see #20682 - Use proper name "Arête" instead of "Arete", fix unit test

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18537 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: Klumbumbus

resources/data/defaultpresets.xml

@@ -8603,21 +8603,21 @@
                 <combo key="volcano:type" text="Type" values="stratovolcano,shield,scoria" />
             </optional>
         </item> <!-- Volcano -->
-        <item name="Arete" icon="presets/landmark/arete.svg" type="way" preset_name_label="true">
+        <item name="Arête" icon="presets/landmark/arete.svg" type="way" preset_name_label="true">
             <link wiki="Tag:natural=arete" />
             <space />
             <key key="natural" value="arete" />
             <reference ref="name_wikipedia_wikidata" />
             <preset_link preset_name="Ridge" text="Similar but different tags:" />
-        </item> <!-- Arete -->
+        </item> <!-- Arête -->
         <item name="Ridge" icon="presets/landmark/ridge.svg" type="way" preset_name_label="true">
             <link wiki="Tag:natural=ridge" />
             <space />
             <label text="A mountain or hill ridge." />
             <space />
             <key key="natural" value="ridge" />
             <reference ref="name_wikipedia_wikidata" />
-            <preset_link preset_name="Arete" text="Similar but different tags:" />
+            <preset_link preset_name="Arête" text="Similar but different tags:" />
         </item> <!-- Ridge -->
         <item name="Valley" icon="presets/landmark/valley.svg" type="way" preset_name_label="true">
             <link wiki="Tag:natural=valley" />

resources/data/validator/ignoretags.cfg

@@ -389,7 +389,6 @@ K:crossing=controlled
 K:highway=trail
 K:indoor=door
 K:natural=hill
-K:natural=arete
 K:natural=slope
 K:piste:grooming=classic;skating
 K:product=wine