From d3b706d1ff820704f8a4e154019cdf32dbcf7239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= <romjerome@yahoo.fr>
Date: Tue, 14 May 2013 08:12:07 +0000
Subject: [PATCH] update template via intltool

svn: r22292
---
 po/gramps.pot | 5331 +++++++++++++++++++++++++------------------------
 1 file changed, 2666 insertions(+), 2665 deletions(-)

diff --git a/po/gramps.pot b/po/gramps.pot
index f0f8b3e88..846afe683 100644
--- a/po/gramps.pot
+++ b/po/gramps.pot
@@ -8,11 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 16:17+0200\n"
+"POT-Creation-Date: 2013-05-14 10:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -379,8 +378,8 @@ msgstr ""
 #: ../gramps/cli/clidbman.py:224
 #: ../gramps/gui/editors/displaytabs/webembedlist.py:67
 #: ../gramps/gui/filters/sidebar/_mediasidebarfilter.py:94
-#: ../gramps/gui/glade/editmedia.glade.h:13
-#: ../gramps/gui/glade/editmediaref.glade.h:28
+#: ../gramps/gui/glade/editmedia.glade.h:10
+#: ../gramps/gui/glade/editmediaref.glade.h:17
 #: ../gramps/plugins/view/mediaview.py:107
 msgid "Path"
 msgstr ""
@@ -458,7 +457,7 @@ msgstr ""
 #: ../gramps/plugins/lib/maps/geography.py:722
 #: ../gramps/plugins/quickview/all_relations.py:279
 #: ../gramps/plugins/quickview/all_relations.py:296
-#: ../gramps/plugins/textreport/indivcomplete.py:637
+#: ../gramps/plugins/textreport/indivcomplete.py:638
 #: ../gramps/plugins/tool/check.py:2012 ../gramps/plugins/view/geoclose.py:488
 #: ../gramps/plugins/view/geofamclose.py:246
 #: ../gramps/plugins/view/geofamclose.py:632
@@ -530,7 +529,7 @@ msgid "Family Tree does not exist, as it has been deleted."
 msgstr ""
 
 #. already errors encountered. Show first one on terminal and exit
-#: ../gramps/cli/grampscli.py:307
+#: ../gramps/cli/grampscli.py:322
 #, python-format
 msgid "Error encountered: %s"
 msgstr ""
@@ -647,8 +646,8 @@ msgstr ""
 #: ../gramps/cli/plug/__init__.py:481
 #, python-format
 msgid ""
-"Ignoring '%(notranslate1)s=%(notranslate2)s' and using '%(notranslate1)s="
-"%(notranslate3)s'."
+"Ignoring '%(notranslate1)s=%(notranslate2)s' and using '%(notranslate1)s=%"
+"(notranslate3)s'."
 msgstr ""
 
 #: ../gramps/cli/plug/__init__.py:487
@@ -720,7 +719,7 @@ msgid "TRANSLATORS: Translate this to your name in your native language"
 msgstr ""
 
 #: ../gramps/gen/const.py:240 ../gramps/gen/const.py:241
-#: ../gramps/gen/lib/date.py:1670 ../gramps/gen/lib/date.py:1684
+#: ../gramps/gen/lib/date.py:1671 ../gramps/gen/lib/date.py:1685
 msgid "none"
 msgstr ""
 
@@ -769,10 +768,10 @@ msgstr ""
 #: ../gramps/gen/db/exceptions.py:104
 #, python-format
 msgid ""
-"The Family Tree you are trying to load is in the Bsddb version "
-"%(env_version)s format. This version of Gramps uses Bsddb version "
-"%(bdb_version)s. So you are trying to load data created in a newer format "
-"into an older program, and this is bound to fail.\n"
+"The Family Tree you are trying to load is in the Bsddb version %(env_version)"
+"s format. This version of Gramps uses Bsddb version %(bdb_version)s. So you "
+"are trying to load data created in a newer format into an older program, and "
+"this is bound to fail.\n"
 "\n"
 "You should start your <b>newer</b> version of Gramps and <a href=\"http://"
 "www.gramps-project.org/wiki/index.php?title=How_to_make_a_backup\">make a "
@@ -783,11 +782,10 @@ msgstr ""
 #: ../gramps/gen/db/exceptions.py:129
 #, python-format
 msgid ""
-"The Family Tree you are trying to load is in the Bsddb version "
-"%(env_version)s format. This version of Gramps uses Bsddb version "
-"%(bdb_version)s. So you are trying to load data created in a newer format "
-"into an older program. In this particular case, the difference is very "
-"small, so it may work.\n"
+"The Family Tree you are trying to load is in the Bsddb version %(env_version)"
+"s format. This version of Gramps uses Bsddb version %(bdb_version)s. So you "
+"are trying to load data created in a newer format into an older program. In "
+"this particular case, the difference is very small, so it may work.\n"
 "\n"
 "If you have not already made a backup of your Family Tree, then you should "
 "start your <b>newer</b> version of Gramps and <a href=\"http://www.gramps-"
@@ -798,10 +796,10 @@ msgstr ""
 #: ../gramps/gen/db/exceptions.py:153
 #, python-format
 msgid ""
-"The Family Tree you are trying to load is in the Bsddb version "
-"%(env_version)s format. This version of Gramps uses Bsddb version "
-"%(bdb_version)s. Therefore you cannot load this Family Tree without "
-"upgrading the Bsddb version of the Family Tree.\n"
+"The Family Tree you are trying to load is in the Bsddb version %(env_version)"
+"s format. This version of Gramps uses Bsddb version %(bdb_version)s. "
+"Therefore you cannot load this Family Tree without upgrading the Bsddb "
+"version of the Family Tree.\n"
 "\n"
 "Opening the Family Tree with this version of Gramps might irretrievably "
 "corrupt your Family Tree. You are strongly advised to backup your Family "
@@ -830,10 +828,10 @@ msgstr ""
 #: ../gramps/gen/db/exceptions.py:203
 #, python-format
 msgid ""
-"The Family Tree you are trying to load is in the schema version "
-"%(oldschema)s format. This version of Gramps uses schema version "
-"%(newschema)s. Therefore you cannot load this Family Tree without upgrading "
-"the schema version of the Family Tree.\n"
+"The Family Tree you are trying to load is in the schema version %(oldschema)"
+"s format. This version of Gramps uses schema version %(newschema)s. "
+"Therefore you cannot load this Family Tree without upgrading the schema "
+"version of the Family Tree.\n"
 "\n"
 "If you upgrade then you won't be able to use the previous version of Gramps, "
 "even if you subsequently <a href=\"http://www.gramps-project.org/wiki/index."
@@ -855,9 +853,9 @@ msgstr ""
 #: ../gramps/gen/db/exceptions.py:234
 #, python-format
 msgid ""
-"The Family Tree you are trying to load was created with Python version "
-"%(db_python_version)s. This version of Gramps uses Python version "
-"%(current_python_version)s.  So you are trying to load data created in a "
+"The Family Tree you are trying to load was created with Python version %"
+"(db_python_version)s. This version of Gramps uses Python version %"
+"(current_python_version)s.  So you are trying to load data created in a "
 "newer format into an older program, and this is bound to fail.\n"
 "\n"
 "You should start your <b>newer</b> version of Gramps and <a href=\"http://"
@@ -869,9 +867,9 @@ msgstr ""
 #: ../gramps/gen/db/exceptions.py:259
 #, python-format
 msgid ""
-"The Family Tree you are trying to load is in the Python version "
-"%(db_python_version)s format. This version of Gramps uses Python version "
-"%(current_python_version)s. Therefore you cannot load this Family Tree "
+"The Family Tree you are trying to load is in the Python version %"
+"(db_python_version)s format. This version of Gramps uses Python version %"
+"(current_python_version)s. Therefore you cannot load this Family Tree "
 "without upgrading the Python version of the Family Tree.\n"
 "\n"
 "If you upgrade then you won't be able to use the previous version of Gramps, "
@@ -960,7 +958,7 @@ msgstr ""
 
 #. Make a tuple of the functions and classes that we need for
 #. each of the primary object tables.
-#: ../gramps/gen/db/write.py:1092
+#: ../gramps/gen/db/write.py:1183
 msgid "Rebuild reference map"
 msgstr ""
 
@@ -1216,7 +1214,7 @@ msgstr ""
 #: ../gramps/gen/filters/rules/media/_hascitation.py:49
 #: ../gramps/gen/filters/rules/person/_hascitation.py:49
 #: ../gramps/gen/filters/rules/place/_hascitation.py:50
-#: ../gramps/gui/glade/mergecitation.glade.h:5
+#: ../gramps/gui/glade/mergecitation.glade.h:10
 msgid "Volume/Page:"
 msgstr ""
 
@@ -1234,14 +1232,14 @@ msgstr ""
 #: ../gramps/gen/filters/rules/person/_hasevent.py:51
 #: ../gramps/gen/filters/rules/person/_hasfamilyevent.py:50
 #: ../gramps/gen/filters/rules/place/_hascitation.py:51
-#: ../gramps/gui/glade/mergecitation.glade.h:6
-#: ../gramps/gui/glade/mergeevent.glade.h:6
-#: ../gramps/gui/glade/mergemedia.glade.h:7
+#: ../gramps/gui/glade/mergecitation.glade.h:4
+#: ../gramps/gui/glade/mergeevent.glade.h:4
+#: ../gramps/gui/glade/mergemedia.glade.h:4
 msgid "Date:"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/_hascitationbase.py:53
-#: ../gramps/gui/glade/mergecitation.glade.h:7
+#: ../gramps/gui/glade/mergecitation.glade.h:3
 msgid "Confidence:"
 msgstr ""
 
@@ -1388,7 +1386,7 @@ msgstr ""
 msgid "Miscellaneous filters"
 msgstr ""
 
-#: ../gramps/gen/filters/rules/_rule.py:58 ../gramps/gui/glade/rule.glade.h:26
+#: ../gramps/gen/filters/rules/_rule.py:58 ../gramps/gui/glade/rule.glade.h:22
 #: ../gramps/plugins/view/geoclose.py:499
 #: ../gramps/plugins/view/geofamclose.py:643
 #: ../gramps/plugins/view/geofamily.py:433
@@ -1513,28 +1511,28 @@ msgstr ""
 
 #: ../gramps/gen/filters/rules/citation/_hassource.py:50
 #: ../gramps/gen/filters/rules/media/_hasmedia.py:48
-#: ../gramps/gui/glade/mergedata.glade.h:11
-#: ../gramps/gui/glade/mergemedia.glade.h:5
-#: ../gramps/gui/glade/mergeplace.glade.h:5
-#: ../gramps/gui/glade/mergesource.glade.h:5
+#: ../gramps/gui/glade/mergedata.glade.h:14
+#: ../gramps/gui/glade/mergemedia.glade.h:10
+#: ../gramps/gui/glade/mergeplace.glade.h:11
+#: ../gramps/gui/glade/mergesource.glade.h:11
 msgid "Title:"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/citation/_hassource.py:51
-#: ../gramps/gui/glade/mergedata.glade.h:12
-#: ../gramps/gui/glade/mergesource.glade.h:6
-#: ../gramps/gui/glade/plugins.glade.h:5
+#: ../gramps/gui/glade/mergedata.glade.h:5
+#: ../gramps/gui/glade/mergesource.glade.h:4
+#: ../gramps/gui/glade/plugins.glade.h:2
 msgid "Author:"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/citation/_hassource.py:52
-#: ../gramps/gui/glade/mergedata.glade.h:13
-#: ../gramps/gui/glade/mergesource.glade.h:7
+#: ../gramps/gui/glade/mergedata.glade.h:4
+#: ../gramps/gui/glade/mergesource.glade.h:3
 msgid "Abbreviation:"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/citation/_hassource.py:53
-#: ../gramps/gui/glade/mergedata.glade.h:14
+#: ../gramps/gui/glade/mergedata.glade.h:11
 #: ../gramps/gui/glade/mergesource.glade.h:8
 msgid "Publication:"
 msgstr ""
@@ -1671,7 +1669,7 @@ msgstr ""
 #: ../gramps/gen/filters/rules/person/_hasevent.py:52
 #: ../gramps/gen/filters/rules/person/_hasfamilyevent.py:51
 #: ../gramps/gui/editors/filtereditor.py:507
-#: ../gramps/gui/glade/mergeevent.glade.h:7
+#: ../gramps/gui/glade/mergeevent.glade.h:8
 msgid "Place:"
 msgstr ""
 
@@ -1681,7 +1679,7 @@ msgstr ""
 #: ../gramps/gen/filters/rules/person/_hasdeath.py:49
 #: ../gramps/gen/filters/rules/person/_hasevent.py:53
 #: ../gramps/gen/filters/rules/person/_hasfamilyevent.py:52
-#: ../gramps/gui/glade/mergeevent.glade.h:8
+#: ../gramps/gui/glade/mergeevent.glade.h:5
 msgid "Description:"
 msgstr ""
 
@@ -2193,15 +2191,15 @@ msgstr ""
 
 #: ../gramps/gen/filters/rules/media/_hasmedia.py:49
 #: ../gramps/gen/filters/rules/repository/_hasrepo.py:49
-#: ../gramps/gui/glade/editmediaref.glade.h:22
-#: ../gramps/gui/glade/mergeevent.glade.h:5
-#: ../gramps/gui/glade/mergenote.glade.h:6
-#: ../gramps/gui/glade/mergerepository.glade.h:6
+#: ../gramps/gui/glade/editmediaref.glade.h:25
+#: ../gramps/gui/glade/mergeevent.glade.h:11
+#: ../gramps/gui/glade/mergenote.glade.h:9
+#: ../gramps/gui/glade/mergerepository.glade.h:9
 msgid "Type:"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/media/_hasmedia.py:50
-#: ../gramps/gui/glade/mergemedia.glade.h:6 ../gramps/gui/viewmanager.py:1503
+#: ../gramps/gui/glade/mergemedia.glade.h:7 ../gramps/gui/viewmanager.py:1502
 msgid "Path:"
 msgstr ""
 
@@ -2321,7 +2319,7 @@ msgid "Matches a note with a specified Gramps ID"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/note/_hasnote.py:48
-#: ../gramps/gui/glade/mergenote.glade.h:5
+#: ../gramps/gui/glade/mergenote.glade.h:8
 msgid "Text:"
 msgstr ""
 
@@ -3302,9 +3300,9 @@ msgstr ""
 
 #: ../gramps/gen/filters/rules/place/_hasplace.py:50
 #: ../gramps/gen/filters/rules/repository/_hasrepo.py:48
-#: ../gramps/gui/glade/editfamily.glade.h:3
-#: ../gramps/gui/glade/mergeperson.glade.h:5
-#: ../gramps/gui/glade/mergerepository.glade.h:5
+#: ../gramps/gui/glade/editfamily.glade.h:16
+#: ../gramps/gui/glade/mergeperson.glade.h:8
+#: ../gramps/gui/glade/mergerepository.glade.h:6
 #: ../gramps/plugins/tool/soundgen.glade.h:2
 msgid "Name:"
 msgstr ""
@@ -3379,7 +3377,7 @@ msgid "Latitude:"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/place/_inlatlonneighborhood.py:51
-#: ../gramps/gui/glade/mergeplace.glade.h:7
+#: ../gramps/gui/glade/mergeplace.glade.h:8
 msgid "Longitude:"
 msgstr ""
 
@@ -3676,7 +3674,7 @@ msgstr ""
 #: ../gramps/gen/lib/nameorigintype.py:82 ../gramps/gen/lib/nametype.py:55
 #: ../gramps/gen/lib/notetype.py:81 ../gramps/gen/lib/repotype.py:61
 #: ../gramps/gen/lib/srcmediatype.py:64 ../gramps/gen/lib/urltype.py:56
-#: ../gramps/plugins/textreport/indivcomplete.py:85
+#: ../gramps/plugins/textreport/indivcomplete.py:86
 msgid "Custom"
 msgstr ""
 
@@ -3738,7 +3736,7 @@ msgstr ""
 
 #: ../gramps/gen/lib/attrtype.py:75
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:86
-#: ../gramps/plugins/drawreport/statisticschart.py:359
+#: ../gramps/plugins/drawreport/statisticschart.py:360
 #: ../gramps/plugins/gramplet/agestats.py:170
 #: ../gramps/plugins/gramplet/events.py:58
 #: ../gramps/plugins/quickview/ageondate.py:56
@@ -3806,13 +3804,14 @@ msgstr ""
 msgid "Foster"
 msgstr ""
 
+#. trans_text is a defined keyword (see po/update_po.py, po/genpot.sh)
 #. -------------------------------------------------------------------------
 #.
 #. Short hand function to return either the person's name, or an empty
 #. string if the person is None
 #.
 #. -------------------------------------------------------------------------
-#: ../gramps/gen/lib/date.py:299 ../gramps/gen/lib/date.py:429
+#: ../gramps/gen/lib/date.py:300 ../gramps/gen/lib/date.py:430
 #: ../gramps/gen/mime/_pythonmime.py:50 ../gramps/gen/mime/_pythonmime.py:58
 #: ../gramps/gen/mime/_winmime.py:64 ../gramps/gen/utils/db.py:521
 #: ../gramps/gui/editors/editperson.py:331
@@ -3825,139 +3824,139 @@ msgstr ""
 #: ../gramps/plugins/textreport/detancestralreport.py:596
 #: ../gramps/plugins/textreport/detdescendantreport.py:582
 #: ../gramps/plugins/textreport/detdescendantreport.py:589
-#: ../gramps/plugins/textreport/indivcomplete.py:451
+#: ../gramps/plugins/textreport/indivcomplete.py:452
 #: ../gramps/plugins/view/relview.py:676
 #: ../gramps/plugins/webreport/narrativeweb.py:5390
 msgid "unknown"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:306
+#: ../gramps/gen/lib/date.py:307
 #, python-format
 msgid "less than %s years"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:311 ../gramps/gen/lib/date.py:337
-#: ../gramps/gen/lib/date.py:339 ../gramps/gen/lib/date.py:346
-#: ../gramps/gen/lib/date.py:368
+#: ../gramps/gen/lib/date.py:312 ../gramps/gen/lib/date.py:338
+#: ../gramps/gen/lib/date.py:340 ../gramps/gen/lib/date.py:347
+#: ../gramps/gen/lib/date.py:369
 msgid "more than"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:313 ../gramps/gen/lib/date.py:325
-#: ../gramps/gen/lib/date.py:329 ../gramps/gen/lib/date.py:334
-#: ../gramps/gen/lib/date.py:370
+#: ../gramps/gen/lib/date.py:314 ../gramps/gen/lib/date.py:326
+#: ../gramps/gen/lib/date.py:330 ../gramps/gen/lib/date.py:335
+#: ../gramps/gen/lib/date.py:371
 msgid "less than"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:315 ../gramps/gen/lib/date.py:349
-#: ../gramps/gen/lib/date.py:355 ../gramps/gen/lib/date.py:358
-#: ../gramps/gen/lib/date.py:372
+#: ../gramps/gen/lib/date.py:316 ../gramps/gen/lib/date.py:350
+#: ../gramps/gen/lib/date.py:356 ../gramps/gen/lib/date.py:359
+#: ../gramps/gen/lib/date.py:373
 msgid "age|about"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:321 ../gramps/gen/lib/date.py:365
-#: ../gramps/gen/lib/date.py:381
-msgid "between"
-msgstr ""
-
 #: ../gramps/gen/lib/date.py:322 ../gramps/gen/lib/date.py:366
 #: ../gramps/gen/lib/date.py:382
+msgid "between"
+msgstr ""
+
+#: ../gramps/gen/lib/date.py:323 ../gramps/gen/lib/date.py:367
+#: ../gramps/gen/lib/date.py:383
 #: ../gramps/plugins/quickview/all_relations.py:284
 #: ../gramps/plugins/view/relview.py:1000
 #: ../gramps/plugins/webreport/narrativeweb.py:1156
 msgid "and"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:331 ../gramps/gen/lib/date.py:353
+#: ../gramps/gen/lib/date.py:332 ../gramps/gen/lib/date.py:354
 msgid "less than about"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:343 ../gramps/gen/lib/date.py:351
+#: ../gramps/gen/lib/date.py:344 ../gramps/gen/lib/date.py:352
 msgid "more than about"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:433
+#: ../gramps/gen/lib/date.py:434
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gramps/gen/lib/date.py:440
+#: ../gramps/gen/lib/date.py:441
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gramps/gen/lib/date.py:447
+#: ../gramps/gen/lib/date.py:448
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gramps/gen/lib/date.py:452
+#: ../gramps/gen/lib/date.py:453
 msgid "0 days"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:599
+#: ../gramps/gen/lib/date.py:600
 msgid "calendar|Gregorian"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:600
+#: ../gramps/gen/lib/date.py:601
 msgid "calendar|Julian"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:601
+#: ../gramps/gen/lib/date.py:602
 msgid "calendar|Hebrew"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:602
+#: ../gramps/gen/lib/date.py:603
 msgid "calendar|French Republican"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:603
+#: ../gramps/gen/lib/date.py:604
 msgid "calendar|Persian"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:604
+#: ../gramps/gen/lib/date.py:605
 msgid "calendar|Islamic"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:605
+#: ../gramps/gen/lib/date.py:606
 msgid "calendar|Swedish"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:1670
+#: ../gramps/gen/lib/date.py:1671
 msgid "estimated"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:1670
+#: ../gramps/gen/lib/date.py:1671
 msgid "calculated"
 msgstr ""
 
 #. ui_mods taken from date.py def lookup_modifier(self, modifier):
-#: ../gramps/gen/lib/date.py:1684 ../gramps/plugins/lib/libsubstkeyword.py:278
+#: ../gramps/gen/lib/date.py:1685 ../gramps/plugins/lib/libsubstkeyword.py:278
 msgid "before"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:1684 ../gramps/plugins/lib/libsubstkeyword.py:278
+#: ../gramps/gen/lib/date.py:1685 ../gramps/plugins/lib/libsubstkeyword.py:278
 msgid "after"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:1684 ../gramps/plugins/lib/libsubstkeyword.py:278
+#: ../gramps/gen/lib/date.py:1685 ../gramps/plugins/lib/libsubstkeyword.py:278
 msgid "about"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:1685
+#: ../gramps/gen/lib/date.py:1686
 msgid "range"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:1685
+#: ../gramps/gen/lib/date.py:1686
 msgid "span"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:1685
+#: ../gramps/gen/lib/date.py:1686
 msgid "textonly"
 msgstr ""
 
@@ -4180,187 +4179,187 @@ msgstr ""
 msgid "Alternate Marriage"
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:198
+#: ../gramps/gen/lib/eventtype.py:199
 msgid "birth abbreviation|b."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:199
+#: ../gramps/gen/lib/eventtype.py:200
 msgid "death abbreviation|d."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:200
+#: ../gramps/gen/lib/eventtype.py:201
 msgid "marriage abbreviation|m."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:201
+#: ../gramps/gen/lib/eventtype.py:202
 msgid "Unknown abbreviation|unkn."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:202
+#: ../gramps/gen/lib/eventtype.py:203
 msgid "Custom abbreviation|cust."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:203
+#: ../gramps/gen/lib/eventtype.py:204
 msgid "Adopted abbreviation|adop."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:204
+#: ../gramps/gen/lib/eventtype.py:205
 msgid "Adult Christening abbreviation|a.chr."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:205
+#: ../gramps/gen/lib/eventtype.py:206
 msgid "Baptism abbreviation|bap."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:206
+#: ../gramps/gen/lib/eventtype.py:207
 msgid "Bar Mitzvah abbreviation|bar."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:207
+#: ../gramps/gen/lib/eventtype.py:208
 msgid "Bas Mitzvah abbreviation|bas."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:208
+#: ../gramps/gen/lib/eventtype.py:209
 msgid "Blessing abbreviation|bles."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:209
+#: ../gramps/gen/lib/eventtype.py:210
 msgid "Burial abbreviation|bur."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:210
+#: ../gramps/gen/lib/eventtype.py:211
 msgid "Cause Of Death abbreviation|d.cau."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:211
+#: ../gramps/gen/lib/eventtype.py:212
 msgid "Census abbreviation|cens."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:212
+#: ../gramps/gen/lib/eventtype.py:213
 msgid "Christening abbreviation|chr."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:213
+#: ../gramps/gen/lib/eventtype.py:214
 msgid "Confirmation abbreviation|conf."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:214
+#: ../gramps/gen/lib/eventtype.py:215
 msgid "Cremation abbreviation|crem."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:215
+#: ../gramps/gen/lib/eventtype.py:216
 msgid "Degree abbreviation|deg."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:216
+#: ../gramps/gen/lib/eventtype.py:217
 msgid "Education abbreviation|edu."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:217
+#: ../gramps/gen/lib/eventtype.py:218
 msgid "Elected abbreviation|elec."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:218
+#: ../gramps/gen/lib/eventtype.py:219
 msgid "Emigration abbreviation|em."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:219
+#: ../gramps/gen/lib/eventtype.py:220
 msgid "First Communion abbreviation|f.comm."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:220
+#: ../gramps/gen/lib/eventtype.py:221
 msgid "Immigration abbreviation|im."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:221
+#: ../gramps/gen/lib/eventtype.py:222
 msgid "Graduation abbreviation|grad."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:222
+#: ../gramps/gen/lib/eventtype.py:223
 msgid "Medical Information abbreviation|medinf."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:223
+#: ../gramps/gen/lib/eventtype.py:224
 msgid "Military Service abbreviation|milser."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:224
+#: ../gramps/gen/lib/eventtype.py:225
 msgid "Naturalization abbreviation|nat."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:225
+#: ../gramps/gen/lib/eventtype.py:226
 msgid "Nobility Title abbreviation|nob."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:226
+#: ../gramps/gen/lib/eventtype.py:227
 msgid "Number of Marriages abbreviation|n.o.mar."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:227
+#: ../gramps/gen/lib/eventtype.py:228
 msgid "Occupation abbreviation|occ."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:228
+#: ../gramps/gen/lib/eventtype.py:229
 msgid "Ordination abbreviation|ord."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:229
+#: ../gramps/gen/lib/eventtype.py:230
 msgid "Probate abbreviation|prob."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:230
+#: ../gramps/gen/lib/eventtype.py:231
 msgid "Property abbreviation|prop."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:231
+#: ../gramps/gen/lib/eventtype.py:232
 msgid "Religion abbreviation|rel."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:232
+#: ../gramps/gen/lib/eventtype.py:233
 msgid "Residence abbreviation|res."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:233
+#: ../gramps/gen/lib/eventtype.py:234
 msgid "Retirement abbreviation|ret."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:234
+#: ../gramps/gen/lib/eventtype.py:235
 msgid "Will abbreviation|will."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:235
+#: ../gramps/gen/lib/eventtype.py:236
 msgid "Marriage Settlement abbreviation|m.set."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:236
+#: ../gramps/gen/lib/eventtype.py:237
 msgid "Marriage License abbreviation|m.lic."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:237
+#: ../gramps/gen/lib/eventtype.py:238
 msgid "Marriage Contract abbreviation|m.con."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:238
+#: ../gramps/gen/lib/eventtype.py:239
 msgid "Marriage Banns abbreviation|m.ban."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:239
+#: ../gramps/gen/lib/eventtype.py:240
 msgid "Alternate Marriage abbreviation|alt.mar."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:240
+#: ../gramps/gen/lib/eventtype.py:241
 msgid "Engagement abbreviation|engd."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:241
+#: ../gramps/gen/lib/eventtype.py:242
 msgid "Divorce abbreviation|div."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:242
+#: ../gramps/gen/lib/eventtype.py:243
 msgid "Divorce Filing abbreviation|div.f."
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:243
+#: ../gramps/gen/lib/eventtype.py:244
 msgid "Annulment abbreviation|annul."
 msgstr ""
 
@@ -4403,7 +4402,7 @@ msgstr ""
 #. ----------------------------------
 #: ../gramps/gen/lib/ldsord.py:106
 #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:119
-#: ../gramps/gui/glade/editchildref.glade.h:8
+#: ../gramps/gui/glade/editchildref.glade.h:2
 #: ../gramps/gui/merge/mergeperson.py:249
 #: ../gramps/plugins/export/exportcsv.py:512
 #: ../gramps/plugins/gramplet/children.py:85
@@ -4522,8 +4521,8 @@ msgstr ""
 #: ../gramps/gui/editors/editeventref.py:80
 #: ../gramps/gui/editors/editmediaref.py:97
 #: ../gramps/gui/editors/editreporef.py:74
-#: ../gramps/gui/glade/editmediaref.glade.h:15
-#: ../gramps/gui/glade/editname.glade.h:35
+#: ../gramps/gui/glade/editmediaref.glade.h:10
+#: ../gramps/gui/glade/editname.glade.h:15
 msgid "General"
 msgstr ""
 
@@ -4676,7 +4675,7 @@ msgstr ""
 msgid "Audio"
 msgstr ""
 
-#: ../gramps/gen/lib/srcmediatype.py:66 ../gramps/gui/glade/book.glade.h:1
+#: ../gramps/gen/lib/srcmediatype.py:66 ../gramps/gui/glade/book.glade.h:2
 #: ../gramps/gui/plug/report/_bookdialog.py:374
 #: ../gramps/gui/plug/report/_bookdialog.py:895
 #: ../gramps/gui/plug/report/_bookdialog.py:912
@@ -4930,7 +4929,7 @@ msgid "Relationships"
 msgstr ""
 
 #: ../gramps/gen/plug/_pluginreg.py:90 ../gramps/gen/plug/_pluginreg.py:399
-#: ../gramps/gui/glade/grampletpane.glade.h:9
+#: ../gramps/gui/glade/grampletpane.glade.h:8
 #: ../gramps/gui/widgets/grampletbar.py:607
 #: ../gramps/gui/widgets/grampletpane.py:231
 #: ../gramps/gui/widgets/grampletpane.py:957
@@ -5352,6 +5351,11 @@ msgstr ""
 msgid "Graphviz File"
 msgstr ""
 
+#: ../gramps/gen/plug/menu/_enumeratedlist.py:125
+#, python-format
+msgid "Value '%(val)s' not found for option '%(opt)s'"
+msgstr ""
+
 #. ------------------------------------------------------------------------
 #.
 #. Private Constants
@@ -5422,7 +5426,7 @@ msgstr ""
 msgid "The basic style used for the endnotes reference notes display."
 msgstr ""
 
-#: ../gramps/gen/plug/report/endnotes.py:133
+#: ../gramps/gen/plug/report/endnotes.py:134
 msgid "Endnotes"
 msgstr ""
 
@@ -5436,19 +5440,19 @@ msgstr ""
 
 #. label for the combo
 #: ../gramps/gen/plug/report/stdoptions.py:62 ../gramps/gui/configure.py:967
-#: ../gramps/plugins/webreport/narrativeweb.py:8023
+#: ../gramps/plugins/webreport/narrativeweb.py:8025
 #: ../gramps/plugins/webreport/webcal.py:1358
 msgid "Name format"
 msgstr ""
 
 #: ../gramps/gen/plug/report/stdoptions.py:67
-#: ../gramps/plugins/webreport/narrativeweb.py:8027
+#: ../gramps/plugins/webreport/narrativeweb.py:8029
 #: ../gramps/plugins/webreport/webcal.py:1362
 msgid "Select the format to display names"
 msgstr ""
 
 #: ../gramps/gen/plug/report/utils.py:144
-#: ../gramps/plugins/textreport/indivcomplete.py:654
+#: ../gramps/plugins/textreport/indivcomplete.py:655
 #: ../gramps/plugins/textreport/simplebooktitle.py:106
 #: ../gramps/plugins/webreport/narrativeweb.py:1965
 #: ../gramps/plugins/webreport/narrativeweb.py:2150
@@ -5458,7 +5462,7 @@ msgid "Could not add photo to page"
 msgstr ""
 
 #: ../gramps/gen/plug/report/utils.py:145 ../gramps/gui/utils.py:372
-#: ../gramps/plugins/textreport/indivcomplete.py:655
+#: ../gramps/plugins/textreport/indivcomplete.py:656
 msgid "File does not exist"
 msgstr ""
 
@@ -5563,24 +5567,24 @@ msgid "Registered '%s'"
 msgstr ""
 
 #: ../gramps/gen/proxy/private.py:808
-#: ../gramps/gui/glade/editaddress.glade.h:17
-#: ../gramps/gui/glade/editattribute.glade.h:4
-#: ../gramps/gui/glade/editchildref.glade.h:4
-#: ../gramps/gui/glade/editcitation.glade.h:16
-#: ../gramps/gui/glade/editevent.glade.h:9
-#: ../gramps/gui/glade/editeventref.glade.h:3
-#: ../gramps/gui/glade/editldsord.glade.h:12
-#: ../gramps/gui/glade/editmedia.glade.h:16
-#: ../gramps/gui/glade/editmediaref.glade.h:13
-#: ../gramps/gui/glade/editname.glade.h:5
-#: ../gramps/gui/glade/editnote.glade.h:10
-#: ../gramps/gui/glade/editperson.glade.h:23
+#: ../gramps/gui/glade/editaddress.glade.h:15
+#: ../gramps/gui/glade/editattribute.glade.h:2
+#: ../gramps/gui/glade/editchildref.glade.h:7
+#: ../gramps/gui/glade/editcitation.glade.h:19
+#: ../gramps/gui/glade/editevent.glade.h:11
+#: ../gramps/gui/glade/editeventref.glade.h:10
+#: ../gramps/gui/glade/editldsord.glade.h:8
+#: ../gramps/gui/glade/editmedia.glade.h:14
+#: ../gramps/gui/glade/editmediaref.glade.h:19
+#: ../gramps/gui/glade/editname.glade.h:24
+#: ../gramps/gui/glade/editnote.glade.h:5
+#: ../gramps/gui/glade/editperson.glade.h:24
 #: ../gramps/gui/glade/editpersonref.glade.h:7
-#: ../gramps/gui/glade/editplace.glade.h:7
-#: ../gramps/gui/glade/editreporef.glade.h:8
-#: ../gramps/gui/glade/editrepository.glade.h:10
-#: ../gramps/gui/glade/editsource.glade.h:14
-#: ../gramps/gui/glade/editsourceref.glade.h:8
+#: ../gramps/gui/glade/editplace.glade.h:22
+#: ../gramps/gui/glade/editreporef.glade.h:14
+#: ../gramps/gui/glade/editrepository.glade.h:7
+#: ../gramps/gui/glade/editsource.glade.h:8
+#: ../gramps/gui/glade/editsourceref.glade.h:17
 #: ../gramps/gui/glade/editurl.glade.h:5 ../gramps/gui/grampsgui.py:190
 #: ../gramps/plugins/lib/libpersonview.py:103
 #: ../gramps/plugins/lib/libplaceview.py:108
@@ -5617,109 +5621,109 @@ msgstr ""
 msgid "Person %(person)s connects to himself via %(relation)s"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1201
+#: ../gramps/gen/relationship.py:1207
 msgid "undefined"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1678
+#: ../gramps/gen/relationship.py:1689
 #: ../gramps/plugins/importer/importcsv.py:234
 msgid "husband"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1680
+#: ../gramps/gen/relationship.py:1691
 #: ../gramps/plugins/importer/importcsv.py:230
 msgid "wife"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1682
+#: ../gramps/gen/relationship.py:1693
 msgid "gender unknown|spouse"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1685
+#: ../gramps/gen/relationship.py:1696
 msgid "ex-husband"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1687
+#: ../gramps/gen/relationship.py:1698
 msgid "ex-wife"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1689
+#: ../gramps/gen/relationship.py:1700
 msgid "gender unknown|ex-spouse"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1692
+#: ../gramps/gen/relationship.py:1703
 msgid "unmarried|husband"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1694
+#: ../gramps/gen/relationship.py:1705
 msgid "unmarried|wife"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1696
+#: ../gramps/gen/relationship.py:1707
 msgid "gender unknown,unmarried|spouse"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1699
+#: ../gramps/gen/relationship.py:1710
 msgid "unmarried|ex-husband"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1701
+#: ../gramps/gen/relationship.py:1712
 msgid "unmarried|ex-wife"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1703
+#: ../gramps/gen/relationship.py:1714
 msgid "gender unknown,unmarried|ex-spouse"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1706
+#: ../gramps/gen/relationship.py:1717
 msgid "male,civil union|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1708
+#: ../gramps/gen/relationship.py:1719
 msgid "female,civil union|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1710
+#: ../gramps/gen/relationship.py:1721
 msgid "gender unknown,civil union|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1713
+#: ../gramps/gen/relationship.py:1724
 msgid "male,civil union|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1715
+#: ../gramps/gen/relationship.py:1726
 msgid "female,civil union|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1717
+#: ../gramps/gen/relationship.py:1728
 msgid "gender unknown,civil union|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1720
+#: ../gramps/gen/relationship.py:1731
 msgid "male,unknown relation|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1722
+#: ../gramps/gen/relationship.py:1733
 msgid "female,unknown relation|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1724
+#: ../gramps/gen/relationship.py:1735
 msgid "gender unknown,unknown relation|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1729
+#: ../gramps/gen/relationship.py:1740
 msgid "male,unknown relation|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1731
+#: ../gramps/gen/relationship.py:1742
 msgid "female,unknown relation|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1733
+#: ../gramps/gen/relationship.py:1744
 msgid "gender unknown,unknown relation|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1823
+#: ../gramps/gen/relationship.py:1834
 #, python-format
 msgid ""
 "Family relationship translator not available for language '%s'. Using "
@@ -5835,11 +5839,17 @@ msgstr ""
 msgid "%s, ..."
 msgstr ""
 
-#: ../gramps/gen/utils/db.py:531 ../gramps/plugins/lib/librecords.py:240
+#: ../gramps/gen/utils/db.py:531 ../gramps/plugins/lib/librecords.py:242
 #, python-format
 msgid "%(father)s and %(mother)s"
 msgstr ""
 
+#: ../gramps/gen/utils/image.py:113
+msgid ""
+"WARNING: PIL module not loaded.  Image cropping in report files will not be "
+"available."
+msgstr ""
+
 #: ../gramps/gen/utils/grampslocale.py:604
 msgid "Bulgarian"
 msgstr ""
@@ -5977,7 +5987,7 @@ msgid "Brazil"
 msgstr ""
 
 #: ../gramps/gen/utils/grampslocale.py:642
-#: ../gramps/plugins/lib/holidays.xml.in.h:5
+#: ../gramps/plugins/lib/holidays.xml.in.h:23
 msgid "China"
 msgstr ""
 
@@ -6025,12 +6035,6 @@ msgstr ""
 msgid "See details"
 msgstr ""
 
-#: ../gramps/gen/utils/image.py:113
-msgid ""
-"WARNING: PIL module not loaded.  Image cropping in report files will not be "
-"available."
-msgstr ""
-
 #: ../gramps/gen/utils/keyword.py:56 ../gramps/plugins/export/exportcsv.py:347
 #: ../gramps/plugins/importer/importcsv.py:185
 #: ../gramps/plugins/tool/patchnames.py:436
@@ -6053,7 +6057,7 @@ msgstr ""
 #: ../gramps/gui/configure.py:645 ../gramps/gui/configure.py:646
 #: ../gramps/gui/editors/displaytabs/surnametab.py:77
 #: ../gramps/gui/plug/_guioptions.py:91 ../gramps/gui/plug/_guioptions.py:1456
-#: ../gramps/plugins/drawreport/statisticschart.py:327
+#: ../gramps/plugins/drawreport/statisticschart.py:328
 #: ../gramps/plugins/export/exportcsv.py:345
 #: ../gramps/plugins/importer/importcsv.py:177
 #: ../gramps/plugins/quickview/filterbyname.py:330
@@ -6101,7 +6105,7 @@ msgstr ""
 #: ../gramps/gui/configure.py:640 ../gramps/gui/configure.py:641
 #: ../gramps/gui/configure.py:646 ../gramps/gui/configure.py:648
 #: ../gramps/gui/configure.py:653 ../gramps/gui/configure.py:655
-#: ../gramps/gui/glade/editperson.glade.h:10
+#: ../gramps/gui/glade/editperson.glade.h:26
 #: ../gramps/plugins/export/exportcsv.py:346
 #: ../gramps/plugins/importer/importcsv.py:187
 msgid "Suffix"
@@ -6191,7 +6195,7 @@ msgstr ""
 
 #: ../gramps/gen/utils/keyword.py:73
 #: ../gramps/gui/editors/displaytabs/surnametab.py:76
-#: ../gramps/gui/glade/editperson.glade.h:28
+#: ../gramps/gui/glade/editperson.glade.h:22
 #: ../gramps/plugins/export/exportcsv.py:346
 #: ../gramps/plugins/importer/importcsv.py:186
 msgid "Prefix"
@@ -6324,8 +6328,8 @@ msgstr ""
 #: ../gramps/grampsapp.py:137
 #, python-format
 msgid ""
-"Your Python version does not meet the requirements. At least python %(v1)d."
-"%(v2)d.%(v3)d is needed to start Gramps.\n"
+"Your Python version does not meet the requirements. At least python %(v1)d.%"
+"(v2)d.%(v3)d is needed to start Gramps.\n"
 "\n"
 "Gramps will terminate now."
 msgstr ""
@@ -6428,7 +6432,7 @@ msgstr ""
 #: ../gramps/gui/editors/editlink.py:87
 #: ../gramps/gui/editors/filtereditor.py:290
 #: ../gramps/gui/filters/sidebar/_eventsidebarfilter.py:100
-#: ../gramps/gui/glade/editevent.glade.h:13
+#: ../gramps/gui/glade/editevent.glade.h:9
 #: ../gramps/gui/plug/_guioptions.py:1307
 #: ../gramps/gui/selectors/selectevent.py:67
 #: ../gramps/gui/views/treemodels/placemodel.py:292
@@ -6509,11 +6513,11 @@ msgstr ""
 #: ../gramps/gui/selectors/selectperson.py:76 ../gramps/gui/viewmanager.py:489
 #: ../gramps/gui/views/bookmarks.py:224 ../gramps/gui/views/tags.py:389
 #: ../gramps/gui/views/treemodels/peoplemodel.py:521
-#: ../gramps/plugins/drawreport/timeline.py:72
+#: ../gramps/plugins/drawreport/timeline.py:75
 #: ../gramps/plugins/gramplet/backlinks.py:46
 #: ../gramps/plugins/lib/libpersonview.py:95
 #: ../gramps/plugins/quickview/filterbyname.py:282
-#: ../gramps/plugins/textreport/indivcomplete.py:624
+#: ../gramps/plugins/textreport/indivcomplete.py:625
 #: ../gramps/plugins/textreport/tagreport.py:130
 #: ../gramps/plugins/tool/notrelated.py:125
 #: ../gramps/plugins/tool/removeunused.py:203
@@ -6573,7 +6577,7 @@ msgstr ""
 #: ../gramps/gui/clipboard.py:711 ../gramps/gui/configure.py:526
 #: ../gramps/gui/editors/editlink.py:86
 #: ../gramps/gui/editors/filtereditor.py:287
-#: ../gramps/gui/glade/editpersonref.glade.h:11 ../gramps/gui/grampsgui.py:177
+#: ../gramps/gui/glade/editpersonref.glade.h:5 ../gramps/gui/grampsgui.py:177
 #: ../gramps/plugins/export/exportcsv.py:345
 #: ../gramps/plugins/gramplet/quickviewgramplet.py:108
 #: ../gramps/plugins/importer/importcsv.py:224
@@ -6612,7 +6616,7 @@ msgstr ""
 #: ../gramps/gui/editors/editfamily.py:493
 #: ../gramps/gui/editors/editlink.py:83
 #: ../gramps/gui/editors/filtereditor.py:288
-#: ../gramps/gui/glade/editldsord.glade.h:9 ../gramps/gui/grampsgui.py:155
+#: ../gramps/gui/glade/editldsord.glade.h:3 ../gramps/gui/grampsgui.py:155
 #: ../gramps/plugins/export/exportcsv.py:512
 #: ../gramps/plugins/gramplet/quickviewgramplet.py:110
 #: ../gramps/plugins/importer/importcsv.py:227
@@ -6622,7 +6626,7 @@ msgstr ""
 #: ../gramps/plugins/quickview/filterbyname.py:216
 #: ../gramps/plugins/quickview/quickview.gpr.py:200
 #: ../gramps/plugins/quickview/references.py:88
-#: ../gramps/plugins/textreport/indivcomplete.py:84
+#: ../gramps/plugins/textreport/indivcomplete.py:85
 #: ../gramps/plugins/view/relview.py:1342
 #: ../gramps/plugins/view/relview.py:1364
 #: ../gramps/plugins/webreport/narrativeweb.py:3114
@@ -6740,7 +6744,7 @@ msgstr ""
 
 #: ../gramps/gui/clipboard.py:1354 ../gramps/gui/clipboard.py:1360
 #: ../gramps/gui/clipboard.py:1398 ../gramps/gui/clipboard.py:1442
-#: ../gramps/gui/glade/clipboard.glade.h:1
+#: ../gramps/gui/glade/clipboard.glade.h:2
 msgid "Clipboard"
 msgstr ""
 
@@ -7044,11 +7048,11 @@ msgstr ""
 
 #: ../gramps/gui/configure.py:971
 #: ../gramps/gui/editors/displaytabs/buttontab.py:74
-#: ../gramps/gui/glade/editfamily.glade.h:11
-#: ../gramps/gui/glade/editlink.glade.h:8
-#: ../gramps/gui/glade/editperson.glade.h:31
-#: ../gramps/gui/glade/rule.glade.h:13
-#: ../gramps/gui/glade/styleeditor.glade.h:39
+#: ../gramps/gui/glade/editfamily.glade.h:10
+#: ../gramps/gui/glade/editlink.glade.h:2
+#: ../gramps/gui/glade/editperson.glade.h:15
+#: ../gramps/gui/glade/rule.glade.h:17
+#: ../gramps/gui/glade/styleeditor.glade.h:19
 #: ../gramps/gui/plug/_windows.py:142 ../gramps/gui/plug/_windows.py:198
 #: ../gramps/gui/plug/report/_bookdialog.py:654
 msgid "Edit"
@@ -7411,7 +7415,7 @@ msgstr ""
 msgid "_Extract"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:112 ../gramps/gui/glade/dbman.glade.h:8
+#: ../gramps/gui/dbman.py:112 ../gramps/gui/glade/dbman.glade.h:5
 msgid "_Archive"
 msgstr ""
 
@@ -7736,15 +7740,15 @@ msgstr ""
 #: ../gramps/gui/filters/sidebar/_citationsidebarfilter.py:99
 #: ../gramps/gui/filters/sidebar/_eventsidebarfilter.py:99
 #: ../gramps/gui/filters/sidebar/_mediasidebarfilter.py:95
-#: ../gramps/gui/glade/editaddress.glade.h:20
-#: ../gramps/gui/glade/editcitation.glade.h:4
-#: ../gramps/gui/glade/editevent.glade.h:6
-#: ../gramps/gui/glade/editeventref.glade.h:12
-#: ../gramps/gui/glade/editldsord.glade.h:5
-#: ../gramps/gui/glade/editmedia.glade.h:11
-#: ../gramps/gui/glade/editmediaref.glade.h:26
-#: ../gramps/gui/glade/editname.glade.h:30
-#: ../gramps/gui/glade/editsourceref.glade.h:4 ../gramps/gui/grampsgui.py:152
+#: ../gramps/gui/glade/editaddress.glade.h:5
+#: ../gramps/gui/glade/editcitation.glade.h:16
+#: ../gramps/gui/glade/editevent.glade.h:4
+#: ../gramps/gui/glade/editeventref.glade.h:6
+#: ../gramps/gui/glade/editldsord.glade.h:2
+#: ../gramps/gui/glade/editmedia.glade.h:4
+#: ../gramps/gui/glade/editmediaref.glade.h:6
+#: ../gramps/gui/glade/editname.glade.h:13
+#: ../gramps/gui/glade/editsourceref.glade.h:14 ../gramps/gui/grampsgui.py:152
 #: ../gramps/gui/selectors/selectevent.py:66
 #: ../gramps/plugins/export/exportcsv.py:469
 #: ../gramps/plugins/gramplet/ageondategramplet.py:74
@@ -7894,19 +7898,18 @@ msgid "%(part1)s - %(part2)s"
 msgstr ""
 
 #: ../gramps/gui/editors/displaytabs/buttontab.py:72
-#: ../gramps/gui/glade/editfamily.glade.h:9
-#: ../gramps/gui/glade/editperson.glade.h:20
-#: ../gramps/gui/glade/rule.glade.h:11
-#: ../gramps/gui/glade/styleeditor.glade.h:37
+#: ../gramps/gui/glade/editfamily.glade.h:7
+#: ../gramps/gui/glade/editperson.glade.h:9 ../gramps/gui/glade/rule.glade.h:8
+#: ../gramps/gui/glade/styleeditor.glade.h:14
 #: ../gramps/plugins/view/relview.py:421
 msgid "Add"
 msgstr ""
 
 #: ../gramps/gui/editors/displaytabs/buttontab.py:73
-#: ../gramps/gui/glade/editfamily.glade.h:10
-#: ../gramps/gui/glade/grampletpane.glade.h:5
-#: ../gramps/gui/glade/rule.glade.h:16
-#: ../gramps/gui/glade/styleeditor.glade.h:42
+#: ../gramps/gui/glade/editfamily.glade.h:18
+#: ../gramps/gui/glade/grampletpane.glade.h:9
+#: ../gramps/gui/glade/rule.glade.h:24
+#: ../gramps/gui/glade/styleeditor.glade.h:27
 msgid "Remove"
 msgstr ""
 
@@ -8734,12 +8737,12 @@ msgstr ""
 #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:131
 #: ../gramps/gui/merge/mergeperson.py:182
 #: ../gramps/gui/selectors/selectperson.py:78
-#: ../gramps/plugins/drawreport/statisticschart.py:331
+#: ../gramps/plugins/drawreport/statisticschart.py:332
 #: ../gramps/plugins/export/exportcsv.py:347
 #: ../gramps/plugins/importer/importcsv.py:188
 #: ../gramps/plugins/lib/libpersonview.py:97
 #: ../gramps/plugins/quickview/siblings.py:50
-#: ../gramps/plugins/textreport/indivcomplete.py:625
+#: ../gramps/plugins/textreport/indivcomplete.py:626
 #: ../gramps/plugins/webreport/narrativeweb.py:6199
 msgid "Gender"
 msgstr ""
@@ -8754,7 +8757,7 @@ msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:127
 #: ../gramps/gui/selectors/selectperson.py:79
-#: ../gramps/plugins/drawreport/timeline.py:71
+#: ../gramps/plugins/drawreport/timeline.py:74
 #: ../gramps/plugins/gramplet/children.py:86
 #: ../gramps/plugins/gramplet/children.py:183
 #: ../gramps/plugins/lib/libpersonview.py:98
@@ -9047,7 +9050,7 @@ msgstr ""
 
 #: ../gramps/gui/editors/editmediaref.py:88
 #: ../gramps/gui/editors/editmediaref.py:89
-#: ../gramps/gui/glade/editmediaref.glade.h:2
+#: ../gramps/gui/glade/editmediaref.glade.h:26
 msgid "Y coordinate|Y"
 msgstr ""
 
@@ -9284,8 +9287,8 @@ msgstr ""
 
 #: ../gramps/gui/editors/editplace.py:232
 #: ../gramps/plugins/lib/maps/geography.py:751
-#: ../gramps/plugins/view/geoplaces.py:312
-#: ../gramps/plugins/view/geoplaces.py:331
+#: ../gramps/plugins/view/geoplaces.py:313
+#: ../gramps/plugins/view/geoplaces.py:332
 msgid "Edit Place"
 msgstr ""
 
@@ -9543,7 +9546,7 @@ msgstr ""
 
 #: ../gramps/gui/editors/filtereditor.py:709
 #: ../gramps/gui/editors/filtereditor.py:720
-#: ../gramps/gui/glade/rule.glade.h:24
+#: ../gramps/gui/glade/rule.glade.h:23
 msgid "No rule selected"
 msgstr ""
 
@@ -9570,8 +9573,8 @@ msgstr ""
 #. ###############################
 #: ../gramps/gui/editors/filtereditor.py:1050
 #: ../gramps/plugins/drawreport/calendarreport.py:427
-#: ../gramps/plugins/drawreport/statisticschart.py:936
-#: ../gramps/plugins/drawreport/timeline.py:378
+#: ../gramps/plugins/drawreport/statisticschart.py:937
+#: ../gramps/plugins/drawreport/timeline.py:415
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:943
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:957
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:971
@@ -9583,11 +9586,11 @@ msgstr ""
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:1055
 #: ../gramps/plugins/graph/gvrelgraph.py:497
 #: ../gramps/plugins/quickview/quickview.gpr.py:127
-#: ../gramps/plugins/textreport/birthdayreport.py:376
-#: ../gramps/plugins/textreport/indivcomplete.py:697
+#: ../gramps/plugins/textreport/birthdayreport.py:417
+#: ../gramps/plugins/textreport/indivcomplete.py:698
 #: ../gramps/plugins/textreport/recordsreport.py:172
 #: ../gramps/plugins/tool/sortevents.py:168
-#: ../gramps/plugins/webreport/narrativeweb.py:8001
+#: ../gramps/plugins/webreport/narrativeweb.py:8003
 #: ../gramps/plugins/webreport/webcal.py:1336
 msgid "Filter"
 msgstr ""
@@ -9744,7 +9747,7 @@ msgstr ""
 #. may be a step family. However, it will be odd to display the
 #. parent as anything other than "Father"
 #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:117
-#: ../gramps/gui/glade/editfamily.glade.h:7
+#: ../gramps/gui/glade/editfamily.glade.h:13
 #: ../gramps/gui/merge/mergeperson.py:222
 #: ../gramps/gui/selectors/selectfamily.py:63
 #: ../gramps/gui/widgets/reorderfam.py:85
@@ -9753,9 +9756,9 @@ msgstr ""
 #: ../gramps/plugins/quickview/all_relations.py:302
 #: ../gramps/plugins/textreport/familygroup.py:214
 #: ../gramps/plugins/textreport/familygroup.py:225
-#: ../gramps/plugins/textreport/indivcomplete.py:338
-#: ../gramps/plugins/textreport/indivcomplete.py:340
-#: ../gramps/plugins/textreport/indivcomplete.py:626
+#: ../gramps/plugins/textreport/indivcomplete.py:339
+#: ../gramps/plugins/textreport/indivcomplete.py:341
+#: ../gramps/plugins/textreport/indivcomplete.py:627
 #: ../gramps/plugins/textreport/tagreport.py:217
 #: ../gramps/plugins/view/familyview.py:82
 #: ../gramps/plugins/view/relview.py:907
@@ -9765,7 +9768,7 @@ msgstr ""
 
 #. ----------------------------------
 #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:118
-#: ../gramps/gui/glade/editfamily.glade.h:14
+#: ../gramps/gui/glade/editfamily.glade.h:15
 #: ../gramps/gui/merge/mergeperson.py:224
 #: ../gramps/gui/selectors/selectfamily.py:64
 #: ../gramps/gui/widgets/reorderfam.py:86
@@ -9774,9 +9777,9 @@ msgstr ""
 #: ../gramps/plugins/quickview/all_relations.py:299
 #: ../gramps/plugins/textreport/familygroup.py:231
 #: ../gramps/plugins/textreport/familygroup.py:242
-#: ../gramps/plugins/textreport/indivcomplete.py:347
-#: ../gramps/plugins/textreport/indivcomplete.py:349
-#: ../gramps/plugins/textreport/indivcomplete.py:627
+#: ../gramps/plugins/textreport/indivcomplete.py:348
+#: ../gramps/plugins/textreport/indivcomplete.py:350
+#: ../gramps/plugins/textreport/indivcomplete.py:628
 #: ../gramps/plugins/textreport/tagreport.py:223
 #: ../gramps/plugins/view/familyview.py:83
 #: ../gramps/plugins/view/relview.py:908
@@ -9848,49 +9851,49 @@ msgid "Publication"
 msgstr ""
 
 #: ../gramps/gui/glade/addmedia.glade.h:1
-#: ../gramps/gui/glade/editperson.glade.h:13
+#: ../gramps/gui/glade/editmedia.glade.h:1
+#: ../gramps/gui/glade/editmediaref.glade.h:3
+msgid "<b>Preview</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/addmedia.glade.h:2
+msgid "Convert to a relative path"
+msgstr ""
+
+#: ../gramps/gui/glade/addmedia.glade.h:3
+#: ../gramps/gui/glade/editperson.glade.h:18
 #: ../gramps/plugins/lib/libmetadata.py:94
 #: ../gramps/plugins/textreport/simplebooktitle.py:148
 msgid "Image"
 msgstr ""
 
-#: ../gramps/gui/glade/addmedia.glade.h:2
-#: ../gramps/gui/glade/editmedia.glade.h:6
-#: ../gramps/gui/glade/editmediaref.glade.h:8
-msgid "<b>Preview</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/addmedia.glade.h:3
-#: ../gramps/gui/glade/editcitation.glade.h:20
-#: ../gramps/gui/glade/editmedia.glade.h:2
-#: ../gramps/gui/glade/editmediaref.glade.h:18
-#: ../gramps/gui/glade/editsource.glade.h:3
-#: ../gramps/gui/glade/editsourceref.glade.h:17
-msgid "_Title:"
-msgstr ""
-
 #: ../gramps/gui/glade/addmedia.glade.h:4
-msgid "Convert to a relative path"
+#: ../gramps/gui/glade/editcitation.glade.h:29
+#: ../gramps/gui/glade/editmedia.glade.h:20
+#: ../gramps/gui/glade/editmediaref.glade.h:33
+#: ../gramps/gui/glade/editsource.glade.h:15
+#: ../gramps/gui/glade/editsourceref.glade.h:27
+msgid "_Title:"
 msgstr ""
 
 #: ../gramps/gui/glade/baseselector.glade.h:1
 msgid "Show all"
 msgstr ""
 
-#: ../gramps/gui/glade/book.glade.h:2
-msgid "Book _name:"
+#: ../gramps/gui/glade/book.glade.h:1
+msgid "Add an item to the book"
 msgstr ""
 
 #: ../gramps/gui/glade/book.glade.h:3
-msgid "Clear the book"
+msgid "Book _name:"
 msgstr ""
 
 #: ../gramps/gui/glade/book.glade.h:4
-msgid "Save current set of configured selections"
+msgid "Clear the book"
 msgstr ""
 
 #: ../gramps/gui/glade/book.glade.h:5
-msgid "Open previously created book"
+msgid "Configure currently selected item"
 msgstr ""
 
 #: ../gramps/gui/glade/book.glade.h:6
@@ -9898,38 +9901,46 @@ msgid "Manage previously created books"
 msgstr ""
 
 #: ../gramps/gui/glade/book.glade.h:7
-msgid "Add an item to the book"
-msgstr ""
-
-#: ../gramps/gui/glade/book.glade.h:8
-msgid "Remove currently selected item from the book"
-msgstr ""
-
-#: ../gramps/gui/glade/book.glade.h:9
-msgid "Move current selection one step up in the book"
-msgstr ""
-
-#: ../gramps/gui/glade/book.glade.h:10
 msgid "Move current selection one step down in the book"
 msgstr ""
 
-#: ../gramps/gui/glade/book.glade.h:11
-msgid "Configure currently selected item"
+#: ../gramps/gui/glade/book.glade.h:8
+msgid "Move current selection one step up in the book"
 msgstr ""
 
-#: ../gramps/gui/glade/clipboard.glade.h:2
+#: ../gramps/gui/glade/book.glade.h:9
+msgid "Open previously created book"
+msgstr ""
+
+#: ../gramps/gui/glade/book.glade.h:10
+msgid "Remove currently selected item from the book"
+msgstr ""
+
+#: ../gramps/gui/glade/book.glade.h:11
+msgid "Save current set of configured selections"
+msgstr ""
+
+#: ../gramps/gui/glade/clipboard.glade.h:1
 msgid "Clear _All"
 msgstr ""
 
 #: ../gramps/gui/glade/configure.glade.h:1
-msgid "Format _name:"
+msgid "Example:"
 msgstr ""
 
 #: ../gramps/gui/glade/configure.glade.h:2
 msgid "Format _definition:"
 msgstr ""
 
+#: ../gramps/gui/glade/configure.glade.h:3
+msgid "Format _name:"
+msgstr ""
+
 #: ../gramps/gui/glade/configure.glade.h:4
+msgid "Format definition details"
+msgstr ""
+
+#: ../gramps/gui/glade/configure.glade.h:6
 #, no-c-format
 msgid ""
 "The following conventions are used:\n"
@@ -9942,56 +9953,51 @@ msgid ""
 "  <b>%y</b> - Patronymic       <b>%Y</b> - PATRONYMIC</tt>"
 msgstr ""
 
-#: ../gramps/gui/glade/configure.glade.h:12
-msgid "Format definition details"
-msgstr ""
-
-#: ../gramps/gui/glade/configure.glade.h:13
-msgid "Example:"
-msgstr ""
-
 #: ../gramps/gui/glade/dbman.glade.h:1
-msgid "Revision comment - Gramps"
-msgstr ""
-
-#: ../gramps/gui/glade/dbman.glade.h:2
 msgid "<b>Version description</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade.h:3
+#: ../gramps/gui/glade/dbman.glade.h:2
 msgid "Family Trees - Gramps"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade.h:4
-msgid "_Close Window"
-msgstr ""
-
-#: ../gramps/gui/glade/dbman.glade.h:5
-msgid "_Load Family Tree"
-msgstr ""
-
-#: ../gramps/gui/glade/dbman.glade.h:6
-msgid "_Rename"
-msgstr ""
-
-#: ../gramps/gui/glade/dbman.glade.h:7
+#: ../gramps/gui/glade/dbman.glade.h:3
 msgid "Re_pair"
 msgstr ""
 
+#: ../gramps/gui/glade/dbman.glade.h:4
+msgid "Revision comment - Gramps"
+msgstr ""
+
+#: ../gramps/gui/glade/dbman.glade.h:6
+msgid "_Close Window"
+msgstr ""
+
+#: ../gramps/gui/glade/dbman.glade.h:7
+msgid "_Load Family Tree"
+msgstr ""
+
+#: ../gramps/gui/glade/dbman.glade.h:8
+msgid "_Rename"
+msgstr ""
+
 #: ../gramps/gui/glade/dialog.glade.h:1
-msgid "Do not show this dialog again"
+msgid "Close _without saving"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:2
-msgid "Remove object and all references to it from the database"
+msgid "Do not ask again"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:3
-msgid "_Remove Object"
+msgid "Do not show this dialog again"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:4
-msgid "_Keep Reference"
+msgid ""
+"If you check this button, all the missing media files will be automatically "
+"treated according to the currently selected option. No further dialogs will "
+"be presented for any missing media files."
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:5
@@ -9999,191 +10005,176 @@ msgid "Keep reference to the missing file"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:6
-msgid "Select replacement for the missing file"
+msgid "Remove object and all references to it from the database"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:7
-msgid "_Select File"
+msgid "Select replacement for the missing file"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:8
-msgid "_Use this selection for all missing media files"
+msgid "_Keep Reference"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:9
-msgid ""
-"If you check this button, all the missing media files will be automatically "
-"treated according to the currently selected option. No further dialogs will "
-"be presented for any missing media files."
+msgid "_Remove Object"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:10
-msgid "label"
+msgid "_Select File"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:11
-msgid "Close _without saving"
+msgid "_Use this selection for all missing media files"
 msgstr ""
 
 #: ../gramps/gui/glade/dialog.glade.h:12
-msgid "Do not ask again"
+msgid "label"
 msgstr ""
 
-#: ../gramps/gui/glade/displaystate.glade.h:1 ../data/gramps.desktop.in.h:1
+#: ../gramps/gui/glade/displaystate.glade.h:1 ../data/gramps.desktop.in.h:2
 msgid "Gramps"
 msgstr ""
 
 #: ../gramps/gui/glade/editaddress.glade.h:1
 #: ../gramps/gui/glade/editchildref.glade.h:1
 #: ../gramps/gui/glade/editevent.glade.h:2
-#: ../gramps/gui/glade/editfamily.glade.h:2
+#: ../gramps/gui/glade/editfamily.glade.h:6
 #: ../gramps/gui/glade/editldsord.glade.h:1
 #: ../gramps/gui/glade/editlink.glade.h:1
-#: ../gramps/gui/glade/editname.glade.h:2
-#: ../gramps/gui/glade/editperson.glade.h:2
+#: ../gramps/gui/glade/editname.glade.h:8
+#: ../gramps/gui/glade/editperson.glade.h:8
 #: ../gramps/gui/glade/editpersonref.glade.h:1
-#: ../gramps/gui/glade/editreporef.glade.h:2
-#: ../gramps/gui/glade/editrepository.glade.h:2
-#: ../gramps/gui/glade/editsource.glade.h:2
-#: ../gramps/gui/glade/editurl.glade.h:1
+#: ../gramps/gui/glade/editreporef.glade.h:7
+#: ../gramps/gui/glade/editrepository.glade.h:3
+#: ../gramps/gui/glade/editsource.glade.h:4
+#: ../gramps/gui/glade/editurl.glade.h:2
 msgid "Accept changes and close window"
 msgstr ""
 
 #: ../gramps/gui/glade/editaddress.glade.h:2
-#: ../gramps/gui/glade/editcitation.glade.h:2
-#: ../gramps/gui/glade/editevent.glade.h:4
-#: ../gramps/gui/glade/editeventref.glade.h:7
-#: ../gramps/gui/glade/editldsord.glade.h:2
-#: ../gramps/gui/glade/editmedia.glade.h:3
-#: ../gramps/gui/glade/editmediaref.glade.h:24
-#: ../gramps/gui/glade/editsourceref.glade.h:2
-msgid "_Date:"
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:3
-msgid "St_reet:"
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:4
-#: ../gramps/gui/glade/editlocation.glade.h:1
-#: ../gramps/gui/glade/editplace.glade.h:15
+#: ../gramps/gui/glade/editlocation.glade.h:2
+#: ../gramps/gui/glade/editplace.glade.h:5
 msgid "C_ity:"
 msgstr ""
 
-#: ../gramps/gui/glade/editaddress.glade.h:5
-msgid "The town or city of the address"
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:6
-#: ../gramps/plugins/tool/ownereditor.glade.h:4
-msgid "_State/County:"
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:7
-#: ../gramps/gui/glade/editlocation.glade.h:12
-#: ../gramps/gui/glade/editplace.glade.h:30
-msgid "_ZIP/Postal code:"
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:8
-msgid "Postal code"
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:9
-#: ../gramps/gui/glade/editlocation.glade.h:10
+#: ../gramps/gui/glade/editaddress.glade.h:3
+#: ../gramps/gui/glade/editlocation.glade.h:5
 msgid "Cou_ntry:"
 msgstr ""
 
-#: ../gramps/gui/glade/editaddress.glade.h:10
-#: ../gramps/gui/glade/editlocation.glade.h:13
-#: ../gramps/gui/glade/editplace.glade.h:31
-msgid "Phon_e:"
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:11
-msgid "Phone number linked to the address."
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:12
-msgid ""
-"The state or county of the address in case a mail address must contain this."
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:13
+#: ../gramps/gui/glade/editaddress.glade.h:4
 msgid "Country of the address"
 msgstr ""
 
-#: ../gramps/gui/glade/editaddress.glade.h:14
+#: ../gramps/gui/glade/editaddress.glade.h:6
+msgid "Date at which the address is valid."
+msgstr ""
+
+#: ../gramps/gui/glade/editaddress.glade.h:7
+#: ../gramps/gui/glade/editcitation.glade.h:17
+#: ../gramps/gui/glade/editevent.glade.h:8
+#: ../gramps/gui/glade/editeventref.glade.h:8
+#: ../gramps/gui/glade/editldsord.glade.h:4
+#: ../gramps/gui/glade/editmedia.glade.h:8
+#: ../gramps/gui/glade/editmediaref.glade.h:16
+#: ../gramps/gui/glade/editname.glade.h:16
+#: ../gramps/gui/glade/editsourceref.glade.h:15
+msgid "Invoke date editor"
+msgstr ""
+
+#: ../gramps/gui/glade/editaddress.glade.h:8
 msgid ""
 "Mail address. \n"
 "\n"
 "Note: Use Residence Event for genealogical address data."
 msgstr ""
 
-#: ../gramps/gui/glade/editaddress.glade.h:18
-#: ../gramps/gui/glade/editattribute.glade.h:5
-#: ../gramps/gui/glade/editchildref.glade.h:5
-#: ../gramps/gui/glade/editcitation.glade.h:17
+#: ../gramps/gui/glade/editaddress.glade.h:11
+#: ../gramps/gui/glade/editlocation.glade.h:8
+#: ../gramps/gui/glade/editplace.glade.h:20
+msgid "Phon_e:"
+msgstr ""
+
+#: ../gramps/gui/glade/editaddress.glade.h:12
+msgid "Phone number linked to the address."
+msgstr ""
+
+#: ../gramps/gui/glade/editaddress.glade.h:13
+msgid "Postal code"
+msgstr ""
+
+#: ../gramps/gui/glade/editaddress.glade.h:14
+#: ../gramps/gui/glade/editattribute.glade.h:1
+#: ../gramps/gui/glade/editchildref.glade.h:6
+#: ../gramps/gui/glade/editcitation.glade.h:18
 #: ../gramps/gui/glade/editevent.glade.h:10
-#: ../gramps/gui/glade/editeventref.glade.h:4
-#: ../gramps/gui/glade/editfamily.glade.h:16
-#: ../gramps/gui/glade/editldsord.glade.h:13
-#: ../gramps/gui/glade/editmedia.glade.h:17
-#: ../gramps/gui/glade/editmediaref.glade.h:14
-#: ../gramps/gui/glade/editname.glade.h:6
-#: ../gramps/gui/glade/editnote.glade.h:11
-#: ../gramps/gui/glade/editperson.glade.h:24
-#: ../gramps/gui/glade/editpersonref.glade.h:8
-#: ../gramps/gui/glade/editplace.glade.h:8
-#: ../gramps/gui/glade/editreporef.glade.h:9
-#: ../gramps/gui/glade/editrepository.glade.h:11
-#: ../gramps/gui/glade/editsource.glade.h:15
-#: ../gramps/gui/glade/editsourceref.glade.h:9
-#: ../gramps/gui/glade/editurl.glade.h:6
-#: ../gramps/plugins/webreport/narrativeweb.py:8167
+#: ../gramps/gui/glade/editeventref.glade.h:9
+#: ../gramps/gui/glade/editfamily.glade.h:17
+#: ../gramps/gui/glade/editldsord.glade.h:7
+#: ../gramps/gui/glade/editmedia.glade.h:13
+#: ../gramps/gui/glade/editmediaref.glade.h:18
+#: ../gramps/gui/glade/editname.glade.h:23
+#: ../gramps/gui/glade/editnote.glade.h:4
+#: ../gramps/gui/glade/editperson.glade.h:23
+#: ../gramps/gui/glade/editpersonref.glade.h:6
+#: ../gramps/gui/glade/editplace.glade.h:21
+#: ../gramps/gui/glade/editreporef.glade.h:13
+#: ../gramps/gui/glade/editrepository.glade.h:6
+#: ../gramps/gui/glade/editsource.glade.h:7
+#: ../gramps/gui/glade/editsourceref.glade.h:16
+#: ../gramps/gui/glade/editurl.glade.h:4
+#: ../gramps/plugins/webreport/narrativeweb.py:8169
 msgid "Privacy"
 msgstr ""
 
-#: ../gramps/gui/glade/editaddress.glade.h:19
-#: ../gramps/gui/glade/editcitation.glade.h:3
-#: ../gramps/gui/glade/editevent.glade.h:5
-#: ../gramps/gui/glade/editeventref.glade.h:11
-#: ../gramps/gui/glade/editldsord.glade.h:4
-#: ../gramps/gui/glade/editmedia.glade.h:10
-#: ../gramps/gui/glade/editmediaref.glade.h:25
-#: ../gramps/gui/glade/editname.glade.h:29
-#: ../gramps/gui/glade/editsourceref.glade.h:3
-msgid "Invoke date editor"
+#: ../gramps/gui/glade/editaddress.glade.h:16
+msgid "St_reet:"
 msgstr ""
 
-#: ../gramps/gui/glade/editaddress.glade.h:21
-msgid "Date at which the address is valid."
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:22
-#: ../gramps/gui/glade/editlocation.glade.h:15
-#: ../gramps/gui/glade/editplace.glade.h:32
-#: ../gramps/plugins/tool/ownereditor.glade.h:9
-msgid "_Locality:"
-msgstr ""
-
-#: ../gramps/gui/glade/editaddress.glade.h:23
+#: ../gramps/gui/glade/editaddress.glade.h:17
 msgid "The locality of the address"
 msgstr ""
 
-#: ../gramps/gui/glade/editattribute.glade.h:1
-msgid "_Attribute:"
+#: ../gramps/gui/glade/editaddress.glade.h:18
+msgid ""
+"The state or county of the address in case a mail address must contain this."
 msgstr ""
 
-#: ../gramps/gui/glade/editattribute.glade.h:2
-msgid "_Value:"
+#: ../gramps/gui/glade/editaddress.glade.h:19
+msgid "The town or city of the address"
+msgstr ""
+
+#: ../gramps/gui/glade/editaddress.glade.h:20
+#: ../gramps/gui/glade/editcitation.glade.h:26
+#: ../gramps/gui/glade/editevent.glade.h:15
+#: ../gramps/gui/glade/editeventref.glade.h:11
+#: ../gramps/gui/glade/editldsord.glade.h:10
+#: ../gramps/gui/glade/editmedia.glade.h:16
+#: ../gramps/gui/glade/editmediaref.glade.h:29
+#: ../gramps/gui/glade/editsourceref.glade.h:24
+msgid "_Date:"
+msgstr ""
+
+#: ../gramps/gui/glade/editaddress.glade.h:21
+#: ../gramps/gui/glade/editlocation.glade.h:14
+#: ../gramps/gui/glade/editplace.glade.h:31
+#: ../gramps/plugins/tool/ownereditor.glade.h:4
+msgid "_Locality:"
+msgstr ""
+
+#: ../gramps/gui/glade/editaddress.glade.h:22
+#: ../gramps/plugins/tool/ownereditor.glade.h:7
+msgid "_State/County:"
+msgstr ""
+
+#: ../gramps/gui/glade/editaddress.glade.h:23
+#: ../gramps/gui/glade/editlocation.glade.h:16
+#: ../gramps/gui/glade/editplace.glade.h:35
+msgid "_ZIP/Postal code:"
 msgstr ""
 
 #: ../gramps/gui/glade/editattribute.glade.h:3
-msgid "The value of the attribute. Eg. 1.8, Sunny, or Blue eyes."
-msgstr ""
-
-#: ../gramps/gui/glade/editattribute.glade.h:6
 msgid ""
 "The name of an attribute you want to use. For example: Height (for a "
 "person), Weather on this Day (for an event), ... \n"
@@ -10195,57 +10186,102 @@ msgid ""
 "standard."
 msgstr ""
 
-#: ../gramps/gui/glade/editchildref.glade.h:2
-msgid "Relationship to _Mother:"
+#: ../gramps/gui/glade/editattribute.glade.h:7
+msgid "The value of the attribute. Eg. 1.8, Sunny, or Blue eyes."
+msgstr ""
+
+#: ../gramps/gui/glade/editattribute.glade.h:8
+msgid "_Attribute:"
+msgstr ""
+
+#: ../gramps/gui/glade/editattribute.glade.h:9
+msgid "_Value:"
 msgstr ""
 
 #: ../gramps/gui/glade/editchildref.glade.h:3
-msgid "Relationship to _Father:"
+#: ../gramps/gui/glade/editfamily.glade.h:12
+#: ../gramps/gui/glade/rule.glade.h:20
+#: ../gramps/gui/glade/styleeditor.glade.h:21
+msgid "Edition"
 msgstr ""
 
-#: ../gramps/gui/glade/editchildref.glade.h:6
+#: ../gramps/gui/glade/editchildref.glade.h:4
 msgid "Name Child:"
 msgstr ""
 
-#: ../gramps/gui/glade/editchildref.glade.h:7
+#: ../gramps/gui/glade/editchildref.glade.h:5
 msgid "Open person editor of this child"
 msgstr ""
 
+#: ../gramps/gui/glade/editchildref.glade.h:8
+msgid "Relationship to _Father:"
+msgstr ""
+
 #: ../gramps/gui/glade/editchildref.glade.h:9
-#: ../gramps/gui/glade/editfamily.glade.h:12
-#: ../gramps/gui/glade/rule.glade.h:14
-#: ../gramps/gui/glade/styleeditor.glade.h:40
-msgid "Edition"
+msgid "Relationship to _Mother:"
 msgstr ""
 
 #: ../gramps/gui/glade/editcitation.glade.h:1
 msgid "<b>Citation information</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/editcitation.glade.h:5
-#: ../gramps/gui/glade/editsourceref.glade.h:5
+#: ../gramps/gui/glade/editcitation.glade.h:2
+#: ../gramps/gui/glade/editeventref.glade.h:1
+#: ../gramps/gui/glade/editmediaref.glade.h:1
+#: ../gramps/gui/glade/editperson.glade.h:1
+#: ../gramps/gui/glade/editreporef.glade.h:1
+#: ../gramps/gui/glade/editsourceref.glade.h:1
+#: ../gramps/plugins/tool/verify.glade.h:3
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:3
 msgid ""
-"Specific location within the information referenced. For a published work, "
-"this could include the volume of a multi-volume work and the page number(s). "
-"For a periodical, it could include volume, issue, and page numbers. For a "
-"newspaper, it could include a column number and page number. For an "
-"unpublished source, this could be a sheet number, page number, frame number, "
-"etc. A census record might have a line number or dwelling and family numbers "
-"in addition to the page number. "
+"<b>Note:</b> Any changes in the shared citation information will be "
+"reflected in the citation itself, for all items that reference the citation."
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:4
+#: ../gramps/gui/glade/editsourceref.glade.h:2
+msgid ""
+"<b>Note:</b> Any changes in the shared source information will be reflected "
+"in the source itself, for all items that reference the source."
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:5
+#: ../gramps/gui/glade/editsourceref.glade.h:4
+msgid "<b>Shared source information</b>"
 msgstr ""
 
 #: ../gramps/gui/glade/editcitation.glade.h:6
-#: ../gramps/gui/glade/editsourceref.glade.h:6
-msgid "_Volume/Page:"
+msgid "A unique ID to identify the citation"
 msgstr ""
 
 #: ../gramps/gui/glade/editcitation.glade.h:7
-#: ../gramps/gui/glade/editsourceref.glade.h:7
-msgid "Con_fidence:"
+#: ../gramps/gui/glade/editsource.glade.h:1
+#: ../gramps/gui/glade/editsourceref.glade.h:5
+msgid "A unique ID to identify the source"
 msgstr ""
 
 #: ../gramps/gui/glade/editcitation.glade.h:8
-#: ../gramps/gui/glade/editsourceref.glade.h:10
+#: ../gramps/gui/glade/editsource.glade.h:2
+#: ../gramps/gui/glade/editsourceref.glade.h:6
+msgid "A_bbreviation:"
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:9
+#: ../gramps/gui/glade/editsource.glade.h:5
+#: ../gramps/gui/glade/editsourceref.glade.h:7
+msgid "Authors of the source."
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:10
+#: ../gramps/gui/glade/editsourceref.glade.h:8
+msgid "Con_fidence:"
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:11
+#: ../gramps/gui/glade/editsourceref.glade.h:9
 msgid ""
 "Conveys the submitter's quantitative evaluation of the credibility of a "
 "piece of information, based upon its supporting evidence. It is not intended "
@@ -10257,325 +10293,268 @@ msgid ""
 "Very High =Direct and primary evidence used, or by dominance of the evidence "
 msgstr ""
 
-#: ../gramps/gui/glade/editcitation.glade.h:13
-#: ../gramps/gui/glade/editsourceref.glade.h:15
+#: ../gramps/gui/glade/editcitation.glade.h:20
+#: ../gramps/gui/glade/editsource.glade.h:9
+#: ../gramps/gui/glade/editsourceref.glade.h:18
+msgid ""
+"Provide a short title used for sorting, filing, and retrieving source "
+"records."
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:21
+#: ../gramps/gui/glade/editsource.glade.h:10
+#: ../gramps/gui/glade/editsourceref.glade.h:19
+msgid ""
+"Publication Information, such as city and year of publication, name of "
+"publisher, ..."
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:22
+#: ../gramps/gui/glade/editsourceref.glade.h:20
+msgid ""
+"Specific location within the information referenced. For a published work, "
+"this could include the volume of a multi-volume work and the page number(s). "
+"For a periodical, it could include volume, issue, and page numbers. For a "
+"newspaper, it could include a column number and page number. For an "
+"unpublished source, this could be a sheet number, page number, frame number, "
+"etc. A census record might have a line number or dwelling and family numbers "
+"in addition to the page number. "
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:23
+#: ../gramps/gui/glade/editsourceref.glade.h:21
 msgid ""
 "The date of the entry in the source you are referencing, e.g. the date a "
 "house was visited during a census, or the date an entry was made in a birth "
 "log/registry. "
 msgstr ""
 
-#: ../gramps/gui/glade/editcitation.glade.h:14
-msgid ""
-"<b>Note:</b> Any changes in the shared citation information will be "
-"reflected in the citation itself, for all items that reference the citation."
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:15
-msgid "A unique ID to identify the citation"
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:18
-#: ../gramps/gui/glade/editevent.glade.h:16
-#: ../gramps/gui/glade/editeventref.glade.h:10
-#: ../gramps/gui/glade/editfamily.glade.h:18
-#: ../gramps/gui/glade/editmedia.glade.h:1
-#: ../gramps/gui/glade/editmediaref.glade.h:17
-#: ../gramps/gui/glade/editnote.glade.h:4
-#: ../gramps/gui/glade/editperson.glade.h:35
-#: ../gramps/gui/glade/editplace.glade.h:5
-#: ../gramps/gui/glade/editreporef.glade.h:16
-#: ../gramps/gui/glade/editrepository.glade.h:7
+#: ../gramps/gui/glade/editcitation.glade.h:24
 #: ../gramps/gui/glade/editsource.glade.h:11
+#: ../gramps/gui/glade/editsourceref.glade.h:22
+msgid "Title of the source."
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:25
+#: ../gramps/gui/glade/editsource.glade.h:12
+#: ../gramps/gui/glade/editsourceref.glade.h:23
+msgid "_Author:"
+msgstr ""
+
+#: ../gramps/gui/glade/editcitation.glade.h:27
+#: ../gramps/gui/glade/editevent.glade.h:17
+#: ../gramps/gui/glade/editeventref.glade.h:13
+#: ../gramps/gui/glade/editfamily.glade.h:22
+#: ../gramps/gui/glade/editmedia.glade.h:17
+#: ../gramps/gui/glade/editmediaref.glade.h:30
+#: ../gramps/gui/glade/editnote.glade.h:11
+#: ../gramps/gui/glade/editperson.glade.h:34
+#: ../gramps/gui/glade/editplace.glade.h:30
+#: ../gramps/gui/glade/editreporef.glade.h:16
+#: ../gramps/gui/glade/editrepository.glade.h:9
+#: ../gramps/gui/glade/editsource.glade.h:13
 #: ../gramps/gui/glade/editsourceref.glade.h:25
 msgid "_ID:"
 msgstr ""
 
-#: ../gramps/gui/glade/editcitation.glade.h:19
-#: ../gramps/gui/glade/editeventref.glade.h:5
-#: ../gramps/gui/glade/editmediaref.glade.h:32
-#: ../gramps/gui/glade/editperson.glade.h:21
-#: ../gramps/gui/glade/editreporef.glade.h:11
-#: ../gramps/gui/glade/editsourceref.glade.h:16
-#: ../gramps/plugins/tool/verify.glade.h:15
-msgid "<b>General</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:21
-#: ../gramps/gui/glade/editsource.glade.h:4
-#: ../gramps/gui/glade/editsourceref.glade.h:18
-msgid "_Author:"
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:22
-#: ../gramps/gui/glade/editsource.glade.h:10
-#: ../gramps/gui/glade/editsourceref.glade.h:19
-msgid "A_bbreviation:"
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:23
-#: ../gramps/gui/glade/editsourceref.glade.h:20
-msgid "_Pub. Info.:"
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:24
-#: ../gramps/gui/glade/editsource.glade.h:6
-#: ../gramps/gui/glade/editsourceref.glade.h:21
-msgid "Authors of the source."
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:25
-#: ../gramps/gui/glade/editsourceref.glade.h:22
-msgid ""
-"<b>Note:</b> Any changes in the shared source information will be reflected "
-"in the source itself, for all items that reference the source."
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:26
-#: ../gramps/gui/glade/editsource.glade.h:9
-#: ../gramps/gui/glade/editsourceref.glade.h:23
-msgid ""
-"Provide a short title used for sorting, filing, and retrieving source "
-"records."
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:27
-#: ../gramps/gui/glade/editsource.glade.h:8
-#: ../gramps/gui/glade/editsourceref.glade.h:24
-msgid ""
-"Publication Information, such as city and year of publication, name of "
-"publisher, ..."
-msgstr ""
-
 #: ../gramps/gui/glade/editcitation.glade.h:28
-#: ../gramps/gui/glade/editsource.glade.h:12
 #: ../gramps/gui/glade/editsourceref.glade.h:26
-msgid "A unique ID to identify the source"
-msgstr ""
-
-#: ../gramps/gui/glade/editcitation.glade.h:29
-#: ../gramps/gui/glade/editsource.glade.h:5
-#: ../gramps/gui/glade/editsourceref.glade.h:27
-msgid "Title of the source."
+msgid "_Pub. Info.:"
 msgstr ""
 
 #: ../gramps/gui/glade/editcitation.glade.h:30
 #: ../gramps/gui/glade/editsourceref.glade.h:28
-msgid "<b>Shared source information</b>"
+msgid "_Volume/Page:"
 msgstr ""
 
 #: ../gramps/gui/glade/editdate.glade.h:1
-msgid "Calenda_r:"
-msgstr ""
-
-#: ../gramps/gui/glade/editdate.glade.h:2
-msgid "Dua_l dated"
-msgstr ""
-
-#: ../gramps/gui/glade/editdate.glade.h:3
-msgid "Old Style/New Style"
-msgstr ""
-
-#: ../gramps/gui/glade/editdate.glade.h:4
-msgid "Ne_w year begins:  "
-msgstr ""
-
-#: ../gramps/gui/glade/editdate.glade.h:5
-msgid "Month-Day of first day of new year (e.g., \"1-1\", \"3-1\", \"3-25\")"
-msgstr ""
-
-#: ../gramps/gui/glade/editdate.glade.h:6
-msgid "<b>Q_uality</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/editdate.glade.h:7
-msgid "<b>_Type</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/editdate.glade.h:8
 msgid "<b>Date</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/editdate.glade.h:9
-msgid "_Day"
+#: ../gramps/gui/glade/editdate.glade.h:2
+msgid "<b>Q_uality</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/editdate.glade.h:10
-msgid "_Month"
-msgstr ""
-
-#: ../gramps/gui/glade/editdate.glade.h:11
-msgid "_Year"
-msgstr ""
-
-#: ../gramps/gui/glade/editdate.glade.h:12
+#: ../gramps/gui/glade/editdate.glade.h:3
 msgid "<b>Second date</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/editdate.glade.h:13
+#: ../gramps/gui/glade/editdate.glade.h:4
+msgid "<b>_Type</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/editdate.glade.h:5
+msgid "Calenda_r:"
+msgstr ""
+
+#: ../gramps/gui/glade/editdate.glade.h:6
 msgid "D_ay"
 msgstr ""
 
-#: ../gramps/gui/glade/editdate.glade.h:14
+#: ../gramps/gui/glade/editdate.glade.h:7
+msgid "Dua_l dated"
+msgstr ""
+
+#: ../gramps/gui/glade/editdate.glade.h:8
 msgid "Mo_nth"
 msgstr ""
 
-#: ../gramps/gui/glade/editdate.glade.h:15
-msgid "Y_ear"
+#: ../gramps/gui/glade/editdate.glade.h:9
+msgid "Month-Day of first day of new year (e.g., \"1-1\", \"3-1\", \"3-25\")"
 msgstr ""
 
-#: ../gramps/gui/glade/editdate.glade.h:16
+#: ../gramps/gui/glade/editdate.glade.h:10
+msgid "Ne_w year begins:  "
+msgstr ""
+
+#: ../gramps/gui/glade/editdate.glade.h:11
+msgid "Old Style/New Style"
+msgstr ""
+
+#: ../gramps/gui/glade/editdate.glade.h:12
 msgid "Te_xt comment:"
 msgstr ""
 
+#: ../gramps/gui/glade/editdate.glade.h:13
+msgid "Y_ear"
+msgstr ""
+
+#: ../gramps/gui/glade/editdate.glade.h:14
+msgid "_Day"
+msgstr ""
+
+#: ../gramps/gui/glade/editdate.glade.h:15
+msgid "_Month"
+msgstr ""
+
+#: ../gramps/gui/glade/editdate.glade.h:16
+msgid "_Year"
+msgstr ""
+
 #: ../gramps/gui/glade/editevent.glade.h:1
-msgid "Close window without changes"
+#: ../gramps/gui/glade/editeventref.glade.h:5
+msgid "A unique ID to identify the event"
 msgstr ""
 
 #: ../gramps/gui/glade/editevent.glade.h:3
-#: ../gramps/gui/glade/editeventref.glade.h:6
-msgid "_Event type:"
+msgid "Close window without changes"
 msgstr ""
 
-#: ../gramps/gui/glade/editevent.glade.h:7
-msgid "Show Date Editor"
+#: ../gramps/gui/glade/editevent.glade.h:5
+msgid ""
+"Date of the event. This can be an exact date, a range (from ... to, "
+"between, ...), or an inexact date (about, ...)."
 msgstr ""
 
-#: ../gramps/gui/glade/editevent.glade.h:8
-#: ../gramps/gui/glade/editeventref.glade.h:8
+#: ../gramps/gui/glade/editevent.glade.h:6
+#: ../gramps/gui/glade/editeventref.glade.h:7
 msgid "De_scription:"
 msgstr ""
 
-#: ../gramps/gui/glade/editevent.glade.h:11
+#: ../gramps/gui/glade/editevent.glade.h:7
 msgid ""
 "Description of the event. Leave empty if you want to autogenerate this with "
 "the tool 'Extract Event Description'."
 msgstr ""
 
 #: ../gramps/gui/glade/editevent.glade.h:12
-#: ../gramps/gui/glade/editeventref.glade.h:9
-#: ../gramps/gui/glade/editldsord.glade.h:3
-msgid "_Place:"
-msgstr ""
-
-#: ../gramps/gui/glade/editevent.glade.h:14
-#: ../gramps/gui/glade/editfamily.glade.h:8
-#: ../gramps/gui/glade/editldsord.glade.h:10
-#: ../gramps/gui/glade/editlink.glade.h:6
-#: ../gramps/gui/glade/editpersonref.glade.h:12
+#: ../gramps/gui/glade/editfamily.glade.h:19
+#: ../gramps/gui/glade/editldsord.glade.h:9
+#: ../gramps/gui/glade/editlink.glade.h:7
+#: ../gramps/gui/glade/editpersonref.glade.h:9
 msgid "Selector"
 msgstr ""
 
-#: ../gramps/gui/glade/editevent.glade.h:15
+#: ../gramps/gui/glade/editevent.glade.h:13
+msgid "Show Date Editor"
+msgstr ""
+
+#: ../gramps/gui/glade/editevent.glade.h:14
 msgid "What type of event this is. Eg 'Burial', 'Graduation', ... ."
 msgstr ""
 
-#: ../gramps/gui/glade/editevent.glade.h:17
-#: ../gramps/gui/glade/editeventref.glade.h:13
-msgid "A unique ID to identify the event"
+#: ../gramps/gui/glade/editevent.glade.h:16
+#: ../gramps/gui/glade/editeventref.glade.h:12
+msgid "_Event type:"
 msgstr ""
 
 #: ../gramps/gui/glade/editevent.glade.h:18
-msgid ""
-"Date of the event. This can be an exact date, a range (from ... to, "
-"between, ...), or an inexact date (about, ...)."
-msgstr ""
-
-#: ../gramps/gui/glade/editeventref.glade.h:1
-#: ../gramps/gui/glade/editreporef.glade.h:3
-#: ../gramps/gui/glade/editsourceref.glade.h:1
-msgid "<b>Reference information</b>"
+#: ../gramps/gui/glade/editeventref.glade.h:14
+#: ../gramps/gui/glade/editldsord.glade.h:12
+msgid "_Place:"
 msgstr ""
 
 #: ../gramps/gui/glade/editeventref.glade.h:2
-msgid "_Role:"
-msgstr ""
-
-#: ../gramps/gui/glade/editeventref.glade.h:14
 msgid ""
 "<b>Note:</b> Any changes in the shared event information will be reflected "
 "in the event itself, for all participants in the event."
 msgstr ""
 
-#: ../gramps/gui/glade/editeventref.glade.h:15
-#: ../gramps/gui/glade/editreporef.glade.h:19
+#: ../gramps/gui/glade/editeventref.glade.h:3
+#: ../gramps/gui/glade/editreporef.glade.h:3
+#: ../gramps/gui/glade/editsourceref.glade.h:3
+msgid "<b>Reference information</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/editeventref.glade.h:4
+#: ../gramps/gui/glade/editreporef.glade.h:4
 msgid "<b>Shared information</b>"
 msgstr ""
 
+#: ../gramps/gui/glade/editeventref.glade.h:15
+msgid "_Role:"
+msgstr ""
+
 #: ../gramps/gui/glade/editfamily.glade.h:1
-#: ../gramps/gui/glade/editname.glade.h:1
-#: ../gramps/gui/glade/editperson.glade.h:1
-#: ../gramps/gui/glade/editreporef.glade.h:1
-#: ../gramps/gui/glade/editrepository.glade.h:1
-#: ../gramps/gui/glade/editsource.glade.h:1
-msgid "Abandon changes and close window"
-msgstr ""
-
-#: ../gramps/gui/glade/editfamily.glade.h:4
-msgid "Birth:"
-msgstr ""
-
-#: ../gramps/gui/glade/editfamily.glade.h:5
-msgid "Death:"
-msgstr ""
-
-#: ../gramps/gui/glade/editfamily.glade.h:6
 msgid "<b>Father</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/editfamily.glade.h:13
+#: ../gramps/gui/glade/editfamily.glade.h:2
 msgid "<b>Mother</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/editfamily.glade.h:15
-#: ../gramps/gui/glade/editreporef.glade.h:7
-#: ../gramps/gui/glade/editrepository.glade.h:9
-#: ../gramps/gui/glade/editsource.glade.h:13
-msgid "Indicates if the record is private"
-msgstr ""
-
-#: ../gramps/gui/glade/editfamily.glade.h:17
+#: ../gramps/gui/glade/editfamily.glade.h:3
 msgid "<b>Relationship Information</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/editfamily.glade.h:19
+#: ../gramps/gui/glade/editfamily.glade.h:4
 msgid "A unique ID for the family"
 msgstr ""
 
-#: ../gramps/gui/glade/editfamily.glade.h:20
-#: ../gramps/gui/glade/editname.glade.h:3
-#: ../gramps/gui/glade/editnote.glade.h:2
-#: ../gramps/gui/glade/editperson.glade.h:15
-#: ../gramps/gui/glade/editreporef.glade.h:13
-#: ../gramps/gui/glade/editrepository.glade.h:4
-#: ../gramps/gui/glade/editurl.glade.h:4
-msgid "_Type:"
+#: ../gramps/gui/glade/editfamily.glade.h:5
+#: ../gramps/gui/glade/editname.glade.h:7
+#: ../gramps/gui/glade/editperson.glade.h:7
+#: ../gramps/gui/glade/editreporef.glade.h:6
+#: ../gramps/gui/glade/editrepository.glade.h:2
+#: ../gramps/gui/glade/editsource.glade.h:3
+msgid "Abandon changes and close window"
 msgstr ""
 
-#: ../gramps/gui/glade/editfamily.glade.h:21
-msgid ""
-"The relationship type, eg 'Married' or 'Unmarried'. Use Events for more "
-"details."
+#: ../gramps/gui/glade/editfamily.glade.h:8
+msgid "Birth:"
 msgstr ""
 
-#: ../gramps/gui/glade/editfamily.glade.h:22
-#: ../gramps/gui/glade/editmedia.glade.h:19
-#: ../gramps/gui/glade/editmediaref.glade.h:30
-#: ../gramps/gui/glade/editnote.glade.h:12
-#: ../gramps/gui/glade/editperson.glade.h:37
-msgid "_Tags:"
+#: ../gramps/gui/glade/editfamily.glade.h:9
+msgid "Death:"
 msgstr ""
 
-#: ../gramps/gui/glade/editfamily.glade.h:23
+#: ../gramps/gui/glade/editfamily.glade.h:11
 #: ../gramps/gui/widgets/monitoredwidgets.py:839
 msgid "Edit the tag list"
 msgstr ""
 
-#: ../gramps/gui/glade/editfamily.glade.h:24
-#: ../gramps/gui/glade/editmedia.glade.h:20
-#: ../gramps/gui/glade/editmediaref.glade.h:31
-#: ../gramps/gui/glade/editnote.glade.h:13
-#: ../gramps/gui/glade/editperson.glade.h:38
+#: ../gramps/gui/glade/editfamily.glade.h:14
+#: ../gramps/gui/glade/editreporef.glade.h:10
+#: ../gramps/gui/glade/editrepository.glade.h:4
+#: ../gramps/gui/glade/editsource.glade.h:6
+msgid "Indicates if the record is private"
+msgstr ""
+
+#: ../gramps/gui/glade/editfamily.glade.h:20
+#: ../gramps/gui/glade/editmedia.glade.h:15
+#: ../gramps/gui/glade/editmediaref.glade.h:23
+#: ../gramps/gui/glade/editnote.glade.h:7
+#: ../gramps/gui/glade/editperson.glade.h:28
 #: ../gramps/gui/selectors/selectnote.py:70
 #: ../gramps/plugins/lib/libpersonview.py:104
 #: ../gramps/plugins/tool/notrelated.py:128
@@ -10585,76 +10564,94 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
+#: ../gramps/gui/glade/editfamily.glade.h:21
+msgid ""
+"The relationship type, eg 'Married' or 'Unmarried'. Use Events for more "
+"details."
+msgstr ""
+
+#: ../gramps/gui/glade/editfamily.glade.h:23
+#: ../gramps/gui/glade/editmedia.glade.h:19
+#: ../gramps/gui/glade/editmediaref.glade.h:32
+#: ../gramps/gui/glade/editnote.glade.h:13
+#: ../gramps/gui/glade/editperson.glade.h:37
+msgid "_Tags:"
+msgstr ""
+
+#: ../gramps/gui/glade/editfamily.glade.h:24
+#: ../gramps/gui/glade/editname.glade.h:35
+#: ../gramps/gui/glade/editnote.glade.h:14
+#: ../gramps/gui/glade/editperson.glade.h:38
+#: ../gramps/gui/glade/editreporef.glade.h:19
+#: ../gramps/gui/glade/editrepository.glade.h:11
+#: ../gramps/gui/glade/editurl.glade.h:9
+msgid "_Type:"
+msgstr ""
+
+#: ../gramps/gui/glade/editldsord.glade.h:5
+msgid "LDS _Temple:"
+msgstr ""
+
 #: ../gramps/gui/glade/editldsord.glade.h:6
 msgid "Ordinance:"
 msgstr ""
 
-#: ../gramps/gui/glade/editldsord.glade.h:7
-msgid "LDS _Temple:"
-msgstr ""
-
-#: ../gramps/gui/glade/editldsord.glade.h:8
+#: ../gramps/gui/glade/editldsord.glade.h:11
 msgid "_Family:"
 msgstr ""
 
-#: ../gramps/gui/glade/editldsord.glade.h:11
+#: ../gramps/gui/glade/editldsord.glade.h:13
 msgid "_Status:"
 msgstr ""
 
-#: ../gramps/gui/glade/editlink.glade.h:2
+#: ../gramps/gui/glade/editlink.glade.h:3
 msgid "Gramps item:"
 msgstr ""
 
-#: ../gramps/gui/glade/editlink.glade.h:3
+#: ../gramps/gui/glade/editlink.glade.h:4
 msgid "Internet Address:"
 msgstr ""
 
-#: ../gramps/gui/glade/editlink.glade.h:4
-msgid "_Link Type:"
-msgstr ""
-
-#: ../gramps/gui/glade/editlink.glade.h:7 ../gramps/gui/viewmanager.py:434
+#: ../gramps/gui/glade/editlink.glade.h:6 ../gramps/gui/viewmanager.py:433
 msgid "New"
 msgstr ""
 
-#: ../gramps/gui/glade/editlocation.glade.h:2
-msgid "The town or city where the place is."
+#: ../gramps/gui/glade/editlink.glade.h:8
+msgid "_Link Type:"
+msgstr ""
+
+#: ../gramps/gui/glade/editlocation.glade.h:1
+msgid "A district within, or a settlement near to, a town or city."
 msgstr ""
 
 #: ../gramps/gui/glade/editlocation.glade.h:3
-#: ../gramps/gui/glade/editplace.glade.h:16
-msgid "S_treet:"
-msgstr ""
-
-#: ../gramps/gui/glade/editlocation.glade.h:4
-#: ../gramps/gui/glade/editplace.glade.h:22
+#: ../gramps/gui/glade/editplace.glade.h:6
 msgid "Ch_urch parish:"
 msgstr ""
 
-#: ../gramps/gui/glade/editlocation.glade.h:5
-#: ../gramps/gui/glade/editplace.glade.h:21
+#: ../gramps/gui/glade/editlocation.glade.h:4
+#: ../gramps/gui/glade/editplace.glade.h:7
+msgid "Co_unty:"
+msgstr ""
+
+#: ../gramps/gui/glade/editlocation.glade.h:6
+#: ../gramps/gui/glade/editplace.glade.h:17
 msgid ""
 "Lowest clergical division of this place. Typically used for church sources "
 "that only mention the parish."
 msgstr ""
 
-#: ../gramps/gui/glade/editlocation.glade.h:6
-#: ../gramps/gui/glade/editplace.glade.h:23
-msgid "Co_unty:"
-msgstr ""
-
 #: ../gramps/gui/glade/editlocation.glade.h:7
-#: ../gramps/gui/glade/editplace.glade.h:24
-msgid "Third level of place division. Eg., in the USA a county."
-msgstr ""
-
-#: ../gramps/gui/glade/editlocation.glade.h:8
-#: ../gramps/gui/glade/editplace.glade.h:25
-msgid "_State:"
+msgid "Lowest level of a place division: eg the street name."
 msgstr ""
 
 #: ../gramps/gui/glade/editlocation.glade.h:9
-#: ../gramps/gui/glade/editplace.glade.h:26
+#: ../gramps/gui/glade/editplace.glade.h:23
+msgid "S_treet:"
+msgstr ""
+
+#: ../gramps/gui/glade/editlocation.glade.h:10
+#: ../gramps/gui/glade/editplace.glade.h:24
 msgid ""
 "Second level of place division, eg., in the USA a state, in Germany a "
 "Bundesland."
@@ -10664,24 +10661,48 @@ msgstr ""
 msgid "The country where the place is."
 msgstr ""
 
-#: ../gramps/gui/glade/editlocation.glade.h:14
-msgid "Lowest level of a place division: eg the street name."
+#: ../gramps/gui/glade/editlocation.glade.h:12
+msgid "The town or city where the place is."
 msgstr ""
 
-#: ../gramps/gui/glade/editlocation.glade.h:16
-msgid "A district within, or a settlement near to, a town or city."
+#: ../gramps/gui/glade/editlocation.glade.h:13
+#: ../gramps/gui/glade/editplace.glade.h:29
+msgid "Third level of place division. Eg., in the USA a county."
 msgstr ""
 
-#: ../gramps/gui/glade/editmedia.glade.h:4
-#: ../gramps/gui/glade/editmediaref.glade.h:16
-msgid "_Path:"
+#: ../gramps/gui/glade/editlocation.glade.h:15
+#: ../gramps/gui/glade/editplace.glade.h:34
+msgid "_State:"
+msgstr ""
+
+#: ../gramps/gui/glade/editmedia.glade.h:2
+msgid ""
+"A date associated with the media, eg., for a picture the date it is taken."
+msgstr ""
+
+#: ../gramps/gui/glade/editmedia.glade.h:3
+msgid "A unique ID to identify the Media object."
 msgstr ""
 
 #: ../gramps/gui/glade/editmedia.glade.h:5
-msgid "Image preview"
+#: ../gramps/gui/glade/editmediaref.glade.h:7
+msgid "Descriptive title for this media object."
+msgstr ""
+
+#: ../gramps/gui/glade/editmedia.glade.h:6
+#: ../gramps/gui/glade/editmediaref.glade.h:9
+msgid "Folder"
 msgstr ""
 
 #: ../gramps/gui/glade/editmedia.glade.h:7
+msgid "Image preview"
+msgstr ""
+
+#: ../gramps/gui/glade/editmedia.glade.h:9
+msgid "Open File Browser to select a media file on your computer."
+msgstr ""
+
+#: ../gramps/gui/glade/editmedia.glade.h:11
 msgid ""
 "Path of the media object on your computer.\n"
 "Gramps does not store the media internally, it only stores the path! Set the "
@@ -10690,38 +10711,30 @@ msgid ""
 "managing paths of a collection of media objects. "
 msgstr ""
 
-#: ../gramps/gui/glade/editmedia.glade.h:9
-#: ../gramps/gui/glade/editmediaref.glade.h:19
-msgid "Descriptive title for this media object."
-msgstr ""
-
-#: ../gramps/gui/glade/editmedia.glade.h:12
-msgid "Open File Browser to select a media file on your computer."
-msgstr ""
-
-#: ../gramps/gui/glade/editmedia.glade.h:14
-#: ../gramps/gui/glade/editmediaref.glade.h:29
-msgid "Folder"
-msgstr ""
-
-#: ../gramps/gui/glade/editmedia.glade.h:15
-msgid "A unique ID to identify the Media object."
-msgstr ""
-
 #: ../gramps/gui/glade/editmedia.glade.h:18
+#: ../gramps/gui/glade/editmediaref.glade.h:31
+msgid "_Path:"
+msgstr ""
+
+#: ../gramps/gui/glade/editmediaref.glade.h:2
 msgid ""
-"A date associated with the media, eg., for a picture the date it is taken."
-msgstr ""
-
-#: ../gramps/gui/glade/editmediaref.glade.h:1
-msgid "_Corner 2:  X"
-msgstr ""
-
-#: ../gramps/gui/glade/editmediaref.glade.h:3
-msgid "<b>Referenced Region</b>"
+"<b>Note:</b> Any changes in the shared media object information will be "
+"reflected in the media object itself."
 msgstr ""
 
 #: ../gramps/gui/glade/editmediaref.glade.h:4
+msgid "<b>Referenced Region</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/editmediaref.glade.h:5
+msgid "<b>Shared Information</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/editmediaref.glade.h:8
+msgid "Double click image to view in an external viewer"
+msgstr ""
+
+#: ../gramps/gui/glade/editmediaref.glade.h:11
 msgid ""
 "If media is an image, select the specific part of the image you want to "
 "reference.\n"
@@ -10731,19 +10744,7 @@ msgid ""
 "bottom right corner."
 msgstr ""
 
-#: ../gramps/gui/glade/editmediaref.glade.h:6
-msgid ""
-"Referenced region of the image media object.\n"
-"Select a region with clicking and holding the mouse button on the top left "
-"corner of the region you want, dragging the mouse to the bottom right corner "
-"of the region, and then releasing the mouse button."
-msgstr ""
-
-#: ../gramps/gui/glade/editmediaref.glade.h:9
-msgid "_Corner 1:  X"
-msgstr ""
-
-#: ../gramps/gui/glade/editmediaref.glade.h:10
+#: ../gramps/gui/glade/editmediaref.glade.h:13
 msgid ""
 "If media is an image, select the specific part of the image you want to "
 "reference.\n"
@@ -10755,127 +10756,104 @@ msgstr ""
 
 #: ../gramps/gui/glade/editmediaref.glade.h:20
 msgid ""
-"<b>Note:</b> Any changes in the shared media object information will be "
-"reflected in the media object itself."
+"Referenced region of the image media object.\n"
+"Select a region with clicking and holding the mouse button on the top left "
+"corner of the region you want, dragging the mouse to the bottom right corner "
+"of the region, and then releasing the mouse button."
 msgstr ""
 
-#: ../gramps/gui/glade/editmediaref.glade.h:21
-msgid "Double click image to view in an external viewer"
+#: ../gramps/gui/glade/editmediaref.glade.h:22
+msgid "Select a file"
 msgstr ""
 
-#: ../gramps/gui/glade/editmediaref.glade.h:23
+#: ../gramps/gui/glade/editmediaref.glade.h:24
 msgid "Type of media object as indicated by the computer, eg Image, Video, ..."
 msgstr ""
 
 #: ../gramps/gui/glade/editmediaref.glade.h:27
-msgid "Select a file"
+msgid "_Corner 1:  X"
 msgstr ""
 
-#: ../gramps/gui/glade/editmediaref.glade.h:33
-msgid "<b>Shared Information</b>"
+#: ../gramps/gui/glade/editmediaref.glade.h:28
+msgid "_Corner 2:  X"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:1
+msgid "<i>Family Names     </i>"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:2
+msgid "<i>Given Name(s)    </i>"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:3
+msgid ""
+"A Date associated with this name. Eg. for a Married Name, date the name is "
+"first used or marriage date."
 msgstr ""
 
 #: ../gramps/gui/glade/editname.glade.h:4
-#: ../gramps/gui/glade/editperson.glade.h:16
+#: ../gramps/gui/glade/editperson.glade.h:4
+msgid ""
+"A descriptive name given in place of or in addition to the official given "
+"name."
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:5
+msgid ""
+"A non official name given to a family to distinguish them of people with the "
+"same family name. Often referred to as eg. Farm name."
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:6
+#: ../gramps/gui/glade/editperson.glade.h:5
+msgid "A title used to refer to the person, such as 'Dr.' or 'Rev.'"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:9
+#: ../gramps/gui/glade/editperson.glade.h:10
 msgid ""
 "An identification of what type of Name this is, eg. Birth Name, Married Name."
 msgstr ""
 
-#: ../gramps/gui/glade/editname.glade.h:7
-#: ../gramps/gui/glade/editperson.glade.h:3
-msgid "_Given:"
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:8
-#: ../gramps/gui/glade/editperson.glade.h:7
-msgid "T_itle:"
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:9
-msgid "Suffi_x:"
-msgstr ""
-
 #: ../gramps/gui/glade/editname.glade.h:10
-msgid "C_all Name:"
+#: ../gramps/gui/glade/editperson.glade.h:12
+msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
 msgstr ""
 
 #: ../gramps/gui/glade/editname.glade.h:11
-#: ../gramps/gui/glade/editperson.glade.h:4
-msgid "The person's given names"
+msgid "C_all Name:"
 msgstr ""
 
 #: ../gramps/gui/glade/editname.glade.h:12
-msgid "_Nick Name:"
+msgid "Dat_e:"
 msgstr ""
 
-#: ../gramps/gui/glade/editname.glade.h:13
-#: ../gramps/gui/glade/editperson.glade.h:6
+#: ../gramps/gui/glade/editname.glade.h:14
+msgid "G_roup as:"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:17
+msgid "O_verride"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:18
+#: ../gramps/gui/glade/editperson.glade.h:21
 msgid ""
 "Part of the Given name that is the normally used name. If background is red, "
 "call name is not part of Given name and will not be printed underlined in "
 "some reports."
 msgstr ""
 
-#: ../gramps/gui/glade/editname.glade.h:14
-#: ../gramps/gui/glade/editperson.glade.h:8
-msgid "A title used to refer to the person, such as 'Dr.' or 'Rev.'"
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:15
-#: ../gramps/gui/glade/editperson.glade.h:9
-msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:16
-#: ../gramps/gui/glade/editperson.glade.h:12
-msgid ""
-"A descriptive name given in place of or in addition to the official given "
-"name."
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:17
-msgid "<i>Given Name(s)    </i>"
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:18
-msgid "_Family Nick Name:"
-msgstr ""
-
 #: ../gramps/gui/glade/editname.glade.h:19
 msgid ""
-"A non official name given to a family to distinguish them of people with the "
-"same family name. Often referred to as eg. Farm name."
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:20
-msgid "<i>Family Names     </i>"
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:21
-msgid "G_roup as:"
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:22
-msgid "_Sort as:"
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:23
-msgid "_Display as:"
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:24
-msgid ""
 "People are displayed according to the name format given in the Preferences "
 "(the default).\n"
 "Here you can make sure this person is displayed according to a custom name "
 "format (extra formats can be set in the Preferences)."
 msgstr ""
 
-#: ../gramps/gui/glade/editname.glade.h:26
-msgid "Dat_e:"
-msgstr ""
-
-#: ../gramps/gui/glade/editname.glade.h:27
+#: ../gramps/gui/glade/editname.glade.h:21
 msgid ""
 "People are sorted according to the name format given in the Preferences (the "
 "default).\n"
@@ -10883,7 +10861,16 @@ msgid ""
 "format (extra formats can be set in the Preferences)."
 msgstr ""
 
-#: ../gramps/gui/glade/editname.glade.h:31
+#: ../gramps/gui/glade/editname.glade.h:25
+msgid "Suffi_x:"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:26
+#: ../gramps/gui/glade/editperson.glade.h:27
+msgid "T_itle:"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:27
 msgid ""
 "The Person Tree view groups people under the primary surname. You can "
 "override this by setting here a group value. \n"
@@ -10891,33 +10878,49 @@ msgid ""
 "this specific primary surname."
 msgstr ""
 
+#: ../gramps/gui/glade/editname.glade.h:29
+#: ../gramps/gui/glade/editperson.glade.h:30
+msgid "The person's given names"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:30
+msgid "_Display as:"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:31
+msgid "_Family Nick Name:"
+msgstr ""
+
+#: ../gramps/gui/glade/editname.glade.h:32
+#: ../gramps/gui/glade/editperson.glade.h:33
+msgid "_Given:"
+msgstr ""
+
 #: ../gramps/gui/glade/editname.glade.h:33
-msgid "O_verride"
+msgid "_Nick Name:"
 msgstr ""
 
 #: ../gramps/gui/glade/editname.glade.h:34
-msgid ""
-"A Date associated with this name. Eg. for a Married Name, date the name is "
-"first used or marriage date."
+msgid "_Sort as:"
 msgstr ""
 
 #: ../gramps/gui/glade/editnote.glade.h:1
-msgid "Styled Text Editor"
+msgid "<b>Note</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/editnote.glade.h:3
+#: ../gramps/gui/glade/editnote.glade.h:2
 msgid "A type to classify the note."
 msgstr ""
 
-#: ../gramps/gui/glade/editnote.glade.h:5
+#: ../gramps/gui/glade/editnote.glade.h:3
 msgid "A unique ID to identify the note."
 msgstr ""
 
 #: ../gramps/gui/glade/editnote.glade.h:6
-msgid "_Preformatted"
+msgid "Styled Text Editor"
 msgstr ""
 
-#: ../gramps/gui/glade/editnote.glade.h:7
+#: ../gramps/gui/glade/editnote.glade.h:8
 msgid ""
 "When active the whitespace in your note will be respected in reports. Use "
 "this to add formatting layout with spaces, eg a table. \n"
@@ -10926,27 +10929,64 @@ msgid ""
 "Use monospace font to keep preformatting."
 msgstr ""
 
-#: ../gramps/gui/glade/editnote.glade.h:14
-msgid "<b>Note</b>"
+#: ../gramps/gui/glade/editnote.glade.h:12
+msgid "_Preformatted"
 msgstr ""
 
-#: ../gramps/gui/glade/editperson.glade.h:5
-msgid "C_all:"
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:11
-msgid "_Nick:"
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:14
+#: ../gramps/gui/glade/editperson.glade.h:2
 msgid "<b>Image</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/editperson.glade.h:17
+#: ../gramps/gui/glade/editperson.glade.h:3
+msgid "<b>Preferred Name </b>"
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:6
+msgid "A unique ID for the person."
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:11
+msgid ""
+"An optional prefix for the family that is not used in sorting, such as \"de"
+"\" or \"van\"."
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:13
+msgid "C_all:"
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:14
 msgid "Click on a table cell to edit."
 msgstr ""
 
-#: ../gramps/gui/glade/editperson.glade.h:18
+#: ../gramps/gui/glade/editperson.glade.h:16
+msgid "G_ender:"
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:17
+msgid "Go to Name Editor to add more information about this name"
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:19
+msgid "O_rigin:"
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:20
+msgid ""
+"Part of a person's name indicating the family to which the person belongs"
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:25
+msgid "Set person as private data"
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:29
+msgid ""
+"The origin of this family name for this family, eg 'Inherited' or "
+"'Patronymic'."
+msgstr ""
+
+#: ../gramps/gui/glade/editperson.glade.h:31
 msgid ""
 "Use Multiple Surnames\n"
 "Indicate that the surname consists of different parts. Every surname has its "
@@ -10955,60 +10995,15 @@ msgid ""
 "the connector y, and Cajal, which is inherited from the mother."
 msgstr ""
 
-#: ../gramps/gui/glade/editperson.glade.h:22
-msgid "Set person as private data"
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:25
-msgid "<b>Preferred Name </b>"
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:26
-msgid "_Surname:"
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:27
-msgid ""
-"An optional prefix for the family that is not used in sorting, such as \"de"
-"\" or \"van\"."
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:29
-msgid ""
-"Part of a person's name indicating the family to which the person belongs"
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:30
-msgid "Go to Name Editor to add more information about this name"
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:32
-msgid "O_rigin:"
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:33
-msgid ""
-"The origin of this family name for this family, eg 'Inherited' or "
-"'Patronymic'."
-msgstr ""
-
-#: ../gramps/gui/glade/editperson.glade.h:34
-msgid "G_ender:"
+#: ../gramps/gui/glade/editperson.glade.h:35
+msgid "_Nick:"
 msgstr ""
 
 #: ../gramps/gui/glade/editperson.glade.h:36
-msgid "A unique ID for the person."
+msgid "_Surname:"
 msgstr ""
 
 #: ../gramps/gui/glade/editpersonref.glade.h:2
-msgid "_Person:"
-msgstr ""
-
-#: ../gramps/gui/glade/editpersonref.glade.h:3
-msgid "_Association:"
-msgstr ""
-
-#: ../gramps/gui/glade/editpersonref.glade.h:4
 msgid ""
 "Description of the association, eg. Godfather, Friend, ...\n"
 "\n"
@@ -11017,37 +11012,51 @@ msgid ""
 "in the event."
 msgstr ""
 
-#: ../gramps/gui/glade/editpersonref.glade.h:9
+#: ../gramps/gui/glade/editpersonref.glade.h:8
+msgid "Select a person that has an association to the edited person."
+msgstr ""
+
+#: ../gramps/gui/glade/editpersonref.glade.h:10
 msgid ""
 "Use the select button to choose a person that has an association to the "
 "edited person."
 msgstr ""
 
-#: ../gramps/gui/glade/editpersonref.glade.h:10
-msgid "Select a person that has an association to the edited person."
+#: ../gramps/gui/glade/editpersonref.glade.h:11
+msgid "_Association:"
+msgstr ""
+
+#: ../gramps/gui/glade/editpersonref.glade.h:12
+msgid "_Person:"
 msgstr ""
 
 #: ../gramps/gui/glade/editplace.glade.h:1
-msgid "_Place Name:"
+msgid "<b>Location</b>"
 msgstr ""
 
 #: ../gramps/gui/glade/editplace.glade.h:2
-msgid "L_atitude:"
-msgstr ""
-
-#: ../gramps/gui/glade/editplace.glade.h:3
-msgid "_Longitude:"
+msgid ""
+"A district within, or a settlement near to, a town or city.\n"
+"Use Alternate Locations tab to store the current name."
 msgstr ""
 
 #: ../gramps/gui/glade/editplace.glade.h:4
-msgid "Full name of this place."
-msgstr ""
-
-#: ../gramps/gui/glade/editplace.glade.h:6
 msgid "A unique ID to identify the place"
 msgstr ""
 
+#: ../gramps/gui/glade/editplace.glade.h:8
+msgid "Count_ry:"
+msgstr ""
+
 #: ../gramps/gui/glade/editplace.glade.h:9
+msgid "Full name of this place."
+msgstr ""
+
+#: ../gramps/gui/glade/editplace.glade.h:10
+msgid "L_atitude:"
+msgstr ""
+
+#: ../gramps/gui/glade/editplace.glade.h:11
 msgid ""
 "Latitude (position above the Equator) of the place in decimal or degree "
 "notation. \n"
@@ -11056,7 +11065,7 @@ msgid ""
 "via a map service in the place view."
 msgstr ""
 
-#: ../gramps/gui/glade/editplace.glade.h:12
+#: ../gramps/gui/glade/editplace.glade.h:14
 msgid ""
 "Longitude (position relative to the Prime, or Greenwich, Meridian) of the "
 "place in decimal or degree notation. \n"
@@ -11066,91 +11075,91 @@ msgid ""
 "via a map service in the place view."
 msgstr ""
 
-#: ../gramps/gui/glade/editplace.glade.h:17
+#: ../gramps/gui/glade/editplace.glade.h:18
 msgid ""
 "Lowest level of a place division: eg the street name. \n"
 "Use Alternate Locations tab to store the current name."
 msgstr ""
 
-#: ../gramps/gui/glade/editplace.glade.h:19
+#: ../gramps/gui/glade/editplace.glade.h:25
+msgid "The country where the place is. \n"
+msgstr ""
+
+#: ../gramps/gui/glade/editplace.glade.h:27
 msgid ""
 "The town or city where the place is. \n"
 "Use Alternate Locations tab to store the current name."
 msgstr ""
 
-#: ../gramps/gui/glade/editplace.glade.h:27
-msgid "Count_ry:"
-msgstr ""
-
-#: ../gramps/gui/glade/editplace.glade.h:28
-msgid "The country where the place is. \n"
+#: ../gramps/gui/glade/editplace.glade.h:32
+msgid "_Longitude:"
 msgstr ""
 
 #: ../gramps/gui/glade/editplace.glade.h:33
-msgid ""
-"A district within, or a settlement near to, a town or city.\n"
-"Use Alternate Locations tab to store the current name."
+msgid "_Place Name:"
 msgstr ""
 
-#: ../gramps/gui/glade/editplace.glade.h:35
-msgid "<b>Location</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/editreporef.glade.h:4
-msgid "_Media Type:"
-msgstr ""
-
-#: ../gramps/gui/glade/editreporef.glade.h:5
-msgid "Call n_umber:"
-msgstr ""
-
-#: ../gramps/gui/glade/editreporef.glade.h:6
-msgid "On what type of media this source is available in the repository."
-msgstr ""
-
-#: ../gramps/gui/glade/editreporef.glade.h:10
-msgid "Id number of the source in the repository."
-msgstr ""
-
-#: ../gramps/gui/glade/editreporef.glade.h:12
-#: ../gramps/gui/glade/editrepository.glade.h:3
-#: ../gramps/gui/glade/rule.glade.h:21
-#: ../gramps/plugins/tool/ownereditor.glade.h:1
-msgid "_Name:"
-msgstr ""
-
-#: ../gramps/gui/glade/editreporef.glade.h:14
-#: ../gramps/gui/glade/editrepository.glade.h:5
-msgid "Name of the repository (where sources are stored)."
-msgstr ""
-
-#: ../gramps/gui/glade/editreporef.glade.h:15
+#: ../gramps/gui/glade/editreporef.glade.h:2
 msgid ""
 "<b>Note:</b> Any changes in the shared repository information will be "
 "reflected in the repository itself, for all items that reference the "
 "repository."
 msgstr ""
 
-#: ../gramps/gui/glade/editreporef.glade.h:17
-#: ../gramps/gui/glade/editrepository.glade.h:8
+#: ../gramps/gui/glade/editreporef.glade.h:5
+#: ../gramps/gui/glade/editrepository.glade.h:1
 msgid "A unique ID to identify the repository."
 msgstr ""
 
-#: ../gramps/gui/glade/editreporef.glade.h:18
-#: ../gramps/gui/glade/editrepository.glade.h:6
+#: ../gramps/gui/glade/editreporef.glade.h:8
+msgid "Call n_umber:"
+msgstr ""
+
+#: ../gramps/gui/glade/editreporef.glade.h:9
+msgid "Id number of the source in the repository."
+msgstr ""
+
+#: ../gramps/gui/glade/editreporef.glade.h:11
+#: ../gramps/gui/glade/editrepository.glade.h:5
+msgid "Name of the repository (where sources are stored)."
+msgstr ""
+
+#: ../gramps/gui/glade/editreporef.glade.h:12
+msgid "On what type of media this source is available in the repository."
+msgstr ""
+
+#: ../gramps/gui/glade/editreporef.glade.h:15
+#: ../gramps/gui/glade/editrepository.glade.h:8
 msgid "Type of repository, eg., 'Library', 'Album', ..."
 msgstr ""
 
-#: ../gramps/gui/glade/editsource.glade.h:7
+#: ../gramps/gui/glade/editreporef.glade.h:17
+msgid "_Media Type:"
+msgstr ""
+
+#: ../gramps/gui/glade/editreporef.glade.h:18
+#: ../gramps/gui/glade/editrepository.glade.h:10
+#: ../gramps/gui/glade/rule.glade.h:27
+#: ../gramps/plugins/tool/ownereditor.glade.h:5
+msgid "_Name:"
+msgstr ""
+
+#: ../gramps/gui/glade/editsource.glade.h:14
 msgid "_Pub. info.:"
 msgstr ""
 
-#: ../gramps/gui/glade/editurl.glade.h:2
-msgid "_Web address:"
+#: ../gramps/gui/glade/editurl.glade.h:1
+msgid "A descriptive caption of the Internet location you are storing."
 msgstr ""
 
 #: ../gramps/gui/glade/editurl.glade.h:3
-msgid "_Description:"
+msgid "Open the web address in the default browser."
+msgstr ""
+
+#: ../gramps/gui/glade/editurl.glade.h:6
+msgid ""
+"The internet address as needed to navigate to it, eg. http://gramps-project."
+"org"
 msgstr ""
 
 #: ../gramps/gui/glade/editurl.glade.h:7
@@ -11158,334 +11167,326 @@ msgid "Type of internet address, eg. E-mail, Web Page, ..."
 msgstr ""
 
 #: ../gramps/gui/glade/editurl.glade.h:8
-msgid ""
-"The internet address as needed to navigate to it, eg. http://gramps-project."
-"org"
-msgstr ""
-
-#: ../gramps/gui/glade/editurl.glade.h:9
-msgid "Open the web address in the default browser."
+msgid "_Description:"
 msgstr ""
 
 #: ../gramps/gui/glade/editurl.glade.h:10
-msgid "A descriptive caption of the Internet location you are storing."
+msgid "_Web address:"
 msgstr ""
 
 #: ../gramps/gui/glade/grampletpane.glade.h:1
-msgid "Drag to move; click to detach"
-msgstr ""
-
-#: ../gramps/gui/glade/grampletpane.glade.h:2
-msgid "Detach"
-msgstr ""
-
-#: ../gramps/gui/glade/grampletpane.glade.h:3
-msgid "Config"
-msgstr ""
-
-#: ../gramps/gui/glade/grampletpane.glade.h:4
-msgid "Click to expand/collapse"
-msgstr ""
-
-#: ../gramps/gui/glade/grampletpane.glade.h:6
 msgid "Click to delete gramplet from view"
 msgstr ""
 
-#: ../gramps/gui/glade/grampletpane.glade.h:7
-msgid "Delete"
+#: ../gramps/gui/glade/grampletpane.glade.h:2
+msgid "Click to expand/collapse"
 msgstr ""
 
-#: ../gramps/gui/glade/grampletpane.glade.h:8
+#: ../gramps/gui/glade/grampletpane.glade.h:3
 msgid "Close"
 msgstr ""
 
+#: ../gramps/gui/glade/grampletpane.glade.h:4
+msgid "Config"
+msgstr ""
+
+#: ../gramps/gui/glade/grampletpane.glade.h:5
+msgid "Delete"
+msgstr ""
+
+#: ../gramps/gui/glade/grampletpane.glade.h:6
+msgid "Detach"
+msgstr ""
+
+#: ../gramps/gui/glade/grampletpane.glade.h:7
+msgid "Drag to move; click to detach"
+msgstr ""
+
 #: ../gramps/gui/glade/mergecitation.glade.h:1
+#: ../gramps/gui/glade/mergedata.glade.h:1
+#: ../gramps/gui/glade/mergesource.glade.h:1
+msgid "<b>Source 1</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergecitation.glade.h:2
+#: ../gramps/gui/glade/mergedata.glade.h:2
+#: ../gramps/gui/glade/mergesource.glade.h:2
+msgid "<b>Source 2</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergecitation.glade.h:5
+#: ../gramps/gui/glade/mergeevent.glade.h:6
+#: ../gramps/gui/glade/mergefamily.glade.h:3
+#: ../gramps/gui/glade/mergemedia.glade.h:5
+#: ../gramps/gui/glade/mergenote.glade.h:3
+#: ../gramps/gui/glade/mergeperson.glade.h:4
+#: ../gramps/gui/glade/mergeplace.glade.h:4
+#: ../gramps/gui/glade/mergerepository.glade.h:4
+#: ../gramps/gui/glade/mergesource.glade.h:5
+msgid "Detailed Selection"
+msgstr ""
+
+#: ../gramps/gui/glade/mergecitation.glade.h:6
+#: ../gramps/gui/glade/mergedata.glade.h:6
+#: ../gramps/gui/glade/mergeevent.glade.h:7
+#: ../gramps/gui/glade/mergefamily.glade.h:6
+#: ../gramps/gui/glade/mergemedia.glade.h:6
+#: ../gramps/gui/glade/mergenote.glade.h:5
+#: ../gramps/gui/glade/mergeperson.glade.h:7
+#: ../gramps/gui/glade/mergeplace.glade.h:5
+#: ../gramps/gui/glade/mergerepository.glade.h:5
+#: ../gramps/gui/glade/mergesource.glade.h:6
+msgid "Gramps ID:"
+msgstr ""
+
+#: ../gramps/gui/glade/mergecitation.glade.h:7
+msgid "Notes, media objects and data-items of both citations will be combined."
+msgstr ""
+
+#: ../gramps/gui/glade/mergecitation.glade.h:8
 msgid ""
 "Select the citation that will provide the\n"
 "primary data for the merged citation."
 msgstr ""
 
-#: ../gramps/gui/glade/mergecitation.glade.h:3
-#: ../gramps/gui/glade/mergedata.glade.h:9
-#: ../gramps/gui/glade/mergesource.glade.h:3
-msgid "<b>Source 1</b>"
+#: ../gramps/gui/glade/mergedata.glade.h:3
+msgid "<b>Title selection</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/mergecitation.glade.h:4
-#: ../gramps/gui/glade/mergedata.glade.h:10
-#: ../gramps/gui/glade/mergesource.glade.h:4
-msgid "<b>Source 2</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergecitation.glade.h:8
-#: ../gramps/gui/glade/mergedata.glade.h:15
-#: ../gramps/gui/glade/mergeevent.glade.h:9
-#: ../gramps/gui/glade/mergefamily.glade.h:8
-#: ../gramps/gui/glade/mergemedia.glade.h:8
-#: ../gramps/gui/glade/mergenote.glade.h:8
-#: ../gramps/gui/glade/mergeperson.glade.h:7
-#: ../gramps/gui/glade/mergeplace.glade.h:9
-#: ../gramps/gui/glade/mergerepository.glade.h:7
-#: ../gramps/gui/glade/mergesource.glade.h:9
-msgid "Gramps ID:"
-msgstr ""
-
-#: ../gramps/gui/glade/mergecitation.glade.h:9
-msgid "Notes, media objects and data-items of both citations will be combined."
-msgstr ""
-
-#: ../gramps/gui/glade/mergecitation.glade.h:10
-#: ../gramps/gui/glade/mergeevent.glade.h:11
-#: ../gramps/gui/glade/mergefamily.glade.h:10
-#: ../gramps/gui/glade/mergemedia.glade.h:10
-#: ../gramps/gui/glade/mergenote.glade.h:9
-#: ../gramps/gui/glade/mergeperson.glade.h:9
-#: ../gramps/gui/glade/mergeplace.glade.h:11
-#: ../gramps/gui/glade/mergerepository.glade.h:9
-#: ../gramps/gui/glade/mergesource.glade.h:11
-msgid "Detailed Selection"
-msgstr ""
-
-#: ../gramps/gui/glade/mergedata.glade.h:1
+#: ../gramps/gui/glade/mergedata.glade.h:7
 msgid "Merge and _edit"
 msgstr ""
 
-#: ../gramps/gui/glade/mergedata.glade.h:2
-msgid "_Merge and close"
+#: ../gramps/gui/glade/mergedata.glade.h:8
+msgid "Other"
+msgstr ""
+
+#: ../gramps/gui/glade/mergedata.glade.h:9
+msgid "Place 1"
+msgstr ""
+
+#: ../gramps/gui/glade/mergedata.glade.h:10
+msgid "Place 2"
 msgstr ""
 
 #. name, click?, width, toggle
-#: ../gramps/gui/glade/mergedata.glade.h:3 ../gramps/gui/grampsgui.py:189
-#: ../gramps/gui/viewmanager.py:484 ../gramps/plugins/tool/changenames.py:195
+#: ../gramps/gui/glade/mergedata.glade.h:12 ../gramps/gui/grampsgui.py:189
+#: ../gramps/gui/viewmanager.py:483 ../gramps/plugins/tool/changenames.py:195
 #: ../gramps/plugins/tool/extractcity.py:542
 #: ../gramps/plugins/tool/patchnames.py:393
 msgid "Select"
 msgstr ""
 
-#: ../gramps/gui/glade/mergedata.glade.h:4
+#: ../gramps/gui/glade/mergedata.glade.h:13
 msgid ""
 "Select the person that will provide the primary data for the merged person."
 msgstr ""
 
-#: ../gramps/gui/glade/mergedata.glade.h:5
-msgid "Other"
-msgstr ""
-
-#: ../gramps/gui/glade/mergedata.glade.h:6
-msgid "<b>Title selection</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergedata.glade.h:7
-msgid "Place 1"
-msgstr ""
-
-#: ../gramps/gui/glade/mergedata.glade.h:8
-msgid "Place 2"
+#: ../gramps/gui/glade/mergedata.glade.h:15
+msgid "_Merge and close"
 msgstr ""
 
 #: ../gramps/gui/glade/mergeevent.glade.h:1
+msgid "<b>Event 1</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergeevent.glade.h:2
+msgid "<b>Event 2</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergeevent.glade.h:3
+msgid ""
+"Attributes, notes, sources and media objects of both events will be combined."
+msgstr ""
+
+#: ../gramps/gui/glade/mergeevent.glade.h:9
 msgid ""
 "Select the event that will provide the\n"
 "primary data for the merged event."
 msgstr ""
 
-#: ../gramps/gui/glade/mergeevent.glade.h:3
-msgid "<b>Event 1</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergeevent.glade.h:4
-msgid "<b>Event 2</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergeevent.glade.h:10
-msgid ""
-"Attributes, notes, sources and media objects of both events will be combined."
-msgstr ""
-
 #: ../gramps/gui/glade/mergefamily.glade.h:1
-msgid ""
-"Select the family that will provide the\n"
-"primary data for the merged family."
-msgstr ""
-
-#: ../gramps/gui/glade/mergefamily.glade.h:3
 msgid "<b>Family 1</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/mergefamily.glade.h:4
+#: ../gramps/gui/glade/mergefamily.glade.h:2
 msgid "<b>Family 2</b>"
 msgstr ""
 
+#: ../gramps/gui/glade/mergefamily.glade.h:4
+msgid ""
+"Events, lds_ord, media objects, attributes, notes, sources and tags of both "
+"families will be combined."
+msgstr ""
+
 #: ../gramps/gui/glade/mergefamily.glade.h:5
 msgid "Father:"
 msgstr ""
 
-#: ../gramps/gui/glade/mergefamily.glade.h:6
+#: ../gramps/gui/glade/mergefamily.glade.h:7
 msgid "Mother:"
 msgstr ""
 
 #. FIXME this should be lower-case:
-#: ../gramps/gui/glade/mergefamily.glade.h:7
-#: ../gramps/plugins/textreport/indivcomplete.py:264
+#: ../gramps/gui/glade/mergefamily.glade.h:8
+#: ../gramps/plugins/textreport/indivcomplete.py:266
 msgid "Relationship:"
 msgstr ""
 
 #: ../gramps/gui/glade/mergefamily.glade.h:9
 msgid ""
-"Events, lds_ord, media objects, attributes, notes, sources and tags of both "
-"families will be combined."
+"Select the family that will provide the\n"
+"primary data for the merged family."
 msgstr ""
 
 #: ../gramps/gui/glade/mergemedia.glade.h:1
+msgid "<b>Object 1</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergemedia.glade.h:2
+msgid "<b>Object 2</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergemedia.glade.h:3
+msgid "Attributes, sources, notes and tags of both objects will be combined."
+msgstr ""
+
+#: ../gramps/gui/glade/mergemedia.glade.h:8
 msgid ""
 "Select the object that will provide the\n"
 "primary data for the merged object."
 msgstr ""
 
-#: ../gramps/gui/glade/mergemedia.glade.h:3
-msgid "<b>Object 1</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergemedia.glade.h:4
-msgid "<b>Object 2</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergemedia.glade.h:9
-msgid "Attributes, sources, notes and tags of both objects will be combined."
-msgstr ""
-
 #: ../gramps/gui/glade/mergenote.glade.h:1
+msgid "<b>Note 1</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergenote.glade.h:2
+msgid "<b>Note 2</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergenote.glade.h:4 ../gramps/gui/views/listview.py:985
+msgid "Format:"
+msgstr ""
+
+#: ../gramps/gui/glade/mergenote.glade.h:6
 msgid ""
 "Select the note that will provide the\n"
 "primary data for the merged note."
 msgstr ""
 
-#: ../gramps/gui/glade/mergenote.glade.h:3
-msgid "<b>Note 1</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergenote.glade.h:4
-msgid "<b>Note 2</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergenote.glade.h:7 ../gramps/gui/views/listview.py:985
-msgid "Format:"
-msgstr ""
-
 #: ../gramps/gui/glade/mergeperson.glade.h:1
-msgid ""
-"Select the person that will provide the\n"
-"primary data for the merged person."
-msgstr ""
-
-#: ../gramps/gui/glade/mergeperson.glade.h:3
 msgid "<b>Person 1</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/mergeperson.glade.h:4
+#: ../gramps/gui/glade/mergeperson.glade.h:2
 msgid "<b>Person 2</b>"
 msgstr ""
 
+#: ../gramps/gui/glade/mergeperson.glade.h:3
+msgid "Context Information"
+msgstr ""
+
+#: ../gramps/gui/glade/mergeperson.glade.h:5
+msgid ""
+"Events, media objects, addresses, attributes, urls, notes, sources and tags "
+"of both persons will be combined."
+msgstr ""
+
 #: ../gramps/gui/glade/mergeperson.glade.h:6
 msgid "Gender:"
 msgstr ""
 
-#: ../gramps/gui/glade/mergeperson.glade.h:8
+#: ../gramps/gui/glade/mergeperson.glade.h:9
 msgid ""
-"Events, media objects, addresses, attributes, urls, notes, sources and tags "
-"of both persons will be combined."
-msgstr ""
-
-#: ../gramps/gui/glade/mergeperson.glade.h:10
-msgid "Context Information"
+"Select the person that will provide the\n"
+"primary data for the merged person."
 msgstr ""
 
 #: ../gramps/gui/glade/mergeplace.glade.h:1
-msgid ""
-"Select the place that will provide the\n"
-"primary data for the merged place."
-msgstr ""
-
-#: ../gramps/gui/glade/mergeplace.glade.h:3
 msgid "<b>Place 1</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/mergeplace.glade.h:4
+#: ../gramps/gui/glade/mergeplace.glade.h:2
 msgid "<b>Place 2</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/mergeplace.glade.h:8
-msgid "Location:"
-msgstr ""
-
-#: ../gramps/gui/glade/mergeplace.glade.h:10
+#: ../gramps/gui/glade/mergeplace.glade.h:3
 msgid ""
 "Alternate locations, sources, urls, media objects and notes of both places "
 "will be combined."
 msgstr ""
 
+#: ../gramps/gui/glade/mergeplace.glade.h:7
+msgid "Location:"
+msgstr ""
+
+#: ../gramps/gui/glade/mergeplace.glade.h:9
+msgid ""
+"Select the place that will provide the\n"
+"primary data for the merged place."
+msgstr ""
+
 #: ../gramps/gui/glade/mergerepository.glade.h:1
+msgid "<b>Repository 1</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergerepository.glade.h:2
+msgid "<b>Repository 2</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/mergerepository.glade.h:3
+msgid "Addresses, urls and notes of both repositories will be combined."
+msgstr ""
+
+#: ../gramps/gui/glade/mergerepository.glade.h:7
 msgid ""
 "Select the repository that will provide the\n"
 "primary data for the merged repository."
 msgstr ""
 
-#: ../gramps/gui/glade/mergerepository.glade.h:3
-msgid "<b>Repository 1</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergerepository.glade.h:4
-msgid "<b>Repository 2</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/mergerepository.glade.h:8
-msgid "Addresses, urls and notes of both repositories will be combined."
-msgstr ""
-
-#: ../gramps/gui/glade/mergesource.glade.h:1
-msgid ""
-"Select the source that will provide the\n"
-"primary data for the merged source."
-msgstr ""
-
-#: ../gramps/gui/glade/mergesource.glade.h:10
+#: ../gramps/gui/glade/mergesource.glade.h:7
 msgid ""
 "Notes, media objects, data-items and repository references of both sources "
 "will be combined."
 msgstr ""
 
+#: ../gramps/gui/glade/mergesource.glade.h:9
+msgid ""
+"Select the source that will provide the\n"
+"primary data for the merged source."
+msgstr ""
+
 #: ../gramps/gui/glade/papermenu.glade.h:1
-msgid "Paper Settings"
+msgid "Margins"
 msgstr ""
 
 #: ../gramps/gui/glade/papermenu.glade.h:2
-msgid "Paper format"
+msgid "Metric"
 msgstr ""
 
 #: ../gramps/gui/glade/papermenu.glade.h:3
-msgid "Size:"
-msgstr ""
-
-#: ../gramps/gui/glade/papermenu.glade.h:4
-msgid "_Width:"
-msgstr ""
-
-#: ../gramps/gui/glade/papermenu.glade.h:5
-msgid "_Height:"
-msgstr ""
-
-#: ../gramps/gui/glade/papermenu.glade.h:6
 msgid "Orientation:"
 msgstr ""
 
+#: ../gramps/gui/glade/papermenu.glade.h:4
+msgid "Paper Settings"
+msgstr ""
+
+#: ../gramps/gui/glade/papermenu.glade.h:5
+msgid "Paper format"
+msgstr ""
+
+#: ../gramps/gui/glade/papermenu.glade.h:6
+msgid "Size:"
+msgstr ""
+
 #: ../gramps/gui/glade/papermenu.glade.h:7
-#: ../gramps/gui/glade/styleeditor.glade.h:22
-#: ../gramps/gui/plug/report/_papermenu.py:207
-msgid "cm"
+msgid "_Bottom:"
 msgstr ""
 
 #: ../gramps/gui/glade/papermenu.glade.h:8
-msgid "Margins"
+msgid "_Height:"
 msgstr ""
 
 #: ../gramps/gui/glade/papermenu.glade.h:9
@@ -11501,229 +11502,222 @@ msgid "_Top:"
 msgstr ""
 
 #: ../gramps/gui/glade/papermenu.glade.h:12
-msgid "_Bottom:"
+msgid "_Width:"
 msgstr ""
 
 #: ../gramps/gui/glade/papermenu.glade.h:13
-msgid "Metric"
+#: ../gramps/gui/glade/styleeditor.glade.h:41
+#: ../gramps/gui/plug/report/_papermenu.py:207
+msgid "cm"
 msgstr ""
 
 #: ../gramps/gui/glade/plugins.glade.h:1
+msgid "Author's email:"
+msgstr ""
+
+#: ../gramps/gui/glade/plugins.glade.h:3
 msgid "Perform selected action"
 msgstr ""
 
-#: ../gramps/gui/glade/plugins.glade.h:2
+#: ../gramps/gui/glade/plugins.glade.h:4
 #: ../gramps/plugins/gramplet/ageondategramplet.py:76
 msgid "Run"
 msgstr ""
 
-#: ../gramps/gui/glade/plugins.glade.h:3 ../gramps/gui/plug/_dialogs.py:280
+#: ../gramps/gui/glade/plugins.glade.h:5 ../gramps/gui/plug/_dialogs.py:280
 msgid "Select a report from those available on the left."
 msgstr ""
 
-#: ../gramps/gui/glade/plugins.glade.h:4
+#: ../gramps/gui/glade/plugins.glade.h:6
 msgid "Status:"
 msgstr ""
 
-#: ../gramps/gui/glade/plugins.glade.h:6
-msgid "Author's email:"
-msgstr ""
-
 #: ../gramps/gui/glade/reorder.glade.h:1
-msgid "<b>Parent relationships</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/reorder.glade.h:2
-msgid "Move parent up"
-msgstr ""
-
-#: ../gramps/gui/glade/reorder.glade.h:3
-msgid "Arrow top"
-msgstr ""
-
-#: ../gramps/gui/glade/reorder.glade.h:4
-msgid "Move parent down"
-msgstr ""
-
-#: ../gramps/gui/glade/reorder.glade.h:5
-msgid "Arrow bottom"
-msgstr ""
-
-#: ../gramps/gui/glade/reorder.glade.h:6
 msgid "<b>Family relationships</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade.h:7
-msgid "Move family up"
+#: ../gramps/gui/glade/reorder.glade.h:2
+msgid "<b>Parent relationships</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade.h:8
+#: ../gramps/gui/glade/reorder.glade.h:3
+msgid "Arrow bottom"
+msgstr ""
+
+#: ../gramps/gui/glade/reorder.glade.h:4
+msgid "Arrow top"
+msgstr ""
+
+#: ../gramps/gui/glade/reorder.glade.h:5
 msgid "Move family down"
 msgstr ""
 
+#: ../gramps/gui/glade/reorder.glade.h:6
+msgid "Move family up"
+msgstr ""
+
+#: ../gramps/gui/glade/reorder.glade.h:7
+msgid "Move parent down"
+msgstr ""
+
+#: ../gramps/gui/glade/reorder.glade.h:8
+msgid "Move parent up"
+msgstr ""
+
 #: ../gramps/gui/glade/rule.glade.h:1
-msgid "Add a new filter"
+msgid "<b>Definition</b>"
 msgstr ""
 
 #: ../gramps/gui/glade/rule.glade.h:2
-msgid "Edit the selected filter"
+#: ../gramps/gui/glade/styleeditor.glade.h:5
+msgid "<b>Description</b>"
 msgstr ""
 
 #: ../gramps/gui/glade/rule.glade.h:3
-msgid "Clone the selected filter"
+#: ../gramps/gui/glade/styleeditor.glade.h:8
+#: ../gramps/plugins/tool/finddupes.glade.h:2
+#: ../gramps/plugins/tool/mergecitations.glade.h:2
+msgid "<b>Options</b>"
 msgstr ""
 
 #: ../gramps/gui/glade/rule.glade.h:4
-msgid "Test the selected filter"
+msgid "<b>Rule list</b>"
 msgstr ""
 
 #: ../gramps/gui/glade/rule.glade.h:5
-msgid "Delete the selected filter"
+msgid "<b>Selected Rule</b>"
 msgstr ""
 
 #: ../gramps/gui/glade/rule.glade.h:6
-msgid "<i>Note: changes take effect only after this window is closed</i>"
+msgid "<b>Values</b>"
 msgstr ""
 
 #: ../gramps/gui/glade/rule.glade.h:7
-msgid "All rules must apply"
-msgstr ""
-
-#: ../gramps/gui/glade/rule.glade.h:8
-msgid "At least one rule must apply"
+msgid "<i>Note: changes take effect only after this window is closed</i>"
 msgstr ""
 
 #: ../gramps/gui/glade/rule.glade.h:9
-msgid "Exactly one rule must apply"
+msgid "Add a new filter"
 msgstr ""
 
 #: ../gramps/gui/glade/rule.glade.h:10
 msgid "Add another rule to the filter"
 msgstr ""
 
+#: ../gramps/gui/glade/rule.glade.h:11
+msgid "All rules must apply"
+msgstr ""
+
 #: ../gramps/gui/glade/rule.glade.h:12
-msgid "Edit the selected rule"
+msgid "At least one rule must apply"
 msgstr ""
 
-#: ../gramps/gui/glade/rule.glade.h:15
-msgid "Delete the selected rule"
+#: ../gramps/gui/glade/rule.glade.h:13
+msgid "Clone the selected filter"
 msgstr ""
 
-#: ../gramps/gui/glade/rule.glade.h:17
-#: ../gramps/gui/glade/styleeditor.glade.h:10
-#: ../gramps/plugins/tool/finddupes.glade.h:2
-#: ../gramps/plugins/tool/mergecitations.glade.h:2
-msgid "<b>Options</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/rule.glade.h:18
-msgid "<b>Rule list</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/rule.glade.h:19
-msgid "<b>Definition</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/rule.glade.h:20
+#: ../gramps/gui/glade/rule.glade.h:14
 msgid "Co_mment:"
 msgstr ""
 
-#: ../gramps/gui/glade/rule.glade.h:22
-msgid "Return values that do no_t match the filter rules"
+#: ../gramps/gui/glade/rule.glade.h:15
+msgid "Delete the selected filter"
 msgstr ""
 
-#: ../gramps/gui/glade/rule.glade.h:23
-msgid "<b>Selected Rule</b>"
+#: ../gramps/gui/glade/rule.glade.h:16
+msgid "Delete the selected rule"
+msgstr ""
+
+#: ../gramps/gui/glade/rule.glade.h:18
+msgid "Edit the selected filter"
+msgstr ""
+
+#: ../gramps/gui/glade/rule.glade.h:19
+msgid "Edit the selected rule"
+msgstr ""
+
+#: ../gramps/gui/glade/rule.glade.h:21
+msgid "Exactly one rule must apply"
 msgstr ""
 
 #: ../gramps/gui/glade/rule.glade.h:25
-#: ../gramps/gui/glade/styleeditor.glade.h:3
-msgid "<b>Description</b>"
+msgid "Return values that do no_t match the filter rules"
 msgstr ""
 
-#: ../gramps/gui/glade/rule.glade.h:27
-msgid "<b>Values</b>"
+#: ../gramps/gui/glade/rule.glade.h:26
+msgid "Test the selected filter"
 msgstr ""
 
 #: ../gramps/gui/glade/styleeditor.glade.h:1
-msgid "Style n_ame:"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:2
-msgid "Style name"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:4
-msgid "<b>Type face</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:5
-msgid "_Roman (Times, serif)"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:6
-msgid "_Swiss (Arial, Helvetica, sans-serif)"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:7
-msgid "<b>Size</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:8
-#: ../gramps/gui/plug/report/_styleeditor.py:212
-msgid "point size|pt"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:9
-msgid "<b>Color</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:11
-msgid "_Bold"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:12
-msgid "_Italic"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:13
-msgid "_Underline"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:14
-msgid "<b>Font options</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:15
-msgid "_Left"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:16
-msgid "_Right"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:17
-msgid "J_ustify"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:18
-msgid "Cen_ter"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:19
 msgid "<b>Alignment</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/styleeditor.glade.h:20
+#: ../gramps/gui/glade/styleeditor.glade.h:2
 msgid "<b>Background color</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/styleeditor.glade.h:21
+#: ../gramps/gui/glade/styleeditor.glade.h:3
+msgid "<b>Borders</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:4
+msgid "<b>Color</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:6
+msgid "<b>Font options</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:7
+msgid "<b>Indentation</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:9
+msgid "<b>Paragraph options</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:10
+msgid "<b>Size</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:11
+msgid "<b>Spacing</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:12
+msgid "<b>Type face</b>"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:13
+msgid "Abo_ve:"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:15
+msgid "Add a new style"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:16
+msgid "Belo_w:"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:17
+msgid "Cen_ter"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:18
+msgid "Delete the selected style"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:20
+msgid "Edit the selected style"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:22
 msgid "First li_ne:"
 msgstr ""
 
 #: ../gramps/gui/glade/styleeditor.glade.h:23
-msgid "R_ight:"
+msgid "J_ustify"
 msgstr ""
 
 #: ../gramps/gui/glade/styleeditor.glade.h:24
@@ -11731,59 +11725,68 @@ msgid "L_eft:"
 msgstr ""
 
 #: ../gramps/gui/glade/styleeditor.glade.h:25
-msgid "<b>Spacing</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:26
-msgid "Abo_ve:"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:27
-msgid "Belo_w:"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:28
-msgid "<b>Borders</b>"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:29
 msgid "Le_ft"
 msgstr ""
 
-#: ../gramps/gui/glade/styleeditor.glade.h:30
+#: ../gramps/gui/glade/styleeditor.glade.h:26
+msgid "R_ight:"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:28
 msgid "Righ_t"
 msgstr ""
 
+#: ../gramps/gui/glade/styleeditor.glade.h:29
+msgid "Style n_ame:"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:30
+msgid "Style name"
+msgstr ""
+
 #: ../gramps/gui/glade/styleeditor.glade.h:31
-msgid "_Top"
+msgid "_Bold"
 msgstr ""
 
 #: ../gramps/gui/glade/styleeditor.glade.h:32
-msgid "_Padding:"
-msgstr ""
-
-#: ../gramps/gui/glade/styleeditor.glade.h:33
 msgid "_Bottom"
 msgstr ""
 
+#: ../gramps/gui/glade/styleeditor.glade.h:33
+msgid "_Italic"
+msgstr ""
+
 #: ../gramps/gui/glade/styleeditor.glade.h:34
-msgid "<b>Indentation</b>"
+msgid "_Left"
 msgstr ""
 
 #: ../gramps/gui/glade/styleeditor.glade.h:35
-msgid "<b>Paragraph options</b>"
+msgid "_Padding:"
 msgstr ""
 
 #: ../gramps/gui/glade/styleeditor.glade.h:36
-msgid "Add a new style"
+msgid "_Right"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:37
+msgid "_Roman (Times, serif)"
 msgstr ""
 
 #: ../gramps/gui/glade/styleeditor.glade.h:38
-msgid "Edit the selected style"
+msgid "_Swiss (Arial, Helvetica, sans-serif)"
 msgstr ""
 
-#: ../gramps/gui/glade/styleeditor.glade.h:41
-msgid "Delete the selected style"
+#: ../gramps/gui/glade/styleeditor.glade.h:39
+msgid "_Top"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:40
+msgid "_Underline"
+msgstr ""
+
+#: ../gramps/gui/glade/styleeditor.glade.h:42
+#: ../gramps/gui/plug/report/_styleeditor.py:212
+msgid "point size|pt"
 msgstr ""
 
 #: ../gramps/gui/glade/tipofday.glade.h:1
@@ -11791,14 +11794,10 @@ msgid "_Display on startup"
 msgstr ""
 
 #: ../gramps/gui/glade/updateaddons.glade.h:1
-msgid "Install Selected _Addons"
-msgstr ""
-
-#: ../gramps/gui/glade/updateaddons.glade.h:2
 msgid "<b>Available Gramps Updates for Addons</b>"
 msgstr ""
 
-#: ../gramps/gui/glade/updateaddons.glade.h:3
+#: ../gramps/gui/glade/updateaddons.glade.h:2
 msgid ""
 "Gramps comes with a core set of plugins which provide all of the necessary "
 "features. However, you can extend this functionality with additional Addons. "
@@ -11809,12 +11808,16 @@ msgid ""
 "under Edit -> Preferences."
 msgstr ""
 
+#: ../gramps/gui/glade/updateaddons.glade.h:3
+msgid "Install Selected _Addons"
+msgstr ""
+
 #: ../gramps/gui/glade/updateaddons.glade.h:4
-msgid "_Select All"
+msgid "Select _None"
 msgstr ""
 
 #: ../gramps/gui/glade/updateaddons.glade.h:5
-msgid "Select _None"
+msgid "_Select All"
 msgstr ""
 
 #: ../gramps/gui/grampsgui.py:61
@@ -11968,7 +11971,7 @@ msgstr ""
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:691
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:705
 #: ../gramps/plugins/quickview/filterbyname.py:113
-#: ../gramps/plugins/textreport/indivcomplete.py:280
+#: ../gramps/plugins/textreport/indivcomplete.py:281
 #: ../gramps/plugins/textreport/tagreport.py:376
 #: ../gramps/plugins/view/noteview.py:113
 #: ../gramps/plugins/view/view.gpr.py:95
@@ -12368,7 +12371,7 @@ msgid "Merge People"
 msgstr ""
 
 #: ../gramps/gui/merge/mergeperson.py:195
-#: ../gramps/plugins/textreport/indivcomplete.py:374
+#: ../gramps/plugins/textreport/indivcomplete.py:375
 msgid "Alternate Names"
 msgstr ""
 
@@ -12403,7 +12406,7 @@ msgid "No spouses or children found"
 msgstr ""
 
 #: ../gramps/gui/merge/mergeperson.py:256
-#: ../gramps/plugins/textreport/indivcomplete.py:404
+#: ../gramps/plugins/textreport/indivcomplete.py:405
 #: ../gramps/plugins/webreport/narrativeweb.py:1371
 msgid "Addresses"
 msgstr ""
@@ -12448,7 +12451,7 @@ msgstr ""
 msgid "Select a tool from those available on the left."
 msgstr ""
 
-#: ../gramps/gui/plug/_dialogs.py:312 ../gramps/plugins/tool/verify.glade.h:6
+#: ../gramps/gui/plug/_dialogs.py:312 ../gramps/plugins/tool/verify.glade.h:25
 msgid "_Run"
 msgstr ""
 
@@ -13136,17 +13139,17 @@ msgstr ""
 #: ../gramps/gui/plug/report/_reportdialog.py:366
 #: ../gramps/plugins/drawreport/calendarreport.py:418
 #: ../gramps/plugins/drawreport/fanchart.py:648
-#: ../gramps/plugins/drawreport/statisticschart.py:932
-#: ../gramps/plugins/drawreport/timeline.py:376
+#: ../gramps/plugins/drawreport/statisticschart.py:933
+#: ../gramps/plugins/drawreport/timeline.py:413
 #: ../gramps/plugins/graph/gvrelgraph.py:493
 #: ../gramps/plugins/textreport/ancestorreport.py:269
-#: ../gramps/plugins/textreport/birthdayreport.py:369
+#: ../gramps/plugins/textreport/birthdayreport.py:410
 #: ../gramps/plugins/textreport/descendreport.py:401
 #: ../gramps/plugins/textreport/detancestralreport.py:719
 #: ../gramps/plugins/textreport/detdescendantreport.py:882
 #: ../gramps/plugins/textreport/endoflinereport.py:258
 #: ../gramps/plugins/textreport/familygroup.py:634
-#: ../gramps/plugins/textreport/indivcomplete.py:694
+#: ../gramps/plugins/textreport/indivcomplete.py:695
 #: ../gramps/plugins/textreport/kinshipreport.py:343
 #: ../gramps/plugins/textreport/numberofancestorsreport.py:201
 #: ../gramps/plugins/textreport/placereport.py:374
@@ -13154,7 +13157,7 @@ msgstr ""
 #: ../gramps/plugins/textreport/simplebooktitle.py:130
 #: ../gramps/plugins/textreport/summary.py:277
 #: ../gramps/plugins/textreport/tagreport.py:533
-#: ../gramps/plugins/webreport/narrativeweb.py:7976
+#: ../gramps/plugins/webreport/narrativeweb.py:7978
 #: ../gramps/plugins/webreport/webcal.py:1321
 msgid "Report Options"
 msgstr ""
@@ -13218,7 +13221,7 @@ msgstr ""
 
 #: ../gramps/gui/plug/report/_stylecombobox.py:70
 #: ../gramps/gui/plug/report/_stylecombobox.py:89
-#: ../gramps/plugins/importer/importgedcom.glade.h:5
+#: ../gramps/plugins/importer/importgedcom.glade.h:17
 msgid "default"
 msgstr ""
 
@@ -13423,7 +13426,7 @@ msgstr ""
 
 #. List of translated strings used here
 #. Dead code for l10n
-#: ../gramps/gui/viewmanager.py:455
+#: ../gramps/gui/viewmanager.py:454
 msgid "new"
 msgstr ""
 
@@ -13654,7 +13657,7 @@ msgid "Key %s is not bound"
 msgstr ""
 
 #. load plugins
-#: ../gramps/gui/viewmanager.py:986
+#: ../gramps/gui/viewmanager.py:985
 msgid "Loading plugins..."
 msgstr ""
 
@@ -13663,7 +13666,7 @@ msgid "Ready"
 msgstr ""
 
 #. registering plugins
-#: ../gramps/gui/viewmanager.py:1001
+#: ../gramps/gui/viewmanager.py:1000
 msgid "Registering plugins..."
 msgstr ""
 
@@ -13727,14 +13730,14 @@ msgstr ""
 #. #################
 #. What to include
 #. #########################
-#: ../gramps/gui/viewmanager.py:1560
+#: ../gramps/gui/viewmanager.py:1559
 #: ../gramps/plugins/drawreport/ancestortree.py:1026
 #: ../gramps/plugins/drawreport/descendtree.py:1620
 #: ../gramps/plugins/textreport/detancestralreport.py:781
 #: ../gramps/plugins/textreport/detdescendantreport.py:954
 #: ../gramps/plugins/textreport/detdescendantreport.py:955
 #: ../gramps/plugins/textreport/familygroup.py:652
-#: ../gramps/plugins/webreport/narrativeweb.py:8183
+#: ../gramps/plugins/webreport/narrativeweb.py:8185
 msgid "Include"
 msgstr ""
 
@@ -13744,7 +13747,7 @@ msgid "Megabyte|MB"
 msgstr ""
 
 #: ../gramps/gui/viewmanager.py:1561
-#: ../gramps/plugins/webreport/narrativeweb.py:8177
+#: ../gramps/plugins/webreport/narrativeweb.py:8179
 msgid "Exclude"
 msgstr ""
 
@@ -13794,8 +13797,8 @@ msgid ""
 "%(error_msg)s\n"
 "\n"
 "If you are unable to fix the fault yourself then you can submit a bug at "
-"http://bugs.gramps-project.org or contact the plugin author "
-"(%(firstauthoremail)s).\n"
+"http://bugs.gramps-project.org or contact the plugin author (%"
+"(firstauthoremail)s).\n"
 "\n"
 "If you do not want Gramps to try and load this plugin again, you can hide it "
 "by using the Plugin Manager on the Help menu."
@@ -13813,8 +13816,8 @@ msgid ""
 "%(error_msg)s\n"
 "\n"
 "If you are unable to fix the fault yourself then you can submit a bug at "
-"http://bugs.gramps-project.org or contact the view author "
-"(%(firstauthoremail)s).\n"
+"http://bugs.gramps-project.org or contact the view author (%"
+"(firstauthoremail)s).\n"
 "\n"
 "If you do not want Gramps to try and load this view again, you can hide it "
 "by using the Plugin Manager on the Help menu."
@@ -14411,11 +14414,11 @@ msgid "Generates documents in Scalable Vector Graphics format (.svg)."
 msgstr ""
 
 #: ../gramps/plugins/docgen/gtkprint.glade.h:1
-msgid "Print Preview"
+msgid "Closes print preview window"
 msgstr ""
 
 #: ../gramps/plugins/docgen/gtkprint.glade.h:2
-msgid "Closes print preview window"
+msgid "Print Preview"
 msgstr ""
 
 #: ../gramps/plugins/docgen/gtkprint.glade.h:3
@@ -14423,50 +14426,50 @@ msgid "Prints the current file"
 msgstr ""
 
 #: ../gramps/plugins/docgen/gtkprint.glade.h:4
-msgid "Shows the first page"
-msgstr ""
-
-#: ../gramps/plugins/docgen/gtkprint.glade.h:5
 msgid "Shows previous page"
 msgstr ""
 
-#: ../gramps/plugins/docgen/gtkprint.glade.h:6
-msgid "Shows the next page"
+#: ../gramps/plugins/docgen/gtkprint.glade.h:5
+msgid "Shows the first page"
 msgstr ""
 
-#: ../gramps/plugins/docgen/gtkprint.glade.h:7
+#: ../gramps/plugins/docgen/gtkprint.glade.h:6
 msgid "Shows the last page"
 msgstr ""
 
+#: ../gramps/plugins/docgen/gtkprint.glade.h:7
+msgid "Shows the next page"
+msgstr ""
+
 #: ../gramps/plugins/docgen/gtkprint.glade.h:8
-msgid "Zooms to fit the page width"
-msgstr ""
-
-#: ../gramps/plugins/docgen/gtkprint.glade.h:9
-msgid "Zooms to fit the whole page"
-msgstr ""
-
-#: ../gramps/plugins/docgen/gtkprint.glade.h:10
 msgid "Zooms the page in"
 msgstr ""
 
-#: ../gramps/plugins/docgen/gtkprint.glade.h:11
+#: ../gramps/plugins/docgen/gtkprint.glade.h:9
 msgid "Zooms the page out"
 msgstr ""
 
+#: ../gramps/plugins/docgen/gtkprint.glade.h:10
+msgid "Zooms to fit the page width"
+msgstr ""
+
+#: ../gramps/plugins/docgen/gtkprint.glade.h:11
+msgid "Zooms to fit the whole page"
+msgstr ""
+
 #: ../gramps/plugins/docgen/gtkprint.py:484
 #, python-format
 msgid "of %d"
 msgstr ""
 
 #: ../gramps/plugins/docgen/htmldoc.py:276
-#: ../gramps/plugins/webreport/narrativeweb.py:7929
+#: ../gramps/plugins/webreport/narrativeweb.py:7931
 #: ../gramps/plugins/webreport/webcal.py:246
 msgid "Possible destination error"
 msgstr ""
 
 #: ../gramps/plugins/docgen/htmldoc.py:277
-#: ../gramps/plugins/webreport/narrativeweb.py:7930
+#: ../gramps/plugins/webreport/narrativeweb.py:7932
 #: ../gramps/plugins/webreport/webcal.py:247
 msgid ""
 "You appear to have set your target directory to a directory used for data "
@@ -14561,7 +14564,7 @@ msgstr ""
 #: ../gramps/plugins/drawreport/fanchart.py:650
 #: ../gramps/plugins/graph/gvhourglass.py:273
 #: ../gramps/plugins/textreport/ancestorreport.py:271
-#: ../gramps/plugins/textreport/birthdayreport.py:381
+#: ../gramps/plugins/textreport/birthdayreport.py:422
 #: ../gramps/plugins/textreport/descendreport.py:403
 #: ../gramps/plugins/textreport/detancestralreport.py:722
 #: ../gramps/plugins/textreport/detdescendantreport.py:885
@@ -14865,7 +14868,7 @@ msgstr ""
 #: ../gramps/plugins/textreport/endoflinereport.py:299
 #: ../gramps/plugins/textreport/endoflinereport.py:317
 #: ../gramps/plugins/textreport/familygroup.py:733
-#: ../gramps/plugins/textreport/indivcomplete.py:817
+#: ../gramps/plugins/textreport/indivcomplete.py:818
 #: ../gramps/plugins/textreport/kinshipreport.py:403
 #: ../gramps/plugins/textreport/numberofancestorsreport.py:230
 #: ../gramps/plugins/textreport/recordsreport.py:269
@@ -14891,7 +14894,7 @@ msgstr ""
 #: ../gramps/plugins/drawreport/fanchart.py:183
 #: ../gramps/plugins/graph/gvhourglass.py:105
 #: ../gramps/plugins/textreport/ancestorreport.py:105
-#: ../gramps/plugins/textreport/birthdayreport.py:101
+#: ../gramps/plugins/textreport/birthdayreport.py:110
 #: ../gramps/plugins/textreport/descendreport.py:342
 #: ../gramps/plugins/textreport/detancestralreport.py:139
 #: ../gramps/plugins/textreport/detdescendantreport.py:157
@@ -14911,30 +14914,30 @@ msgid "Calendar Report"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:169
-#: ../gramps/plugins/textreport/birthdayreport.py:184
+#: ../gramps/plugins/textreport/birthdayreport.py:220
 msgid "Formatting months..."
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:272
-#: ../gramps/plugins/textreport/birthdayreport.py:223
+#: ../gramps/plugins/textreport/birthdayreport.py:260
 #: ../gramps/plugins/webreport/webcal.py:1087
 msgid "Applying Filter..."
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:280
-#: ../gramps/plugins/textreport/birthdayreport.py:232
+#: ../gramps/plugins/textreport/birthdayreport.py:271
 #: ../gramps/plugins/webreport/webcal.py:1093
 msgid "Reading database..."
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:322
-#: ../gramps/plugins/textreport/birthdayreport.py:285
+#: ../gramps/plugins/textreport/birthdayreport.py:326
 #, python-format
 msgid "%(person)s, birth%(relation)s"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:326
-#: ../gramps/plugins/textreport/birthdayreport.py:289
+#: ../gramps/plugins/textreport/birthdayreport.py:330
 #, python-format
 msgid "%(person)s, %(age)d%(relation)s"
 msgid_plural "%(person)s, %(age)d%(relation)s"
@@ -14942,7 +14945,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:381
-#: ../gramps/plugins/textreport/birthdayreport.py:335
+#: ../gramps/plugins/textreport/birthdayreport.py:376
 #, python-format
 msgid ""
 "%(spouse)s and\n"
@@ -14950,7 +14953,7 @@ msgid ""
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:386
-#: ../gramps/plugins/textreport/birthdayreport.py:339
+#: ../gramps/plugins/textreport/birthdayreport.py:380
 #, python-format
 msgid ""
 "%(spouse)s and\n"
@@ -14975,7 +14978,7 @@ msgstr ""
 #: ../gramps/plugins/drawreport/calendarreport.py:433
 #: ../gramps/plugins/drawreport/fanchart.py:651
 #: ../gramps/plugins/textreport/ancestorreport.py:272
-#: ../gramps/plugins/textreport/birthdayreport.py:382
+#: ../gramps/plugins/textreport/birthdayreport.py:423
 #: ../gramps/plugins/textreport/descendreport.py:404
 #: ../gramps/plugins/textreport/detancestralreport.py:723
 #: ../gramps/plugins/textreport/detdescendantreport.py:886
@@ -14986,19 +14989,19 @@ msgid "The center person for the report"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:441
-#: ../gramps/plugins/textreport/birthdayreport.py:390
+#: ../gramps/plugins/textreport/birthdayreport.py:431
 #: ../gramps/plugins/webreport/webcal.py:1414
 msgid "Country for holidays"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:452
-#: ../gramps/plugins/textreport/birthdayreport.py:401
+#: ../gramps/plugins/textreport/birthdayreport.py:442
 msgid "Select the country to see associated holidays"
 msgstr ""
 
 #. Default selection ????
 #: ../gramps/plugins/drawreport/calendarreport.py:455
-#: ../gramps/plugins/textreport/birthdayreport.py:404
+#: ../gramps/plugins/textreport/birthdayreport.py:445
 #: ../gramps/plugins/webreport/webcal.py:1439
 msgid "First day of week"
 msgstr ""
@@ -15009,37 +15012,37 @@ msgid "Select the first day of the week for the calendar"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:462
-#: ../gramps/plugins/textreport/birthdayreport.py:411
+#: ../gramps/plugins/textreport/birthdayreport.py:452
 #: ../gramps/plugins/webreport/webcal.py:1429
 msgid "Birthday surname"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:463
-#: ../gramps/plugins/textreport/birthdayreport.py:412
+#: ../gramps/plugins/textreport/birthdayreport.py:453
 #: ../gramps/plugins/webreport/webcal.py:1430
 msgid "Wives use husband's surname (from first family listed)"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:464
-#: ../gramps/plugins/textreport/birthdayreport.py:413
+#: ../gramps/plugins/textreport/birthdayreport.py:454
 #: ../gramps/plugins/webreport/webcal.py:1432
 msgid "Wives use husband's surname (from last family listed)"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:465
-#: ../gramps/plugins/textreport/birthdayreport.py:414
+#: ../gramps/plugins/textreport/birthdayreport.py:455
 #: ../gramps/plugins/webreport/webcal.py:1434
 msgid "Wives use their own surname"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:466
-#: ../gramps/plugins/textreport/birthdayreport.py:415
+#: ../gramps/plugins/textreport/birthdayreport.py:456
 #: ../gramps/plugins/webreport/webcal.py:1435
 msgid "Select married women's displayed surname"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:469
-#: ../gramps/plugins/textreport/birthdayreport.py:418
+#: ../gramps/plugins/textreport/birthdayreport.py:459
 #: ../gramps/plugins/webreport/webcal.py:1452
 msgid "Include only living people"
 msgstr ""
@@ -15050,7 +15053,7 @@ msgid "Include only living people in the calendar"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:473
-#: ../gramps/plugins/textreport/birthdayreport.py:422
+#: ../gramps/plugins/textreport/birthdayreport.py:463
 #: ../gramps/plugins/webreport/webcal.py:1456
 msgid "Include birthdays"
 msgstr ""
@@ -15061,7 +15064,7 @@ msgid "Include birthdays in the calendar"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:477
-#: ../gramps/plugins/textreport/birthdayreport.py:426
+#: ../gramps/plugins/textreport/birthdayreport.py:467
 #: ../gramps/plugins/webreport/webcal.py:1460
 msgid "Include anniversaries"
 msgstr ""
@@ -15073,12 +15076,12 @@ msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:481
 #: ../gramps/plugins/drawreport/calendarreport.py:482
-#: ../gramps/plugins/textreport/birthdayreport.py:435
+#: ../gramps/plugins/textreport/birthdayreport.py:478
 msgid "Text Options"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:484
-#: ../gramps/plugins/textreport/birthdayreport.py:442
+#: ../gramps/plugins/textreport/birthdayreport.py:484
 msgid "Text Area 1"
 msgstr ""
 
@@ -15091,12 +15094,12 @@ msgid "First line of text at bottom of calendar"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:488
-#: ../gramps/plugins/textreport/birthdayreport.py:446
+#: ../gramps/plugins/textreport/birthdayreport.py:488
 msgid "Text Area 2"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:488
-#: ../gramps/plugins/textreport/birthdayreport.py:446
+#: ../gramps/plugins/textreport/birthdayreport.py:68
 msgid "Produced with Gramps"
 msgstr ""
 
@@ -15105,7 +15108,7 @@ msgid "Second line of text at bottom of calendar"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:492
-#: ../gramps/plugins/textreport/birthdayreport.py:450
+#: ../gramps/plugins/textreport/birthdayreport.py:492
 msgid "Text Area 3"
 msgstr ""
 
@@ -15134,17 +15137,17 @@ msgid "Days of the week text"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:563
-#: ../gramps/plugins/textreport/birthdayreport.py:515
+#: ../gramps/plugins/textreport/birthdayreport.py:557
 msgid "Text at bottom, line 1"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:565
-#: ../gramps/plugins/textreport/birthdayreport.py:517
+#: ../gramps/plugins/textreport/birthdayreport.py:559
 msgid "Text at bottom, line 2"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/calendarreport.py:567
-#: ../gramps/plugins/textreport/birthdayreport.py:519
+#: ../gramps/plugins/textreport/birthdayreport.py:561
 msgid "Text at bottom, line 3"
 msgstr ""
 
@@ -15380,10 +15383,10 @@ msgstr ""
 
 #. extract requested items from the database and count them
 #: ../gramps/plugins/drawreport/drawplugins.gpr.py:192
-#: ../gramps/plugins/drawreport/statisticschart.py:751
-#: ../gramps/plugins/drawreport/statisticschart.py:759
-#: ../gramps/plugins/drawreport/statisticschart.py:803
+#: ../gramps/plugins/drawreport/statisticschart.py:752
+#: ../gramps/plugins/drawreport/statisticschart.py:760
 #: ../gramps/plugins/drawreport/statisticschart.py:804
+#: ../gramps/plugins/drawreport/statisticschart.py:805
 msgid "Statistics Charts"
 msgstr ""
 
@@ -15391,7 +15394,9 @@ msgstr ""
 msgid "Produces statistical bar and pie charts of the people in the database"
 msgstr ""
 
+#. feature request 2356: avoid genitive form
 #: ../gramps/plugins/drawreport/drawplugins.gpr.py:216
+#: ../gramps/plugins/drawreport/timeline.py:272
 msgid "Timeline Chart"
 msgstr ""
 
@@ -15512,270 +15517,270 @@ msgid "Both"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/statisticschart.py:306
-#: ../gramps/plugins/drawreport/statisticschart.py:400
-#: ../gramps/plugins/drawreport/statisticschart.py:732
+#: ../gramps/plugins/drawreport/statisticschart.py:401
+#: ../gramps/plugins/drawreport/statisticschart.py:733
 msgid "Men"
 msgstr ""
 
 #: ../gramps/plugins/drawreport/statisticschart.py:307
-#: ../gramps/plugins/drawreport/statisticschart.py:402
-#: ../gramps/plugins/drawreport/statisticschart.py:734
+#: ../gramps/plugins/drawreport/statisticschart.py:403
+#: ../gramps/plugins/drawreport/statisticschart.py:735
 msgid "Women"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:325
+#: ../gramps/plugins/drawreport/statisticschart.py:326
 msgid "person|Title"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:329
+#: ../gramps/plugins/drawreport/statisticschart.py:330
 msgid "Forename"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:333
+#: ../gramps/plugins/drawreport/statisticschart.py:334
 msgid "Birth year"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:335
+#: ../gramps/plugins/drawreport/statisticschart.py:336
 msgid "Death year"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:337
+#: ../gramps/plugins/drawreport/statisticschart.py:338
 msgid "Birth month"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:339
+#: ../gramps/plugins/drawreport/statisticschart.py:340
 msgid "Death month"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:341
+#: ../gramps/plugins/drawreport/statisticschart.py:342
 #: ../gramps/plugins/export/exportcsv.py:348
 #: ../gramps/plugins/importer/importcsv.py:191
 msgid "Birth place"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:343
+#: ../gramps/plugins/drawreport/statisticschart.py:344
 #: ../gramps/plugins/export/exportcsv.py:350
 #: ../gramps/plugins/importer/importcsv.py:213
 msgid "Death place"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:345
+#: ../gramps/plugins/drawreport/statisticschart.py:346
 msgid "Marriage place"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:347
+#: ../gramps/plugins/drawreport/statisticschart.py:348
 msgid "Number of relationships"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:349
+#: ../gramps/plugins/drawreport/statisticschart.py:350
 msgid "Age when first child born"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:351
+#: ../gramps/plugins/drawreport/statisticschart.py:352
 msgid "Age when last child born"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:353
+#: ../gramps/plugins/drawreport/statisticschart.py:354
 msgid "Number of children"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:355
+#: ../gramps/plugins/drawreport/statisticschart.py:356
 msgid "Age at marriage"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:357
+#: ../gramps/plugins/drawreport/statisticschart.py:358
 msgid "Age at death"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:361
+#: ../gramps/plugins/drawreport/statisticschart.py:362
 msgid "Event type"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:375
+#: ../gramps/plugins/drawreport/statisticschart.py:376
 msgid "(Preferred) title missing"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:384
+#: ../gramps/plugins/drawreport/statisticschart.py:385
 msgid "(Preferred) forename missing"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:393
+#: ../gramps/plugins/drawreport/statisticschart.py:394
 msgid "(Preferred) surname missing"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:403
+#: ../gramps/plugins/drawreport/statisticschart.py:404
 msgid "Gender unknown"
 msgstr ""
 
 #. inadequate information
-#: ../gramps/plugins/drawreport/statisticschart.py:412
-#: ../gramps/plugins/drawreport/statisticschart.py:421
-#: ../gramps/plugins/drawreport/statisticschart.py:525
+#: ../gramps/plugins/drawreport/statisticschart.py:413
+#: ../gramps/plugins/drawreport/statisticschart.py:422
+#: ../gramps/plugins/drawreport/statisticschart.py:526
 msgid "Date(s) missing"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:430
-#: ../gramps/plugins/drawreport/statisticschart.py:444
+#: ../gramps/plugins/drawreport/statisticschart.py:431
+#: ../gramps/plugins/drawreport/statisticschart.py:445
 msgid "Place missing"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:452
+#: ../gramps/plugins/drawreport/statisticschart.py:453
 msgid "Already dead"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:459
+#: ../gramps/plugins/drawreport/statisticschart.py:460
 msgid "Still alive"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:467
-#: ../gramps/plugins/drawreport/statisticschart.py:479
+#: ../gramps/plugins/drawreport/statisticschart.py:468
+#: ../gramps/plugins/drawreport/statisticschart.py:480
 msgid "Events missing"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:487
-#: ../gramps/plugins/drawreport/statisticschart.py:495
+#: ../gramps/plugins/drawreport/statisticschart.py:488
+#: ../gramps/plugins/drawreport/statisticschart.py:496
 msgid "Children missing"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:514
+#: ../gramps/plugins/drawreport/statisticschart.py:515
 msgid "Birth missing"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:615
+#: ../gramps/plugins/drawreport/statisticschart.py:616
 msgid "Personal information missing"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:752
+#: ../gramps/plugins/drawreport/statisticschart.py:753
 msgid "Collecting data..."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:760
+#: ../gramps/plugins/drawreport/statisticschart.py:761
 msgid "Sorting data..."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:770
+#: ../gramps/plugins/drawreport/statisticschart.py:771
 #, python-format
 msgid "%(genders)s born %(year_from)04d-%(year_to)04d: %(chart_title)s"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:774
+#: ../gramps/plugins/drawreport/statisticschart.py:775
 #, python-format
 msgid "Persons born %(year_from)04d-%(year_to)04d: %(chart_title)s"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:805
+#: ../gramps/plugins/drawreport/statisticschart.py:806
 msgid "Saving charts..."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:856
-#: ../gramps/plugins/drawreport/statisticschart.py:891
+#: ../gramps/plugins/drawreport/statisticschart.py:857
+#: ../gramps/plugins/drawreport/statisticschart.py:892
 #, python-format
 msgid "%s (persons):"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:938
+#: ../gramps/plugins/drawreport/statisticschart.py:939
 #: ../gramps/plugins/textreport/recordsreport.py:174
 msgid "Determines what people are included in the report."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:942
-#: ../gramps/plugins/drawreport/timeline.py:384
+#: ../gramps/plugins/drawreport/statisticschart.py:943
+#: ../gramps/plugins/drawreport/timeline.py:421
 #: ../gramps/plugins/graph/gvrelgraph.py:503
-#: ../gramps/plugins/textreport/indivcomplete.py:703
+#: ../gramps/plugins/textreport/indivcomplete.py:704
 #: ../gramps/plugins/textreport/recordsreport.py:178
 #: ../gramps/plugins/tool/sortevents.py:173
-#: ../gramps/plugins/webreport/narrativeweb.py:8007
+#: ../gramps/plugins/webreport/narrativeweb.py:8009
 #: ../gramps/plugins/webreport/webcal.py:1342
 msgid "Filter Person"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:943
-#: ../gramps/plugins/textreport/indivcomplete.py:704
+#: ../gramps/plugins/drawreport/statisticschart.py:944
+#: ../gramps/plugins/textreport/indivcomplete.py:705
 msgid "The center person for the filter."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:949
+#: ../gramps/plugins/drawreport/statisticschart.py:950
 msgid "Sort chart items by"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:954
+#: ../gramps/plugins/drawreport/statisticschart.py:955
 msgid "Select how the statistical data is sorted."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:957
+#: ../gramps/plugins/drawreport/statisticschart.py:958
 msgid "Sort in reverse order"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:958
+#: ../gramps/plugins/drawreport/statisticschart.py:959
 msgid "Check to reverse the sorting order."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:962
+#: ../gramps/plugins/drawreport/statisticschart.py:963
 msgid "People Born After"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:964
+#: ../gramps/plugins/drawreport/statisticschart.py:965
 msgid "Birth year from which to include people."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:967
+#: ../gramps/plugins/drawreport/statisticschart.py:968
 msgid "People Born Before"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:969
+#: ../gramps/plugins/drawreport/statisticschart.py:970
 msgid "Birth year until which to include people"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:972
+#: ../gramps/plugins/drawreport/statisticschart.py:973
 msgid "Include people without known birth years"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:974
+#: ../gramps/plugins/drawreport/statisticschart.py:975
 msgid "Whether to include people without known birth years."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:978
+#: ../gramps/plugins/drawreport/statisticschart.py:979
 msgid "Genders included"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:983
+#: ../gramps/plugins/drawreport/statisticschart.py:984
 msgid "Select which genders are included into statistics."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:987
+#: ../gramps/plugins/drawreport/statisticschart.py:988
 msgid "Max. items for a pie"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:988
+#: ../gramps/plugins/drawreport/statisticschart.py:989
 msgid ""
 "With fewer items pie chart and legend will be used instead of a bar chart."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:1004
+#: ../gramps/plugins/drawreport/statisticschart.py:1005
 msgid "Charts 1"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:1006
+#: ../gramps/plugins/drawreport/statisticschart.py:1007
 msgid "Charts 2"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:1008
+#: ../gramps/plugins/drawreport/statisticschart.py:1009
 msgid "Include charts with indicated data."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:1048
+#: ../gramps/plugins/drawreport/statisticschart.py:1049
 msgid "The style used for the items and values."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/statisticschart.py:1057
-#: ../gramps/plugins/drawreport/timeline.py:447
+#: ../gramps/plugins/drawreport/statisticschart.py:1058
+#: ../gramps/plugins/drawreport/timeline.py:488
 #: ../gramps/plugins/textreport/ancestorreport.py:333
 #: ../gramps/plugins/textreport/descendreport.py:448
 #: ../gramps/plugins/textreport/detancestralreport.py:838
 #: ../gramps/plugins/textreport/detdescendantreport.py:1032
 #: ../gramps/plugins/textreport/endoflinereport.py:281
 #: ../gramps/plugins/textreport/familygroup.py:724
-#: ../gramps/plugins/textreport/indivcomplete.py:785
+#: ../gramps/plugins/textreport/indivcomplete.py:786
 #: ../gramps/plugins/textreport/kinshipreport.py:385
 #: ../gramps/plugins/textreport/numberofancestorsreport.py:223
 #: ../gramps/plugins/textreport/simplebooktitle.py:166
@@ -15786,73 +15791,76 @@ msgstr ""
 
 #. Apply the filter
 #. Sort the people as requested
-#: ../gramps/plugins/drawreport/timeline.py:113
-#: ../gramps/plugins/drawreport/timeline.py:140
-#: ../gramps/plugins/drawreport/timeline.py:152
-#: ../gramps/plugins/drawreport/timeline.py:309
+#: ../gramps/plugins/drawreport/timeline.py:126
+#: ../gramps/plugins/drawreport/timeline.py:153
+#: ../gramps/plugins/drawreport/timeline.py:165
+#: ../gramps/plugins/drawreport/timeline.py:346
 msgid "Timeline"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:114
+#: ../gramps/plugins/drawreport/timeline.py:127
 msgid "Applying filter..."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:140
+#: ../gramps/plugins/drawreport/timeline.py:153
 msgid "Sorting dates..."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:153
+#: ../gramps/plugins/drawreport/timeline.py:166
 msgid "Calculating timeline..."
 msgstr ""
 
 #. feature request 2356: avoid genitive form
-#: ../gramps/plugins/drawreport/timeline.py:251
+#. FIXME the %(author)s was chosen because it already existed in the
+#. gramps.pot file (in a "string freeze") so should probably be changed
+#. FIXME this concatenation will fail for RTL languages
+#: ../gramps/plugins/drawreport/timeline.py:267
+#: ../gramps/plugins/webreport/webcal.py:470
+#, python-format
+msgid "Created for %(author)s"
+msgstr ""
+
+#: ../gramps/plugins/drawreport/timeline.py:270
 #, python-format
 msgid "Sorted by %s"
 msgstr ""
 
-#. feature request 2356: avoid genitive form
-#: ../gramps/plugins/drawreport/timeline.py:253
-#, python-format
-msgid "Timeline Graph for %s"
-msgstr ""
-
-#: ../gramps/plugins/drawreport/timeline.py:284
+#: ../gramps/plugins/drawreport/timeline.py:321
 msgid "No Date Information"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:310
+#: ../gramps/plugins/drawreport/timeline.py:347
 msgid "Finding date range..."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:380
+#: ../gramps/plugins/drawreport/timeline.py:417
 msgid "Determines what people are included in the report"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:385
+#: ../gramps/plugins/drawreport/timeline.py:422
 #: ../gramps/plugins/graph/gvrelgraph.py:504
 #: ../gramps/plugins/textreport/recordsreport.py:179
 #: ../gramps/plugins/tool/sortevents.py:174
-#: ../gramps/plugins/webreport/narrativeweb.py:8008
+#: ../gramps/plugins/webreport/narrativeweb.py:8010
 #: ../gramps/plugins/webreport/webcal.py:1343
 msgid "The center person for the filter"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:391
+#: ../gramps/plugins/drawreport/timeline.py:430
 #: ../gramps/plugins/tool/sortevents.py:180
 msgid "Sort by"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:396
+#: ../gramps/plugins/drawreport/timeline.py:435
 #: ../gramps/plugins/tool/sortevents.py:185
 msgid "Sorting method to use"
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:429
+#: ../gramps/plugins/drawreport/timeline.py:470
 msgid "The style used for the person's name."
 msgstr ""
 
-#: ../gramps/plugins/drawreport/timeline.py:438
+#: ../gramps/plugins/drawreport/timeline.py:479
 msgid "The style used for the year labels."
 msgstr ""
 
@@ -15890,8 +15898,8 @@ msgid "Web Family Tree export options"
 msgstr ""
 
 #: ../gramps/plugins/export/export.gpr.py:73
-#: ../gramps/plugins/importer/import.gpr.py:51 ../data/gramps.keys.in.h:4
-#: ../data/gramps.xml.in.h:2
+#: ../gramps/plugins/importer/import.gpr.py:51 ../data/gramps.keys.in.h:1
+#: ../data/gramps.xml.in.h:1
 msgid "GEDCOM"
 msgstr ""
 
@@ -15911,7 +15919,7 @@ msgid "GEDCOM export options"
 msgstr ""
 
 #: ../gramps/plugins/export/export.gpr.py:95
-#: ../gramps/plugins/importer/import.gpr.py:70 ../data/gramps.keys.in.h:5
+#: ../gramps/plugins/importer/import.gpr.py:70 ../data/gramps.keys.in.h:2
 msgid "GeneWeb"
 msgstr ""
 
@@ -16923,7 +16931,7 @@ msgstr ""
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:789
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:803
 #: ../gramps/plugins/textreport/familygroup.py:591
-#: ../gramps/plugins/textreport/indivcomplete.py:465
+#: ../gramps/plugins/textreport/indivcomplete.py:466
 #: ../gramps/plugins/view/pedigreeview.py:1732
 #: ../gramps/plugins/view/relview.py:1382
 #: ../gramps/plugins/webreport/narrativeweb.py:760
@@ -18425,67 +18433,67 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../gramps/plugins/importer/importgedcom.glade.h:1
-msgid "Gramps - GEDCOM Encoding"
+msgid "<b>Status</b>"
 msgstr ""
 
 #: ../gramps/plugins/importer/importgedcom.glade.h:2
-msgid "<span size=\"larger\" weight=\"bold\">GEDCOM Encoding</span>"
-msgstr ""
-
-#: ../gramps/plugins/importer/importgedcom.glade.h:3
-msgid ""
-"This GEDCOM file has identified itself as using ANSEL encoding. Sometimes, "
-"this is in error. If the imported data contains unusual characters, undo the "
-"import, and override the character set by selecting a different encoding "
-"below."
-msgstr ""
-
-#: ../gramps/plugins/importer/importgedcom.glade.h:4
-msgid "Encoding: "
-msgstr ""
-
-#: ../gramps/plugins/importer/importgedcom.glade.h:6
-msgid "ANSEL"
-msgstr ""
-
-#: ../gramps/plugins/importer/importgedcom.glade.h:7
-msgid "ANSI (iso-8859-1)"
-msgstr ""
-
-#: ../gramps/plugins/importer/importgedcom.glade.h:8
-msgid "ASCII"
-msgstr ""
-
-#: ../gramps/plugins/importer/importgedcom.glade.h:9
-msgid "UTF8"
-msgstr ""
-
-#: ../gramps/plugins/importer/importgedcom.glade.h:10
 msgid "<b>Warning messages</b>"
 msgstr ""
 
-#: ../gramps/plugins/importer/importgedcom.glade.h:12
+#: ../gramps/plugins/importer/importgedcom.glade.h:3
+msgid "<span size=\"larger\" weight=\"bold\">GEDCOM Encoding</span>"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgedcom.glade.h:4
+msgid "ANSEL"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgedcom.glade.h:5
+msgid "ANSI (iso-8859-1)"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgedcom.glade.h:6
+msgid "ASCII"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgedcom.glade.h:7
 msgid "Created by:"
 msgstr ""
 
+#: ../gramps/plugins/importer/importgedcom.glade.h:8
+msgid "Encoding:"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgedcom.glade.h:9
+msgid "Encoding: "
+msgstr ""
+
+#: ../gramps/plugins/importer/importgedcom.glade.h:10
+msgid "Families:"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgedcom.glade.h:12
+msgid "Gramps - GEDCOM Encoding"
+msgstr ""
+
 #: ../gramps/plugins/importer/importgedcom.glade.h:13
 msgid "People:"
 msgstr ""
 
 #: ../gramps/plugins/importer/importgedcom.glade.h:14
-msgid "Encoding:"
+msgid ""
+"This GEDCOM file has identified itself as using ANSEL encoding. Sometimes, "
+"this is in error. If the imported data contains unusual characters, undo the "
+"import, and override the character set by selecting a different encoding "
+"below."
 msgstr ""
 
 #: ../gramps/plugins/importer/importgedcom.glade.h:15
-msgid "Version:"
+msgid "UTF8"
 msgstr ""
 
 #: ../gramps/plugins/importer/importgedcom.glade.h:16
-msgid "Families:"
-msgstr ""
-
-#: ../gramps/plugins/importer/importgedcom.glade.h:17
-msgid "<b>Status</b>"
+msgid "Version:"
 msgstr ""
 
 #: ../gramps/plugins/importer/importgedcom.py:132
@@ -18548,18 +18556,18 @@ msgstr ""
 #: ../gramps/plugins/importer/importgpkg.py:119
 #, python-format
 msgid ""
-"The Family Tree you imported into already has a base media path: "
-"%(orig_path)s. The imported media objects however are relative from the path "
-"%(path)s. You can change the media path in the Preferences or you can "
-"convert the imported files to the existing base media path. You can do that "
-"by moving your media files to the new position, and using the media manager "
-"tool, option 'Replace substring in the path' to set correct paths in your "
-"media objects."
+"The Family Tree you imported into already has a base media path: %(orig_path)"
+"s. The imported media objects however are relative from the path %(path)s. "
+"You can change the media path in the Preferences or you can convert the "
+"imported files to the existing base media path. You can do that by moving "
+"your media files to the new position, and using the media manager tool, "
+"option 'Replace substring in the path' to set correct paths in your media "
+"objects."
 msgstr ""
 
 #: ../gramps/plugins/importer/importgrdb.py:58
-#: ../gramps/plugins/importer/importprogen.py:75
-#: ../gramps/plugins/importer/importprogen.py:84
+#: ../gramps/plugins/importer/importprogen.py:76
+#: ../gramps/plugins/importer/importprogen.py:85
 #: ../gramps/plugins/importer/importxml.py:464
 #: ../gramps/plugins/importer/importxml.py:467
 #, python-format
@@ -18578,64 +18586,59 @@ msgid ""
 "_Manage_Family_Trees#Moving_a_Gramps_2.2_databases_to_Gramps_3.x"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:81
+#: ../gramps/plugins/importer/importprogen.py:82
 msgid "Pro-Gen data error"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:170
+#: ../gramps/plugins/importer/importprogen.py:175
 msgid "Not a Pro-Gen file"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:385
+#: ../gramps/plugins/importer/importprogen.py:393
 #, python-format
 msgid "Field '%(fldname)s' not found"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:461
+#: ../gramps/plugins/importer/importprogen.py:469
 #, python-format
 msgid "Cannot find DEF file: %(deffname)s"
 msgstr ""
 
 #. print self.def_.diag()
-#: ../gramps/plugins/importer/importprogen.py:509
+#: ../gramps/plugins/importer/importprogen.py:517
 msgid "Import from Pro-Gen"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:515
+#: ../gramps/plugins/importer/importprogen.py:523
 msgid "Pro-Gen import"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:707
+#: ../gramps/plugins/importer/importprogen.py:749
 #, python-format
 msgid "date did not match: '%(text)s' (%(msg)s)"
 msgstr ""
 
 #. The records are numbered 1..N
-#: ../gramps/plugins/importer/importprogen.py:787
+#: ../gramps/plugins/importer/importprogen.py:829
 msgid "Importing individuals"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:831
-#, python-format
-msgid "Patronymic name skipped: '%(patronym)s' (%(msg)s)"
-msgstr ""
-
 #. The records are numbered 1..N
-#: ../gramps/plugins/importer/importprogen.py:1075
+#: ../gramps/plugins/importer/importprogen.py:1104
 msgid "Importing families"
 msgstr ""
 
 #. The records are numbered 1..N
-#: ../gramps/plugins/importer/importprogen.py:1260
+#: ../gramps/plugins/importer/importprogen.py:1281
 msgid "Adding children"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:1271
+#: ../gramps/plugins/importer/importprogen.py:1292
 #, python-format
 msgid "cannot find father for I%(person)s (father=%(id)d)"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:1274
+#: ../gramps/plugins/importer/importprogen.py:1295
 #, python-format
 msgid "cannot find mother for I%(person)s (mother=%(mother)d)"
 msgstr ""
@@ -18962,174 +18965,174 @@ msgid ""
 msgstr ""
 
 #: ../gramps/plugins/lib/holidays.xml.in.h:1
-msgid "Bulgaria"
+msgid "2 of Hanuka"
 msgstr ""
 
 #: ../gramps/plugins/lib/holidays.xml.in.h:2
+msgid "2 of Passover"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:3
+msgid "2 of Sukot"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:4
+msgid "3 of Hanuka"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:5
+msgid "3 of Passover"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:6
+msgid "3 of Sukot"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:7
+msgid "4 of Hanuka"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:8
+msgid "4 of Passover"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:9
+msgid "4 of Sukot"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:10
+msgid "5 of Hanuka"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:11
+msgid "5 of Passover"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:12
+msgid "5 of Sukot"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:13
+msgid "6 of Hanuka"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:14
+msgid "6 of Passover"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:15
+msgid "6 of Sukot"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:16
+msgid "7 of Hanuka"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:17
+msgid "7 of Passover"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:18
+msgid "7 of Sukot"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:19
+msgid "8 of Hanuka"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:20
+msgid "Bulgaria"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:21
 #: ../gramps/plugins/tool/extractcity.py:64
 msgid "Canada"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:3
-msgid "Czech Republic"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:4
+#: ../gramps/plugins/lib/holidays.xml.in.h:22
 msgid "Chile"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:6
+#: ../gramps/plugins/lib/holidays.xml.in.h:24
 msgid "Croatia"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:7
+#: ../gramps/plugins/lib/holidays.xml.in.h:25
+msgid "Czech Republic"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:26
 msgid "England"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:8
+#: ../gramps/plugins/lib/holidays.xml.in.h:27
 msgid "Finland"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:9
+#: ../gramps/plugins/lib/holidays.xml.in.h:28
 #: ../gramps/plugins/tool/extractcity.py:64
 msgid "France"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:10
+#: ../gramps/plugins/lib/holidays.xml.in.h:29
 msgid "Germany"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:11
+#: ../gramps/plugins/lib/holidays.xml.in.h:30
+msgid "Hanuka"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:31
 msgid "Japan"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:12
+#: ../gramps/plugins/lib/holidays.xml.in.h:32
+msgid "Jewish Holidays"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:33
+msgid "New Zealand"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:34
+msgid "Passover"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:35
+msgid "Purim"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:36
+msgid "Rosh Ha'Shana"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:37
+msgid "Rosh Ha'Shana 2"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:38
+msgid "Shavuot"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:39
+msgid "Simhat Tora"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:40
+msgid "Sukot"
+msgstr ""
+
+#: ../gramps/plugins/lib/holidays.xml.in.h:41
 msgid "Sweden - Holidays"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:13
+#: ../gramps/plugins/lib/holidays.xml.in.h:42
 #: ../gramps/plugins/tool/extractcity.py:64
 msgid "United States of America"
 msgstr ""
 
-#: ../gramps/plugins/lib/holidays.xml.in.h:14
-msgid "Jewish Holidays"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:15
-msgid "Purim"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:16
-msgid "Passover"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:17
-msgid "2 of Passover"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:18
-msgid "3 of Passover"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:19
-msgid "4 of Passover"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:20
-msgid "5 of Passover"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:21
-msgid "6 of Passover"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:22
-msgid "7 of Passover"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:23
-msgid "Shavuot"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:24
-msgid "Rosh Ha'Shana"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:25
-msgid "Rosh Ha'Shana 2"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:26
-msgid "Yom Kippur"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:27
-msgid "Sukot"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:28
-msgid "2 of Sukot"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:29
-msgid "3 of Sukot"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:30
-msgid "4 of Sukot"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:31
-msgid "5 of Sukot"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:32
-msgid "6 of Sukot"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:33
-msgid "7 of Sukot"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:34
-msgid "Simhat Tora"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:35
-msgid "Hanuka"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:36
-msgid "2 of Hanuka"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:37
-msgid "3 of Hanuka"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:38
-msgid "4 of Hanuka"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:39
-msgid "5 of Hanuka"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:40
-msgid "6 of Hanuka"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:41
-msgid "7 of Hanuka"
-msgstr ""
-
-#: ../gramps/plugins/lib/holidays.xml.in.h:42
-msgid "8 of Hanuka"
-msgstr ""
-
 #: ../gramps/plugins/lib/holidays.xml.in.h:43
-msgid "New Zealand"
+msgid "Yom Kippur"
 msgstr ""
 
 #: ../gramps/plugins/lib/libgedcom.py:1765
@@ -19802,8 +19805,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:197
 #, python-format
 msgid ""
-"%(male_name)s died on %(death_date)s in %(death_place)s at the age of "
-"%(age)s."
+"%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:200
@@ -19814,8 +19817,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:201
 #, python-format
 msgid ""
-"%(female_name)s died on %(death_date)s in %(death_place)s at the age of "
-"%(age)s."
+"%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
+"(age)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:205
@@ -20078,8 +20081,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:329
 #, python-format
 msgid ""
-"%(male_name)s died in %(month_year)s in %(death_place)s at the age of "
-"%(age)s."
+"%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:332
@@ -20090,8 +20093,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:333
 #, python-format
 msgid ""
-"%(female_name)s died in %(month_year)s in %(death_place)s at the age of "
-"%(age)s."
+"%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
+"(age)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:337
@@ -20324,8 +20327,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:466
 #, python-format
 msgid ""
-"%(female_name)s was buried on %(burial_date)s in %(burial_place)s"
-"%(endnotes)s."
+"%(female_name)s was buried on %(burial_date)s in %(burial_place)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:467
@@ -20336,8 +20339,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:470
 #, python-format
 msgid ""
-"%(unknown_gender_name)s was buried on %(burial_date)s in %(burial_place)s"
-"%(endnotes)s."
+"%(unknown_gender_name)s was buried on %(burial_date)s in %(burial_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:471
@@ -20411,8 +20414,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:502
 #, python-format
 msgid ""
-"%(unknown_gender_name)s was buried in %(month_year)s in %(burial_place)s"
-"%(endnotes)s."
+"%(unknown_gender_name)s was buried in %(month_year)s in %(burial_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:503
@@ -20486,8 +20489,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:534
 #, python-format
 msgid ""
-"%(unknown_gender_name)s was buried %(modified_date)s in %(burial_place)s"
-"%(endnotes)s."
+"%(unknown_gender_name)s was buried %(modified_date)s in %(burial_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:535
@@ -20609,8 +20612,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:595
 #, python-format
 msgid ""
-"%(male_name)s was baptized on %(baptism_date)s in %(baptism_place)s"
-"%(endnotes)s."
+"%(male_name)s was baptized on %(baptism_date)s in %(baptism_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:596
@@ -20621,8 +20624,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:599
 #, python-format
 msgid ""
-"%(female_name)s was baptized on %(baptism_date)s in %(baptism_place)s"
-"%(endnotes)s."
+"%(female_name)s was baptized on %(baptism_date)s in %(baptism_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:600
@@ -20640,8 +20643,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:604
 #, python-format
 msgid ""
-"This person was baptized on %(baptism_date)s in %(baptism_place)s"
-"%(endnotes)s."
+"This person was baptized on %(baptism_date)s in %(baptism_place)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:606
@@ -20687,8 +20690,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:627
 #, python-format
 msgid ""
-"%(male_name)s was baptized in %(month_year)s in %(baptism_place)s"
-"%(endnotes)s."
+"%(male_name)s was baptized in %(month_year)s in %(baptism_place)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:628
@@ -20699,8 +20702,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:631
 #, python-format
 msgid ""
-"%(female_name)s was baptized in %(month_year)s in %(baptism_place)s"
-"%(endnotes)s."
+"%(female_name)s was baptized in %(month_year)s in %(baptism_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:632
@@ -20711,8 +20714,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:635
 #, python-format
 msgid ""
-"%(unknown_gender_name)s was baptized in %(month_year)s in %(baptism_place)s"
-"%(endnotes)s."
+"%(unknown_gender_name)s was baptized in %(month_year)s in %(baptism_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:636
@@ -20764,8 +20767,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:659
 #, python-format
 msgid ""
-"%(male_name)s was baptized %(modified_date)s in %(baptism_place)s"
-"%(endnotes)s."
+"%(male_name)s was baptized %(modified_date)s in %(baptism_place)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:660
@@ -20776,8 +20779,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:663
 #, python-format
 msgid ""
-"%(female_name)s was baptized %(modified_date)s in %(baptism_place)s"
-"%(endnotes)s."
+"%(female_name)s was baptized %(modified_date)s in %(baptism_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:664
@@ -20788,8 +20791,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:667
 #, python-format
 msgid ""
-"%(unknown_gender_name)s was baptized %(modified_date)s in %(baptism_place)s"
-"%(endnotes)s."
+"%(unknown_gender_name)s was baptized %(modified_date)s in %(baptism_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:668
@@ -20918,36 +20921,36 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:729
 #, python-format
 msgid ""
-"He was christened on %(christening_date)s in %(christening_place)s"
-"%(endnotes)s."
+"He was christened on %(christening_date)s in %(christening_place)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:732
 #, python-format
 msgid ""
-"%(female_name)s was christened on %(christening_date)s in "
-"%(christening_place)s%(endnotes)s."
+"%(female_name)s was christened on %(christening_date)s in %"
+"(christening_place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:733
 #, python-format
 msgid ""
-"She was christened on %(christening_date)s in %(christening_place)s"
-"%(endnotes)s."
+"She was christened on %(christening_date)s in %(christening_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:736
 #, python-format
 msgid ""
-"%(unknown_gender_name)s was christened on %(christening_date)s in "
-"%(christening_place)s%(endnotes)s."
+"%(unknown_gender_name)s was christened on %(christening_date)s in %"
+"(christening_place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:737
 #, python-format
 msgid ""
-"This person was christened on %(christening_date)s in %(christening_place)s"
-"%(endnotes)s."
+"This person was christened on %(christening_date)s in %(christening_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:739
@@ -20994,8 +20997,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:760
 #, python-format
 msgid ""
-"%(male_name)s was christened in %(month_year)s in %(christening_place)s"
-"%(endnotes)s."
+"%(male_name)s was christened in %(month_year)s in %(christening_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:761
@@ -21007,8 +21010,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:764
 #, python-format
 msgid ""
-"%(female_name)s was christened in %(month_year)s in %(christening_place)s"
-"%(endnotes)s."
+"%(female_name)s was christened in %(month_year)s in %(christening_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:765
@@ -21020,15 +21023,15 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:768
 #, python-format
 msgid ""
-"%(unknown_gender_name)s was christened in %(month_year)s in "
-"%(christening_place)s%(endnotes)s."
+"%(unknown_gender_name)s was christened in %(month_year)s in %"
+"(christening_place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:769
 #, python-format
 msgid ""
-"This person was christened in %(month_year)s in %(christening_place)s"
-"%(endnotes)s."
+"This person was christened in %(month_year)s in %(christening_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:771
@@ -21074,8 +21077,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:792
 #, python-format
 msgid ""
-"%(male_name)s was christened %(modified_date)s in %(christening_place)s"
-"%(endnotes)s."
+"%(male_name)s was christened %(modified_date)s in %(christening_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:793
@@ -21087,8 +21090,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:796
 #, python-format
 msgid ""
-"%(female_name)s was christened %(modified_date)s in %(christening_place)s"
-"%(endnotes)s."
+"%(female_name)s was christened %(modified_date)s in %(christening_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:797
@@ -21100,15 +21103,15 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:800
 #, python-format
 msgid ""
-"%(unknown_gender_name)s was christened %(modified_date)s in "
-"%(christening_place)s%(endnotes)s."
+"%(unknown_gender_name)s was christened %(modified_date)s in %"
+"(christening_place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:801
 #, python-format
 msgid ""
-"This person was christened %(modified_date)s in %(christening_place)s"
-"%(endnotes)s."
+"This person was christened %(modified_date)s in %(christening_place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:803
@@ -21513,22 +21516,22 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:997
 #, python-format
 msgid ""
-"This person also married %(spouse)s in %(partial_date)s in %(place)s"
-"%(endnotes)s."
+"This person also married %(spouse)s in %(partial_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:998
 #, python-format
 msgid ""
-"This person also married %(spouse)s on %(full_date)s in %(place)s"
-"%(endnotes)s."
+"This person also married %(spouse)s on %(full_date)s in %(place)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:999
 #, python-format
 msgid ""
-"This person also married %(spouse)s %(modified_date)s in %(place)s"
-"%(endnotes)s."
+"This person also married %(spouse)s %(modified_date)s in %(place)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1002
@@ -21781,8 +21784,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1099
 #, python-format
 msgid ""
-"This person had an unmarried relationship with %(spouse)s in "
-"%(partial_date)s in %(place)s%(endnotes)s."
+"This person had an unmarried relationship with %(spouse)s in %(partial_date)"
+"s in %(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1100
@@ -21802,88 +21805,88 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1104
 #, python-format
 msgid ""
-"He had an unmarried relationship with %(spouse)s in %(partial_date)s in "
-"%(place)s%(endnotes)s."
+"He had an unmarried relationship with %(spouse)s in %(partial_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1105
 #, python-format
 msgid ""
-"He had an unmarried relationship with %(spouse)s on %(full_date)s in "
-"%(place)s%(endnotes)s."
+"He had an unmarried relationship with %(spouse)s on %(full_date)s in %(place)"
+"s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1106
 #, python-format
 msgid ""
-"He had an unmarried relationship with %(spouse)s %(modified_date)s in "
-"%(place)s%(endnotes)s."
+"He had an unmarried relationship with %(spouse)s %(modified_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1109
 #, python-format
 msgid ""
-"She had an unmarried relationship with %(spouse)s in %(partial_date)s in "
-"%(place)s%(endnotes)s."
+"She had an unmarried relationship with %(spouse)s in %(partial_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1110
 #, python-format
 msgid ""
-"She had an unmarried relationship with %(spouse)s on %(full_date)s in "
-"%(place)s%(endnotes)s."
+"She had an unmarried relationship with %(spouse)s on %(full_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1111
 #, python-format
 msgid ""
-"She had an unmarried relationship with %(spouse)s %(modified_date)s in "
-"%(place)s%(endnotes)s."
+"She had an unmarried relationship with %(spouse)s %(modified_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1114
 #: ../gramps/plugins/lib/libnarrate.py:1137
 #, python-format
 msgid ""
-"Unmarried relationship with %(spouse)s %(partial_date)s in %(place)s"
-"%(endnotes)s."
+"Unmarried relationship with %(spouse)s %(partial_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1115
 #: ../gramps/plugins/lib/libnarrate.py:1138
 #, python-format
 msgid ""
-"Unmarried relationship with %(spouse)s %(full_date)s in %(place)s"
-"%(endnotes)s."
+"Unmarried relationship with %(spouse)s %(full_date)s in %(place)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1116
 #: ../gramps/plugins/lib/libnarrate.py:1139
 #, python-format
 msgid ""
-"Unmarried relationship with %(spouse)s %(modified_date)s in %(place)s"
-"%(endnotes)s."
+"Unmarried relationship with %(spouse)s %(modified_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1122
 #, python-format
 msgid ""
-"This person also had an unmarried relationship with %(spouse)s in "
-"%(partial_date)s in %(place)s%(endnotes)s."
+"This person also had an unmarried relationship with %(spouse)s in %"
+"(partial_date)s in %(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1123
 #, python-format
 msgid ""
-"This person also had an unmarried relationship with %(spouse)s on "
-"%(full_date)s in %(place)s%(endnotes)s."
+"This person also had an unmarried relationship with %(spouse)s on %"
+"(full_date)s in %(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1124
 #, python-format
 msgid ""
-"This person also had an unmarried relationship with %(spouse)s "
-"%(modified_date)s in %(place)s%(endnotes)s."
+"This person also had an unmarried relationship with %(spouse)s %"
+"(modified_date)s in %(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1127
@@ -21896,15 +21899,15 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1128
 #, python-format
 msgid ""
-"He also had an unmarried relationship with %(spouse)s on %(full_date)s in "
-"%(place)s%(endnotes)s."
+"He also had an unmarried relationship with %(spouse)s on %(full_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1129
 #, python-format
 msgid ""
-"He also had an unmarried relationship with %(spouse)s %(modified_date)s in "
-"%(place)s%(endnotes)s."
+"He also had an unmarried relationship with %(spouse)s %(modified_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1132
@@ -21917,15 +21920,15 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1133
 #, python-format
 msgid ""
-"She also had an unmarried relationship with %(spouse)s on %(full_date)s in "
-"%(place)s%(endnotes)s."
+"She also had an unmarried relationship with %(spouse)s on %(full_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1134
 #, python-format
 msgid ""
-"She also had an unmarried relationship with %(spouse)s %(modified_date)s in "
-"%(place)s%(endnotes)s."
+"She also had an unmarried relationship with %(spouse)s %(modified_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1145
@@ -21938,57 +21941,57 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1146
 #, python-format
 msgid ""
-"This person had an unmarried relationship with %(spouse)s on %(full_date)s"
-"%(endnotes)s."
+"This person had an unmarried relationship with %(spouse)s on %(full_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1147
 #, python-format
 msgid ""
-"This person had an unmarried relationship with %(spouse)s %(modified_date)s"
-"%(endnotes)s."
+"This person had an unmarried relationship with %(spouse)s %(modified_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1150
 #, python-format
 msgid ""
-"He had an unmarried relationship with %(spouse)s in %(partial_date)s"
-"%(endnotes)s."
+"He had an unmarried relationship with %(spouse)s in %(partial_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1151
 #, python-format
 msgid ""
-"He had an unmarried relationship with %(spouse)s on %(full_date)s"
-"%(endnotes)s."
+"He had an unmarried relationship with %(spouse)s on %(full_date)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1152
 #, python-format
 msgid ""
-"He had an unmarried relationship with %(spouse)s %(modified_date)s"
-"%(endnotes)s."
+"He had an unmarried relationship with %(spouse)s %(modified_date)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1155
 #, python-format
 msgid ""
-"She had an unmarried relationship with %(spouse)s in %(partial_date)s"
-"%(endnotes)s."
+"She had an unmarried relationship with %(spouse)s in %(partial_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1156
 #, python-format
 msgid ""
-"She had an unmarried relationship with %(spouse)s on %(full_date)s"
-"%(endnotes)s."
+"She had an unmarried relationship with %(spouse)s on %(full_date)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1157
 #, python-format
 msgid ""
-"She had an unmarried relationship with %(spouse)s %(modified_date)s"
-"%(endnotes)s."
+"She had an unmarried relationship with %(spouse)s %(modified_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1160
@@ -22009,64 +22012,64 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1168
 #, python-format
 msgid ""
-"This person also had an unmarried relationship with %(spouse)s in "
-"%(partial_date)s%(endnotes)s."
+"This person also had an unmarried relationship with %(spouse)s in %"
+"(partial_date)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1169
 #, python-format
 msgid ""
-"This person also had an unmarried relationship with %(spouse)s on "
-"%(full_date)s%(endnotes)s."
+"This person also had an unmarried relationship with %(spouse)s on %"
+"(full_date)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1170
 #, python-format
 msgid ""
-"This person also had an unmarried relationship with %(spouse)s "
-"%(modified_date)s%(endnotes)s."
+"This person also had an unmarried relationship with %(spouse)s %"
+"(modified_date)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1173
 #, python-format
 msgid ""
-"He also had an unmarried relationship with %(spouse)s in %(partial_date)s"
-"%(endnotes)s."
+"He also had an unmarried relationship with %(spouse)s in %(partial_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1174
 #, python-format
 msgid ""
-"He also had an unmarried relationship with %(spouse)s on %(full_date)s"
-"%(endnotes)s."
+"He also had an unmarried relationship with %(spouse)s on %(full_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1175
 #, python-format
 msgid ""
-"He also had an unmarried relationship with %(spouse)s %(modified_date)s"
-"%(endnotes)s."
+"He also had an unmarried relationship with %(spouse)s %(modified_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1178
 #, python-format
 msgid ""
-"She also had an unmarried relationship with %(spouse)s in %(partial_date)s"
-"%(endnotes)s."
+"She also had an unmarried relationship with %(spouse)s in %(partial_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1179
 #, python-format
 msgid ""
-"She also had an unmarried relationship with %(spouse)s on %(full_date)s"
-"%(endnotes)s."
+"She also had an unmarried relationship with %(spouse)s on %(full_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1180
 #, python-format
 msgid ""
-"She also had an unmarried relationship with %(spouse)s %(modified_date)s"
-"%(endnotes)s."
+"She also had an unmarried relationship with %(spouse)s %(modified_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1183
@@ -22089,8 +22092,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1190
 #, python-format
 msgid ""
-"This person had an unmarried relationship with %(spouse)s in %(place)s"
-"%(endnotes)s."
+"This person had an unmarried relationship with %(spouse)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1191
@@ -22114,22 +22117,22 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1197
 #, python-format
 msgid ""
-"This person also had an unmarried relationship with %(spouse)s in %(place)s"
-"%(endnotes)s."
+"This person also had an unmarried relationship with %(spouse)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1198
 #, python-format
 msgid ""
-"He also had an unmarried relationship with %(spouse)s in %(place)s"
-"%(endnotes)s."
+"He also had an unmarried relationship with %(spouse)s in %(place)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1199
 #, python-format
 msgid ""
-"She also had an unmarried relationship with %(spouse)s in %(place)s"
-"%(endnotes)s."
+"She also had an unmarried relationship with %(spouse)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1204
@@ -22172,15 +22175,15 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1225
 #, python-format
 msgid ""
-"This person had a relationship with %(spouse)s in %(partial_date)s in "
-"%(place)s%(endnotes)s."
+"This person had a relationship with %(spouse)s in %(partial_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1226
 #, python-format
 msgid ""
-"This person had a relationship with %(spouse)s on %(full_date)s in %(place)s"
-"%(endnotes)s."
+"This person had a relationship with %(spouse)s on %(full_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1227
@@ -22193,43 +22196,43 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1230
 #, python-format
 msgid ""
-"He had a relationship with %(spouse)s in %(partial_date)s in %(place)s"
-"%(endnotes)s."
+"He had a relationship with %(spouse)s in %(partial_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1231
 #, python-format
 msgid ""
-"He had a relationship with %(spouse)s on %(full_date)s in %(place)s"
-"%(endnotes)s."
+"He had a relationship with %(spouse)s on %(full_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1232
 #, python-format
 msgid ""
-"He had a relationship with %(spouse)s %(modified_date)s in %(place)s"
-"%(endnotes)s."
+"He had a relationship with %(spouse)s %(modified_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1235
 #, python-format
 msgid ""
-"She had a relationship with %(spouse)s in %(partial_date)s in %(place)s"
-"%(endnotes)s."
+"She had a relationship with %(spouse)s in %(partial_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1236
 #, python-format
 msgid ""
-"She had a relationship with %(spouse)s on %(full_date)s in %(place)s"
-"%(endnotes)s."
+"She had a relationship with %(spouse)s on %(full_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1237
 #, python-format
 msgid ""
-"She had a relationship with %(spouse)s %(modified_date)s in %(place)s"
-"%(endnotes)s."
+"She had a relationship with %(spouse)s %(modified_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1240
@@ -22251,64 +22254,64 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1248
 #, python-format
 msgid ""
-"This person also had a relationship with %(spouse)s in %(partial_date)s in "
-"%(place)s%(endnotes)s."
+"This person also had a relationship with %(spouse)s in %(partial_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1249
 #, python-format
 msgid ""
-"This person also had a relationship with %(spouse)s on %(full_date)s in "
-"%(place)s%(endnotes)s."
+"This person also had a relationship with %(spouse)s on %(full_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1250
 #, python-format
 msgid ""
-"This person also had a relationship with %(spouse)s %(modified_date)s in "
-"%(place)s%(endnotes)s."
+"This person also had a relationship with %(spouse)s %(modified_date)s in %"
+"(place)s%(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1253
 #, python-format
 msgid ""
-"He also had a relationship with %(spouse)s in %(partial_date)s in %(place)s"
-"%(endnotes)s."
+"He also had a relationship with %(spouse)s in %(partial_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1254
 #, python-format
 msgid ""
-"He also had a relationship with %(spouse)s on %(full_date)s in %(place)s"
-"%(endnotes)s."
+"He also had a relationship with %(spouse)s on %(full_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1255
 #, python-format
 msgid ""
-"He also had a relationship with %(spouse)s %(modified_date)s in %(place)s"
-"%(endnotes)s."
+"He also had a relationship with %(spouse)s %(modified_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1258
 #, python-format
 msgid ""
-"She also had a relationship with %(spouse)s in %(partial_date)s in %(place)s"
-"%(endnotes)s."
+"She also had a relationship with %(spouse)s in %(partial_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1259
 #, python-format
 msgid ""
-"She also had a relationship with %(spouse)s on %(full_date)s in %(place)s"
-"%(endnotes)s."
+"She also had a relationship with %(spouse)s on %(full_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1260
 #, python-format
 msgid ""
-"She also had a relationship with %(spouse)s %(modified_date)s in %(place)s"
-"%(endnotes)s."
+"She also had a relationship with %(spouse)s %(modified_date)s in %(place)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1263
@@ -22332,8 +22335,8 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1271
 #, python-format
 msgid ""
-"This person had a relationship with %(spouse)s in %(partial_date)s"
-"%(endnotes)s."
+"This person had a relationship with %(spouse)s in %(partial_date)s%(endnotes)"
+"s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1272
@@ -22396,22 +22399,22 @@ msgstr ""
 #: ../gramps/plugins/lib/libnarrate.py:1294
 #, python-format
 msgid ""
-"This person also had a relationship with %(spouse)s in %(partial_date)s"
-"%(endnotes)s."
+"This person also had a relationship with %(spouse)s in %(partial_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1295
 #, python-format
 msgid ""
-"This person also had a relationship with %(spouse)s on %(full_date)s"
-"%(endnotes)s."
+"This person also had a relationship with %(spouse)s on %(full_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1296
 #, python-format
 msgid ""
-"This person also had a relationship with %(spouse)s %(modified_date)s"
-"%(endnotes)s."
+"This person also had a relationship with %(spouse)s %(modified_date)s%"
+"(endnotes)s."
 msgstr ""
 
 #: ../gramps/plugins/lib/libnarrate.py:1299
@@ -22741,71 +22744,71 @@ msgid ""
 "Provides the base needed for the ancestor and descendant graphical reports."
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:55
+#: ../gramps/plugins/lib/librecords.py:56
 msgid "Youngest living person"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:56
+#: ../gramps/plugins/lib/librecords.py:57
 msgid "Oldest living person"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:57
+#: ../gramps/plugins/lib/librecords.py:58
 msgid "Person died at youngest age"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:58
+#: ../gramps/plugins/lib/librecords.py:59
 msgid "Person died at oldest age"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:59
+#: ../gramps/plugins/lib/librecords.py:60
 msgid "Person married at youngest age"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:60
+#: ../gramps/plugins/lib/librecords.py:61
 msgid "Person married at oldest age"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:61
+#: ../gramps/plugins/lib/librecords.py:62
 msgid "Person divorced at youngest age"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:62
+#: ../gramps/plugins/lib/librecords.py:63
 msgid "Person divorced at oldest age"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:63
+#: ../gramps/plugins/lib/librecords.py:64
 msgid "Youngest father"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:64
+#: ../gramps/plugins/lib/librecords.py:65
 msgid "Youngest mother"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:65
+#: ../gramps/plugins/lib/librecords.py:66
 msgid "Oldest father"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:66
+#: ../gramps/plugins/lib/librecords.py:67
 msgid "Oldest mother"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:67
+#: ../gramps/plugins/lib/librecords.py:68
 msgid "Couple with most children"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:68
+#: ../gramps/plugins/lib/librecords.py:69
 msgid "Living couple married most recently"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:69
+#: ../gramps/plugins/lib/librecords.py:70
 msgid "Living couple married most long ago"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:70
+#: ../gramps/plugins/lib/librecords.py:71
 msgid "Shortest past marriage"
 msgstr ""
 
-#: ../gramps/plugins/lib/librecords.py:71
+#: ../gramps/plugins/lib/librecords.py:72
 msgid "Longest past marriage"
 msgstr ""
 
@@ -22872,8 +22875,8 @@ msgstr ""
 #: ../gramps/plugins/view/geoperson.py:413
 #: ../gramps/plugins/view/geoperson.py:433
 #: ../gramps/plugins/view/geoperson.py:470
-#: ../gramps/plugins/view/geoplaces.py:317
-#: ../gramps/plugins/view/geoplaces.py:335
+#: ../gramps/plugins/view/geoplaces.py:318
+#: ../gramps/plugins/view/geoplaces.py:336
 msgid "Center on this place"
 msgstr ""
 
@@ -23018,7 +23021,7 @@ msgid "Open on maps.google.com"
 msgstr ""
 
 #: ../gramps/plugins/mapservices/mapservice.gpr.py:69
-#: ../gramps/plugins/webreport/narrativeweb.py:8307
+#: ../gramps/plugins/webreport/narrativeweb.py:8309
 msgid "OpenStreetMap"
 msgstr ""
 
@@ -23821,6 +23824,7 @@ msgstr ""
 msgid "The style used for index entries."
 msgstr ""
 
+#. feature request 2356: avoid genitive form
 #: ../gramps/plugins/textreport/ancestorreport.py:191
 #, python-format
 msgid "Ahnentafel Report for %s"
@@ -23846,90 +23850,91 @@ msgstr ""
 msgid "Indicates if a line break should follow the name."
 msgstr ""
 
-#. feature request 2356: avoid genitive form
-#: ../gramps/plugins/textreport/birthdayreport.py:180
-#, python-format
-msgid "Relationships shown are to %s"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:183
-#: ../gramps/plugins/textreport/birthdayreport.py:222
-#: ../gramps/plugins/textreport/birthdayreport.py:231
-#: ../gramps/plugins/textreport/birthdayreport.py:438
+#. _T_ is a gramps-defined keyword -- see po/update_po.py and po/genpot.sh
+#: ../gramps/plugins/textreport/birthdayreport.py:66
+#: ../gramps/plugins/textreport/birthdayreport.py:219
+#: ../gramps/plugins/textreport/birthdayreport.py:259
+#: ../gramps/plugins/textreport/birthdayreport.py:270
 #: ../gramps/plugins/textreport/textplugins.gpr.py:54
 msgid "Birthday and Anniversary Report"
 msgstr ""
 
-#: ../gramps/plugins/textreport/birthdayreport.py:371
-#: ../gramps/plugins/textreport/birthdayreport.py:373
-msgid "Year of report"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:378
-msgid "Select filter to restrict people that appear on report"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:408
-msgid "Select the first day of the week for the report"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:419
-msgid "Include only living people in the report"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:423
-msgid "Include birthdays in the report"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:427
-msgid "Include anniversaries in the report"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:430
-msgid "Include relationships to center person"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:432
-msgid "Include relationships to center person (slower)"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:437
-msgid "Title text"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:439
-msgid "Title of report"
-msgstr ""
-
-#: ../gramps/plugins/textreport/birthdayreport.py:442
+#: ../gramps/plugins/textreport/birthdayreport.py:67
 msgid "My Birthday Report"
 msgstr ""
 
-#: ../gramps/plugins/textreport/birthdayreport.py:443
+#. feature request 2356: avoid genitive form
+#: ../gramps/plugins/textreport/birthdayreport.py:216
+#, python-format
+msgid "Relationships shown are to %s"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:412
+#: ../gramps/plugins/textreport/birthdayreport.py:414
+msgid "Year of report"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:419
+msgid "Select filter to restrict people that appear on report"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:449
+msgid "Select the first day of the week for the report"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:460
+msgid "Include only living people in the report"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:464
+msgid "Include birthdays in the report"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:468
+msgid "Include anniversaries in the report"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:471
+msgid "Include relationships to center person"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:473
+msgid "Include relationships to center person (slower)"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:480
+msgid "Title text"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:481
+msgid "Title of report"
+msgstr ""
+
+#: ../gramps/plugins/textreport/birthdayreport.py:485
 msgid "First line of text at bottom of report"
 msgstr ""
 
-#: ../gramps/plugins/textreport/birthdayreport.py:447
+#: ../gramps/plugins/textreport/birthdayreport.py:489
 msgid "Second line of text at bottom of report"
 msgstr ""
 
-#: ../gramps/plugins/textreport/birthdayreport.py:451
+#: ../gramps/plugins/textreport/birthdayreport.py:493
 msgid "Third line of text at bottom of report"
 msgstr ""
 
-#: ../gramps/plugins/textreport/birthdayreport.py:505
+#: ../gramps/plugins/textreport/birthdayreport.py:547
 msgid "Title text style"
 msgstr ""
 
-#: ../gramps/plugins/textreport/birthdayreport.py:508
+#: ../gramps/plugins/textreport/birthdayreport.py:550
 msgid "Data text display"
 msgstr ""
 
-#: ../gramps/plugins/textreport/birthdayreport.py:510
+#: ../gramps/plugins/textreport/birthdayreport.py:552
 msgid "Day text style"
 msgstr ""
 
-#: ../gramps/plugins/textreport/birthdayreport.py:513
+#: ../gramps/plugins/textreport/birthdayreport.py:555
 msgid "Month text style"
 msgstr ""
 
@@ -24050,7 +24055,7 @@ msgid "The style used for the spouse level %d display."
 msgstr ""
 
 #. feature request 2356: avoid genitive form
-#: ../gramps/plugins/textreport/detancestralreport.py:188
+#: ../gramps/plugins/textreport/detancestralreport.py:190
 #, python-format
 msgid "Ancestral Report for %s"
 msgstr ""
@@ -24062,7 +24067,7 @@ msgid "%(name)s is the same person as [%(id_str)s]."
 msgstr ""
 
 #. feature request 2356: avoid genitive form
-#: ../gramps/plugins/textreport/detancestralreport.py:310
+#: ../gramps/plugins/textreport/detancestralreport.py:312
 #: ../gramps/plugins/textreport/detdescendantreport.py:772
 #, python-format
 msgid "Notes for %s"
@@ -24151,19 +24156,19 @@ msgstr ""
 
 #: ../gramps/plugins/textreport/detancestralreport.py:737
 #: ../gramps/plugins/textreport/detdescendantreport.py:911
-#: ../gramps/plugins/textreport/indivcomplete.py:716
+#: ../gramps/plugins/textreport/indivcomplete.py:717
 msgid "Page break before end notes"
 msgstr ""
 
 #: ../gramps/plugins/textreport/detancestralreport.py:739
 #: ../gramps/plugins/textreport/detdescendantreport.py:913
-#: ../gramps/plugins/textreport/indivcomplete.py:718
+#: ../gramps/plugins/textreport/indivcomplete.py:719
 msgid "Whether to start a new page before the end notes."
 msgstr ""
 
 #. Content options
 #. Content
-#: ../gramps/plugins/textreport/detancestralreport.py:744
+#: ../gramps/plugins/textreport/detancestralreport.py:746
 #: ../gramps/plugins/textreport/detdescendantreport.py:920
 #: ../gramps/plugins/view/relview.py:1691
 msgid "Content"
@@ -24261,13 +24266,13 @@ msgstr ""
 
 #: ../gramps/plugins/textreport/detancestralreport.py:791
 #: ../gramps/plugins/textreport/detdescendantreport.py:965
-#: ../gramps/plugins/textreport/indivcomplete.py:730
+#: ../gramps/plugins/textreport/indivcomplete.py:731
 msgid "Include Photo/Images from Gallery"
 msgstr ""
 
 #: ../gramps/plugins/textreport/detancestralreport.py:792
 #: ../gramps/plugins/textreport/detdescendantreport.py:966
-#: ../gramps/plugins/textreport/indivcomplete.py:731
+#: ../gramps/plugins/textreport/indivcomplete.py:732
 msgid "Whether to include images."
 msgstr ""
 
@@ -24313,13 +24318,13 @@ msgstr ""
 
 #: ../gramps/plugins/textreport/detancestralreport.py:811
 #: ../gramps/plugins/textreport/detdescendantreport.py:985
-#: ../gramps/plugins/textreport/indivcomplete.py:725
+#: ../gramps/plugins/textreport/indivcomplete.py:726
 msgid "Include sources notes"
 msgstr ""
 
 #: ../gramps/plugins/textreport/detancestralreport.py:812
 #: ../gramps/plugins/textreport/detdescendantreport.py:986
-#: ../gramps/plugins/textreport/indivcomplete.py:726
+#: ../gramps/plugins/textreport/indivcomplete.py:727
 msgid ""
 "Whether to include source notes in the Endnotes section. Only works if "
 "Include sources is selected."
@@ -24327,7 +24332,7 @@ msgstr ""
 
 #. How to handle missing information
 #. Missing information
-#: ../gramps/plugins/textreport/detancestralreport.py:816
+#: ../gramps/plugins/textreport/detancestralreport.py:818
 #: ../gramps/plugins/textreport/detdescendantreport.py:1012
 msgid "Missing information"
 msgstr ""
@@ -24612,91 +24617,92 @@ msgstr ""
 msgid "The style used for the parent's name"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:72
+#. _T_ is a gramps-defined keyword -- see po/update_po.py and po/genpot.sh
+#: ../gramps/plugins/textreport/indivcomplete.py:73
 msgid "Sections"
 msgstr ""
 
 #. only used in add_menu_options (so no _T_)
 #. headers for the sections
-#: ../gramps/plugins/textreport/indivcomplete.py:74
+#: ../gramps/plugins/textreport/indivcomplete.py:75
 msgid "Individual Facts"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:219
+#: ../gramps/plugins/textreport/indivcomplete.py:220
 #, python-format
 msgid "%s in %s. "
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:310
+#: ../gramps/plugins/textreport/indivcomplete.py:311
 msgid "Alternate Parents"
 msgstr ""
 
 #. RTL languages are the only reason for "translating" this
-#: ../gramps/plugins/textreport/indivcomplete.py:358
+#: ../gramps/plugins/textreport/indivcomplete.py:360
 #, python-format
 msgid "%(name)s [%(gid)s]"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:432
+#: ../gramps/plugins/textreport/indivcomplete.py:433
 msgid "Marriages/Children"
 msgstr ""
 
 #. feature request 2356: avoid genitive form
-#: ../gramps/plugins/textreport/indivcomplete.py:576
+#: ../gramps/plugins/textreport/indivcomplete.py:578
 #, python-format
 msgid "Summary of %s"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:633
+#: ../gramps/plugins/textreport/indivcomplete.py:634
 msgid "Male"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:635
+#: ../gramps/plugins/textreport/indivcomplete.py:636
 msgid "Female"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:699
+#: ../gramps/plugins/textreport/indivcomplete.py:700
 msgid "Select the filter to be applied to the report."
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:712
+#: ../gramps/plugins/textreport/indivcomplete.py:713
 msgid "List events chronologically"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:713
+#: ../gramps/plugins/textreport/indivcomplete.py:714
 msgid "Whether to sort events into chronological order."
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:721
+#: ../gramps/plugins/textreport/indivcomplete.py:722
 msgid "Include Source Information"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:722
+#: ../gramps/plugins/textreport/indivcomplete.py:723
 msgid "Whether to cite sources."
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:734
+#: ../gramps/plugins/textreport/indivcomplete.py:735
 msgid "Include Gramps ID"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:735
+#: ../gramps/plugins/textreport/indivcomplete.py:736
 msgid "Whether to include Gramps ID next to names."
 msgstr ""
 
 #. ###############################
-#: ../gramps/plugins/textreport/indivcomplete.py:742
+#: ../gramps/plugins/textreport/indivcomplete.py:744
 msgid "Event groups"
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:744
+#: ../gramps/plugins/textreport/indivcomplete.py:745
 msgid "Check if a separate section is required."
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:797
+#: ../gramps/plugins/textreport/indivcomplete.py:798
 msgid "The style used for category labels."
 msgstr ""
 
-#: ../gramps/plugins/textreport/indivcomplete.py:808
+#: ../gramps/plugins/textreport/indivcomplete.py:809
 msgid "The style used for the spouse's name."
 msgstr ""
 
@@ -25291,11 +25297,11 @@ msgid ""
 msgstr ""
 
 #: ../gramps/plugins/tool/changetypes.glade.h:2
-msgid "_Original event type:"
+msgid "_New event type:"
 msgstr ""
 
 #: ../gramps/plugins/tool/changetypes.glade.h:3
-msgid "_New event type:"
+msgid "_Original event type:"
 msgstr ""
 
 #: ../gramps/plugins/tool/changetypes.py:64
@@ -25710,15 +25716,15 @@ msgid "Descendant Browser tool"
 msgstr ""
 
 #: ../gramps/plugins/tool/eval.glade.h:1
-msgid "<b>Evaluation Window</b>"
+msgid "<b>Error Window</b>"
 msgstr ""
 
 #: ../gramps/plugins/tool/eval.glade.h:2
-msgid "<b>Output Window</b>"
+msgid "<b>Evaluation Window</b>"
 msgstr ""
 
 #: ../gramps/plugins/tool/eval.glade.h:3
-msgid "<b>Error Window</b>"
+msgid "<b>Output Window</b>"
 msgstr ""
 
 #: ../gramps/plugins/tool/eval.py:59
@@ -25726,7 +25732,7 @@ msgid "Python evaluation window"
 msgstr ""
 
 #: ../gramps/plugins/tool/eventcmp.glade.h:1
-msgid "_Filter:"
+msgid "Custom filter _editor"
 msgstr ""
 
 #: ../gramps/plugins/tool/eventcmp.glade.h:2
@@ -25736,7 +25742,7 @@ msgid ""
 msgstr ""
 
 #: ../gramps/plugins/tool/eventcmp.glade.h:3
-msgid "Custom filter _editor"
+msgid "_Filter:"
 msgstr ""
 
 #: ../gramps/plugins/tool/eventcmp.py:72
@@ -25847,18 +25853,18 @@ msgid "<b>Match Threshold</b>"
 msgstr ""
 
 #: ../gramps/plugins/tool/finddupes.glade.h:3
-msgid "Use soundex codes"
-msgstr ""
-
-#: ../gramps/plugins/tool/finddupes.glade.h:4
 msgid "Co_mpare"
 msgstr ""
 
-#: ../gramps/plugins/tool/finddupes.glade.h:5
+#: ../gramps/plugins/tool/finddupes.glade.h:4
 #: ../gramps/plugins/tool/mergecitations.glade.h:4
 msgid "Please be patient. This may take a while."
 msgstr ""
 
+#: ../gramps/plugins/tool/finddupes.glade.h:5
+msgid "Use soundex codes"
+msgstr ""
+
 #: ../gramps/plugins/tool/finddupes.py:63
 msgid "Medium"
 msgstr ""
@@ -26215,28 +26221,28 @@ msgid_plural "Looking up the names of %d people"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gramps/plugins/tool/ownereditor.glade.h:2
-msgid "_Street:"
-msgstr ""
-
-#: ../gramps/plugins/tool/ownereditor.glade.h:3
+#: ../gramps/plugins/tool/ownereditor.glade.h:1
 msgid "_City:"
 msgstr ""
 
-#: ../gramps/plugins/tool/ownereditor.glade.h:5
+#: ../gramps/plugins/tool/ownereditor.glade.h:2
 msgid "_Country:"
 msgstr ""
 
-#: ../gramps/plugins/tool/ownereditor.glade.h:6
-msgid "_ZIP/Postal Code:"
+#: ../gramps/plugins/tool/ownereditor.glade.h:3
+msgid "_Email:"
 msgstr ""
 
-#: ../gramps/plugins/tool/ownereditor.glade.h:7
+#: ../gramps/plugins/tool/ownereditor.glade.h:6
 msgid "_Phone:"
 msgstr ""
 
 #: ../gramps/plugins/tool/ownereditor.glade.h:8
-msgid "_Email:"
+msgid "_Street:"
+msgstr ""
+
+#: ../gramps/plugins/tool/ownereditor.glade.h:9
+msgid "_ZIP/Postal Code:"
 msgstr ""
 
 #: ../gramps/plugins/tool/ownereditor.py:58
@@ -26252,10 +26258,6 @@ msgid "Edit database owner information"
 msgstr ""
 
 #: ../gramps/plugins/tool/patchnames.glade.h:1
-msgid "_Accept and close"
-msgstr ""
-
-#: ../gramps/plugins/tool/patchnames.glade.h:2
 msgid ""
 "Below is a list of the nicknames, titles, prefixes and compound surnames "
 "that Gramps can extract from the Family Tree.\n"
@@ -26271,6 +26273,10 @@ msgid ""
 "that can be extracted."
 msgstr ""
 
+#: ../gramps/plugins/tool/patchnames.glade.h:9
+msgid "_Accept and close"
+msgstr ""
+
 #: ../gramps/plugins/tool/patchnames.py:65
 msgid "manual|Extract_Information_from_Names"
 msgstr ""
@@ -26397,15 +26403,17 @@ msgid "Their common ancestors are: "
 msgstr ""
 
 #: ../gramps/plugins/tool/removeunused.glade.h:1
-msgid "Search for events"
+#: ../gramps/plugins/tool/verify.glade.h:1
+msgid "<b>Double-click on a row to view/edit data</b>"
 msgstr ""
 
 #: ../gramps/plugins/tool/removeunused.glade.h:2
-msgid "Search for sources"
+#: ../gramps/plugins/tool/verify.glade.h:6
+msgid "In_vert marks"
 msgstr ""
 
 #: ../gramps/plugins/tool/removeunused.glade.h:3
-msgid "Search for places"
+msgid "Search for events"
 msgstr ""
 
 #: ../gramps/plugins/tool/removeunused.glade.h:4
@@ -26413,31 +26421,29 @@ msgid "Search for media"
 msgstr ""
 
 #: ../gramps/plugins/tool/removeunused.glade.h:5
-msgid "Search for repositories"
-msgstr ""
-
-#: ../gramps/plugins/tool/removeunused.glade.h:6
 msgid "Search for notes"
 msgstr ""
 
+#: ../gramps/plugins/tool/removeunused.glade.h:6
+msgid "Search for places"
+msgstr ""
+
 #: ../gramps/plugins/tool/removeunused.glade.h:7
-#: ../gramps/plugins/tool/verify.glade.h:2
-msgid "_Mark all"
+msgid "Search for repositories"
 msgstr ""
 
 #: ../gramps/plugins/tool/removeunused.glade.h:8
-#: ../gramps/plugins/tool/verify.glade.h:3
-msgid "_Unmark all"
+msgid "Search for sources"
 msgstr ""
 
 #: ../gramps/plugins/tool/removeunused.glade.h:9
-#: ../gramps/plugins/tool/verify.glade.h:4
-msgid "In_vert marks"
+#: ../gramps/plugins/tool/verify.glade.h:24
+msgid "_Mark all"
 msgstr ""
 
 #: ../gramps/plugins/tool/removeunused.glade.h:10
-#: ../gramps/plugins/tool/verify.glade.h:1
-msgid "<b>Double-click on a row to view/edit data</b>"
+#: ../gramps/plugins/tool/verify.glade.h:26
+msgid "_Unmark all"
 msgstr ""
 
 #: ../gramps/plugins/tool/removeunused.py:81
@@ -26727,17 +26733,24 @@ msgid ""
 "Volume/Page, Date and Confidence."
 msgstr ""
 
+#: ../gramps/plugins/tool/verify.glade.h:2
+msgid "<b>Families</b>"
+msgstr ""
+
+#: ../gramps/plugins/tool/verify.glade.h:4
+msgid "<b>Men</b>"
+msgstr ""
+
 #: ../gramps/plugins/tool/verify.glade.h:5
-#: ../gramps/plugins/tool/verify.py:619
-msgid "_Hide marked"
+msgid "<b>Women</b>"
 msgstr ""
 
 #: ../gramps/plugins/tool/verify.glade.h:7
-msgid "Maximum _age"
+msgid "Ma_ximum age to bear a child"
 msgstr ""
 
 #: ../gramps/plugins/tool/verify.glade.h:8
-msgid "Mi_nimum age to marry"
+msgid "Ma_ximum age to father a child"
 msgstr ""
 
 #: ../gramps/plugins/tool/verify.glade.h:9
@@ -26745,11 +26758,11 @@ msgid "Ma_ximum age to marry"
 msgstr ""
 
 #: ../gramps/plugins/tool/verify.glade.h:10
-msgid "Maximum number of _spouses for a person"
+msgid "Maximum _age"
 msgstr ""
 
 #: ../gramps/plugins/tool/verify.glade.h:11
-msgid "Maximum number of consecutive years of _widowhood before next marriage"
+msgid "Maximum _span of years for all children"
 msgstr ""
 
 #: ../gramps/plugins/tool/verify.glade.h:12
@@ -26757,55 +26770,48 @@ msgid "Maximum age for an _unmarried person"
 msgstr ""
 
 #: ../gramps/plugins/tool/verify.glade.h:13
-msgid "_Estimate missing or inexact dates"
-msgstr ""
-
-#: ../gramps/plugins/tool/verify.glade.h:14
-msgid "_Identify invalid dates"
-msgstr ""
-
-#: ../gramps/plugins/tool/verify.glade.h:16
-msgid "Mi_nimum age to bear a child"
-msgstr ""
-
-#: ../gramps/plugins/tool/verify.glade.h:17
-msgid "Ma_ximum age to bear a child"
-msgstr ""
-
-#: ../gramps/plugins/tool/verify.glade.h:18
-msgid "Maximum number of chil_dren"
-msgstr ""
-
-#: ../gramps/plugins/tool/verify.glade.h:19
-msgid "<b>Women</b>"
-msgstr ""
-
-#: ../gramps/plugins/tool/verify.glade.h:20
-msgid "Mi_nimum age to father a child"
-msgstr ""
-
-#: ../gramps/plugins/tool/verify.glade.h:21
-msgid "Ma_ximum age to father a child"
-msgstr ""
-
-#: ../gramps/plugins/tool/verify.glade.h:22
-msgid "<b>Men</b>"
-msgstr ""
-
-#: ../gramps/plugins/tool/verify.glade.h:23
 msgid "Maximum husband-wife age _difference"
 msgstr ""
 
-#: ../gramps/plugins/tool/verify.glade.h:24
+#: ../gramps/plugins/tool/verify.glade.h:14
+msgid "Maximum number of _spouses for a person"
+msgstr ""
+
+#: ../gramps/plugins/tool/verify.glade.h:15
+msgid "Maximum number of chil_dren"
+msgstr ""
+
+#: ../gramps/plugins/tool/verify.glade.h:16
+msgid "Maximum number of consecutive years of _widowhood before next marriage"
+msgstr ""
+
+#: ../gramps/plugins/tool/verify.glade.h:17
 msgid "Maximum number of years _between children"
 msgstr ""
 
-#: ../gramps/plugins/tool/verify.glade.h:25
-msgid "Maximum _span of years for all children"
+#: ../gramps/plugins/tool/verify.glade.h:18
+msgid "Mi_nimum age to bear a child"
 msgstr ""
 
-#: ../gramps/plugins/tool/verify.glade.h:26
-msgid "<b>Families</b>"
+#: ../gramps/plugins/tool/verify.glade.h:19
+msgid "Mi_nimum age to father a child"
+msgstr ""
+
+#: ../gramps/plugins/tool/verify.glade.h:20
+msgid "Mi_nimum age to marry"
+msgstr ""
+
+#: ../gramps/plugins/tool/verify.glade.h:21
+msgid "_Estimate missing or inexact dates"
+msgstr ""
+
+#: ../gramps/plugins/tool/verify.glade.h:22
+#: ../gramps/plugins/tool/verify.py:619
+msgid "_Hide marked"
+msgstr ""
+
+#: ../gramps/plugins/tool/verify.glade.h:23
+msgid "_Identify invalid dates"
 msgstr ""
 
 #: ../gramps/plugins/tool/verify.py:85
@@ -27437,8 +27443,8 @@ msgstr ""
 
 #: ../gramps/plugins/view/geoevents.py:364
 #: ../gramps/plugins/view/geoevents.py:368
-#: ../gramps/plugins/view/geoplaces.py:356
-#: ../gramps/plugins/view/geoplaces.py:360
+#: ../gramps/plugins/view/geoplaces.py:357
+#: ../gramps/plugins/view/geoplaces.py:361
 msgid "Centering on Place"
 msgstr ""
 
@@ -27661,32 +27667,32 @@ msgstr ""
 msgid "Places places map"
 msgstr ""
 
-#: ../gramps/plugins/view/geoplaces.py:280
+#: ../gramps/plugins/view/geoplaces.py:281
 msgid "The place name in the status bar is disabled."
 msgstr ""
 
-#: ../gramps/plugins/view/geoplaces.py:285
+#: ../gramps/plugins/view/geoplaces.py:286
 #, python-format
 msgid "The maximum number of places is reached (%d)."
 msgstr ""
 
-#: ../gramps/plugins/view/geoplaces.py:288
+#: ../gramps/plugins/view/geoplaces.py:289
 msgid "Some information are missing."
 msgstr ""
 
-#: ../gramps/plugins/view/geoplaces.py:290
+#: ../gramps/plugins/view/geoplaces.py:291
 msgid "Please, use filtering to reduce this number."
 msgstr ""
 
-#: ../gramps/plugins/view/geoplaces.py:292
+#: ../gramps/plugins/view/geoplaces.py:293
 msgid "You can modify this value in the geography option."
 msgstr ""
 
-#: ../gramps/plugins/view/geoplaces.py:294
+#: ../gramps/plugins/view/geoplaces.py:295
 msgid "In this case, it may take time to show all markers."
 msgstr ""
 
-#: ../gramps/plugins/view/geoplaces.py:352
+#: ../gramps/plugins/view/geoplaces.py:353
 msgid "Show all places"
 msgstr ""
 
@@ -28334,7 +28340,7 @@ msgstr ""
 #: ../gramps/plugins/webreport/narrativeweb.py:1769
 #: ../gramps/plugins/webreport/narrativeweb.py:1890
 #: ../gramps/plugins/webreport/narrativeweb.py:4978
-#: ../gramps/plugins/webreport/narrativeweb.py:8202
+#: ../gramps/plugins/webreport/narrativeweb.py:8204
 msgid "Download"
 msgstr ""
 
@@ -28417,10 +28423,10 @@ msgstr ""
 #: ../gramps/plugins/webreport/narrativeweb.py:6531
 #: ../gramps/plugins/webreport/narrativeweb.py:7148
 #: ../gramps/plugins/webreport/narrativeweb.py:7155
-#: ../gramps/plugins/webreport/narrativeweb.py:7572
-#: ../gramps/plugins/webreport/narrativeweb.py:7617
-#: ../gramps/plugins/webreport/narrativeweb.py:7635
-#: ../gramps/plugins/webreport/narrativeweb.py:7677
+#: ../gramps/plugins/webreport/narrativeweb.py:7574
+#: ../gramps/plugins/webreport/narrativeweb.py:7619
+#: ../gramps/plugins/webreport/narrativeweb.py:7637
+#: ../gramps/plugins/webreport/narrativeweb.py:7679
 msgid "Narrated Web Site Report"
 msgstr ""
 
@@ -28770,505 +28776,505 @@ msgstr ""
 msgid "Family of %s"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7573
+#: ../gramps/plugins/webreport/narrativeweb.py:7575
 msgid "Creating GENDEX file"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7618
+#: ../gramps/plugins/webreport/narrativeweb.py:7620
 msgid "Creating surname pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7636
+#: ../gramps/plugins/webreport/narrativeweb.py:7638
 msgid "Creating thumbnail preview page..."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7678
+#: ../gramps/plugins/webreport/narrativeweb.py:7680
 msgid "Creating address book pages ..."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7979
+#: ../gramps/plugins/webreport/narrativeweb.py:7981
 msgid "Store web pages in .tar.gz archive"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7981
+#: ../gramps/plugins/webreport/narrativeweb.py:7983
 msgid "Whether to store the web pages in an archive file"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7988
+#: ../gramps/plugins/webreport/narrativeweb.py:7990
 #: ../gramps/plugins/webreport/webcal.py:1325
 msgid "Destination"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7991
+#: ../gramps/plugins/webreport/narrativeweb.py:7993
 #: ../gramps/plugins/webreport/webcal.py:1328
 msgid "The destination directory for the web files"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7997
+#: ../gramps/plugins/webreport/narrativeweb.py:7999
 msgid "Web site title"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7997
+#: ../gramps/plugins/webreport/narrativeweb.py:7999
 msgid "My Family Tree"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7998
+#: ../gramps/plugins/webreport/narrativeweb.py:8000
 msgid "The title of the web site"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8003
+#: ../gramps/plugins/webreport/narrativeweb.py:8005
 msgid "Select filter to restrict people that appear on web site"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8030
+#: ../gramps/plugins/webreport/narrativeweb.py:8032
 #: ../gramps/plugins/webreport/webcal.py:1365
 msgid "File extension"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8033
+#: ../gramps/plugins/webreport/narrativeweb.py:8035
 #: ../gramps/plugins/webreport/webcal.py:1368
 msgid "The extension to be used for the web files"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8036
+#: ../gramps/plugins/webreport/narrativeweb.py:8038
 #: ../gramps/plugins/webreport/webcal.py:1371
 msgid "Copyright"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8039
+#: ../gramps/plugins/webreport/narrativeweb.py:8041
 #: ../gramps/plugins/webreport/webcal.py:1374
 msgid "The copyright to be used for the web files"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8042
+#: ../gramps/plugins/webreport/narrativeweb.py:8044
 #: ../gramps/plugins/webreport/webcal.py:1380
 msgid "StyleSheet"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8047
+#: ../gramps/plugins/webreport/narrativeweb.py:8049
 #: ../gramps/plugins/webreport/webcal.py:1383
 msgid "The stylesheet to be used for the web pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8052
+#: ../gramps/plugins/webreport/narrativeweb.py:8054
 msgid "Horizontal -- Default"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8053
+#: ../gramps/plugins/webreport/narrativeweb.py:8055
 msgid "Vertical   -- Left Side"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8054
+#: ../gramps/plugins/webreport/narrativeweb.py:8056
 msgid "Fade       -- WebKit Browsers Only"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8055
-#: ../gramps/plugins/webreport/narrativeweb.py:8067
+#: ../gramps/plugins/webreport/narrativeweb.py:8057
+#: ../gramps/plugins/webreport/narrativeweb.py:8069
 msgid "Drop-Down  -- WebKit Browsers Only"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8057
+#: ../gramps/plugins/webreport/narrativeweb.py:8059
 msgid "Navigation Menu Layout"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8060
+#: ../gramps/plugins/webreport/narrativeweb.py:8062
 msgid "Choose which layout for the Navigation Menus."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8066
+#: ../gramps/plugins/webreport/narrativeweb.py:8068
 msgid "Normal Outline Style"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8069
+#: ../gramps/plugins/webreport/narrativeweb.py:8071
 msgid "Citation Referents Layout"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8072
+#: ../gramps/plugins/webreport/narrativeweb.py:8074
 msgid ""
 "Determine the default layout for the Source Page's Citation Referents section"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8076
+#: ../gramps/plugins/webreport/narrativeweb.py:8078
 msgid "Include ancestor's tree"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8077
+#: ../gramps/plugins/webreport/narrativeweb.py:8079
 msgid "Whether to include an ancestor graph on each individual page"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8081
+#: ../gramps/plugins/webreport/narrativeweb.py:8083
 msgid "Graph generations"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8082
+#: ../gramps/plugins/webreport/narrativeweb.py:8084
 msgid "The number of generations to include in the ancestor graph"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8092
+#: ../gramps/plugins/webreport/narrativeweb.py:8094
 msgid "Page Generation"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8095
+#: ../gramps/plugins/webreport/narrativeweb.py:8097
 msgid "Home page note"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8096
+#: ../gramps/plugins/webreport/narrativeweb.py:8098
 msgid "A note to be used on the home page"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8099
+#: ../gramps/plugins/webreport/narrativeweb.py:8101
 msgid "Home page image"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8100
+#: ../gramps/plugins/webreport/narrativeweb.py:8102
 msgid "An image to be used on the home page"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8103
+#: ../gramps/plugins/webreport/narrativeweb.py:8105
 msgid "Introduction note"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8104
+#: ../gramps/plugins/webreport/narrativeweb.py:8106
 msgid "A note to be used as the introduction"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8107
+#: ../gramps/plugins/webreport/narrativeweb.py:8109
 msgid "Introduction image"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8108
+#: ../gramps/plugins/webreport/narrativeweb.py:8110
 msgid "An image to be used as the introduction"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8111
+#: ../gramps/plugins/webreport/narrativeweb.py:8113
 msgid "Publisher contact note"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8112
+#: ../gramps/plugins/webreport/narrativeweb.py:8114
 msgid ""
 "A note to be used as the publisher contact.\n"
 "If no publisher information is given,\n"
 "no contact page will be created"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8118
+#: ../gramps/plugins/webreport/narrativeweb.py:8120
 msgid "Publisher contact image"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8119
+#: ../gramps/plugins/webreport/narrativeweb.py:8121
 msgid ""
 "An image to be used as the publisher contact.\n"
 "If no publisher information is given,\n"
 "no contact page will be created"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8125
+#: ../gramps/plugins/webreport/narrativeweb.py:8127
 msgid "HTML user header"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8126
+#: ../gramps/plugins/webreport/narrativeweb.py:8128
 msgid "A note to be used as the page header"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8129
+#: ../gramps/plugins/webreport/narrativeweb.py:8131
 msgid "HTML user footer"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8130
+#: ../gramps/plugins/webreport/narrativeweb.py:8132
 msgid "A note to be used as the page footer"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8133
+#: ../gramps/plugins/webreport/narrativeweb.py:8135
 msgid "Include images and media objects"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8134
+#: ../gramps/plugins/webreport/narrativeweb.py:8136
 msgid "Whether to include a gallery of media objects"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8138
+#: ../gramps/plugins/webreport/narrativeweb.py:8140
 msgid "Create and only use thumbnail- sized images"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8139
+#: ../gramps/plugins/webreport/narrativeweb.py:8141
 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 "
 "total upload size to your web hosting site."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8145
+#: ../gramps/plugins/webreport/narrativeweb.py:8147
 msgid "Max width of initial image"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8147
+#: ../gramps/plugins/webreport/narrativeweb.py:8149
 msgid ""
 "This allows you to set the maximum width of the image shown on the media "
 "page. Set to 0 for no limit."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8151
+#: ../gramps/plugins/webreport/narrativeweb.py:8153
 msgid "Max height of initial image"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8153
+#: ../gramps/plugins/webreport/narrativeweb.py:8155
 msgid ""
 "This allows you to set the maximum height of the image shown on the media "
 "page. Set to 0 for no limit."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8159
+#: ../gramps/plugins/webreport/narrativeweb.py:8161
 msgid "Suppress Gramps ID"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8160
+#: ../gramps/plugins/webreport/narrativeweb.py:8162
 msgid "Whether to include the Gramps ID of objects"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8170
+#: ../gramps/plugins/webreport/narrativeweb.py:8172
 msgid "Include records marked private"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8171
+#: ../gramps/plugins/webreport/narrativeweb.py:8173
 msgid "Whether to include private objects"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8174
+#: ../gramps/plugins/webreport/narrativeweb.py:8176
 msgid "Living People"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8179
+#: ../gramps/plugins/webreport/narrativeweb.py:8181
 msgid "Include Last Name Only"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8181
+#: ../gramps/plugins/webreport/narrativeweb.py:8183
 msgid "Include Full Name Only"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8184
+#: ../gramps/plugins/webreport/narrativeweb.py:8186
 msgid "How to handle living people"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8188
+#: ../gramps/plugins/webreport/narrativeweb.py:8190
 msgid "Years from death to consider living"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8190
+#: ../gramps/plugins/webreport/narrativeweb.py:8192
 msgid ""
 "This allows you to restrict information on people who have not been dead for "
 "very long"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8205
+#: ../gramps/plugins/webreport/narrativeweb.py:8207
 msgid "Include download page"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8206
+#: ../gramps/plugins/webreport/narrativeweb.py:8208
 msgid "Whether to include a database download option"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8210
-#: ../gramps/plugins/webreport/narrativeweb.py:8219
-msgid "Download Filename"
-msgstr ""
-
 #: ../gramps/plugins/webreport/narrativeweb.py:8212
 #: ../gramps/plugins/webreport/narrativeweb.py:8221
+msgid "Download Filename"
+msgstr ""
+
+#: ../gramps/plugins/webreport/narrativeweb.py:8214
+#: ../gramps/plugins/webreport/narrativeweb.py:8223
 msgid "File to be used for downloading of database"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8215
-#: ../gramps/plugins/webreport/narrativeweb.py:8224
+#: ../gramps/plugins/webreport/narrativeweb.py:8217
+#: ../gramps/plugins/webreport/narrativeweb.py:8226
 msgid "Description for download"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8215
+#: ../gramps/plugins/webreport/narrativeweb.py:8217
 msgid "Smith Family Tree"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8216
-#: ../gramps/plugins/webreport/narrativeweb.py:8225
+#: ../gramps/plugins/webreport/narrativeweb.py:8218
+#: ../gramps/plugins/webreport/narrativeweb.py:8227
 msgid "Give a description for this file."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8224
+#: ../gramps/plugins/webreport/narrativeweb.py:8226
 msgid "Johnson Family Tree"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8234
+#: ../gramps/plugins/webreport/narrativeweb.py:8236
 #: ../gramps/plugins/webreport/webcal.py:1525
 msgid "Advanced Options"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8237
+#: ../gramps/plugins/webreport/narrativeweb.py:8239
 #: ../gramps/plugins/webreport/webcal.py:1527
 msgid "Character set encoding"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8240
+#: ../gramps/plugins/webreport/narrativeweb.py:8242
 #: ../gramps/plugins/webreport/webcal.py:1530
 msgid "The encoding to be used for the web files"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8243
+#: ../gramps/plugins/webreport/narrativeweb.py:8245
 msgid "Include link to active person on every page"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8244
+#: ../gramps/plugins/webreport/narrativeweb.py:8246
 msgid "Include a link to the active person (if they have a webpage)"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8247
+#: ../gramps/plugins/webreport/narrativeweb.py:8249
 msgid "Include a column for birth dates on the index pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8248
+#: ../gramps/plugins/webreport/narrativeweb.py:8250
 msgid "Whether to include a birth column"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8251
+#: ../gramps/plugins/webreport/narrativeweb.py:8253
 msgid "Include a column for death dates on the index pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8252
+#: ../gramps/plugins/webreport/narrativeweb.py:8254
 msgid "Whether to include a death column"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8255
+#: ../gramps/plugins/webreport/narrativeweb.py:8257
 msgid "Include a column for partners on the index pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8257
+#: ../gramps/plugins/webreport/narrativeweb.py:8259
 msgid "Whether to include a partners column"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8260
+#: ../gramps/plugins/webreport/narrativeweb.py:8262
 msgid "Include a column for parents on the index pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8262
+#: ../gramps/plugins/webreport/narrativeweb.py:8264
 msgid "Whether to include a parents column"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8265
+#: ../gramps/plugins/webreport/narrativeweb.py:8267
 msgid "Include half and/ or step-siblings on the individual pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8267
+#: ../gramps/plugins/webreport/narrativeweb.py:8269
 msgid ""
 "Whether to include half and/ or step-siblings with the parents and siblings"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8271
+#: ../gramps/plugins/webreport/narrativeweb.py:8273
 msgid "Sort all children in birth order"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8272
+#: ../gramps/plugins/webreport/narrativeweb.py:8274
 msgid "Whether to display children in birth order or in entry order?"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8275
+#: ../gramps/plugins/webreport/narrativeweb.py:8277
 msgid "Include family pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8276
+#: ../gramps/plugins/webreport/narrativeweb.py:8278
 msgid "Whether or not to include family pages."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8279
+#: ../gramps/plugins/webreport/narrativeweb.py:8281
 msgid "Include event pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8280
+#: ../gramps/plugins/webreport/narrativeweb.py:8282
 msgid "Add a complete events list and relevant pages or not"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8283
+#: ../gramps/plugins/webreport/narrativeweb.py:8285
 msgid "Include repository pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8284
+#: ../gramps/plugins/webreport/narrativeweb.py:8286
 msgid "Whether or not to include the Repository Pages."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8287
+#: ../gramps/plugins/webreport/narrativeweb.py:8289
 msgid "Include GENDEX file (/gendex.txt)"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8288
+#: ../gramps/plugins/webreport/narrativeweb.py:8290
 msgid "Whether to include a GENDEX file or not"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8291
+#: ../gramps/plugins/webreport/narrativeweb.py:8293
 msgid "Include address book pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8292
+#: ../gramps/plugins/webreport/narrativeweb.py:8294
 msgid ""
 "Whether or not to add Address Book pages,which can include e-mail and "
 "website addresses and personal address/ residence events."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8302
+#: ../gramps/plugins/webreport/narrativeweb.py:8304
 msgid "Place Map Options"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8306
+#: ../gramps/plugins/webreport/narrativeweb.py:8308
 msgid "Google"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8308
+#: ../gramps/plugins/webreport/narrativeweb.py:8310
 msgid "Map Service"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8311
+#: ../gramps/plugins/webreport/narrativeweb.py:8313
 msgid "Choose your choice of map service for creating the Place Map Pages."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8316
+#: ../gramps/plugins/webreport/narrativeweb.py:8318
 msgid "Include Place map on Place Pages"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8317
+#: ../gramps/plugins/webreport/narrativeweb.py:8319
 msgid ""
 "Whether to include a place map on the Place Pages, where Latitude/ Longitude "
 "are available."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8322
+#: ../gramps/plugins/webreport/narrativeweb.py:8324
 msgid "Include Family Map Pages with all places shown on the map"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8324
+#: ../gramps/plugins/webreport/narrativeweb.py:8326
 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."
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8332
+#: ../gramps/plugins/webreport/narrativeweb.py:8334
 msgid "Family Links"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8333
+#: ../gramps/plugins/webreport/narrativeweb.py:8335
 msgid "Drop"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8334
+#: ../gramps/plugins/webreport/narrativeweb.py:8336
 msgid "Markers"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8335
+#: ../gramps/plugins/webreport/narrativeweb.py:8337
 msgid "Google/ FamilyMap Option"
 msgstr ""
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8338
+#: ../gramps/plugins/webreport/narrativeweb.py:8340
 msgid ""
 "Select which option that you would like to have for the Google Maps Family "
 "Map pages..."
 msgstr ""
 
 #. adding title to hyperlink menu for screen readers and braille writers
-#: ../gramps/plugins/webreport/narrativeweb.py:8798
+#: ../gramps/plugins/webreport/narrativeweb.py:8800
 #, python-format
 msgid "Alphabet Menu: %s"
 msgstr ""
@@ -29295,11 +29301,6 @@ msgstr ""
 msgid "Created for <a href=\"mailto:%(email)s?subject=WebCal\">%(author)s</a>"
 msgstr ""
 
-#: ../gramps/plugins/webreport/webcal.py:470
-#, python-format
-msgid "Created for %(author)s"
-msgstr ""
-
 #. Add a link for year_glance() if requested
 #: ../gramps/plugins/webreport/webcal.py:543
 msgid "Year Glance"
@@ -29630,7 +29631,7 @@ msgstr ""
 msgid "No style sheet"
 msgstr ""
 
-#: ../data/gramps.desktop.in.h:2
+#: ../data/gramps.desktop.in.h:1
 msgid "Genealogy System"
 msgstr ""
 
@@ -29643,66 +29644,140 @@ msgid ""
 "Manage genealogical information, perform genealogical research and analysis"
 msgstr ""
 
-#: ../data/gramps.keys.in.h:1 ../data/gramps.xml.in.h:1
-msgid "Gramps database"
-msgstr ""
-
-#: ../data/gramps.keys.in.h:2 ../data/gramps.xml.in.h:3
-msgid "Gramps package"
-msgstr ""
-
-#: ../data/gramps.keys.in.h:3 ../data/gramps.xml.in.h:4
+#: ../data/gramps.keys.in.h:3 ../data/gramps.xml.in.h:3
 msgid "Gramps XML database"
 msgstr ""
 
-#: ../data/gramps.xml.in.h:5
+#: ../data/gramps.keys.in.h:4 ../data/gramps.xml.in.h:4
+msgid "Gramps database"
+msgstr ""
+
+#: ../data/gramps.keys.in.h:5 ../data/gramps.xml.in.h:5
+msgid "Gramps package"
+msgstr ""
+
+#: ../data/gramps.xml.in.h:2
 msgid "GeneWeb source file"
 msgstr ""
 
 #: ../data/tips.xml.in.h:1
 msgid ""
-"<b>Working with Dates</b><br/>A range of dates can be given by using the "
-"format &quot;between January 4, 2000 and March 20, 2003&quot;. You can also "
-"indicate the level of confidence in a date and even choose between seven "
-"different calendars. Try the button next to the date field in the Events "
-"Editor."
+"<b>Adding Children</b><br/>To add children in Gramps there are two options. "
+"You can find one of their parents in the Families View and open the family. "
+"Then choose to create a new person or add an existing person. You can also "
+"add children (or siblings) from inside the Family Editor."
 msgstr ""
 
 #: ../data/tips.xml.in.h:2
 msgid ""
-"<b>Editing Objects</b><br/>In most cases double clicking on a name, source, "
-"place or media entry will bring up a window to allow you to edit the object. "
-"Note that the result can be dependent on context. For example, in the Family "
-"View clicking on a parent or child will bring up the Relationship Editor."
-msgstr ""
-
-#: ../data/tips.xml.in.h:3
-msgid ""
 "<b>Adding Images</b><br/>An image can be added to any gallery or the Media "
 "View by dragging and dropping it from a file manager or a web browser. "
 "Actually you can add any type of file like this, useful for scans of "
 "documents and other digital sources."
 msgstr ""
 
+#: ../data/tips.xml.in.h:3
+msgid ""
+"<b>Ancestor View</b><br/>The Ancestry View displays a traditional pedigree "
+"chart. Hold the mouse over an individual to see more information about them "
+"or right click on an individual to access other family members and settings. "
+"Play with the settings to see the different options."
+msgstr ""
+
 #: ../data/tips.xml.in.h:4
 msgid ""
-"<b>Ordering Children in a Family</b><br/>The birth order of children in a "
-"family can be set by using drag and drop. This order is preserved even when "
-"they do not have birth dates."
+"<b>Book Reports</b><br/>The Book report under &quot;Reports &gt; Books &gt; "
+"Book Report...&quot;, allows you to collect a variety of reports into a "
+"single document. This single report is easier to distribute than multiple "
+"reports, especially when printed."
 msgstr ""
 
 #: ../data/tips.xml.in.h:5
 msgid ""
-"<b>Talk to Relatives Before It Is Too Late</b><br/>Your oldest relatives can "
-"be your most important source of information. They usually know things about "
-"the family that haven't been written down. They might tell you nuggets about "
-"people that may one day lead to a new avenue of research. At the very least, "
-"you will get to hear some great stories. Don't forget to record the "
-"conversations!"
+"<b>Bookmarking Individuals</b><br/>The Bookmarks menu is a convenient place "
+"to store the names of frequently used individuals. Selecting a bookmark will "
+"make that person the Active Person. To bookmark someone make them the Active "
+"Person then go to &quot;Bookmarks &gt; Add Bookmark&quot; or press Ctrl+D. "
+"You can also bookmark most of the other objects."
 msgstr ""
 
 #: ../data/tips.xml.in.h:6
 msgid ""
+"<b>Calculating Relationships</b><br/>To check if two people in the database "
+"are related (by blood, not marriage) try the tool under &quot;Tools &gt; "
+"Utilities &gt; Relationship Calculator...&quot;. The exact relationship as "
+"well as all common ancestors are reported."
+msgstr ""
+
+#: ../data/tips.xml.in.h:7
+msgid ""
+"<b>Changing the Active Person</b><br/>Changing the Active Person in views is "
+"easy. In the Relationship view just click on anyone. In the Ancestry View "
+"doubleclick on the person or right click to select any of their spouses, "
+"siblings, children or parents."
+msgstr ""
+
+#: ../data/tips.xml.in.h:8
+msgid ""
+"<b>Contributing to Gramps</b><br/>Want to help with Gramps but can't write "
+"programs? Not a problem! A project as large as Gramps requires people with a "
+"wide variety of skills. Contributions can be anything from writing "
+"documentation to testing development versions and helping with the web site. "
+"Start by subscribing to the Gramps developers mailing list, gramps-devel, "
+"and introducing yourself. Subscription information can be found at &quot;"
+"Help &gt; Gramps Mailing Lists&quot;"
+msgstr ""
+
+#: ../data/tips.xml.in.h:9
+msgid ""
+"<b>Directing Your Research</b><br/>Go from what you know to what you do not. "
+"Always record everything that is known before making conjectures. Often the "
+"facts at hand suggest plenty of direction for more research. Don't waste "
+"time looking through thousands of records hoping for a trail when you have "
+"other unexplored leads."
+msgstr ""
+
+#: ../data/tips.xml.in.h:10
+msgid ""
+"<b>Don't speak English?</b><br/>Volunteers have translated Gramps into more "
+"than 20 languages. If Gramps supports your language and it is not being "
+"displayed, set the default language in your operating system and restart "
+"Gramps."
+msgstr ""
+
+#: ../data/tips.xml.in.h:11
+msgid ""
+"<b>Duplicate Entries</b><br/>&quot;Tools &gt; Database Processing &gt; Find "
+"Possible Duplicate People...&quot; allows you to locate (and merge) entries "
+"of the same person entered more than once in the database."
+msgstr ""
+
+#: ../data/tips.xml.in.h:12
+msgid ""
+"<b>Editing Objects</b><br/>In most cases double clicking on a name, source, "
+"place or media entry will bring up a window to allow you to edit the object. "
+"Note that the result can be dependent on context. For example, in the Family "
+"View clicking on a parent or child will bring up the Relationship Editor."
+msgstr ""
+
+#: ../data/tips.xml.in.h:13
+msgid ""
+"<b>Editing the Parent-Child Relationship</b><br/> You can edit the "
+"relationship of a child to its parents by double clicking the child in the "
+"Family Editor. Relationships can be any of Adopted, Birth, Foster, None, "
+"Sponsored, Stepchild and Unknown."
+msgstr ""
+
+#: ../data/tips.xml.in.h:14
+msgid ""
+"<b>Extra Reports and Tools</b><br/>Extra tools and reports can be added to "
+"Gramps with the &quot;Addon&quot; system. See them under &quot;Help &gt; "
+"Extra Reports/Tools&quot;. This is the best way for advanced users to "
+"experiment and create new functionality."
+msgstr ""
+
+#: ../data/tips.xml.in.h:15
+msgid ""
 "<b>Filtering People</b><br/>In the People View, you can 'filter' individuals "
 "based on many criteria. To define a new filter go to &quot;Edit &gt; Person "
 "Filter Editor&quot;. There you can name your filter and add and combine "
@@ -29713,14 +29788,119 @@ msgid ""
 "Filter Sidebar is not visible, select View &gt; Filter."
 msgstr ""
 
-#: ../data/tips.xml.in.h:7
+#: ../data/tips.xml.in.h:16
+msgid ""
+"<b>Filters</b><br/>Filters allow you to limit the people seen in the People "
+"View. In addition to the many preset filters, Custom Filters can be created "
+"limited only by your imagination. Custom filters are created from &quot;Edit "
+"&gt; Person Filter Editor&quot;."
+msgstr ""
+
+#: ../data/tips.xml.in.h:17
+msgid ""
+"<b>Gramps Announcements</b><br/>Interested in getting notified when a new "
+"version of Gramps is released? Join the Gramps-announce mailing list at "
+"&quot;Help &gt; Gramps Mailing Lists&quot;"
+msgstr ""
+
+#: ../data/tips.xml.in.h:18
+msgid ""
+"<b>Gramps Mailing Lists</b><br/>Want answers to your questions about Gramps? "
+"Check out the gramps-users email list. Many helpful people are on the list, "
+"so you're likely to get an answer quickly. If you have questions related to "
+"the development of Gramps, try the gramps-devel list. You can see the lists "
+"by selecting &quot;Help &gt; Gramps Mailing Lists&quot;."
+msgstr ""
+
+#: ../data/tips.xml.in.h:19
+msgid ""
+"<b>Gramps Reports</b><br/>Gramps offers a wide variety of reports. The "
+"Graphical Reports and Graphs can present complex relationships easily and "
+"the Text Reports are particularly useful if you want to send the results of "
+"your family tree to members of the family via email. If you're ready to make "
+"a website for your family tree then there's a report for that as well."
+msgstr ""
+
+#: ../data/tips.xml.in.h:20
+msgid ""
+"<b>Gramps Tools</b><br/>Gramps comes with a rich set of tools. These allow "
+"you to undertake operations such as checking the database for errors and "
+"consistency. There are research and analysis tools such as event comparison, "
+"finding duplicate people, interactive descendant browser, and many others. "
+"All tools can be accessed through the &quot;Tools&quot; menu."
+msgstr ""
+
+#: ../data/tips.xml.in.h:21
+msgid ""
+"<b>Gramps Translators</b><br/>Gramps has been designed so that new "
+"translations can easily be added with little development effort. If you are "
+"interested in participating please email gramps-devel@lists.sf.net"
+msgstr ""
+
+#: ../data/tips.xml.in.h:22
+msgid ""
+"<b>Gramps for Gnome or KDE?</b><br/>For Linux users Gramps works with "
+"whichever desktop environment you prefer. As long as the required GTK "
+"libraries are installed it will run fine."
+msgstr ""
+
+#: ../data/tips.xml.in.h:23
+msgid ""
+"<b>Hello, привет or 喂</b><br/>Whatever script you use Gramps offers full "
+"Unicode support. Characters for all languages are properly displayed."
+msgstr ""
+
+#: ../data/tips.xml.in.h:24
+msgid ""
+"<b>Improving Gramps</b><br/>Users are encouraged to request enhancements to "
+"Gramps. Requesting an enhancement can be done either through the gramps-"
+"users or gramps-devel mailing lists, or by going to http://bugs.gramps-"
+"project.org and creating a Feature Request. Filing a Feature Request is "
+"preferred but it can be good to discuss your ideas on the email lists."
+msgstr ""
+
+#: ../data/tips.xml.in.h:25
+msgid ""
+"<b>Incorrect Dates</b><br/>Everyone occasionally enters dates with an "
+"invalid format. Incorrect date formats will show up in Gramps with a reddish "
+"background. You can fix the date using the Date Selection dialog which can "
+"be opened by clicking on the date button. The format of the date is set "
+"under &quot;Edit &gt; Preferences &gt; Display&quot;."
+msgstr ""
+
+#: ../data/tips.xml.in.h:26
 msgid ""
 "<b>Inverted Filtering</b><br/>Filters can easily be reversed by using the "
 "'invert' option. For instance, by inverting the 'People with children' "
 "filter you can select all people without children."
 msgstr ""
 
-#: ../data/tips.xml.in.h:8
+#: ../data/tips.xml.in.h:27
+msgid ""
+"<b>Keeping Good Records</b><br/>Be accurate when recording genealogical "
+"information. Don't make assumptions while recording primary information; "
+"write it exactly as you see it. Use bracketed comments to indicate your "
+"additions, deletions or comments. Use of the Latin 'sic' is recommended to "
+"confirm the accurate transcription of what appears to be an error in a "
+"source."
+msgstr ""
+
+#: ../data/tips.xml.in.h:28
+msgid ""
+"<b>Keyboard Shortcuts</b><br/>Tired of having to take your hand off the "
+"keyboard to use the mouse? Many functions in Gramps have keyboard shortcuts. "
+"If one exists for a function it is displayed on the right side of the menu."
+msgstr ""
+
+#: ../data/tips.xml.in.h:29
+msgid ""
+"<b>Listing Events</b><br/>Events are added using the editor opened with "
+"&quot;Person &gt; Edit Person &gt; Events&quot;. There is a long list of "
+"preset event types. You can add your own event types by typing in the text "
+"field, they will be added to the available events, but not translated."
+msgstr ""
+
+#: ../data/tips.xml.in.h:30
 msgid ""
 "<b>Locating People</b><br/>By default, each surname in the People View is "
 "listed only once. By clicking on the arrow to the left of a name, the list "
@@ -29730,47 +29910,146 @@ msgid ""
 "enter."
 msgstr ""
 
-#: ../data/tips.xml.in.h:9
+#: ../data/tips.xml.in.h:31
 msgid ""
-"<b>The Family View</b><br/>The Family View is used to display a typical "
-"family unit as two parents and their children."
+"<b>Making a Genealogy Website</b><br/>You can easily export your family tree "
+"to a web page. Select the entire database, family lines or selected "
+"individuals to a collection of web pages ready for upload to the World Wide "
+"Web. The Gramps project provides free hosting of websites made with Gramps."
 msgstr ""
 
-#: ../data/tips.xml.in.h:10
+#: ../data/tips.xml.in.h:32
 msgid ""
-"<b>Changing the Active Person</b><br/>Changing the Active Person in views is "
-"easy. In the Relationship view just click on anyone. In the Ancestry View "
-"doubleclick on the person or right click to select any of their spouses, "
-"siblings, children or parents."
+"<b>Managing Names</b><br/>It is easy to manage people with several names in "
+"Gramps. In the Person Editor select the Names tab. You can add names of "
+"different types and set the prefered name by dragging it to the Prefered "
+"Name section."
 msgstr ""
 
-#: ../data/tips.xml.in.h:11
+#: ../data/tips.xml.in.h:33
 msgid ""
-"<b>Who Was Born When?</b><br/>Under &quot;Tools &gt; Analysis and "
-"exploration &gt; Compare Individual Events...&quot; you can compare the data "
-"of individuals in your database. This is useful, say, if you wish to list "
-"the birth dates of everyone in your database. You can use a custom filter to "
-"narrow the results."
+"<b>Managing Places</b><br/>The Places View shows a list of all places in the "
+"database. The list can be sorted by a number of different criteria, such as "
+"City, County or State."
 msgstr ""
 
-#: ../data/tips.xml.in.h:12
+#: ../data/tips.xml.in.h:34
 msgid ""
-"<b>Gramps Tools</b><br/>Gramps comes with a rich set of tools. These allow "
-"you to undertake operations such as checking the database for errors and "
-"consistency. There are research and analysis tools such as event comparison, "
-"finding duplicate people, interactive descendant browser, and many others. "
-"All tools can be accessed through the &quot;Tools&quot; menu."
+"<b>Managing Sources</b><br/>The Sources View shows a list of all sources in "
+"a single window. From here you can edit your sources, merge duplicates and "
+"see which individuals reference each source. You can use filters to group "
+"your sources."
 msgstr ""
 
-#: ../data/tips.xml.in.h:13
+#: ../data/tips.xml.in.h:35
 msgid ""
-"<b>Calculating Relationships</b><br/>To check if two people in the database "
-"are related (by blood, not marriage) try the tool under &quot;Tools &gt; "
-"Utilities &gt; Relationship Calculator...&quot;. The exact relationship as "
-"well as all common ancestors are reported."
+"<b>Media View</b><br/>The Media View shows a list of all media entered in "
+"the database. These can be graphic images, videos, sound clips, "
+"spreadsheets, documents, and more."
 msgstr ""
 
-#: ../data/tips.xml.in.h:14
+#: ../data/tips.xml.in.h:36
+msgid ""
+"<b>Merging Entries</b><br/>The function &quot;Edit &gt; Compare and Merge..."
+"&quot; allows you to combine separately listed people into one. Select the "
+"second entry by holding the Control key as you click. This is very useful "
+"for combining two databases with overlapping people, or combining "
+"erroneously entered differing names for one individual. This also works for "
+"the Places, Sources and Repositories views."
+msgstr ""
+
+#: ../data/tips.xml.in.h:37
+msgid ""
+"<b>Navigating Back and Forward</b><br/>Gramps maintains a list of previous "
+"active objects such as People, Events and . You can move forward and "
+"backward through the list using &quot;Go &gt; Forward&quot; and &quot;Go "
+"&gt; Back&quot; or the arrow buttons."
+msgstr ""
+
+#: ../data/tips.xml.in.h:38
+msgid ""
+"<b>Open Source Software</b><br/>The Free/Libre and Open Source Software "
+"(FLOSS) development model means Gramps can be extended by any programmer "
+"since all of the source code is freely available under its license. So it's "
+"not just about free beer, it's also about freedom to study and change the "
+"tool. For more about Open Source software lookup the Free Software "
+"Foundation and the Open Source Initiative."
+msgstr ""
+
+#: ../data/tips.xml.in.h:39
+msgid ""
+"<b>Ordering Children in a Family</b><br/>The birth order of children in a "
+"family can be set by using drag and drop. This order is preserved even when "
+"they do not have birth dates."
+msgstr ""
+
+#: ../data/tips.xml.in.h:40
+msgid ""
+"<b>Organising the Views</b><br/>Many of the views can present your data as "
+"either a hierarchical tree or as a simple list. Each view can also be "
+"configured to the way you like it. Have a look to the right of the top "
+"toolbar or under the &quot;View&quot; menu."
+msgstr ""
+
+#: ../data/tips.xml.in.h:41
+msgid ""
+"<b>Privacy in Gramps</b><br/>Gramps helps you to keep personal information "
+"secure by allowing you to mark information as private. Data marked as "
+"private can be excluded from reports and data exports. Look for the padlock "
+"which toggles records between private and public."
+msgstr ""
+
+#: ../data/tips.xml.in.h:42
+msgid ""
+"<b>Read the Manual</b><br/>Don't forget to read the Gramps manual, &quot;"
+"Help &gt; User Manual&quot;. The developers have worked hard to make most "
+"operations intuitive but the manual is full of information that will make "
+"your time spent on genealogy more productive."
+msgstr ""
+
+#: ../data/tips.xml.in.h:43
+msgid ""
+"<b>Record Your Sources</b><br/>Information collected about your family is "
+"only as good as the source it came from. Take the time and trouble to record "
+"all the details of where the information came from. Whenever possible get a "
+"copy of original documents."
+msgstr ""
+
+#: ../data/tips.xml.in.h:44
+msgid ""
+"<b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps "
+"is to use the Gramps bug tracking system at http://bugs.gramps-project.org"
+msgstr ""
+
+#: ../data/tips.xml.in.h:45
+msgid ""
+"<b>Setting Your Preferences</b><br/>&quot;Edit &gt; Preferences...&quot; "
+"lets you modify a number of settings, such as the path to your media files, "
+"and allows you to adjust many aspects of the Gramps presentation to your "
+"needs. Each separate view can also be configured under &quot;View &gt; "
+"Configure View...&quot;"
+msgstr ""
+
+#: ../data/tips.xml.in.h:46
+msgid ""
+"<b>Show All Checkbutton</b><br/>When adding an existing person as a spouse, "
+"the list of people shown is filtered to display only people who could "
+"realistically fit the role (based on dates in the database). In case Gramps "
+"is wrong in making this choice, you can override the filter by checking the "
+"Show All checkbutton."
+msgstr ""
+
+#: ../data/tips.xml.in.h:47
+msgid ""
+"<b>So What's in a Name?</b><br/>The name Gramps was suggested to the "
+"original developer, Don Allingham, by his father. It stands for "
+"<i>Genealogical Research and Analysis Management Program System</i>. It is a "
+"full-featured genealogy program letting you store, edit, and research "
+"genealogical data. The Gramps database back end is so robust that some users "
+"are managing genealogies containing hundreds of thousands of people."
+msgstr ""
+
+#: ../data/tips.xml.in.h:48
 msgid ""
 "<b>SoundEx can help with family research</b><br/>SoundEx solves a long "
 "standing problem in genealogy, how to handle spelling variations. The "
@@ -29782,25 +30061,7 @@ msgid ""
 "Codes...&quot;."
 msgstr ""
 
-#: ../data/tips.xml.in.h:15
-msgid ""
-"<b>Setting Your Preferences</b><br/>&quot;Edit &gt; Preferences...&quot; "
-"lets you modify a number of settings, such as the path to your media files, "
-"and allows you to adjust many aspects of the Gramps presentation to your "
-"needs. Each separate view can also be configured under &quot;View &gt; "
-"Configure View...&quot;"
-msgstr ""
-
-#: ../data/tips.xml.in.h:16
-msgid ""
-"<b>Gramps Reports</b><br/>Gramps offers a wide variety of reports. The "
-"Graphical Reports and Graphs can present complex relationships easily and "
-"the Text Reports are particularly useful if you want to send the results of "
-"your family tree to members of the family via email. If you're ready to make "
-"a website for your family tree then there's a report for that as well."
-msgstr ""
-
-#: ../data/tips.xml.in.h:17
+#: ../data/tips.xml.in.h:49
 msgid ""
 "<b>Starting a New Family Tree</b><br/>A good way to start a new family tree "
 "is to enter all the members of the family into the database using the Person "
@@ -29809,206 +30070,31 @@ msgid ""
 "relationships between people."
 msgstr ""
 
-#: ../data/tips.xml.in.h:18
+#: ../data/tips.xml.in.h:50
 msgid ""
-"<b>What's That For?</b><br/>Unsure what a button does? Simply hold the mouse "
-"over a button and a tooltip will appear."
+"<b>Talk to Relatives Before It Is Too Late</b><br/>Your oldest relatives can "
+"be your most important source of information. They usually know things about "
+"the family that haven't been written down. They might tell you nuggets about "
+"people that may one day lead to a new avenue of research. At the very least, "
+"you will get to hear some great stories. Don't forget to record the "
+"conversations!"
 msgstr ""
 
-#: ../data/tips.xml.in.h:19
+#: ../data/tips.xml.in.h:51
 msgid ""
-"<b>Unsure of a Date?</b><br/>If you're unsure about the date an event "
-"occurred, Gramps allows you to enter a wide range of date formats based on a "
-"guess or an estimate. For instance, &quot;about 1908&quot; is a valid entry "
-"for a birth date in Gramps. Click the Date button next to the date field and "
-"see the Gramps Manual to learn more."
+"<b>The 'How and Why' of Your Genealogy</b><br/> Genealogy isn't only about "
+"dates and names. It is about people. Be descriptive. Include why things "
+"happened, and how descendants might have been shaped by the events they went "
+"through. Narratives go a long way in making your family history come alive."
 msgstr ""
 
-#: ../data/tips.xml.in.h:20
+#: ../data/tips.xml.in.h:52
 msgid ""
-"<b>Duplicate Entries</b><br/>&quot;Tools &gt; Database Processing &gt; Find "
-"Possible Duplicate People...&quot; allows you to locate (and merge) entries "
-"of the same person entered more than once in the database."
+"<b>The Family View</b><br/>The Family View is used to display a typical "
+"family unit as two parents and their children."
 msgstr ""
 
-#: ../data/tips.xml.in.h:21
-msgid ""
-"<b>Merging Entries</b><br/>The function &quot;Edit &gt; Compare and Merge..."
-"&quot; allows you to combine separately listed people into one. Select the "
-"second entry by holding the Control key as you click. This is very useful "
-"for combining two databases with overlapping people, or combining "
-"erroneously entered differing names for one individual. This also works for "
-"the Places, Sources and Repositories views."
-msgstr ""
-
-#: ../data/tips.xml.in.h:22
-msgid ""
-"<b>Organising the Views</b><br/>Many of the views can present your data as "
-"either a hierarchical tree or as a simple list. Each view can also be "
-"configured to the way you like it. Have a look to the right of the top "
-"toolbar or under the &quot;View&quot; menu."
-msgstr ""
-
-#: ../data/tips.xml.in.h:23
-msgid ""
-"<b>Navigating Back and Forward</b><br/>Gramps maintains a list of previous "
-"active objects such as People, Events and . You can move forward and "
-"backward through the list using &quot;Go &gt; Forward&quot; and &quot;Go "
-"&gt; Back&quot; or the arrow buttons."
-msgstr ""
-
-#: ../data/tips.xml.in.h:24
-msgid ""
-"<b>Keyboard Shortcuts</b><br/>Tired of having to take your hand off the "
-"keyboard to use the mouse? Many functions in Gramps have keyboard shortcuts. "
-"If one exists for a function it is displayed on the right side of the menu."
-msgstr ""
-
-#: ../data/tips.xml.in.h:25
-msgid ""
-"<b>Read the Manual</b><br/>Don't forget to read the Gramps manual, &quot;"
-"Help &gt; User Manual&quot;. The developers have worked hard to make most "
-"operations intuitive but the manual is full of information that will make "
-"your time spent on genealogy more productive."
-msgstr ""
-
-#: ../data/tips.xml.in.h:26
-msgid ""
-"<b>Adding Children</b><br/>To add children in Gramps there are two options. "
-"You can find one of their parents in the Families View and open the family. "
-"Then choose to create a new person or add an existing person. You can also "
-"add children (or siblings) from inside the Family Editor."
-msgstr ""
-
-#: ../data/tips.xml.in.h:27
-msgid ""
-"<b>Editing the Parent-Child Relationship</b><br/> You can edit the "
-"relationship of a child to its parents by double clicking the child in the "
-"Family Editor. Relationships can be any of Adopted, Birth, Foster, None, "
-"Sponsored, Stepchild and Unknown."
-msgstr ""
-
-#: ../data/tips.xml.in.h:28
-msgid ""
-"<b>Show All Checkbutton</b><br/>When adding an existing person as a spouse, "
-"the list of people shown is filtered to display only people who could "
-"realistically fit the role (based on dates in the database). In case Gramps "
-"is wrong in making this choice, you can override the filter by checking the "
-"Show All checkbutton."
-msgstr ""
-
-#: ../data/tips.xml.in.h:29
-msgid ""
-"<b>Improving Gramps</b><br/>Users are encouraged to request enhancements to "
-"Gramps. Requesting an enhancement can be done either through the gramps-"
-"users or gramps-devel mailing lists, or by going to http://bugs.gramps-"
-"project.org and creating a Feature Request. Filing a Feature Request is "
-"preferred but it can be good to discuss your ideas on the email lists."
-msgstr ""
-
-#: ../data/tips.xml.in.h:30
-msgid ""
-"<b>Gramps Mailing Lists</b><br/>Want answers to your questions about Gramps? "
-"Check out the gramps-users email list. Many helpful people are on the list, "
-"so you're likely to get an answer quickly. If you have questions related to "
-"the development of Gramps, try the gramps-devel list. You can see the lists "
-"by selecting &quot;Help &gt; Gramps Mailing Lists&quot;."
-msgstr ""
-
-#: ../data/tips.xml.in.h:31
-msgid ""
-"<b>Contributing to Gramps</b><br/>Want to help with Gramps but can't write "
-"programs? Not a problem! A project as large as Gramps requires people with a "
-"wide variety of skills. Contributions can be anything from writing "
-"documentation to testing development versions and helping with the web site. "
-"Start by subscribing to the Gramps developers mailing list, gramps-devel, "
-"and introducing yourself. Subscription information can be found at &quot;"
-"Help &gt; Gramps Mailing Lists&quot;"
-msgstr ""
-
-#: ../data/tips.xml.in.h:32
-msgid ""
-"<b>So What's in a Name?</b><br/>The name Gramps was suggested to the "
-"original developer, Don Allingham, by his father. It stands for "
-"<i>Genealogical Research and Analysis Management Program System</i>. It is a "
-"full-featured genealogy program letting you store, edit, and research "
-"genealogical data. The Gramps database back end is so robust that some users "
-"are managing genealogies containing hundreds of thousands of people."
-msgstr ""
-
-#: ../data/tips.xml.in.h:33
-msgid ""
-"<b>Bookmarking Individuals</b><br/>The Bookmarks menu is a convenient place "
-"to store the names of frequently used individuals. Selecting a bookmark will "
-"make that person the Active Person. To bookmark someone make them the Active "
-"Person then go to &quot;Bookmarks &gt; Add Bookmark&quot; or press Ctrl+D. "
-"You can also bookmark most of the other objects."
-msgstr ""
-
-#: ../data/tips.xml.in.h:34
-msgid ""
-"<b>Incorrect Dates</b><br/>Everyone occasionally enters dates with an "
-"invalid format. Incorrect date formats will show up in Gramps with a reddish "
-"background. You can fix the date using the Date Selection dialog which can "
-"be opened by clicking on the date button. The format of the date is set "
-"under &quot;Edit &gt; Preferences &gt; Display&quot;."
-msgstr ""
-
-#: ../data/tips.xml.in.h:35
-msgid ""
-"<b>Listing Events</b><br/>Events are added using the editor opened with "
-"&quot;Person &gt; Edit Person &gt; Events&quot;. There is a long list of "
-"preset event types. You can add your own event types by typing in the text "
-"field, they will be added to the available events, but not translated."
-msgstr ""
-
-#: ../data/tips.xml.in.h:36
-msgid ""
-"<b>Managing Names</b><br/>It is easy to manage people with several names in "
-"Gramps. In the Person Editor select the Names tab. You can add names of "
-"different types and set the prefered name by dragging it to the Prefered "
-"Name section."
-msgstr ""
-
-#: ../data/tips.xml.in.h:37
-msgid ""
-"<b>Ancestor View</b><br/>The Ancestry View displays a traditional pedigree "
-"chart. Hold the mouse over an individual to see more information about them "
-"or right click on an individual to access other family members and settings. "
-"Play with the settings to see the different options."
-msgstr ""
-
-#: ../data/tips.xml.in.h:38
-msgid ""
-"<b>Managing Sources</b><br/>The Sources View shows a list of all sources in "
-"a single window. From here you can edit your sources, merge duplicates and "
-"see which individuals reference each source. You can use filters to group "
-"your sources."
-msgstr ""
-
-#: ../data/tips.xml.in.h:39
-msgid ""
-"<b>Managing Places</b><br/>The Places View shows a list of all places in the "
-"database. The list can be sorted by a number of different criteria, such as "
-"City, County or State."
-msgstr ""
-
-#: ../data/tips.xml.in.h:40
-msgid ""
-"<b>Media View</b><br/>The Media View shows a list of all media entered in "
-"the database. These can be graphic images, videos, sound clips, "
-"spreadsheets, documents, and more."
-msgstr ""
-
-#: ../data/tips.xml.in.h:41
-msgid ""
-"<b>Filters</b><br/>Filters allow you to limit the people seen in the People "
-"View. In addition to the many preset filters, Custom Filters can be created "
-"limited only by your imagination. Custom filters are created from &quot;Edit "
-"&gt; Person Filter Editor&quot;."
-msgstr ""
-
-#: ../data/tips.xml.in.h:42
+#: ../data/tips.xml.in.h:53
 msgid ""
 "<b>The GEDCOM File Format</b><br/>Gramps allows you to import from, and "
 "export to, the GEDCOM format. There is extensive support for the industry "
@@ -30017,7 +30103,29 @@ msgid ""
 "importing and exporting GEDCOM files trivial."
 msgstr ""
 
-#: ../data/tips.xml.in.h:43
+#: ../data/tips.xml.in.h:54
+msgid ""
+"<b>The Gramps Code</b><br/>Gramps is written in a computer language called "
+"Python using the GTK and GNOME libraries for the graphical interface. Gramps "
+"is supported on any computer system where these programs have been ported. "
+"Gramps is known to be run on Linux, BSD, Solaris, Windows and Mac OS X."
+msgstr ""
+
+#: ../data/tips.xml.in.h:55
+msgid ""
+"<b>The Gramps Homepage</b><br/>The Gramps homepage is at http://gramps-"
+"project.org/"
+msgstr ""
+
+#: ../data/tips.xml.in.h:56
+msgid ""
+"<b>The Gramps Software License</b><br/>You are free to use and share Gramps "
+"with others. Gramps is freely distributable under the GNU General Public "
+"License, see http://www.gnu.org/licenses/licenses.html#GPL to read about the "
+"rights and restrictions of this license."
+msgstr ""
+
+#: ../data/tips.xml.in.h:57
 msgid ""
 "<b>The Gramps XML Package</b><br/>You can export your Family Tree as a "
 "Gramps XML Package. This is a compressed file containing your family tree "
@@ -30027,157 +30135,50 @@ msgid ""
 "information is ever lost when exporting and importing."
 msgstr ""
 
-#: ../data/tips.xml.in.h:44
-msgid ""
-"<b>Web Family Tree Format</b><br/>Gramps can export data to the Web Family "
-"Tree (WFT) format. This format allows a family tree to be displayed online "
-"using a single file, instead of many html files."
-msgstr ""
-
-#: ../data/tips.xml.in.h:45
-msgid ""
-"<b>Making a Genealogy Website</b><br/>You can easily export your family tree "
-"to a web page. Select the entire database, family lines or selected "
-"individuals to a collection of web pages ready for upload to the World Wide "
-"Web. The Gramps project provides free hosting of websites made with Gramps."
-msgstr ""
-
-#: ../data/tips.xml.in.h:46
-msgid ""
-"<b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps "
-"is to use the Gramps bug tracking system at http://bugs.gramps-project.org"
-msgstr ""
-
-#: ../data/tips.xml.in.h:47
-msgid ""
-"<b>The Gramps Homepage</b><br/>The Gramps homepage is at http://gramps-"
-"project.org/"
-msgstr ""
-
-#: ../data/tips.xml.in.h:48
-msgid ""
-"<b>Privacy in Gramps</b><br/>Gramps helps you to keep personal information "
-"secure by allowing you to mark information as private. Data marked as "
-"private can be excluded from reports and data exports. Look for the padlock "
-"which toggles records between private and public."
-msgstr ""
-
-#: ../data/tips.xml.in.h:49
-msgid ""
-"<b>Keeping Good Records</b><br/>Be accurate when recording genealogical "
-"information. Don't make assumptions while recording primary information; "
-"write it exactly as you see it. Use bracketed comments to indicate your "
-"additions, deletions or comments. Use of the Latin 'sic' is recommended to "
-"confirm the accurate transcription of what appears to be an error in a "
-"source."
-msgstr ""
-
-#: ../data/tips.xml.in.h:50
-msgid ""
-"<b>Extra Reports and Tools</b><br/>Extra tools and reports can be added to "
-"Gramps with the &quot;Addon&quot; system. See them under &quot;Help &gt; "
-"Extra Reports/Tools&quot;. This is the best way for advanced users to "
-"experiment and create new functionality."
-msgstr ""
-
-#: ../data/tips.xml.in.h:51
-msgid ""
-"<b>Book Reports</b><br/>The Book report under &quot;Reports &gt; Books &gt; "
-"Book Report...&quot;, allows you to collect a variety of reports into a "
-"single document. This single report is easier to distribute than multiple "
-"reports, especially when printed."
-msgstr ""
-
-#: ../data/tips.xml.in.h:52
-msgid ""
-"<b>Gramps Announcements</b><br/>Interested in getting notified when a new "
-"version of Gramps is released? Join the Gramps-announce mailing list at "
-"&quot;Help &gt; Gramps Mailing Lists&quot;"
-msgstr ""
-
-#: ../data/tips.xml.in.h:53
-msgid ""
-"<b>Record Your Sources</b><br/>Information collected about your family is "
-"only as good as the source it came from. Take the time and trouble to record "
-"all the details of where the information came from. Whenever possible get a "
-"copy of original documents."
-msgstr ""
-
-#: ../data/tips.xml.in.h:54
-msgid ""
-"<b>Directing Your Research</b><br/>Go from what you know to what you do not. "
-"Always record everything that is known before making conjectures. Often the "
-"facts at hand suggest plenty of direction for more research. Don't waste "
-"time looking through thousands of records hoping for a trail when you have "
-"other unexplored leads."
-msgstr ""
-
-#: ../data/tips.xml.in.h:55
-msgid ""
-"<b>The 'How and Why' of Your Genealogy</b><br/> Genealogy isn't only about "
-"dates and names. It is about people. Be descriptive. Include why things "
-"happened, and how descendants might have been shaped by the events they went "
-"through. Narratives go a long way in making your family history come alive."
-msgstr ""
-
-#: ../data/tips.xml.in.h:56
-msgid ""
-"<b>Don't speak English?</b><br/>Volunteers have translated Gramps into more "
-"than 20 languages. If Gramps supports your language and it is not being "
-"displayed, set the default language in your operating system and restart "
-"Gramps."
-msgstr ""
-
-#: ../data/tips.xml.in.h:57
-msgid ""
-"<b>Gramps Translators</b><br/>Gramps has been designed so that new "
-"translations can easily be added with little development effort. If you are "
-"interested in participating please email gramps-devel@lists.sf.net"
-msgstr ""
-
 #: ../data/tips.xml.in.h:58
 msgid ""
-"<b>Hello, привет or 喂</b><br/>Whatever script you use Gramps offers full "
-"Unicode support. Characters for all languages are properly displayed."
-msgstr ""
-
-#: ../data/tips.xml.in.h:59
-msgid ""
 "<b>The Home Person</b><br/>Anyone can be chosen as the Home Person in "
 "Gramps. Use &quot;Edit &gt; Set Home Person&quot; in the Person View. The "
 "home person is the person who is selected when the database is opened or "
 "when the home button is pressed."
 msgstr ""
 
+#: ../data/tips.xml.in.h:59
+msgid ""
+"<b>Unsure of a Date?</b><br/>If you're unsure about the date an event "
+"occurred, Gramps allows you to enter a wide range of date formats based on a "
+"guess or an estimate. For instance, &quot;about 1908&quot; is a valid entry "
+"for a birth date in Gramps. Click the Date button next to the date field and "
+"see the Gramps Manual to learn more."
+msgstr ""
+
 #: ../data/tips.xml.in.h:60
 msgid ""
-"<b>The Gramps Code</b><br/>Gramps is written in a computer language called "
-"Python using the GTK and GNOME libraries for the graphical interface. Gramps "
-"is supported on any computer system where these programs have been ported. "
-"Gramps is known to be run on Linux, BSD, Solaris, Windows and Mac OS X."
+"<b>Web Family Tree Format</b><br/>Gramps can export data to the Web Family "
+"Tree (WFT) format. This format allows a family tree to be displayed online "
+"using a single file, instead of many html files."
 msgstr ""
 
 #: ../data/tips.xml.in.h:61
 msgid ""
-"<b>Open Source Software</b><br/>The Free/Libre and Open Source Software "
-"(FLOSS) development model means Gramps can be extended by any programmer "
-"since all of the source code is freely available under its license. So it's "
-"not just about free beer, it's also about freedom to study and change the "
-"tool. For more about Open Source software lookup the Free Software "
-"Foundation and the Open Source Initiative."
+"<b>What's That For?</b><br/>Unsure what a button does? Simply hold the mouse "
+"over a button and a tooltip will appear."
 msgstr ""
 
 #: ../data/tips.xml.in.h:62
 msgid ""
-"<b>The Gramps Software License</b><br/>You are free to use and share Gramps "
-"with others. Gramps is freely distributable under the GNU General Public "
-"License, see http://www.gnu.org/licenses/licenses.html#GPL to read about the "
-"rights and restrictions of this license."
+"<b>Who Was Born When?</b><br/>Under &quot;Tools &gt; Analysis and "
+"exploration &gt; Compare Individual Events...&quot; you can compare the data "
+"of individuals in your database. This is useful, say, if you wish to list "
+"the birth dates of everyone in your database. You can use a custom filter to "
+"narrow the results."
 msgstr ""
 
 #: ../data/tips.xml.in.h:63
 msgid ""
-"<b>Gramps for Gnome or KDE?</b><br/>For Linux users Gramps works with "
-"whichever desktop environment you prefer. As long as the required GTK "
-"libraries are installed it will run fine."
+"<b>Working with Dates</b><br/>A range of dates can be given by using the "
+"format &quot;between January 4, 2000 and March 20, 2003&quot;. You can also "
+"indicate the level of confidence in a date and even choose between seven "
+"different calendars. Try the button next to the date field in the Events "
+"Editor."
 msgstr ""