X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=testdata%2Fgoldens%2Fwiktionary.WholeSection.IT.quickdic.text;h=8f5ddd23e8e0dbc3912aa94214e005b508f7ed39;hb=146fdf564ddf9839c359cf8c2d37ed16394af1d9;hp=913ea0c71b92e14693cda309ddedcad8f743b29a;hpb=791f149be5b2297b492467f55ea332378819a9d9;p=DictionaryPC.git

diff --git a/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text b/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text
index 913ea0c..8f5ddd2 100644
--- a/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text
+++ b/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text
@@ -3,10 +3,10 @@ EntrySource: wiktionary.WholeSection.IT.quickdic 0
 
 Index: IT IT->EN
 ===A===
-HtmlEntry: A <<<{{wikipedia|lang=it}}
+HtmlEntry: A <<<{wikipedia}
 <h3>Pronunciation</h3>
-<ul><li> {{qualifier|phoneme; name of letter}} {{IPA|/a/|lang=it}}</li>
-<ul><li> {{homophones|a|ha|lang=it}}</li>
+<ul><li> {{qualifier|phoneme; name of letter}} {{IPA|/a/}}</li>
+<ul><li> {{homophones|a|ha}}</li>
 </ul>
 </ul>
 
@@ -19,9 +19,9 @@ HtmlEntry: A <<<{{wikipedia|lang=it}}
 <ul><li> {{list|it|Latin script letters}}</li>
 <li> {{pedialite|Italian alphabet}}</li>
 </ul>
-Category:Italian nouns---->>>
+---->>>
 ===a-===
-HtmlEntry: a- <<<{{wikipedia|a (prefisso)|lang=it}}
+HtmlEntry: a- <<<{{wikipedia|a (prefisso)}}
 <h3>Etymology 1</h3>
 From {{etyl|la|it}} {{term|ad|ad-|lang=la}}.
 <h4>Prefix</h4>
@@ -30,269 +30,225 @@ From {{etyl|la|it}} {{term|ad|ad-|lang=la}}.
 </ol>
 
 <h4>Usage notes</h4>
-The Italian prefix <em>a-</em> often reduplicates the following consonant (syntactic gemination, raddoppiamento fonosintattico).The actual forms usually will be {{term|ab-|lang=it}} (in {{term|abbracciare|lang=it}}), {{term|ad-|lang=it}} (in {{term|addestrare|lang=it}}), {{term|al-|lang=it}} (in {{term|allargare|lang=it}}) etc.
+The Italian prefix <em>a-</em> often reduplicates the following consonant (<a href=":w:en:Syntactic gemination">syntactic gemination</a>, raddoppiamento fonosintattico).The actual forms usually will be {{term|ab-}} (in {{term|abbracciare}}), {{term|ad-}} (in {{term|addestrare}}), {{term|al-}} (in {{term|allargare}}) etc.
 <h3>Etymology 2</h3>
 Borrowed from {{etyl|grc|it}} {{term|ἀ-|tr=a-|lang=grc}}.
 <h4>Prefix</h4>
 {{head|it|prefix}}
-<ol><li> a- (indicating lack or loss)</li>
+<ol><li> <a href="#English">a-</a> (indicating lack or loss)</li>
 </ol>
 
 <h5>Synonyms</h5>
-<ul><li> an-</li>
+<ul><li> <a href="an-">an-</a></li>
 </ul>
 ---->>>
 ===abalienate===
 HtmlEntry: abalienate <<<
 <h3>Verb</h3>
 <b>abalienate</b>
-<ol><li> {{conjugation of|abalienare|2|p|pres|ind|lang=it}}</li>
-<li> {{conjugation of|abalienare|2|p|imp|lang=it}}</li>
-<li> {{form of|Feminine plural|abalienato}}</li>
+<ol><li> {{conjugation of|abalienare|2|p|pres|ind}}</li>
+<li> {{conjugation of|abalienare|2|p|imp}}</li>
+<li> {{form of|<a href="feminine">Feminine</a> plural|abalienato}}</li>
 </ol>
-Category:Italian past participle formsCategory:Italian verb forms---->>>
+---->>>
 ===abate===
 HtmlEntry: abate <<<
 <h3>Etymology</h3>
 From {{etyl|la|it}} {{term|abbas|abbās, abbātis|lang=la}}, from {{etyl|grc|it}} {{term|ἀββᾶς|tr=abbas|lang=grc|sc=polytonic}}, from {{etyl|arc|it}} {{term|אבא|father|lang=arc|tr=’abbā|sc=Hebr}}.
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/a'bate/|lang=it}}</li>
+<ul><li> {{IPA|/a'bate/}}</li>
 <li> {{audio|It-abate.ogg|audio}}</li>
 </ul>
 
 <h3>Noun</h3>
 {{it-noun|abat|m|e|i}}
-<ol><li> abbot</li>
+<ol><li> <a href="abbot">abbot</a></li>
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> abbazia</li>
-<li> badia</li>
-<li> badessa</li>
-</ul>
-
-<h3>Anagrams</h3>
-<ul><li> beata</li>
+<ul><li> <a href="abbazia">abbazia</a></li>
+<li> <a href="badia">badia</a></li>
+<li> <a href="badessa">badessa</a></li>
 </ul>
----->>>
+>>>
 ===abbreviate===
 HtmlEntry: abbreviate <<<
 <h3>Verb</h3>
 <b>abbreviate</b>
-<ol><li> second-person plural present tense of abbreviare</li>
-<li> second-person plural imperative of abbreviare</li>
+<ol><li> <a href="second-person plural">second-person plural</a> <a href="present tense">present tense</a> of <a href="abbreviare">abbreviare</a></li>
+<li> second-person plural <a href="imperative">imperative</a> of abbreviare</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> abbeverati</li>
-</ul>
-Category:Italian verb forms---->>>
+>>>
 ===abdicate===
 HtmlEntry: abdicate <<<
 <h3>Verb form</h3>
 <b>abdicate</b>
-<ol><li> second-person plural present tense of abdicare</li>
-<li> second-person plural imperative of abdicare</li>
+<ol><li> <a href="second-person plural">second-person plural</a> <a href="present tense">present tense</a> of <a href="abdicare">abdicare</a></li>
+<li> second-person plural <a href="imperative">imperative</a> of abdicare</li>
 </ol>
-Category:Italian verb forms---->>>
+---->>>
 ===abduce===
 HtmlEntry: abduce <<<
 <h3>Verb</h3>
 <b>abduce</b>
-<ol><li> {{conjugation of|abdurre|3|s|pres|ind|lang=it}}</li>
+<ol><li> {{conjugation of|abdurre|3|s|pres|ind}}</li>
 </ol>
-Category:Italian verb forms---->>>
+---->>>
 ===aberrate===
 HtmlEntry: aberrate <<<
 <h3>Verb</h3>
 <b>aberrate</b>
-<ol><li> {{conjugation of|aberrare|2|p|pres|ind|lang=it}}</li>
-<li> {{conjugation of|aberrare|2|p|imp|lang=it}}</li>
-<li> {{form of|Feminine plural|aberrato}}</li>
+<ol><li> {{conjugation of|aberrare|2|p|pres|ind}}</li>
+<li> {{conjugation of|aberrare|2|p|imp}}</li>
+<li> {{form of|<a href="feminine">Feminine</a> plural|aberrato}}</li>
 </ol>
-Category:Italian past participle formsCategory:Italian verb forms---->>>
+---->>>
 ===ablative===
 HtmlEntry: ablative <<<
 <h3>Adjective</h3>
 <b>ablative</b> {f}
-<ol><li> Feminine plural form of ablativo</li>
+<ol><li> Feminine plural form of <a href="ablativo">ablativo</a></li>
 </ol>
-Category:Italian adjective forms---->>>
+---->>>
 ===abominate===
 HtmlEntry: abominate <<<
 <h3>Verb</h3>
 <b>abominate</b>
-<ol><li> {{conjugation of|abominare|2|p|pres|ind|lang=it}}</li>
-<li> {{conjugation of|abominare|2|p|imp|lang=it}}</li>
-<li> {{form of|Feminine plural|abominato}}</li>
+<ol><li> {{conjugation of|abominare|2|p|pres|ind}}</li>
+<li> {{conjugation of|abominare|2|p|imp}}</li>
+<li> {{form of|<a href="feminine">Feminine</a> plural|abominato}}</li>
 </ol>
-Category:Italian past participle formsCategory:Italian verb forms---->>>
+---->>>
 ===abortive===
 HtmlEntry: abortive <<<
 <h3>Adjective</h3>
 {{head|it|adjective form}} {{f|p}}
-<ol><li> {{feminine plural of|abortivo|lang=it}}</li>
+<ol><li> {{feminine plural of|abortivo}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> breviato</li>
-</ul>
----->>>
+>>>
 ===abrade===
 HtmlEntry: abrade <<<
 <h3>Verb</h3>
 <b>abrade</b>
-<ol><li> {{conjugation of|abradere|3|s|pres|ind|lang=it}}</li>
+<ol><li> {{conjugation of|abradere|3|s|pres|ind}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> badare</li>
-<li> bader&agrave;</li>
-</ul>
-Category:Italian verb forms---->>>
+>>>
 ===abrase===
 HtmlEntry: abrase <<<
 <h3>Verb</h3>
 <b>abrase</b>
-<ol><li> {{conjugation of|abradere|3|s|past historic|lang=it}}</li>
+<ol><li> {{conjugation of|abradere|3|s|<a href="past historic">past historic</a>}}</li>
 </ol>
 <b>abrase</b> {f}
-<ol><li> Plural of abraso</li>
+<ol><li> <a href="plural">Plural</a> of <a href="abraso">abraso</a></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> basare</li>
-<li> baser&agrave;</li>
-</ul>
-Category:Italian past participle formsCategory:Italian verb forms---->>>
+>>>
 ===abrasive===
 HtmlEntry: abrasive <<<
 <h3>Adjective</h3>
 <b>abrasive</b> {f}
-<ol><li> Feminine plural form of abrasivo</li>
+<ol><li> Feminine plural form of <a href="abrasivo">abrasivo</a></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> bavaresi</li>
-<li> sbaverai</li>
-</ul>
-Category:Italian adjective formsam:abrasivear:abrasivede:abrasiveet:abrasiveel:abrasivefa:abrasivefr:abrasiveko:abrasivehi:abrasiveio:abrasiveid:abrasiveit:abrasivekn:abrasivehu:abrasivemy:abrasivepl:abrasivept:abrasiveru:abrasivefi:abrasiveta:abrasivett:abrasiveth:abrasivetr:abrasivevi:abrasivezh:abrasive>>>
+>>>
 ===abrogate===
 HtmlEntry: abrogate <<<
 <h3>Verb</h3>
 <b>abrogate</b>
-<ol><li> {{conjugation of|abrogare|2|p|pres|ind|lang=it}}</li>
-<li> {{conjugation of|abrogare|2|p|imp|lang=it}}</li>
-<li> {{form of|Feminine plural|abrogato}}</li>
+<ol><li> {{conjugation of|abrogare|2|p|pres|ind}}</li>
+<li> {{conjugation of|abrogare|2|p|imp}}</li>
+<li> {{form of|<a href="feminine">Feminine</a> plural|abrogato}}</li>
 </ol>
-Category:Italian past participle formsCategory:Italian verb forms---->>>
+---->>>
 ===abrogative===
 HtmlEntry: abrogative <<<
 <h3>Adjective</h3>
 <b>abrogative</b> {f}
-<ol><li> Feminine plural form of abrogativo</li>
+<ol><li> Feminine plural form of <a href="abrogativo">abrogativo</a></li>
 </ol>
-Category:Italian adjective formsel:abrogativepl:abrogativeru:abrogativeta:abrogativevi:abrogative>>>
+>>>
 ===abusive===
 HtmlEntry: abusive <<<
 <h3>Adjective</h3>
 <b>abusive</b> {f}
-<ol><li> Feminine plural form of abusivo</li>
+<ol><li> Feminine plural form of <a href="abusivo">abusivo</a></li>
 </ol>
-Category:Italian adjective forms---->>>
+---->>>
 ===acacia===
 HtmlEntry: acacia <<<
 <h3>Noun</h3>
 {{it-noun|acaci|f|a|e}}
-<ol><li> acacia (tree)</li>
+<ol><li> <a href="#English">acacia</a> (tree)</li>
 </ol>
 ---->>>
 ===accidie===
 HtmlEntry: accidie <<<
 <h3>Noun</h3>
 <b>accidie</b> {f}
-<ol><li> {{plural of|accidia|lang=it}}</li>
+<ol><li> {{plural of|accidia}}</li>
 </ol>
-fr:accidie>>>
+>>>
 ===acclimate===
 HtmlEntry: acclimate <<<
 <h3>Verb</h3>
 <b>acclimate</b>
-<ol><li> {{conjugation of|acclimare|2|p|pres|ind|lang=it}}</li>
-<li> {{conjugation of|acclimare|2|p|imp|lang=it}}</li>
-<li> {{form of|Feminine plural|acclimato}}</li>
+<ol><li> {{conjugation of|acclimare|2|p|pres|ind}}</li>
+<li> {{conjugation of|acclimare|2|p|imp}}</li>
+<li> {{form of|<a href="feminine">Feminine</a> plural|<a href="acclimato">acclimato</a>}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> malaticce</li>
-</ul>
-Category:Italian past participle formsCategory:Italian verb formsam:acclimatear:acclimateca:acclimateet:acclimateel:acclimatefa:acclimatefr:acclimateko:acclimateio:acclimateid:acclimateit:acclimatemy:acclimateps:acclimatepl:acclimatept:acclimateru:acclimatevi:acclimatezh:acclimate>>>
+>>>
 ===acclive===
 HtmlEntry: acclive <<<
 <h3>Adjective</h3>
 {{it-adj|accliv|e|i}}
-<ol><li> steep</li>
+<ol><li> <a href="steep">steep</a></li>
 </ol>
 
 <h4>Derived terms</h4>
 <ul><li> {{l|it|acclivit&agrave;}}</li>
 </ul>
-
-<h3>Anagrams</h3>
-<ul><li> leccavi</li>
-<li> velacci</li>
-</ul>
----->>>
+>>>
 ===accresce===
 HtmlEntry: accresce <<<
 <h3>Verb</h3>
 <b>accresce</b>
-<ol><li> {{conjugation of|accrescere|3|s|pres|ind|lang=it}}</li>
+<ol><li> {{conjugation of|accrescere|3|s|pres|ind}}</li>
 </ol>
-Category:Italian verb forms---->>>
+---->>>
 ===accurate===
 HtmlEntry: accurate <<<
 <h3>Adjective</h3>
 {{head|it|adjective form|g=f|g2=p}}
 <ol><li> {{feminine plural of|accurato}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> cacature</li>
-</ul>
----->>>
+>>>
 ===AD===
 HtmlEntry: AD <<<
 <h3>Initialism</h3>
 <b>AD</b>
-<ol><li> CEO (amministratore delegato)</li>
+<ol><li> <a href="CEO">CEO</a> (<a href="amministratore delegato">amministratore delegato</a>)</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> da, da', d&agrave;</li>
-</ul>
-Category:Italian initialisms---->>>
+>>>
 ===Afghanistan===
-HtmlEntry: Afghanistan <<<{{wikipedia|lang=it}}
+HtmlEntry: Afghanistan <<<{wikipedia}
 <h3>Pronunciation</h3>
 <ul><li> {{audio|It-Afghanistan.ogg|audio}}</li>
 </ul>
 
 <h3>Proper noun</h3>
 <b>Afghanistan</b> {m}
-<ol><li> Afghanistan</li>
+<ol><li> <a href="Afghanistan#English">Afghanistan</a></li>
 </ol>
 
 <h4>Alternative forms</h4>
-<ul><li> Afganistan</li>
+<ul><li> <a href="Afganistan">Afganistan</a></li>
 </ul>
 
 <h4>Derived terms</h4>
-<ul><li> afgano, afghano</li>
+<ul><li> <a href="afgano">afgano</a>, <a href="afghano">afghano</a></li>
 </ul>
-Category:Italian proper nounsCategory:it:Countries---->>>
+---->>>
 ===Albania===
-HtmlEntry: Albania <<<{{wikipedia|lang=it}}
+HtmlEntry: Albania <<<{wikipedia}
 <h3>Pronunciation</h3>
 <ul><li> {{audio|It-Albania.ogg|Audio}}</li>
 </ul>
@@ -303,11 +259,11 @@ HtmlEntry: Albania <<<{{wikipedia|lang=it}}
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> albanese</li>
+<ul><li> <a href="albanese">albanese</a></li>
 </ul>
-Category:it:Countries---->>>
+---->>>
 ===Algeria===
-HtmlEntry: Algeria <<<{{wikipedia|lang=it}}
+HtmlEntry: Algeria <<<{wikipedia}
 <h3>Pronunciation</h3>
 <ul><li> {{audio|It-Algeria.ogg|Audio}}</li>
 </ul>
@@ -318,44 +274,35 @@ HtmlEntry: Algeria <<<{{wikipedia|lang=it}}
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> algerino</li>
+<ul><li> <a href="algerino">algerino</a></li>
 </ul>
-
-<h3>Anagrams</h3>
-<ul><li> regalai</li>
-<li> regalia</li>
-</ul>
-Category:it:Countrieszh-min-nan:Algeriacs:Algeriacy:Algeriade:Algeriaet:Algeriael:Algeriaes:Algeriafa:Algeriafr:Algeriako:Algeriahy:Algeriahi:Algeriahr:Algeriaio:Algeriaid:Algeriait:Algeriakn:Algeriasw:Algerialt:Algeriahu:Algeriamg:Algeriamn:Algerianl:Algeriano:Algeriands:Algeriapl:Algeriapt:Algeriaru:Algeriasq:Algeriasimple:Algeriafi:Algeriasv:Algeriata:Algeriatr:Algeriauk:Algeriavi:Algeriazh:Algeria>>>
+>>>
 ===andante===
 HtmlEntry: andante <<<
 <h3>Verb</h3>
 {{head|it|present participle}}
-<ol><li> {{present participle of|andare|lang=it}}</li>
+<ol><li> {{present participle of|andare}}</li>
 </ol>
 
 <h3>Adjective</h3>
 {{it-adj|andant|e|i}}
-<ol><li> cheap, second-rate</li>
-<li> continuous, unbroken</li>
+<ol><li> <a href="cheap">cheap</a>, <a href="second-rate">second-rate</a></li>
+<li> <a href="continuous">continuous</a>, <a href="unbroken">unbroken</a></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> dannate</li>
-</ul>
-de:andanteet:andanteel:andantefr:andantegl:andanteko:andanteid:andanteit:andanteku:andantehu:andanteja:andanteno:andantepl:andanteru:andantesq:andantefi:andanteta:andantetr:andantevi:andantezh:andante>>>
+>>>
 ===Andorra===
-HtmlEntry: Andorra <<<{{wikipedia|lang=it}}
+HtmlEntry: Andorra <<<{wikipedia}
 <h3>Proper noun</h3>
 {{it-proper noun|f}}
 <ol><li> {{l|en|Andorra}}</li>
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> andorrano</li>
+<ul><li> <a href="andorrano">andorrano</a></li>
 </ul>
-Category:it:Countries---->>>
+---->>>
 ===Angola===
-HtmlEntry: Angola <<<{{wikipedia|lang=it}}
+HtmlEntry: Angola <<<{wikipedia}
 <h3>Pronunciation</h3>
 <ul><li> {{audio|it-Angola.ogg|Audio}}</li>
 </ul>
@@ -366,50 +313,45 @@ HtmlEntry: Angola <<<{{wikipedia|lang=it}}
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> angolano</li>
+<ul><li> <a href="angolano">angolano</a></li>
 </ul>
-Category:Italian proper nounsCategory:it:Countries---->>>
+---->>>
 ===aquila===
 HtmlEntry: aquila <<<
 <h3>Etymology</h3>
 From the {{etyl|la|it}} {{term|aquila|lang=la}}.
 <h3>Noun</h3>
 {{it-noun|aquil|f|a|e}}
-<ol><li> eagle</li>
+<ol><li> <a href="eagle">eagle</a></li>
 </ol>
 
 <h4>Derived terms</h4>
 {top2}
-<ul><li> aquila arpia</li>
-<li> aquila del Bonelli</li>
-<li> aquila gigante della Nuova Zelanda</li>
-<li> aquila di Haast</li>
-<li> aquila imperiale</li>
-<li> aquila di mare</li>
-<li> aquila di mare a coda bianca</li>
+<ul><li> <a href="aquila arpia">aquila arpia</a></li>
+<li> <a href="aquila del Bonelli">aquila del Bonelli</a></li>
+<li> <a href="aquila gigante della Nuova Zelanda">aquila gigante della Nuova Zelanda</a></li>
+<li> <a href="aquila di Haast">aquila di Haast</a></li>
+<li> <a href="aquila imperiale">aquila imperiale</a></li>
+<li> <a href="aquila di mare">aquila di mare</a></li>
+<li> <a href="aquila di mare a coda bianca">aquila di mare a coda bianca</a></li>
 </ul>
 {mid2}
-<ul><li> aquila di mare di Steller</li>
-<li> aquila di mare della testa bianca</li>
-<li> aquila pescatrice africana</li>
-<li> aquila pescatrice del Madagascar</li>
-<li> aquila reale</li>
-<li> aquila spiegata</li>
-<li> aquila urlatrice</li>
-</ul>
-{bottom}Category:it:Birds---->>>
+<ul><li> <a href="aquila di mare di Steller">aquila di mare di Steller</a></li>
+<li> <a href="aquila di mare della testa bianca">aquila di mare della testa bianca</a></li>
+<li> <a href="aquila pescatrice africana">aquila pescatrice africana</a></li>
+<li> <a href="aquila pescatrice del Madagascar">aquila pescatrice del Madagascar</a></li>
+<li> <a href="aquila reale">aquila reale</a></li>
+<li> <a href="aquila spiegata">aquila spiegata</a></li>
+<li> <a href="aquila urlatrice">aquila urlatrice</a></li>
+</ul>
+{bottom}---->>>
 ===are===
 HtmlEntry: are <<<
 <h3>Noun</h3>
 <b>are</b> {f} {p}
-<ol><li> {{plural of|ara|lang=it}}</li>
+<ol><li> {{plural of|ara}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> era, Era</li>
-<li> rea</li>
-</ul>
----->>>
+>>>
 ===Argentina===
 HtmlEntry: Argentina <<<
 <h3>Proper noun</h3>
@@ -418,19 +360,12 @@ HtmlEntry: Argentina <<<
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> argentino</li>
-<li> argento</li>
+<ul><li> <a href="argentino">argentino</a></li>
+<li> <a href="argento">argento</a></li>
 </ul>
-
-<h3>Anagrams</h3>
-<ul><li> arginante</li>
-<li> inargenta</li>
-<li> ingranate</li>
-<li> rinnegata</li>
-</ul>
-Category:it:Countries---->>>
+>>>
 ===aria===
-HtmlEntry: aria <<<{{wikipedia|lang=it}}
+HtmlEntry: aria <<<{wikipedia}
 <h3>Etymology</h3>
 Metathesis from {{etyl|la|it}} {{term|aerem|lang=la}}, accusative of {{term|aer|āēr|lang=la}}, from {{etyl|grc|it}} {{term|ἀήρ|air|tr=aēr|sc=polytonic|lang=grc}}.
 <h3>Pronunciation</h3>
@@ -440,64 +375,46 @@ Metathesis from {{etyl|la|it}} {{term|aerem|lang=la}}, accusative of {{term|aer|
 &agrave;ria, /ˈarja/, /&lt;tt&gt;&quot;arja&lt;/tt&gt;/
 <h3>Noun</h3>
 {{it-noun|ari|f|a|e}}
-<ol><li> air</li>
-<li> look, appearance, countenance</li>
-<li> {{context|plurale tantum|lang=it}} airs</li>
-<li> air, wind</li>
-<li> {{context|music|lang=it}}  aria, song</li>
+<ol><li> <a href="air">air</a></li>
+<li> <a href="look">look</a>, <a href="appearance">appearance</a>, <a href="countenance">countenance</a></li>
+<li> {{context|plurale tantum}} <a href="airs">airs</a></li>
+<li> air, <a href="wind">wind</a></li>
+<li> {{context|music}}  <a href="aria#English">aria</a>, <a href="song">song</a></li>
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> aere</li>
-<li> aereo</li>
-<li> aria-acqua</li>
-<li> aria-aria</li>
-<li> aria-terra</li>
-<li> arieggiare</li>
-<li> arioso</li>
+<ul><li> <a href="aere">aere</a></li>
+<li> <a href="aereo">aereo</a></li>
+<li> <a href="aria-acqua">aria-acqua</a></li>
+<li> <a href="aria-aria">aria-aria</a></li>
+<li> <a href="aria-terra">aria-terra</a></li>
+<li> <a href="arieggiare">arieggiare</a></li>
+<li> <a href="arioso">arioso</a></li>
 </ul>
-
-<h3>Anagrams</h3>
-<ul><li> arai</li>
-</ul>
----->>>
+>>>
 ===arietta===
 HtmlEntry: arietta <<<
 <h3>Noun</h3>
 {{it-noun|ariett|f|a|e}}
-<ol><li> breeze</li>
-<li> {{music|lang=it}} arietta</li>
+<ol><li> <a href="breeze">breeze</a></li>
+<li> {music} <a href="#English">arietta</a></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> rateati</li>
-<li> tariate</li>
-<li> traiate</li>
-</ul>
-de:ariettapl:ariettaru:ariettaet:ariettafi:ariettavi:ariettatr:arietta>>>
+>>>
 ===Armenia===
-HtmlEntry: Armenia <<<{{wikipedia|lang=it}}
+HtmlEntry: Armenia <<<{wikipedia}
 <h3>Proper noun</h3>
 {{it-proper noun|g=f}}
 <ol><li> {{l|en|Armenia}}</li>
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> armeno</li>
-</ul>
-
-<h3>Anagrams</h3>
-<ul><li> amareni</li>
-<li> animare</li>
-<li> animer&agrave;</li>
-<li> maniera</li>
-<li> mariane</li>
+<ul><li> <a href="armeno">armeno</a></li>
 </ul>
-Category:it:CountriesCategory:it:Exonyms---->>>
+>>>
 ===Austria===
-HtmlEntry: Austria <<<{{wikipedia|lang=it}}
+HtmlEntry: Austria <<<{wikipedia}
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/ˈaustrja/|lang=it}}, {{X-SAMPA|/&quot;austrja/|lang=it}}</li>
+<ul><li> {{IPA|/ˈaustrja/}}, {{X-SAMPA|/&quot;austrja/}}</li>
 </ul>
 
 <h3>Proper noun</h3>
@@ -506,73 +423,63 @@ HtmlEntry: Austria <<<{{wikipedia|lang=it}}
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> austriaco</li>
-</ul>
-
-<h3>Anagrams</h3>
-<ul><li> riusata</li>
-<li> saturai</li>
-<li> Taurasi</li>
+<ul><li> <a href="austriaco">austriaco</a></li>
 </ul>
-Category:it:CountriesCategory:it:Exonyms---->>>
+>>>
 ===avatar===
 HtmlEntry: avatar <<<
 <h3>Noun</h3>
-{{wikipedia|lang=it}}{{head|it|noun|g=m}} {inv}
-<ol><li> avatar (all senses)</li>
+{wikipedia}{{head|it|noun|g=m}} {inv}
+<ol><li> <a href="#English">avatar</a> (all senses)</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> tarava, varata</li>
-</ul>
----->>>
+>>>
 ===Bahrain===
-HtmlEntry: Bahrain <<<{{wikipedia|lang=it}}
+HtmlEntry: Bahrain <<<{wikipedia}
 <h3>Proper noun</h3>
 {{head|it|proper noun|g=m}}
 <ol><li> {{l|en|Bahrain}}</li>
 </ol>
-Category:it:Countries---->>>
+---->>>
 ===Bangladesh===
-HtmlEntry: Bangladesh <<<{{wikipedia|lang=it}}
+HtmlEntry: Bangladesh <<<{wikipedia}
 <h3>Proper noun</h3>
 {{it-proper noun|g=m}}
 <ol><li> {{l|en|Bangladesh}}</li>
 </ol>
 
 <h4>See also</h4>
-<ul><li> bengalese</li>
-<li> bengali</li>
+<ul><li> <a href="bengalese">bengalese</a></li>
+<li> <a href="bengali">bengali</a></li>
 </ul>
-Category:it:Countries---->>>
+---->>>
 ===BCE===
 HtmlEntry: BCE <<<
 <h3>Etymology</h3>
-{{initialism of|Banca Centrale Europea|European Central Bank|lang=it}}
+{{initialism of|Banca Centrale Europea|European Central Bank}}
 <h3>Proper noun</h3>
 {it-proper noun}
-<ol><li> ECB</li>
+<ol><li> <a href="ECB">ECB</a></li>
 </ol>
 ---->>>
 ===big===
 HtmlEntry: big <<<
 <h3>Noun</h3>
 {{head|it|noun|g=m}} {inv}
-<ol><li> star (entertainment)</li>
-<li> big shot, big noise</li>
+<ol><li> <a href="star">star</a> (entertainment)</li>
+<li> <a href="big shot">big shot</a>, <a href="big noise">big noise</a></li>
 </ol>
 ---->>>
 ===bone===
 HtmlEntry: bone <<<
 <h3>Adjective</h3>
 <b>bone</b> {f}
-<ol><li> {{form of|Feminine plural form|bono}}</li>
+<ol><li> {{form of|Feminine plural form|<a href="bono">bono</a>}}</li>
 </ol>
-Category:Italian adjective forms---->>>
+---->>>
 ===Bulgaria===
-HtmlEntry: Bulgaria <<<{{wikipedia|lang=it}}
+HtmlEntry: Bulgaria <<<{wikipedia}
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/bulɡaˈri.a/|lang=it}}, {{X-SAMPA|/bulga&quot;ri.a/|lang=it}}</li>
+<ul><li> {{IPA|/bulɡaˈri.a/}}, {{X-SAMPA|/bulga&quot;ri.a/}}</li>
 </ul>
 
 <h3>Proper noun</h3>
@@ -581,52 +488,47 @@ HtmlEntry: Bulgaria <<<{{wikipedia|lang=it}}
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> bulgaro</li>
+<ul><li> <a href="bulgaro">bulgaro</a></li>
 </ul>
-Category:it:Countries---->>>
+---->>>
 ===Burundi===
-HtmlEntry: Burundi <<<{{wikipedia|lang=it}}
+HtmlEntry: Burundi <<<{wikipedia}
 <h3>Proper noun</h3>
 {{it-proper noun|g=m}}
 <ol><li> {{l|en|Burundi}}</li>
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> burundese</li>
+<ul><li> <a href="burundese">burundese</a></li>
 </ul>
-Category:it:Countries---->>>
+---->>>
 ===can===
 HtmlEntry: can <<<
 <h3>Noun</h3>
 {{it-noun|ca|m|n|ni}}
-<ol><li> {{context|poetic|_|and literary form of cane|lang=it}} dog</li>
+<ol><li> {{context|poetic|_|and literary form of <a href="cane#Italian">cane</a>}} <a href="dog">dog</a></li>
 </ol>
 ---->>>
 ===centavo===
 HtmlEntry: centavo <<<
 <h3>Noun</h3>
 {{it-noun|centav|m|o|i}}
-<ol><li> centavo</li>
+<ol><li> <a href="#English">centavo</a></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> covante</li>
-<li> vocante</li>
-</ul>
----->>>
+>>>
 ===ci===
 HtmlEntry: ci <<<
 <h3>Etymology</h3>
 &lt;small&gt;For the pronoun&lt;/small&gt;&lt;br&gt;From {{etyl|la|it}} {{term|ecce|look|lang=la}} + {{term|hic|here|lang=la}}&lt;small&gt;For the adverb&lt;/small&gt;&lt;br&gt;{{etyl|la|it}} {{term|ecce|look|lang=la}} + {{term|ibi|there|lang=la}}
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/tʃi/|lang=it}}, {{X-SAMPA|/tSi/}}</li>
-<li> {{homophones|C|lang=it}} {{qualifier|name of letter}}</li>
+<ul><li> {{IPA|/tʃi/}}, {{X-SAMPA|/tSi/}}</li>
+<li> {{homophones|C}} {{qualifier|name of letter}}</li>
 </ul>
 
 <h3>Pronoun</h3>
 {{head|it|pronoun}}
-<ol><li> us.</li>
-<li> {{reflexive|lang=it}} ourselves</li>
+<ol><li> <a href="us">us</a>.</li>
+<li> {reflexive} <a href="ourselves">ourselves</a></li>
 <li> impersonal reflexive pronoun</li>
 <ul><li> <b><em>Ci</b> vuole poco a farmi felice.</em></li>
 <ul><li> It doesn't take much to make me happy.</li>
@@ -636,185 +538,158 @@ HtmlEntry: ci <<<
 </ol>
 
 <h4>See also</h4>
-<ul><li> noi</li>
-<li> si</li>
+<ul><li> <a href="noi">noi</a></li>
+<li> <a href="si">si</a></li>
 </ul>
 
 <h3>Adverb</h3>
 {it-adv}
-<ol><li> here, there</li>
+<ol><li> <a href="here">here</a>, <a href="there">there</a></li>
 </ol>
 
 <h4>See also</h4>
-<ul><li> ivi</li>
-<li> l&agrave;</li>
-<li> qua</li>
-<li> qui</li>
+<ul><li> <a href="ivi">ivi</a></li>
+<li> <a href="là">l&agrave;</a></li>
+<li> <a href="qua">qua</a></li>
+<li> <a href="qui">qui</a></li>
 </ul>
 ---->>>
 ===color===
 HtmlEntry: color <<<
 <h3>Noun</h3>
 {{head|it|noun|g=m}} {inv}
-<ol><li> {{apocopic form of|colore|lang=it}}</li>
+<ol><li> {{apocopic form of|colore}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> cloro</li>
-</ul>
----->>>
+>>>
 ===country===
 HtmlEntry: country <<<
 <h3>Etymology</h3>
 From {{etyl|en|it}}
 <h3>Noun</h3>
 {{head|it|noun}} {{m|inv}}
-<ol><li> {{music|lang=it}} country music</li>
+<ol><li> {music} <a href="country music">country music</a></li>
 </ol>
-af:countryang:countryar:countryaz:countryzh-min-nan:countrycs:countrycy:countryde:countryet:countryel:countryes:countryeo:countryfa:countryfr:countrygl:countryko:countryhy:countryio:countryid:countryit:countrykl:countrykn:countryka:countrykk:countrysw:countryku:countrylo:countrylb:countrylt:countryli:countryhu:countrymg:countryml:countrymy:countrynl:countryja:countrypl:countrypt:countryro:countryru:countrysimple:countryfi:countrysv:countryta:countryte:countryth:countrytr:countryuk:countryvi:countryzh:country>>>
+>>>
 ===crude===
 HtmlEntry: crude <<<
 <h3>Adjective</h3>
 <b>crude</b> <em>f plural</em>
-<ol><li> <em>feminine plural of</em> <b>crudo</b></li>
+<ol><li> <em>feminine plural of</em> <b><a href="crudo#Italian">crudo</a></b></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> curde</li>
-</ul>
-Category:Italian adjective forms---->>>
+>>>
 ===date===
 HtmlEntry: date <<<
 <h3>Noun</h3>
 <b>date</b> {f}
-<ol><li> {{plural of|data|lang=it}}</li>
+<ol><li> {{plural of|data}}</li>
 </ol>
 
 <h3>Verb</h3>
 <b>date</b>
-<ol><li> second-person plural present tense of dare</li>
-<li> second-person plural imperative of dare</li>
-<li> feminine plural of dato, past participle of dare</li>
+<ol><li> <a href="second-person plural">second-person plural</a> <a href="present tense">present tense</a> of <a href="dare#Italian">dare</a></li>
+<li> second-person plural <a href="imperative">imperative</a> of dare</li>
+<li> feminine plural of <a href="dato">dato</a>, <a href="past participle">past participle</a> of dare</li>
 </ol>
-Category:Italian past participle formsCategory:Italian verb forms---->>>
+---->>>
 ===de===
 HtmlEntry: de <<<
 <h3>Contraction</h3>
 {{head|it|contraction}}
-<ol><li> {{apocopic form of|del|lang=it}}</li>
+<ol><li> {{apocopic form of|del}}</li>
 <ul><li> <em>Michael Radford &egrave; il regista <b>de</b> &quot;Il postino&quot;.</em> &amp;mdash; &quot;Michael Radford is the director of &quot;Il Postino&quot;.</li>
 </ul>
 </ol>
 
 <h4>Usage notes</h4>
-{{term|De|lang=it}} is used where {{term|del|lang=it}}, {{term|della|lang=it}}, etc, would ordinarily be used, but cannot be because the article is part of the title of a film, book, etc.
+{{term|De}} is used where {{term|del}}, {{term|della}}, etc, would ordinarily be used, but cannot be because the <a href="article">article</a> is part of the title of a film, book, etc.
 <h4>See also</h4>
 <ul><li> {{l|it|ne}}</li>
 </ul>
-
-<h3>Anagrams</h3>
-<ul><li> ed</li>
-</ul>
----->>>
+>>>
 ===decade===
 HtmlEntry: decade <<<
 <h3>Etymology</h3>
-{{confix|deca|ade|lang=it}}
+{{confix|deca|ade}}
 <h3>Noun</h3>
 {{it-noun|decad|f|e|i}}
-<ol><li> A decade, a period of ten days</li>
+<ol><li> A <a href="#English">decade</a>, a period of ten <a href="day">day</a>s</li>
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> deca-</li>
-<li> decennio (ten years)</li>
+<ul><li> <a href="deca-">deca-</a></li>
+<li> <a href="decennio">decennio</a> (ten years)</li>
 </ul>
 
 <h3>Verb form</h3>
 <b>decade</b>
-<ol><li> <em>third-person singular indicative present of decadere</em></li>
+<ol><li> <em>third-person singular indicative present of <a href="decadere">decadere</a></em></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> deceda</li>
-</ul>
-Category:Italian verb formsCategory:it:Time---->>>
+>>>
 ===deficit===
 HtmlEntry: deficit <<<
 <h3>Etymology</h3>
 {{etyl|en|it}}
 <h3>Noun</h3>
 {{head|it|noun|g=m}} {inv}
-<ol><li> deficit (financial, medical)</li>
+<ol><li> <a href="#English">deficit</a> (financial, medical)</li>
 </ol>
 ---->>>
 ===Esperanto===
 HtmlEntry: Esperanto <<<
 <h3>Noun</h3>
 {{head|it|noun|g=m}}
-<ol><li> Esperanto</li>
+<ol><li> <a href="#English">Esperanto</a></li>
 </ol>
 
 <h3>See also</h3>
-<ul><li> esperantista</li>
+<ul><li> <a href="esperantista">esperantista</a></li>
 </ul>
-
-<h3>Anagrams</h3>
-<ul><li> pensatore</li>
-<li> speronate</li>
-</ul>
----->>>
+>>>
 ===Estonia===
-HtmlEntry: Estonia <<<{{wikipedia|lang=it}}
+HtmlEntry: Estonia <<<{wikipedia}
 <h3>Proper noun</h3>
 {{it-proper noun|f}}
 <ol><li> {{l|en|Estonia}}</li>
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> estone</li>
-</ul>
-
-<h3>Anagrams</h3>
-<ul><li> atesino</li>
-<li> esitano</li>
-<li> soniate</li>
+<ul><li> <a href="estone">estone</a></li>
 </ul>
-Category:it:CountriesCategory:it:Exonyms---->>>
+>>>
 ===euro===
-HtmlEntry: euro <<<{{wikipedia|lang=it}}
+HtmlEntry: euro <<<{wikipedia}
 <h3>Noun</h3>
 {{it-noun|eur|m|o|o}}
-<ol><li> euro {{gloss|currency}}</li>
+<ol><li> <a href="#English">euro</a> {{gloss|currency}}</li>
 </ol>
-Category:it:Currency---->>>
+---->>>
 ===f===
 HtmlEntry: f <<<
 <h3>Noun</h3>
 {{head|it|letter}} {{m|f|inv}}
-<ol><li> See under F</li>
+<ol><li> See under <a href="F#Italian">F</a></li>
 </ol>
 ---->>>
 ===fa===
 HtmlEntry: fa <<<
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|[ˈfa]|lang=it}}, {{X-SAMPA|/&quot;fa/}}</li>
+<ul><li> {{IPA|[ˈfa]}}, {{X-SAMPA|/&quot;fa/}}</li>
 <li> {{hyphenation|f&agrave;}}</li>
 </ul>
 
 <h3>Adverb</h3>
 {it-adv}
-<ol><li> ago</li>
+<ol><li> <a href="ago">ago</a></li>
 </ol>
 
 <h4>Synonyms</h4>
-<ul><li> prima</li>
+<ul><li> <a href="prima">prima</a></li>
 </ul>
 
 <h3>Noun</h3>
-{{wikipedia|Fa (nota)|lang=it}}{{head|it|noun}} {{m|inv}}
-<ol><li> {{music|lang=it}} fa (musical note)</li>
-<li> F (musical note or key)</li>
+{{wikipedia|Fa (nota)}}{{head|it|noun}} {{m|inv}}
+<ol><li> {music} <a href="#English">fa</a> (musical note)</li>
+<li> <a href="F">F</a> (musical note or key)</li>
 </ol>
 
 <h3>Alternative forms</h3>
@@ -833,77 +708,69 @@ HtmlEntry: gratis <<<
 From {{etyl|la|it}} {{term|gratis|lang=la}}
 <h3>Adverb</h3>
 {{head|it|adverb}}
-<ol><li> gratis</li>
+<ol><li> <a href="gratis#English">gratis</a></li>
 </ol>
 
 <h4>Synonyms</h4>
-<ul><li> gratuitamente</li>
+<ul><li> <a href="gratuitamente">gratuitamente</a></li>
 </ul>
 
 <h3>Adjective</h3>
 {{head|it|adjective}} {inv}
-<ol><li> free</li>
+<ol><li> <a href="free">free</a></li>
 </ol>
 
 <h4>Synonyms</h4>
-<ul><li> gratuito</li>
-</ul>
-
-<h3>Anagrams</h3>
-<ul><li> stragi</li>
+<ul><li> <a href="gratuito">gratuito</a></li>
 </ul>
----->>>
+>>>
 ===guerra===
 HtmlEntry: guerra <<<
 <h3>Etymology</h3>
-From {{etyl|roa-oit|it}} {{term|guerra|lang=it}}, from {{etyl|LL.|it}} {{recons|werra|lang=LL.}}, {{recons|guerra|lang=LL.}}, from {{etyl|frk|it}} {{recons|werra|werra|riot, disturbance, quarrel|lang=frk|sc=Latn}} from {{proto|Germanic|werrō|confusion, disarray|lang=it}}, from {{proto|Indo-European|wers-|to mix up, confuse, beat, thresh|lang=it}}. Related to {{etyl|goh|-}} {{term|werra|confusion, strife, quarrel|lang=goh}} ({{etyl|de|-}} {{term|verwirren|to confuse|lang=de}}), {{etyl|osx|-}} {{term|werran|to confuse, perplex|lang=osx}}, {{etyl|nl|-}} {{term|war|confusion, disarray|lang=nl}}, {{etyl|ang|-}} {{term|wyrsa|wyrsa, wiersa|worse|lang=ang}}. More at {{l|en|worse}}, {{l|en|wurst}}.
+From {{etyl|roa-oit|it}} {{term|guerra}}, from {{etyl|LL.|it}} {{recons|werra|lang=LL.}}, {{recons|guerra|lang=LL.}}, from {{etyl|frk|it}} {{recons|werra|werra|riot, disturbance, quarrel|lang=frk|sc=Latn}} from {{proto|Germanic|werrō|confusion, disarray}}, from {{proto|Indo-European|wers-|to mix up, confuse, beat, thresh}}. Related to {{etyl|goh|-}} {{term|werra|confusion, strife, quarrel|lang=goh}} ({{etyl|de|-}} {{term|verwirren|to confuse|lang=de}}), {{etyl|osx|-}} {{term|werran|to confuse, perplex|lang=osx}}, {{etyl|nl|-}} {{term|war|confusion, disarray|lang=nl}}, {{etyl|ang|-}} {{term|wyrsa|wyrsa, wiersa|worse|lang=ang}}. More at {{l|en|worse}}, {{l|en|wurst}}.
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/ˈɡwɛr.ra/|lang=it}}, {{X-SAMPA|/&quot;gwEr.ra/|lang=it}}</li>
+<ul><li> {{IPA|/ˈɡwɛr.ra/}}, {{X-SAMPA|/&quot;gwEr.ra/}}</li>
 <li> {{audio|It-la guerra.ogg|Audio}}</li>
 <li> {{audio|It-guerra.ogg|Audio}}</li>
 </ul>
 
 <h3>Noun</h3>
 {{it-noun|guerr|f|a|e}}
-<ol><li> war, warfare</li>
+<ol><li> <a href="war">war</a>, <a href="warfare">warfare</a></li>
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> dichiarazione di guerra</li>
-<li> guerra civile</li>
-<li> guerra fredda</li>
-<li> guerrafondaio</li>
-<li> guerraiolo</li>
-<li> guerraiuolo</li>
-<li> guerra mondiale</li>
-<li> guerreggiante</li>
-<li> guerreggiare</li>
-<li> guerreggiatore</li>
-<li> guerrescamente</li>
-<li> guerresco</li>
-<li> guerricciola</li>
-<li> guerriera</li>
-<li> guerriero</li>
-<li> guerriglia</li>
-<li> guerrigliera</li>
-<li> guerrigliero</li>
-</ul>
-
-<h3>Anagrams</h3>
-<ul><li> urger&agrave;</li>
+<ul><li> <a href="dichiarazione di guerra">dichiarazione di guerra</a></li>
+<li> <a href="guerra civile">guerra civile</a></li>
+<li> <a href="guerra fredda">guerra fredda</a></li>
+<li> <a href="guerrafondaio">guerrafondaio</a></li>
+<li> <a href="guerraiolo">guerraiolo</a></li>
+<li> <a href="guerraiuolo">guerraiuolo</a></li>
+<li> <a href="guerra mondiale">guerra mondiale</a></li>
+<li> <a href="guerreggiante">guerreggiante</a></li>
+<li> <a href="guerreggiare">guerreggiare</a></li>
+<li> <a href="guerreggiatore">guerreggiatore</a></li>
+<li> <a href="guerrescamente">guerrescamente</a></li>
+<li> <a href="guerresco">guerresco</a></li>
+<li> <a href="guerricciola">guerricciola</a></li>
+<li> <a href="guerriera">guerriera</a></li>
+<li> <a href="guerriero">guerriero</a></li>
+<li> <a href="guerriglia">guerriglia</a></li>
+<li> <a href="guerrigliera">guerrigliera</a></li>
+<li> <a href="guerrigliero">guerrigliero</a></li>
 </ul>
----->>>
+>>>
 ===i===
 HtmlEntry: i <<<
 <h3>Etymology 1</h3>
-Reduced form of {{term|gli|lang=it}}.&lt;ref&gt;{{reference-book| last = Patota | first = Giuseppe | title = Lineamenti di grammatica storica dell'italiano | year = 2002 | publisher = il Mulino | location = Bologna | language = Italian | id = ISBN 88-15-08638-2 | pages = p. 126 | chapter = }}&lt;/ref&gt;
+Reduced form of {{term|gli}}.&lt;ref&gt;{{reference-book| last = Patota | first = Giuseppe | title = Lineamenti di grammatica storica dell'italiano | year = 2002 | publisher = il Mulino | location = Bologna | language = Italian | id = ISBN 88-15-08638-2 | pages = p. 126 | chapter = }}&lt;/ref&gt;
 <h4>Article</h4>
 {Italian definite articles}{{head|it|article|singular|il|g=m|g2=p}}
-<ol><li> the (<em>see the usage notes</em>)</li>
+<ol><li> <a href="the">the</a> (<em>see the usage notes</em>)</li>
 </ol>
 
 <h5>Usage notes</h5>
-<ul><li> <b><em>i</b></em> is used before masculine plural words beginning with a single consonant other than <em>x</em> or <em>z</em>, or the plural noun {{term|dei|lang=it}}; <b><em>{{term|gli|lang=it}}</b></em> is used before masculine plural words beginning with a vowel, <em>x</em>, <em>z</em>, <em>gn</em>, or multiple consonants including <em>pn</em>, <em>ps</em>, and <em>s</em>+consonant, and before the plural noun {{term|dei|lang=it}}.</li>
+<ul><li> <b><em>i</b></em> is used before masculine plural words beginning with a single consonant other than <em>x</em> or <em>z</em>, or the plural noun {{term|dei}}; <b><em>{{term|gli}}</b></em> is used before masculine plural words beginning with a vowel, <em>x</em>, <em>z</em>, <em>gn</em>, or multiple consonants including <em>pn</em>, <em>ps</em>, and <em>s</em>+consonant, and before the plural noun {{term|dei}}.</li>
 </ul>
 
 <h4>See also</h4>
@@ -914,79 +781,69 @@ Reduced form of {{term|gli|lang=it}}.&lt;ref&gt;{{reference-book| last = Patota
 
 <h4>Noun</h4>
 <b>i</b> {f} <em>or</em> {m} {inv}
-<ol><li> <em>I</em> or <em>i</em>, the letter <em>I</em> or <em>i</em></li>
+<ol><li> <em><a href="I">I</a></em> or <em><a href="#English">i</a></em>, the letter <em>I</em> or <em>i</em></li>
 </ol>
 
 <h5>Derived terms</h5>
-<ul><li> i lunga</li>
+<ul><li> <a href="i lunga">i lunga</a></li>
 </ul>
-
-<h3>References</h3>
-&lt;references/&gt;Category:it:Latin letter names---->>>
+>>>
 ===in===
 HtmlEntry: in <<<
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|[in]|lang=it}}</li>
+<ul><li> {{IPA|[in]}}</li>
 </ul>
 
 <h3>Preposition</h3>
 {{head|it|preposition}}
-<ol><li> in</li>
-<li> to</li>
+<ol><li> <a href="in#English">in</a></li>
+<li> <a href="to">to</a></li>
 <ul><li> <em>Vado nella panetteria</em></li>
 <li> <em>Vado dal panettiere</em></li>
 </ul>
-<li> into</li>
-<li> by</li>
+<li> <a href="into">into</a></li>
+<li> <a href="by">by</a></li>
 </ol>
 
 <h4>Usage notes</h4>
-<em>When followed by a definite article</em>, <b>in</b> <em>is combined with the article to give the following combined forms</em>:&lt;table border=&quot;1&quot; align=&quot;center&quot; cellpadding=&quot;5&quot;&gt;&lt;tr&gt;&lt;th&gt;In + article&lt;th&gt;Combined form&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + il&lt;td align=&quot;center&quot;&gt;nel&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + lo&lt;td align=&quot;center&quot;&gt;nello&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + l'&lt;td align=&quot;center&quot;&gt;nell'&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + i&lt;td align=&quot;center&quot;&gt;nei&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + gli&lt;td align=&quot;center&quot;&gt;negli&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + la&lt;td align=&quot;center&quot;&gt;nella&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + le&lt;td align=&quot;center&quot;&gt;nelle&lt;/tr&gt;&lt;/table&gt;
-<h3>Anagrams</h3>
-<ul><li> ni</li>
-</ul>
----->>>
+<em>When followed by a definite article</em>, <b>in</b> <em>is combined with the article to give the following combined forms</em>:&lt;table border=&quot;1&quot; align=&quot;center&quot; cellpadding=&quot;5&quot;&gt;&lt;tr&gt;&lt;th&gt;In + article&lt;th&gt;Combined form&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + <a href="il#Italian">il</a>&lt;td align=&quot;center&quot;&gt;<a href="nel">nel</a>&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + <a href="lo#Italian">lo</a>&lt;td align=&quot;center&quot;&gt;<a href="nello">nello</a>&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + <a href="l'#Italian">l'</a>&lt;td align=&quot;center&quot;&gt;<a href="nell'">nell'</a>&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + <a href="i#Italian">i</a>&lt;td align=&quot;center&quot;&gt;<a href="nei">nei</a>&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + <a href="gli">gli</a>&lt;td align=&quot;center&quot;&gt;<a href="negli">negli</a>&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + <a href="la#Italian">la</a>&lt;td align=&quot;center&quot;&gt;<a href="nella">nella</a>&lt;/tr&gt;&lt;tr&gt;&lt;td align=&quot;center&quot;&gt;in + <a href="le#Italian">le</a>&lt;td align=&quot;center&quot;&gt;<a href="nelle">nelle</a>&lt;/tr&gt;&lt;/table&gt;>>>
 ===Iraq===
-HtmlEntry: Iraq <<<{{wikipedia|lang=it}}
+HtmlEntry: Iraq <<<{wikipedia}
 <h3>Proper noun</h3>
 {{it-proper noun|m}}
 <ol><li> {{l|en|Iraq}}</li>
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> iracheno</li>
+<ul><li> <a href="iracheno">iracheno</a></li>
 </ul>
-Category:it:Countries---->>>
+---->>>
 ===langue===
 HtmlEntry: langue <<<
 <h3>Verb</h3>
 <b>langue</b>
-<ol><li> {{conjugation of|languire|3|s|pres|ind|lang=it}}</li>
+<ol><li> {{conjugation of|languire|3|s|pres|ind}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> lagune</li>
-</ul>
-Category:Italian verb forms---->>>
+>>>
 ===lente===
 HtmlEntry: lente <<<
 <h3>Etymology 1</h3>
-Inflected form of {{term|lento|lang=it}}.
+Inflected form of {{term|lento}}.
 <h4>Adjective</h4>
 {{head|it|adjective form}} {f}{p}
-<ol><li> (<em>feminine plural form of lento</em>) slow</li>
+<ol><li> (<em>feminine plural form of <a href="lento#Italian">lento</a></em>) <a href="slow">slow</a></li>
 </ol>
 
 <h3>Etymology 2</h3>
 From {{etyl|la|it}} {{term|lens|lēns|lentil|lang=la}}, <em>lentis</em>.
 <h4>Noun</h4>
 {{it-noun|lent|f|e|i}}
-<ol><li> lens</li>
+<ol><li> <a href="lens">lens</a></li>
 </ol>
 
 <h5>Derived terms</h5>
-<ul><li> lente a contatto</li>
-<li> lente d'ingrandimento</li>
+<ul><li> <a href="lente a contatto">lente a contatto</a></li>
+<li> <a href="lente d'ingrandimento">lente d'ingrandimento</a></li>
 </ul>
 ---->>>
 ===libero===
@@ -994,206 +851,180 @@ HtmlEntry: libero <<<
 <h3>Etymology</h3>
 From {{etyl|la|it}} {{term|liber|līber}}
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/ˈlibero/|lang=it}}</li>
+<ul><li> {{IPA|/ˈlibero/}}</li>
 <li> {{audio|It-libero.ogg|Audio}}</li>
 </ul>
 
 <h3>Adjective</h3>
 {{it-adj|liber}}
-<ol><li> free (<em>not imprisoned or enslaved</em>)</li>
-<ul><li> <em>Un uomo <b>libero</b>.</em></li>
+<ol><li> <a href="free">free</a> (<em>not <a href="imprisoned">imprisoned</a> or <a href="enslaved">enslaved</a></em>)</li>
+<ul><li> <em>Un <a href="uomo">uomo</a> <b>libero</b>.</em></li>
 <ul><li> A <b>free</b> man.</li>
 </ul>
 </ul>
-<li> clear, unobstructed (<em>without blockages</em>)</li>
-<ul><li> <em>Il passaggio era <b>libero</b>.</em></li>
+<li> <a href="clear">clear</a>, <a href="unobstructed">unobstructed</a> (<em>without <a href="blockage">blockage</a>s</em>)</li>
+<ul><li> <em>Il <a href="passaggio">passaggio</a> era <b>libero</b>.</em></li>
 <ul><li> The passage was <b>clear</b>.</li>
 </ul>
 </ul>
-<li> free (<em>without obligations</em>)</li>
-<ul><li> <em>Tempo <b>libero</b>.</em></li>
+<li> free (<em>without <a href="obligation">obligation</a>s</em>)</li>
+<ul><li> <em><a href="tempo">Tempo</a> <b>libero</b>.</em></li>
 <ul><li> <b>Free</b> time./<b>Leisure</b> time.</li>
 </ul>
 </ul>
 <li> free (<em>that does not have to be paid for</em>)</li>
-<ul><li> <em>Ingresso <b>libero</b>.</em></li>
+<ul><li> <em><a href="ingresso">Ingresso</a> <b>libero</b>.</em></li>
 <ul><li> <b>Free</b> admission.</li>
 </ul>
 </ul>
 <li> free (<em>as in &quot;free software&quot;</em>)</li>
-<ul><li> <em>Software <b>libero</b>.</em></li>
+<ul><li> <em><a href="software#Italian">Software</a> <b>libero</b>.</em></li>
 <ul><li> <b>Free</b> software.</li>
 </ul>
 </ul>
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> liberamente</li>
-<li> liberare</li>
-<li> liberismo</li>
-<li> liberista</li>
-<li> libero professionista</li>
-<li> libert&agrave;</li>
-<li> via libera</li>
+<ul><li> <a href="liberamente">liberamente</a></li>
+<li> <a href="liberare">liberare</a></li>
+<li> <a href="liberismo">liberismo</a></li>
+<li> <a href="liberista">liberista</a></li>
+<li> <a href="libero professionista">libero professionista</a></li>
+<li> <a href="libertà">libert&agrave;</a></li>
+<li> <a href="via libera">via libera</a></li>
 </ul>
 
 <h3>Verb</h3>
 {{head|it|verb form}}
-<ol><li> first-person singular present tense of liberare</li>
+<ol><li> <a href="first-person singular">first-person singular</a> <a href="present tense">present tense</a> of <a href="liberare">liberare</a></li>
 </ol>
 
 <h3>Noun</h3>
 {{it-noun|liber|m|o|i}}
-<ol><li> {{football|lang=it}} sweeper.</li>
+<ol><li> {football} <a href="sweeper">sweeper</a>.</li>
 </ol>
 ---->>>
 ===libre===
 HtmlEntry: libre <<<
 <h3>Noun</h3>
 <b>libre</b> {f}
-<ol><li> {{plural of|libra|lang=it}}</li>
+<ol><li> {{plural of|libra}}</li>
 </ol>
 ---->>>
 ===medicine===
 HtmlEntry: medicine <<<
 <h3>Noun</h3>
 <b>medicine</b> {f}
-<ol><li> {{plural of|medicina|lang=it}}</li>
+<ol><li> {{plural of|medicina}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> endemici</li>
-</ul>
----->>>
+>>>
 ===minute===
 HtmlEntry: minute <<<
 <h3>Adjective</h3>
 {{head|it|adjective form|g=f|g2=p}}
-<ol><li> {{feminine plural of|minuto|lang=it}}</li>
+<ol><li> {{feminine plural of|minuto}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> emunti, munite</li>
-</ul>
----->>>
+>>>
 ===mobile===
 HtmlEntry: mobile <<<
 <h3>Etymology</h3>
-From {{etyl|la|it}} <em>mobilis</em>.
+From {{etyl|la|it}} <em><a href="mobilis">mobilis</a></em>.
 <h3>Adjective</h3>
 {{it-adj|mobil|e|i}}
-<ol><li> movable, mobile</li>
-<li> moving</li>
+<ol><li> <a href="movable">movable</a>, <a href="mobile#English">mobile</a></li>
+<li> <a href="moving">moving</a></li>
 </ol>
 
 <h4>Antonyms</h4>
-<ul><li> immobile</li>
+<ul><li> <a href="immobile">immobile</a></li>
 </ul>
 
 <h3>Noun</h3>
 {{it-noun|mobil|m|e|i}}
-<ol><li> {{context|singular|lang=it}} item of furniture</li>
-<li> {{context|plural|lang=it}} furniture</li>
-<li> mobile {{gloss|cellular phone}}</li>
+<ol><li> {{context|singular}} <a href="item">item</a> of <a href="furniture">furniture</a></li>
+<li> {{context|plural}} <a href="furniture">furniture</a></li>
+<li> <a href="mobile#English">mobile</a> {{gloss|cellular phone}}</li>
 </ol>
 
 <h4>Synonyms</h4>
-<ul><li> {{sense|furniture}} mobilia, mobilio, arredamento</li>
-<li> {{sense|cellular phone}} cellulare, telefonino</li>
+<ul><li> {{sense|furniture}} <a href="mobilia">mobilia</a>, <a href="mobilio">mobilio</a>, <a href="arredamento">arredamento</a></li>
+<li> {{sense|cellular phone}} <a href="cellulare">cellulare</a>, <a href="telefonino">telefonino</a></li>
 </ul>
 
 <h4>Antonyms</h4>
-<ul><li> {{sense|cellular phone}} fisso</li>
+<ul><li> {{sense|cellular phone}} <a href="fisso">fisso</a></li>
 </ul>
 
 <h3>Related terms</h3>
-<ul><li> mobilia / mobilio</li>
-<li> mobiliare</li>
-<li> mobilificio</li>
-<li> mobilit&agrave;</li>
-<li> mobilitare</li>
+<ul><li> <a href="mobilia">mobilia</a> / <a href="mobilio">mobilio</a></li>
+<li> <a href="mobiliare">mobiliare</a></li>
+<li> <a href="mobilificio">mobilificio</a></li>
+<li> <a href="mobilità">mobilit&agrave;</a></li>
+<li> <a href="mobilitare">mobilitare</a></li>
 </ul>
-
-<h3>Anagrams</h3>
-<ul><li> emboli</li>
-</ul>
----->>>
+>>>
 ===monetario===
 HtmlEntry: monetario <<<
 <h3>Adjective</h3>
 {{it-adj|monetar|io|ia|i|ie}}
-<ol><li> monetary</li>
+<ol><li> <a href="monetary">monetary</a></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> erotomani</li>
-</ul>
----->>>
+>>>
 ===nu===
 HtmlEntry: nu <<<
 <h3>Noun</h3>
 {{head|it|noun|g=m|g2=f}} {inv}
-<ol><li> The name of the letter N</li>
+<ol><li> The name of the letter <a href="N#Italian">N</a></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> un, un'</li>
-</ul>
----->>>
+>>>
 ===o===
 HtmlEntry: o <<<
 <h3>Etymology 1</h3>
 From {{etyl|la|it}} {{term|aut|lang=la}}.&lt;ref&gt;Angelo Prati, &quot;Vocabolario Etimologico Italiano&quot;, Torino, 1951&lt;/ref&gt;
 <h4>Alternative forms</h4>
-<ul><li> od {{qualifier|used optionally before words beginning with a vowel}}</li>
+<ul><li> <a href="od">od</a> {{qualifier|used optionally before words beginning with a vowel}}</li>
 </ul>
 
 <h4>Conjunction</h4>
 {{head|it|conjunction}}
-<ol><li> or</li>
+<ol><li> <a href="or">or</a></li>
 </ol>
 
 <h3>Etymology 2</h3>
 
 <h4>Verb</h4>
 {{head|it|verb form}}
-<ol><li> {{misspelling of|ho|lang=it}}</li>
+<ol><li> {{misspelling of|ho}}</li>
 </ol>
-
-<h3>References</h3>
-&lt;references/&gt;---->>>
+>>>
 ===OMC===
 HtmlEntry: OMC <<<
 <h3>{{initialism|Italian}}</h3>
 <b>OMC</b>
-<ol><li> Organizzazione Mondiale del Commercio, WTO (World Trade Organisation.)</li>
+<ol><li> <a href="Organizzazione Mondiale del Commercio">Organizzazione Mondiale del Commercio</a>, <a href="WTO">WTO</a> (<a href="World Trade Organisation">World Trade Organisation</a>.)</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> com'</li>
-</ul>
----->>>
+>>>
 ===osteo-===
 HtmlEntry: osteo- <<<
 <h3>Prefix</h3>
 <b>osteo-</b>
-<ol><li> {{anatomy|lang=it}} osteo-</li>
+<ol><li> {anatomy} <a href="#English">osteo-</a></li>
 </ol>
-Category:Italian prefixeset:osteo-fr:osteo-ja:osteo-pl:osteo->>>
+>>>
 ===parole===
 HtmlEntry: parole <<<
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/paɾɔle/|lang=it}}, {{X-SAMPA|/pa4Ole/}}</li>
+<ul><li> {{IPA|/paɾɔle/}}, {{X-SAMPA|/pa4Ole/}}</li>
 </ul>
 
 <h3>Noun</h3>
 {{head|it|noun|g=f|g2=p}}
-<ol><li> {{plural of|parola|lang=it}}</li>
+<ol><li> {{plural of|parola}}</li>
 <ul><li> <em>Ci vogliono fatti e non <b>parole</b>.</em></li>
 <ul><li> <em>Action is needed, not <b>words</b>.</em></li>
 </ul>
 </ul>
-<li> {{context|of a song}} lyrics, words</li>
+<li> {{context|of a song}} <a href="lyrics">lyrics</a>, <a href="word">word</a>s</li>
 <ul><li> <em>Musica di Paolo, <b>parole</b> di Lorenzo</em></li>
 <ul><li> <em>Music by Paolo, <b>lyrics</b> by Lorenzo.</em></li>
 </ul>
@@ -1201,241 +1032,202 @@ HtmlEntry: parole <<<
 </ol>
 
 <h4>Synonyms</h4>
-<ul><li> {{sense|lyrics}} testo</li>
-</ul>
-
-<h3>Anagrams</h3>
-<ul><li> paler&ograve;, polare</li>
+<ul><li> {{sense|lyrics}} <a href="testo">testo</a></li>
 </ul>
----->>>
+>>>
 ===peso===
 HtmlEntry: peso <<<
 <h3>Etymology</h3>
 From {{etyl|la|it}} {{term|pensum|lang=la}}.
 <h3>Noun</h3>
 {{it-noun|pes|m|o|i}}
-<ol><li> weight</li>
+<ol><li> <a href="weight">weight</a></li>
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> pesalettere</li>
-<li> pesante</li>
-<li> pesare</li>
-<li> pesata</li>
-<li> pesiera</li>
-<li> pesista</li>
-<li> pesistica</li>
+<ul><li> <a href="pesalettere">pesalettere</a></li>
+<li> <a href="pesante">pesante</a></li>
+<li> <a href="pesare">pesare</a></li>
+<li> <a href="pesata">pesata</a></li>
+<li> <a href="pesiera">pesiera</a></li>
+<li> <a href="pesista">pesista</a></li>
+<li> <a href="pesistica">pesistica</a></li>
 </ul>
 
 <h3>Verb</h3>
 <b>peso</b>
-<ol><li> {{conjugation of|pesare|1|s|pres|ind|lang=it}}</li>
+<ol><li> {{conjugation of|pesare|1|s|pres|ind}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> pose</li>
-</ul>
-Category:Italian verb forms---->>>
+>>>
 ===pie===
 HtmlEntry: pie <<<
 <h3>Adjective</h3>
 <b>pie</b> {f}
-<ol><li> Feminine plural form of pio</li>
+<ol><li> Feminine plural form of <a href="pio">pio</a></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> pei</li>
-</ul>
-Category:Italian adjective forms---->>>
+>>>
 ===premature===
 HtmlEntry: premature <<<
 <h3>Adjective</h3>
 <b>premature</b>
-<ol><li> Feminine plural form of prematuro</li>
+<ol><li> Feminine plural form of <a href="prematuro">prematuro</a></li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> premurate</li>
-</ul>
-Category:Italian adjective formset:prematurees:prematurefr:prematureko:prematureio:prematureid:prematureit:prematurekn:prematurehu:prematuremg:prematureml:prematuremy:prematurenl:prematurepl:prematurefi:prematuresv:prematureta:prematurete:prematurevi:prematurezh:premature>>>
+>>>
 ===pseudo-===
 HtmlEntry: pseudo- <<<
 <h3>Prefix</h3>
 {{head|it|prefix}}
-<ol><li> pseudo-</li>
+<ol><li> <a href="#English">pseudo-</a></li>
 </ol>
 ---->>>
 ===qualitative===
 HtmlEntry: qualitative <<<
 <h3>Adjective</h3>
 <b>qualitative</b> {f}
-<ol><li> Feminine plural form of qualitativo</li>
+<ol><li> Feminine plural form of <a href="qualitativo">qualitativo</a></li>
 </ol>
-Category:Italian adjective formset:qualitativeel:qualitativees:qualitativefa:qualitativefr:qualitativeio:qualitativehu:qualitativemy:qualitativeja:qualitativepl:qualitativept:qualitativeru:qualitativesimple:qualitativefi:qualitativeta:qualitativete:qualitativetr:qualitativevi:qualitativezh:qualitative>>>
+>>>
 ===quiz===
 HtmlEntry: quiz <<<
 <h3>Noun</h3>
 {{head|it|noun|g=m}} {inv}
-<ol><li> quiz</li>
+<ol><li> <a href="#English">quiz</a></li>
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> telequiz</li>
+<ul><li> <a href="telequiz">telequiz</a></li>
 </ul>
-et:quizel:quizfa:quizfr:quizko:quizid:quizit:quizkn:quizsw:quizhu:quizml:quizmy:quiznl:quizja:quizpl:quizpt:quizru:quizsimple:quizfi:quizsv:quizta:quizte:quiztr:quizvi:quizzh:quiz>>>
+>>>
 ===radio===
-HtmlEntry: radio <<<{{wikipedia|lang=it}}
+HtmlEntry: radio <<<{wikipedia}
 <h3>Etymology</h3>
-Borrowed from {{etyl|la|it}} <em>radius</em>.
+Borrowed from {{etyl|la|it}} <em><a href="radius">radius</a></em>.
 <h3>Pronunciation</h3>
-<ul><li> {{enPR|r&agrave;dio}}, {{IPA|/ˈradjo/|lang=it}}, {{X-SAMPA|/&quot;radjo/}}</li>
+<ul><li> {{enPR|r&agrave;dio}}, {{IPA|/ˈradjo/}}, {{X-SAMPA|/&quot;radjo/}}</li>
 </ul>
 
 <h3>Noun</h3>
 {{it-noun|rad|m|io|i}}
-<ol><li> {{skeleton|lang=it}} radius</li>
-<li> radium</li>
-<li> Variant of raggio.</li>
+<ol><li> {skeleton} <a href="radius">radius</a></li>
+<li> <a href="radium">radium</a></li>
+<li> Variant of <a href="raggio">raggio</a>.</li>
 </ol>
 
 <h4>Synonyms</h4>
-<ul><li> {{sense|radius}} radiale, osso radiale</li>
+<ul><li> {{sense|radius}} <a href="radiale">radiale</a>, <a href="osso radiale">osso radiale</a></li>
 </ul>
 
 <h4>Related terms</h4>
-<ul><li> radiale</li>
+<ul><li> <a href="radiale">radiale</a></li>
 </ul>
 
 <h3>Noun</h3>
 {{head|it|noun|g=f}} {inv}
-<ol><li> radio</li>
+<ol><li> <a href="#English">radio</a></li>
 </ol>
 
 <h3>Verb</h3>
 {{head|it|verb form}}
-<ol><li> {{conjugation of|radiare|1|s|pres|ind|lang=it}}</li>
+<ol><li> {{conjugation of|radiare|1|s|pres|ind}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> adiro, adir&ograve;</li>
-<li> adori</li>
-<li> Adrio</li>
-<li> arido</li>
-<li> Dario</li>
-<li> dorai</li>
-<li> rioda</li>
-<li> rodai</li>
-</ul>
-Category:Italian nouns with irregular genderCategory:it:Chemical elements---->>>
+>>>
 ===rape===
 HtmlEntry: rape <<<
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/ˈrape/|[ˈraː.pe]|lang=it}}, {{X-SAMPA|/&quot;rape/}}</li>
+<ul><li> {{IPA|/ˈrape/|[ˈraː.pe]}}, {{X-SAMPA|/&quot;rape/}}</li>
 <li> {{hyphenation|r&agrave;|pe}}</li>
 </ul>
 
 <h3>Noun</h3>
 <b>rape</b> {f}
-<ol><li> {{plural of|rapa|lang=it}}</li>
+<ol><li> {{plural of|rapa}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> apre, arpe, pare, pera</li>
-</ul>
----->>>
+>>>
 ===relegate===
 HtmlEntry: relegate <<<
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/re.leˈɡa.te/|lang=it}}</li>
+<ul><li> {{IPA|/re.leˈɡa.te/}}</li>
 <li> {{hyphenation|re|le|g&agrave;|te}}</li>
 </ul>
 
 <h3>Verb</h3>
 <b>relegate</b>
-<ol><li> {{conjugation of|relegare|2|p|pres|ind|lang=it}}</li>
-<li> {{conjugation of|relegare|2|p|imp|lang=it}}</li>
-<li> {{form of|Feminine plural|relegato}}</li>
+<ol><li> {{conjugation of|relegare|2|p|pres|ind}}</li>
+<li> {{conjugation of|relegare|2|p|imp}}</li>
+<li> {{form of|<a href="feminine">Feminine</a> plural|relegato}}</li>
 </ol>
-Category:Italian past participle formsCategory:Italian verb forms---->>>
+---->>>
 ===robot===
 HtmlEntry: robot <<<
 <h3>Noun</h3>
 {{head|it|noun|g=m}} {inv}
 <ol><li> {{l|en|robot}}</li>
-<li> {{computing|lang=it}} bot</li>
+<li> {computing} <a href="bot">bot</a></li>
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> robot da cucina</li>
+<ul><li> <a href="robot da cucina">robot da cucina</a></li>
 </ul>
 ---->>>
 ===sabato===
 HtmlEntry: sabato <<<
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/ˈsabato/|[ˈsaː.ba.t̪o]|lang=it}}, {{X-SAMPA|/&quot;sabato/}}</li>
+<ul><li> {{IPA|/ˈsabato/|[ˈsaː.ba.t̪o]}}, {{X-SAMPA|/&quot;sabato/}}</li>
 <li> {{audio|It-sabato.ogg|audio}}</li>
 <li> {{hyphenation|s&agrave;|ba|to}}</li>
 </ul>
 
 <h3>Etymology</h3>
-From {{etyl|la|it}} <em>sabbatum</em>, from {{etyl|grc|it}} {{term|σάββατον|Sabbath|tr=sabbaton|lang=grc|sc=Grek}}, from {{etyl|hbo|it}} {{term|שבת|Sabbath|tr=shabbat|sc=Hebr|lang=he}}; compare English {{term|Sabbath|lang=en}}.
+From {{etyl|la|it}} <em><a href="sabbatum">sabbatum</a></em>, from {{etyl|grc|it}} {{term|σάββατον|Sabbath|tr=sabbaton|lang=grc|sc=Grek}}, from {{etyl|hbo|it}} {{term|שבת|Sabbath|tr=shabbat|sc=Hebr|lang=he}}; compare English {{term|Sabbath|lang=en}}.
 <h3>Noun</h3>
 {{it-noun|sabat|m|o|i}}
-<ol><li> Saturday</li>
+<ol><li> <a href="Saturday">Saturday</a></li>
 </ol>
 
 <h3>See also</h3>
 <ul><li> {{list|it|days of the week}}</li>
 </ul>
-
-<h3>Anagrams</h3>
-<ul><li> basato, sabota</li>
-</ul>
-Category:it:Days of the weekaf:sabatoang:sabatoast:sabatoaz:sabatobr:sabatocs:sabatocy:sabatoda:sabatode:sabatoet:sabatoel:sabatoes:sabatoeo:sabatoeu:sabatofr:sabatogl:sabatoko:sabatohy:sabatoio:sabatoid:sabatoit:sabatolo:sabatolv:sabatolb:sabatolt:sabatohu:sabatomg:sabatonl:sabatoja:sabatono:sabatooc:sabatopl:sabatopt:sabatoro:sabatoru:sabatofi:sabatosv:sabatota:sabatotr:sabatozh:sabato>>>
+>>>
 ===seme===
-HtmlEntry: seme <<<{{wikipedia|lang=it}}
+HtmlEntry: seme <<<{wikipedia}
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|[ˈseme]|lang=it}}</li>
-<li> {{enPR|s&eacute;me}}, {{IPA|/ˈseme/|lang=it}}, {{X-SAMPA|/&quot;seme/}}</li>
+<ul><li> {{IPA|[ˈseme]}}</li>
+<li> {{enPR|s&eacute;me}}, {{IPA|/ˈseme/}}, {{X-SAMPA|/&quot;seme/}}</li>
 </ul>
 
 <h3>Etymology</h3>
-From {{etyl|la|it}} <em>semen</em>.
+From {{etyl|la|it}} <em><a href="semen">semen</a></em>.
 <h3>Noun</h3>
 {{it-noun|sem|m|e|i}}
-<ol><li> seed</li>
-<li> pip</li>
-<li> bean (in some cases)</li>
+<ol><li> <a href="seed">seed</a></li>
+<li> <a href="pip">pip</a></li>
+<li> <a href="bean">bean</a> (in some cases)</li>
 </ol>
 
 <h4>Related terms</h4>
-<ul><li> semaio</li>
-<li> sementa</li>
-<li> semente</li>
-<li> semenza</li>
-<li> semina</li>
-<li> seminare</li>
+<ul><li> <a href="semaio">semaio</a></li>
+<li> <a href="sementa">sementa</a></li>
+<li> <a href="semente">semente</a></li>
+<li> <a href="semenza">semenza</a></li>
+<li> <a href="semina">semina</a></li>
+<li> <a href="seminare">seminare</a></li>
 </ul>
-
-<h3>Anagrams</h3>
-<ul><li> mese</li>
-</ul>
----->>>
+>>>
 ===SpA===
 HtmlEntry: SpA <<<
 <h3>Noun</h3>
 {{head|it|noun}} {{f|inv}}
-<ol><li> {{abbreviation of|societ&agrave; per azioni|lang=it}} {{gloss|public limited company, PLC}}</li>
+<ol><li> {{abbreviation of|societ&agrave; per azioni}} {{gloss|public limited company, PLC}}</li>
 </ol>
 
 <h4>Coordinate terms</h4>
 <ul><li> societ&agrave; per azioni</li>
-<li> LLC {{qualifier|English}}</li>
-<li> {{sense|Canada}} Ltd. {{qualifier|English}} , Lt&eacute;e. {{qualifier|French}}</li>
-<li> {{sense|Germany}} GmbH {{qualifier|German}}</li>
-<li> {{sense|Netherlands}} N.V. {{qualifier|Dutch}}</li>
-<li> {{sense|UK}} PLC {{qualifier|English}}</li>
-<li> {{sense|USA}} Inc. {{qualifier|English}}</li>
+<li> <a href="LLC">LLC</a> {{qualifier|English}}</li>
+<li> {{sense|Canada}} <a href="Ltd.">Ltd.</a> {{qualifier|English}} , <a href="Ltée.">Lt&eacute;e.</a> {{qualifier|French}}</li>
+<li> {{sense|Germany}} <a href="GmbH">GmbH</a> {{qualifier|German}}</li>
+<li> {{sense|Netherlands}} <a href="N.V.">N.V.</a> {{qualifier|Dutch}}</li>
+<li> {{sense|UK}} <a href="PLC">PLC</a> {{qualifier|English}}</li>
+<li> {{sense|USA}} <a href="Inc.">Inc.</a> {{qualifier|English}}</li>
 </ul>
 >>>
 ===star===
@@ -1444,16 +1236,16 @@ HtmlEntry: star <<<
 From {{etyl|en|it}}
 <h3>Noun</h3>
 {{head|it|noun|g=f}} {inv}
-<ol><li> star {{gloss|celebrity}}</li>
+<ol><li> <a href="#English">star</a> {{gloss|celebrity}}</li>
 </ol>
 ---->>>
 ===stock===
 HtmlEntry: stock <<<
 <h3>Etymology</h3>
-From {{etyl|en|it}} stock.
+From {{etyl|en|it}} <a href="#English">stock</a>.
 <h3>Noun</h3>
 {{head|it|noun}}
-<ol><li> stock, goods in supply, inventory</li>
+<ol><li> <a href="#English">stock</a>, goods in supply, <a href="inventory">inventory</a></li>
 </ol>
 ---->>>
 ===te===
@@ -1462,94 +1254,90 @@ HtmlEntry: te <<<
 From {{etyl|la|it}} {{term|te|tē|lang=la}}, from {{term|tu|tū|lang=la}}.
 <h3>Pronoun</h3>
 {{head|it|pronoun}}
-<ol><li> (<em>emphasised objective of tu</em>) you</li>
+<ol><li> (<em>emphasised objective of <a href="tu#Italian">tu</a></em>) <a href="you">you</a></li>
 </ol>
 
 <h4>See also</h4>
-<ul><li> ti</li>
-<li> t&egrave;</li>
+<ul><li> <a href="ti#Italian">ti</a></li>
+<li> <a href="tè">t&egrave;</a></li>
 </ul>
 ---->>>
 ===transfinite===
 HtmlEntry: transfinite <<<
 <h3>Adjective</h3>
 <b>transfinite</b> {f}
-<ol><li> Feminine plural form of transfinito</li>
+<ol><li> Feminine plural form of <a href="transfinito">transfinito</a></li>
 </ol>
-Category:Italian adjective formsfr:transfiniteko:transfiniteio:transfinitepl:transfiniteru:transfinitevi:transfinite>>>
+>>>
 ===transitive===
 HtmlEntry: transitive <<<
 <h3>Adjective</h3>
 <b>transitive</b> {p}
-<ol><li> {{feminine of|transitivo|lang=it}}</li>
+<ol><li> {{feminine of|transitivo}}</li>
 </ol>
-
-<h3>Anagrams</h3>
-<ul><li> {{l|it|intervista}}, {{l|it|intestarvi}}, {{l|it|intraviste}}, {{l|it|rinvestita}}, {{l|it|rinvitaste}}, {{l|it|strinatevi}}, {{l|it|vetrinista}}</li>
-</ul>
-Category:Italian adjective forms---->>>
+>>>
 ===Tunisia===
-HtmlEntry: Tunisia <<<{{wikipedia|lang=it}}
+HtmlEntry: Tunisia <<<{wikipedia}
 <h3>Proper noun</h3>
 <b>Tunisia</b> {f}
-<ol><li> Tunisia</li>
+<ol><li> <a href="#English">Tunisia</a></li>
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> tunisino</li>
+<ul><li> <a href="tunisino">tunisino</a></li>
 </ul>
-Category:Italian proper nounsCategory:it:Countries---->>>
+---->>>
 ===wireless===
 HtmlEntry: wireless <<<
 <h3>Etymology</h3>
 {{etyl|en|it}}
 <h3>Noun</h3>
 {{head|it|noun|g=m}} {inv}
-<ol><li> wireless (transmission without wires)</li>
+<ol><li> <a href="#English">wireless</a> (transmission without wires)</li>
 </ol>
 
 <h3>Adjective</h3>
 {{head|it|adjective}} {inv}
-<ol><li> wireless (computing)</li>
+<ol><li> <a href="#English">wireless</a> (computing)</li>
 </ol>
-cs:wirelesset:wirelessel:wirelessfa:wirelessfr:wirelessko:wirelessio:wirelessid:wirelesskn:wirelesshu:wirelessml:wirelessfj:wirelessnl:wirelesspl:wirelesspt:wirelessfi:wirelesssv:wirelessta:wirelesstr:wirelessvi:wirelesszh:wireless>>>
+>>>
 ===y===
 HtmlEntry: y <<<
 <h3>Noun</h3>
 {{head|it|letter}} {{m|f|inv}}
-<ol><li> See under Y</li>
+<ol><li> See under <a href="Y#Italian">Y</a></li>
 </ol>
 ---->>>
 ===zero===
 HtmlEntry: zero <<<{{cardinalbox|it|0|1|uno|ord=zeresimo}}
 <h3>Pronunciation</h3>
-<ul><li> {{IPA|/ˈdzɛro/|[ˈd̪͡z̪ɛː.ro]|lang=it}}, {{X-SAMPA|/&quot;dzEro/}}</li>
+<ul><li> {{IPA|/ˈdzɛro/|[ˈd̪͡z̪ɛː.ro]}}, {{X-SAMPA|/&quot;dzEro/}}</li>
 <li> {{hyphenation|z&egrave;|ro}}</li>
 </ul>
 
 <h3>Adjective</h3>
 {{head|it|adjective}} {{m|f|inv}}
-<ol><li> zero</li>
+<ol><li> <a href="#English">zero</a></li>
 </ol>
 
 <h3>Noun</h3>
 {{it-noun|zer|m|o|i}}
-<ol><li> zero</li>
-<li> nil (football)</li>
+<ol><li> <a href="#English">zero</a></li>
+<li> <a href="nil">nil</a> (football)</li>
 </ol>
 
 <h4>Derived terms</h4>
-<ul><li> a zero</li>
-<li> zero assoluto</li>
-<li> zero spaccato</li>
-<li> zero zero sette</li>
-<li> l'ora zero</li>
+<ul><li> <a href="a zero">a zero</a></li>
+<li> <a href="zero assoluto">zero assoluto</a></li>
+<li> <a href="zero spaccato">zero spaccato</a></li>
+<li> <a href="zero zero sette">zero zero sette</a></li>
+<li> l'<a href="ora zero">ora zero</a></li>
 </ul>
 
 <h3>See also</h3>
-<ul><li> Appendix:Italian numbers</li>
+<ul><li> <a href="Appendix:Italian numbers">Appendix:Italian numbers</a></li>
 </ul>
-Category:Italian cardinal numbers---->>>
+---->>>
 
 Index: EN EN->IT