Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge branch 'develop'

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-12-25 23:17:38 +01:00
commit 217c103adc
75 changed files with 4344 additions and 2521 deletions
Download patch file Download diff file Expand all files Collapse all files

1
langs/en.json
View file

@ -913,6 +913,7 @@
"inviteToSplit": "Split this road in smaller segments. This allows to give different properties to parts of the road.",
"loginToSplit": "You must be logged in to split a road",
"split": "Split",
"splitAgain": "Split this road again",
"splitTitle": "Choose on the map where the properties of this road change"
},
"translations": {

21
langs/layers/ca.json
View file

@ -881,31 +881,31 @@
"2": {
"then": "Ací es poden reciclar llaunes"
},
"7": {
"8": {
"then": "Ací es poden reciclar residus orgànics"
},
"8": {
"9": {
"then": "Ací es poden reciclar ampolles de vidre"
},
"9": {
"10": {
"then": "Ací es pot reciclar vidre"
},
"10": {
"12": {
"then": "Ací es poden reciclar diaris"
},
"11": {
"13": {
"then": "Ací es pot reciclar paper"
},
"12": {
"14": {
"then": "Ací es poden reciclar ampolles de plàstic"
},
"13": {
"15": {
"then": "Ací es poden reciclar envasos de plàstic"
},
"14": {
"16": {
"then": "Ací es pot reciclar plàstic"
},
"20": {
"22": {
"then": "Ací es pot reciclar el rebuig"
}
}
@ -1052,9 +1052,6 @@
"render": "Paperera"
}
},
"watermill": {
"name": "Molí d'aigua"
},
"windturbine": {
"title": {
"mappings": {

61
langs/layers/de.json
View file

@ -6322,37 +6322,37 @@
"6": {
"question": "Recycling von Motoröl"
},
"7": {
"8": {
"question": "Recycling von Grünabfällen"
},
"8": {
"9": {
"question": "Recycling von Glasflaschen"
},
"9": {
"10": {
"question": "Recycling von Glas"
},
"10": {
"12": {
"question": "Recycling von Zeitungen"
},
"11": {
"13": {
"question": "Recycling von Papier"
},
"12": {
"14": {
"question": "Recycling von Plastikflaschen"
},
"13": {
"15": {
"question": "Recycling von Kunststoffverpackungen"
},
"14": {
"16": {
"question": "Recycling von Kunststoffen"
},
"15": {
"17": {
"question": "Recycling von Metallschrott"
},
"16": {
"18": {
"question": "Recycling von Elektrokleingeräten"
},
"17": {
"19": {
"question": "Recycling von Restabfällen"
}
}
@ -6411,49 +6411,49 @@
"5": {
"then": "Motoröl kann hier recycelt werden"
},
"6": {
"7": {
"then": "Grünabfälle können hier recycelt werden"
},
"7": {
"8": {
"then": "Bio-Abfall kann hier recycelt werden"
},
"8": {
"9": {
"then": "Glasflaschen können hier recycelt werden"
},
"9": {
"10": {
"then": "Glas kann hier recycelt werden"
},
"10": {
"12": {
"then": "Zeitungen können hier recycelt werden"
},
"11": {
"13": {
"then": "Papier kann hier recycelt werden"
},
"12": {
"14": {
"then": "Plastikflaschen können hier recycelt werden"
},
"13": {
"15": {
"then": "Kunststoffverpackungen können hier recycelt werden"
},
"14": {
"16": {
"then": "Kunststoff kann hier recycelt werden"
},
"15": {
"17": {
"then": "Metallschrott kann hier recycelt werden"
},
"16": {
"18": {
"then": "Schuhe können hier recycelt werden"
},
"17": {
"then": "Elektrokleingeräte können hier recycelt werden"
},
"18": {
"then": "Elektrokleingeräte können hier recycelt werden"
},
"19": {
"then": "Nadeln können hier recycelt werden"
"then": "Elektrokleingeräte können hier recycelt werden"
},
"20": {
"then": "Elektrokleingeräte können hier recycelt werden"
},
"21": {
"then": "Nadeln können hier recycelt werden"
},
"22": {
"then": "Restmüll kann hier recycelt werden"
}
},
@ -8308,9 +8308,6 @@
"render": "Mülltonne"
}
},
"watermill": {
"name": "Wassermühlen"
},
"windturbine": {
"description": "Moderne Windmühlen zur Stromerzeugung",
"name": "Windräder",

121
langs/layers/en.json
View file

@ -169,6 +169,15 @@
},
"atm": {
"description": "ATMS to withdraw money",
"filter": {
"1": {
"options": {
"0": {
"question": "With speech output"
}
}
}
},
"name": "ATMs",
"presets": {
"0": {
@ -186,6 +195,34 @@
"question": "What brand is this ATM?",
"render": "The brand of this ATM is {brand}"
},
"cash_in": {
"mappings": {
"0": {
"then": "You probably cannot deposit cash into this ATM"
},
"1": {
"then": "You can deposit cash into this ATM"
},
"2": {
"then": "You cannot deposit cash into this ATM"
}
},
"question": "Can you deposit cash into this ATM?"
},
"cash_out": {
"mappings": {
"0": {
"then": "You can withdraw cash from this ATM"
},
"1": {
"then": "You can withdraw cash from this ATM"
},
"2": {
"then": "You cannot withdraw cash from this ATM"
}
},
"question": "Can you withdraw cash from this ATM?"
},
"name": {
"render": "The name of this ATM is {name}"
},
@ -195,6 +232,26 @@
},
"question": "What company operates this ATM?",
"render": "The ATM is operated by {operator}"
},
"speech_output": {
"mappings": {
"0": {
"then": "This ATM has speech output, usually available through a headphone jack"
},
"1": {
"then": "This ATM does not have speech output"
}
},
"question": "Does this ATM have speech output for visually impaired users?"
},
"speech_output_language": {
"render": {
"special": {
"question": "In which languages does this ATM have speech output?",
"render_list_item": "This ATM has speech output in {language():font-bold}",
"render_single_language": "This ATM has speech output in {language():font-bold}"
}
}
}
},
"title": {
@ -6323,36 +6380,42 @@
"question": "Recycling of engine oil"
},
"7": {
"question": "Recycling of green waste"
"question": "Recycling of fluorescent tubes"
},
"8": {
"question": "Recycling of glass bottles"
"question": "Recycling of green waste"
},
"9": {
"question": "Recycling of glass"
"question": "Recycling of glass bottles"
},
"10": {
"question": "Recycling of newspapers"
"question": "Recycling of glass"
},
"11": {
"question": "Recycling of paper"
"question": "Recycling of light bulbs"
},
"12": {
"question": "Recycling of plastic bottles"
"question": "Recycling of newspapers"
},
"13": {
"question": "Recycling of plastic packaging"
"question": "Recycling of paper"
},
"14": {
"question": "Recycling of plastic"
"question": "Recycling of plastic bottles"
},
"15": {
"question": "Recycling of scrap metal"
"question": "Recycling of plastic packaging"
},
"16": {
"question": "Recycling of small electrical appliances"
"question": "Recycling of plastic"
},
"17": {
"question": "Recycling of scrap metal"
},
"18": {
"question": "Recycling of small electrical appliances"
},
"19": {
"question": "Recycling of residual waste"
}
}
@ -6412,48 +6475,54 @@
"then": "Engine oil can be recycled here"
},
"6": {
"then": "Green waste can be recycled here"
"then": "Fluorescent tubes can be recycled here"
},
"7": {
"then": "Organic waste can be recycled here"
"then": "Green waste can be recycled here"
},
"8": {
"then": "Glass bottles can be recycled here"
"then": "Organic waste can be recycled here"
},
"9": {
"then": "Glass can be recycled here"
"then": "Glass bottles can be recycled here"
},
"10": {
"then": "Newspapers can be recycled here"
"then": "Glass can be recycled here"
},
"11": {
"then": "Paper can be recycled here"
"then": "Light bulbs can be recycled here"
},
"12": {
"then": "Plastic bottles can be recycled here"
"then": "Newspapers can be recycled here"
},
"13": {
"then": "Plastic packaging can be recycled here"
"then": "Paper can be recycled here"
},
"14": {
"then": "Plastic can be recycled here"
"then": "Plastic bottles can be recycled here"
},
"15": {
"then": "Scrap metal can be recycled here"
"then": "Plastic packaging can be recycled here"
},
"16": {
"then": "Shoes can be recycled here"
"then": "Plastic can be recycled here"
},
"17": {
"then": "Small electrical appliances can be recycled here"
"then": "Scrap metal can be recycled here"
},
"18": {
"then": "Small electrical appliances can be recycled here"
"then": "Shoes can be recycled here"
},
"19": {
"then": "Needles can be recycled here"
"then": "Small electrical appliances can be recycled here"
},
"20": {
"then": "Small electrical appliances can be recycled here"
},
"21": {
"then": "Needles can be recycled here"
},
"22": {
"then": "Residual waste can be recycled here"
}
},
@ -7407,6 +7476,7 @@
"name": "Ticket Validators",
"presets": {
"0": {
"description": "A ticket validator to validate a public transport ticket. This can be either a digital reader, reading a card or ticket, or a machine stamping or punching a ticket.",
"title": "a ticket validator"
}
},
@ -8308,9 +8378,6 @@
"render": "Waste Disposal"
}
},
"watermill": {
"name": "Watermill"
},
"windturbine": {
"description": "Modern windmills generating electricity",
"name": "wind turbine",

36
langs/layers/es.json
View file

@ -3189,28 +3189,28 @@
"6": {
"question": "Reciclaje de aceite de motor"
},
"8": {
"9": {
"question": "Reciclaje de botellas de cristal"
},
"9": {
"10": {
"question": "Reciclaje de cristal"
},
"10": {
"12": {
"question": "Reciclaje de periódicos"
},
"11": {
"13": {
"question": "Reciclaje de papel"
},
"12": {
"14": {
"question": "Reciclaje de botellas de papel"
},
"13": {
"15": {
"question": "Reciclaje de embalajes plásticos"
},
"14": {
"16": {
"question": "Reciclaje de plástico"
},
"15": {
"17": {
"question": "Reciclaje de chatarra"
}
}
@ -3266,34 +3266,34 @@
"5": {
"then": "Aquí se puede reciclar aceite de motor"
},
"7": {
"8": {
"then": "Aquí se pueden reciclar residuos orgánicos"
},
"8": {
"9": {
"then": "Aquí se pueden reciclar botellas de cristal"
},
"9": {
"10": {
"then": "Aquí se puede reciclar cristal"
},
"10": {
"12": {
"then": "Aquí se pueden reciclar periódicos"
},
"11": {
"13": {
"then": "Aquí se puede reciclar papel"
},
"12": {
"14": {
"then": "Aquí se pueden reciclar botellas de plástico"
},
"13": {
"15": {
"then": "Aquí se pueden reciclar embalajes plásticos"
},
"14": {
"16": {
"then": "Aquí se puede reciclar plástico"
},
"15": {
"17": {
"then": "Aquí se puede reciclar chatarra"
},
"16": {
"18": {
"then": "Aquí se pueden reciclar zapatos"
}
},

58
langs/layers/it.json
View file

@ -1766,37 +1766,37 @@
"6": {
"question": "Riciclo di olio da motore"
},
"7": {
"8": {
"question": "Riciclo di umido"
},
"8": {
"9": {
"question": "Riciclo di bottiglie di vetro"
},
"9": {
"10": {
"question": "Riciclo di vetro"
},
"10": {
"12": {
"question": "Riciclo di giornali"
},
"11": {
"13": {
"question": "Riciclo di carta"
},
"12": {
"14": {
"question": "Riciclo di bottiglie di plastica"
},
"13": {
"15": {
"question": "Riciclo di confezioni di plastica"
},
"14": {
"16": {
"question": "Riciclo di plastica"
},
"15": {
"17": {
"question": "Riciclo di rottami metallici"
},
"16": {
"18": {
"question": "Riciclo di piccoli elettrodomestici"
},
"17": {
"19": {
"question": "Riciclo di secco"
}
}
@ -1855,49 +1855,49 @@
"5": {
"then": "Olio di motore"
},
"6": {
"7": {
"then": "Verde"
},
"7": {
"8": {
"then": "Umido"
},
"8": {
"9": {
"then": "Bottiglie di vetro"
},
"9": {
"10": {
"then": "Vetro"
},
"10": {
"12": {
"then": "Giornali"
},
"11": {
"13": {
"then": "Carta"
},
"12": {
"14": {
"then": "Bottiglie di platica"
},
"13": {
"15": {
"then": "Confezioni di plastica"
},
"14": {
"16": {
"then": "Plastica"
},
"15": {
"17": {
"then": "Rottami metallici"
},
"16": {
"18": {
"then": "Scarpe"
},
"17": {
"then": "Piccoli elettrodomestici"
},
"18": {
"then": "Piccoli elettrodomestici"
},
"19": {
"then": "Aghi e oggetti appuntiti"
"then": "Piccoli elettrodomestici"
},
"20": {
"then": "Piccoli elettrodomestici"
},
"21": {
"then": "Aghi e oggetti appuntiti"
},
"22": {
"then": "Secco"
}
},

113
langs/layers/nl.json
View file

@ -5988,36 +5988,42 @@
"question": "Recycling van motorolie"
},
"7": {
"question": "Recycling van groen afval"
"question": "Recycling van tl-buizen"
},
"8": {
"question": "Recycling van glazen flessen"
"question": "Recycling van groen afval"
},
"9": {
"question": "Recycling van glas"
"question": "Recycling van glazen flessen"
},
"10": {
"question": "Recycling van kranten"
"question": "Recycling van glas"
},
"11": {
"question": "Recycling van papier"
"question": "Recycling van lampen"
},
"12": {
"question": "Recycling van plastic flessen"
"question": "Recycling van kranten"
},
"13": {
"question": "Recycling van plastic verpakking"
"question": "Recycling van papier"
},
"14": {
"question": "Recycling van plastic"
"question": "Recycling van plastic flessen"
},
"15": {
"question": "Recycling van oud metaal"
"question": "Recycling van plastic verpakking"
},
"16": {
"question": "Recycling van kleine elektrische apparaten"
"question": "Recycling van plastic"
},
"17": {
"question": "Recycling van oud metaal"
},
"18": {
"question": "Recycling van kleine elektrische apparaten"
},
"19": {
"question": "Recycling van restafval"
}
}
@ -6077,48 +6083,54 @@
"then": "Motorolie kan hier gerecycled worden"
},
"6": {
"then": "Groen afval kan hier gerecycled worden"
"then": "TL-buizen kunnen hier gerecycled worden"
},
"7": {
"then": "Organisch afval kan hier gerecycled worden"
"then": "Groen afval kan hier gerecycled worden"
},
"8": {
"then": "Glazen flessen kunnen hier gerecycled worden"
"then": "Organisch afval kan hier gerecycled worden"
},
"9": {
"then": "Glas kan hier gerecycled worden"
"then": "Glazen flessen kunnen hier gerecycled worden"
},
"10": {
"then": "Kranten kunnen hier gerecycled worden"
"then": "Glas kan hier gerecycled worden"
},
"11": {
"then": "Papier kan hier gerecycled worden"
"then": "Lampen kunnen hier gerecycled worden"
},
"12": {
"then": "Plastic flessen kunnen hier gerecycled worden"
"then": "Kranten kunnen hier gerecycled worden"
},
"13": {
"then": "Plastic verpakking kan hier gerecycled worden"
"then": "Papier kan hier gerecycled worden"
},
"14": {
"then": "Plastic kan hier gerecycled worden"
"then": "Plastic flessen kunnen hier gerecycled worden"
},
"15": {
"then": "Oud metaal kan hier gerecycled worden"
"then": "Plastic verpakking kan hier gerecycled worden"
},
"16": {
"then": "Schoenen kunnen hier gerecycled worden"
"then": "Plastic kan hier gerecycled worden"
},
"17": {
"then": "Kleine elektrische apparaten kunnen hier gerecycled worden"
"then": "Oud metaal kan hier gerecycled worden"
},
"18": {
"then": "Kleine elektrische apparaten kunnen hier gerecycled worden"
"then": "Schoenen kunnen hier gerecycled worden"
},
"19": {
"then": "Injectienaalden kunnen hier gerecycled worden"
"then": "Kleine elektrische apparaten kunnen hier gerecycled worden"
},
"20": {
"then": "Kleine elektrische apparaten kunnen hier gerecycled worden"
},
"21": {
"then": "Injectienaalden kunnen hier gerecycled worden"
},
"22": {
"then": "Restafval kan hier gerecycled worden"
}
},
@ -7872,59 +7884,6 @@
"render": "Afvalbak"
}
},
"watermill": {
"description": "Watermolens",
"name": "Watermolens",
"tagRenderings": {
"Access tag": {
"mappings": {
"0": {
"then": "Vrij toegankelijk"
},
"1": {
"then": "Niet toegankelijk"
},
"2": {
"then": "Niet toegankelijk, want privégebied"
},
"3": {
"then": "Toegankelijk, ondanks dat het privegebied is"
},
"4": {
"then": "Enkel toegankelijk met een gids of tijdens een activiteit"
},
"5": {
"then": "Toegankelijk mits betaling"
}
},
"question": "Is dit gebied toegankelijk?",
"render": "De toegankelijkheid van dit gebied is: {access:description}"
},
"Operator tag": {
"mappings": {
"0": {
"then": "Dit gebied wordt beheerd door Natuurpunt"
},
"1": {
"then": "Dit gebied wordt beheerd door {operator}"
}
},
"question": "Wie beheert dit pad?",
"render": "Beheer door {operator}"
}
},
"title": {
"mappings": {
"0": {
"then": "{name:nl}"
},
"1": {
"then": "{name}"
}
},
"render": "Watermolens"
}
},
"windturbine": {
"description": "Windturbines (moderne windmolens die elektriciteit genereren)",
"name": "windturbine",

18
langs/shared-questions/nl.json
View file

@ -179,6 +179,24 @@
}
}
},
"payment-options-split": {
"override": {
"mappings+": {
"0": {
"then": "Muntgeld wordt hier aanvaard"
},
"1": {
"then": "Bankbiljetten worden hier aanvaard"
},
"2": {
"then": "Betalen met debetkaarten kan hier"
},
"3": {
"then": "Betalen met creditkaarten kan hier"
}
}
}
},
"phone": {
"question": "Wat is het telefoonnummer van {title()}?"
},

4
langs/themes/ca.json
View file

@ -443,14 +443,14 @@
},
"onwheels": {
"layers": {
"18": {
"19": {
"override": {
"=title": {
"render": "Estadístiques"
}
}
},
"19": {
"20": {
"override": {
"+tagRenderings": {
"0": {

4
langs/themes/da.json
View file

@ -680,14 +680,14 @@
}
}
},
"18": {
"19": {
"override": {
"=title": {
"render": "Statistikker"
}
}
},
"19": {
"20": {
"override": {
"+tagRenderings": {
"0": {

4
langs/themes/de.json
View file

@ -909,14 +909,14 @@
}
}
},
"18": {
"19": {
"override": {
"=title": {
"render": "Statistik"
}
}
},
"19": {
"20": {
"override": {
"+tagRenderings": {
"0": {

4
langs/themes/en.json
View file

@ -909,14 +909,14 @@
}
}
},
"18": {
"19": {
"override": {
"=title": {
"render": "Statistics"
}
}
},
"19": {
"20": {
"override": {
"+tagRenderings": {
"0": {

4
langs/themes/fr.json
View file

@ -888,14 +888,14 @@
}
}
},
"18": {
"19": {
"override": {
"=title": {
"render": "Statistiques"
}
}
},
"19": {
"20": {
"override": {
"+tagRenderings": {
"0": {

4
langs/themes/nb_NO.json
View file

@ -441,14 +441,14 @@
},
"onwheels": {
"layers": {
"18": {
"19": {
"override": {
"=title": {
"render": "Statistikk"
}
}
},
"19": {
"20": {
"override": {
"+tagRenderings": {
"0": {

4
langs/themes/nl.json
View file

@ -1036,14 +1036,14 @@
}
}
},
"18": {
"19": {
"override": {
"=title": {
"render": "Statistieken"
}
}
},
"19": {
"20": {
"override": {
"+tagRenderings": {
"0": {

4
langs/themes/pa_PK.json
View file

@ -168,14 +168,14 @@
},
"onwheels": {
"layers": {
"18": {
"19": {
"override": {
"=title": {
"render": "انکڑے"
}
}
},
"19": {
"20": {
"override": {
"+tagRenderings": {
"0": {