]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Update to iD v1.8.2
[rails.git] / vendor / assets / iD / iD / locales / en.json
index 7fdbb96b037d1e10cda06f64958057f49c1e5fc5..3d9c46bc798804a659de8125eb6c0d60cca88266 100644 (file)
         },
         "merge": {
             "title": "Merge",
-            "description": "Merge these lines.",
+            "description": "Merge these features.",
             "key": "C",
-            "annotation": "Merged {n} lines.",
+            "annotation": "Merged {n} features.",
             "not_eligible": "These features can't be merged.",
-            "not_adjacent": "These lines can't be merged because they aren't connected.",
-            "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.",
-            "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded."
+            "not_adjacent": "These features can't be merged because they aren't connected.",
+            "restriction": "These features can't be merged because at least one is a member of a \"{relation}\" relation.",
+            "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded.",
+            "conflicting_tags": "These features can't be merged because some of their tags have conflicting values."
         },
         "move": {
             "title": "Move",
         "nothing": "Nothing to redo."
     },
     "tooltip_keyhint": "Shortcut:",
-    "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
+    "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 11 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
     "translate": {
         "translate": "Translate",
         "localized_translation_label": "Multilingual name",
     "zoom_in_edit": "Zoom in to Edit",
     "logout": "logout",
     "loading_auth": "Connecting to OpenStreetMap...",
-    "report_a_bug": "report a bug",
+    "report_a_bug": "Report a bug",
+    "help_translate": "Help translate",
     "feature_info": {
         "hidden_warning": "{count} hidden features",
         "hidden_details": "These features are currently hidden: {details}"
                 "label": "Handicap",
                 "placeholder": "1-18"
             },
+            "handrail": {
+                "label": "Handrail"
+            },
             "highway": {
                 "label": "Type"
             },
                 "label": "Speed Limit",
                 "placeholder": "40, 50, 60..."
             },
+            "maxstay": {
+                "label": "Max Stay"
+            },
             "mtb/scale": {
                 "label": "Mountain Biking Difficulty",
                 "placeholder": "0, 1, 2, 3...",
                     "grade5": "Soft: soil/sand/grass"
                 }
             },
+            "traffic_signals": {
+                "label": "Type"
+            },
             "trail_visibility": {
                 "label": "Trail Visibility",
                 "placeholder": "Excellent, Good, Bad...",
                 "name": "Marketplace",
                 "terms": ""
             },
+            "amenity/motorcycle_parking": {
+                "name": "Motorcycle Parking",
+                "terms": ""
+            },
             "amenity/nightclub": {
                 "name": "Nightclub",
                 "terms": "disco*,night club,dancing,dance club"
                 "name": "University Grounds",
                 "terms": "college"
             },
-            "amenity/vending_machine": {
+            "amenity/vending_machine/cigarettes": {
+                "name": "Cigarette Vending Machine",
+                "terms": "cigarette"
+            },
+            "amenity/vending_machine/condoms": {
+                "name": "Condom Vending Machine",
+                "terms": "condom"
+            },
+            "amenity/vending_machine/drinks": {
+                "name": "Drink Vending Machine",
+                "terms": "drink,soda,beverage,juice,pop"
+            },
+            "amenity/vending_machine/excrement_bags": {
+                "name": "Excrement Bag Vending Machine",
+                "terms": "excrement bags,poop,dog,animal"
+            },
+            "amenity/vending_machine/news_papers": {
+                "name": "Newspaper Vending Machine",
+                "terms": "newspaper"
+            },
+            "amenity/vending_machine/parcel_pickup_dropoff": {
+                "name": "Parcel Pickup/Dropoff Vending Machine",
+                "terms": "parcel,mail,pickup"
+            },
+            "amenity/vending_machine/parking_tickets": {
+                "name": "Parking Ticket Vending Machine",
+                "terms": "parking,ticket"
+            },
+            "amenity/vending_machine/public_transport_tickets": {
+                "name": "Transit Ticket Vending Machine",
+                "terms": "bus,train,ferry,rail,ticket,transportation"
+            },
+            "amenity/vending_machine/sweets": {
+                "name": "Snack Vending Machine",
+                "terms": "candy,gum,chip,pretzel,cookie,cracker"
+            },
+            "amenity/vending_machine/vending_machine": {
                 "name": "Vending Machine",
-                "terms": "snack,soda,ticket"
+                "terms": ""
             },
             "amenity/veterinary": {
                 "name": "Veterinary",
                 "terms": ""
             },
             "building/cathedral": {
-                "name": "Cathedral",
+                "name": "Cathedral Building",
                 "terms": ""
             },
             "building/chapel": {
-                "name": "Chapel",
+                "name": "Chapel Building",
                 "terms": ""
             },
             "building/church": {
-                "name": "Church",
+                "name": "Church Building",
                 "terms": ""
             },
             "building/college": {
                 "terms": ""
             },
             "building/detached": {
-                "name": "Detached Home",
-                "terms": ""
+                "name": "Detached House",
+                "terms": "home,single,family,residence,dwelling"
             },
             "building/dormitory": {
                 "name": "Dormitory",
             },
             "building/house": {
                 "name": "House",
-                "terms": ""
+                "terms": "home,family,residence,dwelling"
             },
             "building/hut": {
                 "name": "Hut",
                 "name": "School Building",
                 "terms": "academy,elementary school,middle school,high school"
             },
+            "building/semidetached_house": {
+                "name": "Semi-Detached House",
+                "terms": "home,double,duplex,twin,family,residence,dwelling"
+            },
             "building/shed": {
                 "name": "Shed",
                 "terms": ""
             },
             "building/terrace": {
                 "name": "Row Houses",
-                "terms": ""
+                "terms": "home,terrace,brownstone,family,residence,dwelling"
             },
             "building/train_station": {
                 "name": "Train Station",
                 "terms": ""
             },
             "landuse/allotments": {
-                "name": "Allotments",
-                "terms": ""
+                "name": "Community Garden",
+                "terms": "allotment,garden"
             },
             "landuse/basin": {
                 "name": "Basin",
                 "name": "Basketball Court",
                 "terms": ""
             },
+            "leisure/pitch/rugby_league": {
+                "name": "Rugby League Field",
+                "terms": ""
+            },
+            "leisure/pitch/rugby_union": {
+                "name": "Rugby Union Field",
+                "terms": ""
+            },
             "leisure/pitch/skateboard": {
                 "name": "Skate Park",
                 "terms": ""
                 "name": "Bunker",
                 "terms": ""
             },
+            "military/checkpoint": {
+                "name": "Checkpoint",
+                "terms": ""
+            },
+            "military/danger_area": {
+                "name": "Danger Area",
+                "terms": ""
+            },
+            "military/naval_base": {
+                "name": "Naval Base",
+                "terms": ""
+            },
+            "military/obstacle_course": {
+                "name": "Obstacle Course",
+                "terms": ""
+            },
             "military/range": {
                 "name": "Military Range",
                 "terms": ""
             },
+            "military/training_area": {
+                "name": "Training area",
+                "terms": ""
+            },
             "natural": {
                 "name": "Natural",
                 "terms": ""