midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-05-02 00:44:32 +02:00
commit 9fe8955d77
25 changed files with 251 additions and 1385 deletions
Download patch file Download diff file Expand all files Collapse all files

32
langs/layers/en.json
View file

@ -918,19 +918,19 @@
"then": "This is a shop whose main focus is bicycle rental"
},
"1": {
"then": "This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus"
"then": "This is a rental business which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus"
},
"2": {
"then": "This is a shop which sells or repairs bicycles, but also rents out bicycles"
},
"3": {
"then": "This is an automated docking station, where a bicycle is mechanically locked into a structure"
"then": "This is an automated docking station, where a bicycle is mechanically locked to a structure"
},
"4": {
"then": "A machine is present which dispenses and accepts keys, eventually after authentication and/or payment. The bicycles are parked nearby"
},
"5": {
"then": "This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only"
"then": "This is a dropoff point, e.g. a reserved parking to place the bicycles clearly marked as being for the rental service only"
}
},
"question": "What kind of bicycle rental is this?"
@ -938,7 +938,7 @@
"rental_types": {
"renderings": {
"0": {
"question": "How much type_plural can be rented here?",
"question": "How many type_plural can be rented here?",
"render": "{capacity:bicycle_type} type_plural can be rented here"
}
},
@ -957,7 +957,7 @@
"1": "BMX bikes"
},
"4": {
"1": "mountainbike"
"1": "mountainbikes"
},
"5": {
"1": "bicycle panniers"
@ -1051,7 +1051,7 @@
"then": "This bike cafe doesn't offer tools for DIY repair"
}
},
"question": "Are there tools here to repair your own bike?"
"question": "Are tools offered to repair your own bike?"
},
"opening_hours": {
"override": {
@ -1159,7 +1159,7 @@
"then": "Bollard"
},
"7": {
"then": "An area on the floor which is marked for bicycle parking"
"then": "An area on the floor which is marked for bicycle parking"
}
},
"question": "What is the type of this bicycle parking?",
@ -1397,7 +1397,7 @@
"1": {
"options": {
"0": {
"question": "Sells second hand bicycles"
"question": "Sells second-hand bicycles"
}
}
},
@ -1530,13 +1530,13 @@
"title": {
"mappings": {
"0": {
"then": "Sport gear shop <i>{name}</i>"
"then": "Sports gear shop <i>{name}</i>"
},
"1": {
"then": "Winkel"
},
"2": {
"then": "Bicycle rental <i>{name}</i>"
"then": "Bicycle rental shop <i>{name}</i>"
},
"3": {
"then": "Bike repair <i>{name}</i>"
@ -1560,7 +1560,7 @@
"then": "Cycle track"
}
},
"render": "Bike related object"
"render": "Bike-related object"
}
},
"binocular": {
@ -4333,7 +4333,7 @@
"0": {
"options": {
"0": {
"question": "Opened now"
"question": "Open now"
}
}
},
@ -5589,7 +5589,7 @@
}
},
"maproulette_challenge": {
"description": "Layer showing tasks of a single MapRoulette challenge. This layer is intended to be reused and extended in themes; refer to the documentation on how to do this.",
"description": "Layer showing tasks of a single MapRoulette challenge. This layer is intended to be reused and extended in themes; refer to [the documentation](https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Integrating_Maproulette.md) on how to do this.",
"filter": {
"0": {
"options": {
@ -6950,7 +6950,11 @@
"question": "Recycling of residual waste"
},
"20": {
<<<<<<< HEAD
"question": "Recycling of residual waste"
=======
"question": "Recycling of printer cartridges"
>>>>>>> develop
},
"21": {
"question": "Recycling of bicycles"
@ -9158,4 +9162,4 @@
}
}
}
}
}