diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 44b7ab3c40..5e7f0dd778 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -321,6 +321,7 @@ - shops - sports_centre - tertiary_education + - vending_machine - veterinary diff --git a/Docs/Layers/all_vending_machine.md b/Docs/Layers/all_vending_machine.md index 3d7f30a6eb..323ec9fc5b 100644 --- a/Docs/Layers/all_vending_machine.md +++ b/Docs/Layers/all_vending_machine.md @@ -47,13 +47,14 @@ this quick overview is incomplete attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | -[](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets) +[](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets) [meat](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmeat) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) [](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF) [](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF) [](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | [](https://taginfo.openstreetmap.org/keys/indoor#values) [indoor](https://wiki.openstreetmap.org/wiki/Key:indoor) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno) [](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) +[](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | @@ -122,6 +123,7 @@ This is rendered with `This vending machine sells {vending}` - *Parking tickets are sold* corresponds with `vending=parking_tickets` - *Pressed pennies are sold* corresponds with `vending=elongated_coin` - *Public transport tickets are sold* corresponds with `vending=public_transport_tickets` + - *Meat products are being sold* corresponds with `vending=meat` @@ -292,6 +294,28 @@ This is rendered with `Located on the {level}th floor` +### phone + + + +The question is *What is the phone number of the operator of this vending machine?* + +This rendering asks information about the property [phone](https://wiki.openstreetmap.org/wiki/Key:phone) + +This is rendered with `{phone}` + + + + + + - *{contact:phone}* corresponds with `contact:phone~.+` + - This option cannot be chosen as answer + + +This tagrendering has labels `contact` + + + ### leftover-questions @@ -390,6 +414,10 @@ vending.13 | Sale of cheese | vending~^(.*cheese.*)$ vending.14 | Sale of honey | vending~^(.*honey.*)$ vending.15 | Sale of potatoes | vending~^(.*potatoes.*)$ vending.16 | Sale of flowers | vending~^(.*flowers.*)$ +vending.17 | Sale of parking | vending~^(.*parking_tickets.*)$ +vending.18 | Sale of pressed pennies | vending=elongated_coin +vending.19 | Sale of public transport tickets | vending~^(.*public_transport_tickets.*)$ +vending.20 | Sale of meat products | vending=meat This document is autogenerated from [assets/themes/vending_machine/vending_machine.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/vending_machine/vending_machine.json) diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md index 65a8f01ac6..dce2efb076 100644 --- a/Docs/Layers/sport_pitch.md +++ b/Docs/Layers/sport_pitch.md @@ -134,6 +134,8 @@ The question is *How much basketball hoops does this pitch have?* - This option cannot be chosen as answer +This tagrendering is only visible in the popup if the following condition is met: `sport~^((^|.*;)basketball(;.*|$))$` + ### sport_pitch-surface diff --git a/Docs/Layers/vending_machine.md b/Docs/Layers/vending_machine.md index a5bd5c9777..6034c6854a 100644 --- a/Docs/Layers/vending_machine.md +++ b/Docs/Layers/vending_machine.md @@ -47,13 +47,14 @@ this quick overview is incomplete attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | -[](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets) +[](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets) [meat](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmeat) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) [](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF) [](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF) [](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | [](https://taginfo.openstreetmap.org/keys/indoor#values) [indoor](https://wiki.openstreetmap.org/wiki/Key:indoor) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno) [](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) +[](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | @@ -122,6 +123,7 @@ This is rendered with `This vending machine sells {vending}` - *Parking tickets are sold* corresponds with `vending=parking_tickets` - *Pressed pennies are sold* corresponds with `vending=elongated_coin` - *Public transport tickets are sold* corresponds with `vending=public_transport_tickets` + - *Meat products are being sold* corresponds with `vending=meat` @@ -292,6 +294,28 @@ This is rendered with `Located on the {level}th floor` +### phone + + + +The question is *What is the phone number of the operator of this vending machine?* + +This rendering asks information about the property [phone](https://wiki.openstreetmap.org/wiki/Key:phone) + +This is rendered with `{phone}` + + + + + + - *{contact:phone}* corresponds with `contact:phone~.+` + - This option cannot be chosen as answer + + +This tagrendering has labels `contact` + + + ### leftover-questions @@ -390,6 +414,10 @@ vending.13 | Sale of cheese | vending~^(.*cheese.*)$ vending.14 | Sale of honey | vending~^(.*honey.*)$ vending.15 | Sale of potatoes | vending~^(.*potatoes.*)$ vending.16 | Sale of flowers | vending~^(.*flowers.*)$ +vending.17 | Sale of parking | vending~^(.*parking_tickets.*)$ +vending.18 | Sale of pressed pennies | vending=elongated_coin +vending.19 | Sale of public transport tickets | vending~^(.*public_transport_tickets.*)$ +vending.20 | Sale of meat products | vending=meat This document is autogenerated from [assets/layers/vending_machine/vending_machine.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/vending_machine/vending_machine.json) diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index 6c25eb3f17..06ef64b471 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -12155,22 +12155,22 @@ }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops=1 with a fixed text, namely 'This basketball pitch has a single hoop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "description": "Layer 'Sport pitches' shows hoops=1 with a fixed text, namely 'This basketball pitch has a single hoop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)", "value": "1" }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops=2 with a fixed text, namely 'This basketball pitch has two hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "description": "Layer 'Sport pitches' shows hoops=2 with a fixed text, namely 'This basketball pitch has two hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)", "value": "2" }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops=4 with a fixed text, namely 'This basketball pitch has four hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "description": "Layer 'Sport pitches' shows hoops=4 with a fixed text, namely 'This basketball pitch has four hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)", "value": "4" }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops~.+ with a fixed text, namely 'This basketball pitch has {hoops} hoops' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Sport pitches' shows hoops~.+ with a fixed text, namely 'This basketball pitch has {hoops} hoops' (in the mapcomplete.org theme 'Personal theme') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)" }, { "key": "surface", @@ -14082,6 +14082,11 @@ "description": "Layer 'Vending Machines' shows vending=public_transport_tickets with a fixed text, namely 'Public transport tickets are sold' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", "value": "public_transport_tickets" }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=meat with a fixed text, namely 'Meat products are being sold' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "meat" + }, { "key": "opening_hours", "description": "Layer 'Vending Machines' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Personal theme')" @@ -14314,6 +14319,14 @@ "description": "Layer 'Vending Machines' shows level=-1 with a fixed text, namely 'Located on the first basement level' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", "value": "-1" }, + { + "key": "phone", + "description": "Layer 'Vending Machines' shows and asks freeform values for key 'phone' (in the mapcomplete.org theme 'Personal theme')" + }, + { + "key": "contact:phone", + "description": "Layer 'Vending Machines' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + }, { "key": "amenity", "description": "The MapComplete theme Personal theme has a layer veterinary showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_sport_pitches.json b/Docs/TagInfo/mapcomplete_sport_pitches.json index c9e83a9328..8120b13612 100644 --- a/Docs/TagInfo/mapcomplete_sport_pitches.json +++ b/Docs/TagInfo/mapcomplete_sport_pitches.json @@ -76,22 +76,22 @@ }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops=1 with a fixed text, namely 'This basketball pitch has a single hoop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sport pitches')", + "description": "Layer 'Sport pitches' shows hoops=1 with a fixed text, namely 'This basketball pitch has a single hoop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sport pitches') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)", "value": "1" }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops=2 with a fixed text, namely 'This basketball pitch has two hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sport pitches')", + "description": "Layer 'Sport pitches' shows hoops=2 with a fixed text, namely 'This basketball pitch has two hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sport pitches') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)", "value": "2" }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops=4 with a fixed text, namely 'This basketball pitch has four hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sport pitches')", + "description": "Layer 'Sport pitches' shows hoops=4 with a fixed text, namely 'This basketball pitch has four hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sport pitches') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)", "value": "4" }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops~.+ with a fixed text, namely 'This basketball pitch has {hoops} hoops' (in the mapcomplete.org theme 'Sport pitches')" + "description": "Layer 'Sport pitches' shows hoops~.+ with a fixed text, namely 'This basketball pitch has {hoops} hoops' (in the mapcomplete.org theme 'Sport pitches') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)" }, { "key": "surface", diff --git a/Docs/TagInfo/mapcomplete_sports.json b/Docs/TagInfo/mapcomplete_sports.json index 0c1a817147..3f6f703cce 100644 --- a/Docs/TagInfo/mapcomplete_sports.json +++ b/Docs/TagInfo/mapcomplete_sports.json @@ -76,22 +76,22 @@ }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops=1 with a fixed text, namely 'This basketball pitch has a single hoop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')", + "description": "Layer 'Sport pitches' shows hoops=1 with a fixed text, namely 'This basketball pitch has a single hoop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)", "value": "1" }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops=2 with a fixed text, namely 'This basketball pitch has two hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')", + "description": "Layer 'Sport pitches' shows hoops=2 with a fixed text, namely 'This basketball pitch has two hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)", "value": "2" }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops=4 with a fixed text, namely 'This basketball pitch has four hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')", + "description": "Layer 'Sport pitches' shows hoops=4 with a fixed text, namely 'This basketball pitch has four hoops' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)", "value": "4" }, { "key": "hoops", - "description": "Layer 'Sport pitches' shows hoops~.+ with a fixed text, namely 'This basketball pitch has {hoops} hoops' (in the mapcomplete.org theme 'Sports')" + "description": "Layer 'Sport pitches' shows hoops~.+ with a fixed text, namely 'This basketball pitch has {hoops} hoops' (in the mapcomplete.org theme 'Sports') (This is only shown if sport~^((^|.*;)basketball(;.*|$))$)" }, { "key": "surface", diff --git a/Docs/TagInfo/mapcomplete_vending_machine.json b/Docs/TagInfo/mapcomplete_vending_machine.json index cf55db2334..98450f9883 100644 --- a/Docs/TagInfo/mapcomplete_vending_machine.json +++ b/Docs/TagInfo/mapcomplete_vending_machine.json @@ -134,6 +134,11 @@ "description": "Layer 'Vending Machines' shows vending=public_transport_tickets with a fixed text, namely 'Public transport tickets are sold' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines')", "value": "public_transport_tickets" }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=meat with a fixed text, namely 'Meat products are being sold' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines')", + "value": "meat" + }, { "key": "opening_hours", "description": "Layer 'Vending Machines' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Vending Machines')" @@ -365,6 +370,14 @@ "key": "level", "description": "Layer 'Vending Machines' shows level=-1 with a fixed text, namely 'Located on the first basement level' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines')", "value": "-1" + }, + { + "key": "phone", + "description": "Layer 'Vending Machines' shows and asks freeform values for key 'phone' (in the mapcomplete.org theme 'Vending Machines')" + }, + { + "key": "contact:phone", + "description": "Layer 'Vending Machines' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Vending Machines')" } ] } \ No newline at end of file diff --git a/src/assets/contributors.json b/src/assets/contributors.json index 7332600ae4..4ac350da49 100644 --- a/src/assets/contributors.json +++ b/src/assets/contributors.json @@ -1,7 +1,7 @@ { "contributors": [ { - "commits": 5961, + "commits": 5965, "contributor": "Pieter Vander Vennet" }, { diff --git a/src/assets/language_native.json b/src/assets/language_native.json index c7869833f1..cee5eb76b5 100644 --- a/src/assets/language_native.json +++ b/src/assets/language_native.json @@ -12,7 +12,7 @@ "gl": "lingua galega", "he": "עברית", "hu": "magyar", - "id": "bahasa Indonesia", + "id": "Indonesia", "it": "italiano", "ja": "日本語", "nb_NO": "bokmål", @@ -23,6 +23,5 @@ "ru": "русский язык", "sl": "slovenščina", "sv": "svenska", - "zh_Hans": "简体中文", - "zh_Hant": "繁體中文" + "zh_Hant": "簡體中文" } \ No newline at end of file diff --git a/src/assets/language_translations.json b/src/assets/language_translations.json index 87e2029114..f32335666b 100644 --- a/src/assets/language_translations.json +++ b/src/assets/language_translations.json @@ -146,7 +146,7 @@ "gl": "Lingua adigue", "he": "אדיגית", "hu": "adigei", - "id": "bahasa Adyghe", + "id": "Adyghe", "it": "adighè", "ja": "アディゲ語", "nb_NO": "adygeisk", @@ -603,7 +603,7 @@ "gl": "árabe", "he": "ערבית", "hu": "arab", - "id": "bahasa Arab", + "id": "Arab", "it": "arabo", "ja": "アラビア語", "nb_NO": "arabisk", @@ -929,7 +929,7 @@ "fi": "Awadhin kieli", "fr": "awadhi", "gl": "Lingua awadhi", - "he": "אוודהית", + "he": "אוודית", "id": "Bahasa Awadhi", "it": "awadhi", "ja": "アワディー語", @@ -1603,7 +1603,7 @@ "gl": "lingua bretoa", "he": "ברטונית", "hu": "breton", - "id": "Bahasa Breton", + "id": "Breton", "it": "bretone", "ja": "ブルトン語", "nb_NO": "bretonsk", @@ -1772,7 +1772,7 @@ "gl": "Lingua buriata", "he": "בוריאטית", "hu": "burját", - "id": "bahasa Buryat", + "id": "Buryat", "it": "buriato", "ja": "ブリヤート語", "nb_NO": "burjatisk", @@ -2316,7 +2316,7 @@ "gl": "Lingua tártara de Crimea", "he": "טטרית של קרים", "hu": "krími tatár", - "id": "Bahasa Tatar Krimea", + "id": "Tatar Krimea", "it": "tataro di Crimea", "ja": "クリミア・タタール語", "nb_NO": "krimtatarisk", @@ -2442,6 +2442,7 @@ "id": "Bahasa Chittagonia", "it": "lingua chittagonian", "ja": "チッタゴン語", + "nb_NO": "Chittagong", "pl": "Język chatgaya", "pt": "Língua chittagong", "pt_BR": "Língua chittagong", @@ -2532,7 +2533,7 @@ "gl": "lingua dinamarquesa", "he": "דנית", "hu": "dán", - "id": "bahasa Denmark", + "id": "Denmark", "it": "danese", "ja": "デンマーク語", "nb_NO": "dansk", @@ -2595,7 +2596,7 @@ "gl": "lingua alemá", "he": "גרמנית", "hu": "német", - "id": "bahasa Jerman", + "id": "Jerman", "it": "tedesco", "ja": "ドイツ語", "nb_NO": "tysk", @@ -2966,8 +2967,8 @@ "ru": "новогреческий язык", "sl": "novogrščina", "sv": "nygrekiska", - "zh_Hans": "希腊语", - "zh_Hant": "希臘語", + "zh_Hans": "现代希腊语", + "zh_Hant": "現代希臘語", "_meta": { "countries": [ "CY", @@ -3584,7 +3585,7 @@ "gl": "lingua feroesa", "he": "פארואזית", "hu": "feröeri", - "id": "bahasa Faroe", + "id": "Faroe", "it": "faroese", "ja": "フェロー語", "nb_NO": "færøysk", @@ -4872,7 +4873,7 @@ "gl": "lingua indonesia", "he": "אינדונזית", "hu": "indonéz", - "id": "bahasa Indonesia", + "id": "Indonesia", "it": "indonesiano", "ja": "インドネシア語", "nb_NO": "indonesisk", @@ -5019,7 +5020,7 @@ "gl": "lingua islandesa", "he": "איסלנדית", "hu": "izlandi", - "id": "bahasa Islandia", + "id": "Islandia", "it": "islandese", "ja": "アイスランド語", "nb_NO": "islandsk", @@ -5055,7 +5056,7 @@ "gl": "lingua italiana", "he": "איטלקית", "hu": "olasz", - "id": "bahasa Italia", + "id": "Italia", "it": "italiano", "ja": "イタリア語", "nb_NO": "italiensk", @@ -5127,7 +5128,7 @@ "gl": "lingua xaponesa", "he": "יפנית", "hu": "japán", - "id": "bahasa Jepang", + "id": "Jepang", "it": "giapponese", "ja": "日本語", "nb_NO": "japansk", @@ -5210,7 +5211,7 @@ "gl": "Lingua xavanesa", "he": "ג'אווה", "hu": "jávai", - "id": "bahasa Jawa", + "id": "Jawa", "it": "giavanese", "ja": "ジャワ語", "nb_NO": "javanesisk", @@ -5247,7 +5248,7 @@ "gl": "lingua xeorxiana", "he": "גאורגית", "hu": "grúz", - "id": "Bahasa Georgia", + "id": "Georgia", "it": "georgiano", "ja": "ジョージア語", "nb_NO": "georgisk", @@ -5282,7 +5283,7 @@ "gl": "Lingua karakalpak", "he": "קראקלפקית", "hu": "karakalpak", - "id": "Bahasa Karakalpak", + "id": "Karakalpak", "it": "karakalpako", "ja": "カラカルパク語", "nl": "Karakalpaks", @@ -5466,6 +5467,7 @@ "ja": "カインガング語", "nb_NO": "Kaingang", "nl": "Kaingang", + "pl": "Języki caingang", "pt": "Língua caingangue", "pt_BR": "Língua kaingáng", "ru": "Каинганг", @@ -5636,7 +5638,7 @@ "gl": "Lingua casaca", "he": "קזחית", "hu": "kazak", - "id": "bahasa Kazakh", + "id": "Kazakh", "it": "kazako", "ja": "カザフ語", "nb_NO": "kasakhisk", @@ -5673,7 +5675,7 @@ "gl": "Lingua grenlandesa", "he": "גרינלנדית", "hu": "grönlandi", - "id": "bahasa Greenland", + "id": "Greenland", "it": "groenlandese", "ja": "グリーンランド語", "nb_NO": "grønlandsk", @@ -5705,7 +5707,7 @@ "gl": "Lingua khmer", "he": "קמרית", "hu": "khmer", - "id": "bahasa Khmer", + "id": "Khmer", "it": "khmer", "ja": "クメール語", "nb_NO": "khmer", @@ -5816,6 +5818,7 @@ "pl": "język komi-permiacki", "pt": "Língua komi-permyak", "ru": "коми-пермяцкий язык", + "sl": "permjaščina", "sv": "komi-permjakiska", "zh_Hans": "彼尔姆科米语", "zh_Hant": "彼爾姆科米語", @@ -6025,32 +6028,32 @@ } }, "ku": { - "ca": "kurd del nord", - "cs": "kurmándží", - "da": "Kurmanji", - "de": "Kurmandschi", - "en": "Kurmanji", - "eo": "kurmanĝa lingvo", - "es": "kurmanji", - "eu": "Kurmanji", - "fi": "Kurmandži", - "fr": "kurmandji", + "ca": "kurd", + "cs": "kurdština", + "da": "kurdisk", + "de": "Kurdisch", + "en": "Kurdish", + "eo": "kurda lingvo", + "es": "kurdo", + "eu": "kurduera", + "fi": "kurdi", + "fr": "kurde", "gl": "lingua kurda", - "he": "כורמנג'ית", - "hu": "kurmandzsi", - "id": "Kurmanji", - "it": "kurmanji", - "ja": "クルマンジー", + "he": "כורדית", + "hu": "kurd", + "id": "Bahasa Kurdi", + "it": "curdo", + "ja": "クルド語", "nb_NO": "kurdisk", - "nl": "Kurmançi", - "pl": "język kurmandżi", - "pt": "curmânji", - "pt_BR": "Curmânji", - "ru": "курманджи", - "sl": "kurmandži", - "sv": "nordkurdiska", + "nl": "Koerdisch", + "pl": "język kurdyjski", + "pt": "língua curda", + "pt_BR": "língua curda", + "ru": "курдские языки", + "sl": "kurdščina", + "sv": "kurdiska", "zh_Hans": "库尔德语", - "zh_Hant": "北庫德語", + "zh_Hant": "庫德語", "_meta": { "countries": [ "IQ" @@ -6127,7 +6130,7 @@ "gl": "lingua komi", "he": "קומי", "hu": "komi", - "id": "Bahasa Komi", + "id": "Komi", "it": "comi", "ja": "コミ語", "nb_NO": "syrjensk", @@ -6135,6 +6138,7 @@ "pl": "język komi", "pt": "língua komi", "ru": "коми язык", + "sl": "komijščina", "sv": "komi", "_meta": { "dir": [ @@ -6217,7 +6221,7 @@ "gl": "kirguiz", "he": "קירגיזית", "hu": "kirgiz", - "id": "bahasa Kirgiz", + "id": "Kirgiz", "it": "kirghiso", "ja": "キルギス語", "nb_NO": "kirgisisk", @@ -6303,7 +6307,7 @@ "gl": "Lingua luxemburguesa", "he": "לוקסמבורגית", "hu": "luxemburgi", - "id": "bahasa Luksemburg", + "id": "Luksemburg", "it": "lussemburghese", "ja": "ルクセンブルク語", "nb_NO": "luxembourgsk", @@ -6543,7 +6547,7 @@ "gl": "Lingua lombarda", "he": "לומברד (שפה)", "hu": "lombard", - "id": "bahasa Lombard", + "id": "Lombard", "it": "lingua lombarda", "ja": "ロンバルド語", "nb_NO": "lombardisk", @@ -6603,7 +6607,7 @@ "gl": "Lingua laosiana", "he": "לאית", "hu": "lao", - "id": "bahasa Lao", + "id": "Lao", "it": "lao", "ja": "ラーオ語", "nb_NO": "laotisk", @@ -6973,7 +6977,7 @@ "gl": "Lingua malgaxe", "he": "מלגשית", "hu": "malgas", - "id": "Bahasa Malagasi", + "id": "Malagasi", "it": "malgascio", "ja": "マダガスカル語", "nb_NO": "gassisk", @@ -7159,7 +7163,7 @@ "gl": "Lingua macedonia", "he": "מקדונית", "hu": "macedón", - "id": "bahasa Makedonia", + "id": "Makedonia", "it": "macedone", "ja": "マケドニア語", "nb_NO": "makedonsk", @@ -7227,7 +7231,7 @@ "gl": "Lingua mongol", "he": "מונגולית", "hu": "mongol", - "id": "bahasa Mongol", + "id": "Mongol", "it": "mongolo", "ja": "モンゴル語", "nb_NO": "mongolsk", @@ -7468,7 +7472,7 @@ "gl": "lingua malaia", "he": "מלאית", "hu": "maláj", - "id": "bahasa Melayu", + "id": "Melayu", "it": "malese", "ja": "マレー語", "nb_NO": "malayisk", @@ -7646,7 +7650,7 @@ "gl": "birmano", "he": "בורמזית", "hu": "burmai", - "id": "bahasa Burma", + "id": "Burma", "it": "birmano", "ja": "ビルマ語", "nb_NO": "burmesisk", @@ -8108,7 +8112,7 @@ "gl": "lingua norueguesa", "he": "נורווגית", "hu": "norvég", - "id": "bahasa Norwegia", + "id": "Norwegia", "it": "norvegese", "ja": "ノルウェー語", "nb_NO": "norsk", @@ -8435,12 +8439,12 @@ "eo": "olonec-karela lingvo", "fi": "livvinkarjala", "fr": "olonetsien", - "gl": "Lingua livvi", + "gl": "lingua livvi", "it": "lingua livvi", "ja": "リッヴィ語", "nb_NO": "livvisk", "nl": "Olonetsisch", - "pl": "Dialekt ołoniecki", + "pl": "dialekt ołoniecki", "ru": "ливвиковское наречие", "sv": "livvi", "zh_Hant": "利維卡累利阿語", @@ -8545,7 +8549,7 @@ "gl": "Lingua oseta", "he": "אוסטית", "hu": "oszét", - "id": "bahasa Ossetia", + "id": "Ossetia", "it": "osseto", "ja": "オセット語", "nb_NO": "ossetisk", @@ -8621,7 +8625,7 @@ "gl": "lingua punjabi (Shahmukhi)", "he": "פנג'אבי (אלפבית שאהמוקי)", "hu": "pandzsábi (Shahmukhi)", - "id": "Bahasa Punjab (Abjad Shahmukhi)", + "id": "Punjab (Abjad Shahmukhi)", "it": "punjabi (Shahmukhī)", "ja": "パンジャーブ語 (シャームキー文字)", "nb_NO": "panjabi (Shahmukhi)", @@ -8846,6 +8850,7 @@ "pl": "Język neosalomoński", "pt": "Língua pijin", "ru": "Пиджин Соломоновых Островов", + "sl": "salomonski pidžin", "sv": "pijin", "_meta": { "dir": [ @@ -9043,7 +9048,7 @@ "gl": "lingua portuguesa", "he": "פורטוגזית", "hu": "portugál", - "id": "bahasa Portugis", + "id": "Portugis", "it": "portoghese", "ja": "ポルトガル語", "nb_NO": "portugisisk", @@ -9253,7 +9258,7 @@ "en": "Rakhine", "fr": "arakanais", "gl": "Lingua arakanesa", - "id": "bahasa Rakhine", + "id": "Rakhine", "ja": "ラカイン語", "nl": "Arakanees", "pl": "Język arakański", @@ -9501,7 +9506,7 @@ "gl": "Lingua arromanesa", "he": "ארומנית", "hu": "aromán", - "id": "Bahasa Arumania", + "id": "Arumania", "it": "arumeno", "ja": "アルーマニア語", "nb_NO": "arumensk", @@ -9896,7 +9901,7 @@ "ca": "taixelhit", "cs": "tašelhit", "de": "Taschelhit", - "en": "Shilha", + "en": "Tachelhit", "eo": "ŝelha lingvo", "es": "chilha", "fi": "Tašelhit", @@ -9996,7 +10001,7 @@ "pt": "Língua cingalesa", "pt_BR": "Língua cingalesa", "ru": "сингальский язык", - "sl": "sinhalščina", + "sl": "singalščina", "sv": "singalesiska", "zh_Hant": "僧伽羅語", "_meta": { @@ -10456,7 +10461,7 @@ "gl": "Lingua albanesa", "he": "אלבנית", "hu": "albán", - "id": "Bahasa Albania", + "id": "Albania", "it": "albanese", "ja": "アルバニア語", "nb_NO": "albansk", @@ -10699,7 +10704,7 @@ "gl": "lingua sueca", "he": "שוודית", "hu": "svéd", - "id": "bahasa Swedia", + "id": "Swedia", "it": "svedese", "ja": "スウェーデン語", "nb_NO": "svensk", @@ -10798,7 +10803,7 @@ "gl": "Lingua silesiana", "he": "שלזית", "hu": "sziléziai", - "id": "bahasa Silesia", + "id": "Silesia", "it": "slesiano", "ja": "シレジア語", "nb_NO": "schlesisk", @@ -10847,7 +10852,7 @@ "gl": "Lingua támil", "he": "טמילית", "hu": "tamil", - "id": "Bahasa Tamil", + "id": "Tamil", "it": "tamil", "ja": "タミル語", "nb_NO": "tamilsk", @@ -11034,7 +11039,7 @@ "gl": "lingua tailandesa", "he": "תאית", "hu": "thai", - "id": "bahasa Thai", + "id": "Thai", "it": "thailandese", "ja": "タイ語", "nb_NO": "thai", @@ -11104,7 +11109,7 @@ "gl": "Lingua turcomá", "he": "טורקמנית", "hu": "türkmén", - "id": "bahasa Turkmen", + "id": "Turkmen", "it": "Turkmeno", "ja": "トルクメン語", "nb_NO": "turkmensk", @@ -11632,7 +11637,7 @@ "gl": "Lingua uigur", "he": "אויגורית", "hu": "ujgur", - "id": "bahasa Uyghur", + "id": "Uighur", "it": "uiguro", "ja": "ウイグル語", "nb_NO": "uigurisk", @@ -11702,7 +11707,7 @@ "gl": "Lingua usbeka", "he": "אוזבקית", "hu": "üzbég", - "id": "bahasa Uzbek", + "id": "Uzbek", "it": "uzbeco", "ja": "ウズベク語", "nb_NO": "usbekisk", @@ -12591,7 +12596,7 @@ "gl": "lingua chinesa", "he": "סינית", "hu": "kínai", - "id": "bahasa Tionghoa", + "id": "Tionghoa", "it": "cinese", "ja": "中国語", "nb_NO": "kinesisk", @@ -12647,7 +12652,7 @@ ] } }, - "zh_Hans": { + "zh_Hant": { "ca": "xinès simplificat", "cs": "zjednodušená čínština", "da": "forenklet kinesisk", @@ -12656,6 +12661,7 @@ "eo": "simpligita ĉina skribsistemo", "es": "chino simplificado", "eu": "Txinera sinplifikatua", + "fi": "perinteinen kiina", "fr": "chinois simplifié", "gl": "chinés simplificado", "he": "סינית מפושטת", @@ -12678,36 +12684,6 @@ ] } }, - "zh_Hant": { - "ca": "xinès tradicional", - "cs": "čínština (tradiční)", - "da": "traditionel kinesisk", - "de": "traditionelles Chinesisch", - "en": "Traditional Chinese", - "eo": "ĉina lingvo de tradicia ortografio", - "es": "chino tradicional", - "eu": "Txinera tradizional", - "fi": "perinteinen kiina", - "fr": "chinois traditionnel", - "gl": "chinés tradicional", - "he": "סינית מסורתית", - "it": "cinese tradizionale", - "ja": "繁体字中国語", - "nb_NO": "tradisjonell kinesisk", - "nl": "traditioneel Chinees", - "pl": "język chiński tradycyjny", - "pt": "chinês tradicional", - "ru": "традиционный китайский", - "sl": "tradicionalna kitajščina", - "sv": "traditionell kinesiska", - "zh_Hans": "繁体中文", - "zh_Hant": "繁體中文", - "_meta": { - "dir": [ - "left-to-right" - ] - } - }, "zu": { "ca": "zulu", "cs": "zuluština", diff --git a/src/assets/translators.json b/src/assets/translators.json index ba4b58214e..8287906ac2 100644 --- a/src/assets/translators.json +++ b/src/assets/translators.json @@ -1,7 +1,7 @@ { "contributors": [ { - "commits": 300, + "commits": 303, "contributor": "kjon" }, { @@ -9,7 +9,7 @@ "contributor": "Pieter Vander Vennet" }, { - "commits": 160, + "commits": 163, "contributor": "paunofu" }, { @@ -34,11 +34,11 @@ }, { "commits": 32, - "contributor": "Babos Gábor" + "contributor": "Lucas" }, { - "commits": 31, - "contributor": "Lucas" + "commits": 32, + "contributor": "Babos Gábor" }, { "commits": 31,