Merge remote-tracking branch 'upstream/master' into routing

Conflicts:
	app/assets/javascripts/index.js
	app/assets/javascripts/leaflet.map.js.erb
	config/environments/production.rb
	config/locales/de.yml

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

@@ -65,7 +65,6 @@
         },
         "delete": {
             "title": "Verwyder",
-            "description": "Verwyder van die kaart.",
             "annotation": {
                 "point": "Verwyder 'n punt.",
                 "vertex": "Verwyder 'n punt van 'n weg.",
@@ -287,6 +286,12 @@
             },
             "category-route": {
                 "name": "Roete"
+            },
+            "category-water-area": {
+                "name": "Water"
+            },
+            "category-water-line": {
+                "name": "Water"
             }
         },
         "fields": {
@@ -325,19 +330,37 @@
                     }
                 }
             },
+            "access_simple": {
+                "label": "Toegang",
+                "placeholder": "ja"
+            },
             "address": {
                 "label": "Adres",
                 "placeholders": {
                     "housename": "Huisnaam",
-                    "number": "123",
                     "street": "Straat",
                     "city": "Tipe",
-                    "postcode": "Pos Kode"
+                    "postcode": "Poskode",
+                    "place": "Plek"
                 }
             },
             "admin_level": {
                 "label": "Administratiewe vlak"
             },
+            "aerialway/capacity": {
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/occupancy": {
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "options": {
+                    "both": "Beide"
+                }
+            },
             "aeroway": {
                 "label": "Tipe"
             },
@@ -367,7 +390,17 @@
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
-                "label": "Rigting"
+                "label": "Rigting",
+                "options": {
+                    "N": "Noord",
+                    "E": "Oos",
+                    "S": "Suid",
+                    "W": "Wes",
+                    "NE": "Noordoos",
+                    "SE": "Suidoos",
+                    "SW": "Suidwes",
+                    "NW": "Noordwes"
+                }
             },
             "clock_direction": {
                 "label": "Rigting",
@@ -419,6 +452,9 @@
             "fixme": {
                 "label": "Maak My Reg"
             },
+            "fuel/diesel": {
+                "label": "Verkoop diesel"
+            },
             "highway": {
                 "label": "Tipe"
             },
@@ -523,16 +559,7 @@
                 "label": "Tipe"
             },
             "religion": {
-                "label": "Geloof",
-                "options": {
-                    "christian": "Christen",
-                    "muslim": "Moslem",
-                    "buddhist": "Boeddhis",
-                    "jewish": "Joods",
-                    "hindu": "Hindoe",
-                    "shinto": "Sjinto",
-                    "taoist": "Taoist"
-                }
+                "label": "Geloof"
             },
             "restriction": {
                 "label": "Tipe"
@@ -543,9 +570,6 @@
             "route_master": {
                 "label": "Tipe"
             },
-            "sac_scale": {
-                "label": "Moeilikheidsgraad van voetslaanpad"
-            },
             "service": {
                 "label": "Tipe"
             },
@@ -583,9 +607,6 @@
             "towertype": {
                 "label": "Toring tipe"
             },
-            "tracktype": {
-                "label": "Tipe"
-            },
             "trail_visibility": {
                 "label": "Sigbaarheid van voetslaanpad"
             },
@@ -680,10 +701,6 @@
                 "name": "Fliek",
                 "terms": "Fliek, Inry, Movie, Silverdoek"
             },
-            "amenity/college": {
-                "name": "Kollege",
-                "terms": "kollege, landboukollege, raad, genootskap"
-            },
             "amenity/courthouse": {
                 "name": "Hof"
             },
@@ -708,12 +725,6 @@
             "amenity/grave_yard": {
                 "name": "Begrafplaas"
             },
-            "amenity/hospital": {
-                "name": "Hospitaal"
-            },
-            "amenity/kindergarten": {
-                "name": "Kleuterskool"
-            },
             "amenity/library": {
                 "name": "Biblioteek"
             },
@@ -753,9 +764,6 @@
             "amenity/restaurant": {
                 "name": "Restaurant"
             },
-            "amenity/school": {
-                "name": "Skool"
-            },
             "amenity/swimming_pool": {
                 "name": "Swembad"
             },
@@ -774,9 +782,6 @@
             "amenity/townhall": {
                 "name": "Stadsaal"
             },
-            "amenity/university": {
-                "name": "Universiteit"
-            },
             "amenity/waste_basket": {
                 "name": "Asblik"
             },
@@ -840,18 +845,12 @@
             "building/apartments": {
                 "name": "Woonstelle"
             },
-            "building/entrance": {
-                "name": "Ingang"
-            },
             "building/house": {
                 "name": "Huis"
             },
             "emergency/phone": {
                 "name": "Noodtelefoon"
             },
-            "entrance": {
-                "name": "Ingang"
-            },
             "highway": {
                 "name": "Snelweg"
             },
@@ -876,9 +875,6 @@
             "highway/motorway": {
                 "name": "Snelweg"
             },
-            "highway/motorway_junction": {
-                "name": "Snelwegkruising"
-            },
             "highway/motorway_link": {
                 "name": "Snelwegaansluiting"
             },
@@ -1130,10 +1126,6 @@
                 "name": "Watertoring",
                 "terms": "Watertoring"
             },
-            "man_made/water_well": {
-                "name": "Put",
-                "terms": "put"
-            },
             "man_made/water_works": {
                 "name": "Waterwerke",
                 "terms": "waterwerke"
@@ -1319,9 +1311,6 @@
             "shop/bicycle": {
                 "name": "Fietswinkel"
             },
-            "shop/books": {
-                "name": "Boekwinkel"
-            },
             "shop/boutique": {
                 "name": "Boetiek"
             },
@@ -1346,9 +1335,6 @@
             "shop/computer": {
                 "name": "Rekenaarwinkel"
             },
-            "shop/confectionery": {
-                "name": "Lekkergoedwinkel"
-            },
             "shop/convenience": {
                 "name": "Geriefswinkel"
             },
@@ -1361,9 +1347,6 @@
             "shop/doityourself": {
                 "name": "Selfdoenwinkel"
             },
-            "shop/dry_cleaning": {
-                "name": "Droogskoonmakers"
-            },
             "shop/electronics": {
                 "name": "Elektronikawinkel"
             },
@@ -1400,9 +1383,6 @@
             "shop/jewelry": {
                 "name": "Juwelier"
             },
-            "shop/kiosk": {
-                "name": "Kiosk"
-            },
             "shop/laundry": {
                 "name": "Wassery"
             },
@@ -1418,15 +1398,9 @@
             "shop/music": {
                 "name": "Musiekwinkel"
             },
-            "shop/newsagent": {
-                "name": "Nuusagentskap"
-            },
             "shop/optician": {
                 "name": "Oogarts"
             },
-            "shop/outdoor": {
-                "name": "Buitelewewinkel"
-            },
             "shop/pet": {
                 "name": "Troeteldierwinkel"
             },

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

@@ -1 +1,171 @@
-{}
+{
+    "modes": {
+        "add_area": {
+            "title": "مساحة",
+            "description": ".أضف المنتزهات أو المباني أو البحيرات أو مساحات أخرى إلى الخريطة",
+            "tail": ".أنقر على الخريطة لتبدأ رسم مساحة مثل منتزه أو بحيرة أو مبنى"
+        },
+        "add_line": {
+            "title": "خط",
+            "description": "أضف الطرق السريعة أوالشوارع أوممرات المشاة أوالقنوات أو خطوط أخرى إلى الخريطة.",
+            "tail": ".انقر على الخريطة لرسم الطريق أو المسار أو الشارع"
+        },
+        "add_point": {
+            "title": "نقطة",
+            "description": ".إضف المطاعم أوالمعالم أوصناديق البريد أو نقاط أخرى إلى الخريطة",
+            "tail": ".انقر على الخريطة لإضافة نقطة"
+        },
+        "browse": {
+            "title": "تصفح",
+            "description": ".تحرك عموديا و أفقيا أو كبر الخريطة"
+        },
+        "draw_area": {
+            "tail": ".انقر لإضافة العقد إلى منطقتك. انقر فوق العقدة الأولى لإنهاء المنطقة"
+        },
+        "draw_line": {
+            "tail": ".انقر لإضافة المزيد من العقد إلى الخط. انقر على خطوط أخرى للاتصال بهم، وانقر نقرا مزدوجا لإنهاء الخط"
+        }
+    },
+    "operations": {
+        "add": {
+            "annotation": {
+                "point": ".أضاف نقطة",
+                "vertex": ".أظاف عقدة إلى الطريق"
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": ".بدأ خط",
+                "area": ".بدأ المساحة"
+            }
+        },
+        "continue": {
+            "annotation": {
+                "line": ".مواصلة خط",
+                "area": ".مواصلة مساحة"
+            }
+        },
+        "cancel_draw": {
+            "annotation": ".إلغاء الرسم"
+        },
+        "change_tags": {
+            "annotation": ".العلامات المتغيرة"
+        },
+        "circularize": {
+            "annotation": {
+                "line": ".جعل خط دائري",
+                "area": "جعل مساحة  دائرية"
+            }
+        },
+        "orthogonalize": {
+            "title": "مربع",
+            "annotation": {
+                "line": ".جعل زوايا الخط مربعة",
+                "area": ".جعل زوايا المساحة مربعة"
+            }
+        },
+        "delete": {
+            "title": "حذف",
+            "annotation": {
+                "point": ".حذف نقطة",
+                "vertex": ".حذف عقدة من الطريق",
+                "line": ".حذف خط",
+                "area": ".حذف مساحة",
+                "relation": ".حذف علاقة",
+                "multiple": " .شيء {n} حذف"
+            }
+        },
+        "connect": {
+            "annotation": {
+                "point": ".وصل طريق بنقطة",
+                "vertex": ".وصل طريق بآخر",
+                "line": ".وصل طريق بخط",
+                "area": ".وصل طريق بمساحة"
+            }
+        },
+        "disconnect": {
+            "title": ".غير متصل",
+            "description": ".قطع إتصال هذه الخطوط أوالمساحات بعضها ببعض",
+            "annotation": ".خطوط أومساحات غير متصلة"
+        },
+        "merge": {
+            "title": "دمج",
+            "description": ".دمج هذه الخطوط",
+            "annotation": ".خط مندمج {n}"
+        },
+        "move": {
+            "title": "نقل",
+            "description": ".نقل هذا إلى موقع مختلف",
+            "annotation": {
+                "point": ".نقل نقطة",
+                "vertex": ".نقل عقدة في طريق",
+                "line": ".نقل خط",
+                "area": ".نقل مساحة",
+                "multiple": ".نقل أشياء متعددة"
+            }
+        },
+        "rotate": {
+            "title": "تدوير",
+            "description": ".تدوير هذا الشيء حول نقطة مركزه",
+            "annotation": {
+                "line": ".استدارة خط",
+                "area": ".استدارة مساحة"
+            }
+        },
+        "reverse": {
+            "title": "عكس",
+            "description": ".عكس إتجاه الخط",
+            "annotation": ".تم عكس إتجاه الخط"
+        },
+        "split": {
+            "title": "تقسيم"
+        }
+    },
+    "browser_notice": "هذا المحرر مدعوم في فايرفوكس، كروم، سفاري، أوبرا، وإنترنت إكسبلورر 9 وما فوق. الرجاء ترقية المتصفح أو استخدام بوتلاتش2 .لتعديل الخريطة ",
+    "zoom_in_edit": ".كبِّر للتعديل",
+    "logout": "تسجيل الخروج",
+    "report_a_bug": "خبِّر عن خطأ أو عطل",
+    "commit": {
+        "title": "حفظ التغييرات",
+        "description_placeholder": "وصف موجز لمساهماتكم",
+        "upload_explanation": "التغييرات التي قمتم بتحميلها ستكون مرئية على جميع الخرائط التي تستخدم بيانات خريطة الشارع المفتوح.",
+        "save": "حفظ",
+        "cancel": "إلغاء",
+        "warnings": "تحذيرات",
+        "modified": "تم التغيير",
+        "deleted": "تم الحذف",
+        "created": "تم الإنشاء"
+    },
+    "contributors": {
+        "list": "{users} تعديلات من قبل",
+        "truncated_list": "تعديلات من قبل {users} و {count} آخرين"
+    },
+    "geolocate": {
+        "title": "أظهر مكاني"
+    },
+    "inspector": {
+        "no_documentation_combination": "لا توجد وثائق متاحة لهذه المجموعة من العلامات",
+        "no_documentation_key": "لا توجد وثائق متاحة لهذه الكلمة",
+        "view_on_osm": "openstreetmap.org شاهد على",
+        "choose": "حدد نوع الميزة",
+        "results": "{n} نتائج {search}",
+        "reference": "OpenStreetMap شاهد على ويكي"
+    },
+    "background": {
+        "title": "الخلفية",
+        "description": "إعدادات الخلفية",
+        "percent_brightness": "{opacity}% سطوع",
+        "fix_misalignment": "إصلاح الإستقامة",
+        "reset": "أعد للوضع السابق"
+    },
+    "restore": {
+        "description": "هل ترغب في استعادة التغييرات غير المحفوظة من جلسة التحرير السابق؟",
+        "restore": "استعادة",
+        "reset": "أعد للوضع السابق"
+    },
+    "save": {
+        "title": "حفظ",
+        "help": " مما يجعلها مرئية للمستخدمين الآخرين OpenStreetMap حفظ التغييرات إلى",
+        "no_changes": ".لا تغييرات للحفظ"
+    }
+}

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

@@ -3,17 +3,17 @@
         "add_area": {
             "title": "المساحة",
             "description": "أضف مواقف أو مباني أو بحيرات أو مناطق أخرى إلى الخارطة.",
-            "tail": "إنقرعلى الخارطة للبدء ببتحديد منطقة، مثلاً حديقة، بجيرة، أو مبنى."
+            "tail": "انقر على الخارطة للبدء في رسم منطقة، كحديقة, بجيرة أو مبنى."
         },
         "add_line": {
             "title": "خط",
             "description": "أضف طرق سريعة، شوارع، معابر للمشاة، قنوات أو خطوط أخرى للخارطة.",
-            "tail": "إنقر على الخارطة "
+            "tail": "اضغط على الخارطة للبدء في رسم طريق أو مسار أو تحويلة"
         },
         "add_point": {
             "title": "نقطة",
             "description": "أضف مطاعم، نُصب تذكارية، مكاتب بريد أو نقاط اخرى إلى الخارطة.",
-            "tail": "إنقر على الخارطة ﻹضافة نقطة. "
+            "tail": "اضغط على الخارطة ﻹضافة نقطة. "
         },
         "browse": {
             "title": "عرض",
@@ -30,21 +30,21 @@
         "add": {
             "annotation": {
                 "point": "أضف نقطة",
-                "vertex": "أضف عقدة إلى طريق",
-                "relation": "أضف علاقة"
+                "vertex": "أضفت عقدة إلى طريق.",
+                "relation": "أضفت علاقة."
             }
         },
         "start": {
             "annotation": {
-                "line": "ابدأ خطا",
-                "area": "ابدأ مساحة"
+                "line": "بدأ خطّ",
+                "area": "بدأت منطقة."
             }
         },
         "continue": {
-            "title": "اﻹستمرار",
-            "description": "أكمل هذا الخط.",
+            "title": "استمر",
+            "description": "مواصلة هذا الخط.",
             "not_eligible": "لا يوجد خط يمكن تكملته هنا.",
-            "multiple": "يمكن استمرارية عدة خطوط هنا. لاختيار خط، اضغط على مفتاح Shift وانقر عليه لتحديده.",
+            "multiple": "يمكن أن تستمر عدة أسطر هنا. لاختيار خط، اضغط على مفتاح Shift ثم انقر عليه لتحديده.",
             "annotation": {
                 "line": "استمر في الخط",
                 "area": "استمر في مساحة"
@@ -88,7 +88,6 @@
         },
         "delete": {
             "title": "حذف",
-            "description": "احذف هذه من الخريطة",
             "annotation": {
                 "point": "احذف نقطة",
                 "vertex": "احذف عقدة من طريق",
@@ -408,11 +407,8 @@
             "address": {
                 "label": "العنوان",
                 "placeholders": {
-                    "housename": "اسم المنزل",
-                    "number": "١٢٣",
                     "street": "الشارع",
-                    "city": "المدينة",
-                    "postcode": "الرمز البريدي"
+                    "city": "المدينة"
                 }
             },
             "admin_level": {
@@ -627,16 +623,7 @@
                 "label": "النوع"
             },
             "religion": {
-                "label": "الديانة",
-                "options": {
-                    "christian": "المسيحية",
-                    "muslim": "الإسلام",
-                    "buddhist": "البوذية",
-                    "jewish": "اليهودية",
-                    "hindu": "الهيندوسية",
-                    "shinto": "الشينتو",
-                    "taoist": "التاو"
-                }
+                "label": "الديانة"
             },
             "restriction": {
                 "label": "النوع"
@@ -647,9 +634,6 @@
             "route_master": {
                 "label": "النوع"
             },
-            "sac_scale": {
-                "label": "صعوبة الطريق"
-            },
             "service": {
                 "label": "النوع"
             },
@@ -693,9 +677,6 @@
             "towertype": {
                 "label": "نوع البرج"
             },
-            "tracktype": {
-                "label": "نوع"
-            },
             "trail_visibility": {
                 "label": "وضوحية الطريق"
             },
@@ -821,18 +802,10 @@
                 "name": "غسيل سيارات",
                 "terms": "غسيل السيارات"
             },
-            "amenity/childcare": {
-                "name": "رعاية الأطفال",
-                "terms": "رعاية الأطفال, حماية الطفولة"
-            },
             "amenity/cinema": {
                 "name": "سينما",
                 "terms": "سينما,صالة سينما, دار السينما "
             },
-            "amenity/college": {
-                "name": "كلية",
-                "terms": "كلية, مبنى الكلية, حشد, مجمع"
-            },
             "amenity/courthouse": {
                 "name": "دار العدل",
                 "terms": "مجمع المحاكم, دار العدل, دار القضاء"
@@ -865,14 +838,6 @@
                 "name": "مقبرة",
                 "terms": "مقبرة, مدفن"
             },
-            "amenity/hospital": {
-                "name": "مستشفى",
-                "terms": "مستشفى, مستوصف"
-            },
-            "amenity/kindergarten": {
-                "name": "روضة أطفال",
-                "terms": "روضة أطفال"
-            },
             "amenity/library": {
                 "name": "مكتبة",
                 "terms": "مكتبة"
@@ -933,10 +898,6 @@
                 "name": "مطعم",
                 "terms": "مطعم"
             },
-            "amenity/school": {
-                "name": "مدرسة",
-                "terms": "مدرسة"
-            },
             "amenity/shelter": {
                 "name": "مأوى",
                 "terms": "مأوى, ملجأ, ملاذ, سقيفة, وقاء"
@@ -965,10 +926,6 @@
                 "name": "قاعة البلدة",
                 "terms": "قاعة البلدة"
             },
-            "amenity/university": {
-                "name": "جامعة",
-                "terms": "جامعة"
-            },
             "amenity/vending_machine": {
                 "name": "آلة بيع",
                 "terms": "آلة بيع، نقطة بيع"
@@ -1065,10 +1022,6 @@
                 "name": "مبني تجاري",
                 "terms": "مبنى تجاري"
             },
-            "building/entrance": {
-                "name": "مدخل",
-                "terms": "مدخل"
-            },
             "building/garage": {
                 "name": "جراج",
                 "terms": "مَرْأب , كراج, تصليح سيارات"
@@ -1101,10 +1054,6 @@
                 "name": "هاتف طوارئ",
                 "terms": "هاتف طوارئ"
             },
-            "entrance": {
-                "name": "مدخل",
-                "terms": "مدخل"
-            },
             "footway/crossing": {
                 "name": "تقاطع",
                 "terms": "تقاطع, معبر"
@@ -1149,10 +1098,6 @@
                 "name": "طريق سريع",
                 "terms": "طريق سريع"
             },
-            "highway/motorway_junction": {
-                "name": "مفرق طريق سريع",
-                "terms": "مفرق طريق سريع"
-            },
             "highway/motorway_link": {
                 "name": "رابط لطريق سريع",
                 "terms": "رابط لطريق سريع"
@@ -1425,10 +1370,6 @@
                 "name": "مزلقة سفن",
                 "terms": "مزلقة سفن"
             },
-            "leisure/sports_center": {
-                "name": "مركز رياضة",
-                "terms": "مركز رياضي، مركز للتسلية والترفيه"
-            },
             "leisure/stadium": {
                 "name": "مدرج رياضي",
                 "terms": "مدرج, مدرج للألعاب الرياضية, أستاذ رياضي"
@@ -1437,10 +1378,6 @@
                 "name": "حوض سباحة",
                 "terms": "حوض سباحة"
             },
-            "leisure/track": {
-                "name": "ميدان سباق",
-                "terms": "ميدان سباق"
-            },
             "line": {
                 "name": "طريق",
                 "terms": "طريق"
@@ -1489,10 +1426,6 @@
                 "name": "خزان مائي",
                 "terms": "خزان مائي"
             },
-            "man_made/water_well": {
-                "name": "بئر مياه",
-                "terms": "بئر ماء"
-            },
             "man_made/water_works": {
                 "name": "محطة مياه",
                 "terms": "محطة مياه"
@@ -1809,10 +1742,6 @@
                 "name": "محل دراجات هوائية",
                 "terms": "محل دراجات هوائية"
             },
-            "shop/books": {
-                "name": "محل بيع كتب",
-                "terms": "محل بيع كتب"
-            },
             "shop/boutique": {
                 "name": "بوتيك",
                 "terms": "بوتيك"
@@ -1845,10 +1774,6 @@
                 "name": "محل حاسوب",
                 "terms": "محل حاسوب"
             },
-            "shop/confectionery": {
-                "name": "محل حلويات",
-                "terms": "محل حلويات"
-            },
             "shop/convenience": {
                 "name": "بقالة",
                 "terms": "بقالة"
@@ -1865,10 +1790,6 @@
                 "name": "محل افعلها بنفسك",
                 "terms": "محل افعلها بنفسك"
             },
-            "shop/dry_cleaning": {
-                "name": "محل غسيل جاف",
-                "terms": "محل غسيل الجاف"
-            },
             "shop/electronics": {
                 "name": "محل إلكترونيات",
                 "terms": "محل إلكترونيات"
@@ -1917,10 +1838,6 @@
                 "name": "محل بيع مجوهرات",
                 "terms": "محل بيع المجوهرات, محل بيع الذهب"
             },
-            "shop/kiosk": {
-                "name": "كشك",
-                "terms": "كشك"
-            },
             "shop/laundry": {
                 "name": "محل غسيل ملابس",
                 "terms": "غسيل ملابس"
@@ -1945,18 +1862,10 @@
                 "name": "محل بيع موسيقى",
                 "terms": "محل بيع الموسيقى"
             },
-            "shop/newsagent": {
-                "name": "محل بيع صحف",
-                "terms": "محل بيع صحف"
-            },
             "shop/optician": {
                 "name": "محل بيع نظارات",
                 "terms": "محل بيع نظارات"
             },
-            "shop/outdoor": {
-                "name": "محل بيع مستلزمات التخييم",
-                "terms": "محل بيع مستلزمات التخييم"
-            },
             "shop/pet": {
                 "name": "محل حيوانات أليفة",
                 "terms": "محل حيوانات أليفة"

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

@@ -30,7 +30,8 @@
         "add": {
             "annotation": {
                 "point": "Добавена е точка.",
-                "vertex": "Добавен е възел към път."
+                "vertex": "Добавен е възел към път.",
+                "relation": "Добавена е връзка"
             }
         },
         "start": {
@@ -40,6 +41,9 @@
             }
         },
         "continue": {
+            "key": "А",
+            "title": "Продължи",
+            "description": "Продължи тази линия.",
             "annotation": {
                 "line": "Продължена е линия.",
                 "area": "Продължен е площен обект."
@@ -68,14 +72,19 @@
             "not_closed": "Този обект не може да стане кръг, защото не е затворен."
         },
         "orthogonalize": {
+            "title": "Квадрат",
+            "key": "S",
             "annotation": {
                 "line": "Изправихте ъглите на линия.",
                 "area": "Изправихте ъглите на площен обект."
             }
         },
+        "straighten": {
+            "key": "S"
+        },
         "delete": {
             "title": "Изтриване",
-            "description": "Премахнете това от картата.",
+            "description": "Изтрива обекта окончателно",
             "annotation": {
                 "point": "Изтрита е точка.",
                 "vertex": "Изтрит е възел от път.",
@@ -131,6 +140,7 @@
         },
         "rotate": {
             "title": "Въртене",
+            "description": "Завъртете този обект около централната му точка.",
             "key": "R",
             "annotation": {
                 "line": "Завъртяна е линия.",
@@ -158,9 +168,22 @@
             },
             "not_eligible": "Линиите не могат да бъдат разделяни в началото или края им.",
             "multiple_ways": "Има твърде много линии за разделяне тук."
+        },
+        "restriction": {
+            "help": {
+                "select": "Клик за селекция на пътен сегмент",
+                "toggle": "Натиснете за обръщане на ограниченията за завиване",
+                "toggle_on": "Натиснете за добавяне на \"{restriction}\" ограничение.",
+                "toggle_off": "Натиснете за премахване на \"{restriction}\" ограничение."
+            },
+            "annotation": {
+                "create": "Добавено ограничение в завойте",
+                "delete": "Изтрийте ограничение за завиване."
+            }
         }
     },
     "undo": {
+        "tooltip": "Назад: {action}",
         "nothing": "Нищо за отменяне."
     },
     "redo": {
@@ -200,6 +223,11 @@
         "list": "Редакции от {users}",
         "truncated_list": "Редакции от {users} и още {count} други"
     },
+    "geocoder": {
+        "search": "Търси навсякъде...",
+        "no_results_visible": "Няма резултати във видимата част на картата",
+        "no_results_worldwide": "Няма намерени резултати"
+    },
     "geolocate": {
         "title": "Показване на моето местоположение"
     },
@@ -211,6 +239,7 @@
         "all_tags": "Всички тагове",
         "all_members": "Всички членове",
         "all_relations": "Всички релации",
+        "new_relation": "Нова връзка...",
         "role": "Роля",
         "choose": "Изберете вид обект",
         "results": "{n} резултата за {search}",
@@ -226,6 +255,7 @@
         "title": "Изображения",
         "description": "Изображения настройки",
         "percent_brightness": "{opacity}% яркост",
+        "fix_misalignment": "Подравняване",
         "reset": "презареждане"
     },
     "restore": {
@@ -246,7 +276,9 @@
         "edited_osm": "Редактирахте OSM!",
         "just_edited": "Вие редактирахте OpenStreetMap!",
         "view_on_osm": "Вижте в OSM",
-        "facebook": "Споделете във Facebook"
+        "facebook": "Споделете във Facebook",
+        "twitter": "Сподели в Twitter",
+        "google": "Сподели в Google+"
     },
     "confirm": {
         "okay": "Окей"
@@ -312,7 +344,6 @@
         },
         "areas": {
             "title": "Площи",
-            "add": "Площите са по-подробен начин за изобразяване на обектите на картата. Те дават информация за границите на обекта. Площите могат да бъдат използвани за повечето обекти изобразявани с точка и често това се предпочита. **Натиснете бутона 'Площ', за да добавите нов площен обект.",
             "corner": "Площни обекти се чертаят чрез поставяне на възли, които маркират контура на площния обект. **Поставете началния възел върху един от краищата на детската площадка.**",
             "place": "Начертайте площния обект като поставите още възли. Завършете площния обект като щракнете върху началния възел. **Начертайте площ за детската площадка.**",
             "search": "**Потърсете '{name}'**",
@@ -395,11 +426,17 @@
             "address": {
                 "label": "Адрес",
                 "placeholders": {
-                    "housename": "Име на жилищна сграда",
-                    "number": "123",
+                    "housename": "Къща",
+                    "housenumber": "123",
                     "street": "Улица",
                     "city": "Град",
-                    "postcode": "Пощенски код"
+                    "place": "Място",
+                    "suburb": "Квартал",
+                    "subdistrict": "Землище",
+                    "district": "Община",
+                    "province": "Област",
+                    "state": "Икономически район NUT2",
+                    "country": "Държава"
                 }
             },
             "admin_level": {
@@ -509,6 +546,9 @@
                     "terminal": "Терминал"
                 }
             },
+            "lamp_type": {
+                "label": "Тип"
+            },
             "landuse": {
                 "label": "Вид"
             },
@@ -590,16 +630,7 @@
                 "label": "Вид"
             },
             "religion": {
-                "label": "Религия",
-                "options": {
-                    "christian": "Християнство",
-                    "muslim": "Мюсюлманство",
-                    "buddhist": "Будизъм",
-                    "jewish": "Юдаизъм",
-                    "hindu": "Хиндуизъм",
-                    "shinto": "Шинтоизъм",
-                    "taoist": "Таоизъм"
-                }
+                "label": "Религия"
             },
             "restriction": {
                 "label": "Вид"
@@ -610,9 +641,6 @@
             "route_master": {
                 "label": "Вид"
             },
-            "sac_scale": {
-                "label": "Трудност на пътеката"
-            },
             "service": {
                 "label": "Вид"
             },
@@ -650,9 +678,6 @@
             "towertype": {
                 "label": "Вид кула"
             },
-            "tracktype": {
-                "label": "Вид"
-            },
             "trail_visibility": {
                 "label": "Видимост на туристическата пътека"
             },
@@ -746,9 +771,6 @@
             "amenity/cinema": {
                 "name": "Кино"
             },
-            "amenity/college": {
-                "name": "Колеж"
-            },
             "amenity/courthouse": {
                 "name": "Съд"
             },
@@ -773,12 +795,6 @@
             "amenity/grave_yard": {
                 "name": "Гробище"
             },
-            "amenity/hospital": {
-                "name": "Болница"
-            },
-            "amenity/kindergarten": {
-                "name": "Детска градина"
-            },
             "amenity/library": {
                 "name": "Библиотека"
             },
@@ -818,9 +834,6 @@
             "amenity/restaurant": {
                 "name": "Ресторант"
             },
-            "amenity/school": {
-                "name": "Училище"
-            },
             "amenity/swimming_pool": {
                 "name": "Плувен басейн"
             },
@@ -839,9 +852,6 @@
             "amenity/townhall": {
                 "name": "Кметство"
             },
-            "amenity/university": {
-                "name": "Университет"
-            },
             "amenity/waste_basket": {
                 "name": "Кош за боклук"
             },
@@ -908,18 +918,12 @@
             "building/apartments": {
                 "name": "Жилищен блок"
             },
-            "building/entrance": {
-                "name": "Вход"
-            },
             "building/house": {
                 "name": "Къща"
             },
             "emergency/phone": {
                 "name": "Телефон за спешна помощ"
             },
-            "entrance": {
-                "name": "Вход"
-            },
             "highway": {
                 "name": "Път"
             },
@@ -947,9 +951,6 @@
             "highway/motorway": {
                 "name": "Автомагистрала"
             },
-            "highway/motorway_junction": {
-                "name": "Автомагистрален пътен възел"
-            },
             "highway/motorway_link": {
                 "name": "Автомагистрална връзка"
             },
@@ -998,6 +999,9 @@
             "highway/steps": {
                 "name": "Стъпала"
             },
+            "highway/street_lamp": {
+                "name": "Улична лампа"
+            },
             "highway/tertiary": {
                 "name": "Третокласен път"
             },
@@ -1181,9 +1185,6 @@
             "man_made/water_tower": {
                 "name": "Водна кула"
             },
-            "man_made/water_well": {
-                "name": "Кладенец"
-            },
             "man_made/water_works": {
                 "name": "Помпена станция"
             },
@@ -1346,9 +1347,6 @@
             "shop/bicycle": {
                 "name": "Магазин за велосипеди"
             },
-            "shop/books": {
-                "name": "Книжарница"
-            },
             "shop/boutique": {
                 "name": "Бутик"
             },
@@ -1373,9 +1371,6 @@
             "shop/computer": {
                 "name": "Компютърен магазин"
             },
-            "shop/confectionery": {
-                "name": "Сладкарница"
-            },
             "shop/convenience": {
                 "name": "Магазин за хранителни стоки"
             },
@@ -1388,9 +1383,6 @@
             "shop/doityourself": {
                 "name": "Магазин \"Направи си сам\""
             },
-            "shop/dry_cleaning": {
-                "name": "Химическо чистене"
-            },
             "shop/electronics": {
                 "name": "Магазин за електроника"
             },
@@ -1427,9 +1419,6 @@
             "shop/jewelry": {
                 "name": "Бижутер"
             },
-            "shop/kiosk": {
-                "name": "Будка за вестници"
-            },
             "shop/laundry": {
                 "name": "Пералня"
             },
@@ -1445,15 +1434,9 @@
             "shop/music": {
                 "name": "Музикален магазин"
             },
-            "shop/newsagent": {
-                "name": "Продавач на вестници"
-            },
             "shop/optician": {
                 "name": "Оптика"
             },
-            "shop/outdoor": {
-                "name": "Магазин за екипировка"
-            },
             "shop/pet": {
                 "name": "Зоо магазин"
             },
@@ -1550,6 +1533,21 @@
             "type/restriction": {
                 "name": "Ограничение"
             },
+            "type/restriction/no_right_turn": {
+                "name": "Без десен завой"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Без обратен завой"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Завой само на ляво"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Завой само на дясно"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Без завиване"
+            },
             "type/route": {
                 "name": "Маршрут"
             },

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

@@ -88,7 +88,6 @@
         },
         "delete": {
             "title": "মুছে ফেলুন",
-            "description": "ম্যাপ থেকে এটিকে মুছে ফেলুন।",
             "annotation": {
                 "point": "একটি বিন্দু মুছে ফেলা হয়েছে।",
                 "vertex": "একটি গমনপথ থেকে একটি নোড মুছে ফেলা হয়েছে।",
@@ -342,6 +341,15 @@
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "দালান"
+            },
+            "category-golf": {
+                "name": "গল্ফ"
+            },
+            "category-landuse": {
+                "name": "ভুমির ব্যবহার"
+            },
             "category-path": {
                 "name": "পথ"
             },
@@ -350,6 +358,12 @@
             },
             "category-road": {
                 "name": "রাস্তা"
+            },
+            "category-water-area": {
+                "name": "জল"
+            },
+            "category-water-line": {
+                "name": "জল"
             }
         },
         "fields": {
@@ -365,7 +379,8 @@
                 },
                 "options": {
                     "yes": {
-                        "title": "অনুমোদিত"
+                        "title": "অনুমোদিত",
+                        "description": "অাইনানুসারে প্রবেশ অনুমোদিত"
                     },
                     "no": {
                         "title": "নিষিদ্ধ",
@@ -388,14 +403,54 @@
                     }
                 }
             },
+            "access_simple": {
+                "label": "প্রবেশ করা",
+                "placeholder": "হ্যা"
+            },
+            "access_toilets": {
+                "label": "প্রবেশ করা"
+            },
             "address": {
                 "label": "ঠিকানা",
                 "placeholders": {
                     "housename": "বাড়ির নাম",
-                    "number": "১২৩",
+                    "housenumber": "১২৩",
                     "street": "স্ট্রীট",
                     "city": "শহর",
-                    "postcode": "পিনকোড"
+                    "postcode": "পিনকোড",
+                    "place": "জায়গা",
+                    "suburb": "শহরতলি",
+                    "subdistrict": "উপজেলা",
+                    "district": "জেলা",
+                    "state": "রাজ্য",
+                    "country": "দেশ"
+                }
+            },
+            "aerialway": {
+                "label": "টাইপ"
+            },
+            "aerialway/access": {
+                "label": "প্রবেশ করা",
+                "options": {
+                    "entry": "প্রবেশ",
+                    "exit": "প্রস্থাণ",
+                    "both": "উভয়"
+                }
+            },
+            "aerialway/capacity": {
+                "placeholder": "৫০০, ২৫০০, ৫০০০ ..."
+            },
+            "aerialway/duration": {
+                "placeholder": "১, ২, ৩..."
+            },
+            "aerialway/occupancy": {
+                "placeholder": "২, ৪, ৮..."
+            },
+            "aerialway/summer/access": {
+                "options": {
+                    "entry": "প্রবেশ",
+                    "exit": "প্রস্থাণ",
+                    "both": "উভয়"
                 }
             },
             "aeroway": {
@@ -433,7 +488,14 @@
                 "placeholder": "৫০, ১০০, ২০০..."
             },
             "cardinal_direction": {
-                "label": "দিক/অভিমুখ"
+                "label": "দিক/অভিমুখ",
+                "options": {
+                    "N": "উত্তর",
+                    "E": "পূর্ব",
+                    "S": "দক্ষিণ",
+                    "W": "পশ্চিম",
+                    "NE": "উত্তরপূর্ব"
+                }
             },
             "clock_direction": {
                 "label": "দিক/অভিমুখ",
@@ -466,6 +528,9 @@
             "entrance": {
                 "label": "টাইপ"
             },
+            "except": {
+                "label": "ব্যতিক্রম"
+            },
             "fax": {
                 "label": "ফ্যাক্স",
                 "placeholder": "+৩১ ৪২ ১২৩ ৪৫৬৭"
@@ -474,29 +539,51 @@
                 "label": "মূল্য"
             },
             "fire_hydrant/type": {
-                "label": "টাইপ"
+                "label": "টাইপ",
+                "options": {
+                    "wall": "দেয়াল",
+                    "pond": "পুকুর"
+                }
             },
             "fixme": {
                 "label": "অামাকে ঠিক করুন"
             },
+            "fuel": {
+                "label": "জ্বালানি"
+            },
             "generator/method": {
                 "label": "পদ্ধতি"
             },
+            "generator/source": {
+                "label": "উৎস"
+            },
             "generator/type": {
                 "label": "টাইপ"
             },
+            "handicap": {
+                "label": "বিকলাঙ্গ",
+                "placeholder": "১-১৮"
+            },
             "highway": {
                 "label": "টাইপ"
             },
             "historic": {
                 "label": "টাইপ"
             },
+            "hoops": {
+                "placeholder": "১, ২, ৪..."
+            },
             "incline": {
                 "label": "ঝোকা"
             },
+            "information": {
+                "label": "টাইপ"
+            },
             "internet_access": {
                 "label": "ইন্টারনেট সুবিধা",
                 "options": {
+                    "yes": "হ্যা",
+                    "no": "না",
                     "wlan": "তারবিহীন",
                     "wired": "তারযুক্ত",
                     "terminal": "টার্মিনাল"
@@ -515,6 +602,9 @@
             "leisure": {
                 "label": "টাইপ"
             },
+            "length": {
+                "label": "দৈর্ঘ্য (মিটার)"
+            },
             "levels": {
                 "label": "স্তর",
                 "placeholder": "২, ৪, ৬..."
@@ -580,14 +670,7 @@
                 "label": "টাইপ"
             },
             "religion": {
-                "label": "ধর্ম",
-                "options": {
-                    "christian": "খ্রিষ্টান",
-                    "muslim": "মুসলিম",
-                    "buddhist": "বৌদ্ধ",
-                    "jewish": "ইহুদি",
-                    "hindu": "হিন্দু"
-                }
+                "label": "ধর্ম"
             },
             "restriction": {
                 "label": "টাইপ"
@@ -598,9 +681,6 @@
             "route_master": {
                 "label": "টাইপ"
             },
-            "sac_scale": {
-                "label": "পথের কঠিনতা"
-            },
             "service": {
                 "label": "টাইপ"
             },
@@ -630,9 +710,6 @@
             "tourism": {
                 "label": "টাইপ"
             },
-            "tracktype": {
-                "label": "টাইপ"
-            },
             "water": {
                 "label": "টাইপ"
             },
@@ -696,15 +773,9 @@
             "amenity/car_rental": {
                 "name": "গাড়ি ভাড়া"
             },
-            "amenity/childcare": {
-                "name": "শিশুপালন"
-            },
             "amenity/cinema": {
                 "name": "সিনেমা"
             },
-            "amenity/college": {
-                "name": "কলেজ/মহাবিদ্যালয়"
-            },
             "amenity/drinking_water": {
                 "name": "পানীয় জল"
             },
@@ -726,9 +797,6 @@
             "amenity/grave_yard": {
                 "name": "কবরখানা"
             },
-            "amenity/hospital": {
-                "name": "হাসপাতাল"
-            },
             "amenity/library": {
                 "name": "পাঠাগার"
             },
@@ -768,9 +836,6 @@
             "amenity/restaurant": {
                 "name": "রেস্তোরাঁ"
             },
-            "amenity/school": {
-                "name": "বিদ্যালয়"
-            },
             "amenity/swimming_pool": {
                 "name": "সাঁতার কাটার পুকুর"
             },
@@ -786,9 +851,6 @@
             "amenity/townhall": {
                 "name": "টাউন হল"
             },
-            "amenity/university": {
-                "name": "বিশ্ববিদ্যালয়"
-            },
             "area": {
                 "name": "এলাকা"
             },
@@ -816,9 +878,6 @@
             "building/commercial": {
                 "name": "বানিজ্যিক ভবন"
             },
-            "building/entrance": {
-                "name": "দ্বার"
-            },
             "building/garage": {
                 "name": "গ্যারেজ"
             },
@@ -837,9 +896,6 @@
             "emergency/phone": {
                 "name": "অাপদকালীন দুরভাষ"
             },
-            "entrance": {
-                "name": "প্রবেশপথ"
-            },
             "footway/crossing": {
                 "name": "ক্রসিং"
             },
@@ -1020,9 +1076,6 @@
             "man_made/water_tower": {
                 "name": "জল স্তম্ভ"
             },
-            "man_made/water_well": {
-                "name": "নলকুপ"
-            },
             "natural": {
                 "name": "প্রাকৃতিক"
             },
@@ -1158,9 +1211,6 @@
             "shop/bicycle": {
                 "name": "সাইকেল-এর দোকান"
             },
-            "shop/books": {
-                "name": "বই-এর দোকান"
-            },
             "shop/boutique": {
                 "name": "বুটিক"
             },
@@ -1185,9 +1235,6 @@
             "shop/computer": {
                 "name": "কম্পিউটার-এর দোকান"
             },
-            "shop/confectionery": {
-                "name": "কনফেকশনারি"
-            },
             "shop/department_store": {
                 "name": "ডিপার্টমেন্ট স্টোর"
             },

vendor/assets/iD/iD/locales/bs.json

@@ -95,7 +95,6 @@
         },
         "delete": {
             "title": "Izbrišite",
-            "description": "Uklonite ovo sa karte.",
             "annotation": {
                 "point": "Izbrisana tačka.",
                 "vertex": "Izbrisan čvor sa putanje.",
@@ -260,7 +259,6 @@
         "percent_brightness": "prozirnost {opacity}% ",
         "none": "Ništa",
         "custom": "Prilagođena pozadina",
-        "custom_prompt": "Unesite šablon pločica. Validni simboli su {z}, {x}, {y} za Z/X/Y šemu i {u} za \"QuadTile\" šemu.",
         "fix_misalignment": "Popravite poravnanje",
         "reset": "ponovo postavite"
     },
@@ -359,7 +357,6 @@
         },
         "areas": {
             "title": "Područja",
-            "add": "Područja su detaljniji način da se predstave značajke. Ona pružaju informacije o granicama značajke. Područja mogu biti korištena za većinu vrsta značajki za koje se koriste tačke, i često su preferirane. **Kliknite na dugme 'Područje' da dodate novo područje.**",
             "corner": "Područja se crtaju postavljanjem čvorova koji označavaju granicu područja. **Postavite početni čvor na uglovima igrališta.**",
             "place": "Nacrtati područje postavljanjem više čvorova. Završiti područje klikom na početni čvor. **Nacrtati područje za igralište.**",
             "search": "**Tražiti '{name}'.**",
@@ -459,11 +456,8 @@
             "address": {
                 "label": "Adresa",
                 "placeholders": {
-                    "housename": "Naziv",
-                    "number": "123",
                     "street": "Ulica",
-                    "city": "Grad",
-                    "postcode": "Poštanski broj"
+                    "city": "Grad"
                 }
             },
             "admin_level": {
@@ -529,9 +523,6 @@
             "building_area": {
                 "label": "Građevina"
             },
-            "cans": {
-                "label": "Prihvata konzerve"
-            },
             "capacity": {
                 "label": "Kapacitet",
                 "placeholder": "50, 100, 200..."
@@ -546,9 +537,6 @@
                     "anticlockwise": "U smjeru suprotnom od kazaljke na satu"
                 }
             },
-            "clothes": {
-                "label": "Prihvata odjeću"
-            },
             "collection_times": {
                 "label": "Vremena skupljanja"
             },
@@ -607,9 +595,6 @@
             "generator/type": {
                 "label": "Vrsta"
             },
-            "glass": {
-                "label": "Prihvata staklo"
-            },
             "golf_hole": {
                 "label": "Referenca",
                 "placeholder": "Rupa broj (1-18)"
@@ -702,9 +687,6 @@
             "operator": {
                 "label": "Operator"
             },
-            "paper": {
-                "label": "Prihvata papir"
-            },
             "par": {
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
@@ -744,16 +726,7 @@
                 "label": "Vrsta"
             },
             "religion": {
-                "label": "Religija",
-                "options": {
-                    "christian": "Kršćanstvo",
-                    "muslim": "Islam",
-                    "buddhist": "Budizam",
-                    "jewish": "Judaizam",
-                    "hindu": "Hinduizam",
-                    "shinto": "Šintoizam",
-                    "taoist": "Taoizam"
-                }
+                "label": "Religija"
             },
             "restriction": {
                 "label": "Vrsta"
@@ -764,9 +737,6 @@
             "route_master": {
                 "label": "Vrsta"
             },
-            "sac_scale": {
-                "label": "Težina staze"
-            },
             "service": {
                 "label": "Vrsta"
             },
@@ -813,9 +783,6 @@
             "towertype": {
                 "label": "Tip tornja"
             },
-            "tracktype": {
-                "label": "vrsta"
-            },
             "trail_visibility": {
                 "label": "Vidljivost traga"
             },
@@ -947,10 +914,6 @@
                 "name": "Autopraonica",
                 "terms": "autopraonica,samouslužna autopraonica,praonica automobila"
             },
-            "amenity/childcare": {
-                "name": "Briga o djeci",
-                "terms": "čuvanje djece,dnevni boravak djece,briga o djeci"
-            },
             "amenity/cinema": {
                 "name": "Kino",
                 "terms": "kino,kino dvorana,multipleks"
@@ -958,10 +921,6 @@
             "amenity/clinic": {
                 "name": "Klinika"
             },
-            "amenity/college": {
-                "name": "Koledž",
-                "terms": "koledž,fakultet,faks"
-            },
             "amenity/courthouse": {
                 "name": "Sudnica",
                 "terms": "sudnica,zgrada suda"
@@ -1002,14 +961,6 @@
                 "name": "Groblje",
                 "terms": "groblje,greblje,mezarje"
             },
-            "amenity/hospital": {
-                "name": "Bolnica",
-                "terms": "bolnica,centar za liječenje"
-            },
-            "amenity/kindergarten": {
-                "name": "Vrtić",
-                "terms": "vrtić,dječji vrtić,zabavište"
-            },
             "amenity/library": {
                 "name": "Biblioteka",
                 "terms": "biblioteka,knjižnica"
@@ -1074,10 +1025,6 @@
                 "name": "Restoran",
                 "terms": "restoran,gostionica"
             },
-            "amenity/school": {
-                "name": "Škola",
-                "terms": "škola,školska zgrada"
-            },
             "amenity/shelter": {
                 "name": "Sklonište",
                 "terms": "sklonište,zaklon"
@@ -1109,10 +1056,6 @@
                 "name": "Gradska vijećnica",
                 "terms": "gradska vijećnica,vijećnica"
             },
-            "amenity/university": {
-                "name": "Univerzitet",
-                "terms": "univerzitet,koledž"
-            },
             "amenity/vending_machine": {
                 "name": "Automat",
                 "terms": "automat,automat za prodaju pića,automat sa pićem,automat sa slatkišima"
@@ -1209,10 +1152,6 @@
                 "name": "Poslovna zgrada",
                 "terms": "poslovna zgrada,zgrada firme"
             },
-            "building/entrance": {
-                "name": "Ulaz",
-                "terms": "ulaz,vrata"
-            },
             "building/garage": {
                 "name": "Garaža",
                 "terms": "garaža"
@@ -1291,9 +1230,6 @@
             "craft/photographer": {
                 "name": "Fotograf"
             },
-            "craft/photographic_labratory": {
-                "name": "Fotografska laboratorija"
-            },
             "craft/plumber": {
                 "name": "Vodoinstalater"
             },
@@ -1337,10 +1273,6 @@
                 "name": "Telefon za hitne slučajeve",
                 "terms": "telefon za hitne slučajeve,hitna telefonska linija"
             },
-            "entrance": {
-                "name": "Ulaz",
-                "terms": "ulaz,vrata"
-            },
             "footway/crossing": {
                 "name": "Prelaz",
                 "terms": "prelaz,pješački prelaz"
@@ -1417,10 +1349,6 @@
                 "name": "Autoput",
                 "terms": "autoput,autocesta"
             },
-            "highway/motorway_junction": {
-                "name": "Čvorište autoputa",
-                "terms": "čvorište autoceste,čvorište autoputa"
-            },
             "highway/motorway_link": {
                 "name": "Poveznica na autoput",
                 "terms": "poveznica na autoput,poveznica na autocestu"
@@ -1697,10 +1625,6 @@
                 "name": "Navoz",
                 "terms": "navoz,navoz na šine"
             },
-            "leisure/sports_center": {
-                "name": "Sportski centar",
-                "terms": "sportski centar,centar za sport, centar za sportske aktivnosti"
-            },
             "leisure/stadium": {
                 "name": "Stadion",
                 "terms": "stadion,sportsko borilište"
@@ -1709,10 +1633,6 @@
                 "name": "Bazen",
                 "terms": "bazen,bazen za plivanje,plivački bazen"
             },
-            "leisure/track": {
-                "name": "Staza za utrku",
-                "terms": "staza za utrku,trkaća staza"
-            },
             "line": {
                 "name": "Linija",
                 "terms": "linija"
@@ -1769,10 +1689,6 @@
                 "name": "Vodo-toranj",
                 "terms": "vodo-toranj,vodeni toranj"
             },
-            "man_made/water_well": {
-                "name": "Bunar",
-                "terms": "bunar,umjetni rezervoar za vodu"
-            },
             "man_made/water_works": {
                 "name": "Vodosnadbjevanje",
                 "terms": "vodosnadbjevanje,snadbjevanje vodom"
@@ -2113,10 +2029,6 @@
                 "name": "Prodavnica bicikala",
                 "terms": "prodavnica bicikala,radnja za prodaju bicikala"
             },
-            "shop/books": {
-                "name": "Knjižara",
-                "terms": "knjižara,radnja za prodaju knjiga"
-            },
             "shop/boutique": {
                 "name": "Butik",
                 "terms": "butik,radnja za prodaju odjeće"
@@ -2149,10 +2061,6 @@
                 "name": "Prodavnica računara",
                 "terms": "radnja za prodaju računara,prodaja računara i računarske opreme"
             },
-            "shop/confectionery": {
-                "name": "Slastičarna",
-                "terms": "slastičarna,slatki butik"
-            },
             "shop/convenience": {
                 "name": "Bakalnica",
                 "terms": "bakalnica,dragstor,prodavnica,granap"
@@ -2169,10 +2077,6 @@
                 "name": "Sve za kuću",
                 "terms": "sve za kuću,prodaja dijelova za \"uradi sam\" radove"
             },
-            "shop/dry_cleaning": {
-                "name": "Hemijsko čišćenje",
-                "terms": "hemijska čistionica,hemijsko čišćenje odjeće"
-            },
             "shop/electronics": {
                 "name": "Prodavnica elektronike",
                 "terms": "prodavnica elektronike,radnja za prodaju elektronskih uređaja"
@@ -2221,10 +2125,6 @@
                 "name": "Zlatar",
                 "terms": "zlatara,radnja za prodaju nakita"
             },
-            "shop/kiosk": {
-                "name": "Trafika",
-                "terms": "trafika,kiosk"
-            },
             "shop/laundry": {
                 "name": "Praonica",
                 "terms": "praonica,servis za pranje rublja"
@@ -2249,18 +2149,10 @@
                 "name": "Muzička prodavnica",
                 "terms": "muzička prodavnica,prodaja muzičke opreme i muzike"
             },
-            "shop/newsagent": {
-                "name": "Kiosk",
-                "terms": "trafika,kiosk"
-            },
             "shop/optician": {
                 "name": "Optičar",
                 "terms": "optičar,optičarska radnja"
             },
-            "shop/outdoor": {
-                "name": "Prodavnica opreme za rekreaciju",
-                "terms": "prodavnica planinarske opreme,prodaja kamp opreme,prodaja GPS uređaja"
-            },
             "shop/pet": {
                 "name": "Prodavnica kućnih ljubnimaca",
                 "terms": "prodavnica kućnih ljubimaca,prodaja hrane za kućne ljubimce"

vendor/assets/iD/iD/locales/cs.json

@@ -71,7 +71,8 @@
                 "line": "Cesta zakulacena.",
                 "area": "Plocha zakulacena."
             },
-            "not_closed": "Z objektu nelze udělat kruh, protože nejde o smyčku."
+            "not_closed": "Z objektu nelze udělat kruh, protože nejde o smyčku.",
+            "too_large": "Z objektu nelze udělat kruh, protože není vidět dostatečně velká část."
         },
         "orthogonalize": {
             "title": "Zhranatit",
@@ -84,7 +85,8 @@
                 "line": "Úhly cesty do pravého úhle.",
                 "area": "Rohy plochy do pravého úhle."
             },
-            "not_squarish": "Z objektu není možné udělat čtverec, protože se čtverci vůbec nepodobá."
+            "not_squarish": "Z objektu není možné udělat čtverec, protože se čtverci vůbec nepodobá.",
+            "too_large": "Z objektu není možné udělat čtverec, protože není vidět dostatečně velká část."
         },
         "straighten": {
             "title": "Narovnat",
@@ -95,7 +97,6 @@
         },
         "delete": {
             "title": "Smazat",
-            "description": "Odstranit objekt z mapy.",
             "annotation": {
                 "point": "Smazán uzel.",
                 "vertex": "Smazán uzel z cesty.",
@@ -134,7 +135,8 @@
             "annotation": "Cesty spojeny (celkem {n}).",
             "not_eligible": "Objekty nelze spojit v jeden.",
             "not_adjacent": "Tyto cesty nelze spojit v jednu, protože nekončí v jednom bodě.",
-            "restriction": "Tyto cesty není možné spojit, protože aspoň jedna z nich je členem relace \"{relation}\"."
+            "restriction": "Tyto cesty není možné spojit, protože aspoň jedna z nich je členem relace \"{relation}\".",
+            "incomplete_relation": "Zvolené objekty není možné spojit, protože nejsou úplně stažené."
         },
         "move": {
             "title": "Posunout",
@@ -179,6 +181,18 @@
             },
             "not_eligible": "Cestu není možné rozdělit v jejím začátku ani konci.",
             "multiple_ways": "Není jasné, kterou cestu rozdělit."
+        },
+        "restriction": {
+            "help": {
+                "select": "Kliknutím zvolte část silnice.",
+                "toggle": "Kliknutím přepněte omezení odbočování.",
+                "toggle_on": "Kliknutím přidejte omezení typu \"{restriction}\".",
+                "toggle_off": "Kliknutím odstraníte omezení \"{restriction}\"."
+            },
+            "annotation": {
+                "create": "Přidáno omezení odbočování",
+                "delete": "Smazáno omezení odbočování"
+            }
         }
     },
     "undo": {
@@ -264,6 +278,7 @@
         "percent_brightness": "{opacity}% viditelnost",
         "none": "Žádné",
         "custom": "Vlastní",
+        "custom_button": "Editovat vlastní pozadí",
         "custom_prompt": "Vložte šablonu adres dlaždic. Lze použít tokeny {z}, {x}, {y} pro schéma Z/X/Y a {u} pro hierarchické schéma quadtile.",
         "fix_misalignment": "Vyrovnat posunutí pozadí",
         "reset": "vrátit na začátek"
@@ -316,7 +331,6 @@
         "untagged_area": "Neoznačená plocha",
         "many_deletions": "Pokoušíte se smazat {n} objektů. Opravdu to chcete provést? Odstranilo by je z globální mapy na openstreetmap.org.",
         "tag_suggests_area": "Vlastnost {tag} obvykle označuje plochu - ale zvolený objekt není plocha",
-        "untagged_tooltip": "Zvolte typ objektu - co je tato {geometry} zač.",
         "deprecated_tags": "Zastaralé vlastnosti: {tag}"
     },
     "zoom": {
@@ -365,7 +379,6 @@
         },
         "areas": {
             "title": "Plochy",
-            "add": "Reálný objekt lze podrobněji reprezentovat pomocí plochy, která opisuje jeho hranici. Pro většinu typů objektů lze místo uzlu použít plochu - a často je to tak lepší. **Klikněte na tlačítko Plocha a přidejte tak novou plochu.**",
             "corner": "Plochu nakreslíte tak, že postupně nanášíte jeden uzel za druhým podél hranice plochy. **Umístěte první uzel na jeden z rohů hřiště.**",
             "place": "Plochu zakreslíte tak, že přidáte další uzly. Kreslení zakončíte kliknutím na počáteční uzel. **Nakreslete plochu hřiště.**",
             "search": "**Dejte hledat '{name}'.**",
@@ -408,6 +421,9 @@
             "category-rail": {
                 "name": "Železniční síť"
             },
+            "category-restriction": {
+                "name": "Omezení"
+            },
             "category-road": {
                 "name": "Silniční síť"
             },
@@ -465,11 +481,9 @@
             "address": {
                 "label": "Adresa",
                 "placeholders": {
-                    "housename": "Název budovy",
-                    "number": "123",
                     "street": "Ulice",
                     "city": "Město",
-                    "postcode": "PSČ"
+                    "postcode": "Poštovní směrovací číslo"
                 }
             },
             "admin_level": {
@@ -535,9 +549,6 @@
             "building_area": {
                 "label": "Budova"
             },
-            "cans": {
-                "label": "Pro plechovky"
-            },
             "capacity": {
                 "label": "Kapacita",
                 "placeholder": "50, 100, 200..."
@@ -552,9 +563,6 @@
                     "anticlockwise": "Proti směru hod. ručiček"
                 }
             },
-            "clothes": {
-                "label": "Pro textil"
-            },
             "collection_times": {
                 "label": "Čas výběru"
             },
@@ -594,6 +602,9 @@
             "entrance": {
                 "label": "Typ"
             },
+            "except": {
+                "label": "Výjimky"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+31 42 123 4567"
@@ -619,9 +630,6 @@
             "generator/type": {
                 "label": "Typ"
             },
-            "glass": {
-                "label": "Pro sklo"
-            },
             "golf_hole": {
                 "label": "Číslo",
                 "placeholder": "Číslo jamky (1-18)"
@@ -669,6 +677,9 @@
             "leisure": {
                 "label": "Typ"
             },
+            "length": {
+                "label": "Délka (v metrech)"
+            },
             "levels": {
                 "label": "Počet pater",
                 "placeholder": "2, 4, 6..."
@@ -703,10 +714,16 @@
                 "label": "Typ"
             },
             "oneway": {
-                "label": "Jednosměrka"
+                "label": "Jednosměrka",
+                "options": {
+                    "undefined": "Implicitně Ne"
+                }
             },
             "oneway_yes": {
-                "label": "Jednosměrka"
+                "label": "Jednosměrka",
+                "options": {
+                    "undefined": "Implicitně Ano"
+                }
             },
             "opening_hours": {
                 "label": "Provozní doba"
@@ -714,9 +731,6 @@
             "operator": {
                 "label": "Provozovatel"
             },
-            "paper": {
-                "label": "Pro papír"
-            },
             "par": {
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
@@ -756,29 +770,20 @@
                 "label": "Typ"
             },
             "religion": {
-                "label": "Náboženství",
-                "options": {
-                    "christian": "Křesťanství",
-                    "muslim": "Islám",
-                    "buddhist": "Buddhismus",
-                    "jewish": "Judaismus",
-                    "hindu": "Hinduismus",
-                    "shinto": "Šintoismus",
-                    "taoist": "Taoismus"
-                }
+                "label": "Náboženství"
             },
             "restriction": {
                 "label": "Typ"
             },
+            "restrictions": {
+                "label": "Omezení odbočování"
+            },
             "route": {
                 "label": "Typ"
             },
             "route_master": {
                 "label": "Typ"
             },
-            "sac_scale": {
-                "label": "Obtížnost stezky"
-            },
             "service": {
                 "label": "Typ"
             },
@@ -791,6 +796,10 @@
             "shop": {
                 "label": "Typ"
             },
+            "social_facility_for": {
+                "label": "Zákazníci",
+                "placeholder": "Bezdomovec, Postižený ..."
+            },
             "source": {
                 "label": "Zdroj"
             },
@@ -804,7 +813,8 @@
                     "bridge": "Most",
                     "tunnel": "Tunel",
                     "embankment": "Násyp",
-                    "cutting": "Zářez"
+                    "cutting": "Zářez",
+                    "ford": "Brod"
                 }
             },
             "studio_type": {
@@ -825,9 +835,6 @@
             "towertype": {
                 "label": "Typ věže"
             },
-            "tracktype": {
-                "label": "Typ"
-            },
             "trail_visibility": {
                 "label": "Viditelnost stezky"
             },
@@ -856,6 +863,9 @@
             "wheelchair": {
                 "label": "Pro vozíčkáře"
             },
+            "width": {
+                "label": "Šířka (v metrech)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -996,10 +1006,6 @@
                 "name": "Mytí aut",
                 "terms": "myčka,automyčka,mytí,čistění,umývání,čistírna"
             },
-            "amenity/childcare": {
-                "name": "Mimoškolní péče",
-                "terms": "družina,školka,péče o děti,kroužek,tábor"
-            },
             "amenity/cinema": {
                 "name": "Kino",
                 "terms": "kino,film,cinema,multikino,bio,biograf,kinematograf"
@@ -1012,10 +1018,6 @@
                 "name": "Hodiny",
                 "terms": "hodiny,orloj,hodinky,chronometr,ciferník,čas,ukazatel času"
             },
-            "amenity/college": {
-                "name": "College",
-                "terms": "Vysoká škola,univerzita,akademie"
-            },
             "amenity/courthouse": {
                 "name": "Soud",
                 "terms": "soud,soudní budova,soudní dvůr"
@@ -1057,12 +1059,7 @@
                 "terms": "hřbitov,pohřebiště"
             },
             "amenity/hospital": {
-                "name": "Nemocnice",
-                "terms": "nemocnice,klinika,špitál,středisko,hospic,LDN,sanatorium,nemocniční,lazaret,ambulance,poliklinika,pohotovost"
-            },
-            "amenity/kindergarten": {
-                "name": "Mateřská školka",
-                "terms": "jesle,školka,kindergarten,předškolní"
+                "name": "Prostor nemocnice"
             },
             "amenity/library": {
                 "name": "Knihovna",
@@ -1129,13 +1126,21 @@
                 "terms": "bar,jídelna,kantýna,bistro,bufet,rychlé občerstvení,fast food,hamburger,restaurace,restaurant,hostinec,pohostinství,krčma,gastronomie,občerstvení,stánek,jídlo,obědy,gril,pizzeria,čína,kebab"
             },
             "amenity/school": {
-                "name": "Škola",
-                "terms": "univerzita,universita,fakulta,vysoká škola,univerzitní,universitní,katedra,ústav,college"
+                "name": "Prostor školy"
             },
             "amenity/shelter": {
                 "name": "Přístřešek",
                 "terms": "přístřešek,střecha,budka,bouda,čekárna"
             },
+            "amenity/social_facility": {
+                "name": "Sociální zařízení"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Zásoby jídla"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Bezdomovecký úkryt"
+            },
             "amenity/studio": {
                 "name": "Studio",
                 "terms": "studio,nahrávací studio,rozhlasové studio,rádiové studio,radiové studio,televizní studio,filmové studio,trikové studio,dabingové studio"
@@ -1164,10 +1169,6 @@
                 "name": "Radnice",
                 "terms": "radnice,místní správa,obecní správa,obecní úřad"
             },
-            "amenity/university": {
-                "name": "Vysoká škola",
-                "terms": "vysoká škola,univerzita,universita,vyšší odborná škola,VOŠ,college"
-            },
             "amenity/vending_machine": {
                 "name": "Prodejní automat",
                 "terms": "automat,prodejní automat"
@@ -1264,18 +1265,44 @@
                 "name": "Bytový dům",
                 "terms": "bytovka,bytový dům,obytná budova,panelák,věžák,barák,činžák,činžovní dům"
             },
+            "building/barn": {
+                "name": "Stodola"
+            },
+            "building/bunker": {
+                "name": "Bunkr"
+            },
+            "building/cabin": {
+                "name": "Srub"
+            },
+            "building/cathedral": {
+                "name": "Katedrála"
+            },
+            "building/chapel": {
+                "name": "Kaple"
+            },
+            "building/church": {
+                "name": "Kostel"
+            },
             "building/commercial": {
                 "name": "Obchodní budova",
                 "terms": "obchody,firmy,firma,prodej,podnik,podniky,kanceláře"
             },
-            "building/entrance": {
-                "name": "Vchod",
-                "terms": "vchod"
+            "building/construction": {
+                "name": "Probíhá stavba"
             },
             "building/garage": {
                 "name": "Garáž",
                 "terms": "garáž,garáže,parkování,kryté parkování"
             },
+            "building/garages": {
+                "name": "Garáže"
+            },
+            "building/hospital": {
+                "name": "Nemocnice"
+            },
+            "building/hotel": {
+                "name": "Hotel"
+            },
             "building/house": {
                 "name": "Rodinný dům",
                 "terms": "dům,rodinný dům,řadový dům,domek"
@@ -1292,6 +1319,27 @@
                 "name": "Obytná budova",
                 "terms": "obytná budova,ubytování,bývání,byt"
             },
+            "building/roof": {
+                "name": "Strop"
+            },
+            "building/school": {
+                "name": "Škola"
+            },
+            "building/stable": {
+                "name": "Stálý"
+            },
+            "building/terrace": {
+                "name": "Řadové domy"
+            },
+            "building/train_station": {
+                "name": "Vlaková Stanice"
+            },
+            "building/university": {
+                "name": "Vysoká Škola"
+            },
+            "building/warehouse": {
+                "name": "Skladiště"
+            },
             "craft/basket_maker": {
                 "name": "Košíkář",
                 "terms": "košíkář,košíkářství,proutěný,pletení"
@@ -1392,10 +1440,6 @@
                 "name": "Fotograf",
                 "terms": "fotograf,fotografie,ateliér"
             },
-            "craft/photographic_labratory": {
-                "name": "Fotolaboratoř",
-                "terms": "fotolaboratoř,fotografická laboratoř,vyvolání,film"
-            },
             "craft/plasterer": {
                 "name": "Štukatér",
                 "terms": "štukatér,škukatérství,štuky"
@@ -1489,8 +1533,7 @@
                 "terms": "nouzový telefon,SOS,tísňová linka"
             },
             "entrance": {
-                "name": "Vchod",
-                "terms": "vchod,východ,únikový východ,brána,dveře,vrata"
+                "name": "Vchod/Východ"
             },
             "footway/crossing": {
                 "name": "Přechod pro chodce",
@@ -1500,6 +1543,10 @@
                 "name": "Chodník po straně silnice",
                 "terms": "chodník,obrubník"
             },
+            "ford": {
+                "name": "Brod",
+                "terms": "brod,přejezd vody,ford"
+            },
             "golf/bunker": {
                 "name": "Pískový bunker",
                 "terms": "pískový bunker,písková překážka,písečná překážka,bunker,hazard"
@@ -1569,8 +1616,7 @@
                 "terms": "dálnice"
             },
             "highway/motorway_junction": {
-                "name": "Dálniční sjezd",
-                "terms": "dálniční nájezd, dálniční výjezd, dálniční exit"
+                "name": "Dálnice / Sjezd"
             },
             "highway/motorway_link": {
                 "name": "Dálnice - nájezd",
@@ -1857,8 +1903,7 @@
                 "terms": "spouštění lodi,dok,loděnice,skluz v loděnici,skluzavka"
             },
             "leisure/sports_center": {
-                "name": "Sportovní areál",
-                "terms": "sportovní areál,sportovní centrum"
+                "name": "Sportovní Centrum / Posilovna"
             },
             "leisure/stadium": {
                 "name": "Stadion",
@@ -1868,10 +1913,6 @@
                 "name": "Plavecký bazén",
                 "terms": "plovárna,koupaliště"
             },
-            "leisure/track": {
-                "name": "Závodní dráha",
-                "terms": "závodní dráha, závodiště, dráha, ovál, stadion, areál"
-            },
             "line": {
                 "name": "Cesta",
                 "terms": "čára,cesta,trať,kanál,trasa"
@@ -1928,10 +1969,6 @@
                 "name": "Vodárenská věž",
                 "terms": "vodojem,věž s vodojemem,věž,vodárenská věž"
             },
-            "man_made/water_well": {
-                "name": "Studna",
-                "terms": "studna,studánka,čerpadlo,vodní zdroj,pramen"
-            },
             "man_made/water_works": {
                 "name": "Vodárna",
                 "terms": "vodárna,úpravna vody"
@@ -2284,10 +2321,6 @@
                 "name": "Cykloprodejna",
                 "terms": "obchod s koly,kola,horská kola,jízdní kola,cyklistika,cykloprodejna"
             },
-            "shop/books": {
-                "name": "Knihkupectví",
-                "terms": "Knihovnictví"
-            },
             "shop/boutique": {
                 "name": "Módní butik",
                 "terms": "oblečení,šaty,oděv,oděvy,butik,móda,módní"
@@ -2320,10 +2353,6 @@
                 "name": "Počítače",
                 "terms": "obchod s výpočetní technikou,počítače,elektro,elektronika,výpočetní technika"
             },
-            "shop/confectionery": {
-                "name": "Cukrovinky",
-                "terms": "cukrárna,cukrovinky,cukrářství,cukrářské zboží,sladkosti,cukroví"
-            },
             "shop/convenience": {
                 "name": "Smíšené zboží",
                 "terms": "smíšené zboží,krám,obchod,potraviny,večerka"
@@ -2340,10 +2369,6 @@
                 "name": "Obchod pro kutily",
                 "terms": "obchod pro kutily,stavební materiál,stavebniny,staviva,potřeby pro kutily,zahradní potřeby,železářství,kutil"
             },
-            "shop/dry_cleaning": {
-                "name": "Čistírna",
-                "terms": "čistírna,chemické čištění,čištění oděvů za sucha"
-            },
             "shop/electronics": {
                 "name": "Elektro",
                 "terms": "Elektronika"
@@ -2392,10 +2417,6 @@
                 "name": "Klenotnictví",
                 "terms": "zlatnictví,šperky,klenotník,klenoty,klenotnictví,bižutérie,náramky,náušnice,prsteny"
             },
-            "shop/kiosk": {
-                "name": "Stánek",
-                "terms": "stánek,noviny,kiosek,občerstvení,tabák"
-            },
             "shop/laundry": {
                 "name": "Prádelna",
                 "terms": "prádelna,čistírna,prádlo"
@@ -2420,18 +2441,10 @@
                 "name": "Obchod s hudbou",
                 "terms": "hudební obchod,obchod s hudbou,cd,lp"
             },
-            "shop/newsagent": {
-                "name": "Trafika",
-                "terms": "prodavač novin,trafikant,trafika,noviny,časopisy,tabák"
-            },
             "shop/optician": {
                 "name": "Optika",
                 "terms": "optik,optika,brýle,zrak,kontaktní čočky,čočky"
             },
-            "shop/outdoor": {
-                "name": "Vybavení do přírody",
-                "terms": "obchod s vybavením pro pobyt v přírodě,stany,spacáky,outdoor"
-            },
             "shop/pet": {
                 "name": "Chovatelské potřeby",
                 "terms": "obchod pro domácí zvířata,obchod pro domácí mazlíčky,zverimex"
@@ -2564,6 +2577,34 @@
                 "name": "Omezení",
                 "terms": "omezení,dopravní omezení"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Zákaz odbočování vlevo",
+                "terms": "odbočování vlevo,odbočení vlevo,odbočit vlevo,zatočení vlevo,zatočit vlevo"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Zákaz odbočování vpravo",
+                "terms": "odbočování vpravo,odbočit vpravo,odbočit vpravo,odbočení vpravo,zatočit vpravo,zatočení vpravo"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Zákaz jízdy přímo",
+                "terms": "zákaz jízdy rovně,zákaz jízdy přímo,zakázáno jet rovně,zakázáno jet přímo,přikázaný směr jízdy vlevo a vpravo,přikázaný směr jízdy vpravo a vlevo,přikázáno odbočit,přikázáno odbočení"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Zákaz otáčení",
+                "terms": "otáčení,otočit,u-turn"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Přikázaný směr jízdy vlevo",
+                "terms": "přikázáno jet vlevo,jen vlevo,pouze vlevo,odbočit vlevo"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Přikázaný směr jízdy vpravo",
+                "terms": "přikázáno jet vpravo,jen vpravo,pouze vpravo,odbočit vpravo"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Přikázaný směr jízdy přímo",
+                "terms": "přikázaný směr jízdy rovně,zákaz odbočit,zákaz zatočit,pouze rovně,pouze přímo,jen rovně,jen přímo"
+            },
             "type/route": {
                 "name": "Trasa",
                 "terms": "trasa,cesta,linka,stopa,značka,spojení"

vendor/assets/iD/iD/locales/el.json

@@ -38,6 +38,7 @@
             }
         },
         "continue": {
+            "key": "A",
             "title": "Συνέχεια",
             "description": "Συνεχίστε αυτή τη γραμμή.",
             "annotation": {
@@ -68,6 +69,8 @@
             "not_closed": "Αυτό δεν μπορεί να γίνει κυκλικό επειδή δεν είναι βρόγχος."
         },
         "orthogonalize": {
+            "title": "Τετράγωνο",
+            "key": "S",
             "annotation": {
                 "line": "Τετραγωνισμός των γωνιών μιας γραμμής.",
                 "area": "Τετραγωνίστηκαν οι γωνίες μιας περιοχής"
@@ -81,7 +84,6 @@
         },
         "delete": {
             "title": "Διαγραφή",
-            "description": "Αφαιρέστε αυτό από το χάρτη.",
             "annotation": {
                 "point": "Διαγραφή ενός σημείου.",
                 "vertex": "Διαγράφηκε ένας κόμβος από μια διαδρομή.",
@@ -189,8 +191,8 @@
         "title": "Αποθήκευση Αλλαγών",
         "description_placeholder": "Σύντομη περιγραφή των συνεισφορών σας",
         "message_label": "Υποβολή μηνύματος",
-        "upload_explanation": "ΟΙ αλλαγές που ανεβάσατε θα είναι ορατές σε όλους τους χάρτες που χρησιμοποιούν δεδομένα OpenStreetMap.",
-        "upload_explanation_with_user": "ΟΙ αλλαγές που ανεβάσατε ως {user} θα είναι ορατές σε όλους τους χάρτες που χρησιμοποιούν δεδομένα OpenStreetMap.",
+        "upload_explanation": "ΟΙ αλλαγές που θα ανεβάσετε θα είναι ορατές σε όλους τους χάρτες που χρησιμοποιούν δεδομένα OpenStreetMap.",
+        "upload_explanation_with_user": "ΟΙ αλλαγές που θα ανεβάσετε ως {user} θα είναι ορατές σε όλους τους χάρτες που χρησιμοποιούν δεδομένα OpenStreetMap.",
         "save": "Αποθήκευση",
         "cancel": "Ακύρωση",
         "warnings": "Προειδοποιήσεις",
@@ -329,6 +331,9 @@
             "category-building": {
                 "name": "Κτίριο"
             },
+            "category-golf": {
+                "name": "Γκόλφ"
+            },
             "category-landuse": {
                 "name": "Χρήση Γης"
             },
@@ -338,11 +343,20 @@
             "category-rail": {
                 "name": "Σιδηροδρομική Γραμμή"
             },
+            "category-restriction": {
+                "name": "Περιορισμός"
+            },
             "category-road": {
                 "name": "Δρόμος"
             },
             "category-route": {
                 "name": "Διαδρομή"
+            },
+            "category-water-area": {
+                "name": "Νερό"
+            },
+            "category-water-line": {
+                "name": "Νερό"
             }
         },
         "fields": {
@@ -383,14 +397,26 @@
                     }
                 }
             },
+            "access_simple": {
+                "label": "Πρόσβαση",
+                "placeholder": "ναι"
+            },
+            "access_toilets": {
+                "label": "Πρόσβαση"
+            },
             "address": {
                 "label": "Διεύθυνση",
                 "placeholders": {
                     "housename": "Όνομα Σπιτιού",
-                    "number": "123",
+                    "housenumber": "123",
                     "street": "Οδός",
                     "city": "Πόλη",
-                    "postcode": "Ταχυδρομικός Κώδικας"
+                    "postcode": "Ταχ. Κώδικας",
+                    "place": "Τόπος",
+                    "hamlet": "Οικισμός",
+                    "suburb": "Προάστιο",
+                    "state": "Πολιτεία",
+                    "country": "Χώρα"
                 }
             },
             "admin_level": {
@@ -400,7 +426,10 @@
                 "label": "Τύπος"
             },
             "aerialway/access": {
-                "label": "Πρόσβαση"
+                "label": "Πρόσβαση",
+                "options": {
+                    "exit": "Έξοδος"
+                }
             },
             "aerialway/capacity": {
                 "label": "Χωρητικότητα (ανά ώρα)",
@@ -414,7 +443,10 @@
                 "placeholder": "2, 4, 8..."
             },
             "aerialway/summer/access": {
-                "label": "Πρόσβαση (καλοκαίρι)"
+                "label": "Πρόσβαση (καλοκαίρι)",
+                "options": {
+                    "exit": "Έξοδος"
+                }
             },
             "aeroway": {
                 "label": "Είδος"
@@ -451,7 +483,25 @@
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
-                "label": "Κατεύθυνση"
+                "label": "Κατεύθυνση",
+                "options": {
+                    "N": "Βοράς",
+                    "E": "Ανατολή",
+                    "S": "Νότος",
+                    "W": "Δύση",
+                    "NE": "Βορειοανατολικά",
+                    "SE": "Νοτιοανατολικά",
+                    "SW": "Νοτιοδυτικά",
+                    "NW": "Βορειοδυτικά",
+                    "NNE": "Βόρεια-βορειοανατολικά",
+                    "ENE": "Ανατολικά-βορειοανατολικά",
+                    "ESE": "Ανατολικά-νοτιοανατολικά",
+                    "SSE": "Νότια-νοτιοανατολικά",
+                    "SSW": "Νότια-νοτιοδυτικά",
+                    "WSW": "Δυτικά-νοτιοδυτικά",
+                    "WNW": "Δυτικά-βορειοδυτικά",
+                    "NNW": "Βόρεια-βορειοδυτικά"
+                }
             },
             "clock_direction": {
                 "label": "Κατεύθυνση",
@@ -484,6 +534,12 @@
             "description": {
                 "label": "Περιγραφή"
             },
+            "electrified": {
+                "options": {
+                    "yes": "Ναι (ακαθόριστο)",
+                    "no": "Όχι"
+                }
+            },
             "elevation": {
                 "label": "Υψόμετρο"
             },
@@ -493,6 +549,9 @@
             "entrance": {
                 "label": "Είδος"
             },
+            "except": {
+                "label": "Εξαιρέσεις"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+31 42 123 4567"
@@ -501,11 +560,19 @@
                 "label": "Αμοιβή"
             },
             "fire_hydrant/type": {
-                "label": "Τύπος"
+                "label": "Τύπος",
+                "options": {
+                    "underground": "Υπόγεια",
+                    "wall": "Τοίχος",
+                    "pond": "Λιμνούλα"
+                }
             },
             "fixme": {
                 "label": "Διορθώστε με"
             },
+            "fuel": {
+                "label": "Καύσιμο"
+            },
             "generator/method": {
                 "label": "Μέθοδος"
             },
@@ -515,6 +582,12 @@
             "generator/type": {
                 "label": "Τύπος"
             },
+            "golf_hole": {
+                "label": "Αναφορά"
+            },
+            "handicap": {
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Είδος"
             },
@@ -527,14 +600,22 @@
             "incline": {
                 "label": "Κλήση"
             },
+            "information": {
+                "label": "Είδος"
+            },
             "internet_access": {
                 "label": "Πρόσβαση Στο Διαδίκτυο",
                 "options": {
+                    "yes": "Ναι",
+                    "no": "Όχι",
                     "wlan": "Ασύρματο Δίκτυο",
                     "wired": "Ενσύρματο δύκτυο",
                     "terminal": "Τερματικό"
                 }
             },
+            "lamp_type": {
+                "label": "Είδος"
+            },
             "landuse": {
                 "label": "Τύπος"
             },
@@ -548,6 +629,9 @@
             "leisure": {
                 "label": "Είδος"
             },
+            "length": {
+                "label": "Μήκος (Μέτρα)"
+            },
             "levels": {
                 "label": "Επίπεδα",
                 "placeholder": "2, 4, 6..."
@@ -562,6 +646,12 @@
                 "label": "Όριο Ταχύτητας",
                 "placeholder": "40, 50, 60..."
             },
+            "mtb/scale": {
+                "placeholder": "0, 1, 2, 3..."
+            },
+            "mtb/scale/uphill": {
+                "placeholder": "0, 1, 2, 3..."
+            },
             "name": {
                 "label": "Όνομα",
                 "placeholder": "Κοινό Όνομα (αν υπάρχει)"
@@ -579,10 +669,18 @@
                 "label": "Είδος"
             },
             "oneway": {
-                "label": "Μονόδρομος"
+                "label": "Μονόδρομος",
+                "options": {
+                    "yes": "Ναι",
+                    "no": "Όχι"
+                }
             },
             "oneway_yes": {
-                "label": "Μονόδρομος"
+                "label": "Μονόδρομος",
+                "options": {
+                    "yes": "Ναι",
+                    "no": "Όχι"
+                }
             },
             "opening_hours": {
                 "label": "Ωράριο"
@@ -590,11 +688,17 @@
             "operator": {
                 "label": "Διαχειριστής"
             },
+            "par": {
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Σταθμός Μετεπιβίβασης"
             },
             "parking": {
-                "label": "Είδος"
+                "label": "Είδος",
+                "options": {
+                    "surface": "Επιφάνεια"
+                }
             },
             "phone": {
                 "label": "Τηλέφωνο",
@@ -609,6 +713,9 @@
             "place": {
                 "label": "Είδος"
             },
+            "population": {
+                "label": "Πληθυσμός"
+            },
             "power": {
                 "label": "Είδος"
             },
@@ -622,16 +729,7 @@
                 "label": "Είδος"
             },
             "religion": {
-                "label": "Θρησκεία",
-                "options": {
-                    "christian": "Χριστιανισμός",
-                    "muslim": "Μουσουλμάνισμος",
-                    "buddhist": "Βουδισμός",
-                    "jewish": "Ιουδαϊσμός",
-                    "hindu": "Ινδουισμός",
-                    "shinto": "Σιντοϊσμός",
-                    "taoist": "Ταοϊσμός"
-                }
+                "label": "Θρησκεία"
             },
             "restriction": {
                 "label": "Είδος"
@@ -642,9 +740,6 @@
             "route_master": {
                 "label": "Είδος"
             },
-            "sac_scale": {
-                "label": "Δυσκολία Μονοπατιού"
-            },
             "service": {
                 "label": "Τύπος"
             },
@@ -657,12 +752,26 @@
             "shop": {
                 "label": "Είδος"
             },
+            "smoking": {
+                "label": "Κάπνισμα",
+                "placeholder": "Όχι, Ξεχωριστά, Ναι...",
+                "options": {
+                    "outside": "Επιτρέπεται έξω",
+                    "yes": "Επιτρέπεται παντού"
+                }
+            },
             "source": {
                 "label": "Πηγή"
             },
             "sport": {
                 "label": "Άθλημα"
             },
+            "sport_ice": {
+                "label": "Άθλημα"
+            },
+            "sport_racing": {
+                "label": "Άθλημα"
+            },
             "structure": {
                 "label": "Διάρθρωση",
                 "placeholder": "Άγνωστο",
@@ -670,7 +779,8 @@
                     "bridge": "Γέφυρα",
                     "tunnel": "Σήραγγα",
                     "embankment": "Ανάχωμα",
-                    "cutting": "Ανασκαφή"
+                    "cutting": "Ανασκαφή",
+                    "ford": "Κοιτόστρωση"
                 }
             },
             "studio_type": {
@@ -688,18 +798,21 @@
             "towertype": {
                 "label": "Τύπος Πύργου"
             },
-            "tracktype": {
-                "label": "Είδος"
-            },
             "trail_visibility": {
                 "label": "Ορατότητα Μονοπατιού"
             },
             "tree_type": {
                 "label": "Τύπος"
             },
+            "trees": {
+                "label": "Δέντρα"
+            },
             "tunnel": {
                 "label": "Σήραγγα"
             },
+            "vending": {
+                "label": "Είδος αγαθών"
+            },
             "water": {
                 "label": "Είδος"
             },
@@ -716,6 +829,9 @@
             "wheelchair": {
                 "label": "Πρόσβαση Με Αναπηρικό Καροτσάκι"
             },
+            "width": {
+                "label": "Πλάτος (Μέτρα)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -791,6 +907,15 @@
                 "name": "Ενοικίαση Ποδηλάτων",
                 "terms": "Ενοικίαση ποδηλάτων"
             },
+            "amenity/boat_rental": {
+                "name": "Ενοικίαση Σκαφών"
+            },
+            "amenity/bureau_de_change": {
+                "name": "Ανταλακτήριο Συναλάγματος"
+            },
+            "amenity/bus_station": {
+                "name": "Σταθμός Λεωφορείων"
+            },
             "amenity/cafe": {
                 "name": "Καφετέρια",
                 "terms": "Καφετέρια, Καφενείο"
@@ -807,21 +932,22 @@
                 "name": "Πλυντήριο Αυτοκινήτων",
                 "terms": "Πληντήριο αυτοκινήτων"
             },
-            "amenity/childcare": {
-                "name": "Φροντίδα Παιδιών",
-                "terms": "Φροντίδα παιδιών, Φύλαξη παιδιών, Παιδικός σταθμός"
+            "amenity/charging_station": {
+                "name": "Σταθμός Φόρτισης"
             },
             "amenity/cinema": {
                 "name": "Κινηματογράφος",
                 "terms": "Κινηματογράφος"
             },
+            "amenity/clinic": {
+                "name": "Κλινική"
+            },
             "amenity/clock": {
                 "name": "Ρολόι",
                 "terms": "ωρολόγιο"
             },
-            "amenity/college": {
-                "name": "Κολλέγιο",
-                "terms": "Κολέγιο"
+            "amenity/compressed_air": {
+                "name": "Πεπιεσμένος Αέρας"
             },
             "amenity/courthouse": {
                 "name": "Δικαστήριο",
@@ -863,14 +989,6 @@
                 "name": "Κοιμητήριο",
                 "terms": "Νεκροταφείο"
             },
-            "amenity/hospital": {
-                "name": "Νοσοκομείο",
-                "terms": "Νοσοκομείο"
-            },
-            "amenity/kindergarten": {
-                "name": "Νηπιαγωγείο",
-                "terms": "Νηπιαγωγείο"
-            },
             "amenity/library": {
                 "name": "Βιβλιοθήκη",
                 "terms": "Βιβλιοθήκη"
@@ -879,6 +997,12 @@
                 "name": "Αγορά",
                 "terms": "Αγορά"
             },
+            "amenity/nightclub": {
+                "name": "Νυχτερινό Κέντρο"
+            },
+            "amenity/parking": {
+                "name": "Στάθμευση Αυτοκινήτων"
+            },
             "amenity/pharmacy": {
                 "name": "Φαρμακείο",
                 "terms": "Φαρμακείο"
@@ -919,13 +1043,18 @@
                 "name": "Παμπ",
                 "terms": "Παμπ"
             },
+            "amenity/recycling": {
+                "name": "Ανακύκλωση"
+            },
             "amenity/restaurant": {
                 "name": "Εστιατόριο",
                 "terms": "Εστιατόριο"
             },
-            "amenity/school": {
-                "name": "Σχολείο",
-                "terms": "Σχολείο"
+            "amenity/shelter": {
+                "name": "Στέγαστρο"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Καταφύγιο Αστέγων"
             },
             "amenity/swimming_pool": {
                 "name": "Πισίνα",
@@ -951,14 +1080,13 @@
                 "name": "Δημαρχείο",
                 "terms": "Δημαρχείο"
             },
-            "amenity/university": {
-                "name": "Πανεπιστήμιο",
-                "terms": "Πανεπιστήμιο"
-            },
             "amenity/vending_machine": {
                 "name": "Μηχάνημα Αυτόματης Πώλησης",
                 "terms": "αυτόματος πωλητής"
             },
+            "amenity/veterinary": {
+                "name": "Κτηνιατρείο"
+            },
             "amenity/waste_basket": {
                 "name": "Κάδος Απορριμάτων",
                 "terms": "Κάλαθος αχρήστων, Καλάθι σκουπιδιών"
@@ -973,7 +1101,7 @@
             },
             "barrier/bollard": {
                 "name": "Στύλος",
-                "terms": "Κολώνα, Στύλος"
+                "terms": "Κολόνα, Στύλος, Στύλοι"
             },
             "barrier/cattle_grid": {
                 "name": "Συρματόπλεγμα"
@@ -1036,18 +1164,35 @@
             "building/apartments": {
                 "name": "Διαμερίσματα"
             },
+            "building/cathedral": {
+                "name": "Καθεδρικός"
+            },
+            "building/chapel": {
+                "name": "Παρεκλήσι"
+            },
+            "building/church": {
+                "name": "Εκκλησία"
+            },
             "building/commercial": {
                 "name": "Εμπορικό Κτίριο",
                 "terms": "Εμπορικό Κτήριο, Επαγγελματικό κτήριο"
             },
+            "building/construction": {
+                "name": "Κτήριο Υπό Κατασκευή"
+            },
             "building/entrance": {
-                "name": "Είσοδος",
-                "terms": "Είσοδος"
+                "name": "Είσοδος/Έξοδος"
             },
             "building/garage": {
                 "name": "Εργαστήριο",
                 "terms": "Γκαράζ"
             },
+            "building/hospital": {
+                "name": "Κτήριο Νοσοκομείου"
+            },
+            "building/hotel": {
+                "name": "Κτήριο Ξενοδοχείου"
+            },
             "building/house": {
                 "name": "Σπίτι",
                 "terms": "Κατοικία, Σπίτι"
@@ -1060,10 +1205,40 @@
                 "name": "Βιομηχανικό Κτήριο",
                 "terms": "Βιομηχανικό κτήριο"
             },
+            "building/public": {
+                "name": "Δημόσιο κτήριο"
+            },
             "building/residential": {
                 "name": "Κτίριο Κατοικιών",
                 "terms": "Κτήριο κατοικιών, Αστικό κτήριο"
             },
+            "building/roof": {
+                "name": "Στέγη"
+            },
+            "building/school": {
+                "name": "Κτήριο Σχολείου"
+            },
+            "building/train_station": {
+                "name": "Σταθμός Τρένου"
+            },
+            "building/university": {
+                "name": "Κτήριο Πανεπιστημίου"
+            },
+            "building/warehouse": {
+                "name": "Αποθήκη"
+            },
+            "craft/basket_maker": {
+                "name": "Καλαθάς"
+            },
+            "craft/beekeeper": {
+                "name": "Μελισοκόμος"
+            },
+            "craft/blacksmith": {
+                "name": "Σιδηρουργός"
+            },
+            "craft/boatbuilder": {
+                "name": "Ναυπηγός"
+            },
             "craft/brewery": {
                 "name": "Ζυθοποιείο",
                 "terms": "ζυθοποιός, ζυθοποιία"
@@ -1084,13 +1259,34 @@
                 "name": "Ηλεκτρολόγος",
                 "terms": "ηλεκτροτεχνίτης"
             },
+            "craft/gardener": {
+                "name": "Κηπουρός"
+            },
+            "craft/locksmith": {
+                "name": "Κλειδαράς"
+            },
+            "craft/metal_construction": {
+                "name": "Μεταλικές Κατασκευές"
+            },
             "craft/optician": {
                 "name": "Οπτικός",
                 "terms": "οφθαλμίατρος,οφθαλμολόγος"
             },
+            "craft/photographer": {
+                "name": "Φωτογράφος"
+            },
+            "craft/photographic_laboratory": {
+                "name": "Φωτογραφικό Εργαστήριο"
+            },
+            "craft/plumber": {
+                "name": "Υδραυλικός"
+            },
             "craft/sawmill": {
                 "name": "Πριονιστήριο"
             },
+            "craft/sculpter": {
+                "name": "Γλυπτης"
+            },
             "craft/shoemaker": {
                 "name": "Τσαγκάρης",
                 "terms": "παπουτσής,υποδηματοποιός"
@@ -1099,6 +1295,12 @@
                 "name": "Ραφτική",
                 "terms": "ράφτης"
             },
+            "craft/watchmaker": {
+                "name": "Ωρολογοποιός"
+            },
+            "embankment": {
+                "name": "Ανάχωμα"
+            },
             "emergency/ambulance_station": {
                 "name": "Σταθμός Ασθενοφόρων",
                 "terms": "Σταθμός ασθενοφόρων"
@@ -1112,8 +1314,13 @@
                 "terms": "Τηλέφωνο επειγόντων, Τηλέφωνο ανάγκης"
             },
             "entrance": {
-                "name": "Είσοδος",
-                "terms": "Είσοδος"
+                "name": "Είσοδος/Έξοδος"
+            },
+            "footway/crossing": {
+                "name": "Διασταύρωση"
+            },
+            "ford": {
+                "name": "Κοιτόστρωση"
             },
             "highway": {
                 "name": "Αυτοκινητόδρομος",
@@ -1148,8 +1355,7 @@
                 "terms": "Αυτοκινητόδρομος"
             },
             "highway/motorway_junction": {
-                "name": "Διασταύρωση Αυτοκινητόδρομου",
-                "terms": "Διασταύρωση αυτοκινητόδρομου"
+                "name": "Διασταύρωση Αυτοκινητόδρομου / Έξοδος"
             },
             "highway/motorway_link": {
                 "name": "Σύνδεση Αυτοκινητόδρομου",
@@ -1268,7 +1474,7 @@
             },
             "landuse/cemetery": {
                 "name": "Κοιμητήριο",
-                "terms": "Κοιμητήριο"
+                "terms": "Νεκροταφείο"
             },
             "landuse/commercial": {
                 "name": "Εμπορική",
@@ -1381,7 +1587,7 @@
                 "terms": "Γλίστρα"
             },
             "leisure/sports_center": {
-                "name": "Αθλητικό Κέντρο"
+                "name": "Αθλητικό Κέντρο / Γυμναστήριο"
             },
             "leisure/stadium": {
                 "name": "Στάδιο",
@@ -1391,10 +1597,6 @@
                 "name": "Πισίνα",
                 "terms": "Πισίνα, Δεξαμενή κολύμβησης"
             },
-            "leisure/track": {
-                "name": "Πίστα Αγώνων",
-                "terms": "Πίστα αγώνων, Αυτοκινητοδρόμιο"
-            },
             "line": {
                 "name": "Γραμμή",
                 "terms": "Γραμμή"
@@ -1407,6 +1609,9 @@
                 "name": "Κυματοθραύστης",
                 "terms": "Κυματοθραύστης"
             },
+            "man_made/embankment": {
+                "name": "Ανάχωμα"
+            },
             "man_made/lighthouse": {
                 "name": "Φάρος",
                 "terms": "Φάρος"
@@ -1433,10 +1638,6 @@
                 "name": "Δεξαμενή Νερού",
                 "terms": "Πύργος νερού, Δεξαμενή"
             },
-            "man_made/water_well": {
-                "name": "Πηγάδι Νερού",
-                "terms": "Πηγάδι νερού"
-            },
             "man_made/water_works": {
                 "name": "Υδραυλικά Έργα",
                 "terms": "Υδραυλικά έργα"
@@ -1527,12 +1728,27 @@
                 "name": "Κτηματομεσιτικό Γραφείο",
                 "terms": "μεσιτικό γραφείο, μεσίτης"
             },
+            "office/insurance": {
+                "name": "Ασφαλιστικό Γραφείο"
+            },
+            "office/lawyer": {
+                "name": "Δηκηγορικό Γραφείο"
+            },
             "office/newspaper": {
                 "name": "Εφημερίδα"
             },
+            "office/ngo": {
+                "name": "Γραφείο ΜΚΟ"
+            },
             "office/political_party": {
                 "name": "Πολιτικό Κόμμα"
             },
+            "office/therapist": {
+                "name": "Θεραπευτής"
+            },
+            "office/travel_agent": {
+                "name": "Ταξιδιωτικό Γραφείο"
+            },
             "place": {
                 "name": "Τόπος",
                 "terms": "Τόπος"
@@ -1556,6 +1772,9 @@
                 "name": "Τοποθεσία",
                 "terms": "Τοποθεσία, Τοπωνύμιο, Περιοχή"
             },
+            "place/neighbourhood": {
+                "name": "Γειτονιά"
+            },
             "place/town": {
                 "name": "Κωμόπολη",
                 "terms": "Κωμόπολη"
@@ -1593,6 +1812,9 @@
                 "name": "Μετασχηματιστής",
                 "terms": "Μετασχηματιστής"
             },
+            "public_transport/stop_position": {
+                "name": "Σημείο Στάσης"
+            },
             "railway": {
                 "name": "Σιδηροδρομικός Διάδρομος",
                 "terms": "Σιδηρόδρομος"
@@ -1662,10 +1884,6 @@
                 "name": "Κατάστημα Ποδηλάτων",
                 "terms": "Ποδηλατάδικο, Κατάστημα ποδηλάτων"
             },
-            "shop/books": {
-                "name": "Βιβλιοπωλείο",
-                "terms": "Βιβλιοπωλείο"
-            },
             "shop/boutique": {
                 "name": "Μπουτίκ",
                 "terms": "Μπουτίκ"
@@ -1697,10 +1915,6 @@
                 "name": "Κατάστημα Υπολογιστών",
                 "terms": "Κατάστημα υπολογιστών"
             },
-            "shop/confectionery": {
-                "name": "Ζαχαροπλαστείο",
-                "terms": "Ζαχαροπλαστείο"
-            },
             "shop/convenience": {
                 "name": "Παντοπωλείο",
                 "terms": "Ψιλικατζίδικο, Παντοπολείο"
@@ -1717,10 +1931,6 @@
                 "name": "Κατάστημα ιδιοκατασκευών",
                 "terms": "Φτιάξτο μόνος σου, Κατάστημα Ιδιοκατασκευών"
             },
-            "shop/dry_cleaning": {
-                "name": "Στεγνοκαθαριστήριο",
-                "terms": "Στεγνοκαθαριστήριο"
-            },
             "shop/electronics": {
                 "name": "Κατάστημα Ηλεκτρονικών",
                 "terms": "Κατάστημα ηλεκτρονικών"
@@ -1759,10 +1969,6 @@
                 "name": "Κοσμηματοπωλείο",
                 "terms": "Χρυσοχοείο, Κοσμηματοπώλης, Κοσμηματοπωλείο"
             },
-            "shop/kiosk": {
-                "name": "Περίπτερο",
-                "terms": "Περίπτερο, Κιόσκι"
-            },
             "shop/laundry": {
                 "name": "Καθαριστήριο",
                 "terms": "Πλυντήριο"
@@ -1786,18 +1992,10 @@
                 "name": "Κατάστημα Μουσικής",
                 "terms": "Κατάστημα μουσικής"
             },
-            "shop/newsagent": {
-                "name": "Πρακτορείο τύπου",
-                "terms": "Πρακτορείο εφημερίδων, Εφημεριδοπώλης"
-            },
             "shop/optician": {
                 "name": "Οπτικός",
                 "terms": "Οπτικός"
             },
-            "shop/outdoor": {
-                "name": "Κατάστημα Υπαίθριων",
-                "terms": "Κατάστημα υπαίθριων δραστηριοτήτων"
-            },
             "shop/pet": {
                 "name": "Κατάστημα Κατοικίδιων",
                 "terms": "Κατάστημα κατοικιδίων"
@@ -1806,6 +2004,9 @@
                 "name": "Φωτογραφείο",
                 "terms": "φωτογράφος"
             },
+            "shop/seafood": {
+                "name": "Κατάστημα Θαλασινών"
+            },
             "shop/shoes": {
                 "name": "Κατάστημα Υπόδησης",
                 "terms": "Κατάστημα υποδημάτων"
@@ -1822,6 +2023,9 @@
                 "name": "Supermarket",
                 "terms": "Σούπερ μάρκετ, Υπεραγορά"
             },
+            "shop/tailor": {
+                "name": "Ράφτης"
+            },
             "shop/toys": {
                 "name": "Κατάστημα Παιχνιδιών",
                 "terms": "Κατάστημα παιχνιδιών"
@@ -1893,8 +2097,8 @@
                 "terms": "Χώρος εκδρομής, Χώρος πικ νικ"
             },
             "tourism/theme_park": {
-                "name": "Θεματικό Πάρκο",
-                "terms": "Θεματικό πάρκο"
+                "name": "Πάρκο Ψυχαγωγίας",
+                "terms": "Θεματικό πάρκο, Λούνα παρκ"
             },
             "tourism/viewpoint": {
                 "name": "Σημείο θέασης",
@@ -1920,6 +2124,27 @@
                 "name": "Περιορισμός",
                 "terms": "Περιορισμός"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Όχι Αριστερή Στροφή"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Όχι Δεξιά Στροφή"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Όχι Ευθεία"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Όχι Αναστροφή"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Μόνο Αριστερή Στροφή"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Μόνο Δεξιά Στροφή"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Όχι Στροφές"
+            },
             "type/route": {
                 "name": "Δρομολόγιο",
                 "terms": "Δρομολόγιο, Διαδρομή"

vendor/assets/iD/iD/locales/en-GB.json

@@ -18,13 +18,20 @@
         "browse": {
             "title": "Browse",
             "description": "Pan and zoom the map."
+        },
+        "draw_area": {
+            "tail": "Click to add nodes to your area. Click the first node to finish the area."
+        },
+        "draw_line": {
+            "tail": "Click to add more nodes to the line. Click on other lines to connect to them, and double-click to end the line."
         }
     },
     "operations": {
         "add": {
             "annotation": {
                 "point": "Added a point.",
-                "vertex": "Added a node to a way."
+                "vertex": "Added a node to a way.",
+                "relation": "Added a relation."
             }
         },
         "start": {
@@ -33,16 +40,177 @@
                 "area": "Started an area."
             }
         },
+        "continue": {
+            "key": "A",
+            "title": "Continue",
+            "description": "Continue this line.",
+            "not_eligible": "No line can be continued here.",
+            "multiple": "Several lines can be continued here. To choose a line, press the Shift key and click on it to select it.",
+            "annotation": {
+                "line": "Continued a line.",
+                "area": "Continued an area."
+            }
+        },
         "cancel_draw": {
             "annotation": "Cancelled drawing."
         },
+        "change_role": {
+            "annotation": "Changed the role of a relation member."
+        },
+        "change_tags": {
+            "annotation": "Changed tags."
+        },
         "circularize": {
-            "title": "Circularise"
+            "title": "Circularise",
+            "description": {
+                "line": "Make this line circular.",
+                "area": "Make this area circular."
+            },
+            "key": "O",
+            "annotation": {
+                "line": "Made a line circular.",
+                "area": "Made an area circular."
+            },
+            "not_closed": "This can't be made circular because it's not a loop.",
+            "too_large": "This can't be made circular because not enough of it is currently visible."
+        },
+        "orthogonalize": {
+            "title": "Square",
+            "description": {
+                "line": "Square the corners of this line.",
+                "area": "Square the corners of this area."
+            },
+            "key": "S",
+            "annotation": {
+                "line": "Squared the corners of a line.",
+                "area": "Squared the corners of an area."
+            },
+            "not_squarish": "This can't be made square because it is not squarish.",
+            "too_large": "This can't be made square because not enough of it is currently visible."
+        },
+        "straighten": {
+            "title": "Straighten",
+            "description": "Straighten this line.",
+            "key": "S",
+            "annotation": "Straightened a line.",
+            "too_bendy": "This can't be straightened because it bends too much."
+        },
+        "delete": {
+            "title": "Delete",
+            "description": "Delete object permanently.",
+            "annotation": {
+                "point": "Deleted a point.",
+                "vertex": "Deleted a node from a way.",
+                "line": "Deleted a line.",
+                "area": "Deleted an area.",
+                "relation": "Deleted a relation.",
+                "multiple": "Deleted {n} objects."
+            },
+            "incomplete_relation": "This feature can't be deleted because it hasn't been fully downloaded."
+        },
+        "add_member": {
+            "annotation": "Added a member to a relation."
+        },
+        "delete_member": {
+            "annotation": "Removed a member from a relation."
+        },
+        "connect": {
+            "annotation": {
+                "point": "Connected a way to a point.",
+                "vertex": "Connected a way to another.",
+                "line": "Connected a way to a line.",
+                "area": "Connected a way to an area."
+            }
+        },
+        "disconnect": {
+            "title": "Disconnect",
+            "description": "Disconnect these lines/areas from each other.",
+            "key": "D",
+            "annotation": "Disconnected lines/areas.",
+            "not_connected": "There aren't enough lines/areas here to disconnect."
+        },
+        "merge": {
+            "title": "Merge",
+            "description": "Merge these lines.",
+            "key": "C",
+            "annotation": "Merged {n} lines.",
+            "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."
+        },
+        "move": {
+            "title": "Move",
+            "description": "Move this to a different location.",
+            "key": "M",
+            "annotation": {
+                "point": "Moved a point.",
+                "vertex": "Moved a node in a way.",
+                "line": "Moved a line.",
+                "area": "Moved an area.",
+                "multiple": "Moved multiple objects."
+            },
+            "incomplete_relation": "This feature can't be moved because it hasn't been fully downloaded.",
+            "too_large": "This can't be moved because not enough of it is currently visible."
         },
         "rotate": {
-            "description": "Rotate this object around its centre point."
+            "title": "Rotate",
+            "description": "Rotate this object around its centre point.",
+            "key": "R",
+            "annotation": {
+                "line": "Rotated a line.",
+                "area": "Rotated an area."
+            },
+            "too_large": "This can't be rotated because not enough of it is currently visible."
+        },
+        "reverse": {
+            "title": "Reverse",
+            "description": "Make this line go in the opposite direction.",
+            "key": "V",
+            "annotation": "Reversed a line."
+        },
+        "split": {
+            "title": "Split",
+            "description": {
+                "line": "Split this line into two at this node.",
+                "area": "Split the boundary of this area into two.",
+                "multiple": "Split the lines/area boundaries at this node into two."
+            },
+            "key": "X",
+            "annotation": {
+                "line": "Split a line.",
+                "area": "Split an area boundary.",
+                "multiple": "Split {n} lines/area boundaries."
+            },
+            "not_eligible": "Lines can't be split at their beginning or end.",
+            "multiple_ways": "There are too many lines here to split."
+        },
+        "restriction": {
+            "help": {
+                "select": "Click to select a road segment.",
+                "toggle": "Click to toggle turn restrictions.",
+                "toggle_on": "Click to add a \"{restriction}\" restriction.",
+                "toggle_off": "Click to remove the \"{restriction}\" restriction."
+            },
+            "annotation": {
+                "create": "Added a turn restriction",
+                "delete": "Deleted a turn restriction"
+            }
         }
     },
+    "undo": {
+        "tooltip": "Undo: {action}",
+        "nothing": "Nothing to undo."
+    },
+    "redo": {
+        "tooltip": "Redo: {action}",
+        "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.",
+    "translate": {
+        "translate": "Translate"
+    },
     "zoom_in_edit": "Zoom in to Edit",
     "inspector": {
         "none": "None"
@@ -60,7 +228,27 @@
         }
     },
     "presets": {
+        "fields": {
+            "fax": {
+                "placeholder": "+44 207 123456"
+            },
+            "fuel/lpg": {
+                "label": "Sells LPG"
+            },
+            "lit": {
+                "label": "Street Lighting"
+            },
+            "phone": {
+                "placeholder": "+44 207 123456"
+            },
+            "toilets/disposal": {
+                "label": "Toilet Disposal"
+            }
+        },
         "presets": {
+            "aerialway/gondola": {
+                "terms": "Dangleway"
+            },
             "amenity/arts_centre": {
                 "name": "Arts Centre"
             },
@@ -68,10 +256,6 @@
                 "name": "Petrol Station",
                 "terms": "gas, fuel, propane, diesel, lng, cng, biodiesel"
             },
-            "amenity/kindergarten": {
-                "name": "Nursery",
-                "terms": "Nursery, Pre-school, preschool, kingergarden"
-            },
             "amenity/post_box": {
                 "name": "Post Box",
                 "terms": "Mailbox"
@@ -88,8 +272,32 @@
             "building/terrace": {
                 "name": "Terraced houses"
             },
-            "leisure/sports_center": {
-                "name": "Sports Centre"
+            "footway/crosswalk": {
+                "name": "Pedestrian Crossing"
+            },
+            "highway/bridleway": {
+                "name": "Bridleway"
+            },
+            "highway/crosswalk": {
+                "name": "Zebra Crossing"
+            },
+            "landuse/commercial": {
+                "name": "Commercial landuse"
+            },
+            "leisure/pitch/baseball": {
+                "name": "Baseball"
+            },
+            "leisure/pitch/soccer": {
+                "name": "Football Field"
+            },
+            "office/estate_agent": {
+                "name": "Estate Agent"
+            },
+            "shop/alcohol": {
+                "name": "Off license"
+            },
+            "shop/farm": {
+                "name": "Farm Shop"
             },
             "shop/garden_centre": {
                 "name": "Garden Centre"

vendor/assets/iD/iD/locales/eo.json

@@ -0,0 +1,99 @@
+{
+    "modes": {
+        "add_area": {
+            "title": "Areo",
+            "description": "Aldoni parkoj, konstruaĵoj, lagoj aŭ aliaj areoj por la mapo.",
+            "tail": "Klaku sur la mapo por komenci desegni areo, kiel parko, lago, aŭ konstruaĵo."
+        },
+        "add_line": {
+            "title": "linio",
+            "description": "Aldoni ŝoseoj, stratoj, piediranto vojoj, kanaloj aŭ aliajn liniojn al la mapo.",
+            "tail": "Klaku sur la mapo por komenci desegni vojo, vojo, aŭ itinero."
+        },
+        "add_point": {
+            "title": "punkto",
+            "description": "Aldoni restoracioj, monumentoj, bildkartoj skatoloj aŭ aliaj punktoj al la mapo.",
+            "tail": "Klaku sur la mapo por aldoni punkton."
+        },
+        "browse": {
+            "title": "Foliumi",
+            "description": "Pan kaj zomi la mapon."
+        },
+        "draw_area": {
+            "tail": "Klaku por aldoni nodoj al via areo. Klaku la unuan nodo fini la areo."
+        },
+        "draw_line": {
+            "tail": "Klaku por aldoni pli nodoj al la linio. Klaku sur aliaj linioj por konekti al ili, kaj duoble klaki por fino la linion."
+        }
+    },
+    "operations": {
+        "add": {
+            "annotation": {
+                "point": "Aldonita punkto.",
+                "vertex": "Aldonita nodon al vojo.",
+                "relation": "Aldonita rilato."
+            }
+        },
+        "continue": {
+            "title": "Daŭrigu",
+            "description": "Daŭrigu tiun linion.",
+            "not_eligible": "Neniu linio povas esti daŭrigita tien.",
+            "multiple": "Pluraj linioj povas esti daŭrigita tien. Elekti linion, premu la klavo Shift kaj klaku sur ĝi por elekti ĝin.",
+            "annotation": {
+                "line": "Daŭre linion.",
+                "area": "Daŭre areo."
+            }
+        },
+        "cancel_draw": {
+            "annotation": "Nuligita desegno."
+        },
+        "change_role": {
+            "annotation": "Ŝanĝis la rolo de rilato membron."
+        },
+        "change_tags": {
+            "annotation": "Ŝanĝita etikedojn."
+        },
+        "circularize": {
+            "title": "Circularize"
+        },
+        "delete": {
+            "annotation": {
+                "point": "Forigita punkton.",
+                "line": "Forigita linion."
+            }
+        },
+        "disconnect": {
+            "title": "Malkonekti"
+        },
+        "rotate": {
+            "title": "Rotacio"
+        }
+    },
+    "translate": {
+        "translate": "Traduki",
+        "localized_translation_label": "Multlingva nomon"
+    },
+    "intro": {
+        "navigation": {
+            "title": "Navigado"
+        },
+        "points": {
+            "title": "Punktoj"
+        },
+        "areas": {
+            "title": "Areoj",
+            "choose": "** Elektu Playground el la listo. **",
+            "describe": "**Aldoni nomo, kaj fermi la redaktilon trajto **"
+        },
+        "lines": {
+            "title": "Linioj",
+            "wrong_preset": "Vi ne selektis la Residencial vojo tipo. ** Klaku tie ĉi por elekti denove **"
+        },
+        "startediting": {
+            "title": "Komenco Redaktado",
+            "help": "Pli dokumentado kaj tiu walkthrough estas havebla ĉi tie.",
+            "save": "Ne forgesu regule savu viajn ŝanĝojn!",
+            "start": "Starti surĵeto!"
+        }
+    }
+}

vendor/assets/iD/iD/locales/et.json

@@ -25,7 +25,7 @@
             "annotation": {
                 "point": "Punkt lisatud.",
                 "vertex": "Joonele lisatud punkt.",
-                "relation": "Relatsioon lisatud."
+                "relation": "Seos lisatud."
             }
         },
         "start": {
@@ -87,13 +87,12 @@
         },
         "delete": {
             "title": "Kustuta",
-            "description": "Eemalda kaardilt.",
             "annotation": {
                 "point": "Punkt kustutatud.",
                 "vertex": "Punkt kustutatud joonelt.",
                 "line": "Joon kustutatud.",
                 "area": "Ala kustutatud.",
-                "relation": "Relatsioon kustutatud.",
+                "relation": "Seos kustutatud.",
                 "multiple": "{n} objekti kustutatud."
             }
         },
@@ -101,7 +100,7 @@
             "annotation": "Lisatud relatsiooni liige."
         },
         "delete_member": {
-            "annotation": "Relatsiooni liige kustutatud."
+            "annotation": "Seose liige kustutatud."
         },
         "connect": {
             "annotation": {
@@ -139,6 +138,7 @@
         },
         "rotate": {
             "title": "Pööra",
+            "description": "Pööra objekti ümber tema keskpunkti.",
             "key": "R",
             "annotation": {
                 "line": "Pööratud joont.",
@@ -181,7 +181,7 @@
         "localized_translation_language": "Vali keel",
         "localized_translation_name": "Nimi"
     },
-    "zoom_in_edit": "Muutmiseks zuumi sisse",
+    "zoom_in_edit": "Muutmiseks suurenda sisse",
     "logout": "Logi välja",
     "loading_auth": "OpenStreetMap'iga ühendamine...",
     "report_a_bug": "teata veast",
@@ -217,8 +217,8 @@
         "view_on_osm": "Vaata openstreetmap.org lehel",
         "all_tags": "Kõik sildid",
         "all_members": "Kõik liikmed",
-        "all_relations": "Kõik relatsioonid",
-        "new_relation": "Uus relatsioon...",
+        "all_relations": "Kõik seosed",
+        "new_relation": "Uus seos...",
         "role": "Roll",
         "choose": "Vali objekti liik",
         "results": "{n} tulemust otsingule {search}",
@@ -226,12 +226,16 @@
         "back_tooltip": "Muuda objekti",
         "remove": "Eemalda",
         "search": "Otsi",
-        "multiselect": "Valitud ühikud",
+        "multiselect": "Valitud objektid",
         "unknown": "Teadmata",
         "incomplete": "<alla laadimata>",
         "feature_list": "Otsi objekte",
         "edit": "Muuda objekti",
-        "none": "Puudub"
+        "none": "Puudub",
+        "node": "Punkt",
+        "way": "Joon",
+        "relation": "Seos",
+        "location": "Asukoht"
     },
     "background": {
         "title": "Taust",
@@ -239,7 +243,7 @@
         "percent_brightness": "{opacity}% heledus",
         "none": "Puudub",
         "custom": "Kohandatud",
-        "custom_prompt": "Sisesta kohandatud tausta URL. Kasutatavad muutujad on {z}, {x}, {y} Z/X/Y skeemi jaoks ja {u} quadtile skeemi jaoks.",
+        "custom_button": "Muuda kohandatud tausta",
         "fix_misalignment": "Korrigeeri nihet",
         "reset": "lähtesta"
     },
@@ -273,7 +277,7 @@
         "welcome": "Tere tulemast kasutama iD OpenStreetMap redaktorit",
         "text": "iD on kasutajasõbralik ja samas võimas töövahend parima vaba maailmakaardi täiendamiseks. See on versioon {version}. Rohkem infot võib leida veebilehelt {website} ja vigadest saab teatada lehel {github}.",
         "walkthrough": "Alusta tutvustust",
-        "start": "Kohe redigeerima"
+        "start": "Alusta muutmist"
     },
     "source_switch": {
         "live": "live",
@@ -299,7 +303,7 @@
     },
     "gpx": {
         "local_layer": "Kohalik GPX fail",
-        "zoom": "Zuumi GPX jälg sisse",
+        "zoom": "Suurenda GPX jälg sisse",
         "browse": "Vali .gpx fail"
     },
     "help": {
@@ -327,13 +331,19 @@
             "road": "**Vali nimekirjast tee**"
         },
         "startediting": {
-            "title": "Alusta redigeerimist",
+            "title": "Alusta muutmist",
             "save": "Ära unusta oma muudatusi regulaarselt salvestada!",
             "start": "Alusta kaardistamist!"
         }
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Hoone"
+            },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Maakasutus"
             },
@@ -343,22 +353,80 @@
             "category-rail": {
                 "name": "Raudtee"
             },
+            "category-restriction": {
+                "name": "Piirang"
+            },
             "category-road": {
                 "name": "Tee"
+            },
+            "category-route": {
+                "name": "Teekond"
+            },
+            "category-water-area": {
+                "name": "Vesi"
+            },
+            "category-water-line": {
+                "name": "Vesi"
             }
         },
         "fields": {
             "access": {
-                "label": "Ligipääs"
+                "label": "Juurdepääs",
+                "placeholder": "Teadmata",
+                "types": {
+                    "access": "Üldine",
+                    "foot": "Jalg",
+                    "motor_vehicle": "Mootorsõidukid",
+                    "bicycle": "Jalgrattad",
+                    "horse": "Hobused"
+                },
+                "options": {
+                    "yes": {
+                        "title": "Lubatud",
+                        "description": "Juurdepääs seaduse alusel; igameheõigus"
+                    },
+                    "no": {
+                        "title": "Keelatud",
+                        "description": "Avalik juurdepääs puudub"
+                    },
+                    "permissive": {
+                        "title": "Soovituslik",
+                        "description": "Juurdepääs on lubatud ajani, mil omanik tühistab loa"
+                    },
+                    "private": {
+                        "title": "Era",
+                        "description": "Juurdepääs lubatud ainult omaniku eriloal"
+                    },
+                    "designated": {
+                        "title": "Määratud"
+                    },
+                    "destination": {
+                        "title": "Sihtkoht"
+                    }
+                }
+            },
+            "access_simple": {
+                "label": "Juurdepääs",
+                "placeholder": "jah"
+            },
+            "access_toilets": {
+                "label": "Juurdepääs"
             },
             "address": {
                 "label": "Aadress",
                 "placeholders": {
-                    "housename": "Majanimi",
-                    "number": "123",
+                    "housename": "Maja nimetus",
+                    "housenumber": "123",
                     "street": "Tänav",
                     "city": "Linn",
-                    "postcode": "Postiindeks"
+                    "postcode": "Sihtnumber",
+                    "place": "Koht",
+                    "country": "Riik"
+                }
+            },
+            "aerialway/access": {
+                "options": {
+                    "both": "Mõlemad"
                 }
             },
             "aeroway": {
@@ -388,8 +456,8 @@
             "clock_direction": {
                 "label": "Suund",
                 "options": {
-                    "clockwise": "Kellasuunas",
-                    "anticlockwise": "Kella vastassuunas"
+                    "clockwise": "Päripäeva",
+                    "anticlockwise": "Vastupäeva"
                 }
             },
             "collection_times": {
@@ -564,7 +632,7 @@
                 "name": "Tuletõrjedepoo"
             },
             "amenity/fountain": {
-                "name": "Purskaev"
+                "name": "Purskkaev"
             },
             "amenity/fuel": {
                 "name": "Bensiinijaam"
@@ -572,12 +640,6 @@
             "amenity/grave_yard": {
                 "name": "Surnuaed"
             },
-            "amenity/hospital": {
-                "name": "Haigla"
-            },
-            "amenity/kindergarten": {
-                "name": "Lasteaed"
-            },
             "amenity/library": {
                 "name": "Raamatukogu"
             },
@@ -606,13 +668,10 @@
                 "name": "Postkontor"
             },
             "amenity/pub": {
-                "name": "Pubi"
+                "name": "Kõrts"
             },
             "amenity/restaurant": {
-                "name": "Restoraan"
-            },
-            "amenity/school": {
-                "name": "Kool"
+                "name": "Restoran"
             },
             "amenity/swimming_pool": {
                 "name": "Ujumisbassein"
@@ -626,9 +685,6 @@
             "amenity/toilets": {
                 "name": "Tualett"
             },
-            "amenity/university": {
-                "name": "Ülikool"
-            },
             "amenity/waste_basket": {
                 "name": "Prügikast"
             },
@@ -665,32 +721,98 @@
             "building/apartments": {
                 "name": "Korterid"
             },
+            "building/church": {
+                "name": "Kirik"
+            },
             "building/commercial": {
                 "name": "Ärihoone"
             },
+            "building/construction": {
+                "name": "Ehitusjärgus hoone"
+            },
+            "building/detached": {
+                "name": "Eramu"
+            },
+            "building/dormitory": {
+                "name": "Ühiselamu"
+            },
             "building/entrance": {
                 "name": "Sissepääs"
             },
+            "building/garage": {
+                "name": "Garaaz"
+            },
+            "building/garages": {
+                "name": "Garaazid"
+            },
+            "building/greenhouse": {
+                "name": "Kasvuhoone"
+            },
+            "building/hospital": {
+                "name": "Haigla"
+            },
+            "building/hotel": {
+                "name": "Hotell"
+            },
             "building/house": {
                 "name": "Maja"
             },
+            "building/hut": {
+                "name": "Onn"
+            },
             "building/industrial": {
                 "name": "Tööstushoone"
             },
+            "building/kindergarten": {
+                "name": "Lasteaed"
+            },
+            "building/public": {
+                "name": "Avalik hoone"
+            },
             "building/residential": {
                 "name": "Elamu"
             },
+            "building/roof": {
+                "name": "Katus"
+            },
+            "building/train_station": {
+                "name": "Raudteejaam"
+            },
+            "building/university": {
+                "name": "Ülikool"
+            },
+            "building/warehouse": {
+                "name": "Ladu"
+            },
+            "craft/basket_maker": {
+                "name": "Korvimeister"
+            },
+            "craft/beekeeper": {
+                "name": "Mesinik"
+            },
+            "craft/blacksmith": {
+                "name": "Sepikoda"
+            },
+            "craft/boatbuilder": {
+                "name": "Paadiehitaja"
+            },
+            "craft/bookbinder": {
+                "name": "Raamatuköitja"
+            },
+            "craft/brewery": {
+                "name": "Pruulikoda"
+            },
+            "craft/carpenter": {
+                "name": "Puusepp"
+            },
             "emergency/phone": {
                 "name": "Hädaabi telefon"
             },
-            "entrance": {
-                "name": "Sissepääs"
-            },
             "highway": {
                 "name": "Tee"
             },
             "highway/bridleway": {
-                "name": "Ratsutamistee"
+                "name": "Ratsutamise rada"
             },
             "highway/bus_stop": {
                 "name": "Bussipeatus"
@@ -713,9 +835,6 @@
             "highway/motorway": {
                 "name": "Kiirtee"
             },
-            "highway/motorway_junction": {
-                "name": "Kiirtee liiklussõlm"
-            },
             "highway/path": {
                 "name": "Rada"
             },
@@ -768,16 +887,16 @@
                 "name": "Surnuaed"
             },
             "landuse/commercial": {
-                "name": "Kommertsmaa"
+                "name": "Ärimaa"
             },
             "landuse/forest": {
-                "name": "Mets"
+                "name": "Metsamaa"
             },
             "landuse/grass": {
                 "name": "Muru"
             },
             "landuse/industrial": {
-                "name": "Tüüstuslik"
+                "name": "Tootmismaa"
             },
             "landuse/meadow": {
                 "name": "Niit"
@@ -789,10 +908,10 @@
                 "name": "Karjäär"
             },
             "landuse/residential": {
-                "name": "Elamupiirkond"
+                "name": "Elamumaa"
             },
             "landuse/retail": {
-                "name": "Kaubanduslik"
+                "name": "Jaekaubandus"
             },
             "landuse/vineyard": {
                 "name": "Viinapuuaed"
@@ -854,9 +973,6 @@
             "man_made/water_tower": {
                 "name": "Veetorn"
             },
-            "man_made/water_well": {
-                "name": "Veekaev"
-            },
             "natural": {
                 "name": "Looduslik"
             },
@@ -992,9 +1108,6 @@
             "shop/bicycle": {
                 "name": "Rattapood"
             },
-            "shop/books": {
-                "name": "Raamatupood"
-            },
             "shop/butcher": {
                 "name": "Lihapood"
             },
@@ -1013,12 +1126,6 @@
             "shop/computer": {
                 "name": "Arvutipood"
             },
-            "shop/confectionery": {
-                "name": "Kommipood"
-            },
-            "shop/dry_cleaning": {
-                "name": "Keemiline puhastus"
-            },
             "shop/electronics": {
                 "name": "Elektroonikapood"
             },
@@ -1034,9 +1141,6 @@
             "shop/hairdresser": {
                 "name": "Juuksurisalong"
             },
-            "shop/kiosk": {
-                "name": "Kiosk"
-            },
             "shop/laundry": {
                 "name": "Pesumaja"
             },
@@ -1086,7 +1190,7 @@
                 "name": "Kunstiteos"
             },
             "tourism/attraction": {
-                "name": "\tTurismiatraktsioon"
+                "name": "Turismiatraktsioon"
             },
             "tourism/caravan_site": {
                 "name": "Karavanipark"

vendor/assets/iD/iD/locales/fa.json

@@ -1,7 +1,7 @@
 {
     "modes": {
         "add_area": {
-            "title": "فضاها",
+            "title": "محدوده",
             "description": "افزودن پارک ها، ساختمان ها، دریاچه ها و سایر فضاها به نقشه.",
             "tail": "برای شروع کشیدن فضا هایی مثل پارک، دریاچه، یا ساختمان روی نقشه کلیک کنید."
         },
@@ -95,7 +95,6 @@
         },
         "delete": {
             "title": "حذف",
-            "description": "حذف این از نقشه.",
             "annotation": {
                 "point": "نقطه حذف شد.",
                 "vertex": "گره از راه حذف شد.",
@@ -179,6 +178,11 @@
             },
             "not_eligible": "خطوط در شروع و پایانشان قابل تقسیم نیستند.",
             "multiple_ways": "تعداد خیلی زیادی خط برای تقسیم اینجا وجود دارد."
+        },
+        "restriction": {
+            "help": {
+                "select": "کلیک برای انتخاب یک بخش جاده"
+            }
         }
     },
     "undo": {
@@ -246,7 +250,7 @@
         "reference": "نمایش در ویکی  OpenStreetMap",
         "back_tooltip": "تغییر ویژگی",
         "remove": "پاک کردن",
-        "search": "جسنجو",
+        "search": "جستجو",
         "multiselect": "موارد انتخاب شدند",
         "unknown": "ناشناخته",
         "incomplete": "<دانلود نشده>",
@@ -264,7 +268,7 @@
         "percent_brightness": "{opacity}% روشنایی",
         "none": "هیچ",
         "custom": "سفارشی",
-        "custom_prompt": "قالب کاشی را وارد کنید. نشانه های مشخص  {z}, {x}, {y} هستند برای طرح  Z/X/Y و {u} برای طرح چهار کاشی.",
+        "custom_button": "ویرایش پشت زمینه سفارشی",
         "fix_misalignment": "تعمیر تراز",
         "reset": "باز نشاندن"
     },
@@ -316,7 +320,6 @@
         "untagged_area": "فضای برچسب گذاری نشده",
         "many_deletions": "شما در حال حذف {n} شیئ هستید. مطمئنید میخواهید این کار را انجام دهید؟ این کار آنها را از نقشه ای که دیگران در openstreetmap.org میبینند حذف می کند.",
         "tag_suggests_area": "برچسب  {tag} پیشنهاد میکند خط باید یک فضا باشد، اما این یک فضا نیست",
-        "untagged_tooltip": "یک نوع ویژگی را انتخاب کنید که توصیف کند این {geometry} چیست.",
         "deprecated_tags": "برچسب های توصیه شده: {tags}"
     },
     "zoom": {
@@ -359,7 +362,6 @@
         },
         "areas": {
             "title": "فضاها",
-            "add": "فضا ها یک راه جزییاتی بیشتر برای نمایش مشخصات اند. آنها اطلاعاتی درباره ویژگی های مرزی ارائه میدهند. فضا ها میتوانند برای انواع بیشتری ویژگی استفاده شوند نقاط میتوانند استفاده شوند و، اغلب مقدم ترند.**برای افزودن فضای جدید روی دکمه ی فضا کلیک کنید.**",
             "corner": "مناطق با گذاشتن گره هایی در مرز منطقه کشیده می شوند.**گره آغازین را در یکی از گوشه های زمین بازی قرار دهید.**",
             "place": "فضا را با گذاشتن گره های بیشتر بکشید. فضا را با کلیک روی نقطه ی شروع پایان دهید.**فضایی برای زمین بازی بکشید.**",
             "search": "**برای  '{name}' جستجو کنید.**",
@@ -459,11 +461,8 @@
             "address": {
                 "label": "ادرس",
                 "placeholders": {
-                    "housename": "نام خانه",
-                    "number": "123",
                     "street": "خيابان",
-                    "city": "شهر",
-                    "postcode": "کد پستی"
+                    "city": "شهر"
                 }
             },
             "admin_level": {
@@ -529,9 +528,6 @@
             "building_area": {
                 "label": "ساختمان"
             },
-            "cans": {
-                "label": "پذیرش قوطی ها"
-            },
             "capacity": {
                 "label": "ظرفيت",
                 "placeholder": "50, 100, 200..."
@@ -546,9 +542,6 @@
                     "anticlockwise": "پاد ساعتگرد"
                 }
             },
-            "clothes": {
-                "label": "پذیرش لباس ها"
-            },
             "collection_times": {
                 "label": "مجموع دفعات"
             },
@@ -588,6 +581,9 @@
             "entrance": {
                 "label": "نوع"
             },
+            "except": {
+                "label": "استثناها"
+            },
             "fax": {
                 "label": "نمابر",
                 "placeholder": "+31 42 123 4567"
@@ -601,6 +597,9 @@
             "fixme": {
                 "label": "تصحیح من"
             },
+            "fuel": {
+                "label": "سوخت"
+            },
             "gauge": {
                 "label": "مقیاس"
             },
@@ -613,9 +612,6 @@
             "generator/type": {
                 "label": "نوع"
             },
-            "glass": {
-                "label": "پذیرش عینک"
-            },
             "golf_hole": {
                 "label": "مراجعه",
                 "placeholder": "تعداد سوراخ (1-18)"
@@ -630,6 +626,9 @@
             "historic": {
                 "label": "نوع"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "یاتا"
             },
@@ -663,6 +662,9 @@
             "leisure": {
                 "label": "نوع"
             },
+            "length": {
+                "label": "طول (متر)"
+            },
             "levels": {
                 "label": "سطح",
                 "placeholder": "2, 4, 6..."
@@ -708,9 +710,6 @@
             "operator": {
                 "label": "اپراتور"
             },
-            "paper": {
-                "label": "پذیرش کاغذ"
-            },
             "par": {
                 "label": "برابری",
                 "placeholder": "3, 4, 5..."
@@ -750,16 +749,7 @@
                 "label": "نوع"
             },
             "religion": {
-                "label": "دین",
-                "options": {
-                    "christian": "مسیحی",
-                    "muslim": "مسلمان",
-                    "buddhist": "بودایی",
-                    "jewish": "یهودی",
-                    "hindu": "هندو",
-                    "shinto": "شینتو",
-                    "taoist": "تائو"
-                }
+                "label": "دین"
             },
             "restriction": {
                 "label": "نوع"
@@ -770,8 +760,8 @@
             "route_master": {
                 "label": "نوع"
             },
-            "sac_scale": {
-                "label": "سختی مسیر"
+            "seasonal": {
+                "label": "فصلی"
             },
             "service": {
                 "label": "نوع"
@@ -785,12 +775,18 @@
             "shop": {
                 "label": "نوع"
             },
+            "social_facility_for": {
+                "placeholder": "بی خانمان، معلول، کودک، و غیره"
+            },
             "source": {
                 "label": "منبع"
             },
             "sport": {
                 "label": "ورزشي"
             },
+            "sport_ice": {
+                "label": "ورزشی"
+            },
             "structure": {
                 "label": "ساختاری",
                 "placeholder": "ناشناخته",
@@ -819,15 +815,15 @@
             "towertype": {
                 "label": "نوع برج"
             },
-            "tracktype": {
-                "label": "نوع"
-            },
             "trail_visibility": {
                 "label": "مسیر پیاده روی"
             },
             "tree_type": {
                 "label": "نوع"
             },
+            "trees": {
+                "label": "درخت‌ها"
+            },
             "tunnel": {
                 "label": "تونل"
             },
@@ -978,9 +974,8 @@
                 "name": "کارواش",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'کارواش'، با کاما جدا میشوند>"
             },
-            "amenity/childcare": {
-                "name": "مراقبت از کودک",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مراقبت از کودک'، با کاما جدا میشوند>"
+            "amenity/charging_station": {
+                "name": "ایستگاه شارژ"
             },
             "amenity/cinema": {
                 "name": "سینما",
@@ -992,10 +987,6 @@
             "amenity/clock": {
                 "name": "ساعت"
             },
-            "amenity/college": {
-                "name": "دانشکده",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دانشکده'، با کاما جدا میشوند>"
-            },
             "amenity/courthouse": {
                 "name": "دادگاه",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دادگاه'، با کاما جدا میشوند>"
@@ -1035,12 +1026,7 @@
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مقبره'، با کاما جدا میشوند>"
             },
             "amenity/hospital": {
-                "name": "بیمارستان",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بیمارستان'، با کاما جدا میشوند>"
-            },
-            "amenity/kindergarten": {
-                "name": "مهد کودک",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مهد کودک'، با کاما جدا میشوند>"
+                "name": "محیط بیمارستان"
             },
             "amenity/library": {
                 "name": "کتابخانه",
@@ -1053,6 +1039,9 @@
             "amenity/parking": {
                 "name": "پارکینگ خودرو"
             },
+            "amenity/parking_entrance": {
+                "name": "ورودی/خروجی پارکینگ"
+            },
             "amenity/pharmacy": {
                 "name": "داروخانه",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'داروخانه'، با کاما جدا میشوند>"
@@ -1104,12 +1093,17 @@
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'رستوران'، با کاما جدا میشوند>"
             },
             "amenity/school": {
-                "name": "مدرسه",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'مدرسه'، با کاما جدا میشوند>"
+                "name": "محیط مدرسه"
             },
             "amenity/shelter": {
                 "name": "پناه گاه"
             },
+            "amenity/social_facility/food_bank": {
+                "name": "فروشگاه مواد غذایی"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "پناهگاه بی خانمان‌ها"
+            },
             "amenity/studio": {
                 "name": "استدیو"
             },
@@ -1137,10 +1131,6 @@
                 "name": "تالار شهر",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تالار شهر'، با کاما جدا میشوند>"
             },
-            "amenity/university": {
-                "name": "دانشگاه",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'دانشگاه'، با کاما جدا میشوند>"
-            },
             "amenity/vending_machine": {
                 "name": "دستگاه فروش"
             },
@@ -1235,18 +1225,47 @@
                 "name": "آپارتمان ها",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'آپارتمان'، با کاما جدا میشوند>"
             },
+            "building/cabin": {
+                "name": "کابین"
+            },
+            "building/cathedral": {
+                "name": "کلیسای بزرگ"
+            },
+            "building/chapel": {
+                "name": "کلیسای کوچک"
+            },
+            "building/church": {
+                "name": "کلیسا"
+            },
             "building/commercial": {
                 "name": "ساختمان ارتباطی",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان ارتباطی'، با کاما جدا میشوند>"
             },
+            "building/construction": {
+                "name": "ساختمان در دست ساخت"
+            },
+            "building/dormitory": {
+                "name": "خوابگاه"
+            },
             "building/entrance": {
-                "name": "ورودی",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
+                "name": "ورود/خروج"
             },
             "building/garage": {
                 "name": "گاراژ",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گاراژ'، با کاما جدا میشوند>"
             },
+            "building/garages": {
+                "name": "گاراژ"
+            },
+            "building/greenhouse": {
+                "name": "گلخانه"
+            },
+            "building/hospital": {
+                "name": "ساختمان بیمارستان"
+            },
+            "building/hotel": {
+                "name": "ساختمان هتل"
+            },
             "building/house": {
                 "name": "خانه",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'خانه'، با کاما جدا میشوند>"
@@ -1259,10 +1278,31 @@
                 "name": "ساختمان صنعتی",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان صنعتی'، با کاما جدا میشوند>"
             },
+            "building/public": {
+                "name": "ساختمان عمومی"
+            },
             "building/residential": {
                 "name": "ساختمان مسکونی",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان مسکونی'، با کاما جدا میشوند>"
             },
+            "building/retail": {
+                "name": "ساختمان خرده فروشی"
+            },
+            "building/roof": {
+                "name": "سقف"
+            },
+            "building/school": {
+                "name": "ساختمان مدرسه"
+            },
+            "building/stable": {
+                "name": "اصطبل"
+            },
+            "building/train_station": {
+                "name": "ایستگاه قطار"
+            },
+            "building/university": {
+                "name": "ساختمان دانشگاه"
+            },
             "craft/basket_maker": {
                 "name": "سبد ساز"
             },
@@ -1335,9 +1375,6 @@
             "craft/photographer": {
                 "name": "عکاس"
             },
-            "craft/photographic_labratory": {
-                "name": "آزمایشگاه عکس برداری"
-            },
             "craft/plasterer": {
                 "name": "گچ کار"
             },
@@ -1409,8 +1446,7 @@
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تلفن اورژانسی'، با کاما جدا میشوند>"
             },
             "entrance": {
-                "name": "درب ورودی",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
+                "name": "ورود/خروج"
             },
             "footway/crossing": {
                 "name": "خط عابر پیاده"
@@ -1475,16 +1511,16 @@
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای   'Mini-Roundabout'، با کاما جدا میشوند>"
             },
             "highway/motorway": {
-                "name": "مسیر موتور سواری",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'راه وسایل موتوری'، با کاما جدا میشوند>"
+                "name": "بزرگراه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'بزرگراه'، با کاما جدا میشوند>"
             },
             "highway/motorway_junction": {
-                "name": "محل اتصال جاده موتور سیکلت",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'Motorway Junction'، با کاما جدا میشوند>"
+                "name": "تقاطع بزرگراه / خروج",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تقاطع بزرگراه/خروج'، با کاما جدا میشوند>"
             },
             "highway/motorway_link": {
-                "name": "اتصال جاده موتور سیکلت",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوستن جاده موتور'، با کاما جدا میشوند>"
+                "name": "اتصال بزرگراه",
+                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوستن بزرگراه'، با کاما جدا میشوند>"
             },
             "highway/path": {
                 "name": "مسیر",
@@ -1651,9 +1687,15 @@
             "landuse/industrial": {
                 "name": "صنعتی"
             },
+            "landuse/landfill": {
+                "name": "محل دفن مواد (زباله)"
+            },
             "landuse/meadow": {
                 "name": "مرغزار"
             },
+            "landuse/military": {
+                "name": "نظامی"
+            },
             "landuse/orchard": {
                 "name": "باغ میوه"
             },
@@ -1721,7 +1763,7 @@
                 "name": "قایق ساکن"
             },
             "leisure/sports_center": {
-                "name": "مرکز ورزشی"
+                "name": "مرکز ورزشی/ بدنسازی"
             },
             "leisure/stadium": {
                 "name": "ورزشگاه"
@@ -1729,9 +1771,6 @@
             "leisure/swimming_pool": {
                 "name": "استخر شنا"
             },
-            "leisure/track": {
-                "name": "مسیر مسابقه"
-            },
             "line": {
                 "name": "خط"
             },
@@ -1774,9 +1813,6 @@
             "man_made/water_tower": {
                 "name": "برج مخزن آب"
             },
-            "man_made/water_well": {
-                "name": "چاه آب"
-            },
             "man_made/water_works": {
                 "name": "امور آب"
             },
@@ -2041,8 +2077,8 @@
             "shop/bicycle": {
                 "name": "فروشگاه دوچرخه"
             },
-            "shop/books": {
-                "name": "کتاب فروشی"
+            "shop/bookmaker": {
+                "name": "صحافی"
             },
             "shop/boutique": {
                 "name": "بوتیک"
@@ -2068,9 +2104,6 @@
             "shop/computer": {
                 "name": "فروشگاه کامپیوتر"
             },
-            "shop/confectionery": {
-                "name": "شیرینی پزی"
-            },
             "shop/convenience": {
                 "name": "فروشگاه زنجیره ای"
             },
@@ -2083,9 +2116,6 @@
             "shop/doityourself": {
                 "name": "فروشگاه DIY"
             },
-            "shop/dry_cleaning": {
-                "name": "پاک کننده های خشک"
-            },
             "shop/electronics": {
                 "name": "فروشگاه الکترونیک"
             },
@@ -2122,15 +2152,15 @@
             "shop/jewelry": {
                 "name": "جواهر فروشی"
             },
-            "shop/kiosk": {
-                "name": "دکه"
-            },
             "shop/laundry": {
                 "name": "خشک شویی"
             },
             "shop/locksmith": {
                 "name": "قفل سازی"
             },
+            "shop/lottery": {
+                "name": "فروشگاه قرعه کشی"
+            },
             "shop/mall": {
                 "name": "مرکز خرید"
             },
@@ -2143,15 +2173,9 @@
             "shop/music": {
                 "name": "فروشگاه موسیقی"
             },
-            "shop/newsagent": {
-                "name": "دکه ی روزنامه"
-            },
             "shop/optician": {
                 "name": "عینک سازی"
             },
-            "shop/outdoor": {
-                "name": "فروشگاه فضای باز"
-            },
             "shop/pet": {
                 "name": "فروشگاه حیوانات خانگی"
             },

vendor/assets/iD/iD/locales/fil.json

@@ -0,0 +1,494 @@
+{
+    "modes": {
+        "add_area": {
+            "title": "Area o poligon",
+            "description": "Magdagdag ng mga parke, mga gusali, lawa o iba pang mga \"area\" sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang lugar, tulad ng isang parke, lawa, o gusali."
+        },
+        "add_line": {
+            "title": "Linya o guhit",
+            "description": "Magdagdag ng mga kalsada o kalye, mga daanang pantao, kanal o iba pang mga linya sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang linya tulad ng kalsada, daanang pantao, o ruta."
+        },
+        "add_point": {
+            "title": "Punto o tuldok",
+            "description": "Magdagdag ng kainan, monumento, \"postbox\" o iba pang mga punto o tuldok sa mapa.",
+            "tail": "Mag-click sa mapa upang magdagdag ng isang punto o tuldok."
+        },
+        "browse": {
+            "title": "Mag-browse",
+            "description": "I-pan at i-zoom ang mapa."
+        },
+        "draw_area": {
+            "tail": "I-click upang magdagdag ng mga node sa iyong polygon o area. I-click ang unang node upang isarado ang polygon o area."
+        },
+        "draw_line": {
+            "tail": "I-click upang magdagdag ng higit pang mga node sa linya. Mag-click sa iba pang mga linya upang kumonekta sa kanila, at i-double click upang tapusin ang linya."
+        }
+    },
+    "operations": {
+        "add": {
+            "annotation": {
+                "point": "Idinagdag ng isang punto o tuldok.",
+                "vertex": "Nagdagdag ng node sa isang way.",
+                "relation": "Nagdagdag ng relation."
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": "Nagsimula ng isang linya.",
+                "area": "Nagsimula sa isang area o polygon."
+            }
+        },
+        "continue": {
+            "key": "S",
+            "title": "Ipagpatuloy",
+            "description": "Ipagpatuloy ang linyang ito.",
+            "not_eligible": "Walang linyang maaring ipagpatuloy dito.",
+            "annotation": {
+                "line": "Karugtong ng isang linya.",
+                "area": "Nagpatuloy sa pagguhit ng area o poligon."
+            }
+        },
+        "cancel_draw": {
+            "annotation": "Kinansela ang pagguhit."
+        },
+        "change_tags": {
+            "annotation": "Pinalitan ang mga tag."
+        },
+        "circularize": {
+            "title": "Pina-bilog",
+            "description": {
+                "line": "Gawin pabilog ang linyang ito.",
+                "area": "Gawin pabilog ang area o poligong ito."
+            },
+            "key": "O",
+            "annotation": {
+                "line": "Ginawang pabilog and isang linya.",
+                "area": "Ginawang pabilog and isang area o poligon."
+            },
+            "not_closed": "Hindi ito maaaring gawing pabilog dahil hindi ito isang \"loop\".",
+            "too_large": "Hindi na ito maaaring gawing pabilog dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "orthogonalize": {
+            "title": "Iskawalado",
+            "description": {
+                "line": "Gawing iskwalado ang mga kanto ng linyang ito.",
+                "area": "Gawing iskwalado ang mga kanto ng area o poligong ito."
+            },
+            "key": "S",
+            "annotation": {
+                "line": "Ginawang iskawalado ang bawat kanto ng linya.",
+                "area": "Ginawang iskawalado ang bawat kanto ng area o poligon."
+            },
+            "not_squarish": "Hindi maaring gawing iskwalado.",
+            "too_large": "Hindi ito maaaring gawing iskuwalado dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "straighten": {
+            "title": "Ituwid",
+            "description": "Ituwid ang linyang ito.",
+            "key": "S",
+            "annotation": "Naituwid ang linya.",
+            "too_bendy": "Hindi naituwid dahil masyadong kurbado."
+        },
+        "delete": {
+            "title": "Burahin",
+            "description": "Burahin ito sa mapa.",
+            "annotation": {
+                "point": "Binura ang isang point o tuldok.",
+                "vertex": "Binura ang isang node mula sa way o linya.",
+                "line": "Binura ang isang linya.",
+                "area": "Binura ang isang area o poligon.",
+                "relation": "Binura ang isang \"relation\".",
+                "multiple": "Binura ang {n} bagay sa mapa."
+            }
+        },
+        "add_member": {
+            "annotation": "Dinagdag ang kasapi o miyembro ng relation."
+        },
+        "delete_member": {
+            "annotation": "Inalis ang kasapi o miyembro ng relation."
+        },
+        "connect": {
+            "annotation": {
+                "point": "Dinugtong ang isang \"way\" sa isang punto o tuldok.",
+                "vertex": "Dinugtong ang isang \"way\" sa isa pang \"way\".",
+                "line": "Dinugtong ang isang \"way\" sa isang linya.",
+                "area": "Dinugtong ang isang \"way\" sa isang area o poligon."
+            }
+        },
+        "disconnect": {
+            "title": "Alisin ang pagkakadugtong",
+            "description": "Alisin sa pagkakadugtong ang mga linya / poligon.",
+            "key": "D",
+            "annotation": "Naalis sa pagkakadugtong ang mga linya / poligon."
+        },
+        "merge": {
+            "title": "Pagsamahin",
+            "description": "Pagdugtungin ang mga linyang ito.",
+            "key": "C",
+            "annotation": "Dinugtung ang {n} linya.",
+            "not_eligible": "Ang mga bagay na ito ay hindi maaaring pagsamahin.",
+            "not_adjacent": "Hindi mapagsama ang linyang ito dahil sila ay hindi konektado.",
+            "incomplete_relation": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga ito ay hindi pa ganap na nai-download."
+        },
+        "move": {
+            "title": "Ilipat ng posisyon",
+            "description": "Ilipat ang posisyon.",
+            "key": "M",
+            "annotation": {
+                "point": "Inilipat ang posisyon ng isang punto o tuldok.",
+                "vertex": "Inilipat ang posisyon ng isang \"node\" na sa isang \"way\".",
+                "line": "Inilipat ang posisyon ng isang linya.",
+                "area": "Inilipat ang posisyon ng isang area o poligon.",
+                "multiple": "Inilipat ang posisyon ang maraming bagay."
+            }
+        },
+        "rotate": {
+            "title": "Paikutin",
+            "description": "Paikutin ang bagay na ito mula sa kanyang \"center point\".",
+            "key": "R",
+            "annotation": {
+                "line": "Pinaikot ang linya.",
+                "area": "Pinaikot ang area o poligon."
+            }
+        },
+        "reverse": {
+            "title": "Baliktarin",
+            "description": "Baliktarin ang direksyon ng linyang ito.",
+            "key": "V",
+            "annotation": "Binaliktad ang direksyon ng linya."
+        },
+        "split": {
+            "title": "Hatiin",
+            "description": {
+                "line": "Hatiin sa dalawa ang linya mula sa node na ito.",
+                "area": "Hatiin ang hangganan ng lugar na ito sa dalawa."
+            },
+            "key": "X",
+            "annotation": {
+                "line": "Hattin ang linya.",
+                "area": "Hatiin ang hangganan ng area o poligon.",
+                "multiple": "Hattin ang {n} linya/area o poligon."
+            },
+            "not_eligible": "Hindi maaaring hatiin ang linya mula sa umpisa o dulong \"node\" nito."
+        }
+    },
+    "undo": {
+        "tooltip": "I-undo:{action}",
+        "nothing": "Walang ma-undo"
+    },
+    "redo": {
+        "tooltip": "i-redo: {action}",
+        "nothing": "Walang ma-redo."
+    },
+    "browser_notice": "Ang editor na ito ay suportado sa Firefox, Chrome, Safari, Opera, at Internet Explorer 9 at sa mas mataas pang bersion. I-upgrade ang inyong browser o gamitin Potlatch 2 upang i-edit ng mapa.",
+    "translate": {
+        "localized_translation_language": "Pumili ng wika",
+        "localized_translation_name": "Pangalan"
+    },
+    "zoom_in_edit": "Mag-zoom in para makapag-edit",
+    "logout": "Mag-logout",
+    "loading_auth": "Kumokonekta sa OpenStreetMap ...",
+    "report_a_bug": "I-ulat ang bug",
+    "status": {
+        "error": "Hindi maka-konekta sa API."
+    },
+    "commit": {
+        "title": "I-save ang mga binago.",
+        "description_placeholder": "Maikling paglalarawan ng iyong mga ambag o edits",
+        "message_label": "Mag-commit mensahe",
+        "upload_explanation": "Ang mga pagbabagong na-upload ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "save": "I-save",
+        "cancel": "Kanselahin",
+        "warnings": "Mga babala",
+        "modified": "Binago",
+        "deleted": "Binura",
+        "created": "Nilikha"
+    },
+    "contributors": {
+        "list": "Edits nina {users}",
+        "truncated_list": "Edits nina {users} at {count} iba pa"
+    },
+    "geocoder": {
+        "search": "Maghanap sa buong mundo ...",
+        "no_results_visible": "Walang mga resulta sa kasalukuyang lugar sa mapa",
+        "no_results_worldwide": "Walang mga resultang natagpuan"
+    },
+    "geolocate": {
+        "title": "Ipakita ang kasalukuyang lokasyon."
+    },
+    "inspector": {
+        "no_documentation_combination": "Walang documentation para sa kumbinasyon ng mga tag na ginamit",
+        "no_documentation_key": "Walang \"documentation\" na magagamit para sa \"key\" na ito.",
+        "show_more": "Higit pang detalye",
+        "view_on_osm": "Tingnan sa openstreetmap.org",
+        "all_tags": "Lahat ng tags",
+        "all_members": "Lahat ng kasapi",
+        "all_relations": "Lahat ng \"relation\"",
+        "new_relation": "Bagong relation ...",
+        "choose": "Pumili ng uri ng \"features\"",
+        "results": "{n} mga resulta para sa {search}",
+        "reference": "Tingnan sa OpenStreetMap Wiki",
+        "back_tooltip": "Baguhin ang \"feature\"",
+        "remove": "Alisin",
+        "search": "Mag-search",
+        "feature_list": "Mag-hanap ng \"feature\"",
+        "edit": "I-edit ang \"feature\"",
+        "none": "Wala",
+        "node": "Node",
+        "way": "Way",
+        "relation": "Relation",
+        "location": "Lokasyon"
+    },
+    "background": {
+        "title": "\"Background\" o \"imagery\"",
+        "description": "Mga setting ng \"background\" o \"imagery\"",
+        "percent_brightness": "{opacity}% Pagkalinaw",
+        "none": "Wala",
+        "custom": "Custom",
+        "fix_misalignment": "Ayusin ang pagkakahanay ng \"imagery\"",
+        "reset": "I-reset"
+    },
+    "restore": {
+        "heading": "Mayroon kang hindi na-save ng mga pagbabago",
+        "description": "Ibig mo bang ibalik ang mga hindi na-save na pagbabago mula sa isang nakaraang session sa pag-edit?",
+        "restore": "Ibalik",
+        "reset": "I-reset"
+    },
+    "save": {
+        "title": "I-save",
+        "help": "I-save ang mga pagbabago sa OpenStreetMap upang makita ng ibang gumagamit ng datos.",
+        "no_changes": "Walang mga pagbabago upang i-save.",
+        "error": "May error habang sinusubukang i-save",
+        "uploading": "Ina-upload ang mga pagbabago sa OpenStreetMap.",
+        "unsaved_changes": "Mayroon kang hindi na-save ng mga pagbabago"
+    },
+    "success": {
+        "edited_osm": "Nag-edit sa OSM!",
+        "view_on_osm": "Tingnan sa OSM",
+        "facebook": "I-share sa Facebook",
+        "twitter": "I-share sa Twitter",
+        "google": "I-share sa Google+"
+    },
+    "confirm": {
+        "okay": "Okay"
+    },
+    "splash": {
+        "welcome": "Maligayang pagdating sa iD OpenStreetMap editor",
+        "text": "Ang iD ay isang simple ngunit magandang editor para sa pag-edit ng libreng mapa ng buong mundo.  Ito ay bersyon {version}. Para sa karagdagang impormasyon tingnan ang {website} at i-ulat ang mga bugs sa {github}.",
+        "walkthrough": "Simulan ang \"Walkthrough\"",
+        "start": "Simulan ang pag-edit"
+    },
+    "source_switch": {
+        "live": "live",
+        "lose_changes": "Mayroon kang hindi na-save ang mga pagbabago. Mawawala ang pagbabagong ito kung lilipat sa ibang map server.   Sigurado ka bang gusto mong lumipat ng server?",
+        "dev": "dev"
+    },
+    "tag_reference": {
+        "description": "Paglalarawan",
+        "on_wiki": "{tag} sa wiki.osm.org",
+        "used_with": "Kabilang sa gingamait ang {type}"
+    },
+    "validations": {
+        "untagged_point": "Walang tag na punto o tuldok",
+        "untagged_line": "Walang tag na linya",
+        "untagged_area": "Walang tag na area o poligon",
+        "many_deletions": "Nagbura ka ng {n} bagay sa mapa. Sigurado ka bang gusto mong gawin ito? Ito ay tatanggalin sa mapa na nakikita sa openstreetmap.org.",
+        "tag_suggests_area": "Ang tag na {tag} ay kalimitang para sa mga area o poligon sublait ito ay nasa linya lamang.",
+        "untagged_tooltip": "Pumili ng uri ng \"feature\" na naglalarawan kung ano ang {geometry} na ito.",
+        "deprecated_tags": "Hindi na ginagamit na \"tag\": {tags}"
+    },
+    "zoom": {
+        "in": "i-zoom in",
+        "out": "I-zoom out"
+    },
+    "cannot_zoom": "Hindi na pwedeng mag-zoom out sa kasalukuyang \"mode\".",
+    "gpx": {
+        "local_layer": "Lokal na GPX file",
+        "drag_drop": "I-drag at i-drop ang .gpx file mula sa inyong \"computer\" sa pahinang ito, o i-click ang button sa kanan upang mag-browse",
+        "zoom": "I-zoom sa GPX track",
+        "browse": "Mag-browse ng .gpx file"
+    },
+    "intro": {
+        "navigation": {
+            "header": "Ang \"header\" ay nagpapakita kung anong uri ng \"feature\" ito."
+        },
+        "points": {
+            "title": "Mga Punto o tuldok",
+            "choose": "**Pumili ng Cafe mula sa talaan.**",
+            "describe": "Ang punto o tuldok na ito ay minarkahan bilang \"cafe\".  Gamit ang \"feature editor\", maari tayong magdagdag ng iba pang impormasyon. **Magdagdag ng pangalan**"
+        },
+        "areas": {
+            "title": "Mga area o poligon",
+            "search": "**Hanapin ang '{name}'.**",
+            "choose": "**Pliin ang \"Playground\" mula sa talaan.**",
+            "describe": "**Magdagdag ng pangalan at isara ang \"feature editor\"**"
+        },
+        "lines": {
+            "title": "Mga linya",
+            "add": "Ang mga linya ay ginagamit para kumatawan sa mga \"feature\" na gaya ng mga kalsada, riles ng tren at ilog. **I-click ang button para sa \"Linya\" upang magdagdag ng bagong linya. **",
+            "start": "**Simulan ang linya sa pamamagitan ng pag-click sa dulo ng kalsada.**",
+            "road": "**Piliin ang \"Road\" mula sa talaan**"
+        },
+        "startediting": {
+            "title": "Umpisahan ang pag-edit",
+            "save": "Huwag kalimutan na regular na i-save ang iyong mga binago!",
+            "start": "Simulan ang pagma-mapa!"
+        }
+    },
+    "presets": {
+        "fields": {
+            "address": {
+                "label": "Address",
+                "placeholders": {
+                    "number": "123",
+                    "street": "Kalsada",
+                    "city": "Siyudad"
+                }
+            },
+            "aerialway": {
+                "label": "Uri"
+            },
+            "aeroway": {
+                "label": "Uri"
+            },
+            "amenity": {
+                "label": "Uri"
+            },
+            "artwork_type": {
+                "label": "Uri"
+            },
+            "atm": {
+                "label": "ATM"
+            },
+            "barrier": {
+                "label": "Uri"
+            },
+            "bicycle_parking": {
+                "label": "Uri"
+            },
+            "boundary": {
+                "label": "Uri"
+            },
+            "building": {
+                "label": "Gusali"
+            },
+            "building_area": {
+                "label": "Gusali"
+            },
+            "capacity": {
+                "label": "Kapasidad"
+            },
+            "construction": {
+                "label": "Uri"
+            },
+            "crossing": {
+                "label": "Uri"
+            },
+            "entrance": {
+                "label": "Uri"
+            },
+            "fire_hydrant/type": {
+                "label": "Uri"
+            },
+            "generator/type": {
+                "label": "Uri"
+            },
+            "highway": {
+                "label": "Uri"
+            },
+            "historic": {
+                "label": "Uri"
+            },
+            "information": {
+                "label": "Uri"
+            },
+            "internet_access": {
+                "options": {
+                    "wlan": "Wifi"
+                }
+            },
+            "landuse": {
+                "label": "Uri"
+            },
+            "leisure": {
+                "label": "Uri"
+            },
+            "man_made": {
+                "label": "Uri"
+            },
+            "name": {
+                "label": "Pangalan"
+            },
+            "office": {
+                "label": "Uri"
+            },
+            "parking": {
+                "label": "Uri"
+            },
+            "piste/type": {
+                "label": "Uri"
+            },
+            "place": {
+                "label": "Uri"
+            },
+            "power": {
+                "label": "Uri"
+            },
+            "railway": {
+                "label": "Uri"
+            },
+            "relation": {
+                "label": "Uri"
+            },
+            "restriction": {
+                "label": "Uri"
+            },
+            "route": {
+                "label": "Uri"
+            },
+            "route_master": {
+                "label": "Uri"
+            },
+            "service": {
+                "label": "Uri"
+            },
+            "shelter_type": {
+                "label": "Uri"
+            },
+            "shop": {
+                "label": "Uri"
+            },
+            "studio_type": {
+                "label": "Uri"
+            },
+            "tourism": {
+                "label": "Uri"
+            },
+            "tracktype": {
+                "label": "Uri"
+            },
+            "tree_type": {
+                "label": "Uri"
+            },
+            "water": {
+                "label": "Uri"
+            },
+            "waterway": {
+                "label": "Uri"
+            },
+            "wetland": {
+                "label": "Uri"
+            },
+            "wood": {
+                "label": "Uri"
+            }
+        },
+        "presets": {
+            "building": {
+                "name": "Gusali"
+            }
+        }
+    }
+}

vendor/assets/iD/iD/locales/gan.json

@@ -0,0 +1 @@
+{}

vendor/assets/iD/iD/locales/hy.json

@@ -46,8 +46,6 @@
             "address": {
                 "label": "Հասցե",
                 "placeholders": {
-                    "housename": "Շենքի անվանում",
-                    "number": "123",
                     "street": "Փողոց",
                     "city": "Քաղաք"
                 }

vendor/assets/iD/iD/locales/is.json

@@ -7,7 +7,7 @@
         },
         "add_line": {
             "title": "Lína",
-            "description": "Bætu þjóðvegum, götum, göngustígum, síkjum eða öðrum línum við kortið.",
+            "description": "Bættu þjóðvegum, götum, göngustígum, síkjum eða öðrum línum við kortið.",
             "tail": "Smelltu á kortið til að byrja á að teikna línu, svo sem veg, slóða eða leið."
         },
         "add_point": {
@@ -41,6 +41,7 @@
             }
         },
         "continue": {
+            "title": "Halda áfram",
             "annotation": {
                 "line": "Hélt áfram með línu.",
                 "area": "Hélt áfram með svæði."
@@ -69,14 +70,24 @@
             "not_closed": "Það er ekki hægt að gera þetta hringlaga því að það er ekki samfelld röð hnúta."
         },
         "orthogonalize": {
+            "title": "Ferhyrningur",
+            "description": {
+                "area": "Rétta horn þessa svæðis."
+            },
+            "key": "S",
             "annotation": {
                 "line": "Réttaði horn á línu.",
                 "area": "Réttaði horn svæðis."
-            }
+            },
+            "not_squarish": "Það er ekki hægt að hornrétta þetta því að það er ekki kassalaga"
+        },
+        "straighten": {
+            "title": "Slétta",
+            "annotation": "Slétti úr línu",
+            "too_bendy": "Það er ekki hægt að slétta úr þessu því að það beygir of skarplega"
         },
         "delete": {
             "title": "Eyða",
-            "description": "Fjarlægja af korti.",
             "annotation": {
                 "point": "Eyddi punkti.",
                 "vertex": "Eyddi hnút af leið.",
@@ -159,12 +170,19 @@
             },
             "not_eligible": "Ekki er hægt að aðskilja línur við upphaf þeirra eða endi.",
             "multiple_ways": "Of margar línur hér til að hægt sé að aðskilja."
+        },
+        "restriction": {
+            "help": {
+                "select": "Smelltu til að velja veghluta"
+            }
         }
     },
     "undo": {
+        "tooltip": "Afturkalla: {action}",
         "nothing": "Ekkert til að hætta við."
     },
     "redo": {
+        "tooltip": "Endurtaka: {action}",
         "nothing": "Ekkert til að endurtaka."
     },
     "tooltip_keyhint": "Flýtival:",
@@ -225,15 +243,22 @@
         "back_tooltip": "Breyta eigindi",
         "remove": "Fjarlægja",
         "search": "Leita",
+        "multiselect": "Valdir hlutir",
         "unknown": "Óþekkt",
         "incomplete": "<ekki hlaðið niður>",
         "feature_list": "Leitareigindi",
-        "edit": "Breyta eigindi"
+        "edit": "Breyta eigindi",
+        "none": "Ekkert",
+        "node": "Hnútur",
+        "way": "Ferill",
+        "relation": "Vensl",
+        "location": "Staðsetning"
     },
     "background": {
         "title": "Bakgrunnur",
         "description": "Bakgrunnsstillingar",
         "percent_brightness": "{opacity}% birta",
+        "none": "Ekkert",
         "reset": "endurstilla"
     },
     "restore": {
@@ -254,7 +279,9 @@
         "edited_osm": "Þú breyttir OSM!",
         "just_edited": "Þú hefur breytt OpenStreetMap!",
         "view_on_osm": "Skoða á OSM",
-        "facebook": "Deila á Facebook"
+        "facebook": "Deila á Facebook",
+        "twitter": "Deila á Twitter",
+        "google": "Deila á Google+"
     },
     "confirm": {
         "okay": "Í lagi"
@@ -289,7 +316,8 @@
     },
     "cannot_zoom": "Get ekki þysjað lengra út í núverandi ham.",
     "gpx": {
-        "local_layer": "Staðvær GPX-skrá"
+        "local_layer": "Staðvær GPX-skrá",
+        "drag_drop": "Dragðu og slepptu .gpx skrá á síðuna eða smelltu á takkann til hægri til að fletta"
     },
     "help": {
         "title": "Hjálp",
@@ -320,7 +348,6 @@
         },
         "areas": {
             "title": "Svæði",
-            "add": "Svæði eru nákvæmari leið til að tákna hluti. Þau sýna ytri mörk hlutarins. Svæði er hægt að nota fyrir flestallt það sem punktar sýna, og eru oft fyrsta val. **Smelltu á takkann 'Svæði' til að bæta nýju svæði við**",
             "corner": "Svæði eru dregin með því að setja niður hnúta sem tákna ytri mörk svæðisins. **Settu byrjunarhnútinn í eitt horn leiksvæðisins.**",
             "place": "Teiknaðu svæðið með því að setja fleiri hnúta á kortið. Kláraðu svæðið með því að smella í lokin á upphafshnútinn. **Teiknaðu svæði fyrir leikvöllinn.**",
             "search": "**Leita að '{name}'.**",
@@ -346,6 +373,9 @@
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Bygging"
+            },
             "category-landuse": {
                 "name": "Landnotkun"
             },
@@ -403,11 +433,8 @@
             "address": {
                 "label": "Heimilisfang",
                 "placeholders": {
-                    "housename": "Nafn byggingar",
-                    "number": "123",
                     "street": "Gata",
-                    "city": "Sveitarfélag",
-                    "postcode": "Póstnúmer"
+                    "city": "Sveitarfélag"
                 }
             },
             "admin_level": {
@@ -460,6 +487,9 @@
             "country": {
                 "label": "Land"
             },
+            "crop": {
+                "label": "Uppskera"
+            },
             "crossing": {
                 "label": "Tegund"
             },
@@ -494,12 +524,18 @@
             "fixme": {
                 "label": "Lagaðu mig"
             },
+            "fuel": {
+                "label": "Eldsneyti"
+            },
             "highway": {
                 "label": "Tegund"
             },
             "historic": {
                 "label": "Tegund"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -591,6 +627,18 @@
             "railway": {
                 "label": "Tegund"
             },
+            "recycling/cans": {
+                "label": "Tekur við dósum"
+            },
+            "recycling/clothes": {
+                "label": "Tekur við fötum"
+            },
+            "recycling/glass": {
+                "label": "Tekur við gleri"
+            },
+            "recycling/paper": {
+                "label": "Tekur við pappír"
+            },
             "ref": {
                 "label": "Heimildir"
             },
@@ -598,16 +646,7 @@
                 "label": "Tegund"
             },
             "religion": {
-                "label": "Trúarbrögð",
-                "options": {
-                    "christian": "Kristni",
-                    "muslim": "Múhameðstrú",
-                    "buddhist": "Búddismi",
-                    "jewish": "Gyðingdómur",
-                    "hindu": "Hindu",
-                    "shinto": "Shinto",
-                    "taoist": "Tao"
-                }
+                "label": "Trúarbrögð"
             },
             "restriction": {
                 "label": "Tegund"
@@ -618,8 +657,8 @@
             "route_master": {
                 "label": "Tegund"
             },
-            "sac_scale": {
-                "label": "Erfiðleikastig"
+            "seasonal": {
+                "label": "Árstíðabundið"
             },
             "service": {
                 "label": "Tegund"
@@ -630,12 +669,18 @@
             "shop": {
                 "label": "Tegund"
             },
+            "smoking": {
+                "label": "Reykingar"
+            },
             "source": {
                 "label": "Uppruni"
             },
             "sport": {
                 "label": "Íþrótt"
             },
+            "sport_ice": {
+                "label": "Íþrótt"
+            },
             "structure": {
                 "label": "Mannvirki",
                 "placeholder": "Óþekkt",
@@ -658,12 +703,15 @@
             "towertype": {
                 "label": "Turntegund"
             },
-            "tracktype": {
-                "label": "Tegund"
-            },
             "trail_visibility": {
                 "label": "Sýnileiki"
             },
+            "trees": {
+                "label": "Tré"
+            },
+            "tunnel": {
+                "label": "Göng"
+            },
             "water": {
                 "label": "Tegund"
             },
@@ -709,7 +757,8 @@
                 "name": "Flugskýli"
             },
             "aeroway/helipad": {
-                "name": "Þyrlupallur"
+                "name": "Þyrlupallur",
+                "terms": "lendingarpallur"
             },
             "aeroway/runway": {
                 "name": "Flugbraut"
@@ -727,11 +776,15 @@
                 "name": "Hraðbanki"
             },
             "amenity/bank": {
-                "name": "Banki"
+                "name": "Banki",
+                "terms": "fjármálastofnun"
             },
             "amenity/bar": {
                 "name": "Knæpa"
             },
+            "amenity/bbq": {
+                "name": "Grill"
+            },
             "amenity/bench": {
                 "name": "Bekkur"
             },
@@ -742,7 +795,8 @@
                 "name": "Hjólaleiga"
             },
             "amenity/cafe": {
-                "name": "Kaffihús"
+                "name": "Kaffihús",
+                "terms": "tehús"
             },
             "amenity/car_rental": {
                 "name": "Bílaleiga"
@@ -751,10 +805,11 @@
                 "name": "Bílaþvottur"
             },
             "amenity/cinema": {
-                "name": "Kvikmyndahús"
+                "name": "Kvikmyndahús",
+                "terms": "bíó"
             },
-            "amenity/college": {
-                "name": "Háskóli"
+            "amenity/clock": {
+                "name": "Klukka"
             },
             "amenity/courthouse": {
                 "name": "Dómhús"
@@ -781,10 +836,7 @@
                 "name": "Grafreitur"
             },
             "amenity/hospital": {
-                "name": "Sjúkrahús"
-            },
-            "amenity/kindergarten": {
-                "name": "Leikskóli"
+                "name": "Spítalalóð"
             },
             "amenity/library": {
                 "name": "Bókasafn"
@@ -792,11 +844,18 @@
             "amenity/marketplace": {
                 "name": "Markaður"
             },
+            "amenity/nightclub": {
+                "name": "Næturklúbbur"
+            },
+            "amenity/parking": {
+                "name": "Bílastæði"
+            },
             "amenity/pharmacy": {
                 "name": "Lyfjaverslun"
             },
             "amenity/place_of_worship": {
-                "name": "Tilbeiðsluhús"
+                "name": "Tilbeiðsluhús",
+                "terms": "musteri, kirkja, kapella, bænahús"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "Búddistamusteri"
@@ -808,10 +867,12 @@
                 "name": "Bænahús gyðinga"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Moska"
+                "name": "Moska",
+                "terms": "bænahús múslima"
             },
             "amenity/police": {
-                "name": "Lögregla"
+                "name": "Lögregla",
+                "terms": "löggan"
             },
             "amenity/post_box": {
                 "name": "Póstkassi"
@@ -826,7 +887,13 @@
                 "name": "Veitingahús"
             },
             "amenity/school": {
-                "name": "Skóli"
+                "name": "Skólalóð"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Mataraðstoð"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Athvarf heimilislausra"
             },
             "amenity/swimming_pool": {
                 "name": "Sundlaug"
@@ -846,8 +913,8 @@
             "amenity/townhall": {
                 "name": "Ráðhús"
             },
-            "amenity/university": {
-                "name": "Háskóli"
+            "amenity/veterinary": {
+                "name": "Dýralæknir"
             },
             "amenity/waste_basket": {
                 "name": "Ruslafata"
@@ -915,18 +982,137 @@
             "building/apartments": {
                 "name": "Íbúðir"
             },
-            "building/entrance": {
-                "name": "Inngangur"
+            "building/barn": {
+                "name": "Hlaða"
+            },
+            "building/bunker": {
+                "name": "Byrgi"
+            },
+            "building/cabin": {
+                "name": "Sumarhús",
+                "terms": "Sumarbústaður, kofi"
+            },
+            "building/cathedral": {
+                "name": "Dómkirkja"
+            },
+            "building/chapel": {
+                "name": "Kapella"
+            },
+            "building/church": {
+                "name": "Kirkja"
+            },
+            "building/commercial": {
+                "name": "Atvinnuhúsnæði"
+            },
+            "building/construction": {
+                "name": "Á byggingarstigi"
+            },
+            "building/dormitory": {
+                "name": "Heimavist"
+            },
+            "building/garage": {
+                "name": "Bílskúr"
+            },
+            "building/garages": {
+                "name": "Bílskúrar"
+            },
+            "building/hospital": {
+                "name": "Sjúkrahúsbygging"
+            },
+            "building/hotel": {
+                "name": "Hótelbygging"
             },
             "building/house": {
-                "name": "Hús"
+                "name": "Einbýlishús"
+            },
+            "building/hut": {
+                "name": "Kofi"
+            },
+            "building/industrial": {
+                "name": "Iðnaðarhúsnæði"
+            },
+            "building/public": {
+                "name": "Opinber bygging"
+            },
+            "building/residential": {
+                "name": "Íbúahúsnæði"
+            },
+            "building/retail": {
+                "name": "Verslunarhúsnæði"
+            },
+            "building/roof": {
+                "name": "Þak"
+            },
+            "building/school": {
+                "name": "Skólabygging"
+            },
+            "building/shed": {
+                "name": "Skúr",
+                "terms": "garðskáli"
+            },
+            "building/static_caravan": {
+                "name": "Staðfast hjólhýsi"
+            },
+            "building/terrace": {
+                "name": "Raðhús"
+            },
+            "building/train_station": {
+                "name": "Lestarstöð"
+            },
+            "building/university": {
+                "name": "Háskólabygging"
+            },
+            "building/warehouse": {
+                "name": "Vöruhús"
+            },
+            "craft/dressmaker": {
+                "name": "Kjólasaumari"
+            },
+            "craft/electrician": {
+                "name": "Rafvirki"
+            },
+            "craft/gardener": {
+                "name": "Garðyrkjumaður"
+            },
+            "craft/jeweler": {
+                "name": "Skartgripasali"
+            },
+            "craft/key_cutter": {
+                "name": "Lyklaþjónusta"
+            },
+            "craft/locksmith": {
+                "name": "Lyklasmiður"
+            },
+            "craft/optician": {
+                "name": "Gleraugnasali"
+            },
+            "craft/painter": {
+                "name": "Málari"
+            },
+            "craft/photographer": {
+                "name": "Ljósmyndari"
+            },
+            "craft/plumber": {
+                "name": "Pípari"
+            },
+            "craft/shoemaker": {
+                "name": "Skósmiður"
+            },
+            "craft/tailor": {
+                "name": "Skraddari"
+            },
+            "craft/upholsterer": {
+                "name": "Bólstrari"
+            },
+            "craft/watchmaker": {
+                "name": "Úrsmiður"
+            },
+            "emergency/ambulance_station": {
+                "name": "Sjúkrabílastöð"
             },
             "emergency/phone": {
                 "name": "Neyðarsími"
             },
-            "entrance": {
-                "name": "Inngangur"
-            },
             "highway": {
                 "name": "Þjóðvegur"
             },
@@ -946,7 +1132,7 @@
                 "name": "Göngustígur"
             },
             "highway/living_street": {
-                "name": "Íbúagata"
+                "name": "Vistgata"
             },
             "highway/mini_roundabout": {
                 "name": "Lítið hringtorg"
@@ -954,9 +1140,6 @@
             "highway/motorway": {
                 "name": "Hraðbraut"
             },
-            "highway/motorway_junction": {
-                "name": "Hraðbrautarmót"
-            },
             "highway/motorway_link": {
                 "name": "Hraðbrautarrein"
             },
@@ -975,6 +1158,9 @@
             "highway/residential": {
                 "name": "Íbúagata"
             },
+            "highway/rest_area": {
+                "name": "Hvíldarsvæði"
+            },
             "highway/road": {
                 "name": "Óþekktur vegur"
             },
@@ -994,7 +1180,8 @@
                 "name": "Afgreiðslulúga"
             },
             "highway/service/driveway": {
-                "name": "Innkeyrsla"
+                "name": "Innkeyrsla",
+                "terms": "Heimreið"
             },
             "highway/service/emergency_access": {
                 "name": "Neyðaraðgangur"
@@ -1002,6 +1189,9 @@
             "highway/service/parking_aisle": {
                 "name": "Bílastæðagangur"
             },
+            "highway/services": {
+                "name": "Þjónustusvæði"
+            },
             "highway/steps": {
                 "name": "Tröppur"
             },
@@ -1089,9 +1279,16 @@
             "landuse/industrial": {
                 "name": "Iðnaðarsvæði"
             },
+            "landuse/landfill": {
+                "name": "Landfylling"
+            },
             "landuse/meadow": {
                 "name": "Engi"
             },
+            "landuse/military": {
+                "name": "Hersvæði",
+                "terms": "herstöð, æfingasvæði"
+            },
             "landuse/orchard": {
                 "name": "Aldingarður"
             },
@@ -1110,12 +1307,21 @@
             "leisure": {
                 "name": "Skemmtun"
             },
+            "leisure/dog_park": {
+                "name": "Hundagarður"
+            },
+            "leisure/firepit": {
+                "name": "Eldstæði"
+            },
             "leisure/garden": {
                 "name": "Garður"
             },
             "leisure/golf_course": {
                 "name": "Golfvöllur"
             },
+            "leisure/ice_rink": {
+                "name": "Skautasvell"
+            },
             "leisure/marina": {
                 "name": "Bátahöfn"
             },
@@ -1188,9 +1394,6 @@
             "man_made/water_tower": {
                 "name": "Vatnsturn"
             },
-            "man_made/water_well": {
-                "name": "Brunnur"
-            },
             "man_made/water_works": {
                 "name": "Vatnsveita"
             },
@@ -1251,6 +1454,9 @@
             "office": {
                 "name": "Skrifstofa"
             },
+            "office/political_party": {
+                "name": "Stjórnmálaflokkur"
+            },
             "place": {
                 "name": "Staður"
             },
@@ -1269,6 +1475,9 @@
             "place/locality": {
                 "name": "Staðfesti"
             },
+            "place/neighbourhood": {
+                "name": "Hverfi"
+            },
             "place/town": {
                 "name": "Bær"
             },
@@ -1281,6 +1490,9 @@
             "power": {
                 "name": "Orka"
             },
+            "power/generator": {
+                "name": "Aflstöð"
+            },
             "power/line": {
                 "name": "Orkulína"
             },
@@ -1305,6 +1517,9 @@
             "railway/disused": {
                 "name": "Ónotaðir lestarteinar"
             },
+            "railway/funicular": {
+                "name": "Toglest"
+            },
             "railway/level_crossing": {
                 "name": "Jöfn vegamót"
             },
@@ -1353,8 +1568,8 @@
             "shop/bicycle": {
                 "name": "Hjólabúð"
             },
-            "shop/books": {
-                "name": "Bóksala"
+            "shop/bookmaker": {
+                "name": "Veðmangari"
             },
             "shop/boutique": {
                 "name": "Búð"
@@ -1380,9 +1595,6 @@
             "shop/computer": {
                 "name": "Tölvuverslun"
             },
-            "shop/confectionery": {
-                "name": "Konfektbúð"
-            },
             "shop/convenience": {
                 "name": "Kjörbúð"
             },
@@ -1395,9 +1607,6 @@
             "shop/doityourself": {
                 "name": "Handlaginna verslun"
             },
-            "shop/dry_cleaning": {
-                "name": "Þurrhreinsun"
-            },
             "shop/electronics": {
                 "name": "Raftækjaverslun"
             },
@@ -1410,6 +1619,9 @@
             "shop/florist": {
                 "name": "Blómabúð"
             },
+            "shop/funeral_directors": {
+                "name": "Útfararheimili"
+            },
             "shop/furniture": {
                 "name": "Húsgagnaverslun"
             },
@@ -1434,9 +1646,6 @@
             "shop/jewelry": {
                 "name": "Skartgripabúð"
             },
-            "shop/kiosk": {
-                "name": "Blaðastandur"
-            },
             "shop/laundry": {
                 "name": "Þvottur"
             },
@@ -1452,18 +1661,16 @@
             "shop/music": {
                 "name": "Tónlistarbúð"
             },
-            "shop/newsagent": {
-                "name": "Blaðasali"
-            },
             "shop/optician": {
                 "name": "Gleraugnaverslun"
             },
-            "shop/outdoor": {
-                "name": "Útivistarbúð"
-            },
             "shop/pet": {
                 "name": "Dýrabúð"
             },
+            "shop/seafood": {
+                "name": "Fiskverslu",
+                "terms": "verslun með sjávarfang"
+            },
             "shop/shoes": {
                 "name": "Skóbúð"
             },

vendor/assets/iD/iD/locales/km-KH.json

@@ -0,0 +1 @@
+{}

vendor/assets/iD/iD/locales/km.json

@@ -0,0 +1 @@
+{}

vendor/assets/iD/iD/locales/kn.json

@@ -20,12 +20,6 @@
             "atm": {
                 "label": "ATM"
             },
-            "religion": {
-                "options": {
-                    "christian": "ಕ್ರೈಸ್ತ",
-                    "hindu": "ಹಿಂದು"
-                }
-            },
             "source": {
                 "label": "ಮೂಲ"
             }
@@ -37,15 +31,9 @@
             "amenity/cinema": {
                 "name": "ಸಿನಿಮಾ"
             },
-            "amenity/hospital": {
-                "name": "ಆಸ್ಪತ್ರೆ"
-            },
             "amenity/library": {
                 "name": "ಗ್ರಂಥಾಲಯ"
             },
-            "amenity/school": {
-                "name": "ಶಾಲೆ"
-            },
             "highway/bus_stop": {
                 "name": "ಬಸ್ ನಿಲ್ದಾಣ"
             }

vendor/assets/iD/iD/locales/ko-KR.json

@@ -4,8 +4,6 @@
             "address": {
                 "label": "주소",
                 "placeholders": {
-                    "housename": "건물명칭",
-                    "number": "123",
                     "street": "길",
                     "city": "도시"
                 }
@@ -78,14 +76,7 @@
                 "label": "종류"
             },
             "religion": {
-                "label": "종교",
-                "options": {
-                    "christian": "기독교",
-                    "muslim": "이슬람교",
-                    "buddhist": "불교",
-                    "jewish": "유대교",
-                    "hindu": "힌두교"
-                }
+                "label": "종교"
             },
             "service": {
                 "label": "종류"
@@ -146,9 +137,6 @@
             "amenity/fire_station": {
                 "name": "소방소"
             },
-            "amenity/hospital": {
-                "name": "병원"
-            },
             "amenity/library": {
                 "name": "도서관"
             },
@@ -173,15 +161,9 @@
             "amenity/restaurant": {
                 "name": "식당"
             },
-            "amenity/school": {
-                "name": "학교"
-            },
             "amenity/toilets": {
                 "name": "화장실"
             },
-            "amenity/university": {
-                "name": "대학교"
-            },
             "building": {
                 "name": "건물"
             },

vendor/assets/iD/iD/locales/lv.json

@@ -34,6 +34,8 @@
             }
         },
         "continue": {
+            "title": "Turpināt ",
+            "description": "Turpināt šo līniju.",
             "annotation": {
                 "line": "Līnija turpināta.",
                 "area": "Apgabals turpināts."
@@ -67,7 +69,6 @@
         },
         "delete": {
             "title": "Dzēst",
-            "description": "Izdzēst no kartes.",
             "annotation": {
                 "point": "Punkts dzēsts.",
                 "vertex": "Mezgls dzests.",
@@ -171,6 +172,11 @@
         "deleted": "Dzēsts",
         "created": "Izveidots"
     },
+    "geocoder": {
+        "search": "Meklēt pasaulē...",
+        "no_results_visible": "Nav rezultātu redzamajā kartes apgabalā",
+        "no_results_worldwide": "Nav rezultātu"
+    },
     "geolocate": {
         "title": "Parādīt manu atrašanās vietu"
     },
@@ -311,10 +317,8 @@
             "address": {
                 "label": "Adrese",
                 "placeholders": {
-                    "number": "123",
                     "street": "Iela",
-                    "city": "Pilsēta",
-                    "postcode": "Pasta indekss"
+                    "city": "Pilsēta"
                 }
             },
             "aeroway": {
@@ -455,16 +459,7 @@
                 "label": "Atskaites punkts"
             },
             "religion": {
-                "label": "Reliģija",
-                "options": {
-                    "christian": "Kristietiešu",
-                    "muslim": "Musulmaņu",
-                    "buddhist": "Budistu",
-                    "jewish": "Ebreju",
-                    "hindu": "Hinduistu",
-                    "shinto": "Sintoistu",
-                    "taoist": "Taoistu"
-                }
+                "label": "Reliģija"
             },
             "service": {
                 "label": "Tips"
@@ -496,9 +491,6 @@
             "tourism": {
                 "label": "Tips"
             },
-            "tracktype": {
-                "label": "Tips"
-            },
             "water": {
                 "label": "Tips"
             },
@@ -570,9 +562,6 @@
             "amenity/grave_yard": {
                 "name": "Kapi"
             },
-            "amenity/hospital": {
-                "name": "Slimnīca"
-            },
             "amenity/library": {
                 "name": "Bibliotēka"
             },
@@ -609,9 +598,6 @@
             "amenity/restaurant": {
                 "name": "Restorāns"
             },
-            "amenity/school": {
-                "name": "Skola"
-            },
             "amenity/swimming_pool": {
                 "name": "Peldbaseins"
             },
@@ -627,9 +613,6 @@
             "amenity/townhall": {
                 "name": "Pilsētas dome"
             },
-            "amenity/university": {
-                "name": "Universitāte"
-            },
             "barrier": {
                 "name": "Barjera"
             },
@@ -675,15 +658,9 @@
             "building/apartments": {
                 "name": "Dzīvokļi"
             },
-            "building/entrance": {
-                "name": "Ieeja"
-            },
             "building/house": {
                 "name": "Māja"
             },
-            "entrance": {
-                "name": "Ieeja"
-            },
             "highway": {
                 "name": "Šoseja"
             },
@@ -975,9 +952,6 @@
             "shop/bicycle": {
                 "name": "Velo veikals"
             },
-            "shop/books": {
-                "name": "Grāmatu veikals"
-            },
             "shop/boutique": {
                 "name": "Veikals"
             },
@@ -1002,9 +976,6 @@
             "shop/computer": {
                 "name": "Datorveikals"
             },
-            "shop/confectionery": {
-                "name": "Saldumu veikals"
-            },
             "shop/convenience": {
                 "name": "Veikals"
             },
@@ -1014,9 +985,6 @@
             "shop/department_store": {
                 "name": "Lielveikals"
             },
-            "shop/dry_cleaning": {
-                "name": "Ķīmiskā tīrītava"
-            },
             "shop/electronics": {
                 "name": "Elektronikas veikals"
             },
@@ -1041,9 +1009,6 @@
             "shop/jewelry": {
                 "name": "Juvelieris"
             },
-            "shop/kiosk": {
-                "name": "Kiosks"
-            },
             "shop/laundry": {
                 "name": "Veļas mazgātuve"
             },
@@ -1062,9 +1027,6 @@
             "shop/optician": {
                 "name": "Optometrists"
             },
-            "shop/outdoor": {
-                "name": "Aktīvās atpūtas veikals"
-            },
             "shop/pet": {
                 "name": "Dzīvnieku veikals"
             },

vendor/assets/iD/iD/locales/no.json

@@ -24,7 +24,8 @@
         "add": {
             "annotation": {
                 "point": "Legg til et punkt.",
-                "vertex": "Legg til et punkt til veien."
+                "vertex": "Legg til et punkt til veien.",
+                "relation": "La til en relasjo"
             }
         },
         "start": {
@@ -34,6 +35,8 @@
             }
         },
         "continue": {
+            "key": "A",
+            "title": "Fortsett",
             "annotation": {
                 "line": "Videreførte en linje.",
                 "area": "Videreførte et areal."
@@ -54,14 +57,17 @@
             }
         },
         "orthogonalize": {
+            "key": "S",
             "annotation": {
                 "line": "Laget hjørnene på linjen vinkelrette.",
                 "area": "Laget hjørnene på arealet vinkelrette."
             }
         },
+        "straighten": {
+            "key": "S"
+        },
         "delete": {
             "title": "Fjern",
-            "description": "Fjern dette fra kartet.",
             "annotation": {
                 "point": "Fjern et punkt.",
                 "vertex": "Fjernet en node fra veien.",
@@ -71,6 +77,12 @@
                 "multiple": "Fjernet {n} objekter."
             }
         },
+        "add_member": {
+            "annotation": "La et medlem til i en relasjon"
+        },
+        "delete_member": {
+            "annotation": "Fjernet et medlem fra en relasjon"
+        },
         "connect": {
             "annotation": {
                 "point": "Koblet en vei til et punkt.",
@@ -81,13 +93,15 @@
         },
         "disconnect": {
             "title": "Kobl fra",
+            "description": "Koble disse linjene/areane fra hverandre",
             "key": "D"
         },
         "merge": {
             "title": "Knytt sammen",
             "description": "Knytt disse linjene sammen.",
             "key": "C",
-            "annotation": "Knyttet {n} linjer sammen."
+            "annotation": "Knyttet {n} linjer sammen.",
+            "incomplete_relation": "Disse funksjonene kan ikke bli knyttet sammen fordi hvertfall én av dem er ikke ferdig nedlastet."
         },
         "move": {
             "title": "Flytt",
@@ -117,16 +131,25 @@
         },
         "split": {
             "title": "Del",
-            "key": "X"
+            "key": "X",
+            "annotation": {
+                "line": "Splitt en linje"
+            }
         }
     },
     "undo": {
         "nothing": "Ingen ting å gjøre."
     },
     "redo": {
+        "tooltip": "Omgjør: {action}",
         "nothing": "Ingen ting å gjøre tilbake."
     },
     "browser_notice": "Denne editor er støttet i Firefox, Chrome, Safari, Opera og Internet Explorer 9 og høyere. Vennligst oppgrader din nettleser eller bruk Potlatch 2 for å redigere kartet.",
+    "translate": {
+        "translate": "Oversett",
+        "localized_translation_language": "Velg språk",
+        "localized_translation_name": "Navn"
+    },
     "logout": "logg ut",
     "loading_auth": "Kobler til OpenStreetMap...",
     "report_a_bug": "meld en programvarefeil",
@@ -141,6 +164,9 @@
         "deleted": "Fjernet",
         "created": "Opprettet"
     },
+    "geocoder": {
+        "no_results_worldwide": "Ingen resultater funnet"
+    },
     "geolocate": {
         "title": "Vis min posisjon"
     },
@@ -148,9 +174,19 @@
         "no_documentation_combination": "Det finnes ingen dokumentasjon for denne tag-kombinasjonen",
         "no_documentation_key": "Det finnes ingen dokumentasjon tilgjengelig for denne nøkkelen",
         "show_more": "Vis mer",
+        "all_members": "Alle medlemmer",
+        "new_relation": "Ny relasjon...",
+        "role": "Rolle",
         "choose": "Velg egenskapstype",
         "results": "{n} resultater for {search}",
-        "remove": "Fjern"
+        "back_tooltip": "Endre funksjon",
+        "remove": "Fjern",
+        "search": "Søk",
+        "unknown": "Ukjent",
+        "edit": "Endre funksjon",
+        "way": "Vei",
+        "relation": "Relasjon",
+        "location": "Sted"
     },
     "background": {
         "title": "Bakgrunn",
@@ -159,7 +195,8 @@
         "reset": "tilbakestill"
     },
     "restore": {
-        "heading": "Du har ulagrede endringer"
+        "heading": "Du har ulagrede endringer",
+        "reset": "Tilbakestill"
     },
     "save": {
         "title": "Lagre",
@@ -170,7 +207,11 @@
         "unsaved_changes": "Du har ulagrede endringer"
     },
     "success": {
-        "just_edited": "Du har akkurat endret OpenStreetMap!"
+        "just_edited": "Du har akkurat endret OpenStreetMap!",
+        "view_on_osm": "Vis på OSM",
+        "facebook": "Del på Facebook",
+        "twitter": "Del på Twitter",
+        "google": "Del på Google+"
     },
     "splash": {
         "welcome": "Velkommen til iD OpenStreetMap editor",
@@ -204,11 +245,24 @@
     },
     "intro": {
         "navigation": {
+            "title": "Navigasjon",
             "drag": "Hovedkartet viser data fra OpenstreetMap lagt over en bakgrunn. Du kan navigere ved å dra eller scrolle, slik som et vanlig nettkart. **Dra kartet!**"
+        },
+        "areas": {
+            "search": "**Søk etter '{name}'.**"
+        },
+        "lines": {
+            "title": "Linjer"
         }
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Bygning"
+            },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Arealbruk"
             },
@@ -223,6 +277,12 @@
             },
             "category-route": {
                 "name": "Rute"
+            },
+            "category-water-area": {
+                "name": "Vann"
+            },
+            "category-water-line": {
+                "name": "Vann"
             }
         },
         "fields": {
@@ -264,16 +324,26 @@
             "address": {
                 "label": "Adresse",
                 "placeholders": {
-                    "housename": "Husnavn",
-                    "number": "123",
                     "street": "Gate",
-                    "city": "By",
-                    "postcode": "Postkode"
+                    "city": "By"
                 }
             },
             "admin_level": {
                 "label": "Administrasjonsnivå"
             },
+            "aerialway": {
+                "label": "Type"
+            },
+            "aerialway/capacity": {
+                "label": "Kapasitet (per time)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/occupancy": {
+                "placeholder": "2, 4, 8..."
+            },
             "aeroway": {
                 "label": "Type"
             },
@@ -346,9 +416,21 @@
             "fee": {
                 "label": "Avgift"
             },
+            "fire_hydrant/type": {
+                "label": "Type"
+            },
             "fixme": {
                 "label": "Fiks meg"
             },
+            "generator/method": {
+                "label": "Metode"
+            },
+            "generator/source": {
+                "label": "Kilde"
+            },
+            "generator/type": {
+                "label": "Type"
+            },
             "highway": {
                 "label": "Type"
             },
@@ -364,6 +446,9 @@
             "incline": {
                 "label": "Stigning"
             },
+            "information": {
+                "label": "Type"
+            },
             "internet_access": {
                 "label": "Internettilgang",
                 "options": {
@@ -453,16 +538,7 @@
                 "label": "Type"
             },
             "religion": {
-                "label": "Religion",
-                "options": {
-                    "christian": "Kristen",
-                    "muslim": "Muslim",
-                    "buddhist": "Buddhist",
-                    "jewish": "Jøde",
-                    "hindu": "Hindu",
-                    "shinto": "Shinto",
-                    "taoist": "Taoist"
-                }
+                "label": "Religion"
             },
             "restriction": {
                 "label": "Type"
@@ -473,12 +549,12 @@
             "route_master": {
                 "label": "Type"
             },
-            "sac_scale": {
-                "label": "Stiens vanskelighetsgrad"
-            },
             "service": {
                 "label": "Type"
             },
+            "shelter_type": {
+                "label": "Type"
+            },
             "shop": {
                 "label": "Type"
             },
@@ -488,6 +564,9 @@
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Struktur",
                 "placeholder": "Ukjent",
@@ -496,6 +575,9 @@
                     "tunnel": "Tunnel"
                 }
             },
+            "studio_type": {
+                "label": "Type"
+            },
             "surface": {
                 "label": "Overflate"
             },
@@ -505,9 +587,12 @@
             "towertype": {
                 "label": "Tårntype"
             },
-            "tracktype": {
+            "tree_type": {
                 "label": "Type"
             },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "water": {
                 "label": "Type"
             },
@@ -595,8 +680,11 @@
             "amenity/cinema": {
                 "name": "Kino"
             },
-            "amenity/college": {
-                "name": "Videregående skole"
+            "amenity/clock": {
+                "name": "Klokke"
+            },
+            "amenity/doctor": {
+                "name": "Doktor"
             },
             "amenity/drinking_water": {
                 "name": "Drikkevann"
@@ -616,18 +704,15 @@
             "amenity/grave_yard": {
                 "name": "Kirkegård"
             },
-            "amenity/hospital": {
-                "name": "Sykehus"
-            },
-            "amenity/kindergarten": {
-                "name": "Barnehage"
-            },
             "amenity/library": {
                 "name": "Bibliotek"
             },
             "amenity/marketplace": {
                 "name": "Markedsplass"
             },
+            "amenity/nightclub": {
+                "name": "Nattklubb"
+            },
             "amenity/pharmacy": {
                 "name": "Apotek"
             },
@@ -661,9 +746,6 @@
             "amenity/restaurant": {
                 "name": "Restaurant"
             },
-            "amenity/school": {
-                "name": "Skole"
-            },
             "amenity/swimming_pool": {
                 "name": "Svømmebasseng"
             },
@@ -679,9 +761,6 @@
             "amenity/townhall": {
                 "name": "Rådhus"
             },
-            "amenity/university": {
-                "name": "Universitet"
-            },
             "amenity/waste_basket": {
                 "name": "Søppel"
             },
@@ -721,18 +800,15 @@
             "building/apartments": {
                 "name": "Leiligheter"
             },
-            "building/entrance": {
-                "name": "Inngang"
-            },
             "building/house": {
                 "name": "Hus"
             },
+            "craft/optician": {
+                "name": "Optiker"
+            },
             "emergency/phone": {
                 "name": "Nødtelefon"
             },
-            "entrance": {
-                "name": "Inngang"
-            },
             "highway": {
                 "name": "Vei"
             },
@@ -757,9 +833,6 @@
             "highway/motorway": {
                 "name": "Motorvei"
             },
-            "highway/motorway_junction": {
-                "name": "Motorveikrysning"
-            },
             "highway/motorway_link": {
                 "name": "Motorveirampe"
             },
@@ -877,6 +950,9 @@
             "leisure": {
                 "name": "Fritid"
             },
+            "leisure/dog_park": {
+                "name": "Hundepark"
+            },
             "leisure/garden": {
                 "name": "Hage"
             },
@@ -943,9 +1019,6 @@
             "man_made/water_tower": {
                 "name": "Vanntårn"
             },
-            "man_made/water_well": {
-                "name": "brønn"
-            },
             "man_made/water_works": {
                 "name": "Vannfiltreringsanlegg"
             },
@@ -1000,6 +1073,9 @@
             "office": {
                 "name": "Kontor"
             },
+            "office/architect": {
+                "name": "Arkitekt"
+            },
             "place": {
                 "name": "Sted"
             },
@@ -1078,9 +1154,6 @@
             "shop/bicycle": {
                 "name": "Sykkelbutikk"
             },
-            "shop/books": {
-                "name": "Bokhandler"
-            },
             "shop/butcher": {
                 "name": "Slakter"
             },
@@ -1126,9 +1199,6 @@
             "shop/jewelry": {
                 "name": "Smykkeforhandler"
             },
-            "shop/kiosk": {
-                "name": "Kiosk"
-            },
             "shop/laundry": {
                 "name": "Vaskeri"
             },
@@ -1144,9 +1214,6 @@
             "shop/music": {
                 "name": "Musikkforretning"
             },
-            "shop/newsagent": {
-                "name": "Avisutsalg"
-            },
             "shop/optician": {
                 "name": "Optiker"
             },

vendor/assets/iD/iD/locales/ro-RO.json

@@ -1,39 +1,499 @@
 {
     "modes": {
+        "add_area": {
+            "title": "Suprafață",
+            "description": "Adaugă hărți: parcuri, clădiri, lacuri sau alte suprafețe",
+            "tail": "Apasă pe hartă pentru a incepe trasarea unei suprafețe precum: parc, lac sau cladire"
+        },
         "add_line": {
-            "title": "Linie"
+            "title": "Linie",
+            "description": "Adaugă hărți: autostrăzi, străzi, cai pietonale, canale sau alte linii.",
+            "tail": "Apasă pe hartă pentru a trasa o stradă, o cale sau o rută."
         },
         "add_point": {
-            "title": "Punct"
+            "title": "Punct",
+            "description": "Adauga restaurante, monumente, cutii poștale sau alte puncte pe hartă.",
+            "tail": "Apasă pe hartă pentru a adauga un punct."
+        },
+        "browse": {
+            "title": "Navighează",
+            "description": "Mișcă și mărește harta."
         }
     },
     "operations": {
+        "add": {
+            "annotation": {
+                "point": "Am adăugat un punct.",
+                "vertex": "Am adăugat un nod la o cale"
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": "Am pornit o linie.",
+                "area": "Am pornit o suprafață."
+            }
+        },
         "continue": {
-            "key": "A"
+            "key": "A",
+            "annotation": {
+                "line": "Am continuat o linie.",
+                "area": "Am continuat o suprafață. "
+            }
+        },
+        "cancel_draw": {
+            "annotation": "Am anulat desenul."
+        },
+        "change_tags": {
+            "annotation": "Tag-uri schimbate."
+        },
+        "circularize": {
+            "key": "O",
+            "annotation": {
+                "line": "Am făcut linia circulară.",
+                "area": "Am facut suprafața circulară."
+            }
         },
         "orthogonalize": {
             "key": "S"
         },
         "straighten": {
             "key": "S"
+        },
+        "delete": {
+            "title": "Sterge",
+            "annotation": {
+                "point": "Șterge un punct.",
+                "vertex": "Șterge un nod dintr-o cale.",
+                "line": "Șterge o linie.",
+                "area": "Șterge o suprafață.",
+                "relation": "Șterge o relație.",
+                "multiple": "Am șters {n} obiecte."
+            }
+        },
+        "connect": {
+            "annotation": {
+                "point": "Am conectat o cale cu un punct.",
+                "vertex": "Am conectat o cale cu alta.",
+                "line": "Am conectat o cale la o linie.",
+                "area": "Am conectat o cale la o suprafață."
+            }
+        },
+        "disconnect": {
+            "title": "Deconectează",
+            "description": "Deconectează aceste linii/suprafețe de ele insele.",
+            "key": "D",
+            "annotation": "Am deconectat liniile/suprafețele."
+        },
+        "merge": {
+            "title": "Unește",
+            "description": "Unește aceste linii.",
+            "key": "C",
+            "annotation": "Am unit {n} linii."
+        },
+        "move": {
+            "title": "Mută",
+            "description": "Mută la o locație noua.",
+            "key": "M",
+            "annotation": {
+                "point": "Am mutat un punct.",
+                "vertex": "Am mutat un nod intr-o cale.",
+                "line": "Am mutat o linie.",
+                "area": "Am mutat o suprafață.",
+                "multiple": "Am mutat mai multe obiecte."
+            }
+        },
+        "rotate": {
+            "title": "Rotește",
+            "key": "R",
+            "annotation": {
+                "line": "Am rotit o linie.",
+                "area": "Am rotit o suprafață."
+            }
+        },
+        "reverse": {
+            "title": "Întoarce",
+            "description": "Fă această linie să se indrepte in direcția opusă.",
+            "key": "V",
+            "annotation": "Am întors o linie."
+        },
+        "split": {
+            "title": "Separă",
+            "key": "X",
+            "annotation": {
+                "line": "Separă linia",
+                "area": "Sparge limitele unei suprafețe"
+            }
         }
     },
+    "browser_notice": "Acest editor este compatibil cu Firefox, Chrome, Safari, Opera și Internet Explorer 9 sau o versiune ulterioară . Te rugăm să iți actualizezi navigatorul de internet sau folosește Potlach 2 să editezi harta.",
+    "translate": {
+        "translate": "Traduce",
+        "localized_translation_name": "Nume"
+    },
+    "logout": "logout",
+    "loading_auth": "Conectare la OpenStreetMap..",
+    "commit": {
+        "title": "Salveaza modificarile",
+        "description_placeholder": "O scurtă descriere a contribuției tale.",
+        "message_label": "Consemnează mesaj.",
+        "save": "Salveaza",
+        "cancel": "Renunță",
+        "warnings": "Atenționări",
+        "modified": "Modificat",
+        "deleted": "Șters",
+        "created": "Creat"
+    },
+    "contributors": {
+        "list": "Editări făcute de {user}"
+    },
+    "geolocate": {
+        "title": "Arată locația mea "
+    },
     "inspector": {
+        "no_documentation_combination": "Nu este documentație disponibilă pentru combinația de tag-uri (cuvinte cheie)",
+        "no_documentation_key": "Nu este documentație pentru această cheie.",
+        "show_more": "Arată mai mult",
+        "all_members": "Toți membrii",
+        "all_relations": "Toate relațiile",
         "role": "Rol",
+        "results": "{n} rezultate pentru {search}",
+        "back_tooltip": "Schimbă trăsătură",
+        "unknown": "Necunoscut",
         "location": "Locație"
     },
+    "background": {
+        "title": "Fundal",
+        "description": "Setări fundal",
+        "percent_brightness": "{opacity}% luminozitate",
+        "reset": "resetează"
+    },
+    "restore": {
+        "heading": "Ai modificări nesalvate.",
+        "description": "Dorești să revii la modificările nesalvate din sesiunea anterioară de editare? ",
+        "restore": "Restabilește.",
+        "reset": "Resetează"
+    },
+    "save": {
+        "title": "Salveaza",
+        "help": "Salvează modificările pe OpenSteetMap, făcându-le disponibile către alți utilizatori.",
+        "no_changes": "Nici o modificare de salvat.",
+        "error": "A apărut o eroare in timp ce salvai.",
+        "uploading": "Încarcă modificările in OpenStreetMap",
+        "unsaved_changes": "Ai modificări nesalvate."
+    },
     "success": {
         "facebook": "Distribuie pe Facebook"
     },
+    "splash": {
+        "welcome": "Bine ai venit în editorul iD OpenStreetMap",
+        "walkthrough": "Începe ghidul",
+        "start": "Editează acum"
+    },
+    "source_switch": {
+        "live": "live",
+        "lose_changes": "Ai modificări nesalvate. Schimbând serverul de harți, le vei pierde. Ești sigur(ă) ca vrei să schimbi serverele ?",
+        "dev": "dev"
+    },
+    "tag_reference": {
+        "description": "Descriere",
+        "on_wiki": "{tag} pe wiki.osm.org",
+        "used_with": "folosit cu {type}"
+    },
+    "validations": {
+        "untagged_line": "Linie fară tag-uri (cuvinte cheie)",
+        "untagged_area": "Suprafața fară tag-uri",
+        "many_deletions": "Șteregi {n} obiecte. Ești sigur(ă) ? Le vei șterge de pe harta pe care toată lumea o vede pe opensteetmap.org. ",
+        "tag_suggests_area": "Tag-ul {tag} sugerează că linia trebuie sa fie o suprafață, dar nu e.",
+        "deprecated_tags": "Tag-uri învechite: {tags}"
+    },
+    "zoom": {
+        "in": "Mareste",
+        "out": "Micsoreaza"
+    },
+    "gpx": {
+        "local_layer": "Fișier GPX local"
+    },
+    "help": {
+        "title": "Ajutor"
+    },
     "intro": {
+        "navigation": {
+            "select": "Trăsăturile hărții sunt reprezentate in trei moduri: folosind puncte, linii sau suprafețe. Toate trăsăturile pot fi selectate apăsând pe ele. **Apasă pe un punct pentru al selecta.** ",
+            "header": "Antetul ne arată tipul trăsaturii.",
+            "pane": "Când o trăsătura este selectată, editorul este afișat. Antelul ne arată tipul trăsăturii și panoul principal, atributele trăsăturii, precum numele sau adresa.**Inchide editorul de trăsături folosind butonul de inchidere din colțul dreapta sus.**"
+        },
         "points": {
             "title": "Puncte"
         },
+        "areas": {
+            "search": "**Caută {name}.**"
+        },
         "lines": {
             "title": "Linii"
         },
         "startediting": {
             "start": "Începe cartografierea!"
         }
+    },
+    "presets": {
+        "fields": {
+            "access": {
+                "label": "Acces"
+            },
+            "address": {
+                "label": "Adresă",
+                "placeholders": {
+                    "street": "Stradă",
+                    "city": "Oraș"
+                }
+            },
+            "aeroway": {
+                "label": "Tip"
+            },
+            "amenity": {
+                "label": "Tip"
+            },
+            "atm": {
+                "label": "ATM"
+            },
+            "bicycle_parking": {
+                "label": "Tip"
+            },
+            "building": {
+                "label": "Clădire"
+            },
+            "building_area": {
+                "label": "Clădire"
+            },
+            "capacity": {
+                "label": "Capacitate"
+            },
+            "construction": {
+                "label": "Tip"
+            },
+            "crossing": {
+                "label": "Tip"
+            },
+            "denomination": {
+                "label": "Denominare"
+            },
+            "emergency": {
+                "label": "Urgență"
+            },
+            "entrance": {
+                "label": "Tip"
+            },
+            "fax": {
+                "label": "Fax"
+            },
+            "fee": {
+                "label": "Taxă"
+            },
+            "highway": {
+                "label": "Tip"
+            },
+            "historic": {
+                "label": "Tip"
+            },
+            "internet_access": {
+                "label": "Acces internet",
+                "options": {
+                    "wlan": "Wifi",
+                    "wired": "Conectat",
+                    "terminal": "Terminal"
+                }
+            },
+            "landuse": {
+                "label": "Tip"
+            },
+            "layer": {
+                "label": "Strat"
+            },
+            "leisure": {
+                "label": "Tip"
+            },
+            "levels": {
+                "label": "Nivele"
+            },
+            "man_made": {
+                "label": "Tip"
+            },
+            "maxspeed": {
+                "label": "Limită de viteză"
+            },
+            "natural": {
+                "label": "Natural"
+            },
+            "network": {
+                "label": "Rețea"
+            },
+            "note": {
+                "label": "Notă"
+            },
+            "office": {
+                "label": "Tip"
+            },
+            "oneway": {
+                "label": "Sens unic"
+            },
+            "opening_hours": {
+                "label": "Ore"
+            },
+            "operator": {
+                "label": "Operator"
+            },
+            "phone": {
+                "label": "Telefon"
+            },
+            "place": {
+                "label": "Tip"
+            },
+            "railway": {
+                "label": "Tip"
+            },
+            "religion": {
+                "label": "Religie"
+            },
+            "service": {
+                "label": "Tip"
+            },
+            "shelter": {
+                "label": "Adăpost"
+            },
+            "shop": {
+                "label": "Tip"
+            },
+            "source": {
+                "label": "Sursă"
+            },
+            "sport": {
+                "label": "Sport"
+            },
+            "surface": {
+                "label": "Suprafață"
+            },
+            "tourism": {
+                "label": "Tip"
+            },
+            "water": {
+                "label": "Tip"
+            },
+            "waterway": {
+                "label": "Tip"
+            },
+            "website": {
+                "label": "Website"
+            },
+            "wetland": {
+                "label": "Tip"
+            },
+            "wikipedia": {
+                "label": "Wikipedia"
+            },
+            "wood": {
+                "label": "Tip"
+            }
+        },
+        "presets": {
+            "aeroway": {
+                "name": "Aeroway"
+            },
+            "aeroway/aerodrome": {
+                "name": "Aeroport"
+            },
+            "amenity/bank": {
+                "name": "Banca"
+            },
+            "amenity/bar": {
+                "name": "Bar"
+            },
+            "amenity/bicycle_parking": {
+                "name": "Parcare biciclete"
+            },
+            "amenity/bicycle_rental": {
+                "name": "Închiriere biciclete"
+            },
+            "amenity/cafe": {
+                "name": "Cafenea"
+            },
+            "amenity/cinema": {
+                "name": "Cinema"
+            },
+            "amenity/fast_food": {
+                "name": "Fast Food"
+            },
+            "amenity/fire_station": {
+                "name": "Pompieri"
+            },
+            "amenity/grave_yard": {
+                "name": "Cimitir"
+            },
+            "amenity/library": {
+                "name": "Librărie"
+            },
+            "amenity/pharmacy": {
+                "name": "Farmacie"
+            },
+            "amenity/place_of_worship/christian": {
+                "name": "Biserică"
+            },
+            "amenity/place_of_worship/jewish": {
+                "name": "Sinagogă"
+            },
+            "amenity/place_of_worship/muslim": {
+                "name": "Moschee"
+            },
+            "amenity/police": {
+                "name": "Poliție"
+            },
+            "amenity/post_box": {
+                "name": "Cutie Poștală"
+            },
+            "amenity/post_office": {
+                "name": "Oficiul Poștal"
+            },
+            "amenity/pub": {
+                "name": "Pub"
+            },
+            "amenity/restaurant": {
+                "name": "Restaurant"
+            },
+            "amenity/toilets": {
+                "name": "Toaletă"
+            },
+            "amenity/townhall": {
+                "name": "Primărie"
+            },
+            "building": {
+                "name": "Clădire"
+            },
+            "highway": {
+                "name": "Autostradă"
+            },
+            "highway/bus_stop": {
+                "name": "Stație de autobuz"
+            },
+            "highway/crossing": {
+                "name": "Trecere"
+            },
+            "highway/cycleway": {
+                "name": "Pistă biciclete"
+            },
+            "highway/footway": {
+                "name": "Potecă"
+            },
+            "highway/primary": {
+                "name": "Drum principal"
+            },
+            "highway/residential": {
+                "name": "Drum rezidențial"
+            },
+            "highway/secondary": {
+                "name": "Drum secundar"
+            },
+            "highway/steps": {
+                "name": "Scări"
+            }
+        }
     }
 }

vendor/assets/iD/iD/locales/sc.json

@@ -1 +1,18 @@
-{}
+{
+    "modes": {
+        "browse": {
+            "title": "Circa"
+        }
+    },
+    "operations": {
+        "delete": {
+            "title": "Boga"
+        },
+        "move": {
+            "title": "Movi"
+        },
+        "split": {
+            "title": "Sperra"
+        }
+    }
+}

vendor/assets/iD/iD/locales/si.json

@@ -0,0 +1,47 @@
+{
+    "modes": {
+        "add_area": {
+            "title": "ප්‍රදේශය",
+            "description": "උද්‍යාන, ගොඩනැගිලි, වැව් හෝ වෙනත් ප්‍රදේශ සිතියමට එකතු කරන්න.",
+            "tail": "උද්‍යානයක්, වැවක් හෝ ගොඩනැගිල්ලක් වැනි ප්‍රදේශයක් ලකුණු කිරීම ඇරඹීමට සිතියම මත ඔබන්න."
+        },
+        "add_line": {
+            "title": "රේඛා",
+            "description": "අධිවේගී මාර්ග, මාර්ග, පදික මාර්ග, ඇලවල් හෝ වෙනත් රේඛා සිතියමට එකතු කරන්න.",
+            "tail": "මාර්ගයක් සලකුණු කිරීමට සිතියම මත ඔබන්න."
+        },
+        "add_point": {
+            "title": "ලක්ෂ්‍යයක්"
+        }
+    },
+    "operations": {
+        "start": {
+            "annotation": {
+                "line": "රේඛාවක් අරඹන ලදී.",
+                "area": "ප්‍රදේශයක් අරඹන ලදී."
+            }
+        },
+        "delete": {
+            "title": "මකන්න",
+            "annotation": {
+                "point": "ලක්ෂ්‍යයක් ඉවත් කරන්න.",
+                "line": "රේඛාව මකන්න.",
+                "area": "ප්‍රදේශය මකන්න."
+            }
+        },
+        "disconnect": {
+            "title": "විසන්ධි කරන්න"
+        },
+        "rotate": {
+            "title": "හරවන්න"
+        }
+    },
+    "commit": {
+        "save": "සුරකින්න",
+        "deleted": "මකාදමන ලදී"
+    },
+    "save": {
+        "title": "සුරකින්න",
+        "no_changes": "සුරැකීම සඳහා වෙනස් කිරීම් නැත."
+    }
+}

vendor/assets/iD/iD/locales/sq-AL.json

@@ -0,0 +1 @@
+{}

vendor/assets/iD/iD/locales/ta.json

@@ -1,23 +1,45 @@
 {
     "modes": {
         "add_area": {
-            "title": "பரப்பளவு"
+            "title": "பரப்பளவு",
+            "description": "வரைபடத்தை பூங்காக்கள், கட்டிடங்கள், ஏரிகள் அல்லது மற்ற பகுதிகளில் சேர்.",
+            "tail": "பூங்கா, ஏரி, அல்லது கட்டிடம் வரைய வரைபடத்தை கிளிக் செய்க."
         },
         "add_line": {
-            "title": "கோடு"
+            "title": "கோடு",
+            "description": "வரைபடத்தை நெடுஞ்சாலைகள், தெருக்களில், பாதசாரி பாதைகள், கால்வாய்கள் அல்லது மற்ற வரிகளை சேர்க்கவும்.",
+            "tail": "சாலை, பாதை, அல்லது இந்த வரைபடத்தை கிளிக் செய்க."
         },
         "add_point": {
-            "title": "புள்ளி"
+            "title": "புள்ளி",
+            "description": "வரைபடத்தை உணவகங்கள், நினைவு சின்னங்கள், தபால் பெட்டிகள் அல்லது மற்ற சேர்க்கவும்.",
+            "tail": "ஒரு புள்ளி சேர்க்க வரைபடத்தை கிளிக் செய்க."
+        },
+        "browse": {
+            "title": "உலவ"
         }
     },
     "operations": {
+        "start": {
+            "annotation": {
+                "line": "வரி தொடங்கியது",
+                "area": "பகுதி தொடங்கியது"
+            }
+        },
         "continue": {
-            "key": "A"
+            "key": "A",
+            "annotation": {
+                "line": "வரி தொ ங்கியது"
+            }
+        },
+        "cancel_draw": {
+            "annotation": "வரைவது தவிர்கபட்டது "
         },
         "circularize": {
             "key": "O"
         },
         "orthogonalize": {
+            "title": "சதுரம்",
             "key": "S"
         },
         "straighten": {
@@ -31,19 +53,28 @@
             }
         },
         "disconnect": {
+            "title": "தொடர்பை -துண்டி",
             "key": "D"
         },
         "merge": {
+            "title": "இணை",
+            "description": "இந்த கோடுகளை இணை",
             "key": "C"
         },
         "move": {
             "title": "நகர்த்து",
-            "key": "M"
+            "key": "M",
+            "annotation": {
+                "point": "புள்ளி நகர்த்தப்பட்டது",
+                "area": "பரப்பை நகர்த்தபட்டது "
+            }
         },
         "rotate": {
+            "title": "திருப்பு",
             "key": "R"
         },
         "reverse": {
+            "title": "தலைகீழாக்கு",
             "key": "V"
         },
         "split": {
@@ -112,8 +143,6 @@
             "address": {
                 "label": "முகவரி",
                 "placeholders": {
-                    "housename": "வீட்டின் பெயர்",
-                    "number": "123",
                     "street": "தெரு",
                     "city": "மாநகரம்"
                 }
@@ -176,10 +205,14 @@
             "crossing": {
                 "label": "வகை"
             },
+            "emergency": {
+                "label": "அவசரநிலை"
+            },
             "entrance": {
                 "label": "வகை"
             },
             "fax": {
+                "label": "தொலைநகல்",
                 "placeholder": "+31 42 123 4567"
             },
             "fire_hydrant/type": {
@@ -206,6 +239,9 @@
             "information": {
                 "label": "வகை"
             },
+            "internet_access": {
+                "label": "இணைய அணுகல்"
+            },
             "landuse": {
                 "label": "வகை"
             },
@@ -213,10 +249,14 @@
                 "label": "சந்துகள்",
                 "placeholder": "1, 2, 3..."
             },
+            "layer": {
+                "label": "அடுக்கு"
+            },
             "leisure": {
                 "label": "வகை"
             },
             "levels": {
+                "label": "நிலைகள்",
                 "placeholder": "2, 4, 6..."
             },
             "location": {
@@ -235,6 +275,9 @@
             "natural": {
                 "label": "இயற்கையான"
             },
+            "network": {
+                "label": "நெட்வொர்க்"
+            },
             "note": {
                 "label": "குறிப்பு"
             },
@@ -250,6 +293,9 @@
             "opening_hours": {
                 "label": "மணிநேரங்கள்"
             },
+            "operator": {
+                "label": "இயக்குபவர்"
+            },
             "par": {
                 "placeholder": "3, 4, 5..."
             },
@@ -276,13 +322,7 @@
                 "label": "வகை"
             },
             "religion": {
-                "label": "மதம்",
-                "options": {
-                    "christian": "கிறித்தவர்",
-                    "muslim": "இசுலாமியர்",
-                    "buddhist": "புத்த மதத்தினர்",
-                    "hindu": "இந்து"
-                }
+                "label": "மதம்"
             },
             "restriction": {
                 "label": "வகை"
@@ -319,9 +359,6 @@
             "tourism": {
                 "label": "வகை"
             },
-            "tracktype": {
-                "label": "வகை"
-            },
             "tree_type": {
                 "label": "வகை"
             },
@@ -352,12 +389,18 @@
             "aeroway/aerodrome": {
                 "name": "விமானநிலையம்"
             },
+            "aeroway/helipad": {
+                "name": "சிறு விமானம் இறங்கும் தளம்"
+            },
             "amenity/bank": {
                 "name": "வங்கி"
             },
             "amenity/bicycle_parking": {
                 "name": "ஈருருளை நிறுத்தகம்"
             },
+            "amenity/bicycle_rental": {
+                "name": "சைக்கிள் வாடகை"
+            },
             "amenity/cafe": {
                 "name": "டீக்கடை"
             },
@@ -367,9 +410,6 @@
             "amenity/clock": {
                 "name": "கடிகாரம்"
             },
-            "amenity/college": {
-                "name": "கல்லூரி"
-            },
             "amenity/fire_station": {
                 "name": "தீயணைப்பு நிலையம்"
             },
@@ -377,7 +417,7 @@
                 "name": "இடுகாடு"
             },
             "amenity/hospital": {
-                "name": "மருத்துவமனை"
+                "name": "மருத்துவமனை "
             },
             "amenity/library": {
                 "name": "புத்தகச்சாலை"
@@ -385,6 +425,9 @@
             "amenity/marketplace": {
                 "name": "பஜார்"
             },
+            "amenity/parking": {
+                "name": "கார் பார்க்கிங்"
+            },
             "amenity/pharmacy": {
                 "name": "மருந்தகம்"
             },
@@ -407,7 +450,7 @@
                 "name": "உணவகம்"
             },
             "amenity/school": {
-                "name": "பள்ளி"
+                "name": "பள்ளி மைதானத்தில்"
             },
             "amenity/swimming_pool": {
                 "name": "நீச்சல் குளம்"
@@ -421,8 +464,8 @@
             "amenity/toilets": {
                 "name": "கழிவறைகள்"
             },
-            "amenity/university": {
-                "name": "பல்கலைக்கழகம்"
+            "amenity/townhall": {
+                "name": "நகராட்சிமன்றம்"
             },
             "area": {
                 "name": "பரப்பளவு"
@@ -445,9 +488,6 @@
             "building/apartments": {
                 "name": "அபார்ட்மண்டுகள்"
             },
-            "building/entrance": {
-                "name": "நுழைவுவாயில்"
-            },
             "building/house": {
                 "name": "வீடு"
             },
@@ -455,7 +495,7 @@
                 "name": "ஓவியர்"
             },
             "entrance": {
-                "name": "நுழைவுவாயில்"
+                "name": "நுழைவு / வெளியேறு"
             },
             "highway/bus_stop": {
                 "name": "பேருந்து நிலையம்"
@@ -619,9 +659,6 @@
             "shop/alcohol": {
                 "name": "மதுபானக் கடை"
             },
-            "shop/books": {
-                "name": "புத்தகக்கடை"
-            },
             "shop/car": {
                 "name": "வாகன விற்பனையகம்"
             },
@@ -631,9 +668,6 @@
             "shop/computer": {
                 "name": "கணினி விற்பனையகம்"
             },
-            "shop/dry_cleaning": {
-                "name": "உலர் சலவையகம்"
-            },
             "shop/florist": {
                 "name": "பூக்கடை"
             },

vendor/assets/iD/iD/locales/te.json

@@ -13,6 +13,9 @@
             "title": "బిందువు",
             "description": "హోటెల్, పోస్ట్ బాక్స్ ఇతరత్రా ప్రదేశాలను మ్యాప్ కి జతపరచండి",
             "tail": "కొత్త పాయంట్ గీయుటకు మ్యాప్ మీద క్లిక్ చేయండి"
+        },
+        "browse": {
+            "title": "బ్రౌస్"
         }
     },
     "operations": {
@@ -53,16 +56,21 @@
         },
         "orthogonalize": {
             "title": "చతురస్రం",
-            "key": "ఎస్"
+            "description": {
+                "area": "ఈ ప్రదేశపు మూలలను చదరంగా చేయండి."
+            },
+            "key": "ఎస్",
+            "not_squarish": "ఇది పలకలుగా లేదు కనుక దీన్ని చదరంగా చెయ్యడం కుదరదు."
         },
         "straighten": {
             "title": "తిన్నగాచేయి",
             "description": "ఈ గీతను తిన్నగా చేయి.",
-            "key": "ఎస్"
+            "key": "ఎస్",
+            "annotation": "గీతను తిన్నగా చేసారు.",
+            "too_bendy": "ఇది బాగా వంగి ఉన్నందున దీన్ని తిన్నగా చెయ్యడం కుదరదు."
         },
         "delete": {
             "title": "తొలగించు",
-            "description": "మ్యాప్ నుండి ఇది తొలగించు",
             "annotation": {
                 "point": "ఒక బిందువును తొలగించారు.",
                 "line": "గీత తొలగించబడింది",
@@ -136,11 +144,14 @@
         "localized_translation_name": "పేరు"
     },
     "zoom_in_edit": "మార్చడానికి దగ్గరగా వీక్షించు",
+    "logout": "నిష్క్రమించు",
+    "loading_auth": "ఓపెన్‌స్ట్రీట్‌మ్యాపుకి అనుసంధానిస్తున్నాం…",
     "report_a_bug": "ఒక తప్పును నివేదించు",
     "commit": {
         "title": "మార్పులను భద్రపరచు",
         "description_placeholder": "మీ మార్పులకు టూకీ వివరణ",
         "message_label": "మార్పుని తెలిపే సందేశం",
+        "upload_explanation": "మీరు ఎక్కించే మార్పులు ఓపెన్‌స్ట్రీట్‌మ్యాప్ డేటాను వాడే పటాలన్నింటిలోనూ కనిపిస్తాయి.",
         "save": "భద్రపరచు",
         "cancel": "రద్దుచేయి",
         "warnings": "హెచ్చరికలు",
@@ -263,7 +274,6 @@
             "address": {
                 "label": "చిరునామా",
                 "placeholders": {
-                    "number": "123",
                     "street": "వీధి",
                     "city": "నగరం"
                 }
@@ -385,13 +395,7 @@
                 "label": "రకం"
             },
             "religion": {
-                "label": "మతం",
-                "options": {
-                    "christian": "క్రైస్తవం",
-                    "muslim": "ముస్లిం",
-                    "buddhist": "బౌద్ధం",
-                    "hindu": "హిందు"
-                }
+                "label": "మతం"
             },
             "restriction": {
                 "label": "రకం"
@@ -426,9 +430,6 @@
             "tourism": {
                 "label": "రకం"
             },
-            "tracktype": {
-                "label": "రకం"
-            },
             "water": {
                 "label": "రకం"
             },
@@ -470,9 +471,6 @@
             "amenity/grave_yard": {
                 "name": "స్మశానం"
             },
-            "amenity/hospital": {
-                "name": "ఆసుపత్రి"
-            },
             "amenity/library": {
                 "name": "గ్రంథాలయం"
             },
@@ -502,18 +500,12 @@
             "amenity/restaurant": {
                 "name": "రెస్టారెంట్"
             },
-            "amenity/school": {
-                "name": "బడి"
-            },
             "amenity/swimming_pool": {
                 "name": "ఈత కొలను"
             },
             "amenity/toilets": {
                 "name": "మరుగుదొడ్లు"
             },
-            "amenity/university": {
-                "name": "విశ్వవిద్యాలయం"
-            },
             "barrier/fence": {
                 "name": "కంచె"
             },
@@ -529,9 +521,6 @@
             "building/hut": {
                 "name": "గుడిసె"
             },
-            "entrance": {
-                "name": "ప్రవేశ ద్వారం"
-            },
             "highway/footway": {
                 "name": "కాల్దారి"
             },

vendor/assets/iD/iD/locales/tl.json

@@ -0,0 +1,555 @@
+{
+    "modes": {
+        "add_area": {
+            "title": "Poligon",
+            "description": "Magdagdag ng mga parke, mga gusali, lawa o iba pang mga \"area\" sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang lugar, tulad ng isang parke, lawa, o gusali."
+        },
+        "add_line": {
+            "title": "Linya",
+            "description": "Magdagdag ng mga kalsada o kalye, mga daanang pantao, kanal o iba pang mga linya sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang linya tulad ng kalsada, daanang pantao, o ruta."
+        },
+        "add_point": {
+            "title": "Punto o tuldok",
+            "description": "Magdagdag ng kainan, monumento, \"postbox\" o iba pang mga punto o tuldok sa mapa.",
+            "tail": "Mag-click sa mapa upang magdagdag ng isang punto o tuldok."
+        },
+        "browse": {
+            "title": "Mag-browse",
+            "description": "Mag-pan at mag-zoom sa mapa."
+        },
+        "draw_area": {
+            "tail": "I-click upang magdagdag ng mga tuldok sa poligon. I-click ang unang tuldok upang isarado ang poligon o area."
+        },
+        "draw_line": {
+            "tail": "I-click upang magdagdag ng higit pang mga node sa linya. Mag-click sa iba pang mga linya upang kumonekta sa kanila, at i-double click upang tapusin ang linya."
+        }
+    },
+    "operations": {
+        "add": {
+            "annotation": {
+                "point": "Nagdagdag ng isang punto o tuldok.",
+                "vertex": "Nagdagdag ng node sa isang way.",
+                "relation": "Nagdagdag ng relation."
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": "Nagsimula ng isang linya.",
+                "area": "Nagsimula sa isang area o polygon."
+            }
+        },
+        "continue": {
+            "key": "S",
+            "title": "Ipagpatuloy",
+            "description": "Ipagpatuloy ang linyang ito.",
+            "not_eligible": "Walang linyang maaring ipagpatuloy dito.",
+            "multiple": "Mga ilang mga linya ay maaaring ipagpatuloy dito. Upang pumili ng isang linya, pindutin ang ng Shift at i-click ito upang piliin.",
+            "annotation": {
+                "line": "Karugtong ng isang linya.",
+                "area": "Nagpatuloy sa pagguhit ng area o poligon."
+            }
+        },
+        "cancel_draw": {
+            "annotation": "Kinansela ang pagguhit."
+        },
+        "change_role": {
+            "annotation": "Binago ang role ng isang kasapi ng  relation."
+        },
+        "change_tags": {
+            "annotation": "Pinalitan ang mga tag."
+        },
+        "circularize": {
+            "title": "Pina-bilog",
+            "description": {
+                "line": "Gawing pabilog ang linyang ito.",
+                "area": "Gawing pabilog ang area o poligong ito."
+            },
+            "key": "O",
+            "annotation": {
+                "line": "Ginawang pabilog and isang linya.",
+                "area": "Ginawang pabilog and isang area o poligon."
+            },
+            "not_closed": "Hindi ito maaaring gawing pabilog dahil hindi ito isang \"loop\".",
+            "too_large": "Hindi na ito maaaring gawing pabilog dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "orthogonalize": {
+            "title": "Iskawalado",
+            "description": {
+                "line": "Gawing iskwalado ang mga kanto ng linyang ito.",
+                "area": "Gawing iskwalado ang mga kanto ng area o poligong ito."
+            },
+            "key": "S",
+            "annotation": {
+                "line": "Ginawang iskawalado ang bawat kanto ng linya.",
+                "area": "Ginawang iskawalado ang bawat kanto ng area o poligon."
+            },
+            "not_squarish": "Hindi maaring gawing iskwalado.",
+            "too_large": "Hindi ito maaaring gawing iskuwalado dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "straighten": {
+            "title": "Ituwid",
+            "description": "Ituwid ang linyang ito.",
+            "key": "S",
+            "annotation": "Naituwid ang linya.",
+            "too_bendy": "Hindi naituwid dahil masyadong kurbado."
+        },
+        "delete": {
+            "title": "Burahin",
+            "description": "Permanenteng burahin ito. ",
+            "annotation": {
+                "point": "Binura ang isang point o tuldok.",
+                "vertex": "Binura ang isang node mula sa way o linya.",
+                "line": "Binura ang isang linya.",
+                "area": "Binary ang isang area o poligon.",
+                "relation": "Binura ang isang \"relation\".",
+                "multiple": "Binura ang {n} bagay sa mapa."
+            },
+            "incomplete_relation": "Hindi maaring mabura dahil ito ay hindi pa ganap na nai-download."
+        },
+        "add_member": {
+            "annotation": "Dinagdag ang kasapi o miyembro ng relation."
+        },
+        "delete_member": {
+            "annotation": "Inalis ang kasapi o miyembro ng relation."
+        },
+        "connect": {
+            "annotation": {
+                "point": "Dinugtong ang isang \"way\" sa isang punto o tuldok.",
+                "vertex": "Dinugtong ang isang \"way\" sa isa pang \"way\".",
+                "line": "Dinugtong ang isang \"way\" sa isang linya.",
+                "area": "Dinugtong ang isang \"way\" sa isang area o poligon."
+            }
+        },
+        "disconnect": {
+            "title": "Alisin ang pagkakadugtong",
+            "description": "Alisin sa pagkakadugtong ang mga linya / poligon.",
+            "key": "D",
+            "annotation": "Naalis sa pagkakadugtong ang mga linya / poligon.",
+            "not_connected": "Hindi sapat na bilang ng mga linya upang i-diskonekta o paghiwalayin."
+        },
+        "merge": {
+            "title": "Pagsamahin",
+            "description": "Pagdugtungin ang mga linyang ito.",
+            "key": "C",
+            "annotation": "Dinugtung ang {n} linya.",
+            "not_eligible": "Ang mga bagay na ito ay hindi maaaring pagsamahin.",
+            "not_adjacent": "Hindi mapagsama ang linyang ito dahil sila ay hindi konektado.",
+            "restriction": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga miyembro ng '{relation}\" ito ay hindi pa ganap na nai-download.",
+            "incomplete_relation": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga ito ay hindi pa ganap na nai-download."
+        },
+        "move": {
+            "title": "Ilipat ng posisyon",
+            "description": "Ilipat ang posisyon.",
+            "key": "M",
+            "annotation": {
+                "point": "Inilipat ang posisyon ng isang punto o tuldok.",
+                "vertex": "Inilipat ang posisyon ng isang \"node\" na sa isang \"way\".",
+                "line": "Inilipat ang posisyon ng isang linya.",
+                "area": "Inilipat ang posisyon ng isang area o poligon.",
+                "multiple": "Inilipat ang posisyon ang maraming bagay."
+            },
+            "incomplete_relation": "Hindi maaring ilipat ng posisyon dahil ito ay hindi pa ganap na nai-download."
+        },
+        "rotate": {
+            "title": "Paikutin",
+            "description": "Paikutin ang bagay na ito mula sa kanyang \"center point\".",
+            "key": "R",
+            "annotation": {
+                "line": "Pinaikot ang linya.",
+                "area": "Pinaikot ang area o poligon."
+            }
+        },
+        "reverse": {
+            "title": "Baliktarin",
+            "description": "Baliktarin ang direksyon ng linyang ito.",
+            "key": "V",
+            "annotation": "Binaliktad ang direksyon ng linya."
+        },
+        "split": {
+            "title": "Hatiin",
+            "description": {
+                "line": "Hatiin sa dalawa ang linya mula sa node na ito.",
+                "area": "Hatiin ang hangganan ng lugar na ito sa dalawa.",
+                "multiple": "Hatiin ang linya o hangganan ng lugar na ito sa dalawa."
+            },
+            "key": "X",
+            "annotation": {
+                "line": "Hatiin ang linya.",
+                "area": "Hatiin ang hangganan ng area o poligon.",
+                "multiple": "Hatiin ang {n} linya/area o poligon."
+            },
+            "not_eligible": "Hindi maaaring hatiin ang linya mula sa umpisa o dulong \"node\" nito.",
+            "multiple_ways": "Masyadong maraming mga linya dito upang hatiin."
+        },
+        "restriction": {
+            "help": {
+                "select": "I-click upang pumili ng isang segment ng kalsada.",
+                "toggle": "I-click upang i-toggle ang mga \"turn restrictions\".",
+                "toggle_on": "I-click upang magdagdag ng \"{restriction}\" restriction.",
+                "toggle_off": "I-click upang alisin ang \"{restriction}\" restriction."
+            },
+            "annotation": {
+                "create": "Idinagdag isang \"turn restriction\"",
+                "delete": "Tinanggal ang isang \"turn restriction\""
+            }
+        }
+    },
+    "undo": {
+        "tooltip": "I-undo:{action}",
+        "nothing": "Walang ma-undo"
+    },
+    "redo": {
+        "tooltip": "i-redo: {action}",
+        "nothing": "Walang ma-redo."
+    },
+    "tooltip_keyhint": "Shortcut:",
+    "browser_notice": "Ang editor na ito ay suportado sa Firefox, Chrome, Safari, Opera, at Internet Explorer 9 at sa mas mataas pang bersion. I-upgrade ang inyong browser o gamitin Potlatch 2 upang i-edit ng mapa.",
+    "translate": {
+        "translate": "I-salin",
+        "localized_translation_label": "Multilingual name",
+        "localized_translation_language": "Pumili ng wika",
+        "localized_translation_name": "Pangalan"
+    },
+    "zoom_in_edit": "Mag-zoom-in para makapag-edit",
+    "logout": "Mag-logout",
+    "loading_auth": "Kumokonekta sa OpenStreetMap ...",
+    "report_a_bug": "I-ulat ang bug",
+    "status": {
+        "error": "Hindi maka-konekta sa API.",
+        "offline": "Kasalukuyang offline ang API. Subukang mag-edit muli sa ibang pagkakataon.",
+        "readonly": "Kasalukuyang nasa read-only ang API. Kailangan mong maghintay upang i-save ang iyong mga pagbabago."
+    },
+    "commit": {
+        "title": "I-save ang mga binago.",
+        "description_placeholder": "Maikling paglalarawan ng iyong mga ambag o edits",
+        "message_label": "Mag-commit mensahe",
+        "upload_explanation": "Ang mga pagbabagong na-upload ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "upload_explanation_with_user": "Ang mga pagbabagong na-upload bilang {user} ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "save": "I-save",
+        "cancel": "Kanselahin",
+        "warnings": "Mga babala",
+        "modified": "Binago",
+        "deleted": "Binura",
+        "created": "Nilikha"
+    },
+    "contributors": {
+        "list": "Edits nina {users}",
+        "truncated_list": "Edits nina {users} at {count} iba pa"
+    },
+    "geocoder": {
+        "search": "Maghanap sa buong mundo ...",
+        "no_results_visible": "Walang mga resulta sa kasalukuyang lugar sa mapa",
+        "no_results_worldwide": "Walang mga resultang natagpuan"
+    },
+    "geolocate": {
+        "title": "Ipakita ang kasalukuyang lokasyon."
+    },
+    "inspector": {
+        "no_documentation_combination": "Walang documentation para sa kumbinasyon ng mga tag na ginamit",
+        "no_documentation_key": "Walang \"documentation\" na magagamit para sa \"key\" na ito.",
+        "show_more": "Higit pang detalye",
+        "view_on_osm": "Tingnan sa openstreetmap.org",
+        "all_tags": "Lahat ng tags",
+        "all_members": "Lahat ng kasapi",
+        "all_relations": "Lahat ng \"relation\"",
+        "new_relation": "Bagong relation ...",
+        "role": "Kasapi",
+        "choose": "Pumili ng uri ng \"features\"",
+        "results": "{n} mga resulta para sa {search}",
+        "reference": "Tingnan sa OpenStreetMap Wiki",
+        "back_tooltip": "Baguhin ang \"feature\"",
+        "remove": "Alisin",
+        "search": "Mag-search",
+        "multiselect": "Napiling mga item",
+        "unknown": "Unknown",
+        "incomplete": "<not downloaded>",
+        "feature_list": "Mag-hanap ng \"feature\"",
+        "edit": "I-edit ang \"feature\"",
+        "none": "Wala",
+        "node": "Node",
+        "way": "Way",
+        "relation": "Relation",
+        "location": "Lokasyon"
+    },
+    "background": {
+        "title": "\"Background\" o \"imagery\"",
+        "description": "Mga setting ng \"background\" o \"imagery\"",
+        "percent_brightness": "{opacity}% Pagkalinaw",
+        "none": "Wala",
+        "custom": "Custom",
+        "custom_button": "I-edit ang custom na background",
+        "custom_prompt": "Magpasok ng template na tile URL. Ang wastong mga token ay {z}, {x}, {y} para sa Z/X/Y scheme at {u} naman para sa quadtile scheme.",
+        "fix_misalignment": "Ayusin ang pagkakahanay ng \"imagery\"",
+        "reset": "I-reset"
+    },
+    "restore": {
+        "heading": "Mayroon kang hindi na-save ng mga pagbabago",
+        "description": "Ibig mo bang ibalik ang mga hindi na-save na pagbabago mula sa isang nakaraang session sa pag-edit?",
+        "restore": "Ibalik",
+        "reset": "I-reset"
+    },
+    "save": {
+        "title": "I-save",
+        "help": "I-save ang mga pagbabago sa OpenStreetMap upang makita ng ibang gumagamit ng datos.",
+        "no_changes": "Walang mga pagbabago upang i-save.",
+        "error": "May error habang sinusubukang i-save",
+        "uploading": "Ina-upload ang mga pagbabago sa OpenStreetMap.",
+        "unsaved_changes": "Mayroon kang hindi na-save ng mga pagbabago"
+    },
+    "success": {
+        "edited_osm": "Nag-edit sa OSM!",
+        "just_edited": "Nag-edit ka sa OpenStreetMap!",
+        "view_on_osm": "Tingnan sa OSM",
+        "facebook": "I-share sa Facebook",
+        "twitter": "I-share sa Twitter",
+        "google": "I-share sa Google+",
+        "help_html": "Ang iyong nagawang mga pagbabago ay lilitaw sa \"Standard\" layer sa loob ng ilang minuto. Para sa iba pang mga layer at ang ilang mga tampok, maaaring mas matagal kaysa ilang minuto\n(<a href ='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank '>basahin ang detalye dito</ a>).\n"
+    },
+    "confirm": {
+        "okay": "Okay"
+    },
+    "splash": {
+        "welcome": "Maligayang pagdating sa iD OpenStreetMap editor",
+        "text": "Ang iD ay isang simple ngunit magandang editor para sa pag-edit ng libreng mapa ng buong mundo.  Ito ay bersyon {version}. Para sa karagdagang impormasyon tingnan ang {website} at i-ulat ang mga bugs sa {github}.",
+        "walkthrough": "Simulan ang \"Walkthrough\"",
+        "start": "Simulan ang pag-edit"
+    },
+    "source_switch": {
+        "live": "live",
+        "lose_changes": "Mayroon kang hindi na-save ang mga pagbabago. Mawawala ang pagbabagong ito kung lilipat sa ibang map server.   Sigurado ka bang gusto mong lumipat ng server?",
+        "dev": "dev"
+    },
+    "tag_reference": {
+        "description": "Paglalarawan",
+        "on_wiki": "{tag} sa wiki.osm.org",
+        "used_with": "Kabilang sa gingamait ang {type}"
+    },
+    "validations": {
+        "untagged_point": "Walang tag na punto o tuldok",
+        "untagged_line": "Walang tag na linya",
+        "untagged_area": "Walang tag na area o poligon",
+        "many_deletions": "Nagbura ka ng {n} bagay sa mapa. Sigurado ka bang gusto mong gawin ito? Ito ay tatanggalin sa mapa na nakikita sa openstreetmap.org.",
+        "tag_suggests_area": "Ang tag na {tag} ay kalimitang para sa mga area o poligon sublait ito ay nasa linya lamang.",
+        "untagged_point_tooltip": "Pumili ng uri ng tampok na naglalarawan kung ano ang puntong ito.",
+        "untagged_line_tooltip": "Pumili ng uri ng tampok na naglalarawan kung ano ang linyang ito.",
+        "untagged_area_tooltip": "Pumili ng uri ng tampok na naglalarawan kung ano ang poligong ito.",
+        "deprecated_tags": "Hindi na ginagamit na \"tag\": {tags}"
+    },
+    "zoom": {
+        "in": "i-zoom in",
+        "out": "I-zoom out"
+    },
+    "cannot_zoom": "Hindi na pwedeng mag-zoom out sa kasalukuyang \"mode\".",
+    "gpx": {
+        "local_layer": "Lokal na GPX file",
+        "drag_drop": "I-drag at i-drop ang .gpx file mula sa inyong \"computer\" sa pahinang ito, o i-click ang button sa kanan upang mag-browse",
+        "zoom": "I-zoom sa GPX track",
+        "browse": "Mag-browse ng .gpx file"
+    },
+    "help": {
+        "title": "Tulong",
+        "help": "# Help\n\nIto ay isang editor para sa [OpenStreetMap] (http://www.openstreetmap.org/), isang libre at maaaring i-edit na mapa ng mundo. Maaari mo itong gamitin upang idagdag at i-update ang iyong lugar, sa paggawa ng isang open-source at open-data na mapa ng mundo para magamit ng lahat.\n\nAng pag-edit na gagawin mo sa mapang ito ay makikita ng lahat ng gumagamit OpenStreetMap. Upang makapag-edit, kakailanganin mo ng [OpenStreetMap account] (https://www.openstreetmap.org/user/new). \n\nAng [iD editor] (http://ideditor.com/) ay isang collaborative proyekto,  ang [source code ay matatagpuan sa GitHub] (https://github.com/openstreetmap/iD).\n",
+        "editing_saving": "### Pag-edit & Saving\n\nEditor na ito ay dinisenyo upang gumana lalo na sa online, at ina-access mo ito sa pamamagitan ng isang website sa ngayon.\n\n### Pagpili ng Mga Tampok\n\nUpang pumili ng isang tampok ng mapa , tulad ng kalsada o punto ng interes , i-click \nsa ito sa mapa. Ito ay i-highlight ang mga napiling tampok , buksan ang isang panel na may \nmga detalye tungkol dito , at ipakita ang menu ng mga bagay na maaari mong gawin gamit ang tampok. \n\nUpang pumili ng maraming mga tampok , pindutin nang matagal ang 'Shift ' key. Pagkatapos ay i-click ang alinman sa \nsa ang tampok na gusto mong piliin , o i-drag sa mapa upang gumuhit ng parihaba . \nAy ito gumuhit ng isang kahon at piliin ang lahat ng mga punto sa loob nito.\n\n### Saving Pag-edit \n\nKapag gumawa ka ng mga pagbabago tulad ng pag-edit ng mga kalsada, gusali , at mga lugar, ang mga ito ay \nnaka-imbak sa isang lugar lamang hanggang sa i-save mo ang mga ito sa server. Huwag mag-alala kung gumawa ka \nisang pagkakamali - maaari mong i-undo ang mga pagbabago sa pamamagitan ng pag-click sa pindutan undo , at gawing muli ang \nmga pagbabago sa pamamagitan ng pag-click sa pindutan gawing muli.\n\nI-click ang 'I-save ' upang matapos sa isang pangkat ng mga pag-edit - halimbawa , kung nag- nakumpleto \nisang lugar ng bayan at nais na magsimula sa isang bagong lugar . Magkakaroon ka ng pagkakataong \nupang suriin kung ano ang iyong nagawa , at ang editor supplies nakakatulong na mga mungkahi\nat babala kung may isang bagay ay hindi tila karapatan tungkol sa mga pagbabago . \n\nKung mukhang maganda ang lahat ng bagay , maaari mong ipasok ang isang maikling komento na nagpapaliwanag ng mga pagbabago\nna ginawa mo , at i-click muli ang ' I-save' upang i-post ang mga pagbabago\nsa [ OpenStreetMap.org ] ( http://www.openstreetmap.org/ ), kung saan ang mga ito ay nakikita \nsa lahat ng iba pang mga gumagamit at magagamit para sa iba upang bumuo at pagbutihin sa.\n\nKung hindi mo maaaring tapusin ang iyong mga pag-edit sa isang sitting , maaari mong iwanan ang editor window at bumalik ( sa parehong browser at computer ) , at ang\neditor application ay mag-aalok upang ibalik ang iyong trabaho .\n\n",
+        "gps": "# GPS\n\nAng datos mula sa GPS data ay isa sa pinagkakatiwalaang pinagmumulan ng\ndatos para sa OpenStreetMap.  Gamit ang Editor na ito, maaring i-dagdag \nang iyong mga GPS trace mula sa inyong lokal na computer. \nMaaari kang mangolekta ng ganitong uri ng GPS trace sa gamit ang iyong \nsmartphone o anumang GPS receiver. \n\nPara sa impormasyon kung paano magsagawa ng survey sa pamamagitan ng\nGPS, basahin ang: \n[Pag-survey gamit ang GPS] (http://learnosm.org/en/beginner/using-gps/). \n\nUpang magamit ang GPX track para sa pagmamapa, i-drag at i-drop ang GPX file papunta sa mapa. \nMakikita ito sa mapa bilang isang berdeng linya. \nMag-click sa menu na 'Background Settings' sa kanang bahagi upang \ni-enable, disable, o mag-zoom sa GPX layer. \n\nAng GPX track ay hindi direktang naia-upload sa OpenStreetMap. \nGamitin ito bilang isang gabay para sa mga bagong tampok na nais \nmong idagdag.  Kung nais mong i-upload ito sa OpenStreetMap para magamit na iba,  pumunta lamang sa \n[upload ito sa OpenStreetMap] (http://www.openstreetmap.org/trace/create).\n"
+    },
+    "intro": {
+        "navigation": {
+            "title": "Navigation",
+            "drag": "Ang pangunahing lugar ng mapa ay nagpapakita ng datos ng na makikita sa OpenStreetMap. Maaari kang mag-navigate sa pamamagitan ng pag-drag at pag-scroll, tulad ng anumang webmap. **I-drag ang mapa!**",
+            "select": "Mga tampok ng mapa ay kinakatawan ng tatlong paraan: gamit ang mga puntos, mga linya o area/poligon. Ang lahat ng mga tampok ay maaaring piliin sa pamamagitan ng pag-click sa mga ito. **Mag-click sa punto upang piliin ito.**",
+            "header": "Ang \"header\" ay nagpapakita kung anong uri ng \"feature\" ito.",
+            "pane": "Kapag ang isang tampok ay pinili, ang feature editor ay ipinapakita. Ang header ay nagpapakita kung anong uri ng tampok at ipinapakita sa pangunahing pane ang mga katangian ng tampok, tulad ng pangalan at address. **Isara ang feature editor gamit ang close button na malapit sa kanang tuktok. **"
+        },
+        "points": {
+            "title": "Mga Punto o tuldok",
+            "add": "Ang mga puntos ay maaaring gamitin upang kumatawan sa mga tampok tulad ng mga tindahan, kainan at mga monumento. Markahan ang mga ito sa tukoy na lokasyon, at ilarawan kung ano ito. **I-click ang pindutan ng Point upang magdagdag ng bagong punto.**",
+            "place": "Gumawa ng punto sa pamamagitan ng pag-click sa mapa. **Ilagay ang tuldok sa tuktok ng gusali.**",
+            "search": "Maraming iba't ibang mga tampok ang pwedeng kumatawan bilang puntos. Ang puntong iyong nai-dagdag ay isang Cafe. **I-search ang '{name}'**",
+            "choose": "**Pumili ng Cafe mula sa talaan.**",
+            "describe": "Ang punto o tuldok na ito ay minarkahan bilang \"cafe\".  Gamit ang \"feature editor\", maari tayong magdagdag ng iba pang impormasyon. **Magdagdag ng pangalan**",
+            "close": "Ang feature editor ay maaring isara sa pamamagitan ng pag-click ng \"Close\". **Isara the feature editor**",
+            "reselect": "Kadalasan, may mga puntos nang nalikha ng ibang mappers, ngunit may mga mali o hindi kumpleto. Maaaring i-edit ang mga puntos na ito. **Piliin ang punto na nilikha mo kanina.**",
+            "fixname": "**Baguhin o magdagdag ng pangalan ng kalsada at isara ang \"feature editor\"**",
+            "reselect_delete": "Ang lahat ng mga nasa mapa ay maaring burahin. **Mag-click sa punto na nilikha mo.**",
+            "delete": "Ang menu sa paligid ng punto ay naglalaman ng mga operasyon na maaaring isagawa dito, tulad ng pagbura. **Burahin ang punto. **"
+        },
+        "areas": {
+            "title": "Mga area o poligon",
+            "corner": "Ang paglikha ng area o poligon ay sa pamamagitan ng paglalagay node sa paligid ng mga hangganan ng lugar. **Ilagay ang unang node sa isa sa mga sulok ng palaruan.**",
+            "place": "Ipagpatuloy ang pag-guhit ng area o pligon sa pamamagitan ng paglalagay ng higit pang mga node. Tapusin ito sa pamamagitan ng pag-click sa umpisang node. ** Gumuhit ng area o pilgon ng palaruan.**",
+            "search": "**Hanapin ang '{name}'.**",
+            "choose": "**Pliin ang \"Playground\" mula sa talaan.**",
+            "describe": "**Magdagdag ng pangalan at isara ang \"feature editor\"**"
+        },
+        "lines": {
+            "title": "Mga linya",
+            "add": "Ang mga linya ay ginagamit para kumatawan sa mga \"feature\" na gaya ng mga kalsada, riles ng tren at ilog. **I-click ang button para sa \"Linya\" upang magdagdag ng bagong linya. **",
+            "start": "**Simulan ang linya sa pamamagitan ng pag-click sa dulo ng kalsada.**",
+            "intersect": "I-click upang magdagdag ng higit pang mga tuldok sa linya. Maaari mong i-drag ang mapa habang gumuguhit kung kinakailangan. Ang mga kalsada, at iba pang mga uri ng linya, ay pwedeng bahagi ng isang mas malaking network. Mahalaga para sa mga linyang ito ay konektado, maayos ang pagkaka-sunod-sunod para sa routing upang gumana ng mga application. ** Mag-click sa Flower Street, upang lumikha ng isang panulukang naka-konekta sa dalawang linya. **",
+            "finish": "Ang mga linya ay matatapos sa pamamagitan ng pag-click muli sa huling node. **Taposin ang pagguhit ng kalsada.**",
+            "road": "**Piliin ang \"Road\" mula sa talaan**",
+            "residential": "Mayroong iba't ibang mga uri ng mga kalsada, ang pinaka-karaniwang ay residential. **Piliin ang residential na uri ng kalsada**",
+            "describe": "**Magdagdag ng pangalan ng kalsada at isara ang \"feature editor\"**",
+            "restart": "Kailangang i-intersect ang kalsada sa Flower Street.",
+            "wrong_preset": "Hindi ka pumili ang Residential na uri ng kalsada. **I-click dito upang piliin muli**"
+        },
+        "startediting": {
+            "title": "Umpisahan ang pag-edit",
+            "help": "Higit pang mga documentation at ang walkthrough ang makukuha dito.",
+            "save": "Huwag kalimutan na regular na i-save ang iyong mga binago!",
+            "start": "Simulan ang pagma-mapa!"
+        }
+    },
+    "presets": {
+        "fields": {
+            "address": {
+                "label": "Address",
+                "placeholders": {
+                    "street": "Kalsada",
+                    "city": "Siyudad"
+                }
+            },
+            "aerialway": {
+                "label": "Uri"
+            },
+            "aeroway": {
+                "label": "Uri"
+            },
+            "amenity": {
+                "label": "Uri"
+            },
+            "artwork_type": {
+                "label": "Uri"
+            },
+            "atm": {
+                "label": "ATM"
+            },
+            "barrier": {
+                "label": "Uri"
+            },
+            "bicycle_parking": {
+                "label": "Uri"
+            },
+            "boundary": {
+                "label": "Uri"
+            },
+            "building": {
+                "label": "Gusali"
+            },
+            "building_area": {
+                "label": "Gusali"
+            },
+            "capacity": {
+                "label": "Kapasidad"
+            },
+            "construction": {
+                "label": "Uri"
+            },
+            "crossing": {
+                "label": "Uri"
+            },
+            "entrance": {
+                "label": "Uri"
+            },
+            "fire_hydrant/type": {
+                "label": "Uri"
+            },
+            "generator/type": {
+                "label": "Uri"
+            },
+            "highway": {
+                "label": "Uri"
+            },
+            "historic": {
+                "label": "Uri"
+            },
+            "information": {
+                "label": "Uri"
+            },
+            "internet_access": {
+                "options": {
+                    "wlan": "Wifi"
+                }
+            },
+            "landuse": {
+                "label": "Uri"
+            },
+            "leisure": {
+                "label": "Uri"
+            },
+            "man_made": {
+                "label": "Uri"
+            },
+            "name": {
+                "label": "Pangalan"
+            },
+            "office": {
+                "label": "Uri"
+            },
+            "parking": {
+                "label": "Uri"
+            },
+            "piste/type": {
+                "label": "Uri"
+            },
+            "place": {
+                "label": "Uri"
+            },
+            "power": {
+                "label": "Uri"
+            },
+            "railway": {
+                "label": "Uri"
+            },
+            "relation": {
+                "label": "Uri"
+            },
+            "restriction": {
+                "label": "Uri"
+            },
+            "route": {
+                "label": "Uri"
+            },
+            "route_master": {
+                "label": "Uri"
+            },
+            "service": {
+                "label": "Uri"
+            },
+            "shelter_type": {
+                "label": "Uri"
+            },
+            "shop": {
+                "label": "Uri"
+            },
+            "studio_type": {
+                "label": "Uri"
+            },
+            "tourism": {
+                "label": "Uri"
+            },
+            "tree_type": {
+                "label": "Uri"
+            },
+            "water": {
+                "label": "Uri"
+            },
+            "waterway": {
+                "label": "Uri"
+            },
+            "wetland": {
+                "label": "Uri"
+            },
+            "wood": {
+                "label": "Uri"
+            }
+        },
+        "presets": {
+            "building": {
+                "name": "Gusali"
+            }
+        }
+    }
+}

vendor/assets/iD/iD/locales/uk.json

@@ -71,7 +71,8 @@
                 "line": "Лінія перетворена на коло.",
                 "area": "Полігон перетворено на коло."
             },
-            "not_closed": "Неможливо перетворити на коло — лінія не замкнена."
+            "not_closed": "Неможливо перетворити на коло — лінія не замкнена.",
+            "too_large": "Неможливо перетворити на коло, не все що є видно."
         },
         "orthogonalize": {
             "title": "Випрямити кути",
@@ -84,7 +85,8 @@
                 "line": "Випрямлено кути лінії.",
                 "area": "Випрямлено кути полігону."
             },
-            "not_squarish": "Випрямити кути не вдалось, об’єкт не має відповідних кутів."
+            "not_squarish": "Випрямити кути не вдалось, об’єкт не має відповідних кутів.",
+            "too_large": "Неможливо зробити кути прямими, не все що є видно."
         },
         "straighten": {
             "title": "Випрямити",
@@ -95,7 +97,7 @@
         },
         "delete": {
             "title": "Вилучити",
-            "description": "Вилучити об’єкт з мапи.",
+            "description": "Вилучити об'єкт назавжди.",
             "annotation": {
                 "point": "Вилучено точку.",
                 "vertex": "Вилучено точку з лінії.",
@@ -134,7 +136,8 @@
             "annotation": "Об’єднати {n} ліній.",
             "not_eligible": "Ці об’єкти неможливо злити.",
             "not_adjacent": "Ці лінії неможливо злити, бо вони не з’єднані.",
-            "restriction": "Ці лінії не можуть бути об’єднані, принаймні одна з них є членом зв’язку \"{relation}\"."
+            "restriction": "Ці лінії не можуть бути об’єднані, принаймні одна з них є членом зв’язку \"{relation}\".",
+            "incomplete_relation": "Ці об’єкти не можуть бути об’єднані, принаймні один з них завантажений не повністю."
         },
         "move": {
             "title": "Пересунути",
@@ -147,7 +150,8 @@
                 "area": "Полігон пересунуто.",
                 "multiple": "Пересунуто кілька об’єктів."
             },
-            "incomplete_relation": "Цей об’єкт неможливо пересунути, бо він не повністю завантажний."
+            "incomplete_relation": "Цей об’єкт неможливо пересунути, бо він не повністю завантажний.",
+            "too_large": "Неможливо перемістити об’єкт, він не повністю відкритий."
         },
         "rotate": {
             "title": "Обернути",
@@ -156,7 +160,8 @@
             "annotation": {
                 "line": "Напрямок лінії змінено.",
                 "area": "Полігон обернуто."
-            }
+            },
+            "too_large": "Неможливо обернути об’єкт, він не повністю відкритий."
         },
         "reverse": {
             "title": "Розвернути",
@@ -179,6 +184,18 @@
             },
             "not_eligible": "Неможливо розділити лінію на її початку чи кінці.",
             "multiple_ways": "Забагато ліній для розділення."
+        },
+        "restriction": {
+            "help": {
+                "select": "Натисніть для вибору відрізку дороги",
+                "toggle": "Натисніть для перемикання заборони повороту",
+                "toggle_on": "Натисніть для додавання заборони \"{restriction}\".",
+                "toggle_off": "Натисніть для видалення заборони \"{restriction}\"."
+            },
+            "annotation": {
+                "create": "Додано заборону повороту",
+                "delete": "Заборону повороту видалено"
+            }
         }
     },
     "undo": {
@@ -264,7 +281,8 @@
         "percent_brightness": "прозорість {opacity}%",
         "none": "Пусте",
         "custom": "Власний фон",
-        "custom_prompt": "Введіть шаблон для квадратів мапи. Використовуй те  {z}, {x}, {y} для схеми Z/X/Y та {u} схеми QuadTiles.",
+        "custom_button": "Параметри власного фону",
+        "custom_prompt": "Введіть шаблон URL для квадратів мапи. Використовуйте  {z}, {x}, {y} для схеми Z/X/Y та {u} для схеми QuadTiles.",
         "fix_misalignment": "Виправити зсув",
         "reset": "скинути"
     },
@@ -316,7 +334,9 @@
         "untagged_area": "Полігон без  теґів",
         "many_deletions": "Ви збираєтесь вилучити {n} об’єктів. Ви дійсно бажаєте це зробити? Таке вилучення призведе до їх зникнення з мапи openstreetmap.org.",
         "tag_suggests_area": "Теґ {tag} зазвичай ставиться на полігони, але об’єкт не є полігоном",
-        "untagged_tooltip": "Оберіть тип об’єкту, що описує чим є {geometry}.",
+        "untagged_point_tooltip": "Виберіть тип об’єкта, що відповідає цій точці.",
+        "untagged_line_tooltip": "Виберіть тип об’єкта, що відповідає цій лінії.",
+        "untagged_area_tooltip": "Виберіть тип об’єкта, що відповідає цьому полігону.",
         "deprecated_tags": "Застарілі теґи: {tags}"
     },
     "zoom": {
@@ -365,7 +385,7 @@
         },
         "areas": {
             "title": "Полігони",
-            "add": "Полігони — більш докладний спосіб представлення об’єктів. Вони надають інформацію про межі об’єктів. Полігони можуть застосовуватись для більшості об’єктів, що позначаються точками, і є більш бажаними у застосуванні. **Натисніть на 'Полігон' для додавання нового полігону.**",
+            "add": "Полігони використовуються, щоб показати межі об’єктів, наприклад: озер, будинків території житлової забудови. Їх також використовують для більш детального нанесення на мапу об’єктів, які зазвичай позначаються точками. **Натисніть на кнопку Полігон, щоб додати його до мапи.**",
             "corner": "Полігони кресляться додаванням точок на межах об’єкта. **Поставте першу точку на куті ігрового майданчика.**",
             "place": "Окресліть територію, додаючи точки. Закінчіть креслення, клацнувши на першу точку. **Накресліть полігон для ігрового майданчика.**",
             "search": "**Знайдіть '{name}'.**",
@@ -408,6 +428,9 @@
             "category-rail": {
                 "name": "Рейки"
             },
+            "category-restriction": {
+                "name": "Заборона"
+            },
             "category-road": {
                 "name": "Дороги"
             },
@@ -460,16 +483,25 @@
                 }
             },
             "access_simple": {
+                "label": "Доступ",
+                "placeholder": "так"
+            },
+            "access_toilets": {
                 "label": "Доступ"
             },
             "address": {
                 "label": "Адреса",
                 "placeholders": {
-                    "housename": "Назва будинку",
-                    "number": "Номер",
+                    "housename": "Ім’я будинку",
+                    "housenumber": "123",
                     "street": "Вулиця",
                     "city": "Місто",
-                    "postcode": "Поштовий індекс"
+                    "postcode": "Поштовий індекс",
+                    "place": "Місцевість",
+                    "hamlet": "Хутір",
+                    "suburb": "Передмістя",
+                    "district": "Район",
+                    "country": "Країна"
                 }
             },
             "admin_level": {
@@ -479,7 +511,38 @@
                 "label": "Тип"
             },
             "aerialway/access": {
-                "label": "Доступ"
+                "label": "Доступ",
+                "options": {
+                    "entry": "Вхід",
+                    "exit": "Вихід",
+                    "both": "Вхід/Вихід"
+                }
+            },
+            "aerialway/bubble": {
+                "label": "Захисний екран"
+            },
+            "aerialway/capacity": {
+                "label": "Пропускна здатність (на годину)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Тривалість (хвилин)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "З підігрівом"
+            },
+            "aerialway/occupancy": {
+                "label": "Кількість місць",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Доступ влітку",
+                "options": {
+                    "entry": "Вхід",
+                    "exit": "Вихід",
+                    "both": "Вхід/Вихід"
+                }
             },
             "aeroway": {
                 "label": "Тип"
@@ -514,15 +577,30 @@
             "building_area": {
                 "label": "Будинок"
             },
-            "cans": {
-                "label": "Бляшанки"
-            },
             "capacity": {
                 "label": "Міськість",
                 "placeholder": "50, 100, 200…"
             },
             "cardinal_direction": {
-                "label": "Напрямок"
+                "label": "Напрямок",
+                "options": {
+                    "N": "Північ",
+                    "E": "Схід",
+                    "S": "Південь",
+                    "W": "Захід",
+                    "NE": "Північний схід",
+                    "SE": "Південний схід",
+                    "SW": "Південний захід",
+                    "NW": "Північний захід",
+                    "NNE": "Північно-північний схід",
+                    "ENE": "Східно-північний схід",
+                    "ESE": "Східно-південний схід",
+                    "SSE": "Південно-південний схід",
+                    "SSW": "Південно-південний захід",
+                    "WSW": "Західно-південний захід",
+                    "WNW": "Західно-північний захід",
+                    "NNW": "Північно-північний захід"
+                }
             },
             "clock_direction": {
                 "label": "Напрямок",
@@ -531,9 +609,6 @@
                     "anticlockwise": "Проти годинникової стрілки"
                 }
             },
-            "clothes": {
-                "label": "Одяг"
-            },
             "collection_times": {
                 "label": "Час виїмки пошти"
             },
@@ -558,6 +633,9 @@
             "description": {
                 "label": "Опис"
             },
+            "electrified": {
+                "label": "Електрифікація"
+            },
             "elevation": {
                 "label": "Висота"
             },
@@ -567,6 +645,9 @@
             "entrance": {
                 "label": "Тип"
             },
+            "except": {
+                "label": "Вийнятки"
+            },
             "fax": {
                 "label": "Факс",
                 "placeholder": "+31 42 123 4567"
@@ -575,11 +656,40 @@
                 "label": "Плата"
             },
             "fire_hydrant/type": {
-                "label": "Тип"
+                "label": "Тип",
+                "options": {
+                    "pillar": "Надземний",
+                    "underground": "Підземний",
+                    "wall": "Настінний"
+                }
             },
             "fixme": {
                 "label": "Потребує виправлення"
             },
+            "fuel": {
+                "label": "АЗС"
+            },
+            "fuel/biodiesel": {
+                "label": "Біодизель"
+            },
+            "fuel/diesel": {
+                "label": "Дизельне паливо"
+            },
+            "fuel/e10": {
+                "label": "E10"
+            },
+            "fuel/e85": {
+                "label": "E85"
+            },
+            "fuel/lpg": {
+                "label": "Пропан"
+            },
+            "fuel/octane_100": {
+                "label": "Гоночний бензин"
+            },
+            "fuel/octane_91": {
+                "label": "Звичайний бензин"
+            },
             "generator/method": {
                 "label": "Метод"
             },
@@ -589,9 +699,6 @@
             "generator/type": {
                 "label": "Тип"
             },
-            "glass": {
-                "label": "Скло"
-            },
             "golf_hole": {
                 "label": "Лунка",
                 "placeholder": "Номер лунки (1-18)"
@@ -606,6 +713,9 @@
             "historic": {
                 "label": "Тип"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -621,11 +731,16 @@
             "internet_access": {
                 "label": "Доступ до Інтеренету",
                 "options": {
+                    "yes": "Так",
+                    "no": "Ні",
                     "wlan": "Wifi",
                     "wired": "Дротовий",
                     "terminal": "Термінал"
                 }
             },
+            "lamp_type": {
+                "label": "Тип"
+            },
             "landuse": {
                 "label": "Тип"
             },
@@ -639,6 +754,9 @@
             "leisure": {
                 "label": "Тип"
             },
+            "length": {
+                "label": "Довжина (метрів)"
+            },
             "levels": {
                 "label": "Поверхи",
                 "placeholder": "2, 4, 6…"
@@ -656,6 +774,12 @@
                 "label": "Обмеження швидкості",
                 "placeholder": "40, 50, 60…"
             },
+            "mtb/scale": {
+                "placeholder": "0, 1, 2, 3..."
+            },
+            "mtb/scale/uphill": {
+                "placeholder": "0, 1, 2, 3..."
+            },
             "name": {
                 "label": "Назва",
                 "placeholder": "Власна назва (якщо є)"
@@ -673,10 +797,18 @@
                 "label": "Тип"
             },
             "oneway": {
-                "label": "Односторонній рух"
+                "label": "Односторонній рух",
+                "options": {
+                    "yes": "Так",
+                    "no": "Ні"
+                }
             },
             "oneway_yes": {
-                "label": "Односторонній рух"
+                "label": "Односторонній рух",
+                "options": {
+                    "yes": "Так",
+                    "no": "Ні"
+                }
             },
             "opening_hours": {
                 "label": "Години"
@@ -684,9 +816,6 @@
             "operator": {
                 "label": "Оператор"
             },
-            "paper": {
-                "label": "Макулатура"
-            },
             "par": {
                 "placeholder": "3, 4, 5…"
             },
@@ -694,7 +823,15 @@
                 "label": "Перехоплююча стоянка"
             },
             "parking": {
-                "label": "Тип"
+                "label": "Тип",
+                "options": {
+                    "surface": "Покриття",
+                    "multi-storey": "Багаторівнева",
+                    "underground": "Підземна",
+                    "sheds": "Гаражі",
+                    "carports": "Навіси",
+                    "garage_boxes": "Гаражі"
+                }
             },
             "phone": {
                 "label": "Телефон",
@@ -715,6 +852,18 @@
             "railway": {
                 "label": "Тип"
             },
+            "recycling/cans": {
+                "label": "Бляшані банки"
+            },
+            "recycling/clothes": {
+                "label": "Одяг"
+            },
+            "recycling/glass": {
+                "label": "Скло"
+            },
+            "recycling/paper": {
+                "label": "Папір"
+            },
             "ref": {
                 "label": "Номер"
             },
@@ -722,28 +871,22 @@
                 "label": "Тип"
             },
             "religion": {
-                "label": "Релігія",
-                "options": {
-                    "christian": "Християнство",
-                    "muslim": "Мусульманство",
-                    "buddhist": "Будизм",
-                    "jewish": "Іудейство",
-                    "hindu": "Хінду",
-                    "shinto": "Сінто",
-                    "taoist": "Даосизм"
-                }
+                "label": "Релігія"
             },
             "restriction": {
                 "label": "Тип"
             },
+            "restrictions": {
+                "label": "Заборони повороту"
+            },
             "route": {
                 "label": "Тип"
             },
             "route_master": {
                 "label": "Тип"
             },
-            "sac_scale": {
-                "label": "Складність маршруту"
+            "seasonal": {
+                "label": "Сезонний"
             },
             "service": {
                 "label": "Тип"
@@ -757,6 +900,18 @@
             "shop": {
                 "label": "Тип"
             },
+            "smoking": {
+                "label": "Паління",
+                "placeholder": "Заборонено, окремо, дозволено,...",
+                "options": {
+                    "no": "Паління заборонено",
+                    "separated": "У відведених зонах, не ізольованих",
+                    "isolated": "У відведених зонах, ізольованих",
+                    "outside": "Дозволено зовні",
+                    "yes": "Дозволено скрізь",
+                    "dedicated": "Призначено для курців"
+                }
+            },
             "source": {
                 "label": "Джерело"
             },
@@ -783,7 +938,13 @@
                 "label": "Поверхня"
             },
             "toilets/disposal": {
-                "label": "Тип туалету"
+                "label": "Тип туалету",
+                "options": {
+                    "flush": "Зливний",
+                    "pitlatrine": "Яма",
+                    "chemical": "Хімічний",
+                    "bucket": "Відро"
+                }
             },
             "tourism": {
                 "label": "Тип"
@@ -792,14 +953,33 @@
                 "label": "Тип опори"
             },
             "tracktype": {
-                "label": "Тип"
+                "placeholder": "Тверде, переважно тверде, м’яке",
+                "options": {
+                    "grade1": "Тверде: з твердим покриттям чи з ущільненою поверхнею на твердих породах",
+                    "grade2": "Переважно тверде: гравій/камінь з домішками м’яких порід",
+                    "grade3": "Рівна кількість твердих і м’яких матеріалів",
+                    "grade4": "Переважно м’яке: грунт/пісок/трава з домішками твердих порід",
+                    "grade5": "М’яке: грунт/пісок/трава"
+                }
             },
             "trail_visibility": {
-                "label": "Видимість маршруту"
+                "label": "Видимість маршруту",
+                "placeholder": "Відмінна, Хороша, Погана,...",
+                "options": {
+                    "excellent": "Відмінна: чіткий шлях чи вказівники повсюди",
+                    "good": "Хороша: вказівники в межах видимості, шлях не завжди чіткий",
+                    "intermediate": "Середня: мала кількість вказівників, шлях в основному видимий",
+                    "bad": "Погана: без вказівників, шлях іноді відсутній",
+                    "horrible": "Жахлива: шлях часто відсутній, потребує навичок орієнтування",
+                    "no": "Немає: шлях відсутній, потребує хороших навичок орієнтування"
+                }
             },
             "tree_type": {
                 "label": "Тип"
             },
+            "trees": {
+                "label": "Дерева"
+            },
             "tunnel": {
                 "label": "Тунель"
             },
@@ -822,6 +1002,9 @@
             "wheelchair": {
                 "label": "Для інвалідних візків"
             },
+            "width": {
+                "label": "Ширина (метрів)"
+            },
             "wikipedia": {
                 "label": "Вікіпедія"
             },
@@ -834,6 +1017,25 @@
                 "name": "Адреса",
                 "terms": "Address, адреса, місце"
             },
+            "aerialway": {
+                "name": "Канатна дорога",
+                "terms": "Aerialway, rfyfnyf ljhjuf"
+            },
+            "aerialway/cable_car": {
+                "name": "Фунікулер",
+                "terms": "Cable car, aeysrekth"
+            },
+            "aerialway/chair_lift": {
+                "name": "Крісельний підйомник",
+                "terms": "Chair lift, rhsctkmybq gslqjvybr"
+            },
+            "aerialway/gondola": {
+                "name": "Гондоли",
+                "terms": "Gondola, Ujyljkb"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Стрічковий транспортер"
+            },
             "aeroway": {
                 "name": "Аеропорт",
                 "terms": "Aeroway, аеропорт, повітряний транспорт,повітряне сполучення"
@@ -906,6 +1108,10 @@
                 "name": "Прокат човнів",
                 "terms": "Boat Rental,ghjrfn xjdysd, катамарани"
             },
+            "amenity/bus_station": {
+                "name": "Автобусна станція",
+                "terms": "Bus Station, fdnjecyf cnfywsz"
+            },
             "amenity/cafe": {
                 "name": "Кафе",
                 "terms": "Cafe, rfat"
@@ -922,22 +1128,30 @@
                 "name": "Автомийка",
                 "terms": "Car Wash, fdnjvbqrf, мийка"
             },
-            "amenity/childcare": {
-                "name": "Дитяча кімната",
-                "terms": "Childcare, lbnzxf rsvyfnf, догляд за дітьми, ігрова зона, ігрова кімната"
+            "amenity/charging_station": {
+                "name": "Зарядна станція",
+                "terms": "Charging station, pfhzlyf cnfywsz"
             },
             "amenity/cinema": {
                 "name": "Кінотеатр",
                 "terms": "Cinema, rsyjntfnh,кіно,кінематографія"
             },
-            "amenity/college": {
-                "name": "Коледж",
-                "terms": "College, rjktl,училище,технікум"
+            "amenity/clock": {
+                "name": "Годинник",
+                "terms": "Clock, ujlbyybr"
             },
             "amenity/courthouse": {
                 "name": "Суд",
                 "terms": "Courthouse, cel, суд"
             },
+            "amenity/dentist": {
+                "name": "Дантист",
+                "terms": "Dentist, lfynbcn"
+            },
+            "amenity/doctor": {
+                "name": "Лікар",
+                "terms": "Doctor, Ksrfh"
+            },
             "amenity/drinking_water": {
                 "name": "Питна вода",
                 "terms": "Drinking Water, gbnyf djlf, бювет"
@@ -967,12 +1181,8 @@
                 "terms": "Graveyard, wdbynfh,кладовище"
             },
             "amenity/hospital": {
-                "name": "Лікарня",
-                "terms": "Hospital, ksrfhyz,шпиталь,госпіталь,стаціонар,лазарет"
-            },
-            "amenity/kindergarten": {
-                "name": "Дитячий садок",
-                "terms": "Kindergarten, lbnzxbq cfljr,ясла"
+                "name": "Територія лікарні",
+                "terms": "Hospital grounds, nthbnjhsz ksrfhys"
             },
             "amenity/library": {
                 "name": "Бібліотека",
@@ -982,8 +1192,13 @@
                 "name": "Ринок",
                 "terms": "Marketplace, hbyjr,базар,базарна площа"
             },
+            "amenity/nightclub": {
+                "name": "Нічний клуб",
+                "terms": "Nightclub, ysxybq rke"
+            },
             "amenity/parking": {
-                "name": "Автостоянка"
+                "name": "Автостоянка",
+                "terms": "стоянка, паркування, парковка, fdnjcnjzyrf"
             },
             "amenity/pharmacy": {
                 "name": "Аптека",
@@ -1030,19 +1245,28 @@
                 "terms": "Ranger Station,rjynjhf kscybwndf, лісник, лісництво"
             },
             "amenity/recycling": {
-                "name": "Переробка"
+                "name": "Переробка вторсировини",
+                "terms": "Recycling, Gththjrf dnjhcbhjdbyb, пункт прийому вторсировини"
             },
             "amenity/restaurant": {
                 "name": "Ресторан",
                 "terms": "Restaurant, htcnjhfy"
             },
             "amenity/school": {
-                "name": "Школа",
-                "terms": "School, irjkf,навчання,факультет"
+                "name": "Територія школи",
+                "terms": "School grounds, nthbnjhsz irjkb"
             },
             "amenity/shelter": {
                 "name": "Притулок"
             },
+            "amenity/social_facility": {
+                "name": "Соціальний центр",
+                "terms": "Social facility, cjwsfkmybq wtynh"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Притулок для бездомних",
+                "terms": "Homeless shelter, ghbnekjr lkz tpljvyb"
+            },
             "amenity/swimming_pool": {
                 "name": "Басейн",
                 "terms": "Swimming Pool, fctqy"
@@ -1067,14 +1291,14 @@
                 "name": "Міська державна адміністрація",
                 "terms": "Town Hall, vscmrf lthfdyf flvsyscnhfwsz, мерія,ратуша,міськвиконком"
             },
-            "amenity/university": {
-                "name": "Університет",
-                "terms": "University, eysdthcbntn"
-            },
             "amenity/vending_machine": {
                 "name": "Торговельний автомат",
                 "terms": "Vending Machine,njhujdtkmybq fdnjvfn, торгівельний автомат, торговий автомат"
             },
+            "amenity/veterinary": {
+                "name": "Ветеринарна лікарня",
+                "terms": "Veterinary, dtnthbyfhyf ksrfhyz"
+            },
             "amenity/waste_basket": {
                 "name": "Бак для сміття",
                 "terms": "Waste Basket, fr lkz cvsnnz, кошик для сміття"
@@ -1149,7 +1373,7 @@
             },
             "barrier/wall": {
                 "name": "Стіна",
-                "terms": "Wall,cnsyf"
+                "terms": "wall, cnsyf"
             },
             "boundary/administrative": {
                 "name": "Адміністративний кордон",
@@ -1163,18 +1387,50 @@
                 "name": "Житло",
                 "terms": "Apartments,bnkj"
             },
+            "building/bunker": {
+                "name": "Бункер",
+                "terms": "Bunker, eyrth"
+            },
+            "building/cathedral": {
+                "name": "Собор",
+                "terms": "Cathedral, cjjh"
+            },
+            "building/chapel": {
+                "name": "Каплиця",
+                "terms": "Chapel, rfgkbwz"
+            },
+            "building/church": {
+                "name": "Церква",
+                "terms": "Church, wthrdf"
+            },
             "building/commercial": {
                 "name": "Комерційна нерухомість",
                 "terms": "Commercial Building,rjvthwsqyf ythejvscnm"
             },
             "building/entrance": {
-                "name": "Вхід",
-                "terms": "Entrance,dsl,двері,ворота,вихід,фіртка"
+                "name": "Вхід/Вихід",
+                "terms": "Entrance, exit, dsl, dbsl"
             },
             "building/garage": {
                 "name": "Гараж",
                 "terms": "Garage,ufhf"
             },
+            "building/garages": {
+                "name": "Гаражі",
+                "terms": "Garages, ufhfs"
+            },
+            "building/greenhouse": {
+                "name": "Теплиця",
+                "terms": "Greenhouse, ntgkbwz"
+            },
+            "building/hospital": {
+                "name": "Госпіталь",
+                "terms": "Hospital, ujcgsnfkm"
+            },
+            "building/hotel": {
+                "name": "Готель",
+                "terms": "Hotel, ujntkm"
+            },
             "building/house": {
                 "name": "Дім",
                 "terms": "House,lsv,житловий будинок"
@@ -1191,12 +1447,55 @@
                 "name": "Житлова будівля",
                 "terms": "Residential Building,bnkjdf elsdkz"
             },
+            "building/retail": {
+                "name": "Роздрібна торгівля",
+                "terms": "Retail, hjplhsyf njdusdkz"
+            },
+            "building/roof": {
+                "name": "Дах",
+                "terms": "Roof, lf, накриття"
+            },
+            "building/school": {
+                "name": "Школа",
+                "terms": "School, irjkf"
+            },
+            "building/stable": {
+                "name": "Стайні",
+                "terms": "Stable, cnfqys"
+            },
+            "building/train_station": {
+                "name": "Залізнична станція",
+                "terms": "Train station, pfkspybxyf cnfywsz"
+            },
+            "building/university": {
+                "name": "Університет",
+                "terms": "University, eysdthcbntn"
+            },
+            "building/warehouse": {
+                "name": "Склад",
+                "terms": "warehouse, crkfl"
+            },
+            "craft/blacksmith": {
+                "name": "Коваль"
+            },
+            "craft/boatbuilder": {
+                "name": "Корабельня",
+                "terms": "Boat builder, rjhffkmyz"
+            },
+            "craft/electrician": {
+                "name": "Електрик"
+            },
+            "craft/hvac": {
+                "name": "Опалення, вентиляція та кондиціювання повітря",
+                "terms": "HVAC, jgfktyyz, dbynbkzwsz, rjylbwsdfyyz gjdsnhz"
+            },
+            "craft/optician": {
+                "name": "Окуліст",
+                "terms": "Optician, jrekscn"
+            },
             "craft/photographer": {
                 "name": "Фотограф"
             },
-            "craft/photographic_labratory": {
-                "name": "Фотолабораторія"
-            },
             "embankment": {
                 "name": "Насип"
             },
@@ -1212,10 +1511,6 @@
                 "name": "Телефон виклику екстрених служб",
                 "terms": "Emergency Phone,tekeajy dbrkbre trchtyb cke"
             },
-            "entrance": {
-                "name": "Вхід",
-                "terms": "Entrance,dsl,двері,ворота,вихід,фіртка"
-            },
             "footway/crossing": {
                 "name": "Перехрестя"
             },
@@ -1261,10 +1556,6 @@
                 "name": "Автомагістраль",
                 "terms": "Motorway,fdnjvfuscnhfkm"
             },
-            "highway/motorway_junction": {
-                "name": "З’єднання з автомагістраллю",
-                "terms": "Motorway Junction,plyfyyz p fdnjvfuscnhfkk, розв’язка,естакада,з’їзд,заїзд"
-            },
             "highway/motorway_link": {
                 "name": "З’їзд з/на автомагістраль",
                 "terms": "Motorway Link,ppl fdnjvfuscnhfkm,естакада,виїзд з,виїзд на,з’їзд з,з’їзд на"
@@ -1430,7 +1721,8 @@
                 "terms": "Farm,athvf"
             },
             "landuse/farmland": {
-                "name": "Сільгосп. угіддя"
+                "name": "Сільгосп. угіддя",
+                "terms": "farmland, афкьдфтв, поля, поле, сільськогосподарські угіддя"
             },
             "landuse/farmyard": {
                 "name": "Двір ферми",
@@ -1448,6 +1740,10 @@
                 "name": "Промзона",
                 "terms": "Industrial,ghjvpjyf"
             },
+            "landuse/landfill": {
+                "name": "Звалище",
+                "terms": "Landfill, Pdfkbot, смітник, свалка, мусорка, "
+            },
             "landuse/meadow": {
                 "name": "Левада",
                 "terms": "Meadow,ktdflf"
@@ -1536,10 +1832,6 @@
                 "name": "Стапель",
                 "terms": "Slipway,cnfgtkm"
             },
-            "leisure/sports_center": {
-                "name": "Спортивний центр",
-                "terms": "Sports Center,cgjhnbdybq wtynh"
-            },
             "leisure/stadium": {
                 "name": "Стадіон",
                 "terms": "Stadium,cnflsjy"
@@ -1548,10 +1840,6 @@
                 "name": "Басейн",
                 "terms": "Swimming Pool,fctqy"
             },
-            "leisure/track": {
-                "name": "Гоночний трек",
-                "terms": "Race Track,ujyjxybq nhtr, бігова доріжка"
-            },
             "line": {
                 "name": "Лінія",
                 "terms": "Line,ksysz"
@@ -1606,10 +1894,6 @@
                 "name": "Водонапірна вежа",
                 "terms": "Water Tower,djljyfgshyf dtf"
             },
-            "man_made/water_well": {
-                "name": "Колодязь",
-                "terms": "Water well,rjkjlzpm,вода"
-            },
             "man_made/water_works": {
                 "name": "Водозабір",
                 "terms": "Water Works,djljpfsh"
@@ -1700,7 +1984,7 @@
             },
             "natural/wetland": {
                 "name": "Заболочені землі",
-                "terms": "Wetland,pfjkjxtys ptvks"
+                "terms": "Wetland,pfjkjxtys ptvks, болото"
             },
             "natural/wood": {
                 "name": "Дерева",
@@ -1900,10 +2184,6 @@
                 "name": "Веломагазин",
                 "terms": "Bicycle Shop,dtkjvfufpby"
             },
-            "shop/books": {
-                "name": "Книгарня",
-                "terms": "Bookstore,rybufhyz"
-            },
             "shop/boutique": {
                 "name": "Бутік",
                 "terms": "Boutique,ensr"
@@ -1936,10 +2216,6 @@
                 "name": "Комп’ютери",
                 "terms": "Computer Store,rjvgnthb"
             },
-            "shop/confectionery": {
-                "name": "Кондитерська",
-                "terms": "Confectionery,rjylbnthcmrf, цукерки, солодощі"
-            },
             "shop/convenience": {
                 "name": "Міні-маркет",
                 "terms": "Convenience Store,vsys-vfhrtn, ларьок, магазин"
@@ -1956,10 +2232,6 @@
                 "name": "Зроби сам",
                 "terms": "DIY Store,phjb cfv"
             },
-            "shop/dry_cleaning": {
-                "name": "Хімчистка",
-                "terms": "Dry Cleaners,vsxbcnrf"
-            },
             "shop/electronics": {
                 "name": "Електроніка",
                 "terms": "Electronics Store,tktrnhjysrf"
@@ -2008,10 +2280,6 @@
                 "name": "Ювелірні прикраси",
                 "terms": "Jeweler,dtkshys ghbrhfcb"
             },
-            "shop/kiosk": {
-                "name": "Кіоск",
-                "terms": "Kiosk,rsjcr, МАФ, ларьок"
-            },
             "shop/laundry": {
                 "name": "Пральня",
                 "terms": "Laundry,ghfkmyz"
@@ -2036,18 +2304,10 @@
                 "name": "Музичний магазин",
                 "terms": "Music Store,vepbxybq vfufpby"
             },
-            "shop/newsagent": {
-                "name": "Газетний кіоск",
-                "terms": "Newsagent,ufptnybq rsjcr"
-            },
             "shop/optician": {
                 "name": "Оптика",
                 "terms": "Optician,jgnbrf"
             },
-            "shop/outdoor": {
-                "name": "Товари для активного відпочинку",
-                "terms": "Outdoor Store,njdfhb lkz frnbdyjuj dslgjxbyre, туризм, туристичне спорядження"
-            },
             "shop/pet": {
                 "name": "Товари для тварин",
                 "terms": "Pet Store,njdfhb lkz ndfhby"

vendor/assets/iD/iD/locales/yue.json

@@ -95,7 +95,6 @@
         },
         "delete": {
             "title": "刪",
-            "description": "地圖度拎走佢。",
             "annotation": {
                 "point": "刪咗處。",
                 "vertex": "道度刪咗節。",
@@ -264,7 +263,6 @@
         "percent_brightness": "{opacity}% 光",
         "none": "無",
         "custom": "自訂",
-        "custom_prompt": "入個格模。有效字符係{z}、{x}、{y}對應Z/X/Y制及{u}對應四分格制。",
         "fix_misalignment": "校正對位誤差",
         "reset": "重設"
     },
@@ -316,7 +314,6 @@
         "untagged_area": "冇籤嘅範圍",
         "many_deletions": "你要刪走物件{n}個。你真係想咁做？咁人人用開嘅公家街圖入便，都會刪走埋。",
         "tag_suggests_area": "{tag}籤話條綫係範圍，實情佢唔係。",
-        "untagged_tooltip": "揀個地貌，形容到爾一{geometry}。",
         "deprecated_tags": "廢籤：{tags}"
     },
     "zoom": {
@@ -364,7 +361,6 @@
         },
         "areas": {
             "title": "範圍",
-            "add": "範圍係更祥細講地貌。佢畀埋地貌界綫。處出地嘅地貌，範圍多數都用到，做到範圍就做範圍。**撳住範圍掣，開新範圍。**",
             "corner": "要畫範圍，就用節來勾出邊界，包住範圍。**擺開始一節，喺遊樂場一角。**",
             "place": "畫範圍，就要擺多啲節。要完成範圍，就欽返頭嗰節。**畫個範圍畀遊樂場。**",
             "search": "**搵【{name}】。**",
@@ -464,11 +460,8 @@
             "address": {
                 "label": "地埗",
                 "placeholders": {
-                    "housename": "屋名",
-                    "number": "一百二十三號",
                     "street": "街",
-                    "city": "城",
-                    "postcode": "郵政編號"
+                    "city": "城"
                 }
             },
             "admin_level": {
@@ -534,9 +527,6 @@
             "building_area": {
                 "label": "屋宇"
             },
-            "cans": {
-                "label": "收罐"
-            },
             "capacity": {
                 "label": "容納",
                 "placeholder": "50, 100, 200..."
@@ -551,9 +541,6 @@
                     "anticlockwise": "逆時針"
                 }
             },
-            "clothes": {
-                "label": "收衫"
-            },
             "collection_times": {
                 "label": "收集時間"
             },
@@ -615,9 +602,6 @@
             "generator/type": {
                 "label": "類"
             },
-            "glass": {
-                "label": "收玻璃"
-            },
             "golf_hole": {
                 "label": "參攷",
                 "placeholder": "洞數（一到十八）"
@@ -710,9 +694,6 @@
             "operator": {
                 "label": "承辦商"
             },
-            "paper": {
-                "label": "收紙"
-            },
             "par": {
                 "label": "標準桿",
                 "placeholder": "3, 4, 5..."
@@ -752,16 +733,7 @@
                 "label": "類"
             },
             "religion": {
-                "label": "宗敎",
-                "options": {
-                    "christian": "基督敎",
-                    "muslim": "囘敎",
-                    "buddhist": "佛敎",
-                    "jewish": "猶太敎",
-                    "hindu": "印度敎",
-                    "shinto": "神道敎",
-                    "taoist": "道敎"
-                }
+                "label": "宗敎"
             },
             "restriction": {
                 "label": "類"
@@ -772,9 +744,6 @@
             "route_master": {
                 "label": "類"
             },
-            "sac_scale": {
-                "label": "行徑難度"
-            },
             "service": {
                 "label": "類"
             },
@@ -818,9 +787,6 @@
             "towertype": {
                 "label": "塔類"
             },
-            "tracktype": {
-                "label": "類"
-            },
             "trail_visibility": {
                 "label": "徑明顯度"
             },
@@ -965,18 +931,10 @@
                 "name": "洗車舖",
                 "terms": "Car Wash,洗車,洗車店,洗車舖"
             },
-            "amenity/childcare": {
-                "name": "托兒所",
-                "terms": "Childcare,托兒所"
-            },
             "amenity/cinema": {
                 "name": "電影戲院",
                 "terms": "Cinema,戲院,電影,電影戲院,電影院"
             },
-            "amenity/college": {
-                "name": "學院",
-                "terms": "College,大學,大專,學院,專上學院,專校,專科學院,書院,理工"
-            },
             "amenity/courthouse": {
                 "name": "法庭",
                 "terms": "Courthouse,法庭,法院,臬署,裁判署"
@@ -1009,14 +967,6 @@
                 "name": "墳地",
                 "terms": "Graveyard,墓地,墳地,墳場"
             },
-            "amenity/hospital": {
-                "name": "醫院",
-                "terms": "Hospital,療養院,醫學中心,醫療院,醫院"
-            },
-            "amenity/kindergarten": {
-                "name": "幼稚園",
-                "terms": "Kindergarten,幼兒園,幼稚園,托兒所"
-            },
             "amenity/library": {
                 "name": "圖書館",
                 "terms": "Library,圖書館,拉記"
@@ -1081,10 +1031,6 @@
                 "name": "餐廳",
                 "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
             },
-            "amenity/school": {
-                "name": "學校",
-                "terms": "School,中學,國中,國小,學校,小學,校區,校園,高中"
-            },
             "amenity/shelter": {
                 "name": "天遮或亭",
                 "terms": "Shelter,亭,天遮,蓋,避難,避難所"
@@ -1113,10 +1059,6 @@
                 "name": "大會堂",
                 "terms": "Town Hall,大會堂,市政府,市政廳"
             },
-            "amenity/university": {
-                "name": "大學",
-                "terms": "University,大學,大專"
-            },
             "amenity/vending_machine": {
                 "name": "售賣機",
                 "terms": "Vending Machine,售賣機,自勳動賣機"
@@ -1213,10 +1155,6 @@
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
@@ -1261,10 +1199,6 @@
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "Crossing,路口"
@@ -1341,10 +1275,6 @@
                 "name": "高速公路",
                 "terms": "Motorway,高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路口",
-                "terms": "Motorway Junction,高速公路交匯處,高速公路口,高速公路連接點"
-            },
             "highway/motorway_link": {
                 "name": "高速公路駁路",
                 "terms": "Motorway Link,高速公路匝道,高速公路引道,高速公路駁路"
@@ -1621,10 +1551,6 @@
                 "name": "船排",
                 "terms": "Slipway,船排,船架滑道,船臺"
             },
-            "leisure/sports_center": {
-                "name": "體育館",
-                "terms": "Sports Center,體育,體育中心,體育館"
-            },
             "leisure/stadium": {
                 "name": "大體育館",
                 "terms": "Stadium,大體育館,體育,體育場"
@@ -1633,10 +1559,6 @@
                 "name": "游水池",
                 "terms": "Swimming Pool,游水池,游泳池,遊泳池"
             },
-            "leisure/track": {
-                "name": "賽車跑道",
-                "terms": "Race Track,賽車跑道"
-            },
             "line": {
                 "name": "綫",
                 "terms": "Line,綫,線"
@@ -1693,10 +1615,6 @@
                 "name": "水塔",
                 "terms": "Water Tower,水塔"
             },
-            "man_made/water_well": {
-                "name": "井",
-                "terms": "Water well,井,水井"
-            },
             "man_made/water_works": {
                 "name": "供水廠",
                 "terms": "Water Works,供水廠,水務設施"
@@ -2041,10 +1959,6 @@
                 "name": "單車舖",
                 "terms": "Bicycle Shop,單車店,單車舖,自行車店"
             },
-            "shop/books": {
-                "name": "書局",
-                "terms": "Bookstore,書局,書店"
-            },
             "shop/boutique": {
                 "name": "時裝店",
                 "terms": "Boutique,時裝店,服飾店,精品店"
@@ -2077,10 +1991,6 @@
                 "name": "電腦舖",
                 "terms": "Computer Store,電腦店,電腦舖"
             },
-            "shop/confectionery": {
-                "name": "糖菓舖",
-                "terms": "Confectionery,甜點店,糖菓舖"
-            },
             "shop/convenience": {
                 "name": "便利店",
                 "terms": "Convenience Store,便利店"
@@ -2097,10 +2007,6 @@
                 "name": "自組舖",
                 "terms": "DIY Store,DIY商店,自組舖"
             },
-            "shop/dry_cleaning": {
-                "name": "乾洗",
-                "terms": "Dry Cleaners,乾洗,乾洗店"
-            },
             "shop/electronics": {
                 "name": "電子舖",
                 "terms": "Electronics Store,電器店,電子舖"
@@ -2149,10 +2055,6 @@
                 "name": "珠寶金行",
                 "terms": "Jeweler,珠寶店,珠寶舖,珠寶金行,首飾店,首飾舖"
             },
-            "shop/kiosk": {
-                "name": "小賣部、報紙檔、煙仔檔等",
-                "terms": "Kiosk,售貨亭,售賣亭,報刊亭,報攤,小賣部,書報攤"
-            },
             "shop/laundry": {
                 "name": "洗衣舖",
                 "terms": "Laundry,洗衣店,洗衣舖"
@@ -2177,18 +2079,10 @@
                 "name": "唱片舖",
                 "terms": "Music Store,唱片舖,音樂店"
             },
-            "shop/newsagent": {
-                "name": "報紙檔（有舖）",
-                "terms": "Newsagent,報攤,報紙檔,書報攤"
-            },
             "shop/optician": {
                 "name": "眼鏡鋪",
                 "terms": "Optician,眼鏡店,眼鏡行,眼鏡鋪"
             },
-            "shop/outdoor": {
-                "name": "行山舖",
-                "terms": "Outdoor Store,戶外用品店,行山舖"
-            },
             "shop/pet": {
                 "name": "寵物舖",
                 "terms": "Pet Store,寵物店,寵物舖"

vendor/assets/iD/iD/locales/zh-HK.json

@@ -95,7 +95,6 @@
         },
         "delete": {
             "title": "刪",
-            "description": "地圖度拎走佢。",
             "annotation": {
                 "point": "刪咗處。",
                 "vertex": "道度刪咗節。",
@@ -260,7 +259,6 @@
         "percent_brightness": "{opacity}% 光",
         "none": "無",
         "custom": "自訂",
-        "custom_prompt": "入個格模。有效字符係{z}、{x}、{y}對應Z/X/Y制及{u}對應四分格制。",
         "fix_misalignment": "校正對位誤差",
         "reset": "重設"
     },
@@ -312,7 +310,6 @@
         "untagged_area": "冇籤嘅範圍",
         "many_deletions": "你要刪走物件{n}個。你真係想咁做？咁人人用開嘅公家街圖入便，都會刪走埋。",
         "tag_suggests_area": "{tag}籤話條綫係範圍，實情佢唔係。",
-        "untagged_tooltip": "揀個地貌，形容到爾一{geometry}。",
         "deprecated_tags": "廢籤：{tags}"
     },
     "zoom": {
@@ -360,7 +357,6 @@
         },
         "areas": {
             "title": "範圍",
-            "add": "範圍係更祥細講地貌。佢畀埋地貌界綫。處出地嘅地貌，範圍多數都用到，做到範圍就做範圍。**撳住範圍掣，開新範圍。**",
             "corner": "要畫範圍，就用節來勾出邊界，包住範圍。**擺開始一節，喺遊樂場一角。**",
             "place": "畫範圍，就要擺多啲節。要完成範圍，就欽返頭嗰節。**畫個範圍畀遊樂場。**",
             "search": "**搵【{name}】。**",
@@ -460,11 +456,8 @@
             "address": {
                 "label": "地埗",
                 "placeholders": {
-                    "housename": "屋名",
-                    "number": "一百二十三號",
                     "street": "街",
-                    "city": "城",
-                    "postcode": "郵政編號"
+                    "city": "城"
                 }
             },
             "admin_level": {
@@ -503,9 +496,6 @@
             "building_area": {
                 "label": "屋宇"
             },
-            "cans": {
-                "label": "收罐"
-            },
             "capacity": {
                 "label": "容納",
                 "placeholder": "50, 100, 200..."
@@ -520,9 +510,6 @@
                     "anticlockwise": "逆時針"
                 }
             },
-            "clothes": {
-                "label": "收衫"
-            },
             "collection_times": {
                 "label": "收集時間"
             },
@@ -581,9 +568,6 @@
             "generator/type": {
                 "label": "類"
             },
-            "glass": {
-                "label": "收玻璃"
-            },
             "golf_hole": {
                 "label": "參攷",
                 "placeholder": "洞數（一到十八）"
@@ -676,9 +660,6 @@
             "operator": {
                 "label": "承辦商"
             },
-            "paper": {
-                "label": "收紙"
-            },
             "par": {
                 "label": "標準桿",
                 "placeholder": "3, 4, 5..."
@@ -709,16 +690,7 @@
                 "label": "類"
             },
             "religion": {
-                "label": "宗敎",
-                "options": {
-                    "christian": "基督敎",
-                    "muslim": "囘敎",
-                    "buddhist": "佛敎",
-                    "jewish": "猶太敎",
-                    "hindu": "印度敎",
-                    "shinto": "神道敎",
-                    "taoist": "道敎"
-                }
+                "label": "宗敎"
             },
             "restriction": {
                 "label": "類"
@@ -729,9 +701,6 @@
             "route_master": {
                 "label": "類"
             },
-            "sac_scale": {
-                "label": "行徑難度"
-            },
             "service": {
                 "label": "類"
             },
@@ -775,9 +744,6 @@
             "towertype": {
                 "label": "塔類"
             },
-            "tracktype": {
-                "label": "類"
-            },
             "trail_visibility": {
                 "label": "徑明顯度"
             },
@@ -903,18 +869,10 @@
                 "name": "洗車舖",
                 "terms": "Car Wash,洗車,洗車店,洗車舖"
             },
-            "amenity/childcare": {
-                "name": "托兒所",
-                "terms": "Childcare,托兒所"
-            },
             "amenity/cinema": {
                 "name": "電影戲院",
                 "terms": "Cinema,戲院,電影,電影戲院,電影院"
             },
-            "amenity/college": {
-                "name": "學院",
-                "terms": "College,大學,大專,學院,專上學院,專校,專科學院,書院,理工"
-            },
             "amenity/courthouse": {
                 "name": "法庭",
                 "terms": "Courthouse,法庭,法院,臬署,裁判署"
@@ -947,14 +905,6 @@
                 "name": "墳地",
                 "terms": "Graveyard,墓地,墳地,墳場"
             },
-            "amenity/hospital": {
-                "name": "醫院",
-                "terms": "Hospital,療養院,醫學中心,醫療院,醫院"
-            },
-            "amenity/kindergarten": {
-                "name": "幼稚園",
-                "terms": "Kindergarten,幼兒園,幼稚園,托兒所"
-            },
             "amenity/library": {
                 "name": "圖書館",
                 "terms": "Library,圖書館,拉記"
@@ -1019,10 +969,6 @@
                 "name": "餐廳",
                 "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
             },
-            "amenity/school": {
-                "name": "學校",
-                "terms": "School,中學,國中,國小,學校,小學,校區,校園,高中"
-            },
             "amenity/shelter": {
                 "name": "天遮或亭",
                 "terms": "Shelter,亭,天遮,蓋,避難,避難所"
@@ -1051,10 +997,6 @@
                 "name": "大會堂",
                 "terms": "Town Hall,大會堂,市政府,市政廳"
             },
-            "amenity/university": {
-                "name": "大學",
-                "terms": "University,大學,大專"
-            },
             "amenity/vending_machine": {
                 "name": "售賣機",
                 "terms": "Vending Machine,售賣機,自勳動賣機"
@@ -1151,10 +1093,6 @@
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
@@ -1191,10 +1129,6 @@
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "Crossing,路口"
@@ -1271,10 +1205,6 @@
                 "name": "高速公路",
                 "terms": "Motorway,高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路口",
-                "terms": "Motorway Junction,高速公路交匯處,高速公路口,高速公路連接點"
-            },
             "highway/motorway_link": {
                 "name": "高速公路駁路",
                 "terms": "Motorway Link,高速公路匝道,高速公路引道,高速公路駁路"
@@ -1551,10 +1481,6 @@
                 "name": "船排",
                 "terms": "Slipway,船排,船架滑道,船臺"
             },
-            "leisure/sports_center": {
-                "name": "體育館",
-                "terms": "Sports Center,體育,體育中心,體育館"
-            },
             "leisure/stadium": {
                 "name": "大體育館",
                 "terms": "Stadium,大體育館,體育,體育場"
@@ -1563,10 +1489,6 @@
                 "name": "游水池",
                 "terms": "Swimming Pool,游水池,游泳池,遊泳池"
             },
-            "leisure/track": {
-                "name": "賽車跑道",
-                "terms": "Race Track,賽車跑道"
-            },
             "line": {
                 "name": "綫",
                 "terms": "Line,綫,線"
@@ -1623,10 +1545,6 @@
                 "name": "水塔",
                 "terms": "Water Tower,水塔"
             },
-            "man_made/water_well": {
-                "name": "井",
-                "terms": "Water well,井,水井"
-            },
             "man_made/water_works": {
                 "name": "供水廠",
                 "terms": "Water Works,供水廠,水務設施"
@@ -1967,10 +1885,6 @@
                 "name": "單車舖",
                 "terms": "Bicycle Shop,單車店,單車舖,自行車店"
             },
-            "shop/books": {
-                "name": "書局",
-                "terms": "Bookstore,書局,書店"
-            },
             "shop/boutique": {
                 "name": "時裝店",
                 "terms": "Boutique,時裝店,服飾店,精品店"
@@ -2003,10 +1917,6 @@
                 "name": "電腦舖",
                 "terms": "Computer Store,電腦店,電腦舖"
             },
-            "shop/confectionery": {
-                "name": "糖菓舖",
-                "terms": "Confectionery,甜點店,糖菓舖"
-            },
             "shop/convenience": {
                 "name": "便利店",
                 "terms": "Convenience Store,便利店"
@@ -2023,10 +1933,6 @@
                 "name": "自組舖",
                 "terms": "DIY Store,DIY商店,自組舖"
             },
-            "shop/dry_cleaning": {
-                "name": "乾洗",
-                "terms": "Dry Cleaners,乾洗,乾洗店"
-            },
             "shop/electronics": {
                 "name": "電子舖",
                 "terms": "Electronics Store,電器店,電子舖"
@@ -2075,10 +1981,6 @@
                 "name": "珠寶金行",
                 "terms": "Jeweler,珠寶店,珠寶舖,珠寶金行,首飾店,首飾舖"
             },
-            "shop/kiosk": {
-                "name": "小賣部、報紙檔、煙仔檔等",
-                "terms": "Kiosk,售貨亭,售賣亭,報刊亭,報攤,小賣部,書報攤"
-            },
             "shop/laundry": {
                 "name": "洗衣舖",
                 "terms": "Laundry,洗衣店,洗衣舖"
@@ -2103,18 +2005,10 @@
                 "name": "唱片舖",
                 "terms": "Music Store,唱片舖,音樂店"
             },
-            "shop/newsagent": {
-                "name": "報紙檔（有舖）",
-                "terms": "Newsagent,報攤,報紙檔,書報攤"
-            },
             "shop/optician": {
                 "name": "眼鏡鋪",
                 "terms": "Optician,眼鏡店,眼鏡行,眼鏡鋪"
             },
-            "shop/outdoor": {
-                "name": "行山舖",
-                "terms": "Outdoor Store,戶外用品店,行山舖"
-            },
             "shop/pet": {
                 "name": "寵物舖",
                 "terms": "Pet Store,寵物店,寵物舖"

vendor/assets/iD/iD/locales/zh.json

@@ -75,7 +75,6 @@
         },
         "delete": {
             "title": "删除",
-            "description": "从地图中删除此。",
             "annotation": {
                 "point": "删除一个点。",
                 "vertex": "删除线上一个结点。",
@@ -310,7 +309,6 @@
         },
         "areas": {
             "title": "面。",
-            "add": "面能较详细地代表物件，提供该物件的边界资料。大部份以点可以代表的物件类别，都可以用区域代表，而后者往往更为适合。 **点击「区域」按钮，以新增一个新面**",
             "corner": "透过将节点放到面的边界上，可绘制面。 **将起始节点置于游乐场的其中一角**",
             "place": "放置更多节点，以勾画该面。点击起始节点以完成绘制面。 **绘制一区域以代表游乐场**",
             "search": "**搜寻'{名称}'。**",
@@ -393,11 +391,8 @@
             "address": {
                 "label": "地址",
                 "placeholders": {
-                    "housename": "房屋名称",
-                    "number": "123",
                     "street": "街道",
-                    "city": "城市",
-                    "postcode": "邮政编码"
+                    "city": "城市"
                 }
             },
             "admin_level": {
@@ -585,23 +580,11 @@
                 "label": "类型"
             },
             "religion": {
-                "label": "宗教",
-                "options": {
-                    "christian": "基督教",
-                    "muslim": "穆斯林",
-                    "buddhist": "佛教",
-                    "jewish": "犹太教",
-                    "hindu": "印度教",
-                    "shinto": "神道教",
-                    "taoist": "道教"
-                }
+                "label": "宗教"
             },
             "route": {
                 "label": "类型"
             },
-            "sac_scale": {
-                "label": "路径难度"
-            },
             "service": {
                 "label": "类型"
             },
@@ -639,9 +622,6 @@
             "towertype": {
                 "label": "塔型"
             },
-            "tracktype": {
-                "label": "类型"
-            },
             "trail_visibility": {
                 "label": "路径可见度"
             },
@@ -729,9 +709,6 @@
             "amenity/cinema": {
                 "name": "电影院"
             },
-            "amenity/college": {
-                "name": "学院"
-            },
             "amenity/courthouse": {
                 "name": "法院"
             },
@@ -753,12 +730,6 @@
             "amenity/grave_yard": {
                 "name": "墓地"
             },
-            "amenity/hospital": {
-                "name": "医院"
-            },
-            "amenity/kindergarten": {
-                "name": "幼儿园"
-            },
             "amenity/library": {
                 "name": "图书馆"
             },
@@ -795,9 +766,6 @@
             "amenity/restaurant": {
                 "name": "餐馆"
             },
-            "amenity/school": {
-                "name": "学校"
-            },
             "amenity/swimming_pool": {
                 "name": "游泳池"
             },
@@ -813,9 +781,6 @@
             "amenity/townhall": {
                 "name": "市政府"
             },
-            "amenity/university": {
-                "name": "大学"
-            },
             "amenity/waste_basket": {
                 "name": "垃圾箱"
             },
@@ -882,18 +847,12 @@
             "building/apartments": {
                 "name": "酒店公寓"
             },
-            "building/entrance": {
-                "name": "入口"
-            },
             "building/house": {
                 "name": "房屋"
             },
             "emergency/phone": {
                 "name": "紧急电话"
             },
-            "entrance": {
-                "name": "入口"
-            },
             "highway": {
                 "name": "公路"
             },
@@ -921,9 +880,6 @@
             "highway/motorway": {
                 "name": "高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路连接点"
-            },
             "highway/motorway_link": {
                 "name": "高速公路匝道"
             },
@@ -1155,9 +1111,6 @@
             "man_made/water_tower": {
                 "name": "水塔"
             },
-            "man_made/water_well": {
-                "name": "水井"
-            },
             "man_made/water_works": {
                 "name": "水务设施"
             },
@@ -1320,9 +1273,6 @@
             "shop/bicycle": {
                 "name": "自行车店"
             },
-            "shop/books": {
-                "name": "书店"
-            },
             "shop/boutique": {
                 "name": "精品店"
             },
@@ -1347,9 +1297,6 @@
             "shop/computer": {
                 "name": "电脑店"
             },
-            "shop/confectionery": {
-                "name": "甜点店"
-            },
             "shop/convenience": {
                 "name": "便利店"
             },
@@ -1362,9 +1309,6 @@
             "shop/doityourself": {
                 "name": "DIY商店"
             },
-            "shop/dry_cleaning": {
-                "name": "干洗店"
-            },
             "shop/electronics": {
                 "name": "电器店"
             },
@@ -1398,9 +1342,6 @@
             "shop/jewelry": {
                 "name": "珠宝店"
             },
-            "shop/kiosk": {
-                "name": "报刊亭"
-            },
             "shop/laundry": {
                 "name": "洗衣店"
             },
@@ -1416,15 +1357,9 @@
             "shop/music": {
                 "name": "音乐店"
             },
-            "shop/newsagent": {
-                "name": "报摊"
-            },
             "shop/optician": {
                 "name": "眼镜店"
             },
-            "shop/outdoor": {
-                "name": "户外用品店"
-            },
             "shop/pet": {
                 "name": "宠物店"
             },

vendor/assets/leaflet/leaflet.js

@@ -7,7 +7,7 @@
 var oldL = window.L,
     L = {};
 
-L.version = '0.7.2';
+L.version = '0.7.3';
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -2104,13 +2104,13 @@ L.Map = L.Class.extend({
 		var loading = !this._loaded;
 		this._loaded = true;
 
+		this.fire('viewreset', {hard: !preserveMapOffset});
+
 		if (loading) {
 			this.fire('load');
 			this.eachLayer(this._layerAdd, this);
 		}
 
-		this.fire('viewreset', {hard: !preserveMapOffset});
-
 		this.fire('move');
 
 		if (zoomChanged || afterZoomAnim) {
@@ -5083,7 +5083,8 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
 		}
 
 		this._requestUpdate();
-
+		
+		this.fire('remove');
 		this._map = null;
 	},
 
@@ -6605,12 +6606,12 @@ L.DomEvent = {
 		var timeStamp = (e.timeStamp || e.originalEvent.timeStamp),
 			elapsed = L.DomEvent._lastClick && (timeStamp - L.DomEvent._lastClick);
 
-		// are they closer together than 1000ms yet more than 100ms?
+		// are they closer together than 500ms yet more than 100ms?
 		// Android typically triggers them ~300ms apart while multiple listeners
 		// on the same event should be triggered far faster;
 		// or check if click is simulated on the element, and if it is, reject any non-simulated events
 
-		if ((elapsed && elapsed > 100 && elapsed < 1000) || (e.target._simulatedClick && !e._simulated)) {
+		if ((elapsed && elapsed > 100 && elapsed < 500) || (e.target._simulatedClick && !e._simulated)) {
 			L.DomEvent.stop(e);
 			return;
 		}
@@ -6708,6 +6709,7 @@ L.Draggable = L.Class.extend({
 		    offset = newPoint.subtract(this._startPoint);
 
 		if (!offset.x && !offset.y) { return; }
+		if (L.Browser.touch && Math.abs(offset.x) + Math.abs(offset.y) < 3) { return; }
 
 		L.DomEvent.preventDefault(e);
 
@@ -6718,7 +6720,8 @@ L.Draggable = L.Class.extend({
 			this._startPos = L.DomUtil.getPosition(this._element).subtract(offset);
 
 			L.DomUtil.addClass(document.body, 'leaflet-dragging');
-			L.DomUtil.addClass((e.target || e.srcElement), 'leaflet-drag-target');
+			this._lastTarget = e.target || e.srcElement;
+			L.DomUtil.addClass(this._lastTarget, 'leaflet-drag-target');
 		}
 
 		this._newPos = this._startPos.add(offset);
@@ -6734,9 +6737,13 @@ L.Draggable = L.Class.extend({
 		this.fire('drag');
 	},
 
-	_onUp: function (e) {
+	_onUp: function () {
 		L.DomUtil.removeClass(document.body, 'leaflet-dragging');
-		L.DomUtil.removeClass((e.target || e.srcElement), 'leaflet-drag-target');
+
+		if (this._lastTarget) {
+			L.DomUtil.removeClass(this._lastTarget, 'leaflet-drag-target');
+			this._lastTarget = null;
+		}
 
 		for (var i in L.Draggable.MOVE) {
 			L.DomEvent
@@ -7391,7 +7398,7 @@ L.Map.TouchZoom = L.Handler.extend({
 		    center = map.layerPointToLatLng(origin),
 		    zoom = map.getScaleZoom(this._scale);
 
-		map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta);
+		map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta, false, true);
 	},
 
 	_onTouchEnd: function () {
@@ -8376,8 +8383,8 @@ L.Control.Layers = L.Control.extend({
 
 	onRemove: function (map) {
 		map
-		    .off('layeradd', this._onLayerChange)
-		    .off('layerremove', this._onLayerChange);
+		    .off('layeradd', this._onLayerChange, this)
+		    .off('layerremove', this._onLayerChange, this);
 	},
 
 	addBaseLayer: function (layer, name) {
@@ -8918,9 +8925,11 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 		return true;
 	},
 
-	_animateZoom: function (center, zoom, origin, scale, delta, backwards) {
+	_animateZoom: function (center, zoom, origin, scale, delta, backwards, forTouchZoom) {
 
-		this._animatingZoom = true;
+		if (!forTouchZoom) {
+			this._animatingZoom = true;
+		}
 
 		// put transform transition on all layers with leaflet-zoom-animated class
 		L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim');
@@ -8934,14 +8943,16 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 			L.Draggable._disabled = true;
 		}
 
-		this.fire('zoomanim', {
-			center: center,
-			zoom: zoom,
-			origin: origin,
-			scale: scale,
-			delta: delta,
-			backwards: backwards
-		});
+		L.Util.requestAnimFrame(function () {
+			this.fire('zoomanim', {
+				center: center,
+				zoom: zoom,
+				origin: origin,
+				scale: scale,
+				delta: delta,
+				backwards: backwards
+			});
+		}, this);
 	},
 
 	_onZoomTransitionEnd: function () {

vendor/assets/leaflet/leaflet.locate.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2013 Dominik Moritz
+Copyright (c) 2014 Dominik Moritz
 
 This file is part of the leaflet locate control. It is licensed under the MIT license.
 You can find the project at: https://github.com/domoritz/leaflet-locatecontrol
@@ -34,6 +34,8 @@ L.Control.Locate = L.Control.extend({
             //color: '#FFA500',
             //fillColor: '#FFB000'
         },
+        icon: 'icon-location',  // icon-location or icon-direction
+        iconLoading: 'icon-spinner animate-spin',
         circlePadding: [0, 0],
         metric: true,
         onLocationError: function(err) {
@@ -41,17 +43,23 @@ L.Control.Locate = L.Control.extend({
             // that is not a time out error.
             alert(err.message);
         },
-        onLocationOutsideMapBounds: function(context) {
+        onLocationOutsideMapBounds: function(control) {
             // this event is repeatedly called when the location changes
+            control.stopLocate();
             alert(context.options.strings.outsideMapBoundsMsg);
         },
         setView: true, // automatically sets the map view to the user's location
+        // keep the current map zoom level when displaying the user's location. (if 'false', use maxZoom)
+        keepCurrentZoomLevel: false,
         strings: {
             title: "Show me where I am",
             popup: "You are within {distance} {unit} from this point",
             outsideMapBoundsMsg: "You seem located outside the boundaries of the map"
         },
-        locateOptions: {}
+        locateOptions: {
+            maxZoom: Infinity,
+            watch: true  // if you overwrite this, visualization cannot be updated
+        }
     },
 
     onAdd: function (map) {
@@ -62,9 +70,7 @@ L.Control.Locate = L.Control.extend({
         this._layer.addTo(map);
         this._event = undefined;
 
-        this._locateOptions = {
-            watch: true  // if you overwrite this, visualization cannot be updated
-        };
+        this._locateOptions = this.options.locateOptions;
         L.extend(this._locateOptions, this.options.locateOptions);
         L.extend(this._locateOptions, {
             setView: false // have to set this to false because we have to
@@ -79,7 +85,7 @@ L.Control.Locate = L.Control.extend({
         L.extend(tmp, this.options.circleStyle, this.options.followCircleStyle);
         this.options.followCircleStyle = tmp;
 
-        var link = L.DomUtil.create('a', 'control-button', container);
+        var link = L.DomUtil.create('a', 'control-button ' + this.options.icon, container);
         link.innerHTML = "<span class='icon geolocate'></span>";
         link.href = '#';
         link.title = this.options.strings.title;
@@ -88,7 +94,7 @@ L.Control.Locate = L.Control.extend({
             .on(link, 'click', L.DomEvent.stopPropagation)
             .on(link, 'click', L.DomEvent.preventDefault)
             .on(link, 'click', function() {
-                if (self._active && (map.getBounds().contains(self._event.latlng) || !self.options.setView ||
+                if (self._active && (self._event === undefined || map.getBounds().contains(self._event.latlng) || !self.options.setView ||
                     isOutsideMapBounds())) {
                     stopLocate();
                 } else {
@@ -109,9 +115,7 @@ L.Control.Locate = L.Control.extend({
                 startFollowing();
             }
             if (!self._event) {
-                L.DomUtil.addClass(self._container, "requesting");
-                L.DomUtil.removeClass(self._container, "active");
-                L.DomUtil.removeClass(self._container, "following");
+                setClasses('requesting');
             } else {
                 visualizeLocation();
             }
@@ -140,7 +144,7 @@ L.Control.Locate = L.Control.extend({
         };
 
         var startFollowing = function() {
-            map.fire('startfollowing');
+            map.fire('startfollowing', self);
             self._following = true;
             if (self.options.stopFollowingOnDrag) {
                 map.on('dragstart', stopFollowing);
@@ -148,7 +152,7 @@ L.Control.Locate = L.Control.extend({
         };
 
         var stopFollowing = function() {
-            map.fire('stopfollowing');
+            map.fire('stopfollowing', self);
             self._following = false;
             if (self.options.stopFollowingOnDrag) {
                 map.off('dragstart', stopFollowing);
@@ -172,7 +176,10 @@ L.Control.Locate = L.Control.extend({
                 if (isOutsideMapBounds()) {
                     self.options.onLocationOutsideMapBounds(self);
                 } else {
-                    map.fitBounds(self._event.bounds, { padding: self.options.circlePadding });
+                    map.fitBounds(self._event.bounds, {
+                        padding: self.options.circlePadding,
+                        maxZoom: self.options.keepCurrentZoomLevel ? map.getZoom() : self._locateOptions.maxZoom
+                    });
                 }
                 self._locateOnNextLocationFound = false;
             }
@@ -231,16 +238,34 @@ L.Control.Locate = L.Control.extend({
             if (!self._container)
                 return;
             if (self._following) {
-                L.DomUtil.removeClass(self._container, "requesting");
-                L.DomUtil.addClass(self._container, "active");
-                L.DomUtil.addClass(self._container, "following");
+                setClasses('following');
             } else {
-                L.DomUtil.removeClass(self._container, "requesting");
-                L.DomUtil.addClass(self._container, "active");
-                L.DomUtil.removeClass(self._container, "following");
+                setClasses('active');
             }
         };
 
+        var setClasses = function(state) {
+            if (state == 'requesting') {
+                L.DomUtil.removeClasses(self._container, "active following");
+                L.DomUtil.addClasses(self._container, "requesting");
+
+                L.DomUtil.removeClasses(link, self.options.icon);
+                L.DomUtil.addClasses(link, self.options.iconLoading);
+            } else if (state == 'active') {
+                L.DomUtil.removeClasses(self._container, "requesting following");
+                L.DomUtil.addClasses(self._container, "active");
+
+                L.DomUtil.removeClasses(link, self.options.iconLoading);
+                L.DomUtil.addClasses(link, self.options.icon);
+            } else if (state == 'following') {
+                L.DomUtil.removeClasses(self._container, "requesting");
+                L.DomUtil.addClasses(self._container, "active following");
+
+                L.DomUtil.removeClasses(link, self.options.iconLoading);
+                L.DomUtil.addClasses(link, self.options.icon);
+            }
+        }
+
         var resetVariables = function() {
             self._active = false;
             self._locateOnNextLocationFound = self.options.setView;
@@ -252,6 +277,9 @@ L.Control.Locate = L.Control.extend({
         var stopLocate = function() {
             map.stopLocate();
             map.off('dragstart', stopFollowing);
+            if (self.options.follow && self._following) {
+                stopFollowing();
+            }
 
             L.DomUtil.removeClass(self._container, "requesting");
             L.DomUtil.removeClass(self._container, "active");
@@ -265,7 +293,7 @@ L.Control.Locate = L.Control.extend({
 
         var onLocationError = function (err) {
             // ignore time out error if the location is watched
-            if (err.code == 3 && this._locateOptions.watch) {
+            if (err.code == 3 && self._locateOptions.watch) {
                 return;
             }
 
@@ -296,3 +324,17 @@ L.Map.addInitHook(function () {
 L.control.locate = function (options) {
     return new L.Control.Locate(options);
 };
+
+(function(){
+  // leaflet.js raises bug when trying to addClass / removeClass multiple classes at once
+  // Let's create a wrapper on it which fixes it.
+  var LDomUtilApplyClassesMethod = function(method, element, classNames) {
+    classNames = classNames.split(' ');
+    classNames.forEach(function(className) {
+        L.DomUtil[method].call(this, element, className);
+    });
+  };
+
+  L.DomUtil.addClasses = function(el, names) { LDomUtilApplyClassesMethod('addClass', el, names); }
+  L.DomUtil.removeClasses = function(el, names) { LDomUtilApplyClassesMethod('removeClass', el, names); }
+})();

vendor/assets/leaflet/leaflet.locationfilter.js

@@ -100,7 +100,8 @@ L.LocationFilter = L.Class.extend({
         },
         adjustButton: {
             text: "Select area within current zoom"
-        }
+        },
+        buttonPosition: 'topleft'
     },
 
     initialize: function(options) {
@@ -468,7 +469,10 @@ L.LocationFilter = L.Class.extend({
        toggles the location filter */
     _initializeButtonContainer: function() {
         var that = this;
-        this._buttonContainer = new L.Control.ButtonContainer({className: "location-filter button-container"});
+        this._buttonContainer = new L.Control.ButtonContainer({
+	    className: "location-filter button-container",
+	    position: this.options.buttonPosition
+	});
 
         if (this.options.enableButton) {
             this._enableButton = new L.Control.Button({

vendor/assets/leaflet/leaflet.osm.js

@@ -25,15 +25,15 @@ L.OSM.Mapnik = L.OSM.TileLayer.extend({
 
 L.OSM.CycleMap = L.OSM.TileLayer.extend({
   options: {
-    url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png',
-    attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>"
+    url: 'http://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png',
+    attribution: "Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>"
   }
 });
 
 L.OSM.TransportMap = L.OSM.TileLayer.extend({
   options: {
-    url: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png',
-    attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>"
+    url: 'http://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png',
+    attribution: "Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>"
   }
 });