diff --git a/gramps/plugins/importer/importgeneweb.py b/gramps/plugins/importer/importgeneweb.py
index fa0668622..4b287fbc0 100644
--- a/gramps/plugins/importer/importgeneweb.py
+++ b/gramps/plugins/importer/importgeneweb.py
@@ -76,60 +76,60 @@ pevents_map = {
     "#bapt" : EventType.BAPTISM, #Epers_Baptism
     "#deat" : EventType.DEATH, #Epers_Death
     "#buri" : EventType.BURIAL, #Epers_Burial
-    "#crem" : EventType.CREMATION, #Epers_Cremation
-    "#acco" : EventType((EventType.CUSTOM, _('Accomplishment'))) , #Epers_Accomplishment
-    "#acqu" : EventType((EventType.CUSTOM, _('Acquisition'))), #Epers_Acquisition
-    "#adhe" : EventType((EventType.CUSTOM, _('Adhesion'))), #Epers_Adhesion
-    "#awar" : EventType((EventType.CUSTOM, _('Award'))), #Epers_Decoration
+    "#crem" : EventType.CREMATION,
+    "#acco" : EventType((EventType.CUSTOM, _('Accomplishment'))) ,
+    "#acqu" : EventType((EventType.CUSTOM, _('Acquisition'))),
+    "#adhe" : EventType((EventType.CUSTOM, _('Adhesion'))),
+    "#awar" : EventType((EventType.CUSTOM, _('Award'))),
     "#bapl" : LdsOrd.BAPTISM, #Epers_BaptismLDS
     "#barm" : EventType.BAR_MITZVAH, #Epers_BarMitzvah
     "#basm" : EventType.BAS_MITZVAH, #Epers_BatMitzvah
     "#bles" : EventType.BLESS, #Epers_Benediction
-    "#cens" : EventType.CENSUS, #Epers_Recensement
-    "#chgn" : EventType((EventType.CUSTOM, _('Change Name'))), #Epers_ChangeName
-    "#circ" : EventType((EventType.CUSTOM, _('Circumcision'))), #Epers_Circumcision
+    "#cens" : EventType.CENSUS,
+    "#chgn" : EventType((EventType.CUSTOM, _('Change Name'))),
+    "#circ" : EventType((EventType.CUSTOM, _('Circumcision'))),
     "#conf" : EventType.CONFIRMATION, #Epers_Confirmation
     "#conl" : LdsOrd.CONFIRMATION, #Epers_ConfirmationLDS
-    "#degr" : EventType.DEGREE, #Epers_Diploma
-    "#demm" : EventType((EventType.CUSTOM, _('Military Demobilisation'))), #Epers_DemobilisationMilitaire
-    "#dist" : EventType((EventType.CUSTOM, _('Award'))), #Epers_Distinction
+    "#degr" : EventType.DEGREE,
+    "#demm" : EventType((EventType.CUSTOM, _('Military Demobilisation'))),
+    "#dist" : EventType((EventType.CUSTOM, _('Award'))),
     "#dotl" : LdsOrd.ENDOWMENT, #Epers_DotationLDS
     "#educ" : EventType.EDUCATION, #Epers_Education
     "#elec" : EventType.ELECTED, #Epers_Election
-    "#emig" : EventType.EMIGRATION, #Epers_Emigration
-    "#endl" : EventType((EventType.CUSTOM, _('Dotation'))), #Epers_Dotation
-    "#exco" : EventType((EventType.CUSTOM, _('Excommunication'))), #Epers_Excommunication
-    "#fcom" : EventType.FIRST_COMMUN, #Epers_FirstCommunion
-    "#flkl" : EventType((EventType.CUSTOM, _('LDS Family Link'))), #Epers_FamilyLinkLDS
-    "#fune" : EventType((EventType.CUSTOM, _('Funeral'))), #Epers_Funeral
-    "#grad" : EventType.GRADUATION, #Epers_Graduate
-    "#hosp" : EventType((EventType.CUSTOM, _('Hospitalisation'))), #Epers_Hospitalisation
-    "#illn" : EventType((EventType.CUSTOM, _('Illness'))), #Epers_Illness
-    "#immi" : EventType.IMMIGRATION, #Epers_Immigration
-    "#lpas" : EventType((EventType.CUSTOM, _('List Passenger'))), #Epers_ListePassenger
-    "#mdis" : EventType((EventType.CUSTOM, _('Military Distinction'))), #Epers_MilitaryDistinction
-    "#mobm" : EventType((EventType.CUSTOM, _('Militaty Mobilisation'))), #Epers_MobilisationMilitaire
-    "#mpro" : EventType((EventType.CUSTOM, _('Military Promotion'))), #Epers_MilitaryPromotion
+    "#emig" : EventType.EMIGRATION,
+    "#endl" : EventType((EventType.CUSTOM, _('Dotation'))),
+    "#exco" : EventType((EventType.CUSTOM, _('Excommunication'))),
+    "#fcom" : EventType.FIRST_COMMUN,
+    "#flkl" : EventType((EventType.CUSTOM, _('LDS Family Link'))),
+    "#fune" : EventType((EventType.CUSTOM, _('Funeral'))),
+    "#grad" : EventType.GRADUATION,
+    "#hosp" : EventType((EventType.CUSTOM, _('Hospitalisation'))),
+    "#illn" : EventType((EventType.CUSTOM, _('Illness'))),
+    "#immi" : EventType.IMMIGRATION,
+    "#lpas" : EventType((EventType.CUSTOM, _('List Passenger'))),
+    "#mdis" : EventType((EventType.CUSTOM, _('Military Distinction'))),
+    "#mobm" : EventType((EventType.CUSTOM, _('Militaty Mobilisation'))),
+    "#mpro" : EventType((EventType.CUSTOM, _('Military Promotion'))),
     "#mser" : EventType.MILITARY_SERV, #Epers_MilitaryService
     "#natu" : EventType.NATURALIZATION, #Epers_Naturalisation
     "#occu" : EventType.OCCUPATION, #Epers_Occupation
     "#ordn" : EventType.ORDINATION, #Epers_Ordination
     "#prop" : EventType.PROPERTY, #Epers_Property
     "#resi" : EventType.RESIDENCE, #Epers_Residence
-    "#reti" : EventType.RETIREMENT, #Epers_Retired
+    "#reti" : EventType.RETIREMENT,
     "#slgc" : EventType((EventType.CUSTOM, _('LDS Seal to child'))), #Epers_ScellentChildLDS
     "#slgp" : LdsOrd.SEAL_TO_PARENTS, #Epers_ScellentParentLDS
-    "#slgs" : LdsOrd.SEAL_TO_SPOUSE, #Epers_ScellentSpouseLDS
+    "#slgs" : LdsOrd.SEAL_TO_SPOUSE,
     "#vteb" : EventType((EventType.CUSTOM, _('Sold property'))), #Epers_VenteBien
     "#will" : EventType.WILL, #Epers_Will
                      }
 
 fevents_map = {
     "#marr" : EventType.MARRIAGE, #Efam_Marriage
-    "#nmar" : EventType.NUM_MARRIAGES, #Efam_NoMarriage
+    "#nmar" : EventType.NUM_MARRIAGES,
     "#nmen" : EventType((EventType.CUSTOM, _('No mention'))), #Efam_NoMention
     "#enga" : EventType.ENGAGEMENT, #Efam_Engage
-    "#div"  : EventType.DIVORCE, #Efam_Divorce
+    "#div"  : EventType.DIVORCE,
     "#sep"  : EventType((EventType.CUSTOM, _('Separated'))), #Efam_Separated
     "#anul" : EventType.ANNULMENT, #Efam_Annulation
     "#marb" : EventType.MARR_BANNS, #Efam_MarriageBann
diff --git a/po/gramps.pot b/po/gramps.pot
index 889fe4474..3a0bc5d03 100644
--- a/po/gramps.pot
+++ b/po/gramps.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-28 17:52+0200\n"
+"POT-Creation-Date: 2015-05-28 18:27+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"
@@ -20755,8 +20755,8 @@ msgstr ""
 #: ../gramps/plugins/importer/importcsv.py:109
 #: ../gramps/plugins/importer/importgedcom.py:124
 #: ../gramps/plugins/importer/importgedcom.py:138
-#: ../gramps/plugins/importer/importgeneweb.py:86
-#: ../gramps/plugins/importer/importgeneweb.py:92
+#: ../gramps/plugins/importer/importgeneweb.py:153
+#: ../gramps/plugins/importer/importgeneweb.py:159
 #: ../gramps/plugins/importer/importvcard.py:69
 #: ../gramps/plugins/importer/importvcard.py:72
 #, python-format
@@ -20765,7 +20765,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:111
 #: ../gramps/plugins/importer/importgedcom.py:147
-#: ../gramps/plugins/importer/importgeneweb.py:95
+#: ../gramps/plugins/importer/importgeneweb.py:162
 #: ../gramps/plugins/importer/importprogen.py:85
 #: ../gramps/plugins/importer/importvcard.py:74
 msgid "Results"
@@ -20773,7 +20773,7 @@ msgstr ""
 
 #: ../gramps/plugins/importer/importcsv.py:111
 #: ../gramps/plugins/importer/importgedcom.py:147
-#: ../gramps/plugins/importer/importgeneweb.py:95
+#: ../gramps/plugins/importer/importgeneweb.py:162
 #: ../gramps/plugins/importer/importprogen.py:85
 #: ../gramps/plugins/importer/importvcard.py:74
 msgid "done"
@@ -20946,7 +20946,7 @@ msgstr ""
 
 #. translators: leave all/any {...} untranslated
 #: ../gramps/plugins/importer/importcsv.py:295
-#: ../gramps/plugins/importer/importgeneweb.py:187
+#: ../gramps/plugins/importer/importgeneweb.py:274
 #: ../gramps/plugins/importer/importvcard.py:233
 msgid "Import Complete: {number_of} second"
 msgid_plural "Import Complete: {number_of} seconds"
@@ -21010,11 +21010,96 @@ msgstr ""
 msgid "Error reading GEDCOM file"
 msgstr ""
 
-#: ../gramps/plugins/importer/importgeneweb.py:122
+#: ../gramps/plugins/importer/importgeneweb.py:80
+msgid "Accomplishment"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:81
+msgid "Acquisition"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:82
+msgid "Adhesion"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:83
+#: ../gramps/plugins/importer/importgeneweb.py:95
+msgid "Award"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:89
+msgid "Change Name"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:90
+msgid "Circumcision"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:94
+msgid "Military Demobilisation"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:100
+msgid "Dotation"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:101
+msgid "Excommunication"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:103
+msgid "LDS Family Link"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:104
+msgid "Funeral"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:106
+msgid "Hospitalisation"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:107
+msgid "Illness"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:109
+msgid "List Passenger"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:110
+msgid "Military Distinction"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:111
+msgid "Militaty Mobilisation"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:112
+msgid "Military Promotion"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:120
+msgid "LDS Seal to child"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:123
+msgid "Sold property"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:130
+msgid "No mention"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:133
+msgid "Separated"
+msgstr ""
+
+#: ../gramps/plugins/importer/importgeneweb.py:197
 msgid "GeneWeb import"
 msgstr ""
 
-#: ../gramps/plugins/importer/importgeneweb.py:824
+#: ../gramps/plugins/importer/importgeneweb.py:911
 msgid "Invalid date {date} in {gw_snippet}, preserving date as text."
 msgstr ""