Merge branch 'master' into develop

assets/layers/charging_station/charging_station.json

@@ -4605,12 +4605,12 @@
         "socket:typee=1"
       ],
       "title": {
-        "en": "a charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (meant to charge electrical bikes)",
+        "en": "a charging station for electrical bikes with a normal european wall plug  <img src='./assets/layers/charging_station/TypeE.svg' class=\"w-6 h-6 mx-1 bg-white rounded-full \" style='display: inline-block'/>",
-        "nl": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (speciaal bedoeld voor fietsen)",
+        "nl": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact  <img src='./assets/layers/charging_station/TypeE.svg' class=\"w-6 h-6  mx-1 bg-white rounded-full\" style='display: inline-block'/>",
-        "ca": "una estació de càrrega per a bicicletes elèctriques amb un endoll de paret europeu normal<img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (destinat a carregar bicicletes elèctriques)",
+        "ca": "una estació de càrrega per a bicicletes elèctriques amb un endoll de paret europeu normal  <img src='./assets/layers/charging_station/TypeE.svg' class=\"w-6 h-6  mx-1 bg-white rounded-full\" style='display: inline-block'/>",
-        "da": "en ladestation til elektriske cykler med et normalt europæisk vægstik <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (beregnet til opladning af elektriske cykler)",
+        "da": "en ladestation til elektriske cykler med et normalt europæisk vægstik  <img src='./assets/layers/charging_station/TypeE.svg' class=\"w-6 h-6  mx-1 bg-white rounded-full\" style='display: inline-block'/>",
-        "de": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (zum Laden von Elektrofahrrädern)",
+        "de": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose  <img src='./assets/layers/charging_station/TypeE.svg' class=\"w-6 h-6  mx-1 bg-white rounded-full\" style='display: inline-block'/>",
-        "es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (pensado para cargar bicicletas eléctricas)"
+        "es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal  <img src='./assets/layers/charging_station/TypeE.svg' class=\"w-6 h-6  mx-1 bg-white rounded-full\" style='display: inline-block'/>"
       },
       "preciseInput": {
         "preferredBackground": "map"
@@ -5124,4 +5124,4 @@
     },
     "neededChangesets": 10
   }
-}
+}

assets/layers/charging_station/charging_station.protojson

@@ -801,8 +801,8 @@
         "socket:typee=1"
       ],
       "title": {
-        "en": "charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/TypeE.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (meant to charge electrical bikes)",
+        "en": "charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/TypeE.svg' class="w-4 h-4 mx-1 bg-white rounded-full"/>",
-        "nl": "oplaadpunt voor elektrische fietsen"
+        "nl": "oplaadpunt voor elektrische fietsen met een gewone, europese stekker <img src='./assets/layers/charging_station/TypeE.svg' class="w-4 h-4 mx-1 bg-white rounded-full"/>"
       },
       "preciseInput": {
         "preferredBackground": "map"

assets/layers/surveillance_camera/surveillance_camera.json

@@ -460,7 +460,8 @@
         "fr": "Méthode de montage : {camera:mount}",
         "it": "Metodo di montaggio: {camera:mount}",
         "de": "Montageart: {camera:mount}",
-        "da": "Monteringsmetode: {camera:mount}"
+        "da": "Monteringsmetode: {camera:mount}",
+        "ca": "Mètode de muntatge: {camera:mount}"
       },
       "freeform": {
         "key": "camera:mount"

css/index-tailwind-output.css

@@ -1376,14 +1376,6 @@ video {
   border-radius: 1.5rem;
 }
 
-.rounded-xl {
-  border-radius: 0.75rem;
-}
-
-.rounded-lg {
-  border-radius: 0.5rem;
-}
-
 .rounded {
   border-radius: 0.25rem;
 }
@@ -1400,6 +1392,14 @@ video {
   border-radius: 0.375rem;
 }
 
+.rounded-lg {
+  border-radius: 0.5rem;
+}
+
+.rounded-xl {
+  border-radius: 0.75rem;
+}
+
 .rounded-sm {
   border-radius: 0.125rem;
 }

langs/layers/ca.json

@@ -4958,7 +4958,8 @@
                         "then": "Aquesta càmera està posicionada a un arbre"
                     }
                 },
-                "question": "Com està posicionada aquesta càmera?"
+                "question": "Com està posicionada aquesta càmera?",
+                "render": "Mètode de muntatge: {camera:mount}"
             },
             "camera_direction": {
                 "question": "En quina direcció geogràfica apunta aquesta càmera?",