Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 14632)
+++ /trunk/data/defaultpresets.xml	(revision 14633)
@@ -665,5 +665,4 @@
                   fr.href="https://wiki.openstreetmap.org/wiki/FR:Link_(highway)"
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
                   uk.href="https://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
@@ -709,5 +708,4 @@
                   fr.href="https://wiki.openstreetmap.org/wiki/FR:Link_(highway)"
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
                   uk.href="https://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
@@ -754,5 +752,4 @@
                   fr.href="https://wiki.openstreetmap.org/wiki/FR:Link_(highway)"
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
                   uk.href="https://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
@@ -1550,5 +1547,4 @@
                       pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
                       pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:traffic_calming"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
                       ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
                 <space />
@@ -1566,5 +1562,4 @@
                       pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
                       pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:traffic_calming"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
                       ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
                 <space />
@@ -1582,5 +1577,4 @@
                       pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
                       pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:traffic_calming"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
                       ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
                 <space />
@@ -1598,5 +1592,4 @@
                       pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
                       pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:traffic_calming"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
                       ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
                 <space />
@@ -1614,5 +1607,4 @@
                       pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
                       pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:traffic_calming"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
                       ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
                 <space />
@@ -1630,5 +1622,4 @@
                       pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
                       pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:traffic_calming"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
                       ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
                 <space />
@@ -1646,5 +1637,4 @@
                       pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
                       pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:traffic_calming"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
                       ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
                 <space />
@@ -2220,5 +2210,5 @@
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Key:tunnel"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Key:tunnel"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:tunnel"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="https://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
@@ -2275,5 +2265,5 @@
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Key:tunnel"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Key:tunnel"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:tunnel"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="https://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
@@ -5296,5 +5286,5 @@
                   no.href="https://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=place_of_worship"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
                   sv.href="https://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
@@ -5321,5 +5311,5 @@
                   no.href="https://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=place_of_worship"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
                   sv.href="https://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
@@ -5346,5 +5336,5 @@
                   no.href="https://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=place_of_worship"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
                   sv.href="https://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
@@ -5370,5 +5360,5 @@
                   no.href="https://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=place_of_worship"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
                   sv.href="https://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
@@ -5394,5 +5384,5 @@
                   no.href="https://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=place_of_worship"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
                   sv.href="https://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
@@ -5417,5 +5407,5 @@
                   no.href="https://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=place_of_worship"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
                   sv.href="https://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
@@ -6305,5 +6295,5 @@
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:amenity=recycling"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=recycling"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=recycling"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=recycling"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=recycling"
                   sv.href="https://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=recycling" />
@@ -6451,5 +6441,6 @@
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=drinking_water"
                   pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=drinking_water"
-                  ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=drinking_water" />
+                  ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=drinking_water"
+                  uk.href="https://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=drinking_water" />
             <space />
             <key key="amenity" value="drinking_water" />
@@ -6644,6 +6635,5 @@
                       fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=golf_course"
                       ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=golf_course"
-                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=golf_course" />
+                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="tee" />
@@ -6655,6 +6645,5 @@
                       fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=golf_course"
                       ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=golf_course"
-                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=golf_course" />
+                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="hole" />
@@ -6672,6 +6661,5 @@
                       fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=golf_course"
                       ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=golf_course"
-                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=golf_course" />
+                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="pin" />
@@ -6693,6 +6681,5 @@
                       fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=golf_course"
                       ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=golf_course"
-                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=golf_course" />
+                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="water_hazard" />
@@ -6705,6 +6692,5 @@
                       fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=golf_course"
                       ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=golf_course"
-                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=golf_course" />
+                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="lateral_water_hazard" />
@@ -6718,6 +6704,5 @@
                       fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=golf_course"
                       ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=golf_course"
-                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=golf_course" />
+                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="green" />
@@ -6737,6 +6722,5 @@
                       fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=golf_course"
                       ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=golf_course"
-                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=golf_course" />
+                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="rough" />
@@ -6749,6 +6733,5 @@
                       fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=golf_course"
                       ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=golf_course"
-                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course"
-                      pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=golf_course" />
+                      pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="driving_range" />
@@ -7291,5 +7274,5 @@
                   no.href="https://wiki.openstreetmap.org/wiki/No:Key:building"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:building"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:building"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:building"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:building"
                   uk.href="https://wiki.openstreetmap.org/wiki/Uk:Key:building" />
@@ -8323,5 +8306,5 @@
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:power=pole"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:power=pole"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:power=pole" />
             <space />
             <key key="power" value="pole" />
@@ -8344,5 +8327,5 @@
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:power=pole"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:power=pole"
-                  pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:power=pole" />
             <space />
             <key key="power" value="pole" />
@@ -9023,4 +9006,5 @@
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:shop=laundry"
                   es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:shop=laundry"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:shop=laundry"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:shop=laundry"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:shop=laundry"
@@ -10308,4 +10292,5 @@
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:craft=winery"
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:craft=winery"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:craft=winery"
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:craft=winery"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:craft=winery"
@@ -10339,4 +10324,5 @@
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:craft=upholsterer"
                   es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:craft=upholsterer"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:craft=upholsterer"
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:craft=upholsterer"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:craft=upholsterer"
@@ -10435,4 +10421,5 @@
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:craft=tiler"
                   es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:craft=tiler"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:craft=tiler"
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:craft=tiler"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:craft=tiler"
@@ -10447,4 +10434,5 @@
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:craft=window_construction"
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:craft=window_construction"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:craft=window_construction"
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:craft=window_construction"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:craft=window_construction"
@@ -10865,4 +10853,5 @@
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:place=quarter"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:place=quarter"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:place=quarter"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:place=quarter" />
             <space />
@@ -10880,4 +10869,5 @@
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:place=neighbourhood"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
             <space />
@@ -10922,4 +10912,5 @@
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:place=square"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:place=square"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:place=square"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:place=square" />
             <space />
@@ -11895,5 +11886,5 @@
                  nl.href="https://wiki.openstreetmap.org/wiki/NL:Key:addr"
                  pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:addr"
-                 pt_BR.href="https://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
+                 pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:addr"
                  ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:addr" />
             <space />