midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-05-12 18:40:13 +02:00
commit a50ce65793
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
assets/layers/charging_station/charging_station.json
View file

@ -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)",
"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)",
"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)",
"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)",
"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)",
"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)"
"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' 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' 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' 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' 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' class=\"w-6 h-6 mx-1 bg-white rounded-full\" style='display: inline-block'/>"
},
"preciseInput": {
"preferredBackground": "map"
@ -5124,4 +5124,4 @@
},
"neededChangesets": 10
}
}
}

4
assets/layers/charging_station/charging_station.protojson
View file

@ -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)",
"nl": "oplaadpunt voor elektrische fietsen"
"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 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"

3
assets/layers/surveillance_camera/surveillance_camera.json
View file

@ -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"

16
css/index-tailwind-output.css
View file

@ -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;
}

3
langs/layers/ca.json
View file

@ -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?",