Merge pull request #6 from Ircama/cai_scale

Relation revised on cai_scale, descriptions and Italian translation

cai.xml

@@ -11,48 +11,58 @@
               icon="presets/misc/route.svg" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Hiking"
                 it.href="http://wiki.openstreetmap.org/wiki/CAI" />
-            <label text="Edit Club Alpino Italiano relation"
+            <label text="Edit a hiking route relation using convention by Club Alpino Italiano"
                 it.text="Modifica una relazione di un sentiero del Club Alpino Italiano" />
             <key key="type" value="route" />
             <key key="route" value="hiking" />
-            <combo key="network" text="network" values="lwn,rwn,nwn,iwn"
-                   display_values="lwn-local walking network, rwn-regional walking network, nwn-national walking network, iwn-international walking network"
-                   default="lwn" />
-            <text key="name" text="name" default="" />
-            <text key="ref" text="ref" default="" />
-            <combo key="cai_scale" text="cai_scale" values="T,E,EE,EEA,EAI"
-                   display_values="T-Touristic, E-Normal Hickers, EE-Expert Hickers, EEA-Expert Hickers with Equiment, EAI-Expert Hickers with Snow Equiment"
-                   default="" delete_if_empty="true" />
-            <check key="roundtrip" text="roundtrip yes/no" />
-            <text key="source" text="source" default="survey:CAI" />
-            <text key="survey:date" text="survey:date (YYYY-MM-DD)" default="" />
-            <combo key="osmc:symbol" text="osmc:symbol" values="red:red:white_stripe:000:black"
-                   default="red:red:white_stripe:000:black" delete_if_empty="true"/>
-            <combo key="symbol" text="symbol" default="" delete_if_empty="true"
-                   values="000 on white red flag, some old white red flag, likely unmarked, unmarked"/>
-            <combo key="symbol:it" text="symbol:it" default="" delete_if_empty="true"
-                   values="000 su bandierina bianca e rossa, alcuni vecchi segnavia bianco e rosso, probabilmente non segnalato, non segnalato"/>
-            <text key="operator" text="operator" default="Club Alpino Italiano" />
-            <text key="ascent" text="ascent (000)" default="" />
-            <text key="descent" text="descent (000)" default="" />
-            <text key="distance" text="distance (00.0)" default="" />
-            <text key="duration:forward" text="duration-FW (00:00)" default="" />
-            <text key="duration:backward" text="duration-BW (00:00)" default="" />
-            <text key="from" text="from" default="" />
-            <text key="to" text="to" default="" />
-            <combo key="rwn:name" text="rwn:name" default="" delete_if_empty="true"
-                   values="Rete Escursionistica Veneta (REV), Rete Escursionistica della Lombardia (REL), Rete Patrimonio Escursionistico=Piemonte (RPE), Rete Escursionistica Ligure (REL), Rete Escursionistica Emilia-Romagna (REER), Rete Escursionistica Toscana (RET), Rete Escursionistica Marche (RESM), Rete Escursionistica del Lazio (REL), Rete Escursionistica Alpinistica Speleologica e Torrentistica Abruzzo (REASTA), Reti Escursionistiche della Puglia (REP), Rete Escursionistica Campana (REC)"/>
-            <text key="ref:REI" text="ref:REI" default="" />
-            <text key="maintenance" text="maintenance" default="" />
-            <text key="maintenance:it" text="maintenance:it" default="" />
-            <combo key="state" text="state" values="closed,alternate,temporary"
-                   default="" delete_if_empty="true"/>
-            <text key="note" text="note" />
-            <text key="note:it" text="note:it" />
+            <combo key="network" text="network" it.text="Rete" values="lwn,rwn,nwn,iwn"
+                   display_values="lwn-local walking network,rwn-regional walking network,nwn-national walking network,iwn-international walking network"
+                   short_descriptions="local hiking route,regional hiking route,national hiking route,international hiking route"
+                   it.short_descriptions="la maggioranza dei sentieri che insistono su una zona,sentieri di lunga percorrenza che atttraversano piu’ province e/o mettono in collegamento piu’ sentieri ordinari,sentieri di importanza nazionale che attraversano piu’ regioni,sentieri di importanza internazionale che attraversano i confini nazionali"
+                   values_no_i18n="true" default="lwn"  values_sort="false" />
+            <text key="name" text="name" it.text="Nome in formato esteso" default="" />
+            <text key="ref" text="ref" it.text="Ref (numero o codice del sentiero)" default="" />
+            <combo key="cai_scale" text="cai_scale" it.text="Scala di difficoltà CAI" values="T,E,EE,EEA:F,EEA:PD,EEA:D,EEA:MD,EEA:E,EAI"
+                   display_values="T,E,EE,EEA:F,EEA:PD,EEA:D,EEA:MD,EEA:E,EAI"
+                   short_descriptions="Touristic hickers,Regular hickers,Expert hickers,Expert hickers with climbing equipment and moderate difficulty,Expert hickers with climbing equipment and medium difficulty,Expert hickers with climbing equipment and high difficulty,Expert hickers with climbing equipment and very high difficulty,Expert hickers with climbing equipment and extremely high difficulty,Expert hickers with snow equipment"
+                   it.short_descriptions="Sentiero turistico,Sentiero escursionistico,Sentiero per escursionisti esperti,Sentiero per escursionisti esperti con attrezzatura - Facile,Sentiero per escursionisti esperti con attrezzatura - Poco difficile,Sentiero per escursionisti esperti con attrezzatura - Difficile,Sentiero per escursionisti esperti con attrezzatura - Molto difficile,Sentiero per escursionisti esperti con attrezzatura - Estremo,Escursionismo in ambiente innevato"
+                   values_no_i18n="true" default="" delete_if_empty="true" values_sort="false" />
+            <check key="roundtrip" text="roundtrip yes/no" it.text="Percorso circolare" />
+            <combo key="source" text="source" it.text="Fonte informativa" values="survey:CAI,Provincia di...,Comune di...,local knowledge"
+                   it.short_descriptions="Indagine del CAI,Provincia di...,Comune di...,Conoscenza locale"
+                   values_no_i18n="true" default="survey:CAI" delete_if_empty="true" values_sort="false" />
+            <text key="survey:date" text="survey:date (YYYY-MM-DD)" it.text="Data del rilievo (AAAA-MM-GG)" default="" />
+            <combo key="osmc:symbol" text="Hiking Path Symbols (osmc:symbol)" values="red:red:white_stripe:000:black"
+                   display_values="red:red:white_stripe:000:black" it.text="Simboli dei segnavia del percorso (osmc:symbol)" 
+                   short_descriptions="waycolor:background[:foreground][[:foreground2]:text:textcolor]"
+                   values_no_i18n="true" default="red:red:white_stripe:000:black" delete_if_empty="true" values_sort="false" />
+            <combo key="symbol" text="symbol" it.text="Simbolo in forma leggibile inglese" default="" delete_if_empty="true"
+                   values_no_i18n="true" values="000 on white red flags,some old white red flags,likely unmarked,unmarked"/>
+            <combo key="symbol:it" text="symbol:it" it.text="Simbolo in forma leggibile italiana" default="" delete_if_empty="true" values_sort="false"
+                   values_no_i18n="true" values="000 su bandierina bianca e rossa,alcuni vecchi segnavia bianco e rosso,probabilmente non segnalato,non segnalato"/>
+            <text key="operator" text="operator" it.text="Ente che si occupa della manutenzione" default="Club Alpino Italiano" />
+            <text key="ascent" text="ascent (000)" it.text="Dislivello complessivo positivo (000)" default="" />
+            <text key="descent" text="descent (000)" it.text="Dislivello complessivo negativo (00)" default="" />
+            <text key="distance" text="distance (00.0)" it.text="Lunghezza (00.0)" default="" />
+            <text key="duration:forward" text="duration-FW (00:00)" it.text="Percorrenza nella direzione [da -> a] (00:00)" default="" />
+            <text key="duration:backward" text="duration-BW (00:00)" it.text="Percorr. nella direz. contraria [a -> da] (00:00)" default="" />
+            <text key="from" text="from" it.text="Luogo di partenza" default="" />
+            <text key="to" text="to" it.text="Luogo di arrivo" default="" />
+            <combo key="rwn:name" text="rwn:name" it.text="Nome della rete locale/regionale di appartenenza" default="" delete_if_empty="true" values_sort="false"
+                   values_no_i18n="true" values="Rete Escursionistica Veneta (REV),Rete Escursionistica della Lombardia (REL),Rete Patrimonio Escursionistico Piemonte (RPE),Rete Escursionistica Ligure (REL),Rete Escursionistica Emilia-Romagna (REER),Rete Escursionistica Toscana (RET),Rete Escursionistica Marche (RESM),Rete Escursionistica del Lazio (REL),Rete Escursionistica Alpinistica Speleologica e Torrentistica Abruzzo (REASTA),Reti Escursionistiche della Puglia (REP),Rete Escursionistica Campana (REC)" />
+            <text key="ref:REI" text="ref:REI" it.text="Codice nazionale REI (non CAI)" default="" />
+            <text key="maintenance" text="Notes on maintenance" it.text="Note sulla manutenzione (testo inglese)" default="" />
+            <text key="maintenance:it" text="Note sulla manutenzione" it.text="(testo italiano)" default="" />
+            <combo key="state" text="state" it.text="Stato del sentiero" values="closed,alternate,temporary"
+                   short_descriptions="closed route,alternate route,temporary route"
+                   it.short_descriptions="Percorso chiuso,Percorso alternativo,Percorso temporaneo"
+                   values_no_i18n="true" values_sort="false" default="" delete_if_empty="true"/>
+            <text key="note" text="note (English text)" it.text="Note (testo inglese)" />
+            <text key="note:it" text="Note (testo italiano)" />
             <text key="note:project_page" text="note:project_page" />
             <text key="website" text="website" />
-            <text key="description" text="description" default="" />
-            <text key="description:it" text="description:it" default="" />
+            <text key="description" text="description" it.text="Descrizione (testo inglese)" default="" />
+            <text key="description:it" text="description:it" it.text="Descrizione (testo italiano)" default="" />
         </item>
 
         <item name="Club Alpino Italiano Hut" it.name="Rifugio del Club Alpino Italiano"
@@ -62,7 +72,7 @@
                    it.text="Modifica un rifugio del Club Alpino Italiano" />
             <key key="building" value="yes" />
             <combo key="tourism" text="tourism" values="alpine_hut,wilderness_hut"
-                   display_values="alpine_hut,wilderness_hut" />
+                   values_no_i18n="true" display_values="alpine_hut,wilderness_hut" />
             <text key="name" text="Name" default="" />
             <text key="ele" text="Elevation" default="" />
             <text key="opening_hours" text="Opening_hours" default="" />
@@ -72,9 +82,9 @@
             <check key="drinking_water" text="drinking_water yes/no" />
             <check key="toilets" text="toilets yes/no" />
             <combo key="reservation" text="reservation" values="yes,no,required,members_only"
-                   display_values="yes, no, required, members_only" delete_if_empty="true"/>
-            <combo key="access" text="access" values="yes,private" display_values="yes, private"
-                   delete_if_empty="true" />
+                   values_no_i18n="true" display_values="yes,no,required,members_only" delete_if_empty="true"/>
+            <combo key="access" text="access" values="yes,private" display_values="yes,private"
+                   values_no_i18n="true" delete_if_empty="true" />
             <text key="description" text="description" default="" />
             <text key="description:it" text="description:it" default="" />
             <text key="website" text="website" />
@@ -102,11 +112,11 @@
             <check key="toilets" text="toilets yes/no" />
             <combo key="reservation" text="reservation"
                    values="yes,no,required,members_only"
-                   display_values="yes, no, required, members_only"
-                   delete_if_empty="true" />
+                   display_values="yes,no,required,members_only"
+                   values_no_i18n="true" delete_if_empty="true" />
             <combo key="access" text="access" values="yes,private"
-                   display_values="yes, private"
-                   delete_if_empty="true" />
+                   display_values="yes,private"
+                   values_no_i18n="true" delete_if_empty="true" />
             <text key="description" text="description" default="" />
             <text key="description:it" text="description:it" default="" />
             <text key="website" text="website" />
@@ -142,7 +152,7 @@
             <text key="ref:emergency" text="ref" default="" />
             <combo key="rwn:name" text="rwn:name"
                    values="Rete Escursionistica Ligure (REL),Rete Escursionistica Piemontese (RPE),Rete Escursionistica Emilia-Romagna (REER),Rete Escursionistica Toscana (RET)"
-                   default="" delete_if_empty="true" />
+                   values_no_i18n="true" default="" delete_if_empty="true" />
             <text key="destination" text="Destination" default=""  />
             <text key="location:it" text="location:it" default="" />
             <text key="description:it" text="description:it" default="" />
@@ -168,8 +178,8 @@
             <text key="email" text="E-mail" default="" />
             <text key="fax" text="fax" default="" />
             <combo key="wheelchair" text="wheelchair" values="yes,no,limited"
-                   display_values="yes, no, limited"
-                   delete_if_empty="true" />
+                   display_values="yes,no,limited"
+                   values_no_i18n="true" delete_if_empty="true" />
         </item>
 
     </group>