Index: staging/apertium-cat-srd/apertium-cat-srd.cat-srd.dix
===================================================================
--- staging/apertium-cat-srd/apertium-cat-srd.cat-srd.dix	(revision 81923)
+++ staging/apertium-cat-srd/apertium-cat-srd.cat-srd.dix	(revision 81926)
@@ -1921,6 +1921,8 @@
     <e><p><l>Henry<s n="np"/><s n="ant"/></l><r>Henry<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
     <e><p><l>Hugh<s n="np"/><s n="ant"/></l><r>Hugh<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
     <e><p><l>Jaume<s n="np"/><s n="ant"/></l><r>Jaume<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+    <e><p><l>Jaume<s n="np"/><s n="ant"/></l><r>Giacu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+    <e><p><l>Jaume<b/>I<s n="np"/><s n="ant"/></l><r>Giacu<b/>I<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
     <e><p><l>Jeremy<s n="np"/><s n="ant"/></l><r>Jeremy<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
     <e><p><l>Jerry<s n="np"/><s n="ant"/></l><r>Jerry<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
     <e><p><l>Jethro<s n="np"/><s n="ant"/></l><r>Jethro<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
@@ -2107,6 +2109,7 @@
     <e><p><l>Istanbul<s n="np"/><s n="loc"/></l><r>Istanbul<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
     <e><p><l>Escòcia<s n="np"/><s n="loc"/></l><r>Iscòtzia<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
     <e><p><l>Isabel<s n="np"/><s n="ant"/></l><r>Isabel<s n="np"/><s n="ant"/><s n="f"/><s n="sg"/></r></p></e>
+    <e><p><l>Isabel<s n="np"/><s n="ant"/></l><r>Isabella<s n="np"/><s n="ant"/><s n="f"/><s n="sg"/></r></p></e>
     <e><p><l>Irene<s n="np"/><s n="ant"/></l><r>Irene<s n="np"/><s n="ant"/><s n="f"/><s n="sg"/></r></p></e>
     <e><p><l>Inés<s n="np"/><s n="ant"/></l><r>Inés<s n="np"/><s n="ant"/><s n="f"/><s n="sg"/></r></p></e>
     <e><p><l>Illinois<s n="np"/><s n="loc"/></l><r>Illinois<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
@@ -3698,6 +3701,9 @@
       <e><p><l>poc<s n="adj"/><s n="ind"/></l><r>pagu<s n="adj"/></r></p></e>
       <e><p><l>molt<b/>poc<s n="adj"/></l><r>pagu<g><b/>meda</g><s n="adj"/></r></p></e>
       <e><p><l>Joan<s n="np"/><s n="ant"/></l><r>Joan<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Joan<s n="np"/><s n="ant"/></l><r>Giuanne<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Joan<b/>Carles<s n="np"/><s n="ant"/></l><r>Joan<b/>Carles<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Joan<b/>Carles<s n="np"/><s n="ant"/></l><r>Giuanne<b/>Càralu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>sols<s n="adv"/></l><r>petzi<s n="adv"/></r></p></e>
       <e r="LR"><p><l>solament<s n="adv"/></l><r>petzi<s n="adv"/></r></p></e>
       <e r="RL"><p><l>solament<s n="adv"/></l><r>solamente<s n="adv"/></r></p></e>
@@ -3775,6 +3781,7 @@
       <e><p><l>disposar<s n="vblex"/></l><r>dispònnere<s n="vblex"/></r></p></e>
       <e><p><l>superfície<s n="n"/><s n="f"/></l><r>superfìtzie<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>Pere<s n="np"/><s n="ant"/></l><r>Pere<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Pere<s n="np"/><s n="ant"/></l><r>Pedru<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>afegir<s n="vblex"/></l><r>annànghere<s n="vblex"/></r></p></e>
       <e><p><l>fer<g><b/>servir</g><s n="vblex"/></l><r>impreare<s n="vblex"/></r></p></e>
       <e r="RL"><p><l>fer<g><b/>servir</g><s n="vblex"/></l><r>tratare<s n="vblex"/></r></p></e>
@@ -3920,6 +3927,11 @@
       <e r="RL"><p><l>preparar<s n="vblex"/></l><r>aprontare<s n="vblex"/></r></p></e>
       <e><p><l>carta<s n="n"/><s n="f"/></l><r>lìtera<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>Francesc<s n="np"/><s n="ant"/></l><r>Francesc<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Francesc<s n="np"/><s n="ant"/></l><r>Frantziscu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Innocenci<s n="np"/><s n="ant"/></l><r>Innocenci<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Innocenci<s n="np"/><s n="ant"/></l><r>Innocentzu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Sixt<s n="np"/><s n="ant"/></l><r>Sixt<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Sixt<s n="np"/><s n="ant"/></l><r>Sistu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>branca<s n="n"/><s n="f"/></l><r>camba<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>mida<s n="n"/><s n="f"/></l><r>medida<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>cedir<s n="vblex"/></l><r>tzèdere<s n="vblex"/></r></p></e>
@@ -4031,6 +4043,7 @@
       <e><p><l>senzill<s n="adj"/></l><r>simpre<s n="adj"/></r></p><par n="GD_mf"/></e>
       <e r="RL"><p><l>senzill<s n="adj"/></l><r>sèmplitze<s n="adj"/></r></p><par n="GD_mf"/></e>
       <e><p><l>naixement<s n="n"/><s n="m"/></l><r>nàschida<s n="n"/><s n="f"/></r></p></e>
+      <e r="LR"><p><l>naixença<s n="n"/><s n="m"/></l><r>nàschida<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>mena<s n="n"/><s n="f"/></l><r>casta<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>monument<s n="n"/><s n="m"/></l><r>monumentu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>front<s n="n"/><s n="m"/></l><r>fronte<s n="n"/><s n="m"/></r></p></e>
@@ -4100,6 +4113,7 @@
       <e><p><l>participar<g><b/>en</g><s n="vblex"/></l><r>partetzipare<g><b/>a</g><s n="vblex"/></r></p></e>
       <e><p><l>posterior<s n="adj"/></l><r>posteriore<s n="adj"/></r></p></e>
       <e><p><l>Lluís<s n="np"/><s n="ant"/></l><r>Lluís<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Lluís<s n="np"/><s n="ant"/></l><r>Luisi<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>costat<s n="n"/><s n="m"/></l><r>costàgiu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>francès<s n="n"/></l><r>frantzesu<s n="n"/></r></p></e>
       <e><p><l>com<b/>ara<s n="adv"/></l><r>pro<b/>narrere<s n="adv"/></r></p></e>
@@ -4116,6 +4130,7 @@
       <e><p><l>temperatura<s n="n"/><s n="f"/></l><r>temperadura<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>Guerra<s n="np"/><s n="ant"/></l><r>Guerra<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
       <e><p><l>Enric<s n="np"/><s n="ant"/></l><r>Enric<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Enric<s n="np"/><s n="ant"/></l><r>Erricu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>dinastia<s n="n"/><s n="f"/></l><r>dinastia<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>probablement<s n="adv"/></l><r>fortzis<s n="adv"/></r></p></e>
       <e><p><l>competició<s n="n"/><s n="f"/></l><r>disputa<s n="n"/><s n="f"/></r></p></e>
@@ -4139,7 +4154,9 @@
       <e><p><l>per<b/>primera<b/>vegada<s n="adv"/></l><r>sa<b/>prima<b/>bia<s n="adv"/></r></p></e>
       <e><p><l>Santa<b/>Maria<s n="np"/><s n="loc"/></l><r>Santa<b/>Maria<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
       <e><p><l>Alfons<s n="np"/><s n="ant"/></l><r>Alfons<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Alfons<s n="np"/><s n="ant"/></l><r>Alfonsu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>Ferran<s n="np"/><s n="ant"/></l><r>Ferran<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Ferran<s n="np"/><s n="ant"/></l><r>Ferrante<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>alhora<s n="adv"/></l><r>in<b/>s'interi<s n="adv"/></r></p></e>
       <e><p><l>flota<s n="n"/><s n="f"/></l><r>flota<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>roca<s n="n"/><s n="f"/></l><r>roca<s n="n"/><s n="f"/></r></p></e>
@@ -4249,7 +4266,10 @@
       <e><p><l>pis<s n="n"/><s n="m"/></l><r>apartamentu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>profund<s n="adj"/></l><r>fungudu<s n="adj"/></r></p></e>
       <e><p><l>elevar<s n="vblex"/></l><r>artziare<s n="vblex"/></r></p></e>
+      <e><p><l>Humbert<s n="np"/><s n="ant"/></l><r>Humbert<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Humbert<s n="np"/><s n="ant"/></l><r>Umbertu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>Martí<s n="np"/><s n="ant"/></l><r>Martí<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Martí<s n="np"/><s n="ant"/></l><r>Martine<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>tallar<s n="vblex"/></l><r>segare<s n="vblex"/></r></p></e>
       <e r="RL"><p><l>futur<s n="adj"/></l><r>imbeniente<s n="adj"/></r></p><par n="GD_mf"/></e>
       <e><p><l>cavaller<s n="n"/><s n="m"/></l><r>cadderi<s n="n"/><s n="m"/></r></p></e>
@@ -4818,6 +4838,7 @@
       <e><p><l>medi<s n="n"/><s n="m"/></l><r>mèdiu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>tradicionalment<s n="adv"/></l><r>segundu<b/>sa<b/>traditzione<s n="adv"/></r></p></e>
       <e><p><l>Nicolau<s n="np"/><s n="ant"/></l><r>Nicolau<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Nicolau<s n="np"/><s n="ant"/></l><r>Nigola<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>mineral<s n="adj"/></l><r>minerale<s n="adj"/></r></p></e>
       <e><p><l>amant<s n="n"/><s n="mf"/></l><r>amante<s n="n"/><s n="mf"/></r></p></e>
       <e><p><l>espasa<s n="n"/><s n="f"/></l><r>ispada<s n="n"/><s n="f"/></r></p></e>
@@ -5001,6 +5022,8 @@
       <e r="RL"><p><l>desembocar<s n="vblex"/></l><r>sicare<s n="vblex"/></r></p></e>
       <e><p><l>herència<s n="n"/><s n="f"/></l><r>eredidade<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>Lleó<s n="np"/><s n="loc"/></l><r>León<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Lleó<s n="np"/><s n="loc"/></l><r>Lleó<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Lleó<s n="np"/><s n="loc"/></l><r>Leone<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>equipar<s n="vblex"/></l><r>fàghere<g><b/>paris</g><s n="vblex"/></r></p></e>
       <e><p><l>bàsquet<s n="n"/><s n="m"/><s n="sg"/></l><r>pallacanestro<s n="n"/><s n="f"/><s n="sg"/></r></p></e>
       <e r="LR"><p><l>basquetbol<s n="n"/><s n="m"/><s n="sg"/></l><r>pallacanestro<s n="n"/><s n="f"/><s n="sg"/></r></p></e>
@@ -5137,6 +5160,7 @@
       <e><p><l>Elisabet<s n="np"/><s n="ant"/></l><r>Elisabet<s n="np"/><s n="ant"/><s n="f"/><s n="sg"/></r></p></e>
       <e><p><l>destí<s n="n"/><s n="m"/></l><r>destinu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>Benet<s n="np"/><s n="ant"/></l><r>Benet<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Benet<s n="np"/><s n="ant"/></l><r>Beneitu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>síntesi<s n="n"/><s n="f"/></l><r>resumu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>imprimir<s n="vblex"/></l><r>imprentare<s n="vblex"/></r></p></e>
       <e><p><l>europeu<s n="n"/></l><r>europeu<s n="n"/></r></p></e>
@@ -5468,7 +5492,6 @@
       <e><p><l>neu<s n="n"/><s n="f"/></l><r>nie<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>trànsit<s n="n"/><s n="m"/></l><r>trànsitu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>jutjar<s n="vblex"/></l><r>giuigare<s n="vblex"/></r></p></e>
-      <e><p><l>Jaume<b/>I<s n="np"/><s n="ant"/></l><r>Giagu<b/>I<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>riera<s n="n"/><s n="f"/></l><r>ritzolu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>invers<s n="adj"/></l><r>contràriu<s n="adj"/></r></p></e>
       <e><p><l>cable<s n="n"/><s n="m"/></l><r>filu<s n="n"/><s n="m"/></r></p></e>
@@ -6092,6 +6115,9 @@
       <e><p><l>sultà<s n="n"/><s n="m"/></l><r>sultanu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>futur<s n="n"/><s n="m"/></l><r>benidore<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>Pau<s n="np"/><s n="ant"/></l><r>Pau<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Pau<s n="np"/><s n="ant"/></l><r>Pàule<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Joan<b/>Pau<s n="np"/><s n="ant"/></l><r>Joan<b/>Pau<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Joan<b/>Pau<s n="np"/><s n="ant"/></l><r>Giuanne<b/>Pàule<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>Pau<s n="np"/><s n="loc"/></l><r>Pau<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>alcalde<s n="n"/><s n="m"/></l><r>sìndigu<s n="n"/><s n="m"/></r></p></e>
       <e r="LR"><p><l>batlle<s n="n"/><s n="m"/></l><r>sìndigu<s n="n"/><s n="m"/></r></p></e>
@@ -13870,6 +13896,8 @@
       <e><p><l>Guillaumes<s n="np"/><s n="cog"/></l><r>Guillaumes<s n="np"/><s n="cog"/></r></p></e>
       <e><p><l>Guillemette<s n="np"/><s n="cog"/></l><r>Guillemette<s n="np"/><s n="cog"/></r></p></e>
       <e><p><l>Guillem<s n="np"/><s n="ant"/></l><r>Guillem<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
+      <e><p><l>Guillem<s n="np"/><s n="ant"/></l><r>Guillem<s n="np"/><s n="ant"/><s n="m"/><s n="sp"/></r></p></e>
+      <e><p><l>Guillem<s n="np"/><s n="ant"/></l><r>Gullielmu<s n="np"/><s n="ant"/><s n="m"/><s n="sp"/></r></p></e>
       <e><p><l>Guillen<s n="np"/><s n="cog"/></l><r>Guillen<s n="np"/><s n="cog"/></r></p></e>
       <e><p><l>Guillermo<s n="np"/><s n="ant"/></l><r>Guillermo<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
       <e><p><l>Guillette<s n="np"/><s n="cog"/></l><r>Guillette<s n="np"/><s n="cog"/></r></p></e>
@@ -19704,7 +19732,7 @@
       <e><p><l>ambientar<s n="vblex"/></l><r>ambientare<s n="vblex"/></r></p></e>
       <e><p><l>planetari<s n="adj"/></l><r>planetàriu<s n="adj"/></r></p></e>
       <e><p><l>crucial<s n="adj"/></l><r>detzisivu<s n="adj"/></r></p><par n="mf_GD"/></e>
-      <e><p><l>Santiago<b/>de<b/>Compostel·la<s n="np"/><s n="loc"/></l><r>Santu<b/>Giagu<b/>de<b/>Compostela<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Santiago<b/>de<b/>Compostel·la<s n="np"/><s n="loc"/></l><r>Santu<b/>Giacu<b/>de<b/>Compostela<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>recopilar<s n="vblex"/></l><r>compilare<s n="vblex"/></r></p></e>
       <e><p><l>estalviar<s n="vblex"/></l><r>risparmiare<s n="vblex"/></r></p></e>
       <e r="RL"><p><l>estalviar<s n="vblex"/></l><r>istraviare<s n="vblex"/></r></p></e>
@@ -20321,7 +20349,7 @@
       <e><p><l>metàfora<s n="n"/><s n="f"/></l><r>metàfora<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>injectar<s n="vblex"/></l><r>fichire<s n="vblex"/></r></p></e>
       <e><p><l>quadrangular<s n="adj"/><s n="mf"/></l><r>de<b/>bator<b/>àngulos<s n="adj"/><s n="mf"/></r></p><par n="ND_sp"/></e>
-      <e><p><l>Indus<s n="np"/><s n="loc"/></l><r>Indus<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Indus<s n="np"/><s n="loc"/></l><r>Indus<s n="np"/><s n="hyd"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>afecte<s n="adj"/></l><r>demadu<s n="adj"/></r></p><par n="nostre_nostru"/></e>
       <e r="RL"><p><l>afecte<s n="adj"/></l><r>malàidu<s n="adj"/></r></p><par n="nostre_nostru"/></e>
       <e><p><l>termal<s n="adj"/></l><r>termale<s n="adj"/></r></p></e>
@@ -22775,7 +22803,6 @@
       <e><p><l>Bonn<s n="np"/><s n="loc"/></l><r>Bonn<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>a<b/>l'espera<s n="adv"/></l><r>in<b/>isetu<s n="adv"/></r></p></e>
       <e><p><l>sistemàticament<s n="adv"/></l><r>in<b/>manera<b/>sistemàtica<s n="adv"/></r></p></e>
-      <e><p><l>Sant<b/>Lluís<s n="np"/><s n="loc"/></l><r>Sant<b/>Lluís<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>Quito<s n="np"/><s n="loc"/></l><r>Quito<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
       <e><p><l>plafó<s n="n"/><s n="m"/></l><r>pannellu<s n="n"/><s n="m"/></r></p></e>
       <e r="RL"><p><l>plafó<s n="n"/><s n="m"/></l><r>cuadru<s n="n"/><s n="m"/></r></p></e>
@@ -24329,6 +24356,7 @@
       <e><p><l>campus<s n="n"/><s n="m"/></l><r>campus<s n="n"/><s n="m"/></r></p><par n="sp_ND"/></e>
       <e><p><l>rànquing<s n="n"/><s n="m"/></l><r>classìfica<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>burgès<s n="adj"/></l><r>burghesu<s n="adj"/></r></p></e>
+      <e><p><l>comptal<s n="adj"/></l><r>comitale<s n="adj"/></r></p></e>
       <e><p><l>gendre<s n="n"/><s n="m"/></l><r>ghèneru<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>escultòric<s n="adj"/></l><r>iscultòreu<s n="adj"/></r></p></e>
       <e><p><l>finança<s n="n"/><s n="f"/></l><r>finàntzia<s n="n"/><s n="f"/></r></p></e>
@@ -24510,7 +24538,7 @@
       <e><p><l>CBS<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></l><r>CBS<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></r></p></e>
       <e r="LR"><p><l>algoritme<s n="n"/><s n="m"/></l><r>algoritmu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>sintàctic<s n="adj"/></l><r>sintàticu<s n="adj"/></r></p></e>
-      <e><p><l>asturlleonès<s n="adj"/></l><r>asturianuleonesu<s n="adj"/></r></p></e>
+      <e><p><l>asturlleonès<s n="adj"/></l><r>asturianu-leonesu<s n="adj"/></r></p></e>
       <e><p><l>pinzellada<s n="n"/><s n="f"/></l><r>pinzellada<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>Phil<s n="np"/><s n="ant"/></l><r>Phil<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>maledicció<s n="n"/><s n="f"/></l><r>maleditzione<s n="n"/><s n="f"/></r></p></e>
@@ -25784,7 +25812,7 @@
       <e><p><l>curtmetratge<s n="n"/><s n="m"/></l><r>curtzumetràgiu<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>inesperat<s n="adj"/></l><r>no<b/>isetadu<s n="adj"/></r></p></e>
       <e><p><l>hidroelèctric<s n="adj"/></l><r>idroelètricu<s n="adj"/></r></p></e>
-      <e><p><l>Sant<b/>Pere<s n="np"/><s n="ant"/></l><r>Santu<b/>Predu<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Sant<b/>Pere<s n="np"/><s n="ant"/></l><r>Santu<b/>Pedru<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>axioma<s n="n"/><s n="m"/></l><r>assioma<s n="n"/><s n="m"/></r></p></e>
       <e><p><l>aromàtic<s n="adj"/></l><r>aromàticu<s n="adj"/></r></p></e>
       <e><p><l>Pinós<s n="np"/><s n="cog"/></l><r>Pinòs<s n="np"/><s n="cog"/></r></p></e>
@@ -27470,7 +27498,8 @@
       <e><p><l>supeditar<s n="vblex"/></l><r>assugetare<s n="vblex"/></r></p></e>
       <e r="RL"><p><l>supeditar<s n="vblex"/></l><r>subordinare<s n="vblex"/></r></p></e>
       <e><p><l>Renoir<s n="np"/><s n="ant"/></l><r>Renoir<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
-      <e><p><l>Lloret<b/>de<b/>Mar<s n="np"/><s n="loc"/></l><r>Lloret<b/>de<b/>Mar<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
+      <e><p><l>Lloret<b/>de<b/>Mar<s n="np"/><s n="loc"/></l><r>Lloret<b/>de<b/>Mar<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+      <e><p><l>Malgrat<b/>de<b/>Mar<s n="np"/><s n="loc"/></l><r>Malgrat<b/>de<b/>Mar<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
       <e><p><l>inesperadament<s n="adv"/></l><r>sena<b/>l'isetare<s n="adv"/></r></p></e>
       <e><p><l>fermesa<s n="n"/><s n="f"/></l><r>firmesa<s n="n"/><s n="f"/></r></p></e>
       <e><p><l>Dürer<s n="np"/><s n="ant"/></l><r>Dürer<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
Index: staging/apertium-cat-srd/apertium-cat-srd.cat-srd.lrx
===================================================================
--- staging/apertium-cat-srd/apertium-cat-srd.cat-srd.lrx	(revision 81923)
+++ staging/apertium-cat-srd/apertium-cat-srd.cat-srd.lrx	(revision 81926)
@@ -572,6 +572,11 @@
   </rule>
   <rule weight="1.0">
      <match lemma="Carles" tags="np.*"><select lemma="Càralu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Carles" tags="np.*"><select lemma="Càralu"/></match>
      <match tags="num.*"/>
   </rule>
   <rule weight="1.0">
@@ -582,7 +587,7 @@
        <match lemma="emperador" tags="n.*"/>
        <match lemma="rei" tags="n.*"/>
        <match lemma="tsar" tags="n.*"/>
-       <match lemma="virei" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
        <match lemma="príncep" tags="n.*"/>
        <match lemma="comte" tags="n.*"/>
        <match lemma="duc" tags="n.*"/>
@@ -592,6 +597,16 @@
      </or>
      <match lemma="Carles" tags="np.*"><select lemma="Càralu"/></match>
   </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Carles" tags="np.*"><select lemma="Càralu"/></match>
+  </rule>
 
 
 <!-- Felip > Felip, Tilipu -->
@@ -606,6 +621,11 @@
   </rule>
   <rule weight="1.0">
      <match lemma="Felip" tags="np.*"><select lemma="Tilipu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Felip" tags="np.*"><select lemma="Tilipu"/></match>
      <match tags="num.*"/>
   </rule>
   <rule weight="1.0">
@@ -616,7 +636,7 @@
        <match lemma="emperador" tags="n.*"/>
        <match lemma="rei" tags="n.*"/>
        <match lemma="tsar" tags="n.*"/>
-       <match lemma="virei" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
        <match lemma="príncep" tags="n.*"/>
        <match lemma="comte" tags="n.*"/>
        <match lemma="duc" tags="n.*"/>
@@ -626,6 +646,16 @@
      </or>
      <match lemma="Felip" tags="np.*"><select lemma="Tilipu"/></match>
   </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Felip" tags="np.*"><select lemma="Tilipu"/></match>
+  </rule>
 
 <!-- Alexandre > Alexandre, Alexandru -->
 
@@ -639,6 +669,11 @@
   </rule>
   <rule weight="1.0">
      <match lemma="Alexandre" tags="np.*"><select lemma="Alexandru"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Alexandre" tags="np.*"><select lemma="Alexandru"/></match>
      <match tags="num.*"/>
   </rule>
   <rule weight="1.0">
@@ -649,7 +684,7 @@
        <match lemma="emperador" tags="n.*"/>
        <match lemma="rei" tags="n.*"/>
        <match lemma="tsar" tags="n.*"/>
-       <match lemma="virei" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
        <match lemma="príncep" tags="n.*"/>
        <match lemma="comte" tags="n.*"/>
        <match lemma="duc" tags="n.*"/>
@@ -659,6 +694,975 @@
      </or>
      <match lemma="Alexandre" tags="np.*"><select lemma="Alexandru"/></match>
   </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Alexandre" tags="np.*"><select lemma="Alexandru"/></match>
+  </rule>
 
+<!-- Joan > Joan, Giuanne -->
 
+  <rule weight="0.6">
+     <match lemma="Joan" tags="np.*"><select lemma="Joan"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Joan" tags="np.*"><select lemma="Giuanne"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Joan" tags="np.*"><select lemma="Joan"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Joan" tags="np.*"><select lemma="Giuanne"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Joan" tags="np.*"><select lemma="Giuanne"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Joan" tags="np.*"><select lemma="Giuanne"/></match>
+  </rule>
+
+<!-- Joan Carles > Joan Carles, Giuanne Càralu -->
+
+  <rule weight="0.6">
+     <match lemma="Joan Carles" tags="np.*"><select lemma="Joan Carles"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Joan Carles" tags="np.*"><select lemma="Giuanne Càralu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Joan Carles" tags="np.*"><select lemma="Giuanne Càralu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Joan Carles" tags="np.*"><select lemma="Giuanne Càralu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Joan Carles" tags="np.*"><select lemma="Giuanne Càralu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Joan Carles" tags="np.*"><select lemma="Giuanne Càralu"/></match>
+  </rule>
+
+<!-- Pau > Pau, Alexandru -->
+
+  <rule weight="0.6">
+     <match lemma="Pau" tags="np.*"><select lemma="Pau"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Pau" tags="np.*"><select lemma="Pàule"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Pau" tags="np.*"><select lemma="Pàule"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Pau" tags="np.*"><select lemma="Pàule"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Pau" tags="np.*"><select lemma="Pàule"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Pau" tags="np.*"><select lemma="Pàule"/></match>
+  </rule>
+
+<!-- Joan Pau > Joan Pau, Giuanne Pàule -->
+
+  <rule weight="0.6">
+     <match lemma="Joan Pau" tags="np.*"><select lemma="Joan Pau"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Joan Pau" tags="np.*"><select lemma="Giuanne Pàule"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Joan Pau" tags="np.*"><select lemma="Giuanne Pàule"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Joan Pau" tags="np.*"><select lemma="Giuanne Pàule"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Joan Pau" tags="np.*"><select lemma="Giuanne Pàule"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Joan Pau" tags="np.*"><select lemma="Giuanne Pàule"/></match>
+  </rule>
+
+<!-- Benet > Benet, Beneitu -->
+
+  <rule weight="0.6">
+     <match lemma="Benet" tags="np.*"><select lemma="Benet"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Benet" tags="np.*"><select lemma="Beneitu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Benet" tags="np.*"><select lemma="Beneitu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Benet" tags="np.*"><select lemma="Beneitu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Benet" tags="np.*"><select lemma="Beneitu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Benet" tags="np.*"><select lemma="Beneitu"/></match>
+  </rule>
+
+<!-- Francesc > Francesc, Frantziscu -->
+
+  <rule weight="0.6">
+     <match lemma="Francesc" tags="np.*"><select lemma="Francesc"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Francesc" tags="np.*"><select lemma="Frantziscu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Francesc" tags="np.*"><select lemma="Frantziscu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Francesc" tags="np.*"><select lemma="Frantziscu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Francesc" tags="np.*"><select lemma="Frantziscu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Francesc" tags="np.*"><select lemma="Frantziscu"/></match>
+  </rule>
+
+<!-- Sixt > Sixt, Sistu -->
+
+  <rule weight="0.6">
+     <match lemma="Sixt" tags="np.*"><select lemma="Sixt"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Sixt" tags="np.*"><select lemma="Sistu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Sixt" tags="np.*"><select lemma="Sistu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Sixt" tags="np.*"><select lemma="Sistu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Sixt" tags="np.*"><select lemma="Sistu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Sixt" tags="np.*"><select lemma="Sistu"/></match>
+  </rule>
+
+<!-- Innocenci > Innocenci, Innocentzu -->
+
+  <rule weight="0.6">
+     <match lemma="Innocenci" tags="np.*"><select lemma="Innocenci"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Innocenci" tags="np.*"><select lemma="Innocentzu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Innocenci" tags="np.*"><select lemma="Innocentzu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Innocenci" tags="np.*"><select lemma="Innocentzu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Innocenci" tags="np.*"><select lemma="Innocentzu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Innocenci" tags="np.*"><select lemma="Innocentzu"/></match>
+  </rule>
+
+<!-- Lleó > Lleó, Leone -->
+
+  <rule weight="0.6">
+     <match lemma="Lleó" tags="np.*"><select lemma="Lleó"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Lleó" tags="np.*"><select lemma="Leone"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Lleó" tags="np.*"><select lemma="Leone"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Lleó" tags="np.*"><select lemma="Leone"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Lleó" tags="np.*"><select lemma="Leone"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Lleó" tags="np.*"><select lemma="Leone"/></match>
+  </rule>
+
+<!-- Pere > Pere, Pedru -->
+
+  <rule weight="0.6">
+     <match lemma="Pere" tags="np.*"><select lemma="Pere"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Pere" tags="np.*"><select lemma="Pedru"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Pere" tags="np.*"><select lemma="Pedru"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Pere" tags="np.*"><select lemma="Pedru"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Pere" tags="np.*"><select lemma="Pedru"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Pere" tags="np.*"><select lemma="Pedru"/></match>
+  </rule>
+
+<!-- Jaume > Jaume, Giacu -->
+
+  <rule weight="0.6">
+     <match lemma="Jaume" tags="np.*"><select lemma="Jaume"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Jaume" tags="np.*"><select lemma="Giacu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Jaume" tags="np.*"><select lemma="Giacu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Jaume" tags="np.*"><select lemma="Giacu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Jaume" tags="np.*"><select lemma="Giacu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Jaume" tags="np.*"><select lemma="Giacu"/></match>
+  </rule>
+
+<!-- Ferran > Ferran, Ferrante -->
+
+  <rule weight="0.6">
+     <match lemma="Ferran" tags="np.*"><select lemma="Ferran"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Ferran" tags="np.*"><select lemma="Ferrante"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Ferran" tags="np.*"><select lemma="Ferrante"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Ferran" tags="np.*"><select lemma="Ferrante"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Ferran" tags="np.*"><select lemma="Ferrante"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Ferran" tags="np.*"><select lemma="Ferrante"/></match>
+  </rule>
+
+<!-- Martí > Martí, Martine -->
+
+  <rule weight="0.6">
+     <match lemma="Martí" tags="np.*"><select lemma="Martí"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Martí" tags="np.*"><select lemma="Martine"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Martí" tags="np.*"><select lemma="Martine"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Martí" tags="np.*"><select lemma="Martine"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Martí" tags="np.*"><select lemma="Martine"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Martí" tags="np.*"><select lemma="Martine"/></match>
+  </rule>
+
+<!-- Alfons > Alfons, Alfonsu -->
+
+  <rule weight="0.6">
+     <match lemma="Alfons" tags="np.*"><select lemma="Alfons"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Alfons" tags="np.*"><select lemma="Alfonsu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Alfons" tags="np.*"><select lemma="Alfonsu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Alfons" tags="np.*"><select lemma="Alfonsu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Alfons" tags="np.*"><select lemma="Alfonsu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Alfons" tags="np.*"><select lemma="Alfonsu"/></match>
+  </rule>
+
+<!-- Humbert > Humbert, Umbertu -->
+
+  <rule weight="0.6">
+     <match lemma="Humbert" tags="np.*"><select lemma="Humbert"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Humbert" tags="np.*"><select lemma="Umbertu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Humbert" tags="np.*"><select lemma="Umbertu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Humbert" tags="np.*"><select lemma="Umbertu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Humbert" tags="np.*"><select lemma="Umbertu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Humbert" tags="np.*"><select lemma="Umbertu"/></match>
+  </rule>
+
+<!-- Lluís > Lluís, Luisi -->
+
+  <rule weight="0.6">
+     <match lemma="Lluís" tags="np.*"><select lemma="Lluís"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Lluís" tags="np.*"><select lemma="Luisi"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Lluís" tags="np.*"><select lemma="Luisi"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Lluís" tags="np.*"><select lemma="Luisi"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Lluís" tags="np.*"><select lemma="Luisi"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Lluís" tags="np.*"><select lemma="Luisi"/></match>
+  </rule>
+
+<!-- Guillem > Guillem, Gullielmu -->
+
+  <rule weight="0.6">
+     <match lemma="Guillem" tags="np.*"><select lemma="Gullielmu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Guillem" tags="np.*"><select lemma="Gullielmu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Guillem" tags="np.*"><select lemma="Gullielmu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Guillem" tags="np.*"><select lemma="Gullielmu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Guillem" tags="np.*"><select lemma="Gullielmu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Guillem" tags="np.*"><select lemma="Gullielmu"/></match>
+  </rule>
+
+<!-- Enric > Enric, Erricu -->
+
+  <rule weight="0.6">
+     <match lemma="Enric" tags="np.*"><select lemma="Enric"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Enric" tags="np.*"><select lemma="Erricu"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Enric" tags="np.*"><select lemma="Erricu"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Enric" tags="np.*"><select lemma="Erricu"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Enric" tags="np.*"><select lemma="Erricu"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Enric" tags="np.*"><select lemma="Erricu"/></match>
+  </rule>
+
+<!-- Nicolau > Nicolau, Nigola -->
+
+  <rule weight="0.6">
+     <match lemma="Nicolau" tags="np.*"><select lemma="Nicolau"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Nicolau" tags="np.*"><select lemma="Nigola"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Nicolau" tags="np.*"><select lemma="Nigola"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Nicolau" tags="np.*"><select lemma="Nigola"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Nicolau" tags="np.*"><select lemma="Nigola"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Nicolau" tags="np.*"><select lemma="Nigola"/></match>
+  </rule>
+
+<!-- Isabel > Isabel, Isabella -->
+
+  <rule weight="0.6">
+     <match lemma="Isabel" tags="np.*"><select lemma="Isabel"/></match>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Isabel" tags="np.*"><select lemma="Isabella"/></match>
+     <match lemma="de" tags="pr"/>
+     <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Isabel" tags="np.*"><select lemma="Isabella"/></match>
+     <match tags="det.*"/>
+     <match tags="adj.*"/>
+  </rule>
+  <rule weight="1.0">
+     <match lemma="Isabel" tags="np.*"><select lemma="Isabella"/></match>
+     <match tags="num.*"/>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papa" tags="n.*"/>
+       <match lemma="bisbe" tags="n.*"/>
+       <match lemma="sant" tags="n.*"/>
+       <match lemma="emperador" tags="n.*"/>
+       <match lemma="rei" tags="n.*"/>
+       <match lemma="tsar" tags="n.*"/>
+       <match lemma="virrei" tags="n.*"/>
+       <match lemma="príncep" tags="n.*"/>
+       <match lemma="comte" tags="n.*"/>
+       <match lemma="duc" tags="n.*"/>
+       <match lemma="arxiduc" tags="n.*"/>
+       <match lemma="marquès" tags="n.*"/>
+       <match lemma="baró" tags="n.*"/>
+     </or>
+     <match lemma="Isabel" tags="np.*"><select lemma="Isabella"/></match>
+  </rule>
+  <rule weight="1.0">
+     <or>
+       <match lemma="papat" tags="n.*"/>
+       <match lemma="imperi" tags="n.*"/>
+       <match lemma="regne" tags="n.*"/>
+       <match lemma="regnat" tags="n.*"/>
+     </or>
+     <match lemma="de" tags="pr"/>
+     <match lemma="Isabel" tags="np.*"><select lemma="Isabella"/></match>
+  </rule>
+
 </rules>
Index: languages/apertium-srd/apertium-srd.srd.dix
===================================================================
--- languages/apertium-srd/apertium-srd.srd.dix	(revision 81923)
+++ languages/apertium-srd/apertium-srd.srd.dix	(revision 81926)
@@ -7605,6 +7605,7 @@
 <e lm="capitale">        <i>capital</i><par n="fàtzil/e__adj"/></e>
 <e lm="comitale">        <i>comital</i><par n="fàtzil/e__adj"/></e>
 <e lm="capitalista">     <i>capitalista</i><par n="meda__adj"/></e>
+<e lm="precapitalista">  <i>precapitalista</i><par n="meda__adj"/></e>
 <e lm="captadu">         <i>captad</i><par n="frantzes/u__adj"/></e>
 <e lm="carcu">           <i>car</i><par n="linguìsti/cu__adj"/></e>
 <e lm="caru">            <i>car</i><par n="frantzes/u__adj"/></e>
@@ -23216,6 +23217,7 @@
 <e lm="distratzione">    <i>distra</i><par n="tz/z"/><i>ion</i><par n="region/e__n"/></e>
 <e lm="distrale">        <i>distrale</i><par n="pane__n"/></e>
 <e lm="distretu">        <i>distret</i><par n="àbac/u__n"/></e>
+<e lm="distributzione">  <i>distribu</i><par n="tz/z"/><i>ion</i><par n="region/e__n"/></e>
 <e lm="ridistributzione"><i>ridistribu</i><par n="tz/z"/><i>ion</i><par n="region/e__n"/></e>
 <e lm="distribudore">    <i>distribudor</i><par n="traballador/e__n"/></e>
 <e lm="distrossa">       <i>distrossa</i><par n="mesa__n"/></e>
@@ -56879,7 +56881,7 @@
 <e lm="Borbone">           <i>Borbone</i><par n="Saussure__np"/></e>
 <e lm="Pallars Jussà">           <i>Pallars<b/>Jussà</i><par n="Afganistàn__np"/></e>
     <e lm="in menera àmpra"><i>in<b/>menera<b/></i><par n="à/a"/><i>mpra</i><par n="bene__adv"/></e>
-<e lm="Giagu I">           <i>Giagu<b/>I</i><par n="Antoni__np"/></e>
+<e lm="Giacu I">           <i>Giacu<b/>I</i><par n="Antoni__np"/></e>
 <e lm="San Pietroburgu">           <i>San<b/>Pietroburgu</i><par n="Afganistàn__np"/></e>
 <e lm="Karl">           <i>Karl</i><par n="Antoni__np"/></e>
 <e lm="Arnau">           <i>Arnau</i><par n="Antoni__np"/></e>
@@ -57846,7 +57848,7 @@
 <e lm="Hamilton">           <i>Hamilton</i><par n="Saussure__np"/></e>
 <e lm="Grau">           <i>Grau</i><par n="Afganistàn__np"/></e>
     <e lm="Agnès"><i>Agn</i><par n="è/e"/><i>s</i><par n="Maria__np"/></e>
-<e lm="Santu Predu">           <i>Santu<b/>Predu</i><par n="Antoni__np"/></e>
+<e lm="Santu Pedru">           <i>Santu<b/>Pedru</i><par n="Antoni__np"/></e>
 <e lm="Güell">           <i>Güell</i><par n="Saussure__np"/></e>
 <e lm="Bertran">           <i>Bertran</i><par n="Saussure__np"/></e>
     <e lm="Mercùriu"><i>Merc</i><par n="ù/u"/><i>riu</i><par n="Afganistàn__np"/></e>
@@ -67825,7 +67827,7 @@
 <e lm="Herrera">           <i>Herrera</i><par n="Etiòpia__np"/></e>
 <e lm="punta a susu">           <i>punta<b/>a<b/>susu</i><par n="bene__adv"/></e>
 <e lm="Besalú">           <i>Besalú</i><par n="Etiòpia__np"/></e>
-<e lm="Santu Giagu de Compostela">           <i>Santu<b/>Giagu<b/>de<b/>Compostela</i><par n="Afganistàn__np"/></e>
+<e lm="Santu Giacu de Compostela">           <i>Santu<b/>Giacu<b/>de<b/>Compostela</i><par n="Afganistàn__np"/></e>
 <e lm="Renault">           <i>Renault</i><par n="Linux__np"/></e>
     <e lm="a làcana"><i>a<b/>l</i><par n="à/a"/><i>cana</i><par n="matessi__adj"/></e>
 <e lm="giustamente">           <i>giustamente</i><par n="bene__adv"/></e>
@@ -70152,7 +70154,8 @@
 <e lm="Copèrnicu">           <i>Copèrnicu</i><par n="Saussure__np"/></e>
 <e lm="Willy">           <i>Willy</i><par n="Antoni__np"/></e>
 <e lm="Renoir">           <i>Renoir</i><par n="Saussure__np"/></e>
-<e lm="Lloret de Mar">           <i>Lloret<b/>de<b/>Mar</i><par n="Etiòpia__np"/></e>
+<e lm="Lloret de Mar">           <i>Lloret<b/>de<b/>Mar</i><par n="Afganistàn__np"/></e>
+<e lm="Malgrat de Mar">           <i>Malgrat<b/>de<b/>Mar</i><par n="Afganistàn__np"/></e>
 <e lm="sena l'isetare">           <i>sena<b/>l'isetare</i><par n="bene__adv"/></e>
 <e lm="Dürer">           <i>Dürer</i><par n="Saussure__np"/></e>
 <e lm="Calaf">           <i>Calaf</i><par n="Afganistàn__np"/></e>
@@ -70568,9 +70571,12 @@
 <e lm="vitalìtziu"><i>vitalìtzi</i><par n="frantzes/u__adj"/></e>
 <e lm="carnìvoru"><i>carnìvor</i><par n="frantzes/u__adj"/></e>
 <e lm="cordobesu"><i>cordobes</i><par n="frantzes/u__adj"/></e>
+<e lm="cordobesu"><i>cordobes</i><par n="amig/u__n"/></e>
 <e lm="creolu"><i>creol</i><par n="frantzes/u__adj"/></e>
+<e lm="creolu"><i>creol</i><par n="amig/u__n"/></e>
 <e lm="detzisu"><i>detzis</i><par n="frantzes/u__adj"/></e>
 <e lm="empordanesu"><i>empordanes</i><par n="frantzes/u__adj"/></e>
+<e lm="empordanesu"><i>empordanes</i><par n="amig/u__n"/></e>
 <e lm="epònimu"><i>epònim</i><par n="frantzes/u__adj"/></e>
 <e lm="frungiosu"><i>frungios</i><par n="frantzes/u__adj"/></e>
 <e lm="frutìferu"><i>frutìfer</i><par n="frantzes/u__adj"/></e>
@@ -70581,13 +70587,14 @@
 <e lm="ispissu"><i>ispiss</i><par n="frantzes/u__adj"/></e>
 <e lm="leonesu"><i>leones</i><par n="frantzes/u__adj"/></e>
 <e lm="leonesu"><i>leones</i><par n="amig/u__n"/></e>
-<e lm="asturianuleonesu"><i>asturianuleones</i><par n="frantzes/u__adj"/></e>
-<e lm="asturianuleonesu"><i>asturianuleones</i><par n="àbac/u__n"/></e>
+<e lm="asturianu-leonesu"><i>asturianu-leones</i><par n="frantzes/u__adj"/></e>
+<e lm="asturianu-leonesu"><i>asturianu-leones</i><par n="àbac/u__n"/></e>
 <e lm="malu"><i>mal</i><par n="frantzes/u__adj"/></e>
 <e lm="manniosu"><i>mannios</i><par n="frantzes/u__adj"/></e>
 <e lm="navarresu"><i>navarres</i><par n="frantzes/u__adj"/></e>
 <e lm="navarresu"><i>navarres</i><par n="amig/u__n"/></e>
 <e lm="mozàrabu"><i>mozàrab</i><par n="frantzes/u__adj"/></e>
+<e lm="mozàrabu"><i>mozàrab</i><par n="amig/u__n"/></e>
 <e lm="òseu"><i>òse</i><par n="frantzes/u__adj"/></e>
 <e lm="palesu"><i>pales</i><par n="frantzes/u__adj"/></e>
 <e lm="pretrolìferu"><i>pretrolìfer</i><par n="frantzes/u__adj"/></e>
@@ -70639,6 +70646,34 @@
 <e lm="xxe"><i>xx</i><par n="fàtzil/e__adj"/></e>
 <e lm="xxe"><i>xx</i><par n="fàtzil/e__adj"/></e>
 
+<e lm="Giuanne"><i>Giuanne</i><par n="Antoni__np"/></e>
+<e lm="Pàule"><i>Pàule</i><par n="Antoni__np"/></e>
+<e lm="Giuanne Pàule"><i>Giuanne<b/>Pàule</i><par n="Antoni__np"/></e>
+<e lm="Joan Pau"><i>Joan<b/>Pau</i><par n="Antoni__np"/></e>
+<e lm="Beneitu"><i>Beneitu</i><par n="Antoni__np"/></e>
+<e lm="Frantziscu"><i>Frantziscu</i><par n="Antoni__np"/></e>
+<e lm="Sixt"><i>Sixt</i><par n="Antoni__np"/></e>
+<e lm="Sistu"><i>Sistu</i><par n="Antoni__np"/></e>
+<e lm="Innocenci"><i>Innocenci</i><par n="Antoni__np"/></e>
+<e lm="Innocentzu"><i>Innocentzu</i><par n="Antoni__np"/></e>
+<e lm="Leone"><i>Leone</i><par n="Antoni__np"/></e>
+<e lm="Lleó"><i>Lleó</i><par n="Antoni__np"/></e>
+<e lm="Pedru"><i>Pedru</i><par n="Antoni__np"/></e>
+<e lm="Giacu"><i>Giacu</i><par n="Antoni__np"/></e>
+<e lm="Giagu"><i>Giagu</i><par n="Antoni__np"/></e>
+<e lm="Ferrante"><i>Ferrante</i><par n="Antoni__np"/></e>
+<e lm="Martine"><i>Martine</i><par n="Antoni__np"/></e>
+<e lm="Alfonsu"><i>Alfonsu</i><par n="Antoni__np"/></e>
+<e lm="Giuanne Càralu"><i>Giuanne<b/>Càralu</i><par n="Antoni__np"/></e>
+<e lm="Joan Carles"><i>Joan<b/>Carles</i><par n="Antoni__np"/></e>
+<e lm="Umbertu"><i>Umbertu</i><par n="Antoni__np"/></e>
+<e lm="Humbert"><i>Humbert</i><par n="Antoni__np"/></e>
+<e lm="Luisi"><i>Luisi</i><par n="Antoni__np"/></e>
+<e lm="Gullielmu"><i>Gullielmu</i><par n="Antoni__np"/></e>
+<e lm="Erricu"><i>Erricu</i><par n="Antoni__np"/></e>
+<e lm="Nigola"><i>Nigola</i><par n="Antoni__np"/></e>
+<e lm="Isabella"><i>Isabella</i><par n="Maria__np"/></e>
+
   </section>
 
 
Index: languages/apertium-cat/apertium-cat.cat.dix
===================================================================
--- languages/apertium-cat/apertium-cat.cat.dix	(revision 81923)
+++ languages/apertium-cat/apertium-cat.cat.dix	(revision 81926)
@@ -27487,6 +27487,7 @@
 <e lm="Sant Llorenç">    <i>Sant<b/>Llorenç</i><par n="Afganistan__np"/></e>
 <e lm="Sant Llorenç Savall"><i>Sant<b/>Llorenç<b/>Savall</i><par n="Afganistan__np"/></e>
 <e lm="Sant Lluís">      <i>Sant<b/>Lluís</i><par n="Afganistan__np"/></e>
+<e lm="Sant Lluís" a="hector"><i>Sant<b/>Lluís</i><par n="Marc__np"/></e>
 <e lm="Sant Marino" a="prompsit"><i>Sant<b/>Marino</i><par n="Afganistan__np"/></e>
 <e lm="Sant Martí d'Albars"><i>Sant<b/>Martí<b/>d'Albars</i><par n="Afganistan__np"/></e>
 <e lm="Sant Martí de Campmajor"><i>Sant<b/>Martí<b/>de<b/>Campmajor</i><par n="Afganistan__np"/></e>
@@ -30316,6 +30317,12 @@
 <e lm="Joana">           <i>Joana</i><par n="Abad__np"/></e>
 <e lm="Joanchiquet" a="prompsit"><i>Joanchiquet</i><par n="Abad__np"/></e>
 <e lm="Joan">            <i>Joan</i><par n="Abad__np"/></e>
+<e lm="Joan Carles" a="hector"><i>Joan<b/>Carles</i><par n="Abad__np"/></e>
+<e lm="Joan Pau" a="hector"><i>Joan<b/>Pau</i><par n="Abad__np"/></e>
+<e lm="Sixt" a="hector"> <i>Sixt</i><par n="Abad__np"/></e>
+<e lm="Innocenci" a="hector"><i>Innocenci</i><par n="Abad__np"/></e>
+<e lm="Lleó" a="hector"> <i>Lleó</i><par n="Abad__np"/></e>
+<e lm="Humbert" a="hector"> <i>Humbert</i><par n="Abad__np"/></e>
 <e lm="Joan Lluís Vives"><i>Joan<b/>Lluís<b/>Vives</i><par n="Abad__np"/></e>
 <e lm="Joanot" a="prompsit"><i>Joanot</i><par n="Abad__np"/></e>
 <e lm="Joaquim">         <i>Joaquim</i><par n="Abad__np"/></e>