Merge remote-tracking branch 'upstream/pull/1960'

[rails.git] / config / wiki_pages.yml

diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml
index bc8719bcf6bfddc554d7df7b7bd7ba1f4dfd1289..ccf8744af04a38547217313016349112627f28aa 100644 (file)
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -2630,6 +2630,7 @@ de:
     segregated: DE:Key:segregated
     self_service: DE:Key:self service
     service: DE:Key:service
+    service:bicycle:repair: DE:Key:service:bicycle:repair
     service_times: DE:Key:service times
     shelter: DE:Key:shelter
     shelter_type: DE:Key:shelter type
@@ -2834,6 +2835,7 @@ de:
     amenity=prison: DE:Tag:amenity=prison
     amenity=prison_camp: DE:Tag:amenity=prison camp
     amenity=pub: DE:Tag:amenity=pub
+    amenity=public_bath: DE:Tag:amenity=public bath
     amenity=public_bookcase: DE:Tag:amenity=public bookcase
     amenity=ranger_station: DE:Tag:amenity=ranger station
     amenity=recycling: DE:Tag:amenity=recycling
@@ -3822,6 +3824,7 @@ de:
     tunnel=culvert: DE:Tag:tunnel=culvert
     vending=animal_feed: DE:Tag:vending=animal feed
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
+    vending=bottle_return: DE:Tag:vending=bottle return
     vending=bread: DE:Tag:vending=bread
     vending=candles: DE:Tag:vending=candles
     vending=chewing_gums: DE:Tag:vending=chewing gums
@@ -4162,6 +4165,7 @@ en:
     centre_turn_lane: Key:centre turn lane
     cep: Key:cep
     change: Key:change
+    changesets_count: Key:changesets count
     charge: Key:charge
     charity: Key:charity
     check_date: Key:check date
@@ -4564,6 +4568,7 @@ en:
     inscription: Key:inscription
     inscription:url: Key:inscription:url
     int_name: Key:int name
+    int_name:ar: Key:int name:ar
     int_ref: Key:int ref
     int_ref:ar: Key:int ref:ar
     intermittent: Key:intermittent
@@ -4654,8 +4659,10 @@ en:
     living_street: Key:living street
     loading_gauge: Key:loading gauge
     loc_name: Key:loc name
+    loc_name:ar: Key:loc name:ar
     loc_ref: Key:loc ref
     local_ref: Key:local ref
+    locale: Key:locale
     location: Key:location
     lock: Key:lock
     lock_name: Key:lock name
@@ -4757,6 +4764,7 @@ en:
     mtb_scale: Key:mtb scale
     museum: Key:museum
     museum_type: Key:museum type
+    musical_instrument: Key:musical instrument
     name: Key:name
     name:ar: Key:name:ar
     name:be: Key:name:be
@@ -4796,6 +4804,7 @@ en:
     name:ko_rm: Key:name:ko rm
     name:ku: Key:name:ku
     name:left: Key:name:left
+    name:left:ar: Key:name:left:ar
     name:left:fr: Key:name:left:fr
     name:lg: Key:name:lg
     name:mg: Key:name:mg
@@ -4812,6 +4821,7 @@ en:
     name:pronunciation: Key:name:pronunciation
     name:pt: Key:name:pt
     name:right: Key:name:right
+    name:right:ar: Key:name:right:ar
     name:ru: Key:name:ru
     name:ru:word_stress: Key:name:ru:word stress
     name:sc: Key:name:sc
@@ -4831,6 +4841,7 @@ en:
     name_1: Key:name 1
     narrow: Key:narrow
     nat_name: Key:nat name
+    nat_name:ar: Key:nat name:ar
     nat_ref: Key:nat ref
     natural: Key:natural
     naturbase: Key:naturbase
@@ -4876,6 +4887,7 @@ en:
     official_ref: Key:official ref
     offshore: Key:offshore
     ois:fixme: Key:ois:fixme
+    old_name: Key:old name
     old_name:ar: Key:old name:ar
     old_name:etymology:wikidata: Key:old name:etymology:wikidata
     old_railway_operator: Key:old railway operator
@@ -5136,6 +5148,7 @@ en:
     reference: Key:reference
     reference_point: Key:reference point
     reg_name: Key:reg name
+    reg_name:ar: Key:reg name:ar
     reg_ref: Key:reg ref
     regelbau: Key:regelbau
     religion: Key:religion
@@ -5313,6 +5326,7 @@ en:
     social_facility:for: Key:social facility:for
     socket: Key:socket
     sorting_name: Key:sorting name
+    sorting_name:ar: Key:sorting name:ar
     source: Key:source
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
@@ -5478,6 +5492,7 @@ en:
     url: Key:url
     url:restrictions: Key:url:restrictions
     usage: Key:usage
+    user_defined_other: Key:user defined other
     utahagrc:parcelid: Key:utahagrc:parcelid
     validate:no_name: Key:validate:no name
     validate:no_ref: Key:validate:no ref
@@ -5793,6 +5808,7 @@ en:
     amenity=shelter: Tag:amenity=shelter
     amenity=shop: Tag:amenity=shop
     amenity=shower: Tag:amenity=shower
+    amenity=ski_rental: Tag:amenity=ski rental
     amenity=ski_school: Tag:amenity=ski school
     amenity=smoking_area: Tag:amenity=smoking area
     amenity=social_centre: Tag:amenity=social centre
@@ -5814,6 +5830,7 @@ en:
     amenity=theatre: Tag:amenity=theatre
     amenity=ticket_booth: Tag:amenity=ticket booth
     amenity=ticket_validator: Tag:amenity=ticket validator
+    amenity=toilet: Tag:amenity=toilet
     amenity=toilets: Tag:amenity=toilets
     amenity=townhall: Tag:amenity=townhall
     amenity=trolley_bay: Tag:amenity=trolley bay
@@ -6097,6 +6114,7 @@ en:
     craft=key_cutter: Tag:craft=key cutter
     craft=locksmith: Tag:craft=locksmith
     craft=metal_construction: Tag:craft=metal construction
+    craft=musical_instrument: Tag:craft=musical instrument
     craft=oil_mill: Tag:craft=oil mill
     craft=optician: Tag:craft=optician
     craft=organ_builder: Tag:craft=organ builder
@@ -6845,6 +6863,7 @@ en:
     name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
       Christ of Latter-day Saints
     name=Walmart: Tag:name=Walmart
+    name=Продукты: Tag:name=Продукты
     natural=anthill: Tag:natural=anthill
     natural=arete: Tag:natural=arete
     natural=avalanche_dam: Tag:natural=avalanche dam
@@ -7162,6 +7181,7 @@ en:
     operator=independent: Tag:operator=independent
     operator=stadtmobil: Tag:operator=stadtmobil
     operator=teilAuto: Tag:operator=teilAuto
+    organ: Tag:organ
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
     parking=surface: Tag:parking=surface
     passenger=international: Tag:passenger=international
@@ -7178,6 +7198,7 @@ en:
     pipeline=marker: Tag:pipeline=marker
     pipeline=substation: Tag:pipeline=substation
     pipeline=valve: Tag:pipeline=valve
+    piste:type=connection: Tag:piste:type=connection
     piste:type=downhill: Tag:piste:type=downhill
     piste:type=nordic: Tag:piste:type=nordic
     place=allotments: Tag:place=allotments
@@ -7861,6 +7882,7 @@ en:
     shop=photography: Tag:shop=photography
     shop=piercing: Tag:shop=piercing
     shop=pottery: Tag:shop=pottery
+    shop=printer_ink: Tag:shop=printer ink
     shop=printing: Tag:shop=printing
     shop=pyrotechnics: Tag:shop=pyrotechnics
     shop=pépinière: Tag:shop=pépinière
@@ -7969,6 +7991,7 @@ en:
     source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
     source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
     source:maxspeed=implicit: Tag:source:maxspeed=implicit
+    source:name=LPI_NSW_Base_Map: Tag:source:name=LPI NSW Base Map
     source:name=NSW_LPI_Base_Map: Tag:source:name=NSW LPI Base Map
     source=ACT2016: Tag:source=ACT2016
     source=ACTMapiRoads: Tag:source=ACTMapiRoads
@@ -7981,6 +8004,7 @@ en:
       1:25000 map (2007)
     source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
       aerial imagery (2001)
+    source=LPI_NSW_Base_Map: Tag:source=LPI NSW Base Map
     source=LPI_NSW_Imagery: Tag:source=LPI NSW Imagery
     source=NAIP: Tag:source=NAIP
     source=NSW_LPI_Base_Map: Tag:source=NSW LPI Base Map
@@ -8068,6 +8092,7 @@ en:
     sport=paragliding: Tag:sport=paragliding
     sport=pelota: Tag:sport=pelota
     sport=racquet: Tag:sport=racquet
+    sport=rc_car: Tag:sport=rc car
     sport=roller_skating: Tag:sport=roller skating
     sport=rowing: Tag:sport=rowing
     sport=rugby: Tag:sport=rugby
@@ -8413,6 +8438,7 @@ es:
     leaf_type: ES:Key:leaf type
     leisure: ES:Key:leisure
     local_ref: ES:Key:local ref
+    locale: ES:Key:locale
     man_made: ES:Key:man made
     manufacturer: ES:Key:manufacturer
     mapillary: ES:Key:mapillary
@@ -8437,6 +8463,7 @@ es:
     operator:type: ES:Key:operator:type
     organic: ES:Key:organic
     origin: ES:Key:origin
+    osmc:symbol: ES:Key:osmc:symbol
     overtaking: ES:Key:overtaking
     owner: ES:Key:owner
     parking: ES:Key:parking
@@ -8541,6 +8568,7 @@ es:
     amenity=crematorium: ES:Tag:amenity=crematorium
     amenity=crypt: ES:Tag:amenity=crypt
     amenity=dentist: ES:Tag:amenity=dentist
+    amenity=device_charging_station: ES:Tag:amenity=device charging station
     amenity=doctors: ES:Tag:amenity=doctors
     amenity=drinking_water: ES:Tag:amenity=drinking water
     amenity=driving_school: ES:Tag:amenity=driving school
@@ -8746,6 +8774,7 @@ es:
     landuse=construction: ES:Tag:landuse=construction
     landuse=depot: ES:Tag:landuse=depot
     landuse=farmland: ES:Tag:landuse=farmland
+    landuse=farmyard: ES:Tag:landuse=farmyard
     landuse=forest: ES:Tag:landuse=forest
     landuse=garages: ES:Tag:landuse=garages
     landuse=grass: ES:Tag:landuse=grass
@@ -8883,6 +8912,7 @@ es:
     place=hamlet: ES:Tag:place=hamlet
     place=island: ES:Tag:place=island
     place=islet: ES:Tag:place=islet
+    place=isolated_dwelling: ES:Tag:place=isolated dwelling
     place=neighbourhood: ES:Tag:place=neighbourhood
     place=plot: ES:Tag:place=plot
     place=square: ES:Tag:place=square
@@ -9028,6 +9058,7 @@ et:
 fa:
   key:
     highway: Fa:Key:highway
+    level: Fa:Key:level
     name: FA:Key:name
   tag:
     amenity=fountain: Fa:Tag:amenity=fountain
@@ -9174,6 +9205,7 @@ fr:
     capacity:disabled: FR:Key:capacity:disabled
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
+    club: FR:Key:club
     collection_times: FR:Key:collection times
     color: FR:Key:color
     colour: FR:Key:colour
@@ -9466,6 +9498,7 @@ fr:
     amenity=dentist: FR:Tag:amenity=dentist
     amenity=doctors: FR:Tag:amenity=doctors
     amenity=drinking_water: FR:Tag:amenity=drinking water
+    amenity=driving_school: FR:Tag:amenity=driving school
     amenity=embassy: FR:Tag:amenity=embassy
     amenity=fast_food: FR:Tag:amenity=fast food
     amenity=fire_station: FR:Tag:amenity=fire station
@@ -9546,6 +9579,7 @@ fr:
     building=sty: FR:Tag:building=sty
     building=terrace: FR:Tag:building=terrace
     building=warehouse: FR:Tag:building=warehouse
+    club=sport: FR:Tag:club=sport
     construction=yes: FR:Tag:construction=yes
     craft=beekeeper: FR:Tag:craft=beekeeper
     craft=brewery: FR:Tag:craft=brewery
@@ -9673,6 +9707,7 @@ fr:
     leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous
     leisure=dog_park: FR:Tag:leisure=dog park
     leisure=fishing: FR:Tag:leisure=fishing
+    leisure=fitness_centre: FR:Tag:leisure=fitness centre
     leisure=garden: FR:Tag:leisure=garden
     leisure=golf_course: FR:Tag:leisure=golf course
     leisure=hackerspace: FR:Tag:leisure=hackerspace
@@ -9811,6 +9846,7 @@ fr:
     shop=boutique: FR:Tag:shop=boutique
     shop=butcher: FR:Tag:shop=butcher
     shop=car: FR:Tag:shop=car
+    shop=car_parts: FR:Tag:shop=car parts
     shop=car_repair: FR:Tag:shop=car repair
     shop=carpet: FR:Tag:shop=carpet
     shop=charity: FR:Tag:shop=charity
@@ -10404,6 +10440,7 @@ ja:
     distance: JA:Key:distance
     disused: JA:Key:disused
     'disused:': 'JA:Key:disused:'
+    dog: JA:Key:dog
     donation:compensation: JA:Key:donation:compensation
     drink: JA:Key:drink
     drinking_water: JA:Key:drinking water
@@ -10425,6 +10462,7 @@ ja:
     exit_to: JA:Key:exit to
     expressway: JA:Key:expressway
     facebook: JA:Key:facebook
+    fair_trade: JA:Key:fair trade
     fax: JA:Key:fax
     fee: JA:Key:fee
     fence_type: JA:Key:fence type
@@ -10612,6 +10650,7 @@ ja:
     old_ref: JA:Key:old ref
     oneway: JA:Key:oneway
     oneway:bicycle: JA:Key:oneway:bicycle
+    openfire: JA:Key:openfire
     opening_date: JA:Key:opening date
     opening_hours: JA:Key:opening hours
     operator: JA:Key:operator
@@ -10689,6 +10728,7 @@ ja:
     seamark:type: JA:Key:seamark:type
     second_hand: JA:Key:second hand
     segregated: JA:Key:segregated
+    self_service: JA:Key:self service
     service: JA:Key:service
     service_times: JA:Key:service times
     shelter: JA:Key:shelter
@@ -10719,6 +10759,7 @@ ja:
     source:ref: JA:Key:source:ref
     source_ref: JA:Key:source ref
     species: JA:Key:species
+    speech_output: JA:Key:speech output
     sport: JA:Key:sport
     stars: JA:Key:stars
     start_date: JA:Key:start date
@@ -12351,6 +12392,7 @@ pl:
     amenity=drinking_water: Pl:Tag:amenity=drinking water
     amenity=driving_school: Pl:Tag:amenity=driving school
     amenity=events_venue: Pl:Tag:amenity=events venue
+    amenity=fast_food: Pl:Tag:amenity=fast food
     amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal
     amenity=fire_station: Pl:Tag:amenity=fire station
     amenity=food_court: Pl:Tag:amenity=food court
@@ -12866,6 +12908,7 @@ pl:
     traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
     tunnel=culvert: Pl:Tag:tunnel=culvert
     type=public_transport: Pl:Tag:type=public transport
+    vending=bottle_return: Pl:Tag:vending=bottle return
     vending=candles: Pl:Tag:vending=candles
     wall=noise_barrier: Pl:Tag:wall=noise barrier
     water=lake: Pl:Tag:water=lake
@@ -13061,6 +13104,7 @@ pt:
     voltage: Pt:Key:voltage
     water: Pt:Key:water
     waterway: Pt:Key:waterway
+    wetland: Pt:Key:wetland
     wheelchair: Pt:Key:wheelchair
     wikidata: Pt:Key:wikidata
     wikipedia: Pt:Key:wikipedia
@@ -15079,6 +15123,7 @@ ru:
     military=airfield: RU:Tag:military=airfield
     military=bunker: RU:Tag:military=bunker
     military=naval_base: RU:Tag:military=naval base
+    name=Продукты: RU:Tag:name=Продукты
     natural=arete: RU:Tag:natural=arete
     natural=bare_rock: RU:Tag:natural=bare rock
     natural=beach: RU:Tag:natural=beach