diff --git a/po/fr.po b/po/fr.po
index 3efb93a9f..d025d7672 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.3.0beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-29 16:50+0200\n"
-"PO-Revision-Date: 2011-05-29 16:54+0100\n"
+"POT-Creation-Date: 2011-06-02 11:44+0200\n"
+"PO-Revision-Date: 2011-06-02 11:44+0100\n"
 "Last-Translator: Jérôme Rapinat <romjerome@yahoo.fr>\n"
 "Language-Team:  <fr@li.org>\n"
 "Language: \n"
@@ -684,9 +684,9 @@ msgstr ""
 #: ../src/plugins/gramplet/RelativeGramplet.py:134
 #: ../src/plugins/graph/GVFamilyLines.py:159
 #: ../src/plugins/graph/GVRelGraph.py:555
-#: ../src/plugins/lib/maps/geography.py:789
-#: ../src/plugins/lib/maps/geography.py:796
+#: ../src/plugins/lib/maps/geography.py:790
 #: ../src/plugins/lib/maps/geography.py:797
+#: ../src/plugins/lib/maps/geography.py:798
 #: ../src/plugins/quickview/all_relations.py:278
 #: ../src/plugins/quickview/all_relations.py:295
 #: ../src/plugins/textreport/IndivComplete.py:576
@@ -1354,7 +1354,7 @@ msgstr "Type"
 #: ../src/gui/selectors/selectplace.py:62
 #: ../src/gui/selectors/selectrepository.py:61
 #: ../src/gui/selectors/selectsource.py:61
-#: ../src/gui/widgets/grampletpane.py:1490
+#: ../src/gui/widgets/grampletpane.py:1497
 #: ../src/plugins/gramplet/PersonDetails.py:125
 #: ../src/plugins/textreport/TagReport.py:456
 #: ../src/plugins/view/mediaview.py:92
@@ -1415,17 +1415,22 @@ msgstr "Rendre %s actif"
 msgid "Create Filter from selected %s..."
 msgstr "Créer un filtre depuis %s..."
 
-#: ../src/Spell.py:60
+# trunk
+#: ../src/Spell.py:59
+msgid "pyenchant must be installed"
+msgstr "pyenchant doit être installé"
+
+#: ../src/Spell.py:67
 msgid "Spelling checker is not installed"
 msgstr "Le vérificateur orthographique n'est pas installé"
 
 # trunk
-#: ../src/Spell.py:78
+#: ../src/Spell.py:85
 msgid "Off"
 msgstr "Désactivé"
 
 # trunk
-#: ../src/Spell.py:81
+#: ../src/Spell.py:88
 msgid "On"
 msgstr "Activé"
 
@@ -1484,7 +1489,7 @@ msgstr "Source principale"
 #: ../src/Merge/mergeperson.py:238
 #: ../src/plugins/export/ExportCsv.py:501
 #: ../src/plugins/gramplet/Children.py:84
-#: ../src/plugins/gramplet/Children.py:180
+#: ../src/plugins/gramplet/Children.py:181
 #: ../src/plugins/import/ImportCsv.py:218
 #: ../src/Filters/SideBar/_FamilySidebarFilter.py:114
 msgid "Child"
@@ -4338,7 +4343,7 @@ msgid ""
 "  <b>Call</b>       - call name               <b>Nickname</b>     - nick name\n"
 "  <b>Initials</b>   - first letters of Given  <b>Common</b>       - nick name, otherwise first of Given\n"
 "  <b>Primary, Primary[pre] or [sur] or [con]</b>- full primary surname, prefix, surname only, connector   \n"
-"  <b>Patronymic, or [pre] or [sur] or [con]</b> - full pa/matronic surname, prefix, surname only, connector \n"
+"  <b>Patronymic, or [pre] or [sur] or [con]</b> - full pa/matronymic surname, prefix, surname only, connector \n"
 "  <b>Familynick</b> - family nick name        <b>Prefix</b>       - all prefixes (von, de)  \n"
 "  <b>Rest</b>       - non primary surnames    <b>Notpatronymic</b>- all surnames, except pa/matronymic &amp; primary\n"
 "  <b>Rawsurnames</b>- surnames (no prefixes and connectors)\n"
@@ -4547,7 +4552,7 @@ msgstr "Éditer"
 
 # trunk
 #: ../src/gui/configure.py:858
-msgid "Consider single pa/matronimic as surname"
+msgid "Consider single pa/matronymic as surname"
 msgstr "Considérer le simple pa/matronyme comme nom de famille"
 
 #: ../src/gui/configure.py:872
@@ -5426,7 +5431,7 @@ msgid "Delete Filter"
 msgstr "Supprimer le filtre"
 
 #: ../src/gui/grampsbar.py:159
-#: ../src/gui/widgets/grampletpane.py:1123
+#: ../src/gui/widgets/grampletpane.py:1129
 msgid "Unnamed Gramplet"
 msgstr "Gramplet sans nom"
 
@@ -6525,7 +6530,7 @@ msgstr "Maternel"
 #: ../src/gui/selectors/selectperson.py:77
 #: ../src/plugins/drawreport/TimeLine.py:69
 #: ../src/plugins/gramplet/Children.py:85
-#: ../src/plugins/gramplet/Children.py:181
+#: ../src/plugins/gramplet/Children.py:182
 #: ../src/plugins/lib/libpersonview.py:94
 #: ../src/plugins/quickview/FilterByName.py:129
 #: ../src/plugins/quickview/FilterByName.py:209
@@ -6545,7 +6550,7 @@ msgstr "Date de naissance"
 #: ../src/gui/editors/editfamily.py:118
 #: ../src/gui/selectors/selectperson.py:79
 #: ../src/plugins/gramplet/Children.py:87
-#: ../src/plugins/gramplet/Children.py:183
+#: ../src/plugins/gramplet/Children.py:184
 #: ../src/plugins/lib/libpersonview.py:96
 #: ../src/plugins/quickview/lineage.py:60
 #: ../src/plugins/quickview/lineage.py:91
@@ -7059,9 +7064,9 @@ msgid "48.21\"E, -18.2412 or -18:9:48.21)"
 msgstr "48.21\"E, -18.2412 ou -18:9:48.21)"
 
 #: ../src/gui/editors/editplace.py:228
-#: ../src/plugins/lib/maps/geography.py:826
-#: ../src/plugins/view/geoplaces.py:285
-#: ../src/plugins/view/geoplaces.py:304
+#: ../src/plugins/lib/maps/geography.py:827
+#: ../src/plugins/view/geoplaces.py:287
+#: ../src/plugins/view/geoplaces.py:306
 msgid "Edit Place"
 msgstr "Éditer le lieu"
 
@@ -8840,31 +8845,31 @@ msgid "Right click to add gramplets"
 msgstr "Un clic droit pour ajouter des gramplets"
 
 # trunk
-#: ../src/gui/widgets/grampletpane.py:993
+#: ../src/gui/widgets/grampletpane.py:996
 msgid "Untitled Gramplet"
 msgstr "Gramplet sans titre"
 
-#: ../src/gui/widgets/grampletpane.py:1462
+#: ../src/gui/widgets/grampletpane.py:1469
 msgid "Number of Columns"
 msgstr "Nombre de colonnes"
 
-#: ../src/gui/widgets/grampletpane.py:1467
+#: ../src/gui/widgets/grampletpane.py:1474
 msgid "Gramplet Layout"
 msgstr "Mise en page Gramplet"
 
-#: ../src/gui/widgets/grampletpane.py:1497
+#: ../src/gui/widgets/grampletpane.py:1504
 msgid "Use maximum height available"
 msgstr "Utilisation de la hauteur maximale disponible"
 
-#: ../src/gui/widgets/grampletpane.py:1503
+#: ../src/gui/widgets/grampletpane.py:1510
 msgid "Height if not maximized"
 msgstr "La hauteur n'est pas maximisée"
 
-#: ../src/gui/widgets/grampletpane.py:1510
+#: ../src/gui/widgets/grampletpane.py:1517
 msgid "Detached width"
 msgstr "Largeur détachée"
 
-#: ../src/gui/widgets/grampletpane.py:1517
+#: ../src/gui/widgets/grampletpane.py:1524
 msgid "Detached height"
 msgstr "Hauteur détachée"
 
@@ -8880,7 +8885,7 @@ msgstr ""
 "de configuration) pour éditer"
 
 # trunk
-#: ../src/gui/widgets/monitoredwidgets.py:757
+#: ../src/gui/widgets/monitoredwidgets.py:766
 #: ../src/glade/editfamily.glade.h:9
 msgid "Edit the tag list"
 msgstr "Éditer le filtre d'étiquette"
@@ -12062,7 +12067,7 @@ msgstr "Double cliquez sur le jour pour les détails"
 
 # trunk
 #: ../src/plugins/gramplet/Children.py:80
-#: ../src/plugins/gramplet/Children.py:176
+#: ../src/plugins/gramplet/Children.py:177
 msgid "Double-click on a row to edit the selected child."
 msgstr "Double-cliquez sur une ligne pour éditer l'enfant sélectionné."
 
@@ -12293,7 +12298,7 @@ msgstr "Licence"
 
 # trunk
 #: ../src/plugins/gramplet/EditExifMetadata.py:344
-#: ../src/plugins/gramplet/EditExifMetadata.py:1199
+#: ../src/plugins/gramplet/EditExifMetadata.py:1197
 msgid "Select Date"
 msgstr "Sélection de la date"
 
@@ -12419,26 +12424,26 @@ msgstr "Supprimer"
 # trunk
 # Substantif (GNOME fr)
 #. set Message Area to Display...
-#: ../src/plugins/gramplet/EditExifMetadata.py:736
+#: ../src/plugins/gramplet/EditExifMetadata.py:734
 msgid "Displaying image Exif metadata..."
 msgstr "Affichage des métadonnées Exif de l'image..."
 
 # trunk
 # Substantif (GNOME fr)
-#: ../src/plugins/gramplet/EditExifMetadata.py:772
+#: ../src/plugins/gramplet/EditExifMetadata.py:770
 msgid "Copying Exif metadata to the Edit Area..."
 msgstr "Copie des métadonnées Exif vers l'aire d'édition..."
 
 # trunk
 #. set Message Area text...
-#: ../src/plugins/gramplet/EditExifMetadata.py:845
+#: ../src/plugins/gramplet/EditExifMetadata.py:843
 msgid "Edit area has been cleared..."
 msgstr "Vos données ont été nettoyées..."
 
 # trunk
 # Substantif (GNOME fr)
 #. set Message Area to Convert...
-#: ../src/plugins/gramplet/EditExifMetadata.py:874
+#: ../src/plugins/gramplet/EditExifMetadata.py:872
 msgid ""
 "Converting image,\n"
 "You will need to delete the original image file..."
@@ -12449,36 +12454,36 @@ msgstr ""
 # trunk
 # Substantif (GNOME fr)
 #. set Message Area to Saved...
-#: ../src/plugins/gramplet/EditExifMetadata.py:1137
+#: ../src/plugins/gramplet/EditExifMetadata.py:1135
 msgid "Saving Exif metadata to the image..."
 msgstr "Enregistrement des métadonnées Exif dans l'image..."
 
 # trunk
 #. set Message Area to Cleared...
-#: ../src/plugins/gramplet/EditExifMetadata.py:1140
+#: ../src/plugins/gramplet/EditExifMetadata.py:1138
 msgid "Image Exif metadata has been cleared from this image..."
 msgstr "Les métadonnées Exif ont été supprimées de cette image..."
 
 # trunk
 # Substantif (GNOME fr)
 #. set Message Area for deleting...
-#: ../src/plugins/gramplet/EditExifMetadata.py:1171
+#: ../src/plugins/gramplet/EditExifMetadata.py:1169
 msgid "Deleting all Exif metadata..."
 msgstr "Suppression de toutes les métadonnées Exif..."
 
 # trunk
 #. Notify the User...
-#: ../src/plugins/gramplet/EditExifMetadata.py:1178
+#: ../src/plugins/gramplet/EditExifMetadata.py:1176
 msgid "All Exif metadata has been deleted from this image..."
 msgstr "Toutes les métadonnées Exif ont été supprimées de cette image..."
 
 # trunk
-#: ../src/plugins/gramplet/EditExifMetadata.py:1195
+#: ../src/plugins/gramplet/EditExifMetadata.py:1193
 msgid "Double click a day to return the date."
 msgstr "Double cliquez sur un jour pour obtenir la date."
 
 # trunk
-#: ../src/plugins/gramplet/EditExifMetadata.py:1306
+#: ../src/plugins/gramplet/EditExifMetadata.py:1304
 #: ../src/plugins/gramplet/MetadataViewer.py:159
 #, python-format
 msgid "%(date)s %(time)s"
@@ -14096,8 +14101,8 @@ msgstr "Reconstruire la table de référence"
 #: ../src/plugins/import/ImportGrdb.py:2792
 #: ../src/plugins/import/ImportProGen.py:71
 #: ../src/plugins/import/ImportProGen.py:80
-#: ../src/plugins/import/ImportXml.py:388
-#: ../src/plugins/import/ImportXml.py:391
+#: ../src/plugins/import/ImportXml.py:392
+#: ../src/plugins/import/ImportXml.py:395
 #, python-format
 msgid "%s could not be opened"
 msgstr "%s ouverture impossible"
@@ -14242,123 +14247,115 @@ msgstr "%(event_name)s de %(family)s"
 msgid "%(event_name)s of %(person)s"
 msgstr "%(event_name)s de %(person)s"
 
-#: ../src/plugins/import/ImportXml.py:131
-#: ../src/plugins/import/ImportXml.py:136
+#: ../src/plugins/import/ImportXml.py:127
+#: ../src/plugins/import/ImportXml.py:132
 #, python-format
 msgid "Error reading %s"
 msgstr "Erreur de lecture de %s"
 
-#: ../src/plugins/import/ImportXml.py:137
+#: ../src/plugins/import/ImportXml.py:133
 msgid "The file is probably either corrupt or not a valid Gramps database."
 msgstr "Ce fichier est probablement corrompu ou n'est pas une base Gramps valide."
 
-#: ../src/plugins/import/ImportXml.py:240
+# trunk
+#: ../src/plugins/import/ImportXml.py:235
 #, python-format
-msgid "  %(id)s - %(text)s\n"
-msgstr "  %(id)s - %(text)s\n"
-
-#: ../src/plugins/import/ImportXml.py:244
-#, python-format
-msgid "  Family %(id)s\n"
-msgstr "  Famille %(id)s\n"
-
-#: ../src/plugins/import/ImportXml.py:246
-#, python-format
-msgid "  Source %(id)s\n"
-msgstr "  Source %(id)s\n"
-
-#: ../src/plugins/import/ImportXml.py:248
-#, python-format
-msgid "  Event %(id)s\n"
-msgstr "  Événement %(id)s\n"
-
-#: ../src/plugins/import/ImportXml.py:250
-#, python-format
-msgid "  Media Object %(id)s\n"
-msgstr "  Objet Medium %(id)s\n"
-
-#: ../src/plugins/import/ImportXml.py:252
-#, python-format
-msgid "  Place %(id)s\n"
-msgstr "  Lieu %(id)s\n"
-
-#: ../src/plugins/import/ImportXml.py:254
-#, python-format
-msgid "  Repository %(id)s\n"
-msgstr "  Dépôt %(id)s\n"
-
-#: ../src/plugins/import/ImportXml.py:256
-#, python-format
-msgid "  Note %(id)s\n"
-msgstr "  Note %(id)s\n"
+msgid "  %(id)s - %(text)s with %(id2)s\n"
+msgstr "  %(id)s - %(text)s avec %(id2)s\n"
 
 # trunk
-#: ../src/plugins/import/ImportXml.py:258
+#: ../src/plugins/import/ImportXml.py:241
 #, python-format
-msgid "  Tag %(name)s\n"
-msgstr "  Étiquette %(name)s\n"
+msgid "  Family %(id)s with %(id2)s\n"
+msgstr "  Famille %(id)s avec %(id2)s\n"
 
-#: ../src/plugins/import/ImportXml.py:265
+# trunk
+#: ../src/plugins/import/ImportXml.py:244
+#, python-format
+msgid "  Source %(id)s with %(id2)s\n"
+msgstr "  Source %(id)s avec %(id2)s\n"
+
+# trunk
+#: ../src/plugins/import/ImportXml.py:247
+#, python-format
+msgid "  Event %(id)s with %(id2)s\n"
+msgstr "  Événement %(id)s avec %(id2)s\n"
+
+# trunk
+#: ../src/plugins/import/ImportXml.py:250
+#, python-format
+msgid "  Media Object %(id)s with %(id2)s\n"
+msgstr "  Objet Medium %(id)s avec %(id2)s\n"
+
+# trunk
+#: ../src/plugins/import/ImportXml.py:253
+#, python-format
+msgid "  Place %(id)s with %(id)s\n"
+msgstr "  Lieu %(id)s avec %(id)s\n"
+
+# trunk
+#: ../src/plugins/import/ImportXml.py:256
+#, python-format
+msgid "  Repository %(id)s with %(id2)s\n"
+msgstr "  Dépôt %(id)s avec %(id2)s\n"
+
+# trunk
+#: ../src/plugins/import/ImportXml.py:259
+#, python-format
+msgid "  Note %(id)s with %(id2)s\n"
+msgstr "  Note %(id)s avec %(id2)s\n"
+
+#: ../src/plugins/import/ImportXml.py:269
 #, python-format
 msgid "  People: %d\n"
 msgstr "  Individus : %d\n"
 
-#: ../src/plugins/import/ImportXml.py:266
+#: ../src/plugins/import/ImportXml.py:270
 #, python-format
 msgid "  Families: %d\n"
 msgstr "  Familles : %d\n"
 
-#: ../src/plugins/import/ImportXml.py:267
+#: ../src/plugins/import/ImportXml.py:271
 #, python-format
 msgid "  Sources: %d\n"
 msgstr "  Sources : %d\n"
 
-#: ../src/plugins/import/ImportXml.py:268
+#: ../src/plugins/import/ImportXml.py:272
 #, python-format
 msgid "  Events: %d\n"
 msgstr "  Événements : %d\n"
 
-#: ../src/plugins/import/ImportXml.py:269
+#: ../src/plugins/import/ImportXml.py:273
 #, python-format
 msgid "  Media Objects: %d\n"
 msgstr "  Objets Media: %d\n"
 
-#: ../src/plugins/import/ImportXml.py:270
+#: ../src/plugins/import/ImportXml.py:274
 #, python-format
 msgid "  Places: %d\n"
 msgstr "  Lieux : %d\n"
 
-#: ../src/plugins/import/ImportXml.py:271
+#: ../src/plugins/import/ImportXml.py:275
 #, python-format
 msgid "  Repositories: %d\n"
 msgstr "  Dépôts : %d\n"
 
-#: ../src/plugins/import/ImportXml.py:272
+#: ../src/plugins/import/ImportXml.py:276
 #, python-format
 msgid "  Notes: %d\n"
 msgstr "  Notes : %d\n"
 
 # trunk
-#: ../src/plugins/import/ImportXml.py:273
+#: ../src/plugins/import/ImportXml.py:277
 #, python-format
 msgid "  Tags: %d\n"
 msgstr "  Étiquettes : %d\n"
 
-#: ../src/plugins/import/ImportXml.py:275
+#: ../src/plugins/import/ImportXml.py:279
 msgid "Number of new objects imported:\n"
 msgstr "Nombre de nouveaux objets importés :\n"
 
-#: ../src/plugins/import/ImportXml.py:284
-msgid ""
-"\n"
-"\n"
-"Objects merged-overwritten on import:\n"
-msgstr ""
-"\n"
-"\n"
-"Objets fusionnés - écrasés à l'importation :\n"
-
-#: ../src/plugins/import/ImportXml.py:290
+#: ../src/plugins/import/ImportXml.py:283
 msgid ""
 "\n"
 "Media objects with relative paths have been\n"
@@ -14372,21 +14369,46 @@ msgstr ""
 "relatifs par rapport au répertoire défini dans les\n"
 "préférences, ou, si absent, le répertoire utilisateur.\n"
 
-#: ../src/plugins/import/ImportXml.py:828
+# trunk
+#: ../src/plugins/import/ImportXml.py:294
+msgid ""
+"\n"
+"\n"
+"Objects that are candidates to be merged:\n"
+msgstr ""
+"\n"
+"\n"
+"Objects candidats à la fusion :\n"
+
+# trunk
+#. there is no old style XML
+#: ../src/plugins/import/ImportXml.py:683
+#: ../src/plugins/import/ImportXml.py:1123
+#: ../src/plugins/import/ImportXml.py:1390
+#: ../src/plugins/import/ImportXml.py:1759
+msgid "The Gramps Xml you are trying to import is malformed."
+msgstr "Le fichier Gramps Xml que vous tentez d'importer est malformé."
+
+# trunk
+#: ../src/plugins/import/ImportXml.py:684
+msgid "Attributes that link the data together are missing."
+msgstr "Les attributs qui lient les données sont absents."
+
+#: ../src/plugins/import/ImportXml.py:788
 msgid "Gramps XML import"
 msgstr "Importation XML Gramps"
 
-#: ../src/plugins/import/ImportXml.py:858
+#: ../src/plugins/import/ImportXml.py:818
 msgid "Could not change media path"
 msgstr "Impossible de changer le chemin media"
 
-#: ../src/plugins/import/ImportXml.py:859
+#: ../src/plugins/import/ImportXml.py:819
 #, python-format
 msgid "The opened file has media path %s, which conflicts with the media path of the family tree you import into. The original media path has been retained. Copy the files to a correct directory or change the media path in the Preferences."
 msgstr "Le fichier ouvert ayant pour chemin %s, est en conflit avec le chemin media de l'arbre familial. Copier les fichiers du chemin relatif vers un autre emplacement ou changer le chemin media de la base de données dans les Préférences."
 
 # trunk
-#: ../src/plugins/import/ImportXml.py:914
+#: ../src/plugins/import/ImportXml.py:874
 msgid ""
 "The .gramps file you are importing does not contain information about the version of Gramps with, which it was produced.\n"
 "\n"
@@ -14397,12 +14419,12 @@ msgstr ""
 "Votre fichier ne sera pas importé."
 
 # trunk
-#: ../src/plugins/import/ImportXml.py:917
+#: ../src/plugins/import/ImportXml.py:877
 msgid "Import file misses Gramps version"
 msgstr "Le numéro de version Gramps est manquant sur le fichier importé"
 
 # trunk
-#: ../src/plugins/import/ImportXml.py:919
+#: ../src/plugins/import/ImportXml.py:879
 msgid ""
 "The .gramps file you are importing does not contain a valid xml-namespace number.\n"
 "\n"
@@ -14413,16 +14435,16 @@ msgstr ""
 "Votre fichier ne sera pas importé."
 
 # trunk
-#: ../src/plugins/import/ImportXml.py:922
+#: ../src/plugins/import/ImportXml.py:882
 msgid "Import file contains unacceptable XML namespace version"
 msgstr "Le fichier importé a un espace de nommage XML non-accepté"
 
-#: ../src/plugins/import/ImportXml.py:925
+#: ../src/plugins/import/ImportXml.py:885
 #, python-format
 msgid "The .gramps file you are importing was made by version %(newer)s of Gramps, while you are running an older version %(older)s. The file will not be imported. Please upgrade to the latest version of Gramps and try again."
 msgstr "Le fichier .gramps que vous importez provient de la version %(newer)s de Gramps. alors que vous utilisez une ancienne version %(older)s. Ce fichier ne sera pas importé. Mettez à jour vers la dernière version de Gramps et essayez de nouveau."
 
-#: ../src/plugins/import/ImportXml.py:933
+#: ../src/plugins/import/ImportXml.py:893
 #, python-format
 msgid ""
 "The .gramps file you are importing was made by version %(oldgramps)s of Gramps, while you are running a more recent version %(newgramps)s.\n"
@@ -14439,11 +14461,11 @@ msgstr ""
 "  http://gramps-project.org/wiki/index.php?title=GRAMPS_XML\n"
 "pour plus d'informations."
 
-#: ../src/plugins/import/ImportXml.py:945
+#: ../src/plugins/import/ImportXml.py:905
 msgid "The file will not be imported"
 msgstr "Le fichier n'a pas pu être importé"
 
-#: ../src/plugins/import/ImportXml.py:947
+#: ../src/plugins/import/ImportXml.py:907
 #, python-format
 msgid ""
 "The .gramps file you are importing was made by version %(oldgramps)s of Gramps, while you are running a much more recent version %(newgramps)s.\n"
@@ -14460,29 +14482,44 @@ msgstr ""
 "  http://gramps-project.org/wiki/index.php?title=GRAMPS_XML\n"
 "pour plus d'informations."
 
-#: ../src/plugins/import/ImportXml.py:960
+#: ../src/plugins/import/ImportXml.py:920
 msgid "Old xml file"
 msgstr "Ancien fichier xml"
 
-#: ../src/plugins/import/ImportXml.py:1065
-#: ../src/plugins/import/ImportXml.py:2248
+#: ../src/plugins/import/ImportXml.py:1039
+#: ../src/plugins/import/ImportXml.py:2364
 #, python-format
 msgid "Witness name: %s"
 msgstr "Nom du témoin : %s"
 
 # trunk
-#: ../src/plugins/import/ImportXml.py:1494
+#: ../src/plugins/import/ImportXml.py:1124
+msgid "Any event reference must have a 'hlink' attribute."
+msgstr "Tout événement doit avoir un attribut 'hlink'."
+
+# trunk
+#: ../src/plugins/import/ImportXml.py:1391
+msgid "Any person reference must have a 'hlink' attribute."
+msgstr "Tout individu doit avoir un attribut 'hlink'."
+
+# trunk
+#: ../src/plugins/import/ImportXml.py:1559
 #, python-format
 msgid "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", did not change this grouping to \"%(value)s\"."
 msgstr "Votre arbre familial groupe le nom \"%(key)s\" avec \"%(parent)s\", ne pas modifier ce regroupement par \"%(value)s\"."
 
 # ???
 # trunk
-#: ../src/plugins/import/ImportXml.py:1497
+#: ../src/plugins/import/ImportXml.py:1562
 msgid "Gramps ignored namemap value"
 msgstr "La carte des noms ignorés par Gramps"
 
-#: ../src/plugins/import/ImportXml.py:2139
+# trunk
+#: ../src/plugins/import/ImportXml.py:1760
+msgid "Any note reference must have a 'hlink' attribute."
+msgstr "Toute note doit avoir un attribut 'hlink'."
+
+#: ../src/plugins/import/ImportXml.py:2255
 #, python-format
 msgid "Witness comment: %s"
 msgstr "Commentaire du témoin : %s"
@@ -14512,50 +14549,50 @@ msgstr "La ligne %d n'a pas été reconnue, elle sera donc ignorée."
 msgid "Line %d: empty event note was ignored."
 msgstr "La ligne %d : l'événement vide a été ignoré."
 
-#: ../src/plugins/lib/libgedcom.py:5198
-#: ../src/plugins/lib/libgedcom.py:5838
+#: ../src/plugins/lib/libgedcom.py:5206
+#: ../src/plugins/lib/libgedcom.py:5846
 #, python-format
 msgid "Could not import %s"
 msgstr "Impossible d'importer %s"
 
-#: ../src/plugins/lib/libgedcom.py:5599
+#: ../src/plugins/lib/libgedcom.py:5607
 #, python-format
 msgid "Import from %s"
 msgstr "Importer depuis %s"
 
 # trunk
-#: ../src/plugins/lib/libgedcom.py:5634
+#: ../src/plugins/lib/libgedcom.py:5642
 #, python-format
 msgid "Import of GEDCOM file %s with DEST=%s, could cause errors in the resulting database!"
 msgstr "Importation du fichier GEDCOM %s avec DEST=%s, peut générer des erreurs dans la base de données !"
 
 # Substantif (GNOME fr)
 # trunk
-#: ../src/plugins/lib/libgedcom.py:5637
+#: ../src/plugins/lib/libgedcom.py:5645
 msgid "Look for nameless events."
 msgstr "Recherche des événements sans nom."
 
-#: ../src/plugins/lib/libgedcom.py:5696
-#: ../src/plugins/lib/libgedcom.py:5708
+#: ../src/plugins/lib/libgedcom.py:5704
+#: ../src/plugins/lib/libgedcom.py:5716
 #, python-format
 msgid "Line %d: empty note was ignored."
 msgstr "La ligne %d : la note vide a été ignorée."
 
 # à vérifier - contexte
-#: ../src/plugins/lib/libgedcom.py:5747
+#: ../src/plugins/lib/libgedcom.py:5755
 #, python-format
 msgid "skipped %(skip)d subordinate(s) at line %(line)d"
 msgstr "A ignoré %(skip)d enregistrement(s) à la ligne %(line)d"
 
-#: ../src/plugins/lib/libgedcom.py:6014
+#: ../src/plugins/lib/libgedcom.py:6022
 msgid "Your GEDCOM file is corrupted. The file appears to be encoded using the UTF16 character set, but is missing the BOM marker."
 msgstr "Votre fichier GEDCOM est corrompu. Ce fichier apparaît comme utilisant l'encodage de caractères UTF-16, mais il manque le marqueur BOM."
 
-#: ../src/plugins/lib/libgedcom.py:6017
+#: ../src/plugins/lib/libgedcom.py:6025
 msgid "Your GEDCOM file is empty."
 msgstr "Votre fichier GEDCOM est vide."
 
-#: ../src/plugins/lib/libgedcom.py:6080
+#: ../src/plugins/lib/libgedcom.py:6088
 #, python-format
 msgid "Invalid line %d in GEDCOM file."
 msgstr "Ligne %d  invalide dans le fichier GEDCOM."
@@ -18550,83 +18587,83 @@ msgid "New place with empty fields"
 msgstr "Nouveau lieu avec des champs vides"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:426
+#: ../src/plugins/lib/maps/geography.py:427
 msgid "Map Menu"
 msgstr "Menu Carte"
 
 # trunk
 # croix ?
-#: ../src/plugins/lib/maps/geography.py:429
+#: ../src/plugins/lib/maps/geography.py:430
 msgid "Remove cross hair"
 msgstr "Retirer la mire"
 
 # trunk
 # croix ?
-#: ../src/plugins/lib/maps/geography.py:431
+#: ../src/plugins/lib/maps/geography.py:432
 msgid "Add cross hair"
 msgstr "Ajouter la mire"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:438
+#: ../src/plugins/lib/maps/geography.py:439
 msgid "Unlock zoom and position"
 msgstr "Dévérouiller le zoom et la position"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:440
+#: ../src/plugins/lib/maps/geography.py:441
 msgid "Lock zoom and position"
 msgstr "Vérouiller le zoom et la position"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:447
+#: ../src/plugins/lib/maps/geography.py:448
 msgid "Add place"
 msgstr "Ajouter un lieu"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:452
+#: ../src/plugins/lib/maps/geography.py:453
 msgid "Link place"
 msgstr "Lier à un lieu"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:457
+#: ../src/plugins/lib/maps/geography.py:458
 msgid "Center here"
 msgstr "Centrer ici"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:470
+#: ../src/plugins/lib/maps/geography.py:471
 #, python-format
 msgid "Replace '%(map)s' by =>"
 msgstr "Remplacer '%(map)s' par =>"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:830
+#: ../src/plugins/lib/maps/geography.py:831
 #: ../src/plugins/view/geoevents.py:324
 #: ../src/plugins/view/geoevents.py:350
 #: ../src/plugins/view/geofamily.py:375
 #: ../src/plugins/view/geoperson.py:414
 #: ../src/plugins/view/geoperson.py:434
 #: ../src/plugins/view/geoperson.py:471
-#: ../src/plugins/view/geoplaces.py:290
-#: ../src/plugins/view/geoplaces.py:308
+#: ../src/plugins/view/geoplaces.py:292
+#: ../src/plugins/view/geoplaces.py:310
 msgid "Center on this place"
 msgstr "Centrer sur ce lieu"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:1014
+#: ../src/plugins/lib/maps/geography.py:1021
 msgid "Nothing for this view."
 msgstr "Rien pour cette vue."
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:1015
+#: ../src/plugins/lib/maps/geography.py:1022
 msgid "Specific parameters"
 msgstr "Paramètres spécifiques"
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:1029
+#: ../src/plugins/lib/maps/geography.py:1036
 msgid "Where to save the tiles for offline mode."
 msgstr "Où stocker les tuiles en mode hors ligne."
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:1034
+#: ../src/plugins/lib/maps/geography.py:1041
 msgid ""
 "If you have no more space in your file system\n"
 "You can remove all tiles placed in the above path.\n"
@@ -18638,7 +18675,7 @@ msgstr ""
 "pas de carte."
 
 # trunk
-#: ../src/plugins/lib/maps/geography.py:1039
+#: ../src/plugins/lib/maps/geography.py:1046
 msgid "Zoom used when centering"
 msgstr "Zoom utilisé pour centrer"
 
@@ -18647,7 +18684,7 @@ msgstr "Zoom utilisé pour centrer"
 #. perhaps we need some contrôl on this path :
 #. should begin with : /home, /opt, /map, ...
 #. configdialog.add_button(table, '', 4, 'geography.clean')
-#: ../src/plugins/lib/maps/geography.py:1048
+#: ../src/plugins/lib/maps/geography.py:1055
 msgid "The map"
 msgstr "La carte"
 
@@ -22439,8 +22476,8 @@ msgstr "Afficher tous les événements"
 # trunk
 #: ../src/plugins/view/geoevents.py:368
 #: ../src/plugins/view/geoevents.py:372
-#: ../src/plugins/view/geoplaces.py:326
-#: ../src/plugins/view/geoplaces.py:330
+#: ../src/plugins/view/geoplaces.py:328
+#: ../src/plugins/view/geoplaces.py:332
 msgid "Centering on Place"
 msgstr "Centrer sur ce lieu"
 
@@ -22527,7 +22564,7 @@ msgid "Places places map"
 msgstr "Carte de tous les lieux"
 
 # trunk
-#: ../src/plugins/view/geoplaces.py:322
+#: ../src/plugins/view/geoplaces.py:324
 msgid "Show all places"
 msgstr "Afficher tous les lieux"
 
@@ -25746,7 +25783,7 @@ msgstr "Lieux sans latitude ou longitude donnée"
 
 # utilise correspondre pour to match, plus facile que être compatible ou concorder dans ce contexte
 #: ../src/Filters/Rules/Place/_HasNoLatOrLon.py:47
-msgid "Matches places with latitude or longitude empty"
+msgid "Matches places with empty latitude or longitude"
 msgstr "Correspond aux lieux sans latitude ou longitude"
 
 #: ../src/Filters/Rules/Place/_HasNoLatOrLon.py:48
@@ -26048,7 +26085,7 @@ msgstr "Titre de la source qui contient la <sous-chaîne>"
 
 # trunk
 #: ../src/Filters/Rules/Source/_MatchesTitleSubstringOf.py:45
-msgid "Matches sources with title contains text matching a substring"
+msgid "Matches sources whose title contains a certain substring"
 msgstr "Correspond aux sources dont le titre contient une sous-chaîne"
 
 #: ../src/Filters/Rules/Source/_SourcePrivate.py:43
@@ -26271,7 +26308,7 @@ msgstr "Nom de dépôt qui contient la <sous-chaîne>"
 # trunk
 # utilise correspondre pour to match, plus facile que être compatible ou concorder dans ce contexte
 #: ../src/Filters/Rules/Repository/_MatchesNameSubstringOf.py:45
-msgid "Matches repositories with name contains text matching a substring"
+msgid "Matches repositories whose name contains a certain substring"
 msgstr "Correspond aux dépôts dont le nom contient une sous-chaîne"
 
 # utilise correspondre pour to match, plus facile que être compatible ou concorder dans ce contexte
@@ -26323,7 +26360,7 @@ msgstr "Notes qui contiennent la <sous-chaîne>"
 
 # utilise correspondre pour to match, plus facile que être compatible ou concorder dans ce contexte
 #: ../src/Filters/Rules/Note/_MatchesSubstringOf.py:46
-msgid "Matches notes who contain text matching a substring"
+msgid "Matches notes that contain text which matches a substring"
 msgstr "Correspond aux notes qui contiennent une sous-chaîne"
 
 #: ../src/Filters/Rules/Note/_MatchesRegexpOf.py:44
@@ -26336,7 +26373,7 @@ msgstr "Notes qui contiennent une <expression rationnelle>"
 
 # utilise correspondre pour to match, plus facile que être compatible ou concorder dans ce contexte
 #: ../src/Filters/Rules/Note/_MatchesRegexpOf.py:46
-msgid "Matches notes who contain text matching a regular expression"
+msgid "Matches notes that contain text which matches a regular expression"
 msgstr "Correspond aux notes contenant du texte avec l'expression rationnelle"
 
 #: ../src/Filters/Rules/Note/_HasNote.py:47
diff --git a/po/gramps.pot b/po/gramps.pot
index 097cfb122..71e467fcc 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: 2011-05-29 16:50+0200\n"
+"POT-Creation-Date: 2011-06-02 11:44+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"
@@ -550,9 +550,9 @@ msgstr ""
 #: ../src/plugins/gramplet/RelativeGramplet.py:134
 #: ../src/plugins/graph/GVFamilyLines.py:159
 #: ../src/plugins/graph/GVRelGraph.py:555
-#: ../src/plugins/lib/maps/geography.py:789
-#: ../src/plugins/lib/maps/geography.py:796
+#: ../src/plugins/lib/maps/geography.py:790
 #: ../src/plugins/lib/maps/geography.py:797
+#: ../src/plugins/lib/maps/geography.py:798
 #: ../src/plugins/quickview/all_relations.py:278
 #: ../src/plugins/quickview/all_relations.py:295
 #: ../src/plugins/textreport/IndivComplete.py:576
@@ -1131,7 +1131,7 @@ msgstr ""
 #: ../src/gui/selectors/selectplace.py:62
 #: ../src/gui/selectors/selectrepository.py:61
 #: ../src/gui/selectors/selectsource.py:61
-#: ../src/gui/widgets/grampletpane.py:1490
+#: ../src/gui/widgets/grampletpane.py:1497
 #: ../src/plugins/gramplet/PersonDetails.py:125
 #: ../src/plugins/textreport/TagReport.py:456
 #: ../src/plugins/view/mediaview.py:92 ../src/plugins/view/sourceview.py:76
@@ -1183,15 +1183,19 @@ msgstr ""
 msgid "Create Filter from selected %s..."
 msgstr ""
 
-#: ../src/Spell.py:60
+#: ../src/Spell.py:59
+msgid "pyenchant must be installed"
+msgstr ""
+
+#: ../src/Spell.py:67
 msgid "Spelling checker is not installed"
 msgstr ""
 
-#: ../src/Spell.py:78
+#: ../src/Spell.py:85
 msgid "Off"
 msgstr ""
 
-#: ../src/Spell.py:81
+#: ../src/Spell.py:88
 msgid "On"
 msgstr ""
 
@@ -1240,7 +1244,7 @@ msgstr ""
 #: ../src/ToolTips.py:245 ../src/gen/lib/ldsord.py:104
 #: ../src/Merge/mergeperson.py:238 ../src/plugins/export/ExportCsv.py:501
 #: ../src/plugins/gramplet/Children.py:84
-#: ../src/plugins/gramplet/Children.py:180
+#: ../src/plugins/gramplet/Children.py:181
 #: ../src/plugins/import/ImportCsv.py:218
 #: ../src/Filters/SideBar/_FamilySidebarFilter.py:114
 msgid "Child"
@@ -3787,8 +3791,8 @@ msgid ""
 "name, otherwise first of Given\n"
 "  <b>Primary, Primary[pre] or [sur] or [con]</b>- full primary surname, "
 "prefix, surname only, connector   \n"
-"  <b>Patronymic, or [pre] or [sur] or [con]</b> - full pa/matronic surname, "
-"prefix, surname only, connector \n"
+"  <b>Patronymic, or [pre] or [sur] or [con]</b> - full pa/matronymic "
+"surname, prefix, surname only, connector \n"
 "  <b>Familynick</b> - family nick name        <b>Prefix</b>       - all "
 "prefixes (von, de)  \n"
 "  <b>Rest</b>       - non primary surnames    <b>Notpatronymic</b>- all "
@@ -3960,7 +3964,7 @@ msgid "Edit"
 msgstr ""
 
 #: ../src/gui/configure.py:858
-msgid "Consider single pa/matronimic as surname"
+msgid "Consider single pa/matronymic as surname"
 msgstr ""
 
 #: ../src/gui/configure.py:872
@@ -4780,7 +4784,7 @@ msgstr ""
 msgid "Delete Filter"
 msgstr ""
 
-#: ../src/gui/grampsbar.py:159 ../src/gui/widgets/grampletpane.py:1123
+#: ../src/gui/grampsbar.py:159 ../src/gui/widgets/grampletpane.py:1129
 msgid "Unnamed Gramplet"
 msgstr ""
 
@@ -5768,7 +5772,7 @@ msgstr ""
 #: ../src/gui/selectors/selectperson.py:77
 #: ../src/plugins/drawreport/TimeLine.py:69
 #: ../src/plugins/gramplet/Children.py:85
-#: ../src/plugins/gramplet/Children.py:181
+#: ../src/plugins/gramplet/Children.py:182
 #: ../src/plugins/lib/libpersonview.py:94
 #: ../src/plugins/quickview/FilterByName.py:129
 #: ../src/plugins/quickview/FilterByName.py:209
@@ -5788,7 +5792,7 @@ msgstr ""
 #: ../src/gui/editors/editfamily.py:118
 #: ../src/gui/selectors/selectperson.py:79
 #: ../src/plugins/gramplet/Children.py:87
-#: ../src/plugins/gramplet/Children.py:183
+#: ../src/plugins/gramplet/Children.py:184
 #: ../src/plugins/lib/libpersonview.py:96
 #: ../src/plugins/quickview/lineage.py:60
 #: ../src/plugins/quickview/lineage.py:91
@@ -6285,8 +6289,8 @@ msgid "48.21\"E, -18.2412 or -18:9:48.21)"
 msgstr ""
 
 #: ../src/gui/editors/editplace.py:228
-#: ../src/plugins/lib/maps/geography.py:826
-#: ../src/plugins/view/geoplaces.py:285 ../src/plugins/view/geoplaces.py:304
+#: ../src/plugins/lib/maps/geography.py:827
+#: ../src/plugins/view/geoplaces.py:287 ../src/plugins/view/geoplaces.py:306
 msgid "Edit Place"
 msgstr ""
 
@@ -7928,31 +7932,31 @@ msgstr ""
 msgid "Right click to add gramplets"
 msgstr ""
 
-#: ../src/gui/widgets/grampletpane.py:993
+#: ../src/gui/widgets/grampletpane.py:996
 msgid "Untitled Gramplet"
 msgstr ""
 
-#: ../src/gui/widgets/grampletpane.py:1462
+#: ../src/gui/widgets/grampletpane.py:1469
 msgid "Number of Columns"
 msgstr ""
 
-#: ../src/gui/widgets/grampletpane.py:1467
+#: ../src/gui/widgets/grampletpane.py:1474
 msgid "Gramplet Layout"
 msgstr ""
 
-#: ../src/gui/widgets/grampletpane.py:1497
+#: ../src/gui/widgets/grampletpane.py:1504
 msgid "Use maximum height available"
 msgstr ""
 
-#: ../src/gui/widgets/grampletpane.py:1503
+#: ../src/gui/widgets/grampletpane.py:1510
 msgid "Height if not maximized"
 msgstr ""
 
-#: ../src/gui/widgets/grampletpane.py:1510
+#: ../src/gui/widgets/grampletpane.py:1517
 msgid "Detached width"
 msgstr ""
 
-#: ../src/gui/widgets/grampletpane.py:1517
+#: ../src/gui/widgets/grampletpane.py:1524
 msgid "Detached height"
 msgstr ""
 
@@ -7963,7 +7967,7 @@ msgid ""
 "Click Edit icon (enable in configuration dialog) to edit"
 msgstr ""
 
-#: ../src/gui/widgets/monitoredwidgets.py:757
+#: ../src/gui/widgets/monitoredwidgets.py:766
 #: ../src/glade/editfamily.glade.h:9
 msgid "Edit the tag list"
 msgstr ""
@@ -10866,7 +10870,7 @@ msgid "Double-click a day for details"
 msgstr ""
 
 #: ../src/plugins/gramplet/Children.py:80
-#: ../src/plugins/gramplet/Children.py:176
+#: ../src/plugins/gramplet/Children.py:177
 msgid "Double-click on a row to edit the selected child."
 msgstr ""
 
@@ -11055,7 +11059,7 @@ msgid "Copyright"
 msgstr ""
 
 #: ../src/plugins/gramplet/EditExifMetadata.py:344
-#: ../src/plugins/gramplet/EditExifMetadata.py:1199
+#: ../src/plugins/gramplet/EditExifMetadata.py:1197
 msgid "Select Date"
 msgstr ""
 
@@ -11158,51 +11162,51 @@ msgid "Delete"
 msgstr ""
 
 #. set Message Area to Display...
-#: ../src/plugins/gramplet/EditExifMetadata.py:736
+#: ../src/plugins/gramplet/EditExifMetadata.py:734
 msgid "Displaying image Exif metadata..."
 msgstr ""
 
-#: ../src/plugins/gramplet/EditExifMetadata.py:772
+#: ../src/plugins/gramplet/EditExifMetadata.py:770
 msgid "Copying Exif metadata to the Edit Area..."
 msgstr ""
 
 #. set Message Area text...
-#: ../src/plugins/gramplet/EditExifMetadata.py:845
+#: ../src/plugins/gramplet/EditExifMetadata.py:843
 msgid "Edit area has been cleared..."
 msgstr ""
 
 #. set Message Area to Convert...
-#: ../src/plugins/gramplet/EditExifMetadata.py:874
+#: ../src/plugins/gramplet/EditExifMetadata.py:872
 msgid ""
 "Converting image,\n"
 "You will need to delete the original image file..."
 msgstr ""
 
 #. set Message Area to Saved...
-#: ../src/plugins/gramplet/EditExifMetadata.py:1137
+#: ../src/plugins/gramplet/EditExifMetadata.py:1135
 msgid "Saving Exif metadata to the image..."
 msgstr ""
 
 #. set Message Area to Cleared...
-#: ../src/plugins/gramplet/EditExifMetadata.py:1140
+#: ../src/plugins/gramplet/EditExifMetadata.py:1138
 msgid "Image Exif metadata has been cleared from this image..."
 msgstr ""
 
 #. set Message Area for deleting...
-#: ../src/plugins/gramplet/EditExifMetadata.py:1171
+#: ../src/plugins/gramplet/EditExifMetadata.py:1169
 msgid "Deleting all Exif metadata..."
 msgstr ""
 
 #. Notify the User...
-#: ../src/plugins/gramplet/EditExifMetadata.py:1178
+#: ../src/plugins/gramplet/EditExifMetadata.py:1176
 msgid "All Exif metadata has been deleted from this image..."
 msgstr ""
 
-#: ../src/plugins/gramplet/EditExifMetadata.py:1195
+#: ../src/plugins/gramplet/EditExifMetadata.py:1193
 msgid "Double click a day to return the date."
 msgstr ""
 
-#: ../src/plugins/gramplet/EditExifMetadata.py:1306
+#: ../src/plugins/gramplet/EditExifMetadata.py:1304
 #: ../src/plugins/gramplet/MetadataViewer.py:159
 #, python-format
 msgid "%(date)s %(time)s"
@@ -12801,8 +12805,8 @@ msgstr ""
 #: ../src/plugins/import/ImportGrdb.py:2792
 #: ../src/plugins/import/ImportProGen.py:71
 #: ../src/plugins/import/ImportProGen.py:80
-#: ../src/plugins/import/ImportXml.py:388
-#: ../src/plugins/import/ImportXml.py:391
+#: ../src/plugins/import/ImportXml.py:392
+#: ../src/plugins/import/ImportXml.py:395
 #, python-format
 msgid "%s could not be opened"
 msgstr ""
@@ -12955,118 +12959,106 @@ msgstr ""
 msgid "%(event_name)s of %(person)s"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:131
-#: ../src/plugins/import/ImportXml.py:136
+#: ../src/plugins/import/ImportXml.py:127
+#: ../src/plugins/import/ImportXml.py:132
 #, python-format
 msgid "Error reading %s"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:137
+#: ../src/plugins/import/ImportXml.py:133
 msgid "The file is probably either corrupt or not a valid Gramps database."
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:240
+#: ../src/plugins/import/ImportXml.py:235
 #, python-format
-msgid "  %(id)s - %(text)s\n"
+msgid "  %(id)s - %(text)s with %(id2)s\n"
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:241
+#, python-format
+msgid "  Family %(id)s with %(id2)s\n"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:244
 #, python-format
-msgid "  Family %(id)s\n"
+msgid "  Source %(id)s with %(id2)s\n"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:246
+#: ../src/plugins/import/ImportXml.py:247
 #, python-format
-msgid "  Source %(id)s\n"
-msgstr ""
-
-#: ../src/plugins/import/ImportXml.py:248
-#, python-format
-msgid "  Event %(id)s\n"
+msgid "  Event %(id)s with %(id2)s\n"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:250
 #, python-format
-msgid "  Media Object %(id)s\n"
+msgid "  Media Object %(id)s with %(id2)s\n"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:252
+#: ../src/plugins/import/ImportXml.py:253
 #, python-format
-msgid "  Place %(id)s\n"
-msgstr ""
-
-#: ../src/plugins/import/ImportXml.py:254
-#, python-format
-msgid "  Repository %(id)s\n"
+msgid "  Place %(id)s with %(id)s\n"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:256
 #, python-format
-msgid "  Note %(id)s\n"
+msgid "  Repository %(id)s with %(id2)s\n"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:258
+#: ../src/plugins/import/ImportXml.py:259
 #, python-format
-msgid "  Tag %(name)s\n"
-msgstr ""
-
-#: ../src/plugins/import/ImportXml.py:265
-#, python-format
-msgid "  People: %d\n"
-msgstr ""
-
-#: ../src/plugins/import/ImportXml.py:266
-#, python-format
-msgid "  Families: %d\n"
-msgstr ""
-
-#: ../src/plugins/import/ImportXml.py:267
-#, python-format
-msgid "  Sources: %d\n"
-msgstr ""
-
-#: ../src/plugins/import/ImportXml.py:268
-#, python-format
-msgid "  Events: %d\n"
+msgid "  Note %(id)s with %(id2)s\n"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:269
 #, python-format
-msgid "  Media Objects: %d\n"
+msgid "  People: %d\n"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:270
 #, python-format
-msgid "  Places: %d\n"
+msgid "  Families: %d\n"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:271
 #, python-format
-msgid "  Repositories: %d\n"
+msgid "  Sources: %d\n"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:272
 #, python-format
-msgid "  Notes: %d\n"
+msgid "  Events: %d\n"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:273
 #, python-format
-msgid "  Tags: %d\n"
+msgid "  Media Objects: %d\n"
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:274
+#, python-format
+msgid "  Places: %d\n"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:275
+#, python-format
+msgid "  Repositories: %d\n"
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:276
+#, python-format
+msgid "  Notes: %d\n"
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:277
+#, python-format
+msgid "  Tags: %d\n"
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:279
 msgid "Number of new objects imported:\n"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:284
-msgid ""
-"\n"
-"\n"
-"Objects merged-overwritten on import:\n"
-msgstr ""
-
-#: ../src/plugins/import/ImportXml.py:290
+#: ../src/plugins/import/ImportXml.py:283
 msgid ""
 "\n"
 "Media objects with relative paths have been\n"
@@ -13075,15 +13067,34 @@ msgid ""
 "or, if not set, relative to the user's directory.\n"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:828
+#: ../src/plugins/import/ImportXml.py:294
+msgid ""
+"\n"
+"\n"
+"Objects that are candidates to be merged:\n"
+msgstr ""
+
+#. there is no old style XML
+#: ../src/plugins/import/ImportXml.py:683
+#: ../src/plugins/import/ImportXml.py:1123
+#: ../src/plugins/import/ImportXml.py:1390
+#: ../src/plugins/import/ImportXml.py:1759
+msgid "The Gramps Xml you are trying to import is malformed."
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:684
+msgid "Attributes that link the data together are missing."
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:788
 msgid "Gramps XML import"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:858
+#: ../src/plugins/import/ImportXml.py:818
 msgid "Could not change media path"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:859
+#: ../src/plugins/import/ImportXml.py:819
 #, python-format
 msgid ""
 "The opened file has media path %s, which conflicts with the media path of "
@@ -13092,7 +13103,7 @@ msgid ""
 "Preferences."
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:914
+#: ../src/plugins/import/ImportXml.py:874
 msgid ""
 "The .gramps file you are importing does not contain information about the "
 "version of Gramps with, which it was produced.\n"
@@ -13100,11 +13111,11 @@ msgid ""
 "The file will not be imported."
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:917
+#: ../src/plugins/import/ImportXml.py:877
 msgid "Import file misses Gramps version"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:919
+#: ../src/plugins/import/ImportXml.py:879
 msgid ""
 "The .gramps file you are importing does not contain a valid xml-namespace "
 "number.\n"
@@ -13112,11 +13123,11 @@ msgid ""
 "The file will not be imported."
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:922
+#: ../src/plugins/import/ImportXml.py:882
 msgid "Import file contains unacceptable XML namespace version"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:925
+#: ../src/plugins/import/ImportXml.py:885
 #, python-format
 msgid ""
 "The .gramps file you are importing was made by version %(newer)s of Gramps, "
@@ -13124,7 +13135,7 @@ msgid ""
 "imported. Please upgrade to the latest version of Gramps and try again."
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:933
+#: ../src/plugins/import/ImportXml.py:893
 #, python-format
 msgid ""
 "The .gramps file you are importing was made by version %(oldgramps)s of "
@@ -13137,11 +13148,11 @@ msgid ""
 " for more info."
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:945
+#: ../src/plugins/import/ImportXml.py:905
 msgid "The file will not be imported"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:947
+#: ../src/plugins/import/ImportXml.py:907
 #, python-format
 msgid ""
 "The .gramps file you are importing was made by version %(oldgramps)s of "
@@ -13155,28 +13166,40 @@ msgid ""
 "for more info."
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:960
+#: ../src/plugins/import/ImportXml.py:920
 msgid "Old xml file"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:1065
-#: ../src/plugins/import/ImportXml.py:2248
+#: ../src/plugins/import/ImportXml.py:1039
+#: ../src/plugins/import/ImportXml.py:2364
 #, python-format
 msgid "Witness name: %s"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:1494
+#: ../src/plugins/import/ImportXml.py:1124
+msgid "Any event reference must have a 'hlink' attribute."
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:1391
+msgid "Any person reference must have a 'hlink' attribute."
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:1559
 #, python-format
 msgid ""
 "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", did "
 "not change this grouping to \"%(value)s\"."
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:1497
+#: ../src/plugins/import/ImportXml.py:1562
 msgid "Gramps ignored namemap value"
 msgstr ""
 
-#: ../src/plugins/import/ImportXml.py:2139
+#: ../src/plugins/import/ImportXml.py:1760
+msgid "Any note reference must have a 'hlink' attribute."
+msgstr ""
+
+#: ../src/plugins/import/ImportXml.py:2255
 #, python-format
 msgid "Witness comment: %s"
 msgstr ""
@@ -13206,48 +13229,48 @@ msgstr ""
 msgid "Line %d: empty event note was ignored."
 msgstr ""
 
-#: ../src/plugins/lib/libgedcom.py:5198 ../src/plugins/lib/libgedcom.py:5838
+#: ../src/plugins/lib/libgedcom.py:5206 ../src/plugins/lib/libgedcom.py:5846
 #, python-format
 msgid "Could not import %s"
 msgstr ""
 
-#: ../src/plugins/lib/libgedcom.py:5599
+#: ../src/plugins/lib/libgedcom.py:5607
 #, python-format
 msgid "Import from %s"
 msgstr ""
 
-#: ../src/plugins/lib/libgedcom.py:5634
+#: ../src/plugins/lib/libgedcom.py:5642
 #, python-format
 msgid ""
 "Import of GEDCOM file %s with DEST=%s, could cause errors in the resulting "
 "database!"
 msgstr ""
 
-#: ../src/plugins/lib/libgedcom.py:5637
+#: ../src/plugins/lib/libgedcom.py:5645
 msgid "Look for nameless events."
 msgstr ""
 
-#: ../src/plugins/lib/libgedcom.py:5696 ../src/plugins/lib/libgedcom.py:5708
+#: ../src/plugins/lib/libgedcom.py:5704 ../src/plugins/lib/libgedcom.py:5716
 #, python-format
 msgid "Line %d: empty note was ignored."
 msgstr ""
 
-#: ../src/plugins/lib/libgedcom.py:5747
+#: ../src/plugins/lib/libgedcom.py:5755
 #, python-format
 msgid "skipped %(skip)d subordinate(s) at line %(line)d"
 msgstr ""
 
-#: ../src/plugins/lib/libgedcom.py:6014
+#: ../src/plugins/lib/libgedcom.py:6022
 msgid ""
 "Your GEDCOM file is corrupted. The file appears to be encoded using the "
 "UTF16 character set, but is missing the BOM marker."
 msgstr ""
 
-#: ../src/plugins/lib/libgedcom.py:6017
+#: ../src/plugins/lib/libgedcom.py:6025
 msgid "Your GEDCOM file is empty."
 msgstr ""
 
-#: ../src/plugins/lib/libgedcom.py:6080
+#: ../src/plugins/lib/libgedcom.py:6088
 #, python-format
 msgid "Invalid line %d in GEDCOM file."
 msgstr ""
@@ -17448,71 +17471,71 @@ msgstr ""
 msgid "New place with empty fields"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:426
+#: ../src/plugins/lib/maps/geography.py:427
 msgid "Map Menu"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:429
+#: ../src/plugins/lib/maps/geography.py:430
 msgid "Remove cross hair"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:431
+#: ../src/plugins/lib/maps/geography.py:432
 msgid "Add cross hair"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:438
+#: ../src/plugins/lib/maps/geography.py:439
 msgid "Unlock zoom and position"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:440
+#: ../src/plugins/lib/maps/geography.py:441
 msgid "Lock zoom and position"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:447
+#: ../src/plugins/lib/maps/geography.py:448
 msgid "Add place"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:452
+#: ../src/plugins/lib/maps/geography.py:453
 msgid "Link place"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:457
+#: ../src/plugins/lib/maps/geography.py:458
 msgid "Center here"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:470
+#: ../src/plugins/lib/maps/geography.py:471
 #, python-format
 msgid "Replace '%(map)s' by =>"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:830
+#: ../src/plugins/lib/maps/geography.py:831
 #: ../src/plugins/view/geoevents.py:324 ../src/plugins/view/geoevents.py:350
 #: ../src/plugins/view/geofamily.py:375 ../src/plugins/view/geoperson.py:414
 #: ../src/plugins/view/geoperson.py:434 ../src/plugins/view/geoperson.py:471
-#: ../src/plugins/view/geoplaces.py:290 ../src/plugins/view/geoplaces.py:308
+#: ../src/plugins/view/geoplaces.py:292 ../src/plugins/view/geoplaces.py:310
 msgid "Center on this place"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:1014
+#: ../src/plugins/lib/maps/geography.py:1021
 msgid "Nothing for this view."
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:1015
+#: ../src/plugins/lib/maps/geography.py:1022
 msgid "Specific parameters"
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:1029
+#: ../src/plugins/lib/maps/geography.py:1036
 msgid "Where to save the tiles for offline mode."
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:1034
+#: ../src/plugins/lib/maps/geography.py:1041
 msgid ""
 "If you have no more space in your file system\n"
 "You can remove all tiles placed in the above path.\n"
 "Be careful! If you have no internet, you'll get no map."
 msgstr ""
 
-#: ../src/plugins/lib/maps/geography.py:1039
+#: ../src/plugins/lib/maps/geography.py:1046
 msgid "Zoom used when centering"
 msgstr ""
 
@@ -17521,7 +17544,7 @@ msgstr ""
 #. perhaps we need some contrôl on this path :
 #. should begin with : /home, /opt, /map, ...
 #. configdialog.add_button(table, '', 4, 'geography.clean')
-#: ../src/plugins/lib/maps/geography.py:1048
+#: ../src/plugins/lib/maps/geography.py:1055
 msgid "The map"
 msgstr ""
 
@@ -21104,7 +21127,7 @@ msgid "Show all events"
 msgstr ""
 
 #: ../src/plugins/view/geoevents.py:368 ../src/plugins/view/geoevents.py:372
-#: ../src/plugins/view/geoplaces.py:326 ../src/plugins/view/geoplaces.py:330
+#: ../src/plugins/view/geoplaces.py:328 ../src/plugins/view/geoplaces.py:332
 msgid "Centering on Place"
 msgstr ""
 
@@ -21172,7 +21195,7 @@ msgstr ""
 msgid "Places places map"
 msgstr ""
 
-#: ../src/plugins/view/geoplaces.py:322
+#: ../src/plugins/view/geoplaces.py:324
 msgid "Show all places"
 msgstr ""
 
@@ -24215,7 +24238,7 @@ msgid "Places with no latitude or longitude given"
 msgstr ""
 
 #: ../src/Filters/Rules/Place/_HasNoLatOrLon.py:47
-msgid "Matches places with latitude or longitude empty"
+msgid "Matches places with empty latitude or longitude"
 msgstr ""
 
 #: ../src/Filters/Rules/Place/_HasNoLatOrLon.py:48
@@ -24487,7 +24510,7 @@ msgid "Sources title containing <substring>"
 msgstr ""
 
 #: ../src/Filters/Rules/Source/_MatchesTitleSubstringOf.py:45
-msgid "Matches sources with title contains text matching a substring"
+msgid "Matches sources whose title contains a certain substring"
 msgstr ""
 
 #: ../src/Filters/Rules/Source/_SourcePrivate.py:43
@@ -24689,7 +24712,7 @@ msgid "Repository name containing <substring>"
 msgstr ""
 
 #: ../src/Filters/Rules/Repository/_MatchesNameSubstringOf.py:45
-msgid "Matches repositories with name contains text matching a substring"
+msgid "Matches repositories whose name contains a certain substring"
 msgstr ""
 
 #: ../src/Filters/Rules/Repository/_RegExpIdOf.py:48
@@ -24739,7 +24762,7 @@ msgid "Notes containing <substring>"
 msgstr ""
 
 #: ../src/Filters/Rules/Note/_MatchesSubstringOf.py:46
-msgid "Matches notes who contain text matching a substring"
+msgid "Matches notes that contain text which matches a substring"
 msgstr ""
 
 #: ../src/Filters/Rules/Note/_MatchesRegexpOf.py:44
@@ -24751,7 +24774,7 @@ msgid "Notes containing <regular expression>"
 msgstr ""
 
 #: ../src/Filters/Rules/Note/_MatchesRegexpOf.py:46
-msgid "Matches notes who contain text matching a regular expression"
+msgid "Matches notes that contain text which matches a regular expression"
 msgstr ""
 
 #: ../src/Filters/Rules/Note/_HasNote.py:47 ../src/glade/mergenote.glade.h:8
diff --git a/src/gui/configure.py b/src/gui/configure.py
index d094f9d3c..f7b532cd0 100644
--- a/src/gui/configure.py
+++ b/src/gui/configure.py
@@ -855,7 +855,7 @@ class GrampsPreferences(ConfigureDialog):
         
         # Pa/Matronymic surname handling
         self.add_checkbox(table, 
-                          _("Consider single pa/matronimic as surname"), 
+                          _("Consider single pa/matronymic as surname"), 
                           row, 'preferences.patronimic-surname', stop=3,
                           extra_callback=self.cb_pa_sur_changed)
         row += 1