]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2782'
authorTom Hughes <tom@compton.nu>
Wed, 19 Aug 2020 16:31:56 +0000 (17:31 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 19 Aug 2020 16:31:56 +0000 (17:31 +0100)
1  2 
config/locales/en.yml

diff --combined config/locales/en.yml
index f416f3259dd4e4a54feb299a171c288b2499eff7,d5801da40a0a7bc30f2802fa42bdc512fb62bf77..e142a6d4d4240c5ac73dd4e6c61cfec8d407a571
@@@ -20,7 -20,7 +20,7 @@@ en
          create: Send
        client_application:
          create: Register
-         update: Edit
+         update: Update
        redaction:
          create: Create redaction
          update: Save redaction
      # Translates all the model attributes, which is used in error handling on the web site
      # Only the ones that are used on the web site are translated at the moment
      attributes:
+       client_application:
+         name: Name (Required)
+         url: Main Application URL (Required)
+         callback_url: Callback URL
+         support_url: Support URL
+         allow_read_prefs:  read their user preferences
+         allow_write_prefs: modify their user preferences
+         allow_write_diary: create diary entries, comments and make friends
+         allow_write_api:   modify the map
+         allow_read_gpx:    read their private GPS traces
+         allow_write_gpx:   upload GPS traces
+         allow_write_notes: modify notes
        diary_comment:
          body: "Body"
        diary_entry:
          title: "Subject"
          body: "Body"
          recipient: "Recipient"
+       report:
+         category: Select a reason for your report
+         details: Please provide some more details about the problem (required).
        user:
          email: "Email"
          active: "Active"
            chair_lift: "Chair Lift"
            drag_lift: "Drag Lift"
            gondola: "Gondola Lift"
 +          magic_carpet: "Magic Carpet Lift"
            platter: "Platter Lift"
            pylon: "Pylon"
            station: "Aerialway Station"
            t-bar: "T-Bar Lift"
 +          "yes": "Aerialway"
          aeroway:
            aerodrome: "Aerodrome"
            airstrip: "Airstrip"
            hangar: "Hangar"
            helipad: "Helipad"
            holding_position: "Holding Position"
 +          navigationaid: "Aviation Navigation aid"
            parking_position: "Parking Position"
            runway: "Runway"
 +          taxilane: "Taxilane"
            taxiway: "Taxiway"
            terminal: "Terminal"
 +          windsock: "Windsock"
          amenity:
 +          animal_boarding: "Animal Boarding"
            animal_shelter: "Animal Shelter"
            arts_centre: "Arts Centre"
            atm: "ATM"
            bench: "Bench"
            bicycle_parking: "Cycle Parking"
            bicycle_rental: "Cycle Rental"
 +          bicycle_repair_station: "Bicycle Repair Station"
            biergarten: "Beer Garden"
 +          blood_bank: "Blood Bank"
            boat_rental: "Boat Rental"
            brothel: "Brothel"
            bureau_de_change: "Bureau de Change"
            clock: "Clock"
            college: "College"
            community_centre: "Community Centre"
 +          conference_centre: "Conference Centre"
            courthouse: "Courthouse"
            crematorium: "Crematorium"
            dentist: "Dentist"
            drinking_water: "Drinking Water"
            driving_school: "Driving School"
            embassy: "Embassy"
 +          events_venue: "Events Venue"
            fast_food: "Fast Food"
            ferry_terminal: "Ferry Terminal"
            fire_station: "Fire Station"
            hospital: "Hospital"
            hunting_stand: "Hunting Stand"
            ice_cream: "Ice Cream"
 +          internet_cafe: "Internet Cafe"
            kindergarten: "Kindergarten"
 +          language_school: "Language school"
            library: "Library"
 +          loading_dock: "Loading Dock"
 +          love_hotel: "Love Hotel"
            marketplace: "Marketplace"
 +          mobile_money_agent: "Mobile Money Agent"
            monastery: "Monastery"
 +          money_transfer: "Money Transfer"
            motorcycle_parking: "Motorcycle Parking"
 +          music_school: "Music School"
            nightclub: "Night Club"
            nursing_home: "Nursing Home"
 -          office: "Office"
            parking: "Parking"
            parking_entrance: "Parking Entrance"
            parking_space: "Parking Space"
 +          payment_terminal: "Payment Terminal"
            pharmacy: "Pharmacy"
            place_of_worship: "Place of Worship"
            police: "Police"
            post_box: "Post Box"
            post_office: "Post Office"
 -          preschool: "Pre-School"
            prison: "Prison"
            pub: "Pub"
 +          public_bath: "Public Bath"
 +          public_bookcase: "Public Bookcase"
            public_building: "Public Building"
 +          ranger_station: "Ranger Station"
            recycling: "Recycling Point"
            restaurant: "Restaurant"
 -          retirement_home: "Retirement Home"
 -          sauna: "Sauna"
 +          sanitary_dump_station: "Sanitary Dump Station"
            school: "School"
            shelter: "Shelter"
 -          shop: "Shop"
            shower: "Shower"
            social_centre: "Social Centre"
 -          social_club: "Social Club"
            social_facility: "Social Facility"
            studio: "Studio"
            swimming_pool: "Swimming Pool"
            theatre: "Theatre"
            toilets: "Toilets"
            townhall: "Town Hall"
 +          training: "Training Facility"
            university: "University"
 +          vehicle_inspection: "Vehicle Inspection"
            vending_machine: "Vending Machine"
            veterinary: "Veterinary Surgery"
            village_hall: "Village Hall"
            waste_basket: "Waste Basket"
            waste_disposal: "Waste Disposal"
 +          waste_dump_site: "Waste Dump Site"
 +          watering_place: "Watering Place"
            water_point: "Water Point"
 -          youth_centre: "Youth Centre"
 +          weighbridge: "Weighbridge"
 +          "yes": "Amenity"
          boundary:
 +          aboriginal_lands: "Aboriginal Lands"
            administrative: "Administrative Boundary"
            census: "Census Boundary"
            national_park: "National Park"
 +          political: "Electoral Boundary"
            protected_area : "Protected Area"
 +          "yes": "Boundary"
          bridge:
            aqueduct: "Aqueduct"
            boardwalk: "Boardwalk"
            viaduct: "Viaduct"
            "yes": "Bridge"
          building:
 +          apartment: "Apartment"
 +          apartments: "Apartments"
 +          barn: "Barn"
 +          bungalow: "Bungalow"
 +          cabin: "Cabin"
 +          chapel: "Chapel"
 +          church: "Church Building"
 +          civic: "Civic Building"
 +          college: "College Building"
 +          commercial: "Commercial Building"
 +          construction: "Building under Construction"
 +          detached: "Detached House"
 +          dormitory: "Dormitory"
 +          duplex: "Duplex House"
 +          farm: "Farm House"
 +          farm_auxiliary: "Auxiliary Farm House"
 +          garage: "Garage"
 +          garages: "Garages"
 +          greenhouse: "Greenhouse"
 +          hangar: "Hangar"
 +          hospital: "Hospital Building"
 +          hotel: "Hotel Building"
 +          house: "House"
 +          houseboat: "Houseboat"
 +          hut: "Hut"
 +          industrial: "Industrial Building"
 +          kindergarten: "Kindergarden Building"
 +          manufacture: "Manufacturing Building"
 +          office: "Office Building"
 +          public: "Public Building"
 +          residential: "Residential Building"
 +          retail: "Retail Building"
 +          roof: "Roof"
 +          ruins: "Ruined Building"
 +          school: "School Building"
 +          semidetached_house: "Semidetached House"
 +          service: "Service Building"
 +          shed: "Shed"
 +          stable: "Stable"
 +          static_caravan: "Caravan"
 +          temple: "Temple Building"
 +          terrace: "Terrace Building"
 +          train_station: "Train Station Building"
 +          university: "University Building"
 +          warehouse: "Warehouse"
            "yes": "Building"
 +        club:
 +          scout: "Scout Group Base"
 +          sport: "Sportsclub"
 +          "yes": "Club"
          craft:
 +          beekeper: "Beekeeper"
 +          blacksmith: "Blacksmith"
            brewery: "Brewery"
            carpenter: "Carpenter"
 +          caterer: "Caterer"
 +          confectionery: "Confectionary"
 +          dressmaker: "Dressmaker"
            electrician: "Electrician"
 +          electronics_repair: "Electronics Repair"
            gardener: "Gardener"
 +          glaziery: "Glaziery"
 +          handicraft: "Handicraft"
 +          hvac: "HVAC Craft"
 +          metal_construction: "Metal Constructioner"
            painter: "Painter"
            photographer: "Photographer"
            plumber: "Plumber"
 +          roofer: "Roofer"
 +          sawmill: "Sawmill"
            shoemaker: "Shoemaker"
 +          stonemason: "Stonemason"
            tailor: "Tailor"
 +          window_construction: "Window Construction"
 +          winery: "Winery"
            "yes": "Craft Shop"
          emergency:
 +          access_point: "Access Point"
            ambulance_station: "Ambulance Station"
            assembly_point: "Assembly Point"
            defibrillator: "Defibrillator"
 +          fire_xtinguisher: "Fire Extinguisher"
 +          fire_water_pond: "Fire Water Pond"
            landing_site: "Emergency Landing Site"
 +          life_ring: "Emergency Life Ring"
            phone: "Emergency Phone"
 +          siren: "Emergency Siren"
 +          suction_point: "Emergency Suction Point"
            water_tank: "Emergency Water Tank"
            "yes": "Emergency"
          highway:
            cycleway: "Cycle Path"
            elevator: "Elevator"
            emergency_access_point: "Emergency Access Point"
 +          emergency_bay: "Emergency Bay"
            footway: "Footpath"
            ford: "Ford"
            give_way: "Give Way Sign"
            tertiary: "Tertiary Road"
            tertiary_link: "Tertiary Road"
            track: "Track"
 +          traffic_mirror: "Traffic Mirror"
            traffic_signals: "Traffic Signals"
 -          trail: "Trail"
 +          trailhead: "Trailhead"
            trunk: "Trunk Road"
            trunk_link: "Trunk Road"
            turning_loop: "Turning Loop"
            unclassified: "Unclassified Road"
            "yes" : "Road"
          historic:
 +          aircraft: "Historic Aircraft"
            archaeological_site: "Archaeological Site"
 +          bomb_crater: "Historic Bomb Crater"
            battlefield: "Battlefield"
            boundary_stone: "Boundary Stone"
            building: "Historic Building"
            bunker: "Bunker"
 +          cannon: "Historic Cannon"
            castle: "Castle"
 +          charcoal_pile: "Historic Charcoal Pile"
            church: "Church"
            city_gate: "City Gate"
            citywalls: "City Walls"
            fort: "Fort"
            heritage: "Heritage Site"
 +          hollow_way: "Hollow Way"
            house: "House"
 -          icon: "Icon"
            manor: "Manor"
            memorial: "Memorial"
 +          milestone: "Historic Milestone"
            mine: "Mine"
            mine_shaft: "Mine Shaft"
            monument: "Monument"
 +          railway: "Historic Railway"
            roman_road: "Roman Road"
            ruins: "Ruins"
            stone: "Stone"
            tomb: "Tomb"
            tower: "Tower"
 +          wayside_chapel: "Wayside Chapel"
            wayside_cross: "Wayside Cross"
            wayside_shrine: "Wayside Shrine"
            wreck: "Wreck"
            "yes": "Junction"
          landuse:
            allotments: "Allotments"
 +          aquaculture: "Aquaculture"
            basin: "Basin"
            brownfield: "Brownfield Land"
            cemetery: "Cemetery"
            military: "Military Area"
            mine: "Mine"
            orchard: "Orchard"
 +          plant_nursery: "Plant Nursery"
            quarry: "Quarry"
            railway: "Railway"
            recreation_ground: "Recreation Ground"
 +          religious: "Religious Ground"
            reservoir: "Reservoir"
            reservoir_watershed: "Reservoir Watershed"
            residential: "Residential Area"
            retail: "Retail"
 -          road: "Road Area"
            village_green: "Village Green"
            vineyard: "Vineyard"
            "yes": "Landuse"
          leisure:
 +          adult_gaming_centre: "Adult Gaming Centre"
 +          amusement_arcade: "Amusement Arcade"
 +          bandstand: "Bandstand"
            beach_resort: "Beach Resort"
            bird_hide: "Bird Hide"
 +          bleachers: "Bleachers"
 +          bowling_alley: "Bowling Alley"
            common: "Common Land"
 +          dance: "Dance Hall"
            dog_park: "Dog Park"
            firepit: "Fire Pit"
            fishing: "Fishing Area"
            marina: "Marina"
            miniature_golf: "Miniature Golf"
            nature_reserve: "Nature Reserve"
 +          outdoor_seating: "Outdoor Seating"
            park: "Park"
 +          picnic_table: "Picnic Table"
            pitch: "Sports Pitch"
            playground: "Playground"
            recreation_ground: "Recreation Ground"
            "yes": "Leisure"
          man_made:
            adit: "Adit"
 +          advertising: "Advertising"
 +          antenna:  "Antenna"
 +          avalanche_protection: "Avalanche Protection"
            beacon: "Beacon"
 +          beam: "Beam"
            beehive: "Bee Hive"
            breakwater: "Breakwater"
            bridge: "Bridge"
            bunker_silo: "Bunker"
 +          cairn: "Cairn"
            chimney: "Chimney"
 +          clearcut: "Clearcut"
 +          communications_tower: "Communications Tower"
            crane: "Crane"
 +          cross: "Cross"
            dolphin: "Mooring Post"
            dyke: "Dyke"
            embankment: "Embankment"
            groyne: "Groyne"
            kiln: "Kiln"
            lighthouse: "Lighthouse"
 +          manhole: "Manhole"
            mast: "Mast"
            mine: "Mine"
            mineshaft: "Mine Shaft"
            petroleum_well: "Petroleum Well"
            pier: "Pier"
            pipeline: "Pipeline"
 +          pumping_station: "Pumping Station"
 +          reservoir_covered: "Covered Reservoir"
            silo: "Silo"
 +          snow_cannon: "Snow Cannon"
 +          snow_fence: "Snow Fence"
            storage_tank: "Storage Tank"
 +          street_cabinet: "Street Cabinet"
            surveillance: "Surveillance"
 +          telescope: "Telescope"
            tower: "Tower"
 +          utility_pole: "Utility Pole"
            wastewater_plant: "Wastewater Plant"
            watermill: "Water Mill"
 +          water_tap: "Water Tap"
            water_tower: "Water Tower"
            water_well: "Well"
            water_works: "Water Works"
            airfield: "Military Airfield"
            barracks: "Barracks"
            bunker: "Bunker"
 +          checkpoint: "Checkpoint"
 +          trench: "Trench"
            "yes": "Military"
          mountain_pass:
            "yes" : "Mountain Pass"
          natural:
 +          bare_rock: "Bare Rock"
            bay: "Bay"
            beach: "Beach"
            cape: "Cape"
            grassland: "Grassland"
            heath: "Heath"
            hill: "Hill"
 +          hot_spring: "Hot Spring"
            island: "Island"
            land: "Land"
            marsh: "Marsh"
            water: "Water"
            wetland: "Wetland"
            wood: "Wood"
 +          "yes": "Natural Feature"
          office:
            accountant: "Accountant"
            administrative: "Administration"
 +          advertising_agency: "Advertising Agency"
            architect: "Architect"
            association: "Association"
            company: "Company"
 +          diplomatic: "Diplomatic Office"
            educational_institution: "Educational Institution"
            employment_agency: "Employment Agency"
 +          energy_supplier: "Energy Supplier Office"
            estate_agent: "Estate Agent"
 +          financial: "Financial Office"
            government: "Governmental Office"
            insurance: "Insurance Office"
            it: "IT Office"
            lawyer: "Lawyer"
 +          logistics: "Logistics Office"
 +          newspaper: "Newspaper Office"
            ngo: "NGO Office"
 +          notary: "Notary"
 +          religion: "Religious Office"
 +          research: "Research Office"
 +          tax_advisor: "Tax Advisor"
            telecommunication: "Telecommunication Office"
            travel_agent: "Travel Agency"
            "yes": "Office"
            locality: "Locality"
            municipality: "Municipality"
            neighbourhood: "Neighbourhood"
 +          plot: "Plot"
            postcode: "Postcode"
            quarter: "Quarter"
            region: "Region"
            subdivision: "Subdivision"
            suburb: "Suburb"
            town: "Town"
 -          unincorporated_area: "Unincorporated Area"
            village: "Village"
            "yes": "Place"
          railway:
            switch: "Railway Points"
            tram: "Tramway"
            tram_stop: "Tram Stop"
 +          yard: "Railway Yard"
          shop:
 +          agrarian: "Agrarian Shop"
            alcohol: "Off License"
            antiques: "Antiques"
 +          appliance: "Appliances Shop"
            art: "Art Shop"
 +          baby_goods: "Baby Goods"
 +          bag: "Bag Shop"
            bakery: "Bakery"
 +          bathroom_furnishing: "Bathroom Furnishing"
            beauty: "Beauty Shop"
 +          bed: "Bedding Products"
            beverages: "Beverages Shop"
            bicycle: "Bicycle Shop"
            bookmaker: "Bookmaker"
            car_repair: "Car Repair"
            carpet: "Carpet Shop"
            charity: "Charity Shop"
 +          cheese: "Cheese Shop"
            chemist: "Chemist"
 +          chocolate: "Chocolate"
            clothes: "Clothes Shop"
 +          coffee: "Coffee Shop"
            computer: "Computer Shop"
            confectionery: "Confectionery Shop"
            convenience: "Convenience Store"
            copyshop: "Copy Shop"
            cosmetics: "Cosmetics Shop"
 +          craft: "Crafts Supply Store"
 +          curtain: "Curtain Shop"
 +          dairy: "Dairy Shop"
            deli: "Deli"
            department_store: "Department Store"
            discount: "Discount Items Shop"
            doityourself: "Do-It-Yourself"
            dry_cleaning: "Dry Cleaning"
 +          e-cigarette: "E-Cigarette Shop"
            electronics: "Electronics Shop"
 +          erotic: "Erotic Shop"
            estate_agent: "Estate Agent"
 +          fabric: "Fabric Store"
            farm: "Farm Shop"
            fashion: "Fashion Shop"
 -          fish: "Fish Shop"
 +          fishing: "Fishing Supplies Shop"
            florist: "Florist"
            food: "Food Shop"
 +          frame: "Frame Shop"
            funeral_directors: "Funeral Directors"
            furniture: "Furniture"
 -          gallery: "Gallery"
            garden_centre: "Garden Centre"
 +          gas: "Gas Store"
            general: "General Store"
            gift: "Gift Shop"
            greengrocer: "Greengrocer"
            grocery: "Grocery Shop"
            hairdresser: "Hairdresser"
            hardware: "Hardware Store"
 +          health_food: "Health Food Store"
 +          hearing_aids: "Hearing Aids"
 +          herbalist: "Herbalist"
            hifi: "Hi-Fi"
            houseware: "Houseware Shop"
 +          ice_cream: "Ice Cream Shop"
            interior_decoration: "Interior Decoration"
            jewelry: "Jewelry Shop"
            kiosk: "Kiosk Shop"
            kitchen: "Kitchen Shop"
            laundry: "Laundry"
 +          locksmith: "Locksmith"
            lottery: "Lottery"
            mall: "Mall"
 -          market: "Market"
            massage: "Massage"
 +          medical_supply: "Medical Supply Shop"
            mobile_phone: "Mobile Phone Shop"
 +          money_lender: "Money Lender"
            motorcycle: "Motorcycle Shop"
 +          motorcycle_repair: "Motorcycle Repair Shop"
            music: "Music Shop"
 +          musical_instrument: "Musical Instruments"
            newsagent: "Newsagent"
 +          nutrition_supplements: "Nutrition Supplements"
            optician: "Optician"
            organic: "Organic Food Shop"
            outdoor: "Outdoor Shop"
            paint: "Paint Shop"
 +          pastry: "Pastry Shop"
            pawnbroker: "Pawnbroker"
 +          perfumery: "Perfumery"
            pet: "Pet Shop"
 -          pharmacy: "Pharmacy"
 +          pet_grooming: "Pet Grooming"
            photo: "Photo Shop"
            seafood: "Sea Food"
            second_hand: "Second-hand Shop"
 +          sewing: "Sewing Shop"
            shoes: "Shoe Shop"
            sports: "Sports Shop"
            stationery: "Stationery Shop"
 +          storage_rental: "Storage Rental"
            supermarket: "Supermarket"
            tailor: "Tailor"
 +          tattoo: "Tattoo Shop"
 +          tea: "Tea Shop"
            ticket: "Ticket Shop"
            tobacco: "Tobacco Shop"
            toys: "Toy Shop"
            vacant: "Vacant Shop"
            variety_store: "Variety Store"
            video: "Video Shop"
 +          video_games: "Video Game Store"
 +          wholesale: "Wholesale Store"
            wine: "Wine Store"
            "yes": "Shop"
          tourism:
            attraction: "Attraction"
            bed_and_breakfast: "Bed and Breakfast"
            cabin: "Cabin"
 +          camp_pitch: "Camp Pitch"
            camp_site: "Camp Site"
            caravan_site: "Caravan Site"
            chalet: "Chalet"
            picnic_site: "Picnic Site"
            theme_park: "Theme Park"
            viewpoint: "Viewpoint"
 +          wilderness_hut: "Wilderness Hut"
            zoo: "Zoo"
          tunnel:
            building_passage: "Building Passage"
      new:
        title_html: "Report %{link}"
        missing_params: "Cannot create a new report"
-       details: Please provide some more details about the problem (required).
-       select: "Select a reason for your report:"
        disclaimer:
          intro: "Before sending your report to the site moderators, please ensure that:"
          not_just_mistake: You are certain that the problem is not just a mistake
        delete: "Delete Client"
        confirm: "Are you sure?"
        requests: "Requesting the following permissions from the user:"
-       allow_read_prefs:  "read their user preferences."
-       allow_write_prefs: "modify their user preferences."
-       allow_write_diary: "create diary entries, comments and make friends."
-       allow_write_api:   "modify the map."
-       allow_read_gpx:    "read their private GPS traces."
-       allow_write_gpx:   "upload GPS traces."
-       allow_write_notes: "modify notes."
      index:
        title: "My OAuth Details"
        my_tokens: "My Authorised Applications"
        registered_apps: "You have the following client applications registered:"
        register_new: "Register your application"
      form:
-       name: "Name"
-       required: "Required"
-       url: "Main Application URL"
-       callback_url: "Callback URL"
-       support_url: "Support URL"
        requests: "Request the following permissions from the user:"
-       allow_read_prefs:  "read their user preferences."
-       allow_write_prefs: "modify their user preferences."
-       allow_write_diary: "create diary entries, comments and make friends."
-       allow_write_api:   "modify the map."
-       allow_read_gpx:    "read their private GPS traces."
-       allow_write_gpx:   "upload GPS traces."
-       allow_write_notes: "modify notes."
      not_found:
        sorry: "Sorry, that %{type} could not be found."
      create: