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

vendor/assets/iD/iD/locales/af.json

@@ -74,14 +74,6 @@
                     "relation": "'n Verhouding is verwyder."
                 }
             },
-            "connect": {
-                "annotation": {
-                    "point": "'n Weg is gekoppel aan 'n punt.",
-                    "vertex": "Een weg is aan 'n ander gekoppel.",
-                    "line": "'n Weg is aan 'n lyn gekoppel.",
-                    "area": "'n Weg is aan 'n area gekoppel."
-                }
-            },
             "disconnect": {
                 "title": "Ontkoppel.",
                 "description": "Ontkoppel hierdie lyne/areas van mekkaar.",
@@ -881,10 +873,6 @@
                     "name": "Amerikaanse Voetbal Veld",
                     "terms": "Amerikaanse voetbalveld"
                 },
-                "leisure/pitch/baseball": {
-                    "name": "Bofpalveld",
-                    "terms": "bofbaldiamant"
-                },
                 "leisure/pitch/basketball": {
                     "name": "Basketbalbaan",
                     "terms": "Korfbalbaan"

vendor/assets/iD/iD/locales/ar-AA.json

@@ -75,14 +75,6 @@
                     "relation": ".حذف علاقة"
                 }
             },
-            "connect": {
-                "annotation": {
-                    "point": ".وصل طريق بنقطة",
-                    "vertex": ".وصل طريق بآخر",
-                    "line": ".وصل طريق بخط",
-                    "area": ".وصل طريق بمساحة"
-                }
-            },
             "disconnect": {
                 "title": ".غير متصل",
                 "description": ".قطع إتصال هذه الخطوط أوالمساحات بعضها ببعض",

vendor/assets/iD/iD/locales/ast.json

@@ -139,14 +139,6 @@
             "delete_member": {
                 "annotation": "Desaniciáu un miembru d'una rellación."
             },
-            "connect": {
-                "annotation": {
-                    "point": "Coneutada una vía con un puntu.",
-                    "vertex": "Coneutada una vía con otra.",
-                    "line": "Coneutada una vía con una llinia.",
-                    "area": "Coneutada una vía con un área."
-                }
-            },
             "disconnect": {
                 "title": "Desconeutar",
                 "description": "Desconectar estes llinies/árees una d'otra.",
@@ -302,7 +294,6 @@
         "browser_notice": "Esti editor tien encontu en Firefox, Chrome, Safari, Opera, ya Internet Explorer 11 y superior. Anueva'l restolador o usa Potlatch 2 pa editar el mapa.",
         "translate": {
             "translate": "Traducir",
-            "localized_translation_label": "Nome multillingüe",
             "localized_translation_language": "Escoyer idioma",
             "localized_translation_name": "Nome"
         },
@@ -1593,15 +1584,6 @@
                 },
                 "piste/difficulty": {
                     "label": "Dificultá",
-                    "options": {
-                        "advanced": "Avanzáu (diamante prietu)",
-                        "easy": "Fácil (círculu verde)",
-                        "expert": "Espertu (doble diamante prietu)",
-                        "extreme": "Estremu (necesita equipu d'escalada)",
-                        "freeride": "Llibre (fuera de pista)",
-                        "intermediate": "Intermediu (cuadráu azul)",
-                        "novice": "Principiantes (enseñanza)"
-                    },
                     "placeholder": "Fácil, intermediu, avanzáu..."
                 },
                 "piste/grooming": {
@@ -2324,9 +2306,6 @@
                     "name": "Discoteca",
                     "terms": "Disco, discobar, baille"
                 },
-                "amenity/parking": {
-                    "name": "Aparcamientu"
-                },
                 "amenity/parking_entrance": {
                     "name": "Entrada/Salida de garaxe"
                 },
@@ -2502,9 +2481,6 @@
                     "name": "Máquina de venta de periódicos",
                     "terms": "máquina,automática,periódicos.prensa,revistes"
                 },
-                "amenity/vending_machine/parcel_pickup_dropoff": {
-                    "name": "Máquina d'entrega/recoyía de paquetes"
-                },
                 "amenity/vending_machine/parking_tickets": {
                     "name": "Máquina de pagu d'aparcamientu",
                     "terms": "máquina,automática,aparcamientu,pagu"
@@ -2900,8 +2876,7 @@
                     "terms": "Viña"
                 },
                 "embankment": {
-                    "name": "Terremplén",
-                    "terms": "rellenu"
+                    "name": "Terremplén"
                 },
                 "emergency/ambulance_station": {
                     "name": "Parque d'ambulancies",
@@ -2941,22 +2916,6 @@
                     "name": "Entrada/Salida",
                     "terms": "Accesu, puerta"
                 },
-                "footway/crossing": {
-                    "name": "Cruce de cai",
-                    "terms": "pasu"
-                },
-                "footway/crossing-raised": {
-                    "name": "Cruce de cai llevantáu"
-                },
-                "footway/crosswalk": {
-                    "name": "Pasu de peatones"
-                },
-                "footway/crosswalk-raised": {
-                    "name": "Pasu de peatones llevantáu"
-                },
-                "footway/sidewalk": {
-                    "name": "Cera"
-                },
                 "ford": {
                     "name": "Vau"
                 },
@@ -3044,18 +3003,6 @@
                 "highway/corridor": {
                     "name": "Pasiellu d'edificiu"
                 },
-                "highway/crossing": {
-                    "name": "Cruce de cai"
-                },
-                "highway/crossing-raised": {
-                    "name": "Cruce de cai llevantáu"
-                },
-                "highway/crosswalk": {
-                    "name": "Pasu de peatones"
-                },
-                "highway/crosswalk-raised": {
-                    "name": "Pasu de peatones llevantáu"
-                },
                 "highway/cycleway": {
                     "name": "Camín ciclista"
                 },
@@ -3406,9 +3353,6 @@
                 "leisure/pitch/american_football": {
                     "name": "Campu de fútbol americanu"
                 },
-                "leisure/pitch/baseball": {
-                    "name": "Campu de béisbol"
-                },
                 "leisure/pitch/basketball": {
                     "name": "Pista de baloncestu"
                 },
@@ -3523,10 +3467,6 @@
                 "man_made/monitoring_station": {
                     "name": "Estación de control"
                 },
-                "man_made/observation": {
-                    "name": "Torre de vixilancia",
-                    "terms": "Observatoriu,Torre d'observación"
-                },
                 "man_made/petroleum_well": {
                     "name": "Pozu petrolíferu"
                 },
@@ -3548,9 +3488,6 @@
                 "man_made/surveillance": {
                     "name": "Vixilancia"
                 },
-                "man_made/surveillance_camera": {
-                    "name": "Cámara de vixilancia"
-                },
                 "man_made/survey_point": {
                     "name": "Vértiz xeodésicu"
                 },
@@ -3641,9 +3578,6 @@
                 "natural/tree": {
                     "name": "Árbol"
                 },
-                "natural/tree_row": {
-                    "name": "Filera d'árboles"
-                },
                 "natural/volcano": {
                     "name": "Volcan"
                 },
@@ -3740,9 +3674,6 @@
                 "office/travel_agent": {
                     "name": "Axencia de viaxes"
                 },
-                "piste": {
-                    "name": "Pista/Circuitu d'esquí"
-                },
                 "place": {
                     "name": "Llugar"
                 },
@@ -3787,12 +3718,6 @@
                     "name": "Xenerador d'enerxía",
                     "terms": "Central eléctrica"
                 },
-                "power/generator/source_nuclear": {
-                    "name": "Reactor nuclear"
-                },
-                "power/generator/source_wind": {
-                    "name": "Turbina de vientu"
-                },
                 "power/line": {
                     "name": "Llinia eléctrica"
                 },
@@ -4648,9 +4573,6 @@
                 },
                 "name": "OSM Inspector: Etiquetáu"
             },
-            "US-TIGER-Roads-2012": {
-                "name": "Estraes TIGER 2012"
-            },
             "US-TIGER-Roads-2014": {
                 "description": "A nivel d'ampliación 16+, datos del mapa de dominiu públicu dende US Census. A nivel d'ampliación menor, sólo los cambios dende 2006 menos los cambios yá incorporaos a OpenStreetMap",
                 "name": "Estraes TIGER 2014"
@@ -4687,12 +4609,6 @@
                 "description": "Capa d'ortofotos proporcionada por basemap.at «Socesor» de les imáxenes de geoimage.at.",
                 "name": "Ortofoto de basemap.at"
             },
-            "hike_n_bike": {
-                "attribution": {
-                    "text": "© collaboradores d'OpenStreetMap"
-                },
-                "name": "Hike & Bike"
-            },
             "mapbox_locator_overlay": {
                 "attribution": {
                     "text": "Términos y comentarios "
@@ -4877,9 +4793,6 @@
             "be-mailinglist": {
                 "name": "Llista de corréu Talk-be"
             },
-            "be-maptime": {
-                "name": "Maptime Bélxica"
-            },
             "be-matrix": {
                 "name": "Canal Matrix d'OpenStreetMap BE"
             },

vendor/assets/iD/iD/locales/be.json

@@ -4,6 +4,11 @@
             "merge": {
                 "title": "Аб'яднаць"
             }
+        },
+        "imagery": {
+            "Bing": {
+                "name": "Bing аэрафотаздымкі"
+            }
         }
     }
 }

vendor/assets/iD/iD/locales/bg.json

@@ -145,12 +145,6 @@
                 "annotation": "Премахнат член на релация."
             },
             "connect": {
-                "annotation": {
-                    "point": "Свързан е път с точка.",
-                    "vertex": "Свързан е път с друг път.",
-                    "line": "Свързан е път с линия.",
-                    "area": "Свързан е път с площен обект."
-                },
                 "relation": "Тези обекти не могат да бъдат свързани, защото имат различни роли в релация.",
                 "restriction": "Тези обекти не могат да бъдат свързани, защото това ще повреди релацията \"{relation}\". "
             },
@@ -347,7 +341,6 @@
         "browser_notice": "Този редактор се поддържа във Firefox, Chrome, Safari, Opera и Internet Explorer 11 и следващи. Моля обновете своя браузър или използвайте  Potlatch 2, за да редактирате картата.",
         "translate": {
             "translate": "Превод",
-            "localized_translation_label": "Многоезично име",
             "localized_translation_language": "Изберете език",
             "localized_translation_name": "Име"
         },
@@ -1714,15 +1707,6 @@
                 },
                 "piste/difficulty": {
                     "label": "Трудност",
-                    "options": {
-                        "advanced": "Трудна (черен диамант)",
-                        "easy": "Лесна (зелен кръг)",
-                        "expert": "Експерт (двоен черен диамант)",
-                        "extreme": "Екстремна (небходима катерачна екипировка)",
-                        "freeride": "Фрирайд (извън пистите)",
-                        "intermediate": "Средна (син квадрат)",
-                        "novice": "За начинаещи (учебни)"
-                    },
                     "placeholder": "Лесна, Средна, Трудна"
                 },
                 "piste/grooming": {
@@ -2295,9 +2279,6 @@
                 "leisure/pitch/american_football": {
                     "name": "Игрище за американски футбол"
                 },
-                "leisure/pitch/baseball": {
-                    "name": "Игрище за бейзбол"
-                },
                 "leisure/pitch/basketball": {
                     "name": "Баскетболно игрище"
                 },
@@ -2869,9 +2850,6 @@
                 },
                 "name": "OSM Inspector: Тагове"
             },
-            "US-TIGER-Roads-2012": {
-                "name": "TIGER Пътища 2012"
-            },
             "US-TIGER-Roads-2014": {
                 "description": "При ниво на увеличение 16+, публично достъпни картографски данни от US Census. При по-ниски нива увеличение само промените от 2006 година насам без тези вече включени в OpenStreetMap",
                 "name": "TIGER Пътища 2014"
@@ -2928,12 +2906,6 @@
                 "description": "Ортофото слой осигурен от basemap.at. \"Приемник\" на geoimage.at изображенията.",
                 "name": "basemap.at Ортофото"
             },
-            "hike_n_bike": {
-                "attribution": {
-                    "text": "© OpenStreetMap contributors"
-                },
-                "name": "Туризъм & Колоездене"
-            },
             "mapbox_locator_overlay": {
                 "attribution": {
                     "text": "Условия & обратна връзка"

vendor/assets/iD/iD/locales/bn.json

@@ -117,14 +117,6 @@
             "delete_member": {
                 "annotation": "একটি সম্পর্ক থেকে একজন সদস্যকে সরানো হয়েছে।"
             },
-            "connect": {
-                "annotation": {
-                    "point": "একটি গমনপথের সাথে একটি বিন্দু সংযোজন করা হয়েছে।",
-                    "vertex": "একটি গমনপথকে অারেকটি গমনপথের সাথে সংযোজন করা হয়েছে।",
-                    "line": "একটি রেখার সাথে একটি গমনপথ সংযোজন করা হয়েছে।",
-                    "area": "একটি এলাকার সাথে একটি গমনপথ সংযোজন করা হয়েছে।"
-                }
-            },
             "disconnect": {
                 "title": "বিচ্ছিন্ন করুন",
                 "description": "এই রেখা/এলাকাগুলিকে একে অপরের থেকে বিচ্ছিন্ন করুন।",
@@ -194,7 +186,6 @@
         "tooltip_keyhint": "শর্টকাট:",
         "translate": {
             "translate": "অনুবাদ করুন",
-            "localized_translation_label": "বহুভাষিক নাম",
             "localized_translation_language": "ভাষা বেছে নিন",
             "localized_translation_name": "নাম"
         },
@@ -815,9 +806,6 @@
                 "amenity/marketplace": {
                     "name": "বাজার"
                 },
-                "amenity/parking": {
-                    "name": "গাড়ি পার্কিং"
-                },
                 "amenity/pharmacy": {
                     "name": "দাওয়াইখানা"
                 },
@@ -1379,11 +1367,6 @@
                     "text": "© Geofabrik GmbH, ওপেনস্ট্রীটম্যাপের অবদানকারীগণ, সিসি-বাই-এসএ"
                 }
             },
-            "hike_n_bike": {
-                "attribution": {
-                    "text": "© ওপেনস্ট্রীটম্যাপের অবদানকারীগণ"
-                }
-            },
             "mapbox_locator_overlay": {
                 "attribution": {
                     "text": "শর্তাবলী ও প্রতিক্রিয়া"