diff --git a/src/const.py b/src/const.py
index 9c0b1b353..a0e9559bd 100644
--- a/src/const.py
+++ b/src/const.py
@@ -92,7 +92,7 @@ startup        = 1
 #
 #-------------------------------------------------------------------------
 progName     = "GRAMPS"
-version      = "0.8.0-pl2"
+version      = "0.8.0-pl3"
 copyright    = "© 2001-2002 Donald N. Allingham"
 authors      = ["Donald N. Allingham", "David Hampton","Donald A. Peterson"]
 comments     = _("GRAMPS (Genealogical Research and Analysis "
diff --git a/src/data/gedcom.xml b/src/data/gedcom.xml
index 53923950f..d37dac2e3 100644
--- a/src/data/gedcom.xml
+++ b/src/data/gedcom.xml
@@ -50,7 +50,7 @@
   </target>
   <target name="GeneWeb">
     <dest val=""/>
-    <adopt val="event_extended"/>
+    <adopt val="event"/>
     <conc val="standard"/>
     <alternate_names val="none"/>
     <calendar val="yes"/>
@@ -115,4 +115,3 @@
     <residence val="address"/>
   </target>
 </targets>
-
diff --git a/src/plugins/WriteGedcom.py b/src/plugins/WriteGedcom.py
index 8a1a13551..f231fa372 100644
--- a/src/plugins/WriteGedcom.py
+++ b/src/plugins/WriteGedcom.py
@@ -961,6 +961,3 @@ class GedcomWriter:
 from Plugins import register_export
 
 register_export(writeData,_("Export to GEDCOM"))
-
-    
-    
diff --git a/src/po/template.po b/src/po/template.po
index af24d394a..a42a5c437 100644
--- a/src/po/template.po
+++ b/src/po/template.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Mon Aug  5 07:44:19 2002\n"
+"POT-Creation-Date: Tue Oct 15 06:09:07 2002\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"
@@ -56,8 +56,9 @@ msgstr ""
 #: EditPerson.glade:3449 EditPerson.glade:4352 EditPerson.glade:4954
 #: dialog.glade:733 dialog.glade:1311 dialog.glade:2491 dialog.glade:3499
 #: gramps.glade:1758 gramps.glade:2254 imagesel.glade:1285 imagesel.glade:2286
-#: marriage.glade:1016 marriage.glade:1505 places.glade:1216 places.glade:1721
-#: rule.glade:456 rule.glade:854 srcsel.glade:972 styles.glade:247
+#: marriage.glade:1016 marriage.glade:1505 places.glade:1138 places.glade:1416
+#: places.glade:1891 rule.glade:456 rule.glade:854 srcsel.glade:972
+#: styles.glade:247
 msgid "Delete"
 msgstr ""
 
@@ -67,7 +68,7 @@ msgstr ""
 #: gramps.glade:5573 gramps.glade:5969 gramps.glade:5990 gramps.glade:6034
 #: gramps.glade:6064 gramps.glade:7011 gramps.glade:7041 gramps.glade:7058
 #: gramps.glade:7088 plugins/EventCmp.py:286 plugins/FamilyGroup.py:139
-#: plugins/GraphViz.py:323 plugins/GraphViz.py:333
+#: plugins/GraphViz.py:332 plugins/GraphViz.py:333
 msgid "Birth"
 msgstr ""
 
@@ -75,24 +76,24 @@ msgstr ""
 msgid "Choose the Parents of %s"
 msgstr ""
 
-#: ChooseParents.py:212 ChooseParents.py:213 gramps_main.py:1461
-#: gramps_main.py:1462
+#: ChooseParents.py:214 ChooseParents.py:215 gramps_main.py:1473
+#: gramps_main.py:1474
 msgid "Parent"
 msgstr ""
 
-#: ChooseParents.py:215 gramps.glade:1900 gramps.glade:5325
-#: gramps_main.py:1465 mergedata.glade:518 mergedata.glade:1180
+#: ChooseParents.py:217 gramps.glade:1900 gramps.glade:5325
+#: gramps_main.py:1477 mergedata.glade:518 mergedata.glade:1180
 #: plugins/FamilyGroup.py:198 plugins/IndivComplete.py:198
 #: plugins/IndivComplete.py:200 plugins/IndivComplete.py:411
-#: plugins/IndivSummary.py:283 plugins/WebPage.py:263 plugins/WebPage.py:266
+#: plugins/IndivSummary.py:283 plugins/WebPage.py:264 plugins/WebPage.py:267
 msgid "Mother"
 msgstr ""
 
-#: ChooseParents.py:216 gramps.glade:1809 gramps.glade:5065
-#: gramps_main.py:1464 mergedata.glade:766 mergedata.glade:1478
+#: ChooseParents.py:218 gramps.glade:1809 gramps.glade:5065
+#: gramps_main.py:1476 mergedata.glade:766 mergedata.glade:1478
 #: plugins/FamilyGroup.py:185 plugins/IndivComplete.py:190
 #: plugins/IndivComplete.py:192 plugins/IndivComplete.py:406
-#: plugins/IndivSummary.py:269 plugins/WebPage.py:262 plugins/WebPage.py:265
+#: plugins/IndivSummary.py:269 plugins/WebPage.py:263 plugins/WebPage.py:266
 msgid "Father"
 msgstr ""
 
@@ -152,108 +153,108 @@ msgstr ""
 msgid "(and|to|-)"
 msgstr ""
 
-#: Date.py:261 Date.py:287 Date.py:300
+#: Date.py:261 Date.py:291 Date.py:307
 msgid "from"
 msgstr ""
 
-#: Date.py:261 Date.py:287 Date.py:300 plugins/changetype.glade:152
+#: Date.py:261 Date.py:291 Date.py:307 plugins/changetype.glade:152
 msgid "to"
 msgstr ""
 
-#: Date.py:270 EventEdit.py:141 dialog.glade:409 dialog.glade:2215
+#: Date.py:273 EventEdit.py:141 dialog.glade:409 dialog.glade:2215
 msgid "Julian"
 msgstr ""
 
-#: Date.py:272 EventEdit.py:141 dialog.glade:409 dialog.glade:2215
+#: Date.py:275 EventEdit.py:141 dialog.glade:409 dialog.glade:2215
 msgid "Hebrew"
 msgstr ""
 
-#: Date.py:274 dialog.glade:409 dialog.glade:2215
+#: Date.py:277 dialog.glade:409 dialog.glade:2215
 msgid "French"
 msgstr ""
 
-#: Date.py:355 Date.py:373 Date.py:534 Date.py:767
+#: Date.py:365 Date.py:383 Date.py:544 Date.py:777
 msgid "about"
 msgstr ""
 
-#: Date.py:355 Date.py:563
+#: Date.py:365 Date.py:573
 msgid "abt"
 msgstr ""
 
-#: Date.py:356
+#: Date.py:366
 msgid "abt."
 msgstr ""
 
-#: Date.py:356
+#: Date.py:366
 msgid "est"
 msgstr ""
 
-#: Date.py:357
+#: Date.py:367
 msgid "est."
 msgstr ""
 
-#: Date.py:357 Date.py:375
+#: Date.py:367 Date.py:385
 msgid "circa"
 msgstr ""
 
-#: Date.py:358 Date.py:376
+#: Date.py:368 Date.py:386
 msgid "around"
 msgstr ""
 
-#: Date.py:358 Date.py:377 Date.py:536 Date.py:565 Date.py:769
+#: Date.py:368 Date.py:387 Date.py:546 Date.py:575 Date.py:779
 msgid "before"
 msgstr ""
 
-#: Date.py:359
+#: Date.py:369
 msgid "bef"
 msgstr ""
 
-#: Date.py:359
+#: Date.py:369
 msgid "bef."
 msgstr ""
 
-#: Date.py:360
+#: Date.py:370
 msgid "aft."
 msgstr ""
 
-#: Date.py:360 Date.py:378 Date.py:538 Date.py:567 Date.py:771
+#: Date.py:370 Date.py:388 Date.py:548 Date.py:577 Date.py:781
 msgid "after"
 msgstr ""
 
-#: Date.py:361
+#: Date.py:371
 msgid "aft"
 msgstr ""
 
-#: Date.py:372
+#: Date.py:382
 msgid "abt\\.?"
 msgstr ""
 
-#: Date.py:374
+#: Date.py:384
 msgid "est\\.?"
 msgstr ""
 
-#: Date.py:379
+#: Date.py:389
 msgid "aft\\.?"
 msgstr ""
 
-#: Date.py:380
+#: Date.py:390
 msgid "bef\\.?"
 msgstr ""
 
-#: Date.py:593 Date.py:621 Date.py:648 Date.py:677 Date.py:716
+#: Date.py:603 Date.py:631 Date.py:658 Date.py:687 Date.py:726
 msgid "ABOUT"
 msgstr ""
 
-#: Date.py:595 Date.py:623 Date.py:650 Date.py:680 Date.py:718
+#: Date.py:605 Date.py:633 Date.py:660 Date.py:690 Date.py:728
 msgid "BEFORE"
 msgstr ""
 
-#: Date.py:597 Date.py:625 Date.py:652 Date.py:682 Date.py:720
+#: Date.py:607 Date.py:635 Date.py:662 Date.py:692 Date.py:730
 msgid "AFTER"
 msgstr ""
 
-#: DbPrompter.py:100 gramps_main.py:788 gramps_main.py:1164
-#: gramps_main.py:1176
+#: DbPrompter.py:100 gramps_main.py:788 gramps_main.py:1176
+#: gramps_main.py:1188
 msgid "No Comment Provided"
 msgstr ""
 
@@ -311,8 +312,8 @@ msgstr ""
 #: EditPerson.glade:2919 EditPerson.glade:3432 EditPerson.glade:4335
 #: EditPerson.glade:4937 dialog.glade:718 dialog.glade:1296 dialog.glade:2476
 #: dialog.glade:3484 imagesel.glade:1269 imagesel.glade:2270
-#: marriage.glade:1000 marriage.glade:1489 rule.glade:441 rule.glade:838
-#: srcsel.glade:957 styles.glade:232
+#: marriage.glade:1000 marriage.glade:1489 places.glade:1401 rule.glade:441
+#: rule.glade:838 srcsel.glade:957 styles.glade:232
 msgid "Edit"
 msgstr ""
 
@@ -326,7 +327,7 @@ msgstr ""
 
 #: EditPerson.glade:653 gramps.glade:1104 gramps.glade:2536 gramps.glade:7228
 #: gramps.glade:7434 plugins/IndivComplete.py:382 plugins/IndivSummary.py:236
-#: plugins/WebPage.py:256 plugins/WebPage.py:258
+#: plugins/WebPage.py:257 plugins/WebPage.py:259
 msgid "Gender"
 msgstr ""
 
@@ -338,9 +339,9 @@ msgstr ""
 msgid "female"
 msgstr ""
 
-#: EditPerson.glade:711 EditPerson.py:431 const.py:113 gramps.glade:7161
+#: EditPerson.glade:711 EditPerson.py:430 const.py:113 gramps.glade:7161
 #: plugins/FamilyGroup.py:380 plugins/IndivComplete.py:260
-#: plugins/IndivSummary.py:161 plugins/WebPage.py:522
+#: plugins/IndivSummary.py:161 plugins/WebPage.py:524
 msgid "unknown"
 msgstr ""
 
@@ -362,7 +363,8 @@ msgstr ""
 #: dialog.glade:639 dialog.glade:1217 dialog.glade:2397 dialog.glade:3186
 #: dialog.glade:3405 gramps.glade:2831 gramps.glade:4040 gramps.glade:4179
 #: gramps.glade:6383 imagesel.glade:235 imagesel.glade:792 imagesel.glade:1765
-#: imagesel.glade:2383 places.glade:168 srcsel.glade:208 srcsel.glade:878
+#: imagesel.glade:2383 places.glade:168 places.glade:1322 srcsel.glade:208
+#: srcsel.glade:878
 msgid "Title"
 msgstr ""
 
@@ -381,7 +383,7 @@ msgid "Select source for this name information"
 msgstr ""
 
 #: EditPerson.glade:1004 ImageSelect.py:663 Utils.py:194 Utils.py:196
-#: places.glade:350 preferences.glade:2809
+#: preferences.glade:2809
 msgid "Source"
 msgstr ""
 
@@ -392,7 +394,7 @@ msgstr ""
 #: EditPerson.glade:1057 EditPerson.glade:5185 EditPerson.glade:5480
 #: EditPerson.glade:5778 Utils.py:189 dialog.glade:775 dialog.glade:1353
 #: dialog.glade:2533 dialog.glade:3541 gramps.glade:6566 marriage.glade:1873
-#: places.glade:1256
+#: places.glade:1178
 msgid "Note"
 msgstr ""
 
@@ -415,7 +417,7 @@ msgstr ""
 
 #: EditPerson.glade:1359 GrampsCfg.py:95 GrampsCfg.py:101 dialog.glade:495
 #: dialog.glade:1073 dialog.glade:2253 dialog.glade:3261 gramps.glade:6536
-#: imagesel.glade:1882 places.glade:649 plugins/verify.glade:165
+#: imagesel.glade:1882 places.glade:571 plugins/verify.glade:165
 msgid "General"
 msgstr ""
 
@@ -437,7 +439,7 @@ msgstr ""
 #: EditPerson.glade:2064 config.glade:130 gramps.glade:966 gramps.glade:2422
 #: gramps.glade:4719 gramps.glade:5132 gramps.glade:5391 gramps.glade:5839
 #: mergedata.glade:544 mergedata.glade:1699 plugins/IndivComplete.py:371
-#: plugins/IndivSummary.py:222 plugins/WebPage.py:246
+#: plugins/IndivSummary.py:222 plugins/WebPage.py:247
 #: plugins/relcalc.glade:157 plugins/soundex.glade:143 preferences.glade:1763
 #: rule.glade:140 rule.glade:772
 msgid "Name"
@@ -458,8 +460,8 @@ msgstr ""
 #: EditPerson.glade:4318 EditPerson.glade:4920 dialog.glade:703
 #: dialog.glade:1281 dialog.glade:2461 dialog.glade:3469 gramps.glade:1730
 #: imagesel.glade:1253 imagesel.glade:2254 marriage.glade:984
-#: marriage.glade:1473 places.glade:1186 places.glade:1691 rule.glade:426
-#: rule.glade:822 srcsel.glade:942 styles.glade:217
+#: marriage.glade:1473 places.glade:1108 places.glade:1386 places.glade:1861
+#: rule.glade:426 rule.glade:822 srcsel.glade:942 styles.glade:217
 msgid "Add"
 msgstr ""
 
@@ -482,8 +484,8 @@ msgstr ""
 #: EditPerson.glade:2286 EditPerson.glade:2825 EditPerson.glade:4573
 #: EditPerson.glade:4882 GenericFilter.py:274 GenericFilter.py:312
 #: GenericFilter.py:401 GenericFilter.py:433 const.py:321 dialog.glade:206
-#: dialog.glade:2700 gramps.glade:6739 marriage.glade:401 places.glade:1422
-#: places.glade:1654 plugins/pafexport.glade:241
+#: dialog.glade:2700 gramps.glade:6739 marriage.glade:401 places.glade:1592
+#: places.glade:1824 plugins/pafexport.glade:241
 msgid "Description"
 msgstr ""
 
@@ -551,7 +553,7 @@ msgid "No Addresses"
 msgstr ""
 
 #: EditPerson.glade:3511 config.glade:234 dialog.glade:1546 dialog.glade:2038
-#: gramps.glade:3477 places.glade:272 places.glade:793 places.glade:1149
+#: gramps.glade:3477 places.glade:272 places.glade:715 places.glade:1071
 #: preferences.glade:1867
 msgid "Country"
 msgstr ""
@@ -600,7 +602,7 @@ msgid "Enter miscellaneous relevant data and documentation"
 msgstr ""
 
 #: EditPerson.glade:4394 imagesel.glade:882 imagesel.glade:2326
-#: marriage.glade:1546 plugins/IndivComplete.py:150 plugins/WebPage.py:438
+#: marriage.glade:1546 plugins/IndivComplete.py:150 plugins/WebPage.py:439
 msgid "Notes"
 msgstr ""
 
@@ -609,7 +611,7 @@ msgid "Place new media object in this gallery"
 msgstr ""
 
 #: EditPerson.glade:4480 gramps.glade:4434 gramps.glade:6651
-#: marriage.glade:1633 places.glade:1340
+#: marriage.glade:1633 places.glade:1510
 msgid "Add Media Object"
 msgstr ""
 
@@ -618,7 +620,7 @@ msgid "Remove selected object from this gallery only"
 msgstr ""
 
 #: EditPerson.glade:4496 gramps.glade:4463 gramps.glade:6667
-#: marriage.glade:1649 places.glade:1355
+#: marriage.glade:1649 places.glade:1525
 msgid "Delete Media Object"
 msgstr ""
 
@@ -627,21 +629,21 @@ msgid "Modify selected object"
 msgstr ""
 
 #: EditPerson.glade:4512 gramps.glade:6683 marriage.glade:1665
-#: places.glade:1370
+#: places.glade:1540
 msgid "Edit Properties"
 msgstr ""
 
 #: EditPerson.glade:4522 gramps.glade:6695 marriage.glade:1675
-#: places.glade:1382 plugins/WebPage.py:325
+#: places.glade:1552 plugins/WebPage.py:326
 msgid "Gallery"
 msgstr ""
 
-#: EditPerson.glade:4552 places.glade:1401
+#: EditPerson.glade:4552 places.glade:1571
 msgid "Internet Addresses"
 msgstr ""
 
 #: EditPerson.glade:4599 EditPerson.glade:4869 dialog.glade:2674
-#: places.glade:1448 places.glade:1641
+#: places.glade:1618 places.glade:1811
 msgid "Web Address"
 msgstr ""
 
@@ -649,7 +651,7 @@ msgstr ""
 msgid "Go to this web page"
 msgstr ""
 
-#: EditPerson.glade:4696 places.glade:1544
+#: EditPerson.glade:4696 places.glade:1714
 msgid "Go"
 msgstr ""
 
@@ -665,7 +667,7 @@ msgstr ""
 msgid "Delete selected reference"
 msgstr ""
 
-#: EditPerson.glade:4964 places.glade:1731
+#: EditPerson.glade:4964 places.glade:1901
 msgid "Internet"
 msgstr ""
 
@@ -680,8 +682,8 @@ msgstr ""
 
 #: EditPerson.glade:5157 EditPerson.glade:5452 EditPerson.glade:5750
 #: dialog.glade:743 dialog.glade:1321 dialog.glade:2501 dialog.glade:3509
-#: gramps.glade:655 gramps.glade:3071 marriage.glade:1846
-#: plugins/IndivComplete.py:300 plugins/WebPage.py:178
+#: gramps.glade:655 gramps.glade:3071 marriage.glade:1846 places.glade:1426
+#: plugins/IndivComplete.py:300 plugins/WebPage.py:179
 #: plugins/gedcomexport.glade:437 plugins/pkgexport.glade:266
 msgid "Sources"
 msgstr ""
@@ -702,67 +704,67 @@ msgstr ""
 msgid "LDS"
 msgstr ""
 
-#: EditPerson.py:406 GrampsCfg.py:61 const.py:126 gramps.glade:5294
+#: EditPerson.py:405 GrampsCfg.py:61 const.py:126 gramps.glade:5294
 #: gramps.glade:5553 gramps.glade:5969 gramps.glade:6034 gramps.glade:7011
 #: gramps.glade:7058
 msgid "None"
 msgstr ""
 
-#: EditPerson.py:423 EditSource.py:140
+#: EditPerson.py:422 EditSource.py:140
 msgid "%(father)s and %(mother)s"
 msgstr ""
 
-#: EditPerson.py:742 EditPerson.py:744 EditPerson.py:754 EditPerson.py:756
+#: EditPerson.py:741 EditPerson.py:743 EditPerson.py:753 EditPerson.py:755
 #: Marriage.py:355 Marriage.py:358 gramps_main.py:405 gramps_main.py:409
-#: gramps_main.py:1117
+#: gramps_main.py:1129
 msgid "Abandon Changes"
 msgstr ""
 
-#: EditPerson.py:743 EditPerson.py:755
+#: EditPerson.py:742 EditPerson.py:754
 msgid "Are you sure you want to abandon your changes?"
 msgstr ""
 
-#: EditPerson.py:746 EditPerson.py:758 Marriage.py:359
+#: EditPerson.py:745 EditPerson.py:757 Marriage.py:359
 msgid "Continue Editing"
 msgstr ""
 
-#: EditPerson.py:1085
+#: EditPerson.py:1052
 msgid "Make the selected name the preferred name"
 msgstr ""
 
-#: EditPerson.py:1146 Marriage.py:378
+#: EditPerson.py:1113 Marriage.py:378
 msgid "GRAMPS ID value was not changed."
 msgstr ""
 
-#: EditPerson.py:1147
+#: EditPerson.py:1114
 msgid "%(grampsid)s is already used by %(person)s"
 msgstr ""
 
-#: EditPerson.py:1250
+#: EditPerson.py:1219
 msgid ""
 "Changing the gender caused problems with marriage information.\n"
 "Please check the person's marriages."
 msgstr ""
 
-#: EditPlace.py:267 EditPlace.py:291
+#: EditPlace.py:269 EditPlace.py:293
 msgid "Internet Address Editor for %s"
 msgstr ""
 
-#: EditPlace.py:269 EditPlace.py:293 dialog.glade:2633
+#: EditPlace.py:271 EditPlace.py:295 dialog.glade:2633
 msgid "Internet Address Editor"
 msgstr ""
 
-#: EditPlace.py:341 gramps.glade:608 plugins/gedcomexport.glade:489
+#: EditPlace.py:340 gramps.glade:608 plugins/gedcomexport.glade:489
 #: plugins/pkgexport.glade:318
 msgid "People"
 msgstr ""
 
-#: EditPlace.py:343 EditPlace.py:352
+#: EditPlace.py:342 EditPlace.py:351
 msgid ""
 "%s [%s]: event %s\n"
 msgstr ""
 
-#: EditPlace.py:350 plugins/gedcomexport.glade:463 plugins/pkgexport.glade:292
+#: EditPlace.py:349 plugins/gedcomexport.glade:463 plugins/pkgexport.glade:292
 msgid "Families"
 msgstr ""
 
@@ -835,8 +837,8 @@ msgstr ""
 #: dialog.glade:3335 gramps.glade:1034 gramps.glade:2479 gramps.glade:2887
 #: gramps.glade:3192 gramps.glade:3988 gramps.glade:4235 gramps.glade:5865
 #: imagesel.glade:613 imagesel.glade:1507 imagesel.glade:2370
-#: mergedata.glade:1013 mergedata.glade:1725 plugins/relcalc.glade:170
-#: srcsel.glade:808
+#: mergedata.glade:1013 mergedata.glade:1725 places.glade:1252
+#: plugins/relcalc.glade:170 srcsel.glade:808
 msgid "ID"
 msgstr ""
 
@@ -1081,32 +1083,32 @@ msgstr ""
 msgid "Data Guessing"
 msgstr ""
 
-#: GrampsCfg.py:697 GrampsCfg.py:712
+#: GrampsCfg.py:682 GrampsCfg.py:697
 msgid "No default format"
 msgstr ""
 
-#: ImageSelect.py:140
+#: ImageSelect.py:139
 msgid "That is not a valid file name."
 msgstr ""
 
-#: ImageSelect.py:285 MediaView.py:293 plugins/ReadGedcom.py:864
-#: plugins/ReadGedcom.py:899 plugins/ReadGedcom.py:934
+#: ImageSelect.py:284 MediaView.py:293 plugins/ReadGedcom.py:873
+#: plugins/ReadGedcom.py:908 plugins/ReadGedcom.py:943
 msgid "Could not import %s"
 msgstr ""
 
-#: ImageSelect.py:391 MediaView.py:122
+#: ImageSelect.py:390 MediaView.py:122
 msgid "View in the default viewer"
 msgstr ""
 
-#: ImageSelect.py:395 MediaView.py:124
+#: ImageSelect.py:394 MediaView.py:124
 msgid "Edit with the GIMP"
 msgstr ""
 
-#: ImageSelect.py:397 MediaView.py:126
+#: ImageSelect.py:396 MediaView.py:126
 msgid "Edit Object Properties"
 msgstr ""
 
-#: ImageSelect.py:400 MediaView.py:129
+#: ImageSelect.py:399 MediaView.py:129
 msgid "Convert to local copy"
 msgstr ""
 
@@ -1227,7 +1229,7 @@ msgstr ""
 
 #: Plugins.py:378 Plugins.py:389 const.py:127 const.py:402 const.py:410
 #: gramps.glade:5294 gramps.glade:5553 gramps.glade:5969 gramps.glade:6034
-#: gramps.glade:7011 gramps.glade:7058 gramps_main.py:1351 gramps_main.py:1554
+#: gramps.glade:7011 gramps.glade:7058 gramps_main.py:1363 gramps_main.py:1566
 msgid "Unknown"
 msgstr ""
 
@@ -1539,7 +1541,7 @@ msgstr ""
 msgid "RCS"
 msgstr ""
 
-#: WriteXML.py:78
+#: WriteXML.py:79
 msgid "Failure writing %s, original file restored"
 msgstr ""
 
@@ -1570,7 +1572,7 @@ msgid ""
 msgstr ""
 
 #: config.glade:182 dialog.glade:1494 gramps.glade:3306 places.glade:194
-#: places.glade:715 places.glade:1110 preferences.glade:1815
+#: places.glade:637 places.glade:1032 preferences.glade:1815
 msgid "City"
 msgstr ""
 
@@ -1949,17 +1951,17 @@ msgstr ""
 msgid "Attribute Editor"
 msgstr ""
 
-#: dialog.glade:1520 gramps.glade:3363 places.glade:246 places.glade:689
-#: places.glade:1123
+#: dialog.glade:1520 gramps.glade:3363 places.glade:246 places.glade:611
+#: places.glade:1045
 msgid "County"
 msgstr ""
 
-#: dialog.glade:1572 gramps.glade:3420 places.glade:220 places.glade:767
-#: places.glade:1136
+#: dialog.glade:1572 gramps.glade:3420 places.glade:220 places.glade:689
+#: places.glade:1058
 msgid "State"
 msgstr ""
 
-#: dialog.glade:1695 gramps.glade:3249 places.glade:597 places.glade:1001
+#: dialog.glade:1695 gramps.glade:3249 places.glade:519 places.glade:923
 msgid "Church Parish"
 msgstr ""
 
@@ -1996,17 +1998,17 @@ msgstr ""
 msgid "AbiWord"
 msgstr ""
 
-#: docgen/HtmlDoc.py:148 docgen/HtmlDoc.py:173
+#: docgen/HtmlDoc.py:199 docgen/HtmlDoc.py:228
 msgid "The marker '<!-- START -->' was not in the template"
 msgstr ""
 
-#: docgen/HtmlDoc.py:184 docgen/HtmlDoc.py:191
+#: docgen/HtmlDoc.py:243 docgen/HtmlDoc.py:253
 msgid ""
 "Could not open %s\n"
 "Using the default template"
 msgstr ""
 
-#: docgen/HtmlDoc.py:395 docgen/HtmlDrawDoc.py:153 plugins/eventcmp.glade:195
+#: docgen/HtmlDoc.py:557 docgen/HtmlDrawDoc.py:153 plugins/eventcmp.glade:195
 msgid "HTML"
 msgstr ""
 
@@ -2014,10 +2016,14 @@ msgstr ""
 msgid "KWord"
 msgstr ""
 
-#: docgen/LaTeXDoc.py:387
+#: docgen/LaTeXDoc.py:657
 msgid "LaTeX"
 msgstr ""
 
+#: docgen/NroffDoc.py:615
+msgid "nroff/groff"
+msgstr ""
+
 #: docgen/OpenDrawDoc.py:449 docgen/OpenOfficeDoc.py:576
 msgid "OpenOffice/StarOffice 6"
 msgstr ""
@@ -2026,18 +2032,14 @@ msgstr ""
 msgid "PostScript"
 msgstr ""
 
-#: docgen/PdfDoc.py:46 docgen/PdfDrawDoc.py:35
+#: docgen/PdfDoc.py:98 docgen/PdfDrawDoc.py:35
 msgid "The ReportLab modules are not installed"
 msgstr ""
 
-#: docgen/PdfDoc.py:302 docgen/PdfDrawDoc.py:160
+#: docgen/PdfDoc.py:571 docgen/PdfDrawDoc.py:160
 msgid "PDF"
 msgstr ""
 
-#: docgen/RTFDoc.py:516
-msgid "Rich Text Format (RTF)"
-msgstr ""
-
 #: docgen/SvgDrawDoc.py:128
 msgid "SVG (Scalable Vector Graphics)"
 msgstr ""
@@ -2364,8 +2366,8 @@ msgstr ""
 msgid "Exchange active person and displayed spouse"
 msgstr ""
 
-#: gramps.glade:1517 gramps_main.py:1409 gramps_main.py:1434
-#: gramps_main.py:1795
+#: gramps.glade:1517 gramps_main.py:1421 gramps_main.py:1446
+#: gramps_main.py:1807
 msgid "Relationship"
 msgstr ""
 
@@ -2377,7 +2379,7 @@ msgstr ""
 msgid "Make this the preferred spouse"
 msgstr ""
 
-#: gramps.glade:1744 places.glade:1201 places.glade:1706
+#: gramps.glade:1744 places.glade:1123 places.glade:1876
 msgid "Edit/View"
 msgstr ""
 
@@ -2410,7 +2412,7 @@ msgid "Add/Edit/View"
 msgstr ""
 
 #: gramps.glade:2265 plugins/FamilyGroup.py:312 plugins/IndivComplete.py:272
-#: plugins/IndivSummary.py:174 plugins/WebPage.py:538
+#: plugins/IndivSummary.py:174 plugins/WebPage.py:540
 msgid "Children"
 msgstr ""
 
@@ -2598,7 +2600,7 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: gramps.glade:6767 imagesel.glade:2398 places.glade:1761
+#: gramps.glade:6767 imagesel.glade:2398 places.glade:1931
 msgid "References"
 msgstr ""
 
@@ -2760,75 +2762,75 @@ msgstr ""
 msgid "Currently, you can only delete one person at a time"
 msgstr ""
 
-#: gramps_main.py:1066
+#: gramps_main.py:1078
 msgid "Invalid move. Children must be ordered by birth date."
 msgstr ""
 
-#: gramps_main.py:1114
+#: gramps_main.py:1126
 msgid "Do you wish to abandon your changes and revert to the last saved database?"
 msgstr ""
 
-#: gramps_main.py:1118
+#: gramps_main.py:1130
 msgid "Revert to Last Database"
 msgstr ""
 
-#: gramps_main.py:1119
+#: gramps_main.py:1131
 msgid "Continue with Current Database"
 msgstr ""
 
-#: gramps_main.py:1121
+#: gramps_main.py:1133
 msgid "Cannot revert to a previous database, since one does not exist"
 msgstr ""
 
-#: gramps_main.py:1407 gramps_main.py:1793
+#: gramps_main.py:1419 gramps_main.py:1805
 msgid "Preferred Relationship"
 msgstr ""
 
-#: gramps_main.py:1443
+#: gramps_main.py:1455
 msgid "No Relationship"
 msgstr ""
 
-#: gramps_main.py:1473
+#: gramps_main.py:1485
 msgid "Preferred Parents (%d of %d)"
 msgstr ""
 
-#: gramps_main.py:1475
+#: gramps_main.py:1487
 msgid "Preferred Parents"
 msgstr ""
 
-#: gramps_main.py:1478
+#: gramps_main.py:1490
 msgid "Alternate Parents (%d of %d)"
 msgstr ""
 
-#: gramps_main.py:1481
+#: gramps_main.py:1493
 msgid "No Parents"
 msgstr ""
 
-#: gramps_main.py:1729
+#: gramps_main.py:1741
 msgid "No default/home person has been set"
 msgstr ""
 
-#: gramps_main.py:1735
+#: gramps_main.py:1747
 msgid "%s has been bookmarked"
 msgstr ""
 
-#: gramps_main.py:1738
+#: gramps_main.py:1750
 msgid "Bookmark could not be set because no one was selected"
 msgstr ""
 
-#: gramps_main.py:1750
+#: gramps_main.py:1762
 msgid "Do you wish to set %s as the home person?"
 msgstr ""
 
-#: gramps_main.py:1752
+#: gramps_main.py:1764
 msgid "Set Home Person"
 msgstr ""
 
-#: gramps_main.py:1753
+#: gramps_main.py:1765
 msgid "Set as Home Person"
 msgstr ""
 
-#: gramps_main.py:1754
+#: gramps_main.py:1766
 msgid "Do not change Home Person"
 msgstr ""
 
@@ -3012,11 +3014,7 @@ msgstr ""
 msgid "Latitude"
 msgstr ""
 
-#: places.glade:576
-msgid "Select"
-msgstr ""
-
-#: places.glade:668 places.glade:1226
+#: places.glade:590 places.glade:1148
 msgid "Other Names"
 msgstr ""
 
@@ -3046,7 +3044,7 @@ msgstr ""
 
 #: plugins/AncestorChart.py:228 plugins/AncestorChart.py:444
 #: plugins/DesGraph.py:302 plugins/DesGraph.py:451 plugins/GraphViz.py:64
-#: plugins/GraphViz.py:394
+#: plugins/GraphViz.py:443
 msgid "Graphical Reports"
 msgstr ""
 
@@ -3069,8 +3067,8 @@ msgstr ""
 #: plugins/AncestorChart.py:445 plugins/AncestorReport.py:383
 #: plugins/DescendReport.py:285 plugins/DetAncestralReport.py:822
 #: plugins/DetDescendantReport.py:895 plugins/FamilyGroup.py:551
-#: plugins/GraphViz.py:393 plugins/IndivComplete.py:657
-#: plugins/IndivSummary.py:521 plugins/Summary.py:147 plugins/WebPage.py:1249
+#: plugins/GraphViz.py:442 plugins/IndivComplete.py:657
+#: plugins/IndivSummary.py:521 plugins/Summary.py:147 plugins/WebPage.py:1252
 msgid "Beta"
 msgstr ""
 
@@ -3181,6 +3179,19 @@ msgstr ""
 msgid "Produces a textual ancestral report"
 msgstr ""
 
+#: plugins/Capitalize.py:125
+msgid "Convert surnames to all capital letters"
+msgstr ""
+
+#: plugins/Capitalize.py:126 plugins/ChangeTypes.py:94 plugins/Check.py:225
+#: plugins/Merge.py:528 plugins/PatchNames.py:128 plugins/ReorderIds.py:124
+msgid "Database Processing"
+msgstr ""
+
+#: plugins/Capitalize.py:127
+msgid "Searches the entire database and converts all surnames to capital letters"
+msgstr ""
+
 #: plugins/ChangeTypes.py:77
 msgid "1 event record was modified"
 msgstr ""
@@ -3193,11 +3204,6 @@ msgstr ""
 msgid "Rename personal event types"
 msgstr ""
 
-#: plugins/ChangeTypes.py:94 plugins/Check.py:225 plugins/Merge.py:528
-#: plugins/PatchNames.py:128 plugins/ReorderIds.py:124
-msgid "Database Processing"
-msgstr ""
-
 #: plugins/ChangeTypes.py:95
 msgid "Allows all the events of a certain name to be renamed to a new name"
 msgstr ""
@@ -3562,7 +3568,7 @@ msgid "Produces a detailed descendant report"
 msgstr ""
 
 #: plugins/EventCmp.py:131 plugins/GraphViz.py:85 plugins/IndivComplete.py:484
-#: plugins/WebPage.py:910 plugins/WriteGedcom.py:332
+#: plugins/WebPage.py:913 plugins/WriteGedcom.py:332
 #: plugins/WritePafPalm.py:561
 msgid "Entire Database"
 msgstr ""
@@ -3641,7 +3647,7 @@ msgstr ""
 msgid "Multiple"
 msgstr ""
 
-#: plugins/GraphViz.py:63 plugins/GraphViz.py:392
+#: plugins/GraphViz.py:63 plugins/GraphViz.py:441
 msgid "Relationship Graph"
 msgstr ""
 
@@ -3649,7 +3655,7 @@ msgstr ""
 msgid "Graphviz File"
 msgstr ""
 
-#: plugins/GraphViz.py:93 plugins/IndivComplete.py:480 plugins/WebPage.py:922
+#: plugins/GraphViz.py:93 plugins/IndivComplete.py:480 plugins/WebPage.py:925
 #: plugins/WriteGedcom.py:340 plugins/WritePafPalm.py:566
 msgid "Ancestors of %s"
 msgstr ""
@@ -3671,8 +3677,9 @@ msgid "Descendants - Ancestors"
 msgstr ""
 
 #: plugins/GraphViz.py:126 plugins/GraphViz.py:134 plugins/GraphViz.py:142
-#: plugins/GraphViz.py:152 plugins/GraphViz.py:162 plugins/GraphViz.py:176
-#: plugins/GraphViz.py:179 plugins/GraphViz.py:189 plugins/GraphViz.py:196
+#: plugins/GraphViz.py:152 plugins/GraphViz.py:162 plugins/GraphViz.py:170
+#: plugins/GraphViz.py:184 plugins/GraphViz.py:187 plugins/GraphViz.py:197
+#: plugins/GraphViz.py:204
 msgid "GraphViz Options"
 msgstr ""
 
@@ -3716,31 +3723,39 @@ msgstr ""
 msgid "Non-birth relationships will show up as dashed lines in the graph."
 msgstr ""
 
-#: plugins/GraphViz.py:177
+#: plugins/GraphViz.py:168
+msgid "Show family nodes"
+msgstr ""
+
+#: plugins/GraphViz.py:173
+msgid "Families will show up as circles, linkedto parents and children."
+msgstr ""
+
+#: plugins/GraphViz.py:185
 msgid "Top & Bottom Margins"
 msgstr ""
 
-#: plugins/GraphViz.py:180
+#: plugins/GraphViz.py:188
 msgid "Left & Right Margins"
 msgstr ""
 
-#: plugins/GraphViz.py:190
+#: plugins/GraphViz.py:198
 msgid "Number of Horizontal Pages"
 msgstr ""
 
-#: plugins/GraphViz.py:192
+#: plugins/GraphViz.py:200
 msgid "GraphViz can create very large graphs by spreading the graph across a rectangular array of pages. This controls the number pages in the array horizontally."
 msgstr ""
 
-#: plugins/GraphViz.py:197
+#: plugins/GraphViz.py:205
 msgid "Number of Vertical Pages"
 msgstr ""
 
-#: plugins/GraphViz.py:199
+#: plugins/GraphViz.py:207
 msgid "GraphViz can create very large graphs by spreading the graph across a rectangular array of pages. This controls the number pages in the array vertically."
 msgstr ""
 
-#: plugins/GraphViz.py:377
+#: plugins/GraphViz.py:426
 msgid "Generates relationship graphs, currently only in GraphViz format. GraphViz (dot) can transform the graph into postscript, jpeg, png, vrml, svg, and many other formats. For more information or to get a copy of GraphViz, goto http://www.graphviz.org"
 msgstr ""
 
@@ -3757,7 +3772,7 @@ msgid "Alternate Names"
 msgstr ""
 
 #: plugins/IndivComplete.py:244 plugins/IndivSummary.py:145
-#: plugins/WebPage.py:501
+#: plugins/WebPage.py:502
 msgid "Marriages/Children"
 msgstr ""
 
@@ -3766,17 +3781,17 @@ msgid "Individual Facts"
 msgstr ""
 
 #: plugins/IndivComplete.py:354 plugins/IndivSummary.py:203
-#: plugins/WebPage.py:98 plugins/WebPage.py:221
+#: plugins/WebPage.py:98 plugins/WebPage.py:222
 msgid "Summary of %s"
 msgstr ""
 
 #: plugins/IndivComplete.py:384 plugins/IndivSummary.py:243
-#: plugins/WebPage.py:256
+#: plugins/WebPage.py:257
 msgid "Male"
 msgstr ""
 
 #: plugins/IndivComplete.py:386 plugins/IndivSummary.py:245
-#: plugins/WebPage.py:258
+#: plugins/WebPage.py:259
 msgid "Female"
 msgstr ""
 
@@ -3847,19 +3862,27 @@ msgstr ""
 msgid "Searches the entire database and attempts to extract titles and nicknames that may be embedded in a person's given name field."
 msgstr ""
 
-#: plugins/ReadGedcom.py:284 plugins/ReadGedcom.py:295
+#: plugins/ReadGedcom.py:142
+msgid ""
+"Failure reading %s: %s\n"
+"First line should have been '0 HEAD'\n"
+"but was '%s'"
+msgstr ""
+
+#: plugins/ReadGedcom.py:293 plugins/ReadGedcom.py:304
 msgid "Warning: line %d was not understood, so it was ignored."
 msgstr ""
 
-#: plugins/ReadGedcom.py:329
+#: plugins/ReadGedcom.py:338
 msgid "Import Complete: %d seconds"
 msgstr ""
 
-#: plugins/ReadGedcom.py:1659 plugins/ReadGedcom.py:1689
+#: plugins/ReadGedcom.py:1668 plugins/ReadGedcom.py:1698
 msgid "Import from GEDCOM"
 msgstr ""
 
-#: plugins/ReadNative.py:57 plugins/ReadNative.py:85
+#: plugins/ReadNative.py:49 plugins/ReadNative.py:56 plugins/ReadNative.py:59
+#: plugins/ReadNative.py:95
 msgid "Import from GRAMPS"
 msgstr ""
 
@@ -4235,117 +4258,117 @@ msgstr ""
 msgid "List exceptions to assertions or checks about the database"
 msgstr ""
 
-#: plugins/WebPage.py:253
+#: plugins/WebPage.py:254
 msgid "ID Number"
 msgstr ""
 
-#: plugins/WebPage.py:292
+#: plugins/WebPage.py:293
 msgid "Return to the index of people"
 msgstr ""
 
-#: plugins/WebPage.py:399
+#: plugins/WebPage.py:400
 msgid "Facts and Events"
 msgstr ""
 
-#: plugins/WebPage.py:591
+#: plugins/WebPage.py:594
 msgid "Creating Web Pages"
 msgstr ""
 
-#: plugins/WebPage.py:591
+#: plugins/WebPage.py:594
 msgid "Generate HTML reports - GRAMPS"
 msgstr ""
 
-#: plugins/WebPage.py:680 plugins/WebPage.py:684
+#: plugins/WebPage.py:683 plugins/WebPage.py:687
 msgid "Family Tree Index"
 msgstr ""
 
-#: plugins/WebPage.py:718
+#: plugins/WebPage.py:721
 msgid "%s (continued)"
 msgstr ""
 
-#: plugins/WebPage.py:735
+#: plugins/WebPage.py:738
 msgid "Neither %s nor %s are directories"
 msgstr ""
 
-#: plugins/WebPage.py:742 plugins/WebPage.py:746 plugins/WebPage.py:758
-#: plugins/WebPage.py:762
+#: plugins/WebPage.py:745 plugins/WebPage.py:749 plugins/WebPage.py:761
+#: plugins/WebPage.py:765
 msgid "Could not create the directory : %s"
 msgstr ""
 
-#: plugins/WebPage.py:827
+#: plugins/WebPage.py:830
 msgid "Include a link to the index page"
 msgstr ""
 
-#: plugins/WebPage.py:828 plugins/gedcomexport.glade:295
+#: plugins/WebPage.py:831 plugins/gedcomexport.glade:295
 #: plugins/pafexport.glade:296
 msgid "Do not include records marked private"
 msgstr ""
 
-#: plugins/WebPage.py:829
+#: plugins/WebPage.py:832
 msgid "Restrict information on living people"
 msgstr ""
 
-#: plugins/WebPage.py:830
+#: plugins/WebPage.py:833
 msgid "Do not use images"
 msgstr ""
 
-#: plugins/WebPage.py:831
+#: plugins/WebPage.py:834
 msgid "Do not use images for living people"
 msgstr ""
 
-#: plugins/WebPage.py:832
+#: plugins/WebPage.py:835
 msgid "Do not include comments and text in source information"
 msgstr ""
 
-#: plugins/WebPage.py:833
+#: plugins/WebPage.py:836
 msgid "Include the GRAMPS ID in the report"
 msgstr ""
 
-#: plugins/WebPage.py:834
+#: plugins/WebPage.py:837
 msgid "Create a GENDEX index"
 msgstr ""
 
-#: plugins/WebPage.py:835
+#: plugins/WebPage.py:838
 msgid "Image subdirectory"
 msgstr ""
 
-#: plugins/WebPage.py:836
+#: plugins/WebPage.py:839
 msgid "File extension"
 msgstr ""
 
-#: plugins/WebPage.py:860
+#: plugins/WebPage.py:863
 msgid "Privacy"
 msgstr ""
 
-#: plugins/WebPage.py:867
+#: plugins/WebPage.py:870
 msgid "Advanced"
 msgstr ""
 
-#: plugins/WebPage.py:869
+#: plugins/WebPage.py:872
 msgid "GRAMPS ID link URL"
 msgstr ""
 
-#: plugins/WebPage.py:885 plugins/WebPage.py:1247
+#: plugins/WebPage.py:888 plugins/WebPage.py:1250
 msgid "Generate Web Site"
 msgstr ""
 
-#: plugins/WebPage.py:885 plugins/WebPage.py:1248
+#: plugins/WebPage.py:888 plugins/WebPage.py:1251
 msgid "Web Page"
 msgstr ""
 
-#: plugins/WebPage.py:890
+#: plugins/WebPage.py:893
 msgid "Target Directory"
 msgstr ""
 
-#: plugins/WebPage.py:914
+#: plugins/WebPage.py:917
 msgid "Direct Descendants of %s"
 msgstr ""
 
-#: plugins/WebPage.py:918
+#: plugins/WebPage.py:921
 msgid "Descendant Families of %s"
 msgstr ""
 
-#: plugins/WebPage.py:1250
+#: plugins/WebPage.py:1253
 msgid "Generates web (HTML) pages for individuals, or a set of individuals."
 msgstr ""