Localisation updates from https://translatewiki.net.

config/locales/af.yml

@@ -202,10 +202,8 @@ af:
     search_osm_nominatim:
       prefix:
         amenity:
-          airport: Lughawe
           arts_centre: Kunssentrum
           atm: OTM
-          auditorium: Ouditorium
           bank: Bank
           bar: Kroeg
           bench: Bank
@@ -220,7 +218,6 @@ af:
           casino: Casino
           cinema: Bioskoop
           clinic: Kliniek
-          club: Klub
           college: Kollege
           community_centre: Gemeenskap-sentrum
           courthouse: Hof
@@ -239,10 +236,8 @@ af:
           fountain: Fontein
           fuel: Brandstof
           grave_yard: Begraafplaas
-          hall: Saal
           health_centre: Gesondheidsentrum
           hospital: Hospitaal
-          hotel: Hotel
           hunting_stand: Jagtoring
           ice_cream: Roomys
           kindergarten: Kleuterskool
@@ -253,7 +248,6 @@ af:
           nursery: Kleuterskool
           nursing_home: Verpleeghuis
           office: Kantoor
-          park: Park
           parking: Parkade
           pharmacy: Apteek
           place_of_worship: Plek van aanbidding
@@ -264,7 +258,6 @@ af:
           prison: Tronk
           pub: Kroeg
           public_building: Openbare gebou
-          public_market: Openbare mark
           reception_area: Ontvangsarea
           recycling: Herwinningspunt
           restaurant: Restaurant
@@ -273,10 +266,8 @@ af:
           school: Skool
           shelter: Skuiling
           shop: Winkel
-          shopping: Inkopies
           social_club: Sosiale klub
           studio: Studio
-          supermarket: Supermark
           taxi: Taxi
           telephone: Openbare telefoon
           theatre: Teater
@@ -285,7 +276,6 @@ af:
           university: Universiteit
           veterinary: Veearts
           waste_basket: Asblik
-          wifi: WiFi-toegang
           youth_centre: Jeugsentrum
         boundary:
           administrative: Administratiewe grens
@@ -314,7 +304,6 @@ af:
           service: Dienspad
           services: Snelweg Dienste
           steps: Trappe
-          stile: Oorstap
           tertiary: Tersiêre pad
           track: Spoor
           trail: Wandelpad
@@ -334,7 +323,6 @@ af:
           memorial: Herdenkingsmonument
           mine: Myn
           monument: Monument
-          museum: Museum
           ruins: Ruïnes
           tower: Toring
           wayside_cross: Kruis langs die pad
@@ -354,16 +342,12 @@ af:
           landfill: Stortingsterrein
           military: Militêre gebied
           mine: Myn
-          nature_reserve: Natuurreservaat
-          park: Park
           quarry: Steengroewe
           railway: Spoor
           reservoir: Reservoir
           residential: Woongebied
           retail: Kleinhandel
           vineyard: Wingerd
-          wetland: Vleiland
-          wood: Bos
         leisure:
           beach_resort: Strandoort
           fishing: Visvangarea
@@ -386,10 +370,8 @@ af:
           beach: Strand
           cape: Kaap
           cave_entrance: Grotingang
-          channel: Kanaal
           cliff: Kloof
           crater: Krater
-          feature: Besienswaardigheid
           fjord: Fjord
           geyser: Geiser
           glacier: Gletser
@@ -403,11 +385,9 @@ af:
           point: Punt
           reef: Rif
           ridge: Bergkam
-          river: Rivier
           rock: Rotse
           scree: Puin
           scrub: Struikgewas
-          shoal: Sandbank
           spring: Bron
           strait: Seestraat
           tree: Boom
@@ -415,7 +395,6 @@ af:
           volcano: Vulkaan
           water: Water
           wetland: Moeras
-          wetlands: Moeras
           wood: Bos
         place:
           airport: Lughawe
@@ -530,31 +509,25 @@ af:
           hostel: Hotel
           hotel: Hotel
           information: Inligting
-          lean_to: Leer om
           motel: Motel
           museum: Museum
           picnic_site: Piekniekplek
           theme_park: Pretpark
-          valley: Vallei
           viewpoint: Uitkykpunt
           zoo: Dieretuin
         waterway:
           boatyard: Skeepswerf
           canal: Kanaal
-          connector: Waterverbinding
           dam: Dam
           ditch: Sloot
           dock: Dokke
           drain: Afvoerkanaal
           lock: Sluis
           lock_gate: Sluisdeur
-          mineral_spring: Minerale bron
           rapids: Stroomversnelling
           river: Rivier
-          riverbank: Rivierbedding
           stream: Stroom
           waterfall: Waterval
-          water_point: Waterpunt
     description:
       title:
         geonames: Ligging vanaf <a href="http://www.geonames.org/">GeoNames</a>

config/locales/aln.yml

@@ -247,10 +247,8 @@ aln:
     search_osm_nominatim:
       prefix:
         amenity:
-          airport: Airoport
           arts_centre: Art Qendra
           atm: Bankomat
-          auditorium: sallë muzikë
           bank: Banka
           bar: Bar
           bench: Stol
@@ -266,7 +264,6 @@ aln:
           casino: Kazino
           cinema: Kinema
           clinic: Klinikë
-          club: Klub
           college: Kolegj
           community_centre: ndërtimin e qendrës së komunitetit
           courthouse: Ndërtesë e gjyqit
@@ -286,22 +283,18 @@ aln:
           fuel: Lëndë djegëse
           grave_yard: Varrezë
           gym: Qendra Kalitje fizike / palestër
-          hall: Sallë
           health_centre: Qendër e Shëndetësore
           hospital: Spital
-          hotel: Hotel
           hunting_stand: Gjuetia Stand
           ice_cream: Akullore
           kindergarten: Kopshti i fëmijëve
           library: Bibliotekë
           market: Treg
           marketplace: Treg
-          mountain_rescue: jashtëzakonshme mal shpëtimit
           nightclub: Night Club
           nursery: Fidanishte
           nursing_home: shtëpi pleqsh
           office: Zyrë
-          park: Park
           parking: Parking
           pharmacy: Barnatore
           place_of_worship: Vendi i Adhurimi
@@ -312,7 +305,6 @@ aln:
           prison: Burg
           pub: Pijetore
           public_building: Publike Ndërtimi
-          public_market: Tregu Publik
           reception_area: Zona e pritjes
           recycling: Pika riciklimit
           restaurant: Restorant
@@ -321,10 +313,8 @@ aln:
           school: Shkoll
           shelter: Strehim
           shop: Shitore
-          shopping: Pazar
           social_club: klub shoqërore
           studio: Studio
-          supermarket: Supermarket
           taxi: Taxi
           telephone: Telefon Publik
           theatre: Teatër
@@ -335,7 +325,6 @@ aln:
           veterinary: Kirurgji Veterinare
           village_hall: Fshati Hall
           waste_basket: Mbeturinat Shporta
-          wifi: WiFi Hyrje
           youth_centre: Qendër Rinore
         boundary:
           administrative: Administrative kufitare
@@ -345,14 +334,12 @@ aln:
           bridleway: Rruge pa osfallt
           bus_guideway: Lane udhëzoi Autobuseve
           bus_stop: Stacion i autobusave
-          byway: Rruge ansore
           construction: Highway nën ndërtim
           cycleway: Rruge per biciklla
           emergency_access_point: Pike Hyrje e urgjencës
           footway: Rrugë e kambsorve
           ford: Fiord
           living_street: rrugës ku njerëzit jetojnë
-          minor: rrugë të vogla
           motorway: Autostradë
           motorway_junction: Kryqzim per rruge te motorrave
           motorway_link: rrugë autostradë
@@ -369,7 +356,6 @@ aln:
           service: Rruge sherbimi
           services: Autostradë Sherbime
           steps: Hapat
-          stile: Hekur
           tertiary: Rruge tericiere
           track: Udhë
           trail: Shteg
@@ -390,7 +376,6 @@ aln:
           memorial: Përkujtim
           mine: Imi
           monument: Monument
-          museum: Muze
           ruins: Gërmadhe
           tower: Kullë
           wayside_cross: Buzë rruge Kryqi
@@ -415,9 +400,6 @@ aln:
           meadow: Livadh
           military: Zonë Ushtarake
           mine: Imi
-          nature_reserve: Natyra Rezervat
-          park: Park
-          piste: Piste
           quarry: Gurore
           railway: Hekurudhor
           recreation_ground: Zbavitje Ground
@@ -426,8 +408,6 @@ aln:
           retail: Me pakicë
           village_green: Fshati Green
           vineyard: Vresht
-          wetland: Ligatinore
-          wood: Druri
         leisure:
           beach_resort: hoteli në plazh
           common: Toke e njejte
@@ -453,10 +433,8 @@ aln:
           beach: Pllazh
           cape: Kep
           cave_entrance: Shpella Hyrja
-          channel: Kanal
           cliff: Shkamb
           crater: Krater
-          feature: Veçuni
           fell: Moqal
           fjord: Fiord
           geyser: Gejzer
@@ -472,11 +450,9 @@ aln:
           point: Pike
           reef: shkambinj nënujore
           ridge: Kreshtë
-          river: Lum
           rock: Gur
           scree: Rrëpirë me gurë të rrzum
           scrub: Kaçubë
-          shoal: Cekt
           spring: Pranverë
           strait: Ngushticë
           tree: Pemë
@@ -484,7 +460,6 @@ aln:
           volcano: Vullkan
           water: Ujë
           wetland: Lagunat
-          wetlands: Lagunat
           wood: Dru
         place:
           airport: Aeroport
@@ -531,7 +506,6 @@ aln:
           switch: Hekurudhave Pikët
           tram: Tramvajëve
           tram_stop: Tramvaj Stop
-          yard: depo stacioni hekurudhor
         shop:
           alcohol: kiosk
           art: Shitore e kafshëve
@@ -613,18 +587,15 @@ aln:
           hostel: Bujtine
           hotel: Hotel
           information: Informacione
-          lean_to: Strehore
           motel: Motel
           museum: Muze
           picnic_site: Vend per Piknik
           theme_park: Park i lojnave
-          valley: Lugine
           viewpoint: Pike shikimi
           zoo: Kopsht Zoologjik
         waterway:
           boatyard: Kantier detar
           canal: Kanal
-          connector: lidhës lumë i lundrueshëm
           dam: Pendë
           derelict_canal: Kanali i braktisur
           ditch: Hendek
@@ -632,15 +603,12 @@ aln:
           drain: Kullon
           lock: Bllokoj
           lock_gate: Mbylle Porta
-          mineral_spring: ujë mineral burim
           mooring: Ankorim
           rapids: Pragje të lumit
           river: Lum
-          riverbank: banka e lumit
           stream: Lumë
           wadi: luginë
           waterfall: Ujëvarë
-          water_point: Pika e ujit
           weir: Pendë
     description:
       title:

config/locales/ar.yml

@@ -365,11 +365,8 @@ ar:
           taxiway: مدرج المناورات
           terminal: صالة مطار
         amenity:
-          airport: مطار
           arts_centre: مركز فني/ثقافي
-          artwork: عمل فني
           atm: صراف آلي
-          auditorium: قاعة محاضرات
           bank: مصرف
           bar: حانة
           bbq: مشوى
@@ -388,7 +385,6 @@ ar:
           charging_station: محطة تعبئة
           cinema: سينما
           clinic: عيادة
-          club: نادي
           college: كلّية
           community_centre: مركز اجتماع
           courthouse: محكمة
@@ -409,22 +405,18 @@ ar:
           fuel: وقود
           grave_yard: مقبرة
           gym: مركز للرشاقة/الرياضة
-          hall: قاعة
           health_centre: مركز صحي
           hospital: مستشفى
-          hotel: فندق
           hunting_stand: مربط للصيد
           ice_cream: مثلجات
           kindergarten: حضانة أطفال
           library: مكتبة
           market: سوق
           marketplace: سوق
-          mountain_rescue: للإنقاذ في الجبل
           nightclub: نادي ليلي
           nursery: رعاية تمريضية
           nursing_home: دار رعاية مسنين/معاقين
           office: مكتب
-          park: منتزه
           parking: موقف سيارات
           pharmacy: صيدلية
           place_of_worship: معبد
@@ -435,7 +427,6 @@ ar:
           prison: سجن
           pub: حانة
           public_building: مبنى عام
-          public_market: سوق عمومي
           reception_area: منطقة استقبال
           recycling: نقطة إعادة تصنيع
           restaurant: مطعم
@@ -444,13 +435,11 @@ ar:
           school: مدرسة
           shelter: ملجأ
           shop: متجر/دكان/حانوت
-          shopping: التسوق
           shower: غسيل بالدش
           social_centre: مركز إجتماعي
           social_club: نادي اجتماعي
           social_facility: مرفق اجتماعي
           studio: ستوديو
-          supermarket: سوبرماركت
           swimming_pool: مسبح
           taxi: سيارة أجرة
           telephone: هاتف عمومي
@@ -462,8 +451,6 @@ ar:
           veterinary: جراحة بيطرية
           village_hall: مبنى/دار القرية
           waste_basket: سلة نفايات
-          wifi: نقطة إتصال لاسلكية
-          WLAN: نقطة إتصال لاسلكية
           youth_centre: مركز نشاطات للشباب
         boundary:
           administrative: حدود إدارية
@@ -479,13 +466,11 @@ ar:
         building:
           "yes": مبنى
         emergency:
-          fire_hydrant: صنبور مياه الإطفاء
           phone: هاتف طوارئ
         highway:
           bridleway: مسلك خيول
           bus_guideway: مسار خاص للحافلات
           bus_stop: موقف حافلات
-          byway: طريق فرعي
           construction: طريق سريع قيد الإنشاء
           cycleway: مسار دراجات
           emergency_access_point: نقطة دخول طوارئ
@@ -493,7 +478,6 @@ ar:
           ford: مخاضة
           living_street: شارع سكني
           milestone: معلم
-          minor: طريق غير هام
           motorway: طريق سريع
           motorway_junction: تقاطع طرقات سريعة
           motorway_link: طريق سريع
@@ -514,7 +498,6 @@ ar:
           speed_camera: كاميرا كشف السرعة
           steps: درج
           street_lamp: مصباح شارع
-          stile: مرقى لعبور جدار
           tertiary: طريق فرعي
           tertiary_link: طريق فرعي
           track: مسار
@@ -538,7 +521,6 @@ ar:
           memorial: نصب تذكاري
           mine: منجم
           monument: أثر
-          museum: متحف
           ruins: أطلال
           tomb: قبر
           tower: برج
@@ -566,9 +548,6 @@ ar:
           military: منطقة عسكرية
           mine: منجم
           orchard: بستان
-          nature_reserve: محمية طبيعية
-          park: منتزه
-          piste: منطقة تزحلق
           quarry: كسّارة
           railway: سكة حديدية
           recreation_ground: ميدان ألعاب
@@ -578,8 +557,6 @@ ar:
           road: منطقة الطريق
           village_green: أرض خضراء
           vineyard: كرم عنب
-          wetland: أرض رطبة
-          wood: حرج
         leisure:
           beach_resort: شاطئ منتجع
           bird_hide: مخبئ طيور
@@ -614,11 +591,9 @@ ar:
           beach: شاطئ
           cape: رأس (أرض داخلة في البحر(
           cave_entrance: مدخل كهف
-          channel: قناة
           cliff: جرف
           crater: فوهة بركان
           dune: كثيب
-          feature: ميزة
           fell: منحدر
           fjord: مضيق بحري
           forest: غابة
@@ -635,11 +610,9 @@ ar:
           point: نقطة
           reef: سلسلة صخور قرب سطح الماء
           ridge: أرض مرتفعة
-          river: نهر
           rock: صخرة
           scree: أرض حصاة
           scrub: أشجار منخفضة
-          shoal: مياه ضحلة
           spring: نبع
           stone: حجر
           strait: مضيق جبلي
@@ -648,7 +621,6 @@ ar:
           volcano: بركان
           water: ماء
           wetland: أرض رطبة
-          wetlands: أراضي رطبة
           wood: حرج
         office:
           accountant: محاسب
@@ -713,7 +685,6 @@ ar:
           switch: مبدل السكة الحديدية
           tram: سكة ترام
           tram_stop: موقف ترام
-          yard: فناء سكة حديد
         shop:
           alcohol: متجر كحول للبيع الخارجي
           antiques: تحف
@@ -802,12 +773,10 @@ ar:
           hostel: سكن شباب
           hotel: فندق
           information: معلومات
-          lean_to: كوخ منحدر
           motel: نُزل
           museum: متحف
           picnic_site: موقع بيك نيك
           theme_park: حديقة ملاهي
-          valley: وادي
           viewpoint: موقع كاشف
           zoo: حديقة حيوانات
         tunnel:
@@ -817,7 +786,6 @@ ar:
           artificial: مجرى ماء إصطناعي
           boatyard: حوض سفن
           canal: قناة
-          connector: قناة مائية
           dam: سدّ
           derelict_canal: قناة مهجورة
           ditch: خندق
@@ -825,15 +793,12 @@ ar:
           drain: مسرب
           lock: قفل
           lock_gate: هويس
-          mineral_spring: نبع مياه معدنية
           mooring: مرسى
           rapids: منحدرات نهرية
           river: نهر
-          riverbank: ضفة نهر
           stream: جدول
           wadi: وادي
           waterfall: شلال
-          water_point: نقطة ماء شفة
           weir: هدار (سدّ منخفض)
       admin_levels:
         level2: حدود قطرية

config/locales/arz.yml

@@ -220,10 +220,8 @@ arz:
     search_osm_nominatim:
       prefix:
         amenity:
-          airport: مطار
           arts_centre: مركز فني/ثقافي
           atm: صراف آلي
-          auditorium: قاعه محاضرات
           bank: مصرف
           bar: حانة
           bench: مقعد
@@ -239,7 +237,6 @@ arz:
           casino: نادى قمار
           cinema: سينما
           clinic: عيادة
-          club: نادي
           college: كلّية
           community_centre: مركز اجتماع
           courthouse: محكمة
@@ -259,22 +256,18 @@ arz:
           fuel: وقود
           grave_yard: مقبرة
           gym: مركز للرشاقة/الرياضة
-          hall: قاعة
           health_centre: مركز صحي
           hospital: مستشفى
-          hotel: فندق
           hunting_stand: مربط للصيد
           ice_cream: مثلجات
           kindergarten: حضانه أطفال
           library: مكتبة
           market: سوق
           marketplace: سوق
-          mountain_rescue: للإنقاذ فى الجبل
           nightclub: نادى ليلي
           nursery: رعايه تمريضية
           nursing_home: دار رعايه مسنين/معاقين
           office: مكتب
-          park: منتزه
           parking: موقف سيارات
           pharmacy: صيدلية
           place_of_worship: معبد
@@ -285,7 +278,6 @@ arz:
           prison: سجن
           pub: حانة
           public_building: مبنى عام
-          public_market: سوق عمومي
           reception_area: منطقه استقبال
           recycling: نقطه إعاده تصنيع
           restaurant: مطعم
@@ -293,10 +285,8 @@ arz:
           school: مدرسة
           shelter: ملجأ
           shop: متجر/دكان/حانوت
-          shopping: التسوق
           social_club: نادى اجتماعي
           studio: ستوديو
-          supermarket: سوبرماركت
           taxi: سياره أجرة
           telephone: هاتف عمومي
           theatre: مسرح
@@ -306,7 +296,6 @@ arz:
           vending_machine: آله بيع
           veterinary: جراحه بيطرية
           waste_basket: سله نفايات
-          wifi: نقطه اتصال لاسلكيه واى فاي
           youth_centre: مركز نشاطات للشباب
         boundary:
           administrative: حدود إدارية
@@ -315,13 +304,11 @@ arz:
         highway:
           bridleway: مسلك خيول
           bus_stop: موقف نزول/صعود من/إلى حافلات
-          byway: طريق فرعي
           construction: طريق سريع قيد الإنشاء
           cycleway: مسار دراجات
           emergency_access_point: نقطه دخول طوارئ
           footway: ممر للمشاة
           living_street: شارع سكني
-          minor: طريق غير هام
           motorway: طريق سريع
           motorway_junction: تقاطع طرقات سريعة
           motorway_link: طريق سريع
@@ -357,7 +344,6 @@ arz:
           memorial: نصب تذكاري
           mine: منجم
           monument: ضريح
-          museum: متحف
           ruins: أطلال
           tower: برج
           wayside_shrine: مزار جانب طريق
@@ -378,8 +364,6 @@ arz:
           meadow: مرج
           military: منطقه عسكرية
           mine: منجم
-          nature_reserve: محميه طبيعية
-          park: منتزه
           quarry: كسّارة
           railway: سكه حديدية
           recreation_ground: ميدان ألعاب
@@ -387,8 +371,6 @@ arz:
           residential: منطقه سكنية
           retail: بيع بالمفرق
           vineyard: كرم عنب
-          wetland: أرض رطبة
-          wood: حرج
         leisure:
           beach_resort: شاطئ منتجع
           common: أرض مشاع
@@ -414,10 +396,8 @@ arz:
           beach: شاطئ
           cape: رأس (أرض داخله فى البحر(
           cave_entrance: مدخل كهف
-          channel: قناة
           cliff: جرف
           crater: فوهه بركان
-          feature: ميزة
           fell: منحدر
           fjord: مضيق بحري
           geyser: نافوره ماء حار
@@ -431,11 +411,9 @@ arz:
           peak: ذروة
           point: نقطة
           reef: سلسله صخور قرب سطح الماء
-          river: نهر
           rock: صخرة
           scree: أرض حصاة
           scrub: أشجار منخفضة
-          shoal: مياه ضحلة
           spring: نبع
           strait: مضيق جبلي
           tree: شجرة
@@ -443,7 +421,6 @@ arz:
           volcano: بركان
           water: ماء
           wetland: أرض رطبة
-          wetlands: أراضى رطبة
           wood: حرج
         place:
           airport: مطار
@@ -482,7 +459,6 @@ arz:
           subway: محطه مترو الأنفاق
           subway_entrance: مدخل مترو
           tram_stop: موقف ترام
-          yard: فناء سكه حديد
         shop:
           art: متجر فن
           bakery: مخبز
@@ -557,12 +533,10 @@ arz:
           hostel: سكن شباب
           hotel: فندق
           information: معلومات
-          lean_to: كوخ منحدر
           motel: نُزل
           museum: متحف
           picnic_site: موقع بيك نيك
           theme_park: حديقه ملاهي
-          valley: وادي
           viewpoint: موقع كاشف
           zoo: حديقه حيوانات
         waterway:
@@ -573,14 +547,11 @@ arz:
           dock: مرسى
           drain: مسرب
           lock: قفل
-          mineral_spring: نبع مياه معدنية
           rapids: منحدرات نهرية
           river: نهر
-          riverbank: ضفه نهر
           stream: جدول
           wadi: وادي
           waterfall: شلال
-          water_point: نقطه ماء شفة
     description:
       title:
         osm_nominatim: موقع من <a href="http://nominatim.openstreetmap.org/">OpenStreetMap

config/locales/ast.yml

@@ -380,11 +380,8 @@ ast:
           taxiway: Cai de rodaxe
           terminal: Terminal
         amenity:
-          airport: Aeropuertu
           arts_centre: Centru d'arte
-          artwork: Obra d'arte
           atm: Caxeru automáticu
-          auditorium: Auditoriu
           bank: Bancu
           bar: Bar
           bbq: Parrilla
@@ -403,7 +400,6 @@ ast:
           charging_station: Estación de carga
           cinema: Cine
           clinic: Clínica
-          club: Club
           college: Colexu universitariu
           community_centre: Centru comunitariu
           courthouse: Xulgáu
@@ -424,22 +420,18 @@ ast:
           fuel: Combustible
           grave_yard: Cementeriu
           gym: Ximnasiu / Fitness
-          hall: Centru de reuniones
           health_centre: Centru de salú
           hospital: Hospital
-          hotel: Hotel
           hunting_stand: Puestu de caza
           ice_cream: Xelaos
           kindergarten: Guardería
           library: Biblioteca
           market: Mercáu
           marketplace: Mercáu
-          mountain_rescue: Salvamentu nel monte
           nightclub: Sala de fiestes
           nursery: Preescolar
           nursing_home: Residencia asistencial
           office: Oficina
-          park: Parque
           parking: Aparcaderu
           pharmacy: Farmacia
           place_of_worship: Llugar de cultu
@@ -450,7 +442,6 @@ ast:
           prison: Cárcel
           pub: Pub
           public_building: Edificiu públicu
-          public_market: Mercáu públicu
           reception_area: Llugar de recepción
           recycling: Puntu llimpiu
           restaurant: Restaurán
@@ -459,13 +450,11 @@ ast:
           school: Escuela
           shelter: Abellugu
           shop: Tienda
-          shopping: Compres
           shower: Ducha
           social_centre: Centru social
           social_club: Club social
           social_facility: Instalación social
           studio: Estudiu
-          supermarket: Supermercáu
           swimming_pool: Piscina
           taxi: Taxi
           telephone: Teléfonu públicu
@@ -477,8 +466,6 @@ ast:
           veterinary: Ciruxía veterinaria
           village_hall: Casa de la villa
           waste_basket: Papelera
-          wifi: Accesu WiFi
-          WLAN: Accesu WiFi
           youth_centre: Centru de mocedá
         boundary:
           administrative: Llende alministrativa
@@ -494,13 +481,11 @@ ast:
         building:
           "yes": Edificiu
         emergency:
-          fire_hydrant: Boca d'incendios
           phone: Teléfonu d'emerxencia
         highway:
           bridleway: Caleya
           bus_guideway: Carril bus con guía
           bus_stop: Parada d'autobús
-          byway: Camín
           construction: Carretera en construcción
           cycleway: Sienda ciclista
           emergency_access_point: Puntu de llocalización d'emerxencia
@@ -508,7 +493,6 @@ ast:
           ford: Vau
           living_street: Cai residencial
           milestone: Finxu
-          minor: Carretera menor
           motorway: Autopista
           motorway_junction: Enllaz d'autopista
           motorway_link: Autopista
@@ -529,7 +513,6 @@ ast:
           speed_camera: Radar
           steps: Escaleres
           street_lamp: Farola
-          stile: Pasera de muries
           tertiary: Carretera terciaria
           tertiary_link: Carretera terciaria
           track: Pista
@@ -553,7 +536,6 @@ ast:
           memorial: Monumentu
           mine: Mina
           monument: Monumentu
-          museum: Muséu
           ruins: Ruines
           tomb: Sepulcru
           tower: Torre
@@ -581,9 +563,6 @@ ast:
           military: Área militar
           mine: Mina
           orchard: Güerta
-          nature_reserve: Reserva natural
-          park: Parque
-          piste: Pista
           quarry: Cantera
           railway: Ferrocarril
           recreation_ground: Campu recreativu
@@ -594,8 +573,6 @@ ast:
           road: Área de carretera
           village_green: Prau municipal
           vineyard: Viña
-          wetland: Llamuerga
-          wood: Viesca
         leisure:
           beach_resort: Turismu de playa
           bird_hide: Observatoriu d'aves
@@ -630,11 +607,9 @@ ast:
           beach: Playa
           cape: Cabu
           cave_entrance: Boca de cueva
-          channel: Canal
           cliff: Cantil
           crater: Crater
           dune: Duna
-          feature: Carauterística
           fell: Braña
           fjord: Fiordu
           forest: Área forestal
@@ -651,11 +626,9 @@ ast:
           point: Puntu
           reef: Petón
           ridge: Cordal
-          river: Ríu
           rock: Roca
           scree: Llera
           scrub: Cotollal
-          shoal: Baxu
           spring: Fonte
           stone: Piedra
           strait: Estrechu
@@ -664,7 +637,6 @@ ast:
           volcano: Volcan
           water: Agua
           wetland: Llamuerga
-          wetlands: Llamuergues
           wood: Viesca
         office:
           accountant: Contable
@@ -729,7 +701,6 @@ ast:
           switch: Aguyes de ferrocarril
           tram: Tranvía
           tram_stop: Parada de tranvía
-          yard: Apartaderu de clasificación
         shop:
           alcohol: Venta de bébores
           antiques: Antigüedaes
@@ -818,12 +789,10 @@ ast:
           hostel: Albergue
           hotel: Hotel
           information: Información
-          lean_to: Abrigu
           motel: Motel
           museum: Muséu
           picnic_site: Área recreativa
           theme_park: Parque temáticu
-          valley: Valle
           viewpoint: Mirador
           zoo: Zoo
         tunnel:
@@ -833,7 +802,6 @@ ast:
           artificial: Vía acuática artificial
           boatyard: Astilleru
           canal: Canal
-          connector: Regueru
           dam: Presa
           derelict_canal: Canal abandonáu
           ditch: Riega
@@ -841,15 +809,12 @@ ast:
           drain: Desagüe
           lock: Esclusa
           lock_gate: Compuerta
-          mineral_spring: Agua mineral
           mooring: Amarradera
           rapids: Rabión
           river: Ríu
-          riverbank: Ribera'l ríu
           stream: Regatu
           wadi: Riera
           waterfall: Saltu d'agua
-          water_point: Toma d'agua
           weir: Banzáu
       admin_levels:
         level2: Frontera de país

config/locales/az.yml

@@ -281,11 +281,8 @@ az:
           taxiway: Sürmə yolu
           terminal: Terminal
         amenity:
-          airport: Aeroport
           arts_centre: İncəsənət mərkəzi
-          artwork: İncəsənət əsəri
           atm: Bankomat
-          auditorium: Auditoriya
           bank: Bank
           bar: Bar
           bbq: Manqal
@@ -304,7 +301,6 @@ az:
           charging_station: Şarj Stansiyası
           cinema: Kinoteatr
           clinic: Klinika
-          club: Klub
           college: Kollec
           community_centre: İctimai mərkəz
           courthouse: Məhkəmə yeri
@@ -325,22 +321,18 @@ az:
           fuel: Yanacaq doldurma
           grave_yard: Qəbirsanlıq
           gym: Fitnes mərkəzi
-          hall: Zal
           health_centre: Sağlamlıq mərkəzi
           hospital: Qospital
-          hotel: Otel
           hunting_stand: Ov stendi
           ice_cream: Dondurma
           kindergarten: Uşaq bağçası
           library: Kitabxana
           market: Market
           marketplace: Bazar meydanı
-          mountain_rescue: Dağ Xilasetmə Xidməti
           nightclub: Gecə klubu
           nursery: Pansionat
           nursing_home: Qocalar evi
           office: Ofis
-          park: Park
           parking: Dayanacaq
           pharmacy: Aptek
           place_of_worship: Sitayişgah
@@ -351,7 +343,6 @@ az:
           prison: Həbsxana
           pub: Pivəxana
           public_building: İctimai Binalar
-          public_market: İctimai Bazar
           reception_area: Qəbul sahəsi
           recycling: Utilizasiya yeri
           restaurant: Restoran
@@ -360,12 +351,10 @@ az:
           school: Məktəb
           shelter: Sığınacaq
           shop: Mağaza
-          shopping: Alış-veriş
           shower: Duş
           social_centre: İctimai Mərkəz
           social_club: İctimai Club
           studio: Studiya
-          supermarket: Supermarket
           swimming_pool: Üzgüçülük hovuzu
           taxi: Taksi
           telephone: İctimai Telefon
@@ -377,8 +366,6 @@ az:
           veterinary: Veterenar Klinikası
           village_hall: Villa
           waste_basket: Zibillik
-          wifi: WiFi ərazi
-          WLAN: WiFi ərazi
           youth_centre: Gənclər Mərkəzi
         boundary:
           administrative: Administrativ sərhəd
@@ -397,7 +384,6 @@ az:
           bridleway: Atlı yolu
           bus_guideway: Gəzinti Avtobus xətti
           bus_stop: Avtobus dayanacağı
-          byway: Dalan
           construction: Yol təmirdədir
           cycleway: Velocığır
           emergency_access_point: Təcili yardım məntəqəsi
@@ -405,7 +391,6 @@ az:
           ford: Çay keçidi
           living_street: Yaşayış küçəsi
           milestone: Məsafə dirəyi
-          minor: Kiçik yol
           motorway: Avtomagistral
           motorway_junction: Avtomagistral Kəsişməsi
           motorway_link: Avtomagistral yolu
@@ -424,7 +409,6 @@ az:
           services: Yolətrafı Servislər
           speed_camera: Sürət kamerası
           steps: Pilləkənlər
-          stile: Turniket
           tertiary: Üçüncü dərəcəli yol
           tertiary_link: Üçüncü dərəcəli yol
           track: Torpaq yol
@@ -447,7 +431,6 @@ az:
           memorial: Memorial
           mine: Mədən
           monument: Abidə
-          museum: Muzey
           ruins: Xarabalıqlar
           tower: Qüllə
           wayside_cross: Yolkənarı xaç
@@ -474,9 +457,6 @@ az:
           military: Hərbi ərazi
           mine: Mədən
           orchard: Meyvə bağı
-          nature_reserve: Təbiət Qoruğu
-          park: Park
-          piste: Xizəkçilik
           quarry: Karxana
           railway: Dəmir yolu
           recreation_ground: Istirahət guşəsi
@@ -487,8 +467,6 @@ az:
           road: Yol şəbəkəsi ərazisi
           village_green: Yaşıllıq kənd
           vineyard: Üzümlük
-          wetland: Bataqlıq
-          wood: Meşə
         leisure:
           beach_resort: Əkilili çimərlik
           bird_hide: Quşlara gizli müşahidə məntəqəsi
@@ -521,11 +499,9 @@ az:
           beach: Çimərlik
           cape: Burun
           cave_entrance: Mağara girişi
-          channel: Kanal
           cliff: Uçurum
           crater: Krater
           dune: Qum təpəsi
-          feature: Təbii obyekt
           fell: Təpə
           fjord: Fiord
           forest: Meşə
@@ -542,11 +518,9 @@ az:
           point: Burun
           reef: Rif
           ridge: Dağ silsiləsi
-          river: Çay
           rock: Qaya
           scree: Çınqıllıq
           scrub: Kolluq
-          shoal: Dayazlıq
           spring: Bulaq
           stone: Qaya
           strait: Boğaz
@@ -555,7 +529,6 @@ az:
           volcano: Vulkan
           water: Çarhovuz
           wetland: Bataqlıq
-          wetlands: Bataqlıq ərazi
           wood: Meşə
         office:
           accountant: Mühasib
@@ -617,7 +590,6 @@ az:
           switch: Dəmiryol oxu
           tram: Tramvay
           tram_stop: Tramvay dayanacağı
-          yard: Depo
         shop:
           alcohol: Alkoqol dükanı
           antiques: Əntiq əşyalar
@@ -702,12 +674,10 @@ az:
           hostel: Xostel
           hotel: Hotel
           information: Məlumat
-          lean_to: Meyl
           motel: Motel
           museum: Muzey
           picnic_site: Piknik üçün yer
           theme_park: Attraksion
-          valley: Vadi
           viewpoint: Baxış meydançası
           zoo: Zoopark
         tunnel:
@@ -716,7 +686,6 @@ az:
           artificial: Süni su axını
           boatyard: Tərsanə
           canal: Kanal
-          connector: Çayların birləşməsi
           dam: Damba
           derelict_canal: İstifadəsiz Kanal
           ditch: Xəndək
@@ -724,15 +693,12 @@ az:
           drain: Axıntı xəndəyi
           lock: Şlyuz
           lock_gate: Şlyuz qapısı
-          mineral_spring: Mineral bulaq
           mooring: Gəmilərin sahilə bağlama yeri
           rapids: Çay kəndarı
           river: Çay
-          riverbank: Çayın sahili
           stream: Çay
           wadi: Qurumuş cay
           waterfall: Şəlalə
-          water_point: Su təminatı məntəqəsi
           weir: Su bəndi
       admin_levels:
         level2: Ölkə sərhəddi

config/locales/be-Tarask.yml

@@ -51,7 +51,7 @@ be-Tarask:
         body: Тэкст
       diary_entry:
         user: Удзельнік
-        title: Назва
+        title: Тэма
         latitude: Шырата
         longitude: Даўгата
         language: Мова
@@ -69,7 +69,7 @@ be-Tarask:
         description: Апісаньне
       message:
         sender: Адпраўшчык
-        title: Загаловак
+        title: Тэма
         body: Тэкст
         recipient: Атрымальнік
       user:
@@ -95,6 +95,7 @@ be-Tarask:
       description: Аддаленае кіраваньне (JOSM ці Merkaartor)
   browse:
     created: Створана
+    closed: Закрытае
     changeset:
       title: Набор зьменаў
       changesetxml: Набор зьменаў у фармаце XML
@@ -287,10 +288,8 @@ be-Tarask:
           runway: Узлётна-пасадачная паласа
           taxiway: Рулёжная дарога
         amenity:
-          airport: Аэрапорт
           arts_centre: Мастацкі цэнтар
           atm: Банкамат
-          auditorium: Заля для канфэрэнцыяў
           bank: Банк
           bar: Бар
           bench: Лаўка
@@ -306,7 +305,6 @@ be-Tarask:
           casino: Казіно
           cinema: Кінатэатар
           clinic: Паліклініка
-          club: Клюб
           college: Каледж
           community_centre: Грамадзкі цэнтар
           courthouse: Суд
@@ -326,22 +324,18 @@ be-Tarask:
           fuel: Запраўка
           grave_yard: Могілкі
           gym: Фітнэс цэнтар /Трэнажорны зал
-          hall: Хол
           health_centre: Цэнтар здароўя
           hospital: Шпіталь
-          hotel: Гатэль
           hunting_stand: Паляўнічая вежа
           ice_cream: Марозіва
           kindergarten: Дзіцячы садок
           library: Бібліятэка
           market: Рынак
           marketplace: Рынкавая плошча
-          mountain_rescue: Горныя выратавальнікі
           nightclub: Начны клюб
           nursery: Дзіцячы пакой
           nursing_home: Дом састарэлых
           office: Офіс
-          park: Парк
           parking: Стаянка
           pharmacy: Аптэка
           place_of_worship: Культавае збудаваньне
@@ -352,7 +346,6 @@ be-Tarask:
           prison: Турма
           pub: Шынок
           public_building: Грамадзкі будынак
-          public_market: Кірмаш
           reception_area: Прыёмная
           recycling: Месца перапрацоўкі адыходаў
           restaurant: Рэстаран
@@ -361,10 +354,8 @@ be-Tarask:
           school: Школа
           shelter: Прытулак
           shop: Крама
-          shopping: Гандлёвы цэнтар
           social_club: Клюб па інтарэсах
           studio: Студыя
-          supermarket: Супэрмаркет
           taxi: Таксі
           telephone: Тэлефон
           theatre: Тэатар
@@ -375,8 +366,6 @@ be-Tarask:
           veterinary: Вэтэрынарная клініка
           village_hall: Кіраўніцтва вёскі
           waste_basket: Сьметніца
-          wifi: Доступ да WiFi
-          WLAN: Доступ да WiFi
           youth_centre: Моладзевы цэнтар
         boundary:
           administrative: Адміністрацыйная мяжа
@@ -386,14 +375,12 @@ be-Tarask:
           bridleway: Дарога для коней
           bus_guideway: Аўтобусная паласа
           bus_stop: Аўтобусны прыпынак
-          byway: Завулак
           construction: Будаўніцтва дарогі
           cycleway: Роварная дарожка
           emergency_access_point: Пункт хуткай дапамогі
           footway: Пешаходная сьцежка
           ford: Брод
           living_street: Жыльлёвая зона
-          minor: Другасная дарога
           motorway: Аўтастрада
           motorway_junction: Скрыжаваньне аўтастрадаў
           motorway_link: Разьвязка аўтастрады
@@ -410,7 +397,6 @@ be-Tarask:
           service: Службовая дарога
           services: Прыдарожны сэрвіс
           steps: Прыступкі
-          stile: Турнікет
           tertiary: Дарога раённага значэньня
           track: Грунтовая дарога
           trail: Сьцежка
@@ -433,7 +419,6 @@ be-Tarask:
           memorial: Мэмарыял
           mine: Капальня
           monument: Помнік
-          museum: Музэй
           ruins: Руіны
           tower: Вежа
           wayside_cross: Прыдарожны крыж
@@ -458,9 +443,6 @@ be-Tarask:
           meadow: Луг
           military: Вайсковая тэрыторыя
           mine: Капальня
-          nature_reserve: Запаведнік
-          park: Парк
-          piste: Лыжня
           quarry: Кар’ер
           railway: Чыгунка
           recreation_ground: Зона адпачынку
@@ -470,8 +452,6 @@ be-Tarask:
           road: Зона дарожнай сеткі
           village_green: Гарадзкі парк
           vineyard: Вінаграднік
-          wetland: Забалочаная зямля
-          wood: Лес
         leisure:
           beach_resort: Пляжны курорт
           bird_hide: Пункт назіраньня за птушкамі
@@ -499,11 +479,9 @@ be-Tarask:
           beach: Пляж
           cape: Мыс
           cave_entrance: Уваход у пячору
-          channel: Канал
           cliff: Абрыў
           crater: Кратэр
           dune: Дзюна
-          feature: Аб’ект
           fell: Узвышша
           fjord: Фіёрд
           forest: Лес
@@ -520,11 +498,9 @@ be-Tarask:
           point: Пункт
           reef: Рыф
           ridge: Горны хрыбет
-          river: Рака
           rock: Скала
           scree: Шчэбень
           scrub: Хмызьняк
-          shoal: Плыткаводзьдзе
           spring: Крыніца
           stone: Камень
           strait: Пратока
@@ -533,7 +509,6 @@ be-Tarask:
           volcano: Вулькан
           water: Вада
           wetland: Забалочаная зямля
-          wetlands: Забалочаныя землі
           wood: Лес
         office:
           accountant: Бугальтар
@@ -590,7 +565,6 @@ be-Tarask:
           switch: Чыгуначная стрэлка
           tram: Трамвайная каляя
           tram_stop: Трамвайны прыпынак
-          yard: Чыгуначнае дэпо
         shop:
           alcohol: Алькагольная крама
           antiques: Антыкварыят
@@ -673,12 +647,10 @@ be-Tarask:
           hostel: Хостэл
           hotel: Гатэль
           information: Інфармацыя
-          lean_to: Навес
           motel: Матэль
           museum: Музэй
           picnic_site: Месца для пікніка
           theme_park: Атракцыёны
-          valley: Даліна
           viewpoint: Аглядальная пляцоўка
           zoo: Заапарк
         tunnel:
@@ -687,7 +659,6 @@ be-Tarask:
           artificial: Штучны водны шлях
           boatyard: Майстэрня караблёў
           canal: Канал
-          connector: Злучэньне водных шляхоў
           dam: Дамба
           derelict_canal: Пакінуты канал
           ditch: Роў
@@ -695,15 +666,12 @@ be-Tarask:
           drain: Дрэнажны канал
           lock: Шлюз
           lock_gate: Вароты шлюза
-          mineral_spring: Мінэральная крыніца
           mooring: Якарная стаянка
           rapids: Парогі
           river: Рака
-          riverbank: Бераг ракі
           stream: Струмень
           wadi: Сухое рэчышча
           waterfall: Вадаспад
-          water_point: Пункт водазабесьпячэньня
           weir: Плаціна
     description:
       title:

config/locales/be.yml

@@ -406,11 +406,8 @@ be:
           taxiway: Рулёжныя дарожкі
           terminal: Тэрмінал
         amenity:
-          airport: Аэрапорт
           arts_centre: Цэнтр мастацтваў
-          artwork: Інсталяцыя
           atm: Банкамат
-          auditorium: Аўдыторыя
           bank: Банк
           bar: Бар
           bbq: Барбекю
@@ -429,7 +426,6 @@ be:
           charging_station: Зарадная станцыя
           cinema: Кіно
           clinic: Клініка
-          club: Клуб
           college: Каледж
           community_centre: Грамадскі цэнтр
           courthouse: Суд
@@ -450,22 +446,18 @@ be:
           fuel: АЗС
           grave_yard: Могілкі
           gym: Фітнес-цэнтр ці Трэнажорная зала
-          hall: Зала
           health_centre: Медыцынскі цэнтр
           hospital: Бальніца
-          hotel: Гатэль
           hunting_stand: Паляўнічая вежа
           ice_cream: Марозіва
           kindergarten: Дзіцячы сад
           library: Бібліятэка
           market: Рынак
           marketplace: Рыначная плошча
-          mountain_rescue: Выратавальная служба ў гарах
           nightclub: Начны клуб
           nursery: Яслі
           nursing_home: Прыватная лякарня
           office: Офіс
-          park: Парк
           parking: Паркоўка
           pharmacy: Аптэка
           place_of_worship: Культавы будынак
@@ -476,7 +468,6 @@ be:
           prison: Турма
           pub: Паб
           public_building: Грамадскі будынак
-          public_market: Адкрыты рынак
           reception_area: Зона прыёму
           recycling: Пункт перапрацоўкі
           restaurant: Рэстаран
@@ -485,13 +476,11 @@ be:
           school: Школа
           shelter: Укрыццё
           shop: Крама
-          shopping: Шопінг
           shower: Душ
           social_centre: Сацыяльны цэнтр
           social_club: Грамадскі клуб
           social_facility: Сацыяльны аб'ект
           studio: Студыя
-          supermarket: Супермаркет
           swimming_pool: Плавальны басейн
           taxi: Таксі
           telephone: Грамадскі тэлефон
@@ -503,8 +492,6 @@ be:
           veterinary: Ветэрынарная хірургія
           village_hall: Вясковая зала
           waste_basket: Кош для смецця
-          wifi: Wi-Fi доступ
-          WLAN: Wi-Fi доступ
           youth_centre: Маладзежны цэнтр
         boundary:
           administrative: Адміністрацыйная мяжа
@@ -520,13 +507,11 @@ be:
         building:
           "yes": Будынак
         emergency:
-          fire_hydrant: Пажарны гідрант
           phone: Тэлефон экстранай сувязі
         highway:
           bridleway: Дарога для коней
           bus_guideway: Рэйкавы аўтобус
           bus_stop: Аўтобусны прыпынак
-          byway: Сцежка
           construction: Будаўніцтва дарогі
           cycleway: Веласіпедная дарожка
           emergency_access_point: Пункт хуткай дапамогі
@@ -534,7 +519,6 @@ be:
           ford: Брод
           living_street: Жылая вуліца
           milestone: Веха
-          minor: Дробная дарога
           motorway: Аўтамагістраль
           motorway_junction: Аўтамабільная развязка
           motorway_link: Аўтамагістраль
@@ -555,7 +539,6 @@ be:
           speed_camera: Фотарадар
           steps: Прыступкі
           street_lamp: Вулічны ліхтар
-          stile: Турнікет
           tertiary: Трэцясная дарога
           tertiary_link: Трэцясная дарога
           track: Каляя
@@ -579,7 +562,6 @@ be:
           memorial: Мемарыял
           mine: Шахта
           monument: Помнік
-          museum: Музей
           ruins: Руіны
           tomb: Магіла
           tower: Вежа
@@ -607,9 +589,6 @@ be:
           military: Ваенная зона
           mine: Шахта
           orchard: Фруктовы сад
-          nature_reserve: Запаведнік
-          park: Парк
-          piste: Лыжная траса
           quarry: Кар'ер
           railway: Чыгунка
           recreation_ground: Пляцоўка для гульняў
@@ -620,8 +599,6 @@ be:
           road: Прыдарожная паласа
           village_green: Вясковая паляна
           vineyard: Вінаграднік
-          wetland: Забалочаны ўчастак
-          wood: Пушча
         leisure:
           beach_resort: Пляжны курорт
           bird_hide: Засада
@@ -656,11 +633,9 @@ be:
           beach: Пляж
           cape: Мыс
           cave_entrance: Уваход у пячору
-          channel: Канал
           cliff: Мяжа скалы
           crater: Кратэр
           dune: Дзюна
-          feature: Прыродны аб'ект
           fell: Неапрацаваная зямля
           fjord: Фіёрд
           forest: Лес
@@ -677,11 +652,9 @@ be:
           point: Кропка
           reef: Рыф
           ridge: Хрыбет
-          river: Рака
           rock: Скала
           scree: Абсып
           scrub: Кустарнік
-          shoal: Мелкаводдзе
           spring: Крыніца
           stone: Камень
           strait: Праліў
@@ -690,7 +663,6 @@ be:
           volcano: Вулкан
           water: Вада
           wetland: Забалочаны ўчастак
-          wetlands: Водна-балотныя ўгоддзі
           wood: Пушча
         office:
           accountant: Бухгалтар
@@ -755,9 +727,6 @@ be:
           switch: Чыгуначная стрэлка
           tram: Трамвай
           tram_stop: Трамвайны прыпынак
-          yard: Сартавальная станцыя
-        route:
-          bus: Аўтобусны маршрут
         shop:
           alcohol: Алкагольная крама
           antiques: Антыкварыят
@@ -846,12 +815,10 @@ be:
           hostel: Хостэл
           hotel: Гатэль
           information: Інфармацыя
-          lean_to: Навес
           motel: Матэль
           museum: Музей
           picnic_site: Месца для пікніка
           theme_park: Тэматычны парк
-          valley: Даліна
           viewpoint: Аглядальная пляцоўка
           zoo: Заапарк
         tunnel:
@@ -861,7 +828,6 @@ be:
           artificial: Штучны вадацёк
           boatyard: Верфі
           canal: Канал
-          connector: Злучэньне вадацёкаў
           dam: Плаціна
           derelict_canal: Перасохлы канал
           ditch: Роў
@@ -869,15 +835,12 @@ be:
           drain: Дрэнажны канал
           lock: Шлюз
           lock_gate: Вароты шлюза
-          mineral_spring: Мінеральная крыніца
           mooring: Якарная стаянка
           rapids: Парогі
           river: Рака
-          riverbank: Бераг ракі
           stream: Струмень
           wadi: Сухое рэчышча
           waterfall: Вадаспад
-          water_point: Пункт водазабеспячэння
           weir: Плаціна
       admin_levels:
         level2: Мяжа краіны

config/locales/br.yml

@@ -408,11 +408,8 @@ br:
           taxiway: Roudenn evit an taksioù
           terminal: Termenva
         amenity:
-          airport: Aerborzh
           arts_centre: Kreizenn arz
-          artwork: Oberenn arz
           atm: Bilhedaouer
-          auditorium: Selaouva
           bank: Ti-bank
           bar: Tavarn
           bbq: Regezer
@@ -431,7 +428,6 @@ br:
           charging_station: Savlec'h adkargañ
           cinema: Sinema
           clinic: Klinikenn
-          club: Klub
           college: Skol-veur pe skol-uhel
           community_centre: Sal liezimplij
           courthouse: Lez-varn
@@ -452,22 +448,18 @@ br:
           fuel: Trelosk
           grave_yard: Bered
           gym: Fitness/embregerezh-korf
-          hall: Sal
           health_centre: Kreizenn yec'hed
           hospital: Ospital
-          hotel: Leti
           hunting_stand: Stand tennañ
           ice_cream: Dienn skorn
           kindergarten: Liorzh ar vugale
           library: Levraoueg
           market: Marc'had
           marketplace: Marc'hallac'h
-          mountain_rescue: Sikourioù er menezioù
           nightclub: Klub-noz
           nursery: Spluseg
           nursing_home: Ti yec'hed
           office: Burev
-          park: Park
           parking: Parklec'h
           pharmacy: Apotikerezh
           place_of_worship: Lec'h azeuliñ
@@ -478,7 +470,6 @@ br:
           prison: Toull-bac'h
           pub: Tavarn
           public_building: Savadur foran
-          public_market: Marc'had foran
           reception_area: Takad degemer
           recycling: Lec'h adaozañ
           restaurant: Preti
@@ -487,13 +478,11 @@ br:
           school: Skol
           shelter: Gwasked
           shop: Stal
-          shopping: Prenadennoù
           shower: Strinkadenn
           social_centre: Kreizenn sokial
           social_club: Klub sokial
           social_facility: Servij sokial
           studio: Studio
-          supermarket: Gourmarc'had
           swimming_pool: Poull-neuial
           taxi: Taksi
           telephone: Pellgomzer foran
@@ -505,8 +494,6 @@ br:
           veterinary: Surjianerezh evit al loened
           village_hall: Sal ar gumun
           waste_basket: Pod-lastez
-          wifi: Moned WiFi
-          WLAN: Moned WiFi
           youth_centre: Kreizenn evit ar re yaouank
         boundary:
           administrative: Bevennoù melestradurel
@@ -522,13 +509,11 @@ br:
         building:
           "yes": Savadur
         emergency:
-          fire_hydrant: Dour evit an tan
           phone: Pellgomzer evit an trummadoù
         highway:
           bridleway: Hent evit ar varc'hegerien
           bus_guideway: Roudenn vus heñchet
           bus_stop: Arsav bus
-          byway: Hent eil renk
           construction: Chanter gourhent
           cycleway: Roudenn divrodegoù
           emergency_access_point: Poent moned trummadoù
@@ -536,7 +521,6 @@ br:
           ford: Roudour
           living_street: Straed annez
           milestone: ↓Maen-bonn
-          minor: Hent dister
           motorway: Gourhent
           motorway_junction: Kengej gourhent
           motorway_link: Gourhent
@@ -557,7 +541,6 @@ br:
           speed_camera: Radar tizh
           steps: Diri
           street_lamp: Post lamp
-          stile: Skalier
           tertiary: Hent trede renk
           tertiary_link: Hent trede renk
           track: Roudenn
@@ -581,7 +564,6 @@ br:
           memorial: Kounlec'h
           mine: Mengleuz
           monument: Monumant
-          museum: Mirdi
           ruins: Dismantroù
           tomb: Bez
           tower: Tour
@@ -609,9 +591,6 @@ br:
           military: Takad milourel
           mine: Mengleuz
           orchard: Gwerje
-          nature_reserve: Gwarezva natur
-          park: Park
-          piste: Roudenn
           quarry: Mengleuz
           railway: Hent-houarn
           recreation_ground: Leur c'hoari
@@ -622,8 +601,6 @@ br:
           road: Takad hent
           village_green: Takad natur foran
           vineyard: Gwinieg
-          wetland: Takad gleborek
-          wood: Koad
         leisure:
           beach_resort: Kêr-gouronkañ
           bird_hide: Bod evned
@@ -658,11 +635,9 @@ br:
           beach: Traezhenn
           cape: Kab
           cave_entrance: Treuzoù mougev
-          channel: Kanol
           cliff: Tornaod
           crater: Krater
           dune: Tevenn
-          feature: Elfenn
           fell: Fell
           fjord: Fjord
           forest: Koadeg
@@ -679,11 +654,9 @@ br:
           point: Poent
           reef: Karreg
           ridge: Kribenn
-          river: Stêr
           rock: Roc'h
           scree: Disac'hadur
           scrub: Strouezh
-          shoal: Klosenn
           spring: Lamm-dour
           stone: Roc'h
           strait: Strizh-mor
@@ -692,7 +665,6 @@ br:
           volcano: Menez-tan
           water: Dour
           wetland: Takad gleborek
-          wetlands: Takadoù gleborek
           wood: Koad
         office:
           accountant: Kontour
@@ -757,9 +729,6 @@ br:
           switch: Hentoù-houarn heñchañ
           tram: Tramgarr
           tram_stop: Arsav tramgarr
-          yard: Gar-dibab
-        route:
-          bus: Pennad-hent ar bus
         shop:
           alcohol: Gwezher alkool
           antiques: Hendraezoù
@@ -848,12 +817,10 @@ br:
           hostel: Herberc'h
           hotel: Leti
           information: Titouroù
-          lean_to: Stand
           motel: Motel
           museum: Mirdi
           picnic_site: Lec'hienn biknikañ
           theme_park: Park tematek
-          valley: Traoñienn
           viewpoint: Gwelva
           zoo: Zoo
         tunnel:
@@ -863,7 +830,6 @@ br:
           artificial: Gwazh-dour artifisiel
           boatyard: Chanter bigi
           canal: Kanol
-          connector: Kevreadur dourredennoù
           dam: Chaoser
           derelict_canal: Kanol dilezet
           ditch: Foz
@@ -871,15 +837,12 @@ br:
           drain: Dizourer
           lock: Skluz
           lock_gate: Skluz
-          mineral_spring: Mammenn dour melar
           mooring: Fes
           rapids: Taranoù
           river: Stêr
-          riverbank: Naoz
           stream: Gwazh-dour
           wadi: Oued
           waterfall: Lamm-dour
-          water_point: Doureg
           weir: Stankell
       admin_levels:
         level2: Bevenn ar vro

config/locales/bs.yml

@@ -314,11 +314,8 @@ bs:
           taxiway: Rulna staza
           terminal: Terminal
         amenity:
-          airport: Aerodrom
           arts_centre: Centar umjetnosti
-          artwork: Umjetnine
           atm: Bankomat
-          auditorium: Auditorij
           bank: Banka
           bar: Bar
           bbq: Gril
@@ -337,7 +334,6 @@ bs:
           charging_station: Stanica za punjenje
           cinema: Kino
           clinic: Klinika
-          club: Klub
           college: Koledž
           community_centre: Društveni centar
           courthouse: Sud
@@ -358,22 +354,18 @@ bs:
           fuel: Benzinska pumpa
           grave_yard: Groblje
           gym: Fitness centar
-          hall: Dvorana
           health_centre: Zdravstveni centar
           hospital: Bolnica
-          hotel: Hotel
           hunting_stand: Lovačka čeka
           ice_cream: Sladoled
           kindergarten: Dječiji vrtić
           library: Biblioteka
           market: Tržnica
           marketplace: Tržnica
-          mountain_rescue: Gorska služba spašavanja
           nightclub: Noćni klub
           nursery: Čuvanje djece
           nursing_home: Starački dom
           office: Kancelarija
-          park: Park
           parking: Parking
           pharmacy: Apoteka
           place_of_worship: Bogomolja
@@ -384,7 +376,6 @@ bs:
           prison: Zatvor
           pub: Pub
           public_building: Ustanova
-          public_market: Javna tržnica
           reception_area: Recepcija
           recycling: Reciklažna stanica
           restaurant: Restoran
@@ -393,13 +384,11 @@ bs:
           school: Škola
           shelter: Sklonište
           shop: Trgovina
-          shopping: Trgovački centar
           shower: Tuš
           social_centre: Društveni centar
           social_club: Društveni klub
           social_facility: Socialne ustanove
           studio: Studio
-          supermarket: Supermarket
           swimming_pool: Bazen
           taxi: Taxi
           telephone: Telefonska govornica
@@ -411,8 +400,6 @@ bs:
           veterinary: Veterinar
           village_hall: Seoski Dom
           waste_basket: Kanta za otpatke
-          wifi: WiFi pristup
-          WLAN: WiFi pristup
           youth_centre: Centar za omladinu
         boundary:
           administrative: Administrativna granica
@@ -428,13 +415,11 @@ bs:
         building:
           "yes": Građevina
         emergency:
-          fire_hydrant: Hidrant
           phone: S.O.S. Telefon
         highway:
           bridleway: Konjička staza
           bus_guideway: Autobuska traka
           bus_stop: Autobusko stajalište
-          byway: Prečica
           construction: Autoput u izgradnji
           cycleway: Biciklistička staza
           emergency_access_point: S.O.S. tačka pristupa
@@ -442,7 +427,6 @@ bs:
           ford: Gaz
           living_street: Ulica smirenog prometa
           milestone: Miljokaz
-          minor: Drugorazredna cesta
           motorway: Autocesta
           motorway_junction: Čvor (autoputa)
           motorway_link: Autoput (pristupna cesta)
@@ -463,7 +447,6 @@ bs:
           speed_camera: Kamera za kontrolu brzine
           steps: Stepenice
           street_lamp: Ulična svjetiljka
-          stile: Prijelaz preko ograde
           tertiary: Lokalna cesta
           tertiary_link: Lokalna cesta
           track: Makadam
@@ -487,7 +470,6 @@ bs:
           memorial: Memorijal
           mine: Rudnik
           monument: Spomenik
-          museum: Muzej
           ruins: Ruševine
           tomb: Grobnica
           tower: Toranj
@@ -515,9 +497,6 @@ bs:
           military: Vojno područje
           mine: Rudnik
           orchard: Voćnjak
-          nature_reserve: Rezervat prirode
-          park: Park
-          piste: Ski staza
           quarry: Kamenolom
           railway: Željeznica
           recreation_ground: Rekreacijsko područje
@@ -528,8 +507,6 @@ bs:
           road: Područje ceste
           village_green: Seoski travnjak
           vineyard: Vinograd
-          wetland: Močvara
-          wood: Šuma
         leisure:
           beach_resort: Odmaralište - plaža
           bird_hide: Posmatračnica ptica
@@ -564,11 +541,9 @@ bs:
           beach: Plaža
           cape: Rt
           cave_entrance: Pećina (ulaz)
-          channel: Kanal
           cliff: Litica
           crater: Krater
           dune: Dina
-          feature: Značajka
           fell: Brdo
           fjord: Fjord
           forest: Šuma
@@ -585,11 +560,9 @@ bs:
           point: Tačka
           reef: Greben
           ridge: Greben
-          river: Rijeka
           rock: Stijena
           scree: Krš
           scrub: Šikara
-          shoal: Sprud
           spring: Izvor
           stone: Kamen
           strait: Tjesnac
@@ -598,7 +571,6 @@ bs:
           volcano: Vulkan
           water: Voda
           wetland: Močvara
-          wetlands: Močvare
           wood: Šuma
         office:
           accountant: Računovođa
@@ -660,7 +632,6 @@ bs:
           switch: Skretnica
           tram: Tramvaj
           tram_stop: Tramvajska stanica
-          yard: Ranžirni kolodvor
         shop:
           alcohol: Trgovina pićem
           antiques: Antikviteti
@@ -744,12 +715,10 @@ bs:
           hostel: Hostel
           hotel: Hotel
           information: Informacije
-          lean_to: Nadstrešnica
           motel: Motel
           museum: Muzej
           picnic_site: Piknik-mjesto
           theme_park: Tematski park
-          valley: Dolina
           viewpoint: Vidikovac
           zoo: Zoološki vrt
         tunnel:
@@ -758,7 +727,6 @@ bs:
           artificial: Vještački vodotok
           boatyard: Brodogradilište
           canal: Kanal
-          connector: Spoj vodnih puteva
           dam: Brana
           derelict_canal: Zanemaren kanal
           ditch: Jarak
@@ -766,15 +734,12 @@ bs:
           drain: Odvod
           lock: Ustava
           lock_gate: Ustava (vrata)
-          mineral_spring: Mineralni izvor
           mooring: Sidrište
           rapids: Brzaci
           river: Rijeka
-          riverbank: Riječna obala
           stream: Potok
           wadi: Suho korito rijeke
           waterfall: Vodopad
-          water_point: Tačka vodotoka
           weir: Brana
       admin_levels:
         level2: Granica države

config/locales/ca.yml

@@ -425,11 +425,8 @@ ca:
           taxiway: Carrer de rodada
           terminal: Terminal
         amenity:
-          airport: Aeroport
           arts_centre: Centre d'Art
-          artwork: Obra d'art
           atm: Caixer automàtic
-          auditorium: Auditori
           bank: Banc
           bar: Bar
           bbq: barbacoa
@@ -448,7 +445,6 @@ ca:
           charging_station: Estació de recàrrega
           cinema: Cinema
           clinic: Clínica
-          club: Club
           college: Institut
           community_centre: Centre Comunitari / Centre Cívic
           courthouse: Jutjat
@@ -469,22 +465,18 @@ ca:
           fuel: Benzinera
           grave_yard: Cementiri
           gym: Gimnàs
-          hall: Ajuntament
           health_centre: Centre de Salut
           hospital: Hospital
-          hotel: Hotel
           hunting_stand: Club de caça
           ice_cream: Gelat
           kindergarten: Jardí d'infància
           library: Biblioteca
           market: Mercat
           marketplace: Mercat
-          mountain_rescue: Rescat de Muntanya
           nightclub: Club nocturn
           nursery: Infantil
           nursing_home: Llar d'Avis
           office: Oficina
-          park: Parc
           parking: Pàrquing
           pharmacy: Farmàcia
           place_of_worship: Lloc de culte
@@ -495,7 +487,6 @@ ca:
           prison: Presó
           pub: Pub
           public_building: Edifici públic
-          public_market: Mercat Públic
           reception_area: Àrea de recepció
           recycling: Punt de reciclatge
           restaurant: Restaurant
@@ -504,13 +495,11 @@ ca:
           school: Escola
           shelter: Refugi
           shop: Botiga
-          shopping: Botigues
           shower: Dutxa
           social_centre: Centre social
           social_club: Club social
           social_facility: Equipament social
           studio: Estudi
-          supermarket: Supermercat
           swimming_pool: Piscina
           taxi: Taxi
           telephone: Telèfon públic
@@ -522,8 +511,6 @@ ca:
           veterinary: Veterinari
           village_hall: Casa de la Vila
           waste_basket: Cistella de Residus
-          wifi: Punt d'accés WiFi
-          WLAN: Punt d'accés WiFi
           youth_centre: Centre juvenil
         boundary:
           administrative: Límit administratiu
@@ -539,13 +526,11 @@ ca:
         building:
           "yes": Edifici
         emergency:
-          fire_hydrant: Boca d'incendis
           phone: Telèfon per a emergències
         highway:
           bridleway: Ferradura
           bus_guideway: Carril Bus
           bus_stop: Parada d'autobús
-          byway: Ruta segregada
           construction: Autopista en construcció
           cycleway: Ruta per a bicicletes
           emergency_access_point: Accés d'emergència
@@ -553,7 +538,6 @@ ca:
           ford: Fiord
           living_street: Carrer habitat
           milestone: Fita
-          minor: Via secundària
           motorway: Autopista
           motorway_junction: Unió d'autopista
           motorway_link: Carretera d'autopista
@@ -574,7 +558,6 @@ ca:
           speed_camera: Radar
           steps: Graons
           street_lamp: Fanal
-          stile: Escala per a travessar reixats
           tertiary: Carretera terciària
           tertiary_link: Carretera terciària
           track: Pista
@@ -598,7 +581,6 @@ ca:
           memorial: Memorial
           mine: Mina
           monument: Monument
-          museum: Museu
           ruins: Ruïnes
           tomb: Tomba
           tower: Torre
@@ -626,9 +608,6 @@ ca:
           military: Zona Militar
           mine: Mina
           orchard: Verger
-          nature_reserve: Reserva Natural
-          park: Parc
-          piste: Pista d'aterratge
           quarry: Pedrera
           railway: Ferrocarril
           recreation_ground: Zona d'Esbarjo
@@ -639,8 +618,6 @@ ca:
           road: Zona de carretera
           village_green: Zona verda
           vineyard: Vinya
-          wetland: Aiguamoll
-          wood: Fusta
         leisure:
           beach_resort: Beach Resort
           bird_hide: Aguait
@@ -675,11 +652,9 @@ ca:
           beach: Platja
           cape: Cap
           cave_entrance: Entrada a cova
-          channel: Canal
           cliff: Cingle
           crater: Cràter
           dune: Duna
-          feature: Característica
           fell: Forest
           fjord: Fiord
           forest: Bosc
@@ -696,11 +671,9 @@ ca:
           point: Punt
           reef: Escull
           ridge: Cresta
-          river: Riu
           rock: Roca
           scree: Pedregar
           scrub: Scrub
-          shoal: Banc
           spring: Deu
           stone: Pedra
           strait: Estret
@@ -709,7 +682,6 @@ ca:
           volcano: Volcà
           water: Aigua
           wetland: Aiguamoll
-          wetlands: Aiguamolls
           wood: Bosc
         office:
           accountant: Comptable
@@ -774,9 +746,6 @@ ca:
           switch: Punts de ferrocarril
           tram: Tramvia
           tram_stop: Parada de tramvia
-          yard: Pati de ferrocarril
-        route:
-          bus: Ruta d'autobús
         shop:
           alcohol: De llicència
           antiques: Antiquari
@@ -865,12 +834,10 @@ ca:
           hostel: Hostal
           hotel: Hotel
           information: Informació
-          lean_to: Nau
           motel: Motel
           museum: Museu
           picnic_site: Àrea de pícnic
           theme_park: Parc temàtic
-          valley: Vall
           viewpoint: Mirador
           zoo: Zoològic
         tunnel:
@@ -880,7 +847,6 @@ ca:
           artificial: Curs d'aigua artificial
           boatyard: Drassana
           canal: Canal
-          connector: Connector de Waterway
           dam: Dam
           derelict_canal: Hi Canal
           ditch: Séquia
@@ -888,15 +854,12 @@ ca:
           drain: De drenatge
           lock: Pany
           lock_gate: Porta de panys
-          mineral_spring: Mineral primavera
           mooring: Amarradors
           rapids: Ràpids
           river: Riu
-          riverbank: Riverbank
           stream: Stream
           wadi: Torrent
           waterfall: Cascada
-          water_point: Punt d'aigua
           weir: Weir
       admin_levels:
         level2: Frontera internacional
@@ -942,7 +905,7 @@ ca:
     log_in: Inicia sessió
     log_in_tooltip: Inicia una sessió amb un compte existent
     sign_up: Registre
-    start_mapping: Començar a cartografiar
+    start_mapping: Comença a cartografiar
     sign_up_tooltip: Crea un usuari per editar
     edit: Modificació
     history: Historial
@@ -996,7 +959,7 @@ ca:
         a la %{native_link} d'aquesta pàgina o podeu deixar de llegir sobre el copyright
         i anar a %{mapping_link}.
       native_link: versió català
-      mapping_link: Inicia el mapatge
+      mapping_link: Comença a cartografiar
     legal_babble:
       title_html: Drets d'autor i llicència
       intro_1_html: |-
@@ -1041,7 +1004,7 @@ ca:
         de l'API</a>, la <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Política
         d'ús de les tessel·les</a> i la <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Política
         d'ús de Nominatim</a>.
-      contributors_title_html: Nostres col. laboradors
+      contributors_title_html: Els nostres col·laboradors
       contributors_intro_html: 'Els nostres col·laboradors són milers de persones.
         També incloem dades amb llicència oberta de les agències públiques de cartografia
         i d''altres fonts, entre elles:'
@@ -1076,8 +1039,8 @@ ca:
         Ordnance Survey &copy; Drets d'autor de la Corona i de la base de dades
         2010-12.
       contributors_footer_1_html: |-
-        Per a més detalls sobre aquesta i d'altres fonts que han estat utilitzades per millorar els mapes d'OpenStreetMap, si us plau, vegeu al wiki d'OSM la pàgina dedicada als <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">Col·laboradors</a>
+        Per a més detalls sobre aquesta i d'altres fonts que han estat utilitzades per millorar els mapes de l'OpenStreetMap, visiteu la pàgina dedicada als <a
+        href="http://wiki.openstreetmap.org/wiki/Contributors">Col·laboradors</a> del wiki d'OSM.
       contributors_footer_2_html: |-
         Inclusió de dades en OpenStreetMap no implica que l'original
           el proveïdor de dades recolza OpenStreetMap, proporciona cap garantia, o
@@ -1163,7 +1126,7 @@ ca:
     welcome:
       url: /welcome
       title: Benvinguts a l'OSM
-      description: Començar amb aquesta guia ràpida sobre els aspectes bàsics de OpenStreetMap.
+      description: Comença amb aquesta guia ràpida sobre els aspectes bàsics de l'OpenStreetMap.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

config/locales/cs.yml

@@ -419,11 +419,8 @@ cs:
           taxiway: Pojezdová dráha
           terminal: Terminál
         amenity:
-          airport: Letiště
           arts_centre: Kulturní centrum
-          artwork: Umělecké dílo
           atm: Bankomat
-          auditorium: Posluchárna
           bank: Banka
           bar: Bar
           bbq: Místo na grilování
@@ -442,7 +439,6 @@ cs:
           charging_station: Nabíjecí stanice
           cinema: Kino
           clinic: Klinika
-          club: Klub
           college: Univerzita
           community_centre: Komunitní centrum
           courthouse: Soud
@@ -463,22 +459,18 @@ cs:
           fuel: Čerpací stanice
           grave_yard: Hřbitov
           gym: Fitness centrum / tělocvična
-          hall: Sál
           health_centre: Zdravotní středisko
           hospital: Nemocnice
-          hotel: Hotel
           hunting_stand: Posed
           ice_cream: Zmrzlinárna
           kindergarten: Mateřská škola
           library: Knihovna
           market: Tržiště
           marketplace: Tržnice
-          mountain_rescue: Horská služba
           nightclub: Noční klub
           nursery: Jesle
           nursing_home: Pečovatelský dům
           office: Úřad
-          park: Park
           parking: Parkoviště
           pharmacy: Lékárna
           place_of_worship: Náboženský objekt
@@ -489,7 +481,6 @@ cs:
           prison: Věznice
           pub: Hospoda
           public_building: Veřejná budova
-          public_market: Veřejný trh
           reception_area: Recepce
           recycling: Tříděný odpad
           restaurant: Restaurace
@@ -498,13 +489,11 @@ cs:
           school: Škola
           shelter: Přístřeší
           shop: Obchod
-          shopping: Nákupní centrum
           shower: Sprchy
           social_centre: Společenské centrum
           social_club: Společenský klub
           social_facility: Zařízení sociálních služeb
           studio: Studio
-          supermarket: Supermarket
           swimming_pool: Bazén
           taxi: Taxi
           telephone: Telefonní automat
@@ -516,8 +505,6 @@ cs:
           veterinary: Veterinární ordinace
           village_hall: Společenský sál
           waste_basket: Odpadkový koš
-          wifi: Přístup k WiFi
-          WLAN: Přístup k WiFi
           youth_centre: Centrum pro mládež
         boundary:
           administrative: Administrativní hranice
@@ -533,13 +520,11 @@ cs:
         building:
           "yes": Budova
         emergency:
-          fire_hydrant: Požární hydrant
           phone: Nouzový telefon
         highway:
           bridleway: Koňská stezka
           bus_guideway: Autobusová dráha
           bus_stop: Autobusová zastávka
-          byway: Účelová komunikace
           construction: Silnice ve výstavbě
           cycleway: Cyklostezka
           emergency_access_point: Nouzový lokalizační bod
@@ -547,7 +532,6 @@ cs:
           ford: Brod
           living_street: Obytná zóna
           milestone: Kilometrovník
-          minor: Vedlejší silnice
           motorway: Dálnice
           motorway_junction: Dálniční křižovatka
           motorway_link: Dálnice
@@ -568,7 +552,6 @@ cs:
           speed_camera: Radar
           steps: Schody
           street_lamp: Pouliční lampa
-          stile: Schůdky přes ohradu
           tertiary: Silnice třetí třídy
           tertiary_link: Silnice třetí třídy
           track: Cesta
@@ -592,7 +575,6 @@ cs:
           memorial: Památník
           mine: Důl
           monument: Pomník
-          museum: Muzeum
           ruins: Zřícenina
           tomb: Náhrobek
           tower: Věž
@@ -620,9 +602,6 @@ cs:
           military: Vojenský prostor
           mine: Důl
           orchard: Ovocný sad
-          nature_reserve: Přírodní rezervace
-          park: Park
-          piste: Sjezdovka
           quarry: Lom
           railway: Železnice
           recreation_ground: Rekreační oblast
@@ -633,8 +612,6 @@ cs:
           road: Cesty
           village_green: Náves
           vineyard: Vinice
-          wetland: Mokřad
-          wood: Neudržovaný les
         leisure:
           beach_resort: Pobřežní letovisko
           bird_hide: Ptačí pozorovatelna
@@ -669,11 +646,9 @@ cs:
           beach: Pláž
           cape: Mys
           cave_entrance: Vstup do jeskyně
-          channel: Kanál
           cliff: Útes
           crater: Kráter
           dune: Duna
-          feature: Prvek
           fell: Fjell
           fjord: Fjord
           forest: Les
@@ -690,11 +665,9 @@ cs:
           point: Bod
           reef: Útes
           ridge: Hřeben
-          river: Řeka
           rock: Skalisko
           scree: Osyp
           scrub: Rumiště
-          shoal: Mělčina
           spring: Pramen
           stone: Kámen
           strait: Úžina
@@ -703,7 +676,6 @@ cs:
           volcano: Sopka
           water: Vodní plocha
           wetland: Mokřad
-          wetlands: Mokřad
           wood: Neudržovaný les
         office:
           accountant: Účetní
@@ -768,9 +740,6 @@ cs:
           switch: Výhybka
           tram: Tramvajová trať
           tram_stop: Tramvajová zastávka
-          yard: Přednádraží
-        route:
-          bus: Autobusová linka
         shop:
           alcohol: Prodej alkoholu
           antiques: Starožitnosti
@@ -859,12 +828,10 @@ cs:
           hostel: Hostel
           hotel: Hotel
           information: Turistické informace
-          lean_to: Přístřešek
           motel: Motel
           museum: Muzeum
           picnic_site: Piknikové místo
           theme_park: Zábavní park
-          valley: Údolí
           viewpoint: Vyhlídka
           zoo: Zoo
         tunnel:
@@ -874,7 +841,6 @@ cs:
           artificial: Umělý vodní kanál/průplav
           boatyard: Loděnice
           canal: Kanál
-          connector: Propojení vodních cest
           dam: Přehrada
           derelict_canal: Opuštěný kanál
           ditch: Meliorační kanál
@@ -882,15 +848,12 @@ cs:
           drain: Odvodňovací kanál
           lock: Zdymadlo
           lock_gate: Vrata plavební komory
-          mineral_spring: Minerální pramen
           mooring: Kotviště
           rapids: Peřeje
           river: Řeka
-          riverbank: Břeh řeky
           stream: Potok
           wadi: Vádí
           waterfall: Vodopád
-          water_point: Vodní bod
           weir: Jez
       admin_levels:
         level2: Státní hranice

config/locales/cy.yml

@@ -301,10 +301,8 @@ cy:
           gate: Giat
           helipad: Pad Hofrennydd
         amenity:
-          airport: Maes Awyr
           arts_centre: Canolfan Grefftau
           atm: Peiriant Codi Arian
-          auditorium: Awditoriwm
           bank: Banc
           bar: Bar
           bbq: Barbeciw
@@ -323,7 +321,6 @@ cy:
           charging_station: Gorsaf Gwefru
           cinema: Sinema
           clinic: Clinic
-          club: Clwb
           college: Coleg
           community_centre: Canolfan Cymunedol
           courthouse: Llys
@@ -341,21 +338,17 @@ cy:
           fuel: Tanwydd
           grave_yard: Mynwent
           gym: Canolfan Ffitrwydd / Campfa
-          hall: Neuadd
           health_centre: Canolfan Iechyd
           hospital: Ysbyty
-          hotel: Gwesty
           ice_cream: Hufen Iâ
           kindergarten: Meithrinfa
           library: Llyfrgell
           market: Marchnad
           marketplace: Marchnad
-          mountain_rescue: Achub bywyd mynydd
           nightclub: Clwb Nôs
           nursery: Meithrinfa
           nursing_home: Cartref Nyrsio
           office: Swyddfa
-          park: Parc
           parking: Parcio
           pharmacy: Fferyllfa
           place_of_worship: Man addoli
@@ -366,7 +359,6 @@ cy:
           prison: Carchar
           pub: Tafarn
           public_building: Adeilad Cyhoeddus
-          public_market: Marchnad Cyhoeddus
           reception_area: Derbyniad
           recycling: Pwynt Ailgylchu
           restaurant: Bwyty
@@ -375,13 +367,11 @@ cy:
           school: Ysgol
           shelter: Cysgod
           shop: Siop
-          shopping: Siopa
           shower: Cawod
           social_centre: Canolfan Cymdeithasol
           social_club: Clwb Cymdeithasol
           social_facility: Cyfleuster cymedithasol
           studio: Stiwdio
-          supermarket: Archfarchnad
           swimming_pool: Pwll Nofio
           taxi: Tacsi
           telephone: Ffôn Cyhoeddus
@@ -392,8 +382,6 @@ cy:
           veterinary: Milfeddygfa
           village_hall: Neuadd Bentref
           waste_basket: Bin sbwriel
-          wifi: Mynediad WiFi
-          WLAN: Mynediad WiFi
           youth_centre: Canolfan Ieuenctid
         boundary:
           census: Ffin Cyfrifiad
@@ -417,7 +405,6 @@ cy:
           footway: Llwybr Cerdded
           ford: Rhyd
           milestone: Carreg Filltir
-          minor: Ffordd Gefn
           motorway: Traffordd
           motorway_junction: Cyffordd Traffordd
           motorway_link: Ffordd Traffordd
@@ -435,7 +422,6 @@ cy:
           speed_camera: Camera Cyflymder
           steps: Grisiau
           street_lamp: Golau Stryd
-          stile: Camfa
           tertiary: Ffordd Trydyddol
           tertiary_link: Ffordd Trydyddol
           track: Trac
@@ -459,7 +445,6 @@ cy:
           memorial: Cofeb
           mine: Mwynfa
           monument: Cofadail
-          museum: Amgueddfa
           ruins: Adfeilion
           tomb: Beddrod
           tower: Tŵr
@@ -487,9 +472,6 @@ cy:
           military: Ardal Milwrol
           mine: Mwynglawdd
           orchard: Berllan
-          nature_reserve: Gwarchodfa Natur
-          park: Parc
-          piste: Piste
           quarry: Chwarel
           railway: Rheilffordd
           recreation_ground: Maes Chwarae
@@ -497,8 +479,6 @@ cy:
           retail: Adwerthu
           village_green: Llain Pentref
           vineyard: Gwinllan
-          wetland: Gwlypdir
-          wood: Coed
         leisure:
           beach_resort: Ardal Wyliau
           common: Tir Comin
@@ -531,11 +511,9 @@ cy:
           beach: Traeth
           cape: Penrhyn
           cave_entrance: Mynediad Ogof
-          channel: Culfor
           cliff: Clogwyn
           crater: Crater
           dune: Twyn
-          feature: Nodwedd
           fjord: Ffiord
           forest: Coedwig
           geyser: Geiser
@@ -551,10 +529,8 @@ cy:
           point: Pwynt
           reef: Riff
           ridge: Cefn
-          river: Afon
           rock: Craig
           scree: Sgri
-          shoal: Haig
           spring: Ffynnon
           stone: Carreg
           strait: Culfor
@@ -563,7 +539,6 @@ cy:
           volcano: Llosgfynydd
           water: Dŵr
           wetland: Gwlypdir
-          wetlands: Gwlypdiroedd
           wood: Coed
         office:
           accountant: Cyfrifydd
@@ -622,9 +597,6 @@ cy:
           subway_entrance: Mynedfa at Drenau Tanddaearol
           tram: Tramffordd
           tram_stop: Stop Tramiau
-          yard: Buarth Drenau
-        route:
-          bus: Taith Bws
         shop:
           alcohol: Siop Drwyddedig
           antiques: Hynafolion
@@ -717,7 +689,6 @@ cy:
           museum: Amgueddfa
           picnic_site: Safle Picnic
           theme_park: Parc Thema
-          valley: Dyffryn
           viewpoint: Gwylfa
           zoo: Sw
         tunnel:
@@ -732,15 +703,12 @@ cy:
           drain: Draen
           lock: Loc
           lock_gate: Llifddor
-          mineral_spring: Ffynnon Dŵr Mwynol
           mooring: Angori
           rapids: Dŵr Tyrfol
           river: Afon
-          riverbank: Glan Afon
           stream: Nant
           wadi: Sychnant
           waterfall: Rheadr
-          water_point: Pwynt Dŵr
           weir: Cored
       admin_levels:
         level2: Ffin Gwledydd

config/locales/da.yml

@@ -417,11 +417,8 @@ da:
           taxiway: Rullevej
           terminal: Terminal
         amenity:
-          airport: Lufthavn
           arts_centre: Kunstcenter
-          artwork: Kunst
           atm: Pengeautomat
-          auditorium: Auditorium
           bank: Bank
           bar: Bar
           bbq: Grill
@@ -440,7 +437,6 @@ da:
           charging_station: Ladestation
           cinema: Biograf
           clinic: Klinik
-          club: Klub
           college: Videregående uddanelsesinstitution
           community_centre: Forsamlingshus / lokalcenter
           courthouse: Retsbygning
@@ -461,22 +457,18 @@ da:
           fuel: Benzinstation
           grave_yard: Kirkegård
           gym: Træningscenter
-          hall: Forsamlingshal
           health_centre: Sundhedscenter
           hospital: Sygehus
-          hotel: Hotel
           hunting_stand: Jagtplatform
           ice_cream: Is
           kindergarten: Børnehave
           library: Bibliotek
           market: Marked
           marketplace: Markedsplads
-          mountain_rescue: Bjergredning
           nightclub: Natklub
           nursery: Førskole
           nursing_home: Plejehjem
           office: Kontor
-          park: Park
           parking: Parkering
           pharmacy: Apotek
           place_of_worship: Sted for gudstjenester
@@ -487,7 +479,6 @@ da:
           prison: Fængsel
           pub: Pub
           public_building: Offentlig bygning
-          public_market: Offentligt marked
           reception_area: Modtagelsesområde
           recycling: Genbrugsstation
           restaurant: Restaurant
@@ -496,13 +487,11 @@ da:
           school: Skole
           shelter: Shelter
           shop: Forretning
-          shopping: Indkøb
           shower: Brusebad
           social_centre: Socialcenter
           social_club: Social klub
           social_facility: Socialforsogsfacilitet
           studio: Studie
-          supermarket: Supermarked
           swimming_pool: Swimmingpool
           taxi: Taxa
           telephone: Offentlig telefon
@@ -514,8 +503,6 @@ da:
           veterinary: Dyrlæge
           village_hall: Forsamlingshus
           waste_basket: Skraldespand
-          wifi: WiFi-adgangspunkt
-          WLAN: WiFi-adgangspunkt
           youth_centre: Ungdomscenter
         boundary:
           administrative: Administrativ grænse
@@ -531,13 +518,11 @@ da:
         building:
           "yes": Bygning
         emergency:
-          fire_hydrant: Brandhane
           phone: Nødtelefon
         highway:
           bridleway: Ridesti
           bus_guideway: Styret busspor
           bus_stop: Busstoppested
-          byway: Stikvej
           construction: Vej under konstruktion
           cycleway: Cykelsti
           emergency_access_point: Nødudgangspunkt
@@ -545,7 +530,6 @@ da:
           ford: Vadested
           living_street: Vej med legende børn
           milestone: Milepæl
-          minor: Mindre vej
           motorway: Motorvej
           motorway_junction: Motorvejsafkørsel
           motorway_link: Af-/tilkørsel til motorvej
@@ -566,7 +550,6 @@ da:
           speed_camera: Fartkamera
           steps: Trappe
           street_lamp: Gadelygte
-          stile: Fåretrappe
           tertiary: Hovedvej
           tertiary_link: Hovedvej
           track: Hjulspor
@@ -590,7 +573,6 @@ da:
           memorial: Mindesmærke
           mine: Mine
           monument: Monument
-          museum: Museum
           ruins: Ruin
           tomb: Grav
           tower: Tårn
@@ -618,9 +600,6 @@ da:
           military: Militært område
           mine: Mine
           orchard: Plantage
-          nature_reserve: Naturreservat
-          park: Park
-          piste: Piste
           quarry: Stenbrud/grusgrav
           railway: Jernbane
           recreation_ground: Idrætsplads
@@ -631,8 +610,6 @@ da:
           road: Vejområde
           village_green: Forte
           vineyard: Vingård
-          wetland: Vådområde
-          wood: Skov
         leisure:
           beach_resort: Badestrand
           bird_hide: Fugleskjul
@@ -667,11 +644,9 @@ da:
           beach: Strand
           cape: Odde
           cave_entrance: Huleindgang
-          channel: Kanal
           cliff: Forbjerg
           crater: Krater
           dune: Klit
-          feature: Landskabsdetalje
           fell: Fjeld
           fjord: Fjord
           forest: Skov
@@ -688,11 +663,9 @@ da:
           point: Punkt
           reef: Rev
           ridge: Bjergkam
-          river: Flod
           rock: Klippe
           scree: Klint
           scrub: Krat
-          shoal: Sandbanke
           spring: Kilde
           stone: Sten
           strait: Sund
@@ -701,7 +674,6 @@ da:
           volcano: Vulkan
           water: Vand
           wetland: Vådområde
-          wetlands: Vådområder
           wood: Skov
         office:
           accountant: Revisor
@@ -766,9 +738,6 @@ da:
           switch: Sporskifte
           tram: Sporvej
           tram_stop: Sporvognsstoppested
-          yard: Jernbaneterræn
-        route:
-          bus: Busrute
         shop:
           alcohol: Spiritusforretning
           antiques: Antikviteter
@@ -857,12 +826,10 @@ da:
           hostel: Vandrerhjem
           hotel: Hotel
           information: Turistinformation
-          lean_to: Ly
           motel: Motel
           museum: Museum
           picnic_site: Picnicsted
           theme_park: Forlystelsespark
-          valley: Dal
           viewpoint: Udsigtspunkt
           zoo: Zoologisk have
         tunnel:
@@ -872,7 +839,6 @@ da:
           artificial: Kunstig vandvej
           boatyard: Bådeværft
           canal: Kanal
-          connector: Vandvejsforbindelse
           dam: Dæmning
           derelict_canal: Nedlagt kanal
           ditch: Grøft
@@ -880,15 +846,12 @@ da:
           drain: Afløb
           lock: Sluse
           lock_gate: Sluseport
-          mineral_spring: Mineralsk kilde
           mooring: Fortøjning
           rapids: Stryg
           river: Flod
-          riverbank: Flodbred
           stream: Bæk
           wadi: Flodseng
           waterfall: Vandfald
-          water_point: Vandpunkt
           weir: Overløbsdæmning
       admin_levels:
         level2: Landegrænse

config/locales/de.yml

@@ -438,11 +438,8 @@ de:
           taxiway: Rollbahn
           terminal: Terminal
         amenity:
-          airport: Flughafen
           arts_centre: Kulturzentrum
-          artwork: Kunstwerk
           atm: Geldautomat
-          auditorium: Hörsaal
           bank: Bank
           bar: Bar
           bbq: Grillplatz
@@ -459,9 +456,10 @@ de:
           car_wash: Autowaschanlage
           casino: Casino
           charging_station: Ladestation
+          childcare: Kinderbetreuung
           cinema: Kino
           clinic: Krankenhaus
-          club: Club
+          clock: Uhr
           college: Hochschule
           community_centre: Gemeindezentrum
           courthouse: Gericht
@@ -482,22 +480,18 @@ de:
           fuel: Tankstelle
           grave_yard: Friedhof
           gym: Fitnessstudio
-          hall: Halle
           health_centre: Gesundheitszentrum
           hospital: Krankenhaus
-          hotel: Hotel
           hunting_stand: Hochstand
           ice_cream: Eisdiele
           kindergarten: Kindergarten
           library: Bücherei
           market: Markt
           marketplace: Marktplatz
-          mountain_rescue: Bergrettung
           nightclub: Nachtklub
           nursery: Kindertagesstätte
           nursing_home: Altersheim
           office: Büro
-          park: Park
           parking: Parkplatz
           pharmacy: Apotheke
           place_of_worship: Andachtsstätte
@@ -508,7 +502,6 @@ de:
           prison: Gefängnis
           pub: Pub
           public_building: Öffentliches Gebäude
-          public_market: Öffentlicher Markt
           reception_area: Empfangsbereich
           recycling: Recycling-Center
           restaurant: Restaurant
@@ -517,13 +510,11 @@ de:
           school: Schule
           shelter: Unterstand
           shop: Geschäft
-          shopping: Einkaufszentrum
           shower: Dusche
           social_centre: Sozialzentrum
           social_club: Social Club
           social_facility: Soziale Einrichtung
           studio: Studio
-          supermarket: Supermarkt
           swimming_pool: Schwimmbecken
           taxi: Taxi
           telephone: Telefonzelle
@@ -535,8 +526,7 @@ de:
           veterinary: Tierarzt
           village_hall: Gemeindeamt
           waste_basket: Mülleimer
-          wifi: WLAN-Zugangspunkt
-          WLAN: WLAN-Zugangspunkt
+          waste_disposal: Abfallentsorgung
           youth_centre: Jugendzentrum
         boundary:
           administrative: Verwaltungsgrenze
@@ -551,22 +541,29 @@ de:
           "yes": Brücke
         building:
           "yes": Gebäude
+        craft:
+          brewery: Brauerei
+          carpenter: Zimmermann
+          electrician: Elektriker
+          gardener: Gärtner
+          painter: Maler
+          photographer: Fotograf
+          shoemaker: Schuhmacher
+          "yes": Handwerksgeschäft
         emergency:
-          fire_hydrant: Hydrant
           phone: Notrufsäule
         highway:
           bridleway: Reitweg
           bus_guideway: Busspur
           bus_stop: Bushaltestelle
-          byway: Seitenweg (brit.)
           construction: Straße im Bau
           cycleway: Radweg
+          elevator: Lift
           emergency_access_point: Notrufpunkt
           footway: Fußweg
           ford: Furt
           living_street: Spiel-/Wohnstraße
           milestone: Kilometerstein
-          minor: Nebenstraße
           motorway: Autobahn
           motorway_junction: Autobahnausfahrt/-kreuz
           motorway_link: Autobahnauffahrt
@@ -587,15 +584,16 @@ de:
           speed_camera: Blitzer
           steps: Treppe
           street_lamp: Straßenlaterne
-          stile: Zaunübertritt
           tertiary: Gemeindestraße
           tertiary_link: Tertiärstraße-Auffahrt
           track: Feldweg
+          traffic_signals: Lichtzeichenanlage
           trail: Pfad
           trunk: Schnellstraße
           trunk_link: Schnellstraßenauffahrt
           unclassified: Straße
           unsurfaced: Nichtasphaltierte Straße
+          "yes": Straße
         historic:
           archaeological_site: Ausgrabungsstätte
           battlefield: Kampfgebiet
@@ -603,6 +601,7 @@ de:
           building: Historisches Gebäude
           castle: Schloss
           church: Kirche
+          city_gate: Stadttor
           citywalls: Stadtmauern
           fort: Fort
           house: Historisches Haus
@@ -611,7 +610,6 @@ de:
           memorial: Denkmal
           mine: Mine
           monument: Monument
-          museum: Museum
           ruins: Ruine
           tomb: Grabstätte
           tower: Historischer Turm
@@ -639,9 +637,6 @@ de:
           military: Militärgebiet
           mine: Mine
           orchard: Obstgarten
-          nature_reserve: Naturschutzgebiet
-          park: Park
-          piste: Piste
           quarry: Steinbruch
           railway: Bahnkörper
           recreation_ground: Erholungsgebiet
@@ -652,16 +647,17 @@ de:
           road: Straßenfläche
           village_green: Dorfwiese (brit.)
           vineyard: Weingut
-          wetland: Feuchtgebiet
-          wood: Wald
         leisure:
           beach_resort: Strandbad
           bird_hide: Vogelbeobachtungshütte
           common: öffentliche Grünfläche (brit.)
+          dog_park: Hundepark
           fishing: Fischereigrund
+          fitness_centre: Fitnessstudio
           fitness_station: Fitnessstudio
           garden: Garten
           golf_course: Golfplatz
+          horse_riding: Reiten
           ice_rink: Eislaufplatz
           marina: Sporthafen
           miniature_golf: Minigolf
@@ -677,6 +673,10 @@ de:
           swimming_pool: Schwimmbecken
           track: Laufbahn
           water_park: Wasserpark
+        man_made:
+          lighthouse: Leuchtturm
+          tower: Turm
+          works: Fabrik
         military:
           airfield: Militärflugplatz
           barracks: Kaserne
@@ -688,16 +688,15 @@ de:
           beach: Strand
           cape: Kap
           cave_entrance: Höhleneingang
-          channel: Kanal
           cliff: Klippe
           crater: Krater
           dune: Düne
-          feature: Feature
           fell: Weide
           fjord: Fjord
           forest: Wald
           geyser: Geysir
           glacier: Gletscher
+          grassland: Wiese
           heath: Heide
           hill: Hügel
           island: Insel
@@ -709,11 +708,11 @@ de:
           point: Punkt
           reef: Riff
           ridge: Grat
-          river: Fluss
           rock: Steine
+          saddle: Pass
+          sand: Sand
           scree: Geröll
           scrub: Buschland
-          shoal: Untiefe
           spring: Quelle
           stone: Findling
           strait: Straße
@@ -722,10 +721,10 @@ de:
           volcano: Vulkan
           water: Wasser
           wetland: Feuchtgebiet
-          wetlands: Feuchtgebiet
           wood: Wald
         office:
           accountant: Buchhaltungsbüro
+          administrative: Verwaltung
           architect: Architekt
           company: Unternehmen
           employment_agency: Arbeitsamt
@@ -762,6 +761,7 @@ de:
           town: Stadt
           unincorporated_area: Gemeindefreies Gebiet
           village: Dorf
+          "yes": Ort
         railway:
           abandoned: Aufgelassene Bahnstrecke
           construction: Eisenbahn im Bau
@@ -787,9 +787,6 @@ de:
           switch: Weiche
           tram: Straßenbahn
           tram_stop: Haltestelle
-          yard: Rangierbahnhof
-        route:
-          bus: Buslinie
         shop:
           alcohol: Spirituosenladen
           antiques: Antiquitätengeschäft
@@ -867,6 +864,7 @@ de:
           "yes": Geschäft
         tourism:
           alpine_hut: Berghütte
+          apartment: Apartment
           artwork: Kunstwerk
           attraction: Sehenswürdigkeit
           bed_and_breakfast: Bed and Breakfast
@@ -874,16 +872,15 @@ de:
           camp_site: Campingplatz
           caravan_site: Wohnmobile-Stellplatz
           chalet: Chalet
+          gallery: Galerie
           guest_house: Pension
           hostel: Jugendherberge
           hotel: Hotel
           information: Information
-          lean_to: Unterstand
           motel: Motel
           museum: Museum
           picnic_site: Piknikplatz
           theme_park: Freizeitpark
-          valley: Tal
           viewpoint: Aussichtspunkt
           zoo: Zoo
         tunnel:
@@ -893,7 +890,6 @@ de:
           artificial: Künstliche Wasserstraße
           boatyard: Werft
           canal: Kanal
-          connector: Wasserstraßenverbindung
           dam: Staudamm
           derelict_canal: Aufgelassener Kanal
           ditch: Wassergraben
@@ -901,16 +897,14 @@ de:
           drain: Abwassergraben
           lock: Schleuse
           lock_gate: Schleusentor
-          mineral_spring: Mineralquelle
           mooring: Anlegeplatz
           rapids: Stromschnellen
           river: Fluss
-          riverbank: Flussufer
           stream: Bach
           wadi: Trockental
           waterfall: Wasserfall
-          water_point: Trinkwassernachfüllstation
           weir: Wehr
+          "yes": Wasserstraße
       admin_levels:
         level2: Staatsgrenze
         level4: Landesgrenze
@@ -1443,15 +1437,15 @@ de:
       close: Schließen
     search:
       search: Suchen
+      get_directions: Route berechnen
+      get_directions_title: Routenberechnung zwischen zwei Orten
+      close_directions: Schliessen der Route
+      close_directions_title: Schliessen des Routenmenus
+      from: Von
+      to: Nach
       where_am_i: Wo bin ich?
       where_am_i_title: Die momentane Position mit der Suchmaschine anzeigen
       submit_text: Los
-      get_directions: "Route berechnen"
-      get_directions_title: "Routenberechnung zwischen zwei Orten"
-      close_directions: "Schliessen der Route"
-      close_directions_title: "Schliessen des Routenmenus"
-      from: "Von"
-      to: "Nach"
     key:
       table:
         entry:
@@ -2335,39 +2329,39 @@ de:
     edit_help: Wähle eine höhere Zoomstufe und verschiebe die Karte an einen Ort,
       den du bearbeiten möchtest, und klicke hier.
     directions:
-      directions: "Fahranweisungen: "
       engines:
-        graphhopper_bicycle: "Fahrrad (GraphHopper)"
-        graphhopper_foot: "Fuss (GraphHopper)"
-        mapquest_bicycle: "Fahrrad (MapQuest)"
-        mapquest_foot: "Fuss (MapQuest)"
-        mapquest_car: "Auto (MapQuest)"
-        osrm_car: "Auto (OSRM)"
-      distance: "Distanz:"
-      time: "Zeit:"
+        graphhopper_bicycle: Fahrrad (GraphHopper)
+        graphhopper_foot: Fuss (GraphHopper)
+        mapquest_bicycle: Fahrrad (MapQuest)
+        mapquest_car: Auto (MapQuest)
+        mapquest_foot: Fuss (MapQuest)
+        osrm_car: Auto (OSRM)
+      directions: 'Fahranweisungen:'
+      distance: 'Distanz:'
       errors:
-        no_route: "Wir konnten keine Strecke zwischen diesen beiden Orten berechnen."
-        no_place: "Wir konnten den Ort nicht finden."
+        no_route: Wir konnten keine Strecke zwischen diesen beiden Orten berechnen.
+        no_place: Wir konnten den Ort nicht finden.
       instructions:
-        continue_on: "Weiter auf "
-        slight_right: "Rechts halten auf "
-        turn_right: "Rechts abbiegen auf "
-        sharp_right: "Hart rechts auf "
-        uturn: "U-turn along "
-        sharp_left: "Hart links auf "
-        turn_left: "Links abbiegen auf "
-        slight_left: "Links halten auf "
-        via_point: "(via point) "
-        follow:  "Folge "
-        roundabout: "Im Kreisverkehr nehme "
-        leave_roundabout: "Verlasse den Kreisverkehr - "
-        stay_roundabout: "Stay on roundabout - "
-        start: "Start at end of "
-        destination: "Ziel erreicht"
-        against_oneway: "Go against one-way on "
-        end_oneway: "Ende der Einbahnstrasse "
-        unnamed: "(unbekannt)"
-        courtesy: "Fahranweisungen stammen von %{link}"
+        continue_on: Weiter auf
+        slight_right: Rechts halten auf
+        turn_right: Rechts abbiegen auf
+        sharp_right: Hart rechts auf
+        uturn: U-turn along
+        sharp_left: Hart links auf
+        turn_left: Links abbiegen auf
+        slight_left: Links halten auf
+        via_point: (via point)
+        follow: Folge
+        roundabout: Im Kreisverkehr nehme
+        leave_roundabout: Verlasse den Kreisverkehr -
+        stay_roundabout: Stay on roundabout -
+        start: Start at end of
+        destination: Ziel erreicht
+        against_oneway: Go against one-way on
+        end_oneway: Ende der Einbahnstrasse
+        unnamed: (unbekannt)
+        courtesy: Fahranweisungen stammen von %{link}
+      time: 'Zeit:'
     query:
       node: Knoten
       way: Weg

config/locales/diq.yml

@@ -204,11 +204,8 @@ diq:
           taxiway: Raya Texsiyan
           terminal: Terminal
         amenity:
-          airport: Havaherun
           arts_centre: Merkeze Zagoni
-          artwork: Zagonkar
           atm: ATM
-          auditorium: Oditoryum
           bank: Banka
           bar: Bar
           bbq: BBQ
@@ -227,7 +224,6 @@ diq:
           charging_station: İstasyona Pırkerden
           cinema: Sinema
           clinic: Klinik
-          club: Klub
           college: Lise
           community_centre: Merkezê Cemeati
           courthouse: Adliye
@@ -247,22 +243,18 @@ diq:
           fuel: Petrol
           grave_yard: Mezla ser
           gym: Merkeza Fitnessi / Salona Spori
-          hall: Cuwên
           health_centre: Merkeza Weşiney
           hospital: Nêweşxane
-          hotel: Hotel
           hunting_stand: Standê Seydwanan
           ice_cream: Dondırme
           kindergarten: Kreş
           library: Kıtıbxane
           market: Market
           marketplace: Heruna bazari
-          mountain_rescue: Kora rReynayen
           nightclub: Kluba Şewer
           nursery: Kreş
           nursing_home: Rehatxane
           office: Ofis
-          park: Perk
           parking: Otopark
           pharmacy: Eczaxane
           place_of_worship: Bawerxane
@@ -273,7 +265,6 @@ diq:
           prison: Hepısxane
           pub: Biraxane
           public_building: Binaya Şaran
-          public_market: Bazarê Şaran
           reception_area: Heruna Resepsiyoni
           recycling: Heruna peyd amayışi
           restaurant: Restaurant
@@ -282,12 +273,10 @@ diq:
           school: Wendxane
           shelter: Starek
           shop: Dukan
-          shopping: Merkezê dayışgrotışi
           shower: Çımecek
           social_centre: Merkezo Sosyal
           social_club: Kluba Sosyal
           studio: Studyo
-          supermarket: Supermarket
           swimming_pool: Dola Asnawkerdışi
           taxi: Taksi
           telephone: Telafun
@@ -299,8 +288,6 @@ diq:
           veterinary: Veteriner
           village_hall: Wedey Dewer
           waste_basket: Tenkey Sıloy
-          wifi: Heruna WiFi
-          WLAN: Heruna WiFi
           youth_centre: Merkezê Gencan
         boundary:
           administrative: Sinorê İdari
@@ -313,13 +300,11 @@ diq:
         highway:
           bridleway: Raya Estoran
           bus_stop: İstasyonê Otobozan
-          byway: Raya Bınêk
           cycleway: Raya Bisikleter
           emergency_access_point: Cayê vistra resnayışi
           footway: Raya geyrayışi
           ford: Balan
           living_street: Kuçey Cıwiyayışi
-          minor: Raya Werkek
           motorway: Otoray
           motorway_junction: Kewşaxa Otorayer
           motorway_link: Raya Otoray
@@ -334,7 +319,6 @@ diq:
           road: Ray
           speed_camera: Kemeraya Vıstrın
           steps: Merwani
-          stile: Gamena Çitan
           tertiary: Raya Dewan
           track: Raya Herın
           trail: Şop
@@ -348,7 +332,6 @@ diq:
           memorial: Qub
           mine: Mahden
           monument: Ziyarık
-          museum: Muza
           ruins: Pagi
           tower: Kule
         landuse:
@@ -364,9 +347,6 @@ diq:
           military: Eskeri Mıntıqa
           mine: Mahden
           orchard: Hêga
-          nature_reserve: Cayê Gem Starkerden
-          park: Perk
-          piste: Pist
           railway: Rayatiran
           reservoir: Dola Beraci
         leisure:
@@ -378,10 +358,8 @@ diq:
           bunker: Stare
         natural:
           beach: Plac
-          channel: Kenal
           crater: Krater
           dune: Kımıl
-          feature: Weçinaye
           fell: Gedugo wışk
           forest: Mêşe
           geyser: Gayzer
@@ -391,9 +369,7 @@ diq:
           land: Wer
           peak: Gıl /sersıq
           reef: Resif
-          river: Ro
           scree: Heyelan
-          shoal: Wesin
           spring: Ênêk
           stone: Kemere
           strait: Balan
@@ -402,7 +378,6 @@ diq:
           volcano: Wolkan
           water: Aw
           wetland: awe
-          wetlands: Awi
           wood: Meşe
         office:
           accountant: Muhasebedar
@@ -748,7 +723,7 @@ diq:
       nearby mapper: Xeritoğo emıryan
       friend: Embaz
     account:
-      title: Hesabi timar ke
+      title: Hesabi bıvurne
       my settings: Eyarê mı
       current email address: 'E-postay şımaya newki:'
       new email address: 'E-postay adresiyo newe:'

config/locales/dsb.yml

@@ -387,11 +387,8 @@ dsb:
           taxiway: Lětadłowa cera
           terminal: Terminal
         amenity:
-          airport: Lětanišćo
           arts_centre: Kulturny centrum
-          artwork: Wuměłska twórba
           atm: Pjenjezny awtomat
-          auditorium: Awditorium
           bank: Banka
           bar: Bara
           bbq: Grilowanišćo
@@ -410,7 +407,6 @@ dsb:
           charging_station: Napołnjowańska stacija
           cinema: Kino
           clinic: Klinika
-          club: Klub
           college: Wusoka šula
           community_centre: Komunikaciski centrum
           courthouse: Sudnistwo
@@ -431,22 +427,18 @@ dsb:
           fuel: Tankownja
           grave_yard: Kjarchob
           gym: Fitnesowy centrum
-          hall: Hala
           health_centre: Strowotniski centrum
           hospital: Chórownja
-          hotel: Hotel
           hunting_stand: Góntwarske sedło
           ice_cream: Lod
           kindergarten: Źiśownja
           library: Knigłownja
           market: Wiki
           marketplace: Wikowanišćo
-          mountain_rescue: Górska wumóžarska słužba
           nightclub: Nocny klub
           nursery: Źiśownja
           nursing_home: Wótwardowarnja
           office: Běrow
-          park: Park
           parking: Parkowanišćo
           pharmacy: Aptejka
           place_of_worship: Bóžy dom
@@ -457,7 +449,6 @@ dsb:
           prison: Popajźeństwo
           pub: Kjarcma
           public_building: Zjawne twarjenje
-          public_market: Zjawny mark
           reception_area: Wobcerk pśidostaśa
           recycling: Zběranišćo starowinow
           restaurant: Gósćeńc
@@ -466,13 +457,11 @@ dsb:
           school: Šula
           shelter: Pódstup
           shop: Pśekupnica
-          shopping: Nakupowanišćo
           shower: Duša
           social_centre: Socialny centrum
           social_club: Towarišliwostny klub
           social_facility: Socialna institucija
           studio: Studijo
-          supermarket: Supermark
           swimming_pool: Plěwarnja
           taxi: Taksijowe městno
           telephone: Zjawny telefon
@@ -484,8 +473,6 @@ dsb:
           veterinary: Skótny gójc
           village_hall: Gmejnski centrum
           waste_basket: Sudobje za wótpadanki
-          wifi: WiFi-pśistup
-          WLAN: WLAN-pśistup
           youth_centre: Młoźinski centrum
         boundary:
           administrative: Zastojnstwowa granica
@@ -501,13 +488,11 @@ dsb:
         building:
           "yes": Twarjenje
         emergency:
-          fire_hydrant: Hydrant
           phone: Słup za nuzowe zawołanje
         highway:
           bridleway: Rejtarska drožka
           bus_guideway: Jězdna kólej kólejowego busa
           bus_stop: Busowe zastanišćo
-          byway: Pódlańska droga
           construction: Dalokowobchadowa droga se twari
           cycleway: Sćažka za kólasowarjow
           emergency_access_point: Nuzowa słužba
@@ -515,7 +500,6 @@ dsb:
           ford: Brod
           living_street: Droga z pómjeńšonym wobchadom
           milestone: Kilometrownik
-          minor: Bocna droga
           motorway: Awtodroga
           motorway_junction: Kśica awtodrogi
           motorway_link: Zajězd na awtodrogu
@@ -536,7 +520,6 @@ dsb:
           speed_camera: Błyskowak
           steps: Stupy
           street_lamp: Pśidrožna latarnja
-          stile: Płotowy pśestup
           tertiary: Droga tśeśego rěda
           tertiary_link: Droga tśeśego rěda
           track: Pólna drožka
@@ -560,7 +543,6 @@ dsb:
           memorial: Wopomnišćo
           mine: Pódkopy
           monument: Pomnik
-          museum: Muzeum
           ruins: Ruiny
           tomb: Row
           tower: Torm
@@ -588,9 +570,6 @@ dsb:
           military: Militarny wobcerk
           mine: Pódkopy
           orchard: Sadownja
-          nature_reserve: Strony šćitaneje pśirody
-          park: Park
-          piste: Pista
           quarry: Skała
           railway: Zeleznica
           recreation_ground: Wódychańske strony
@@ -601,8 +580,6 @@ dsb:
           road: Drogowy wobcerk
           village_green: Wejsny najs
           vineyard: Winowe kubło
-          wetland: Mokšy teren
-          wood: Lěs
         leisure:
           beach_resort: Mórske kupjele
           bird_hide: Schow za ptaški
@@ -637,11 +614,9 @@ dsb:
           beach: Pśibrjog
           cape: Kap
           cave_entrance: Jamowy zachod
-          channel: Kanal
           cliff: Skalina
           crater: Krater
           dune: Změt pěska
-          feature: Funkcija
           fell: Fjel
           fjord: Fjord
           forest: Góla
@@ -658,11 +633,9 @@ dsb:
           point: Městno
           reef: Riff
           ridge: Górski grjebjeń
-          river: Rěka
           rock: Skała
           scree: Kamjenišćo
           scrub: Krě
-          shoal: Měłkosć
           spring: Žrědło
           stone: Kamjeń
           strait: Mórska wuscyna
@@ -671,7 +644,6 @@ dsb:
           volcano: Wulkan
           water: Wódy
           wetland: Ługowe łuki
-          wetlands: Ługowe łuki
           wood: Lěs
         office:
           accountant: Knigływjeźeński běrow
@@ -736,7 +708,6 @@ dsb:
           switch: Pśestajadło
           tram: Elektriska
           tram_stop: Zastanišćo elektriskeje
-          yard: Ranžěrowańske dwórnišćo
         shop:
           alcohol: Wobchod za spirituoze
           antiques: Wobchod za starobki
@@ -825,12 +796,10 @@ dsb:
           hostel: Młodownja
           hotel: Hotel
           information: Informacije
-          lean_to: Pśitwaŕ
           motel: Motel
           museum: Muzeum
           picnic_site: Piknikowanišćo
           theme_park: Rozwjaseleński park
-          valley: Doł
           viewpoint: Rozglědanišćo
           zoo: Coo
         tunnel:
@@ -840,7 +809,6 @@ dsb:
           artificial: Kumštna wódna droga
           boatyard: Ŀoźnica
           canal: Kanal
-          connector: Zwisk mjazy wódnymi drogami
           dam: Zagaśica
           derelict_canal: Zanjerózony kanal
           ditch: Grobla
@@ -848,15 +816,12 @@ dsb:
           drain: Wótwódowy kanal
           lock: Pušćalnica
           lock_gate: Pušćalnicowe wrota
-          mineral_spring: Žrědło mineralneje wódy
           mooring: Pśistajenje
           rapids: Pśejmy rěki
           river: Rěka
-          riverbank: Rěcyny brjog
           stream: Rěcka
           wadi: Wadi
           waterfall: Wódopad
-          water_point: Wódne městno
           weir: Gaśeńska murja
       admin_levels:
         level2: Statna granica

config/locales/el.yml

@@ -229,6 +229,10 @@ el:
         από %{when}</abbr>
       hidden_by: Έγινε κρυφή από τον %{user} <abbr title='%{exact_time}'>πριν από
         %{when}</abbr>
+    query:
+      title: Πληροφορίες Χαρακτηριστικών
+      introduction: Κάντε κλικ στον χάρτη για να βρείτε κοντινά χαρακτηριστικά.
+      nearby: Κοντινά χαρακτηριστικά
   changeset:
     changeset_paging_nav:
       showing_page: Σελίδα %{page}
@@ -260,6 +264,8 @@ el:
       sorry: Λυπάμαι, ο κατάλογος των ομάδων αλλαγών που ζήτησες χρειάστηκε πολύ χρόνο
         για να ανακτηθεί.
     rss:
+      commented_at_html: Ενημερώθηκε %{when} πριν
+      commented_at_by_html: Ενημερώθηκε %{when} πριν από τον %{user}
       full: Πλήρης συζήτηση
   diary_entry:
     new:
@@ -415,11 +421,8 @@ el:
           taxiway: Τροχιόδρομος
           terminal: Τερματικός Σταθμός
         amenity:
-          airport: Αεροδρόμιο
           arts_centre: Κέντρο Τεχνών
-          artwork: Έργο Τέχνης
           atm: ΑΤΜ
-          auditorium: Αμφιθέατρο
           bank: Τράπεζα
           bar: Μπαρ
           bbq: Ψησταριά
@@ -438,7 +441,6 @@ el:
           charging_station: Σταθμός Φόρτισης
           cinema: Κινηματογράφος
           clinic: Κλινική
-          club: Club
           college: Κολέγιο
           community_centre: Κοινοτικό Κέντρο
           courthouse: Δικαστήριο
@@ -459,22 +461,18 @@ el:
           fuel: Καύσιμα
           grave_yard: Νεκροταφείο
           gym: Γυμναστήριο
-          hall: Αίθουσα
           health_centre: Κέντρο Υγείας
           hospital: Νοσοκομείο
-          hotel: Ξενοδοχείο
           hunting_stand: Κυνηγητικό Κιόσκι
           ice_cream: Παγωτό
           kindergarten: Νηπιαγωγείο
           library: Βιβλιοθήκη
           market: Αγορά
           marketplace: Αγορά
-          mountain_rescue: Ορεινή Διάσωση
           nightclub: Νυχτερινό Κέντρο
           nursery: Παιδικός Σταθμός
           nursing_home: Οίκος Ευγηρίας
           office: Γραφείο
-          park: Πάρκο
           parking: Χώρος Στάθμευσης
           pharmacy: Φαρμακείο
           place_of_worship: Τόπος Λατρείας
@@ -485,7 +483,6 @@ el:
           prison: Φυλακή
           pub: Παμπ
           public_building: Δημόσιο Κτίριο
-          public_market: Δημόσια Αγορά
           reception_area: Χώρος Υποδοχής
           recycling: Σημείο Ανακύκλωσης
           restaurant: Εστιατόριο
@@ -494,13 +491,11 @@ el:
           school: Σχολείο
           shelter: Καταφύγιο
           shop: Κατάστημα
-          shopping: Αγορές
           shower: Ντους
           social_centre: Κοινωνικό Κέντρο
           social_club: Κοινωνική Λέσχη
           social_facility: Κοινωνική Εγκατάσταση
           studio: Στούντιο
-          supermarket: Σουπερμάρκετ
           swimming_pool: Πισίνα
           taxi: Ταξί
           telephone: Δημόσιο Τηλέφωνο
@@ -512,8 +507,6 @@ el:
           veterinary: Κτηνιατρική Χειρουργική
           village_hall: Αίθουσα Χωριού
           waste_basket: Καλάθι Απορριμμάτων
-          wifi: Πρόσβαση WiFi
-          WLAN: Πρόσβαση WiFi
           youth_centre: Κέντρο Νεολαίας
         boundary:
           administrative: Διοικητικό Όριο
@@ -529,13 +522,11 @@ el:
         building:
           "yes": Κτίριο
         emergency:
-          fire_hydrant: Πυροσβεστικός Κρουνός
           phone: Τηλέφωνο Έκτακτης Ανάγκης
         highway:
           bridleway: Μονοπάτι για άλογα
           bus_guideway: Καθορισμένη Λωρίδα Λεωφορείου
           bus_stop: Στάση Λεωφορείου
-          byway: Παράδρομος
           construction: Δρόμος υπό Κατασκευή
           cycleway: Ποδηλατόδρομος
           emergency_access_point: Σημείο Πρόσβασης Έκτακτης Ανάγκης
@@ -543,7 +534,6 @@ el:
           ford: Κοιτόστρωση
           living_street: Μεικτός Δρόμος
           milestone: Ορόσημο
-          minor: Επαρχιακός Δρόμος
           motorway: Αυτοκινητόδρομος
           motorway_junction: Διασταύρωση Αυτοκινητόδρομου
           motorway_link: Αυτοκινητόδρομος
@@ -564,7 +554,6 @@ el:
           speed_camera: Κάμερα Ταχύτητας
           steps: Σκαλοπάτια
           street_lamp: Λάμπα του Δρόμου
-          stile: Στήλη
           tertiary: Τριτεύων Δρόμος
           tertiary_link: Τριτεύων Δρόμος
           track: Χωματόδρομος
@@ -588,7 +577,6 @@ el:
           memorial: Μνημείο
           mine: Ορυχείο
           monument: Μνημείο
-          museum: Μουσείο
           ruins: Ερείπιο
           tomb: Τάφος
           tower: Πύργος
@@ -615,9 +603,6 @@ el:
           military: Στρατιωτική Περιοχή
           mine: Ορυχείο
           orchard: Περιβόλι
-          nature_reserve: Φυσικό Καταφύγιο
-          park: Πάρκο
-          piste: Πίστα σκι
           quarry: Λατομείο
           railway: Σιδηρόδρομος
           recreation_ground: Χώρος Αναψυχής
@@ -628,8 +613,6 @@ el:
           road: Περιοχή Δρόμων
           village_green: Πράσινο Χωριό
           vineyard: Αμπέλι
-          wetland: Υγρότοπος
-          wood: Φυσικό Δάσος
         leisure:
           beach_resort: Παραθαλάσσιο Θέρετρο
           bird_hide: Καταφύγιο Πουλιών
@@ -664,11 +647,9 @@ el:
           beach: Παραλία
           cape: Ακρωτήριο
           cave_entrance: Είσοδος Σπηλιάς
-          channel: Κανάλι
           cliff: Γκρεμός
           crater: Κρατήρας
           dune: Αμμόλοφος
-          feature: Χαρακτηριστικό
           fell: Λόφος
           fjord: Φιόρδ
           forest: Δάσος
@@ -685,10 +666,8 @@ el:
           point: Σημείο
           reef: Ύφαλος
           ridge: Σκόπελος
-          river: Ποτάμι
           rock: Βράχος
           scrub: Θαμνότοπος
-          shoal: Ρηχά
           spring: Πηγή
           stone: Πέτρα
           strait: Πορθμός
@@ -697,7 +676,6 @@ el:
           volcano: Ηφαίστειο
           water: Νερό
           wetland: Υγρότοπος
-          wetlands: Υγρότοποι
           wood: Δάσος
         office:
           accountant: Λογιστής
@@ -761,7 +739,6 @@ el:
           switch: Σιδηροδρομικά Σημεία
           tram: Τραμ
           tram_stop: Στάση Τραμ
-          yard: Σιδηροδρομικός Σταθμός Διαλογής
         shop:
           alcohol: Ψιλικατζίδικο
           antiques: Αντίκες
@@ -854,7 +831,6 @@ el:
           museum: Μουσείο
           picnic_site: Τοποθεσία για Πικ-Νικ
           theme_park: Πάρκο Ψυχαγωγίας
-          valley: Κοιλάδα
           viewpoint: Έποψη
           zoo: Ζωολογικός Κήπος
         tunnel:
@@ -871,15 +847,12 @@ el:
           drain: Υπόνομος
           lock: Κλειδαριά
           lock_gate: Κλειδαριά Πύλης
-          mineral_spring: Πηγή Μεταλλικού Νερού
           mooring: Αγκυροβόλι
           rapids: Χείμαρροι
           river: Ποτάμι
-          riverbank: Όχθη Ποταμού
           stream: Ρέμα
           wadi: Wadi
           waterfall: Καταρράκτης
-          water_point: Σημείο Πρόσβασης σε Νερό
           weir: Υδατοφράκτης
       admin_levels:
         level2: Σύνορο Χώρας
@@ -1253,6 +1226,7 @@ el:
     changeset_comment_notification:
       greeting: Γεια,
       commented:
+        partial_changeset_with_comment: με το σχόλιο «%{changeset_comment}»
         partial_changeset_without_comment: χωρίς σχόλιο
   message:
     inbox:
@@ -1337,7 +1311,7 @@ el:
       shortlink: Σύντομος σύνδεσμος
       createnote: Προσθήκη σημείωσης
       license:
-        copyright: Πνευματικά δικαιώματα του  OpenStreetMap και των συντακτών του,
+        copyright: Πνευματικά δικαιώματα του OpenStreetMap και των συντακτών του,
           υπό ελεύθερη άδεια
       remote_failed: Η επεξεργασία απέτυχε - βεβαιωθείτε ότι ο JOSM ή ο Merkaartor
         έχουν φορτωθεί και η επιλογή τηλεχειρισμού είναι ενεργή
@@ -2112,6 +2086,9 @@ el:
       map_notes_zoom_in_tooltip: Μεγεθύνετε τον χάρτη για να δείτε σημειώσεις
       map_data_zoom_in_tooltip: Μεγεθύνετε τον χάρτη για να δείτε τα δεδομένα του
         χάρτη
+      queryfeature_tooltip: Πληροφορίες χαρακτηριστικών
+      queryfeature_disabled_tooltip: Μεγεθύνετε τον χάρτη για να μάθετε περισσότερα
+        για διάφορα χαρακτηριστικά
     changesets:
       show:
         comment: Σχόλιο

config/locales/es.yml

@@ -432,11 +432,8 @@ es:
           taxiway: Calle de rodaje
           terminal: Terminal
         amenity:
-          airport: Aeropuerto
           arts_centre: Centro artístico
-          artwork: Ilustración
           atm: Cajero automático
-          auditorium: Auditorio
           bank: Banco
           bar: Bar
           bbq: Parrilla
@@ -455,7 +452,6 @@ es:
           charging_station: Estación de carga
           cinema: Cine
           clinic: Clínica
-          club: Club
           college: Instituto
           community_centre: Centro comunitario
           courthouse: Juzgado
@@ -476,22 +472,18 @@ es:
           fuel: Gasolinera
           grave_yard: Cementerio
           gym: Gimnasio
-          hall: Salón
           health_centre: Centro de salud
           hospital: Hospital
-          hotel: Hotel
           hunting_stand: Apostadero de caza
           ice_cream: Heladería
           kindergarten: Escuela infantil/guardería
           library: Biblioteca
           market: Mercado
           marketplace: Mercado
-          mountain_rescue: Rescate de montaña
           nightclub: Club nocturno
           nursery: Enfermería
           nursing_home: Residencia para la tercera edad
           office: Oficina
-          park: Parque
           parking: Aparcamiento
           pharmacy: Farmacia
           place_of_worship: Templo
@@ -502,7 +494,6 @@ es:
           prison: Prisión
           pub: Pub
           public_building: Edificio público
-          public_market: Mercado público
           reception_area: Área de recepción
           recycling: Punto de reciclaje
           restaurant: Restaurante
@@ -511,13 +502,11 @@ es:
           school: Escuela
           shelter: Refugio
           shop: Tienda
-          shopping: Compras
           shower: Ducha
           social_centre: Centro social
           social_club: Club social
           social_facility: Centro social
           studio: Estudio
-          supermarket: Supermercado
           swimming_pool: Piscina
           taxi: Taxi
           telephone: Teléfono público
@@ -529,8 +518,6 @@ es:
           veterinary: Clínica veterinaria
           village_hall: Sala del pueblo
           waste_basket: Papelera
-          wifi: Punto de acceso wifi
-          WLAN: Punto de acceso wifi
           youth_centre: Centro juvenil
         boundary:
           administrative: Frontera administrativa
@@ -546,13 +533,11 @@ es:
         building:
           "yes": Edificio
         emergency:
-          fire_hydrant: Hidrante
           phone: Teléfono de emergencia
         highway:
           bridleway: Camino prioritario para peatones y caballos
           bus_guideway: Canal guiado de autobuses
           bus_stop: Parada de autobuses
-          byway: Camino
           construction: Autopista en construcción
           cycleway: Bicisenda
           emergency_access_point: Acceso de emergencia
@@ -560,7 +545,6 @@ es:
           ford: Vado
           living_street: Calle residencial
           milestone: Hito
-          minor: Carretera secundaria
           motorway: Autovía
           motorway_junction: Cruce de autovías
           motorway_link: Enlace de autovía
@@ -581,7 +565,6 @@ es:
           speed_camera: Radar
           steps: Escaleras
           street_lamp: Farola
-          stile: Escalera para atravesar verjas
           tertiary: Carretera terciaria
           tertiary_link: Carretera terciaria
           track: Pista
@@ -605,7 +588,6 @@ es:
           memorial: Memorial
           mine: Mina
           monument: Monumento
-          museum: Museo
           ruins: Ruinas
           tomb: Tumba
           tower: Torre
@@ -633,9 +615,6 @@ es:
           military: Zona militar
           mine: Mina
           orchard: Huerto
-          nature_reserve: Reserva natural
-          park: Parque
-          piste: Pista de esquí
           quarry: Cantera
           railway: Ferrocarril
           recreation_ground: Área recreacional
@@ -646,8 +625,6 @@ es:
           road: Área de carretera
           village_green: Parque municipal
           vineyard: Viñedo
-          wetland: Pantano
-          wood: Madera
         leisure:
           beach_resort: Complejo en la playa
           bird_hide: Observatorio de aves
@@ -682,11 +659,9 @@ es:
           beach: Playa
           cape: Cabo
           cave_entrance: Entrada a cueva
-          channel: Canal
           cliff: Acantilado
           crater: Cráter
           dune: Duna
-          feature: Característica
           fell: Monte
           fjord: Fiordo
           forest: Bosque
@@ -703,11 +678,9 @@ es:
           point: Punto
           reef: Arrecife
           ridge: Cresta
-          river: Río
           rock: Roca
           scree: Pedregal
           scrub: Matorrales
-          shoal: Banco de arena
           spring: Manantial
           stone: Piedra
           strait: Estrecho
@@ -716,7 +689,6 @@ es:
           volcano: Volcán
           water: Agua
           wetland: Pantano
-          wetlands: Pantano
           wood: Bosque
         office:
           accountant: Contable
@@ -781,9 +753,6 @@ es:
           switch: Aguja de ferrocarril
           tram: Ruta de tranvía
           tram_stop: Parada de tranvía
-          yard: Estación de clasificación
-        route:
-          bus: Ruta de autobús
         shop:
           alcohol: Licorería
           antiques: Anticuario
@@ -872,12 +841,10 @@ es:
           hostel: Hostal
           hotel: Hotel
           information: Información turística
-          lean_to: Refugio
           motel: Motel
           museum: Museo
           picnic_site: Área de picnic
           theme_park: Parque temático
-          valley: Valle
           viewpoint: Mirador
           zoo: Zoológico
         tunnel:
@@ -887,7 +854,6 @@ es:
           artificial: Vía fluvial artificial
           boatyard: Astillero
           canal: Canal
-          connector: Esclusa
           dam: Presa
           derelict_canal: Canal abandonado
           ditch: Acequia
@@ -895,15 +861,12 @@ es:
           drain: Desagüe
           lock: Esclusa
           lock_gate: Compuerta de esclusa
-          mineral_spring: Fuente mineral
           mooring: Amarradero
           rapids: Rápidos
           river: Río
-          riverbank: Ribera
           stream: Arroyo
           wadi: Rambla
           waterfall: Cascada
-          water_point: Punto de agua
           weir: Represa
       admin_levels:
         level2: Límite de país

config/locales/et.yml

@@ -396,11 +396,8 @@ et:
           taxiway: Ruleerimisrada
           terminal: Terminal
         amenity:
-          airport: Lennujaam
           arts_centre: Kunstikeskus
-          artwork: Kunstiteos
           atm: Pangaautomaat
-          auditorium: Auditoorium
           bank: Pank
           bar: Baar
           bench: Pink
@@ -416,7 +413,6 @@ et:
           charging_station: Laadimisjaam
           cinema: Kino
           clinic: Kliinik
-          club: Klubi
           courthouse: Kohtuhoone
           crematorium: Krematoorium
           dentist: Hambaarst
@@ -433,21 +429,17 @@ et:
           fountain: Purskkaev
           fuel: Kütus
           grave_yard: Surnuaed
-          hall: Hall
           health_centre: Tervisekeskus
           hospital: Haigla
-          hotel: Hotell
           hunting_stand: Jahikantsel
           ice_cream: Jäätis
           kindergarten: Lasteaed
           library: Raamatukogu
           market: Turg
           marketplace: Turg
-          mountain_rescue: Mäepäästeteenistus
           nightclub: Ööklubi
           nursing_home: Hooldekodu
           office: Kontor
-          park: Park
           parking: Parkimisplats
           pharmacy: Apteek
           place_of_worship: Pühapaik
@@ -458,7 +450,6 @@ et:
           prison: Vangla
           pub: Pubi
           public_building: Ühiskondlik hoone
-          public_market: Turg
           reception_area: Vastuvõtt
           recycling: Jäätmekäitluspunkt
           restaurant: Restoran
@@ -468,7 +459,6 @@ et:
           shelter: Varjualune
           shop: Kauplus
           shower: Dušš
-          supermarket: Supermarket
           taxi: Takso
           telephone: Üldkasutatav telefon
           theatre: Teater
@@ -477,8 +467,6 @@ et:
           vending_machine: Müügiautomaat
           veterinary: Loomakliinik
           waste_basket: Prügikast
-          wifi: WiFi-ühendus
-          WLAN: WiFi-ühendus
           youth_centre: Noortekeskus
         boundary:
           administrative: Halduspiir
@@ -492,12 +480,10 @@ et:
         building:
           "yes": Hoone
         emergency:
-          fire_hydrant: Tuletõrjehüdrant
           phone: Hädaabi telefon
         highway:
           bridleway: Ratsatee
           bus_stop: Bussipeatus
-          byway: Kõrvaltee
           cycleway: Jalgrattatee
           emergency_access_point: Hädaabi punkt
           footway: Jalgrada
@@ -531,7 +517,6 @@ et:
           memorial: Memoriaal
           mine: Kaevandus
           monument: Mälestusmärk
-          museum: Muuseum
           ruins: Varemed
           tower: Torn
           wayside_cross: Teeäärne rist
@@ -547,16 +532,12 @@ et:
           meadow: Niit
           mine: Kaevandus
           orchard: Viljapuuaed
-          nature_reserve: Looduskaitseala
-          park: Park
           quarry: Karjäär
           railway: Raudtee
           recreation_ground: Puhkeala
           reservoir: Veehoidla
           residential: Elamurajoon
           vineyard: Viinamarjaistandus
-          wetland: Soo
-          wood: Mets
         leisure:
           fishing: Kalapüügipiirkond
           garden: Aed
@@ -585,7 +566,6 @@ et:
           beach: Rand
           cape: Neem
           cave_entrance: Koopa sissepääs
-          channel: Kanal
           cliff: Kalju
           crater: Kraater
           dune: Düün
@@ -602,9 +582,7 @@ et:
           peak: Mäetipp
           point: Neem
           reef: Riff
-          river: Jõgi
           rock: Kivi
-          shoal: Madalik
           spring: Allikas
           stone: Kivi
           strait: Väin
@@ -613,7 +591,6 @@ et:
           volcano: Vulkaan
           water: Vesi
           wetland: Märgala
-          wetlands: Soo
           wood: Mets
         office:
           architect: Arhitekt
@@ -727,7 +704,6 @@ et:
           museum: muuseum
           picnic_site: piknikuplats
           theme_park: Teemapark
-          valley: Org
           viewpoint: Vaatepunkt
           zoo: Loomaaed
         tunnel:
@@ -737,14 +713,11 @@ et:
           canal: Kanal
           dam: Tamm
           ditch: Kraav
-          mineral_spring: Mineraalvee allikas
           rapids: Kärestik
           river: Jõgi
-          riverbank: Jõekallas
           stream: Oja
           wadi: Vadi
           waterfall: Kosk
-          water_point: Veevõtukoht
           weir: Pais
       admin_levels:
         level2: Riigipiir

config/locales/eu.yml

@@ -181,11 +181,8 @@ eu:
           runway: Lurreratze pista
           terminal: Terminala
         amenity:
-          airport: Aireportu
           arts_centre: Arte Zentroa
-          artwork: Artelana
           atm: Kutxazain automatikoa
-          auditorium: Entzunareto
           bank: Banku
           bar: Taberna
           bbq: Barbakoa
@@ -200,7 +197,6 @@ eu:
           casino: Kasino
           cinema: Zinema
           clinic: Klinika
-          club: Diskoteka
           college: Kolegioa
           community_centre: Komunitate Zentroa
           courthouse: Epaitegia
@@ -219,20 +215,16 @@ eu:
           fuel: Gasolindegia
           grave_yard: Hilerri
           gym: Osasun Zentroa / Gimnasioa
-          hall: Aretoa
           health_centre: Osasun Zentroa
           hospital: Ospitalea
-          hotel: Hotel
           ice_cream: Izozkiak
           kindergarten: Haurtzaindegi
           library: Liburutegia
           market: Merkatu
           marketplace: Merkatua
-          mountain_rescue: Mendiko Erreskatea
           nightclub: Gau-klub
           nursery: Haurtzaindegi
           office: Bulego
-          park: Parke
           parking: Aparkaleku
           pharmacy: Farmazia
           place_of_worship: Otoitzerako Lekua
@@ -242,7 +234,6 @@ eu:
           preschool: Eskolaurre
           prison: Espetxe
           public_building: Eraikin publiko
-          public_market: Herri Azoka
           recycling: Birziklatze gune
           restaurant: Jatetxe
           retirement_home: Nagusien etxea
@@ -250,10 +241,8 @@ eu:
           school: Ikastetxe
           shelter: Aterpea
           shop: Denda
-          shopping: Erosketak
           shower: Dutxa
           studio: Estudio
-          supermarket: Supermerkatu
           swimming_pool: Igerilekua
           taxi: Taxi
           telephone: Telefono publiko
@@ -264,8 +253,6 @@ eu:
           vending_machine: Salmenta automatiko
           veterinary: Albaitaritza klinika
           village_hall: Herriko aretoa
-          wifi: WiFi Sarbidea
-          WLAN: WiFi Sarbidea
           youth_centre: Gaztelekua
         boundary:
           administrative: Muga Administratiboa
@@ -311,7 +298,6 @@ eu:
           memorial: Memoriala
           mine: Meategi
           monument: Monumentu
-          museum: Museo
           tower: Dorre
         landuse:
           cemetery: Hilerri
@@ -323,8 +309,6 @@ eu:
           meadow: Larre
           military: Eremu Militarra
           mine: Meategi
-          nature_reserve: Natura-erreserba
-          park: Parke
           quarry: Harrobi
           railway: Trenbide
           reservoir: Urtegi
@@ -351,7 +335,6 @@ eu:
           beach: Hondartza
           cape: Lurmutur
           cave_entrance: Kobazulo Sarrera
-          channel: Kanal
           crater: Crater
           dune: Duna
           fjord: Fiordo
@@ -364,10 +347,8 @@ eu:
           peak: Gailur
           point: Puntu
           reef: Arrezife
-          river: Ibai
           rock: Arroka
           scree: Harritza
-          shoal: Hondar-banku
           strait: Itsasertza
           tree: Zuhaitza
           valley: Haran
@@ -478,7 +459,6 @@ eu:
           museum: Museoa
           picnic_site: Piknik-gune
           theme_park: Parke tematiko
-          valley: Haran
           viewpoint: Behatoki
           zoo: Zoologiko
         tunnel:

config/locales/fa.yml

@@ -165,7 +165,7 @@ fa:
         relation: ارتباط
     containing_relation:
       entry: ارتباط %{relation_name}
-      entry_role: رابطه %{relation_name} (به‌عنوان %{relation_role})
+      entry_role: رابطه %{relation_name} (به عنوان %{relation_role})
     not_found:
       sorry: 'پوزش، %{type} #%{id} یافت نمیشود.'
       type:
@@ -346,7 +346,7 @@ fa:
       too_large:
         advice: 'اگر برون‌بری بالا ناموفق بود، لطفاً از یکی از منابع ذکر شده در زیر
           استفاده کنید:'
-        body: این منطقه برای خارج‌سازی به‌عنوان داده‌های XML OpenStreetMap خیلی بزرگ
+        body: این منطقه برای خارج‌سازی به عنوان داده‌های XML OpenStreetMap خیلی بزرگ
           است. لطفاً بزرگنمایی کنید یا یک منطقه کوچکتر را انتخاب کنید، یا برای دریافت
           داده‌های انبوه یکی از منابع فهرست زیر را استفاده کنید.
         planet:
@@ -405,11 +405,8 @@ fa:
           taxiway: فرود به صحن
           terminal: پایانه
         amenity:
-          airport: فرودگاه
           arts_centre: مرکز هنری
-          artwork: اثر هنری
           atm: خودپرداز
-          auditorium: سالن اجتماعات
           bank: بانک
           bar: بار
           bbq: BBQ
@@ -428,7 +425,6 @@ fa:
           charging_station: ایستگاه شارژ
           cinema: سینما
           clinic: درمانگاه
-          club: باشگاه
           college: کالج
           community_centre: مرکز انجمن
           courthouse: دادگاه
@@ -449,22 +445,18 @@ fa:
           fuel: پمپ بنزین
           grave_yard: محوطهٔ گورستان
           gym: مرکز تناسب اندام / ورزشگاه
-          hall: سالن
           health_centre: مركز بهداشت
           hospital: بیمارستان
-          hotel: هتل
           hunting_stand: شکارگاه
           ice_cream: بستنی فروشی
           kindergarten: کودکستان
           library: کتابخانه
           market: بازار
           marketplace: بازار
-          mountain_rescue: امداد کوهستان
           nightclub: باشگاه شبانه
           nursery: شیر خوارگاه
           nursing_home: خانه سالمندان
           office: دفتر
-          park: پارک
           parking: پارکینگ
           pharmacy: داروخانه
           place_of_worship: عبادتگاه
@@ -475,7 +467,6 @@ fa:
           prison: زندان
           pub: میخانه
           public_building: ساختمان عمومی
-          public_market: بازار عمومی
           reception_area: محوطه پذیرش
           recycling: نقطه بازیافت
           restaurant: رستوران
@@ -484,13 +475,11 @@ fa:
           school: مدرسه
           shelter: پناهگاه
           shop: فروشگاه
-          shopping: خرید
           shower: دوش
           social_centre: مرکز اجتماعی
           social_club: باشگاه اجتماعی
           social_facility: تسهیلات اجتماعی
           studio: استودیو
-          supermarket: سوپرمارکت
           swimming_pool: استخر شنا
           taxi: تاکسی
           telephone: تلفن عمومی
@@ -502,8 +491,6 @@ fa:
           veterinary: جراح دامپزشک
           village_hall: دهیاری
           waste_basket: سطل زباله
-          wifi: دسترسی WiFi
-          WLAN: دسترسی WiFi
           youth_centre: مرکز جوانان
         boundary:
           administrative: مرز اداری
@@ -519,13 +506,11 @@ fa:
         building:
           "yes": ساختمان
         emergency:
-          fire_hydrant: شیر آتش‌نشانی
           phone: تلفن اضطراری
         highway:
           bridleway: راه حیوان رو
           bus_guideway: خط هدایت کننده اتوبوس
           bus_stop: ایستگاه اتوبوس
-          byway: Byway
           construction: بزرگراه در دست ساخت
           cycleway: مسیر دوچرخه
           emergency_access_point: نقطهٔ دسترسی اضطراری
@@ -533,7 +518,6 @@ fa:
           ford: معبر کنار رود
           living_street: خیابان محل سکونت
           milestone: سنگ فرسخ شمار
-          minor: جادهٔ فرعی
           motorway: اتوبان
           motorway_junction: اتصال بزرگراه‌ها
           motorway_link: جاده بزرگراه
@@ -554,7 +538,6 @@ fa:
           speed_camera: دوربین کنترل سرعت
           steps: پله
           street_lamp: چراغ خیابانی
-          stile: نردبانی
           tertiary: راه سوم
           tertiary_link: راه سوم
           track: پیگیری
@@ -578,7 +561,6 @@ fa:
           memorial: یادبود
           mine: معدن
           monument: بنای یادبود
-          museum: موزه
           ruins: خرابه‌ها
           tomb: مقبره
           tower: برج
@@ -606,9 +588,6 @@ fa:
           military: منطقهٔ نظامی
           mine: معدن
           orchard: باغستان
-          nature_reserve: طبیعت یدکی
-          park: پارک
-          piste: پیست سرعت
           quarry: معدن
           railway: راه‌آهن
           recreation_ground: زمین تفریحی
@@ -619,8 +598,6 @@ fa:
           road: جاده منطقه
           village_green: روستای سبز
           vineyard: باغ انگوری
-          wetland: تالاب
-          wood: چوب
         leisure:
           beach_resort: تفریحگاه ساحلی
           bird_hide: محل مشاهده ی پرندگان
@@ -655,11 +632,9 @@ fa:
           beach: ساحل
           cape: دماغه
           cave_entrance: ورودی غار
-          channel: کانال
           cliff: صخره
           crater: دهانه اتش فشان
           dune: تل شنی
-          feature: ویژگی
           fell: سقوط گاه
           fjord: فلات
           forest: جنگل
@@ -676,11 +651,9 @@ fa:
           point: نقطه
           reef: جزیره نما
           ridge: خط‌الرأس
-          river: رود خانه
           rock: صخره
           scree: ریگ زار
           scrub: خارزار غیر قابل عبور
-          shoal: کم عمق
           spring: سرچشمه
           stone: سنگ
           strait: تنگه
@@ -689,7 +662,6 @@ fa:
           volcano: آتشفشان
           water: اب
           wetland: تالاب
-          wetlands: تالاب‌ها
           wood: جنگل
         office:
           accountant: حسابدار
@@ -754,9 +726,6 @@ fa:
           switch: جدا کننده راه آهن
           tram: واگن برقی
           tram_stop: ایستگاه واگن برقی
-          yard: محوطه راه آهن
-        route:
-          bus: مسیر اتوبوس
         shop:
           alcohol: مجوز غیر فعال
           antiques: عتیقه جات
@@ -845,12 +814,10 @@ fa:
           hostel: شبانه روزی
           hotel: هتل
           information: اطلاعات
-          lean_to: آلونک
           motel: متل
           museum: موزه
           picnic_site: مکان پیک نیک
           theme_park: پارک تفریحی
-          valley: دره
           viewpoint: منطره بین
           zoo: باغ وحش
         tunnel:
@@ -860,7 +827,6 @@ fa:
           artificial: آبراه مصنوعی
           boatyard: محوطه قایق
           canal: کانال
-          connector: رابط آبراه
           dam: سد
           derelict_canal: کانال متروک
           ditch: نهر آب
@@ -868,15 +834,12 @@ fa:
           drain: زه کشی
           lock: قفل
           lock_gate: ورودی قفل
-          mineral_spring: چشمهٔ آب معدنی
           mooring: مکان لنگر انداختن
           rapids: سریع السیر
           river: رودخانه
-          riverbank: حاشیه رودخانه
           stream: جوی آب
           wadi: Wadi
           waterfall: ابشار
-          water_point: مکان آب
           weir: آب بند
       admin_levels:
         level2: مرز کشور
@@ -993,7 +956,7 @@ fa:
       credit_2_html: همچنین مطمئن باشید که پاک کردن داده ها تحت یک مجوز دیتابیس باز
         است، و اگر از کاشی‌های نقشهٔ ما استفاده می‌کنید، نقشه‌برداری تحت  مجوز CC
         BY-SA است. میتوانید با پیونددادن به <a href="http://www.openstreetmap.org/copyright">این
-        صفحه حق نشر</a> متناوبا آن را انجام دهید، و به‌عنوان یک درخواست اگر شما توزیع
+        صفحه حق نشر</a> متناوبا آن را انجام دهید، و به عنوان یک درخواست اگر شما توزیع
         کنندهٔ نوع داده‌های OSM هستید، می‌توانید نام و پیوند را بطور مستقیم به مجوز
         بدهید. در رسانه‌ها جاهایی که پیوندها مقدور نیستند(مثل کارهای چاپی)، پیشنهاد
         می‌کنیم خوانندگان‌تان را به openstreetmap.org راهنمایی کنید(شاید با گسترش
@@ -1285,8 +1248,8 @@ fa:
         ارتباط برقرار نمی کنید؟
       people_mapping_nearby: افراد نقشه کش نزدیک
     message_summary:
-      unread_button: علامت‌گذاری به‌عنوان خوانده‌شده
-      read_button: علامت‌گذاری به‌عنوان خوانده‌شده
+      unread_button: علامت‌گذاری به عنوان خوانده‌شده
+      read_button: علامت‌گذاری به عنوان خوانده‌شده
       reply_button: پاسخ
       delete_button: حذف
     new:
@@ -1318,7 +1281,7 @@ fa:
         ارتباط برقرار نمیکنید؟
       people_mapping_nearby: افراد نقشه کش نزدیک
     reply:
-      wrong_user: شما به‌عنوان %{user} وارد سامانه شده‌اید اما پیامی که درخواست پاسخش
+      wrong_user: شما به عنوان %{user} وارد سامانه شده‌اید اما پیامی که درخواست پاسخش
         را داده‌اید به این شناسه ارسال نشده‌است. برای امکان پاسخ‌دادن لطفاً بعنوان
         کاربر صحیح وارد سامانه شوید.
     read:
@@ -1327,12 +1290,12 @@ fa:
       subject: عنوان
       date: تاریخ
       reply_button: پاسخ
-      unread_button: علامت‌گذاری به‌عنوان خوانده‌شده
+      unread_button: علامت‌گذاری به عنوان خوانده‌شده
       back: عقب
       to: به
       wrong_user: شما بعنوان `%{user}' وارد سامانه شده‌اید اما پیامی که درخواست خواندنش
         را داده‌اید توسط کاربر ارسال نشده یا به او ارسال نشده‌است. برای امکان خواندن
-        لطفاً به‌عنوان کاربر صحیح وارد سامانه شوید.
+        لطفاً به عنوان کاربر صحیح وارد سامانه شوید.
     sent_message_summary:
       delete_button: حذف
     mark:
@@ -1467,12 +1430,12 @@ fa:
       url: نشانی اینترنتی
   trace:
     visibility:
-      private: خصوصی (فقط به‌عنوان ناشناس ، نقاط نامشخص)
+      private: خصوصی (فقط به عنوان ناشناس ، نقاط نامشخص)
       public: عمومی (نمایش نقاط نامرتب در فهرست پیگیری ها بعنوان ناشناس)
       trackable: قابل پی‌گیری (نقاط مرتب شده بر اساس زمان را تنها به عنوان ناشناس
         به اشتراک بگذارید)
-      identifiable: قابل شناسایی (نقاط مرتب‌شده بر اساس زمان را در فهرست پی‌گیری به‌عنوان
-        قابل تشخیص نشان دهید)
+      identifiable: قابل شناسایی (نقاط مرتب‌شده بر اساس زمان را در فهرست پی‌گیری به
+        عنوان قابل تشخیص نشان دهید)
     create:
       upload_trace: بارگذاری پیگیری GPS
       trace_uploaded: پروندهٔ GPX شما بارگذاری شده است و در انتظار درج در پایگاه داده
@@ -1790,7 +1753,7 @@ fa:
       title: شرایط شرکت‌کنندگان
       heading: شرایط شرکت کنندگان
       read and accept: برای ادامه‌دادن و ویرایش‌کردن‌های آینده لطفاً این توافق‌نامه
-        را مطالعه کنید و دکمه موافق هستم را فشار دهید به‌عنوان اینکه شما موارد این
+        را مطالعه کنید و دکمه موافق هستم را فشار دهید به عنوان اینکه شما موارد این
         توافق‌نامه را قبول دارید.
       consider_pd: بر اساس توافق‌نامه موفق من ویرایش‌ها و تولیدات خودم را  اجازه میدهم
         که به صورت عمومی انتشار یابد

config/locales/fi.yml

@@ -8,6 +8,7 @@
 # Author: Konstaduck
 # Author: Lliehu
 # Author: Markosu
+# Author: McSalama
 # Author: MrTapsa
 # Author: Nedergard
 # Author: Nelg
@@ -421,11 +422,8 @@ fi:
           taxiway: Rullaustie
           terminal: Terminaali
         amenity:
-          airport: Lentokenttä
           arts_centre: Taidekeskus
-          artwork: Taideteos
           atm: Pankkiautomaatti
-          auditorium: Auditorio
           bank: Pankki
           bar: Baari
           bbq: Grillauskatos
@@ -444,7 +442,6 @@ fi:
           charging_station: Latausasema
           cinema: Elokuvateatteri
           clinic: Klinikka
-          club: Klubi
           college: Oppilaitos
           community_centre: Yhteisökeskus
           courthouse: Oikeustalo
@@ -465,22 +462,18 @@ fi:
           fuel: Polttoaine
           grave_yard: Hautausmaa
           gym: Liikuntakeskus / kuntosali
-          hall: Halli
           health_centre: Terveyskeskus
           hospital: Sairaala
-          hotel: Hotelli
           hunting_stand: Metsästyslava
           ice_cream: Jäätelö
           kindergarten: Päiväkoti
           library: Kirjasto
           market: Tori
           marketplace: Tori
-          mountain_rescue: Vuoristopelastuspalvelu
           nightclub: Yökerho
           nursery: Päiväkoti
           nursing_home: Hoitokoti
           office: Toimisto
-          park: Puisto
           parking: Parkkipaikka
           pharmacy: Apteekki
           place_of_worship: Kirkko, temppeli, pyhä paikka
@@ -491,7 +484,6 @@ fi:
           prison: Vankila
           pub: Pubi
           public_building: Julkinen rakennus
-          public_market: Torikauppa
           reception_area: Vastaanottoalue
           recycling: Kierrätyspaikka
           restaurant: Ravintola
@@ -500,12 +492,11 @@ fi:
           school: Koulu
           shelter: Väestönsuoja
           shop: Kauppa
-          shopping: Ostokset
           shower: Suihku
           social_centre: Sosiaalikeskus
           social_club: Sosiaalinen kerho
+          social_facility: Sosiaalilaitos
           studio: Studio
-          supermarket: Supermarketti
           swimming_pool: Uima-allas
           taxi: Taksi
           telephone: Puhelinkoppi
@@ -517,8 +508,6 @@ fi:
           veterinary: Eläinlääkäri
           village_hall: Kyläkoti
           waste_basket: Roskakori
-          wifi: Langaton lähiverkko
-          WLAN: Langaton Internet
           youth_centre: Nuorisokeskus
         boundary:
           administrative: Hallinnollinen raja
@@ -534,13 +523,11 @@ fi:
         building:
           "yes": Rakennus
         emergency:
-          fire_hydrant: Paloposti
           phone: Hätäpuhelin
         highway:
           bridleway: Ratsastustie
           bus_guideway: Ohjattu linja-autokaista
           bus_stop: Bussipysäkki
-          byway: Sivutie
           construction: Rakenteilla oleva tie
           cycleway: Pyörätie
           emergency_access_point: Hätätilapaikka
@@ -548,7 +535,6 @@ fi:
           ford: Kahluupaikka
           living_street: Asuinkatu
           milestone: Virstanpylväs
-          minor: Sivutie
           motorway: Moottoritie
           motorway_junction: Moottoritien liittymä
           motorway_link: Moottoritie
@@ -569,7 +555,6 @@ fi:
           speed_camera: Nopeuskamera
           steps: Portaat
           street_lamp: Katuvalaisin
-          stile: Aidanylitys
           tertiary: Yhdystie
           tertiary_link: Yhdystie
           track: Metsätie
@@ -593,7 +578,6 @@ fi:
           memorial: Muistomerkki
           mine: Kaivos
           monument: Muistomerkki
-          museum: Museo
           ruins: Rauniot
           tomb: Hautakammio
           tower: Torni
@@ -621,9 +605,6 @@ fi:
           military: Sotilasalue
           mine: Kaivos
           orchard: Puutarha
-          nature_reserve: Luonnonsuojelualue
-          park: Puisto
-          piste: Latu
           quarry: Avolouhos
           railway: Rautatie
           recreation_ground: Virkistysalue
@@ -634,8 +615,6 @@ fi:
           road: Tiealue
           village_green: Puisto
           vineyard: Viinitarha
-          wetland: Kosteikko
-          wood: Metsä
         leisure:
           beach_resort: Rantakohde
           bird_hide: Linnunpesä
@@ -670,11 +649,9 @@ fi:
           beach: Hiekkaranta
           cape: Niemi
           cave_entrance: Luolan sisäänkäynti
-          channel: Kanava
           cliff: Jyrkänne
           crater: Kraatteri
           dune: Dyyni
-          feature: Erikoispiirre
           fell: Tunturi
           fjord: Vuono
           forest: Metsä
@@ -691,11 +668,9 @@ fi:
           point: Niemi
           reef: Riutta
           ridge: Harju
-          river: Joki
           rock: Kivi
           scree: Kivikko
           scrub: Pensaikko
-          shoal: Matalikko
           spring: Lähde
           stone: Kivi
           strait: Salmi
@@ -704,7 +679,6 @@ fi:
           volcano: Tulivuori
           water: Vesi
           wetland: Kosteikko
-          wetlands: Kosteikko
           wood: Metsä
         office:
           accountant: Kirjanpitäjä
@@ -769,9 +743,6 @@ fi:
           switch: Ratavaihde
           tram: Raitiotie
           tram_stop: Raitiovaunupysäkki
-          yard: Ratapiha
-        route:
-          bus: Bussireitti
         shop:
           alcohol: Alkoholikauppa
           antiques: Antiikkia
@@ -860,12 +831,10 @@ fi:
           hostel: Hostelli
           hotel: Hotelli
           information: Infopiste
-          lean_to: Laavu
           motel: Motelli
           museum: Museo
           picnic_site: Piknik-paikka
           theme_park: Teemapuisto
-          valley: Laakso
           viewpoint: Näköalapaikka
           zoo: Eläintarha
         tunnel:
@@ -875,7 +844,6 @@ fi:
           artificial: Kanava
           boatyard: Telakka
           canal: Kanaali
-          connector: Kanava
           dam: Pato
           derelict_canal: Hylätty kanava
           ditch: Oja
@@ -883,21 +851,18 @@ fi:
           drain: Oja
           lock: Sulku
           lock_gate: Sulkuportti
-          mineral_spring: Mineraalivesilähde
           mooring: Rantautumispaikka
           rapids: Koski
           river: Joki
-          riverbank: Joki
           stream: Puro
           wadi: Vadi
           waterfall: Vesiputous
-          water_point: Vedenottopaikka
           weir: Pato
       admin_levels:
         level2: Valtion raja
         level4: Osavaltion raja
         level5: Alueen raja
-        level6: Maan raja
+        level6: Maakunnan raja
         level8: Kunnan raja
         level9: Kylän raja
         level10: Asuinalueen raja
@@ -1056,7 +1021,7 @@ fi:
         <a href="http://www.ngi.gov.za/">Chief Directorate:
         National Geo-Spatial Informationista</a>, kaikki oikeudet pidätetään.
       contributors_gb_html: |-
-        <strong>Iso-Britanna</strong>: Sisältää Ordnance Surveyn
+        <strong>Iso-Britannia</strong>: Sisältää Ordnance Surveyn
         keräämiä karttatietoja © Crown Copyright ja tietokantojen käyttöoikeus 2010-12.
       contributors_footer_1_html: |-
         Täydellinen lista OpenStreetMapin tukijoista löytyy OpenStreetMapin wikistä <a
@@ -1599,6 +1564,7 @@ fi:
         suostua, mutta ne täytyy lukea.
   oauth:
     oauthorize:
+      title: Salli tilisi käyttö
       request_access: Sovellus %{app_name} pyytää pääsyä käyttäjätiliisi %{user}.
         Tarkasta oikeudet, jotka tahdot antaa sovellukselle. Voit valita mielestäsi
         sopivat oikeudet.
@@ -1611,9 +1577,11 @@ fi:
       allow_write_gpx: tallenna GPS-jälkiä.
       allow_write_notes: Muokkaa muistiinpanoja.
     oauthorize_success:
+      title: Valtuutuspyyntö hyväksytty
       verification: Vahvistuskoodi on %{code}.
     oauthorize_failure:
       title: Valtuutuspyyntö epäonnistui
+      invalid: Lupamerkki ei kelpaa.
     revoke:
       flash: Olet poistanut sovelluksen %{application} avaimen
   oauth_clients:

config/locales/fr.yml

@@ -443,11 +443,8 @@ fr:
           taxiway: Voie de circulation (Taxiway)
           terminal: Terminal
         amenity:
-          airport: Aéroport
           arts_centre: Centre artistique
-          artwork: Œuvre d’art
           atm: Distributeur automatique de billets
-          auditorium: Auditorium
           bank: Banque
           bar: Bar
           bbq: Barbecue
@@ -466,7 +463,6 @@ fr:
           charging_station: Station de recharge
           cinema: Cinéma
           clinic: Clinique
-          club: Club
           college: Établissement d’enseignement supérieur
           community_centre: Salle polyvalente
           courthouse: Palais de justice
@@ -487,22 +483,18 @@ fr:
           fuel: Carburant
           grave_yard: Cimetière
           gym: Fitness / gymnastique
-          hall: Salle
           health_centre: Centre de santé / dispensaire
           hospital: Hôpital
-          hotel: Hôtel
           hunting_stand: Stand de tir
           ice_cream: Glacier
           kindergarten: Jardin d’enfant
           library: Bibliothèque
           market: Marché
           marketplace: Place de marché
-          mountain_rescue: Secours en montagne
           nightclub: Boîte de nuit
           nursery: Nurserie
           nursing_home: Maison de retraite médicalisée
           office: Bureau
-          park: Parc
           parking: Parking
           pharmacy: Pharmacie
           place_of_worship: Lieu de culte
@@ -513,7 +505,6 @@ fr:
           prison: Prison
           pub: Pub
           public_building: Bâtiment public
-          public_market: Marché public
           reception_area: Zone de livraison
           recycling: Point de recyclage
           restaurant: Restaurant
@@ -522,13 +513,11 @@ fr:
           school: École
           shelter: Abri
           shop: Boutique
-          shopping: Commerce
           shower: Douche
           social_centre: Centre social
           social_club: Club social
           social_facility: Service social
           studio: Studio
-          supermarket: Supermarché
           swimming_pool: Piscine
           taxi: Taxi
           telephone: Téléphone public
@@ -540,8 +529,6 @@ fr:
           veterinary: Chirurgie vétérinaire
           village_hall: Salle municipale
           waste_basket: Poubelle
-          wifi: Accès WiFi
-          WLAN: Accès WiFi
           youth_centre: Centre pour la jeunesse
         boundary:
           administrative: Limite administrative
@@ -557,13 +544,11 @@ fr:
         building:
           "yes": Bâtiment
         emergency:
-          fire_hydrant: Bouche d’incendie
           phone: Borne d’appel d’urgence
         highway:
           bridleway: Chemin pour cavaliers
           bus_guideway: Voie de bus guidé / trolley
           bus_stop: Arrêt de bus
-          byway: Route secondaire
           construction: Autoroute en construction
           cycleway: Piste cyclable
           emergency_access_point: Point d’accès d’urgence
@@ -571,7 +556,6 @@ fr:
           ford: Gué
           living_street: Rue en zone de rencontre
           milestone: Borne kilométrique
-          minor: Route mineure
           motorway: Autoroute
           motorway_junction: Jonction d’autoroute
           motorway_link: Voie autoroutière
@@ -592,7 +576,6 @@ fr:
           speed_camera: Radar de vitesse
           steps: Escalier
           street_lamp: Lampadaire
-          stile: Échalier
           tertiary: Route tertiaire
           tertiary_link: Route tertiaire
           track: Chemin
@@ -616,7 +599,6 @@ fr:
           memorial: Mémorial
           mine: Mine
           monument: Monument
-          museum: Musée
           ruins: Ruines
           tomb: Tombeau
           tower: Tour
@@ -644,9 +626,6 @@ fr:
           military: Zone militaire
           mine: Mine
           orchard: Verger
-          nature_reserve: Réserve naturelle
-          park: Parc
-          piste: Piste
           quarry: Carrière
           railway: Voie ferrée
           recreation_ground: Aire de jeux
@@ -657,8 +636,6 @@ fr:
           road: Zone routière
           village_green: Espace vert public
           vineyard: Vignoble
-          wetland: Zone humide
-          wood: Bois
         leisure:
           beach_resort: Station balnéaire
           bird_hide: Observatoire ornithologique
@@ -693,11 +670,9 @@ fr:
           beach: Plage
           cape: Cap
           cave_entrance: Entrée de grotte
-          channel: Canal
           cliff: Falaise
           crater: Cratère
           dune: Dune
-          feature: Élément
           fell: Lande
           fjord: Fjord
           forest: Forêt
@@ -714,11 +689,9 @@ fr:
           point: Pointe
           reef: Récif
           ridge: Crête
-          river: Rivière
           rock: Roche
           scree: Éboulis
           scrub: Broussailles
-          shoal: Haut-fond
           spring: Source
           stone: Pierre
           strait: Détroit
@@ -727,7 +700,6 @@ fr:
           volcano: Volcan
           water: Eau
           wetland: Zone humide
-          wetlands: Zones humides
           wood: Forêt
         office:
           accountant: Comptable
@@ -792,9 +764,6 @@ fr:
           switch: Aiguillage
           tram: Tramway
           tram_stop: Arrêt de tram
-          yard: Voie de triage
-        route:
-          bus: Trajet du bus
         shop:
           alcohol: Vendeur d’alcool à emporter / caviste
           antiques: Antiquaire
@@ -883,12 +852,10 @@ fr:
           hostel: Auberge
           hotel: Hôtel
           information: Informations
-          lean_to: Abri ouvert
           motel: Motel
           museum: Musée
           picnic_site: Aire de pique-nique
           theme_park: Parc à thème
-          valley: Vallée
           viewpoint: Point de vue
           zoo: Zoo
         tunnel:
@@ -898,7 +865,6 @@ fr:
           artificial: Cours d’eau artificiel
           boatyard: Chantier naval
           canal: Canal
-          connector: Canal de connexion
           dam: Barrage
           derelict_canal: Canal de décharge
           ditch: Fossé
@@ -906,15 +872,12 @@ fr:
           drain: Drain
           lock: Écluse
           lock_gate: Porte d’écluse
-          mineral_spring: Source d’eau minérale
           mooring: Mouillage
           rapids: Rapides
           river: Rivière
-          riverbank: Lit de rivière
           stream: Ruisseau
           wadi: Oued
           waterfall: Chute d’eau
-          water_point: Point d’eau
           weir: Barrage
       admin_levels:
         level2: Frontière de pays

config/locales/fur.yml

@@ -203,6 +203,7 @@ fur:
         indaûr</abbr>
       hidden_by: Platade di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
     query:
+      title: Ce ch'al è intun lûc
       introduction: Frache su la mape par cjatâ lis robis dongje.
       nearby: Elements dongje
       enclosing: Elements includûts
@@ -367,10 +368,8 @@ fur:
         aeroway:
           terminal: Terminâl
         amenity:
-          airport: Aeropuart
           arts_centre: Centri pes arts
           atm: Bancomat
-          auditorium: Auditori
           bank: Bancje
           bar: Bar
           bench: Bancjute
@@ -401,14 +400,12 @@ fur:
           fuel: Stazion di riforniment
           health_centre: Centri pe salût
           hospital: Ospedâl
-          hotel: Hotel
           ice_cream: Gjelato
           kindergarten: Scuelute
           library: Biblioteche
           market: Marcjât
           nightclub: Club noturni
           office: Ufizi
-          park: Parc
           parking: Parcament
           pharmacy: Farmacie
           place_of_worship: Lûc di cult
@@ -417,7 +414,6 @@ fur:
           prison: Preson
           pub: Pub
           public_building: Edifici public
-          public_market: Marcjât public
           recycling: Pont pal ricicli
           restaurant: Ristorant
           retirement_home: Cjase di polse
@@ -425,7 +421,6 @@ fur:
           school: Scuele
           shop: Buteghe
           social_centre: Centri sociâl
-          supermarket: Supermarcjât
           swimming_pool: Pissine
           taxi: Taxi
           telephone: Telefon public
@@ -435,8 +430,6 @@ fur:
           vending_machine: Distributôr automatic
           veterinary: Veterinari
           village_hall: Centri civic
-          wifi: Pont di acès WiFi
-          WLAN: Pont di acès WiFi
           youth_centre: Centri zovanîl
         boundary:
           administrative: Confin aministratîf
@@ -449,7 +442,6 @@ fur:
         building:
           "yes": Edifici
         emergency:
-          fire_hydrant: Idrant
           phone: Telefon di emergjence
         highway:
           bus_stop: Fermade autobus
@@ -492,7 +484,6 @@ fur:
           memorial: Memoriâl
           mine: Miniere
           monument: Monument
-          museum: Museu
           ruins: Ruvinàs
           tomb: Tombe
           tower: Tor
@@ -506,9 +497,6 @@ fur:
           meadow: Prâts
           military: Aree militâr
           mine: Miniere
-          nature_reserve: Riserve naturâl
-          park: Parc
-          piste: Piste di rivade a tiere
           quarry: Gjave
           railway: Ferade
           residential: Aree residenziâl
@@ -537,7 +525,6 @@ fur:
         natural:
           bay: Rade
           beach: Splaze
-          channel: Canâl
           crater: Cratêr
           dune: Dune
           fjord: Fiort
@@ -550,7 +537,6 @@ fur:
           land: Tiere
           peak: Pic
           point: Pont
-          river: Flum
           tree: Arbul
           valley: Val
           volcano: Vulcan
@@ -596,8 +582,10 @@ fur:
           station: Stazion de ferade
           tram_stop: Fermade dal tram
         shop:
+          art: Buteghe di art
           bakery: Pancôr
           beauty: Centri estetic
+          beverages: Buteghe di bibitis
           bicycle: Buteghe di bicicletis
           books: Librerie
           butcher: Becjarie
@@ -632,7 +620,6 @@ fur:
           information: Informazions
           museum: Museu
           theme_park: Parc tematic
-          valley: Val
           viewpoint: Pont panoramic
           zoo: Zoo
         tunnel:
@@ -1509,6 +1496,8 @@ fur:
       createnote_disabled_tooltip: Aumente il zoom par zontâ une note ae mape
       map_notes_zoom_in_tooltip: Aumente il zoom par viodi lis notis su la mape
       map_data_zoom_in_tooltip: Aumente il zoom par viodi i dâts de mape
+      queryfeature_tooltip: Domande ce ch'al è intun lûc
+      queryfeature_disabled_tooltip: Aumente il zoom par domandâ ce ch'al è
     changesets:
       show:
         comment: Coment

config/locales/gl.yml

@@ -404,11 +404,8 @@ gl:
           taxiway: Vía de circulación do aeroporto
           terminal: Terminal
         amenity:
-          airport: Aeroporto
           arts_centre: Centro artístico
-          artwork: Obra de arte
           atm: Caixeiro automático
-          auditorium: Auditorio
           bank: Banco
           bar: Bar
           bbq: Barbacoa
@@ -427,7 +424,6 @@ gl:
           charging_station: Estación de carga
           cinema: Cine
           clinic: Clínica
-          club: Club
           college: Instituto
           community_centre: Centro comunitario
           courthouse: Xulgado
@@ -448,22 +444,18 @@ gl:
           fuel: Combustible
           grave_yard: Cemiterio
           gym: Ximnasio
-          hall: Sala de reunións
           health_centre: Centro de saúde
           hospital: Hospital
-          hotel: Hotel
           hunting_stand: Lugar de caza
           ice_cream: Xeadaría
           kindergarten: Xardín de infancia
           library: Biblioteca
           market: Mercado
           marketplace: Praza de mercado
-          mountain_rescue: Rescate de montaña
           nightclub: Club nocturno
           nursery: Parvulario
           nursing_home: Residencia para a terceira idade
           office: Oficina
-          park: Parque
           parking: Aparcadoiro
           pharmacy: Farmacia
           place_of_worship: Lugar de culto
@@ -474,7 +466,6 @@ gl:
           prison: Prisión
           pub: Pub
           public_building: Edificio público
-          public_market: Mercado público
           reception_area: Zona de recepción
           recycling: Punto de reciclaxe
           restaurant: Restaurante
@@ -483,13 +474,11 @@ gl:
           school: Escola
           shelter: Abeiro
           shop: Tenda
-          shopping: Comercio
           shower: Ducha
           social_centre: Centro social
           social_club: Club social
           social_facility: Servizos sociais
           studio: Estudio
-          supermarket: Supermercado
           swimming_pool: Piscina
           taxi: Taxi
           telephone: Teléfono público
@@ -501,8 +490,6 @@ gl:
           veterinary: Clínica veterinaria
           village_hall: Concello
           waste_basket: Cesto do lixo
-          wifi: Acceso WiFi
-          WLAN: Acceso WiFi
           youth_centre: Casa da xuventude
         boundary:
           administrative: Límite administrativo
@@ -518,13 +505,11 @@ gl:
         building:
           "yes": Construción
         emergency:
-          fire_hydrant: Boca de incendios
           phone: Teléfono de emerxencia
         highway:
           bridleway: Pista de cabalos
           bus_guideway: Liña de autobuses guiados
           bus_stop: Parada de autobús
-          byway: Camiño secundario
           construction: Autoestrada en construción
           cycleway: Pista de bicicletas
           emergency_access_point: Punto de acceso de emerxencia
@@ -532,7 +517,6 @@ gl:
           ford: Vao
           living_street: Rúa residencial
           milestone: Miliario
-          minor: Estrada lateral
           motorway: Autoestrada
           motorway_junction: Cruzamento de autovías
           motorway_link: Enlace de autoestrada
@@ -553,7 +537,6 @@ gl:
           speed_camera: Radar
           steps: Chanzos
           street_lamp: Luminaria
-          stile: Escada
           tertiary: Estrada terciaria
           tertiary_link: Estrada terciaria
           track: Pista
@@ -577,7 +560,6 @@ gl:
           memorial: Memorial
           mine: Mina
           monument: Monumento
-          museum: Museo
           ruins: Ruínas
           tomb: Sepulcro
           tower: Torre
@@ -605,9 +587,6 @@ gl:
           military: Zona militar
           mine: Mina
           orchard: Horta
-          nature_reserve: Reserva natural
-          park: Parque
-          piste: Pista
           quarry: Canteira
           railway: Ferrocarril
           recreation_ground: Área recreativa
@@ -618,8 +597,6 @@ gl:
           road: Zona de estrada
           village_green: Parque municipal
           vineyard: Viñedo
-          wetland: Pantano
-          wood: Madeira
         leisure:
           beach_resort: Balneario
           bird_hide: Observatorio de aves
@@ -654,11 +631,9 @@ gl:
           beach: Praia
           cape: Cabo
           cave_entrance: Entrada de cova
-          channel: Canal
           cliff: Cantil
           crater: Cráter
           dune: Duna
-          feature: Elemento
           fell: Brañal
           fjord: Fiorde
           forest: Bosque
@@ -675,11 +650,9 @@ gl:
           point: Punto
           reef: Arrecife
           ridge: Crista
-          river: Río
           rock: Rocha
           scree: Pedregal
           scrub: Matogueira
-          shoal: Cardume
           spring: Primavera
           stone: Pedra
           strait: Estreito
@@ -688,7 +661,6 @@ gl:
           volcano: Volcán
           water: Auga
           wetland: Pantano
-          wetlands: Pantano
           wood: Bosque
         office:
           accountant: Contable
@@ -753,9 +725,6 @@ gl:
           switch: Puntos de cambio de vía
           tram: Vía de tranvías
           tram_stop: Parada de tranvías
-          yard: Estación de clasificación
-        route:
-          bus: Ruta de autobús
         shop:
           alcohol: Tenda de licores
           antiques: Tenda de antigüidades
@@ -844,12 +813,10 @@ gl:
           hostel: Hostal
           hotel: Hotel
           information: Información
-          lean_to: Caseta
           motel: Motel
           museum: Museo
           picnic_site: Sitio de pícnic
           theme_park: Parque temático
-          valley: Val
           viewpoint: Miradoiro
           zoo: Zoolóxico
         tunnel:
@@ -859,7 +826,6 @@ gl:
           artificial: Vía fluvial artificial
           boatyard: Estaleiro
           canal: Canal
-          connector: Conexión de vía de auga
           dam: Encoro
           derelict_canal: Canal abandonado
           ditch: Cuneta
@@ -867,15 +833,12 @@ gl:
           drain: Sumidoiro
           lock: Esclusa
           lock_gate: Esclusa
-          mineral_spring: Fonte mineral
           mooring: Atraque
           rapids: Rápidos
           river: Río
-          riverbank: Beira do río
           stream: Arroio
           wadi: Uadi
           waterfall: Fervenza
-          water_point: Punto de auga
           weir: Vaira
       admin_levels:
         level2: Fronteira do país

config/locales/he.yml

@@ -411,11 +411,8 @@ he:
           taxiway: מסלול נסיעת מטוס
           terminal: מסוף
         amenity:
-          airport: שדה תעופה
           arts_centre: מרכז אמנויות
-          artwork: יצירת אמנות
           atm: כספומט
-          auditorium: אודיטוריום
           bank: בנק
           bar: בר
           bbq: מנגל
@@ -434,7 +431,6 @@ he:
           charging_station: תחנת הטענה
           cinema: בית קולנוע
           clinic: מרפאה
-          club: מועדון
           college: מכללה
           community_centre: מרכז קהילתי
           courthouse: בית משפט
@@ -455,22 +451,18 @@ he:
           fuel: דלק
           grave_yard: בית קברות
           gym: מכון כושר/חדר כושר
-          hall: אולם
           health_centre: מרכז בריאות
           hospital: בית חולים
-          hotel: בית מלון
           hunting_stand: תצפית ציידים
           ice_cream: גלידה
           kindergarten: גן ילדים
           library: ספרייה
           market: שוק
           marketplace: שוק
-          mountain_rescue: תחנת חילוץ הררית
           nightclub: מועדון לילה
           nursery: פעוטון
           nursing_home: בית אבות
           office: משרד
-          park: פארק
           parking: חניה
           pharmacy: בית מרקחת
           place_of_worship: מקום פולחן
@@ -481,7 +473,6 @@ he:
           prison: כלא
           pub: פאב
           public_building: מבנה ציבור
-          public_market: שוק
           reception_area: אזור קליטה
           recycling: נקודת מיחזור
           restaurant: מסעדה
@@ -490,13 +481,11 @@ he:
           school: בית ספר
           shelter: מחסה
           shop: חנות
-          shopping: קניות
           shower: מקלחת
           social_centre: מרכז חברתי
           social_club: מועדון
           social_facility: מתקן חברתי
           studio: סטודיו
-          supermarket: סופרמרקט
           swimming_pool: ברֵכת שחייה
           taxi: מונית
           telephone: טלפון ציבורי
@@ -508,8 +497,6 @@ he:
           veterinary: מרפאה וטרינרית
           village_hall: אולם הכפר
           waste_basket: פח אשפה
-          wifi: גישת WiFi
-          WLAN: גישת WiFi
           youth_centre: מרכז נוער
         boundary:
           administrative: גבול שטח שיפוט
@@ -525,13 +512,11 @@ he:
         building:
           "yes": בניין
         emergency:
-          fire_hydrant: ברז כיבוי אש
           phone: טלפון חירום
         highway:
           bridleway: שביל עבור סוסים
           bus_guideway: נתיב תחבורה ציבורית מונחית
           bus_stop: תחנת אוטובוס
-          byway: דרך צדית
           construction: כביש מהיר בבנייה
           cycleway: נתיב אופניים
           emergency_access_point: נקודת גישה לשירותי חירום
@@ -539,7 +524,6 @@ he:
           ford: מעברה בנחל
           living_street: רחוב מגורים
           milestone: אבן דרך
-          minor: דרך משנית
           motorway: כביש
           motorway_junction: צומת כבישים
           motorway_link: כביש מכוניות
@@ -560,7 +544,6 @@ he:
           speed_camera: מצלמת מהירות
           steps: מדרגות
           street_lamp: פנס רחוב
-          stile: מעבר מעל גדר
           tertiary: דרך שלישונית
           tertiary_link: דרך שלישונית
           track: מסלול מרוצים
@@ -584,7 +567,6 @@ he:
           memorial: אנדרטה זיכרון
           mine: מכרה
           monument: אנדרטה
-          museum: מוזיאון
           ruins: הריסות
           tomb: קבר
           tower: מגדל
@@ -612,9 +594,6 @@ he:
           military: שטח צבאי
           mine: מכרה
           orchard: פרדס
-          nature_reserve: שמורת טבע
-          park: פארק
-          piste: מסלול סקי
           quarry: מחצבה
           railway: מסילת ברזל
           recreation_ground: שטחי נופש ופנאי
@@ -625,8 +604,6 @@ he:
           road: אזור דרך
           village_green: כיכר הכפר
           vineyard: כרם
-          wetland: מלחה
-          wood: חורשה
         leisure:
           beach_resort: אתר נופש לחוף ים
           bird_hide: מצפור
@@ -661,11 +638,9 @@ he:
           beach: חוף
           cape: כף
           cave_entrance: כניסה למערה
-          channel: תעלה
           cliff: מצוק
           crater: מכתש
           dune: חולית
-          feature: ישות
           fell: תל
           fjord: פיורד
           forest: יער
@@ -682,11 +657,9 @@ he:
           point: נקודה
           reef: שונית
           ridge: רכס
-          river: נהר
           rock: סלע
           scree: ערמת סלעים
           scrub: סבך
-          shoal: שרטון
           spring: מעיין
           stone: אבן
           strait: מצר
@@ -695,7 +668,6 @@ he:
           volcano: הר געש
           water: מים
           wetland: מלחה
-          wetlands: מלחות
           wood: יער
         office:
           accountant: רואה חשבון
@@ -760,9 +732,6 @@ he:
           switch: נקודות מסילת ברזל
           tram: חשמלית
           tram_stop: תחנת חשמלית
-          yard: מוסך רכבות
-        route:
-          bus: נתיב אוטובוסים
         shop:
           alcohol: חנות אלכוהול
           antiques: עתיקות
@@ -851,12 +820,10 @@ he:
           hostel: אכסניה
           hotel: בית מלון
           information: מידע
-          lean_to: סככה
           motel: מלון דרכים
           museum: מוזיאון
           picnic_site: אתר לפיקניקים
           theme_park: פארק שעשועים
-          valley: עמק
           viewpoint: נקודת תצפית
           zoo: גן חיות
         tunnel:
@@ -866,7 +833,6 @@ he:
           artificial: נתיב מים מלאכותי
           boatyard: מספנה
           canal: תעלה
-          connector: נקודת חיבור בין נתיבי מים
           dam: סכר
           derelict_canal: תעלה נטושה
           ditch: מחפורת
@@ -874,15 +840,12 @@ he:
           drain: ביוב
           lock: תא שיט
           lock_gate: שער בתא שיט
-          mineral_spring: מעיין מים מינרליים
           mooring: מעגן
           rapids: אשדות
           river: נהר
-          riverbank: גדת נהר
           stream: פלג
           wadi: ואדי
           waterfall: מפל מים
-          water_point: נקודת מים
           weir: סכר
       admin_levels:
         level2: גבול המדינה

config/locales/hr.yml

@@ -382,11 +382,8 @@ hr:
           taxiway: Rulnica
           terminal: Terminal
         amenity:
-          airport: Zračna luka
           arts_centre: Umjetnički centar
-          artwork: Umjetnička djela
           atm: Bankomat
-          auditorium: Auditorij
           bank: Banka
           bar: Bar
           bbq: Roštilj
@@ -403,7 +400,6 @@ hr:
           casino: Casino
           cinema: Kino
           clinic: Klinika
-          club: Klub
           college: Fakultet
           community_centre: Društveni centar
           courthouse: Sud
@@ -423,22 +419,18 @@ hr:
           fuel: Benzinska
           grave_yard: Groblje
           gym: Fitness centar
-          hall: Hala
           health_centre: Zdravstveni centar
           hospital: Bolnica
-          hotel: Hotel
           hunting_stand: Čeka
           ice_cream: Slastičarna
           kindergarten: Dječji vrtić
           library: Knjižnica
           market: Tržnica
           marketplace: Tržnica
-          mountain_rescue: GSS - Gorska služba spašavanja
           nightclub: Noćni klub
           nursery: Čuvanje djece
           nursing_home: Starački dom
           office: Kancelarija
-          park: Park
           parking: Parking
           pharmacy: Ljekarna
           place_of_worship: Crkva
@@ -449,7 +441,6 @@ hr:
           prison: Zatvor
           pub: Pub
           public_building: Ustanova
-          public_market: Javna tržnica
           reception_area: Recepcija
           recycling: Reciklažna točka
           restaurant: Restoran
@@ -458,10 +449,8 @@ hr:
           school: Škola
           shelter: Sklonište
           shop: Trgovina
-          shopping: Trgovački centar
           social_club: Društveni klub
           studio: Studio
-          supermarket: Supermarket
           swimming_pool: Bazen
           taxi: Taxi
           telephone: Telefonska govornica
@@ -473,8 +462,6 @@ hr:
           veterinary: Veterinar
           village_hall: Seoski Dom
           waste_basket: Kanta za otpatke
-          wifi: Pristup WiFi-u
-          WLAN: Pristup WiFi-u
           youth_centre: Centar za mladež
         boundary:
           administrative: Administrativna granica
@@ -485,20 +472,16 @@ hr:
           "yes": Most
         building:
           "yes": Zgrada
-        emergency:
-          fire_hydrant: Hidrant
         highway:
           bridleway: Konjička staza
           bus_guideway: Autobusna traka
           bus_stop: Autobusno stajalište
-          byway: Prečica
           construction: Autocesta u izgradnji
           cycleway: Biciklistička staza
           emergency_access_point: S.O.S. točka
           footway: Pješačka staza
           ford: Ford
           living_street: Ulica smirenog prometa
-          minor: Drugorazredna cesta
           motorway: Autocesta
           motorway_junction: Čvor (autoputa)
           motorway_link: Autocesta (pristupna cesta)
@@ -515,7 +498,6 @@ hr:
           service: Servisna cesta
           services: Autocesta - usluge
           steps: Stepenice
-          stile: Prijelaz preko ograde
           tertiary: Lokalna cesta
           track: Makadam
           trail: Staza
@@ -538,7 +520,6 @@ hr:
           memorial: Spomen dom
           mine: Rudnik
           monument: Spomenik
-          museum: Muzej
           ruins: Ruševine
           tomb: Grob
           tower: Toranj
@@ -566,9 +547,6 @@ hr:
           military: Vojno područje
           mine: Rudnik
           orchard: Voćnjak
-          nature_reserve: Rezervat prirode
-          park: Park
-          piste: Pista
           quarry: Kamenolom
           railway: Željeznica
           recreation_ground: Rekreacijsko područje
@@ -577,8 +555,6 @@ hr:
           retail: Trgovina
           village_green: Seoski travnjak
           vineyard: Vinograd
-          wetland: Močvara
-          wood: Šuma
         leisure:
           beach_resort: Plaža
           common: Općinsko zemljište
@@ -608,11 +584,9 @@ hr:
           beach: Plaža
           cape: Rt
           cave_entrance: Pećina (ulaz)
-          channel: Kanal
           cliff: Litica
           crater: Krater
           dune: Dina
-          feature: Obilježje
           fell: Brdo
           fjord: Fjord
           forest: Šuma
@@ -629,11 +603,9 @@ hr:
           point: Točka
           reef: Greben
           ridge: Greben
-          river: Rijeka
           rock: Stijena
           scree: Šljunak
           scrub: Guštara
-          shoal: Sprud
           spring: Izvor
           stone: Kamen
           strait: Tjesnac
@@ -642,7 +614,6 @@ hr:
           volcano: Vulkan
           water: Voda
           wetland: Močvara
-          wetlands: Močvara
           wood: Šuma
         office:
           accountant: Računovođa
@@ -697,7 +668,6 @@ hr:
           switch: Skretnica
           tram: Tramvaj
           tram_stop: Tramvajska stanica
-          yard: Ranžirni kolodvor
         shop:
           alcohol: Trgovina pićem
           art: Atelje
@@ -779,12 +749,10 @@ hr:
           hostel: Hostel
           hotel: Hotel
           information: Informacije
-          lean_to: Lean to
           motel: Motel
           museum: Muzej
           picnic_site: Piknik-mjesto
           theme_park: Tematski park
-          valley: Dolina
           viewpoint: Vidikovac
           zoo: Zoo
         tunnel:
@@ -792,7 +760,6 @@ hr:
         waterway:
           boatyard: Brodogradilište
           canal: Kanal
-          connector: Spoj vodnih puteva
           dam: Brana
           derelict_canal: Zanemaren kanal
           ditch: Jarak
@@ -800,15 +767,12 @@ hr:
           drain: Odvod
           lock: Ustava
           lock_gate: Ustava
-          mineral_spring: Mineralni izvor
           mooring: Sidrište
           rapids: Brzaci
           river: Rijeka
-          riverbank: Riječna obala
           stream: Potok
           wadi: Suho korito rijeke
           waterfall: Vodopad
-          water_point: Točka vodotoka
           weir: Brana
     description:
       title:

config/locales/hsb.yml

@@ -393,11 +393,8 @@ hsb:
           taxiway: Lětadłowa jězdnja
           terminal: Terminal
         amenity:
-          airport: Lětanišćo
           arts_centre: Kulturny centrum
-          artwork: Wuměłska twórba
           atm: Bankomat
-          auditorium: Awditorij
           bank: Banka
           bar: Bara
           bbq: Grilowanišćo
@@ -416,7 +413,6 @@ hsb:
           charging_station: Napjelnjenska stacija
           cinema: Kino
           clinic: Klinika
-          club: Klub
           college: Wysoka šula
           community_centre: Zhromadny centrum
           courthouse: Sudnistwo
@@ -437,22 +433,18 @@ hsb:
           fuel: Tankownja
           grave_yard: Kěrchow
           gym: Fitnesowy center/Fitnesowe studijo
-          hall: Schadźowarnja
           health_centre: Strowotny centrum
           hospital: Chorownja
-          hotel: Hotel
           hunting_stand: Łakańca
           ice_cream: Jědźny lód
           kindergarten: Pěstowarnja
           library: Knihownja
           market: Wiki
           marketplace: Torhošćo
-          mountain_rescue: Hórska wuchowanska słužba
           nightclub: Nócny klub
           nursery: Pěstowarnja
           nursing_home: Hladarnja
           office: Běrow
-          park: Park
           parking: Parkowanišćo
           pharmacy: Lěkarnja
           place_of_worship: Boži dom
@@ -463,7 +455,6 @@ hsb:
           prison: Jastwo
           pub: Korčma
           public_building: Zjawne twarjenje
-          public_market: Zjawne wiki
           reception_area: Přijimanski wobłuk
           recycling: Přijimarnja starowiznow
           restaurant: Hosćenc
@@ -472,13 +463,11 @@ hsb:
           school: Šula
           shelter: Podstup
           shop: Wobchod
-          shopping: Nakup
           shower: Duša
           social_centre: Socialne srjedźišćo
           social_club: Towarstwo
           social_facility: Socialne zarjadnišćo
           studio: Studijo
-          supermarket: Superwiki
           swimming_pool: Płuwanišćo
           taxi: Taksijowe zastanišćo
           telephone: Zjawny telefon
@@ -490,8 +479,6 @@ hsb:
           veterinary: Zwěrjacy lěkar
           village_hall: Gmejnski centrum
           waste_basket: Wotpadkowe sudobjo
-          wifi: WiFi-přistup
-          WLAN: WLAN-přistup
           youth_centre: Centrum za młodostnych
         boundary:
           administrative: Zarjadniska hranica
@@ -507,13 +494,11 @@ hsb:
         building:
           "yes": Twarjenje
         emergency:
-          fire_hydrant: Wohnjowy hydrant
           phone: Nuzowy telefon
         highway:
           bridleway: Jěchanski puć
           bus_guideway: Trolejbusowy milinowód
           bus_stop: Busowe zastanišćo
-          byway: Pódlanski puć
           construction: Dróha so twari
           cycleway: Kolesowarska šćežka
           emergency_access_point: Přijimarnja njezbožow
@@ -521,7 +506,6 @@ hsb:
           ford: Bród
           living_street: Hasa z pomjeńšenym wobchadom
           milestone: Kilometrowy kamjeń
-          minor: Pódlanska hasa
           motorway: Awtodróha
           motorway_junction: Awtodróhowe křižnišćo
           motorway_link: Přijězd na awtodróhu
@@ -542,7 +526,6 @@ hsb:
           speed_camera: Błyskadło
           steps: Schodźenki
           street_lamp: Nadróžna latarnja
-          stile: Płótne stupadło
           tertiary: Dróha třećeho rjada
           tertiary_link: Dróha třećeho rjada
           track: Pólny puć
@@ -566,7 +549,6 @@ hsb:
           memorial: Wopomnišćo
           mine: Podkopki
           monument: Pomnik
-          museum: Muzej
           ruins: Rozpadanki
           tomb: Row
           tower: Wěža
@@ -594,9 +576,6 @@ hsb:
           military: Wojerska kónčina
           mine: Podkopki
           orchard: Sadowa zahroda
-          nature_reserve: Přirodoškitne pasmo
-          park: Park
-          piste: Pista
           quarry: Skała
           railway: Železnica
           recreation_ground: Wočerstwjenska krajina
@@ -607,8 +586,6 @@ hsb:
           road: Dróhowe pasmo
           village_green: Nawjes
           vineyard: Winicy
-          wetland: Łučina
-          wood: Lěs
         leisure:
           beach_resort: Mórske kupjele
           bird_hide: Ptači schow
@@ -643,11 +620,9 @@ hsb:
           beach: Přibrjóh
           cape: Kap
           cave_entrance: Prózdnjeński zachod
-          channel: Kanal
           cliff: Wuskała
           crater: Krater
           dune: Nawěw
-          feature: Funkcija
           fell: Fjeld
           fjord: Fjord
           forest: Lěs
@@ -664,11 +639,9 @@ hsb:
           point: Dypk
           reef: Rif
           ridge: Horinski hrjebjeń
-          river: Rěka
           rock: Skała
           scree: Walanki
           scrub: Kerki
-          shoal: Niłčina, pěsčišćo
           spring: Žórło
           stone: Kamjeń
           strait: Mórska wužina
@@ -677,7 +650,6 @@ hsb:
           volcano: Wulkan
           water: wodźizna
           wetland: Łučina
-          wetlands: Łučiny
           wood: Lěs
         office:
           accountant: Knihiwjedniski běrow
@@ -742,9 +714,6 @@ hsb:
           switch: Wuhibka
           tram: Tramwajka
           tram_stop: Tramwajkowe zastanišćo
-          yard: Ranžěrowanske dwórnišćo
-        route:
-          bus: Busowa linija
         shop:
           alcohol: Wobchod za spirituozy
           antiques: Wobchod starožitnosćow
@@ -833,12 +802,10 @@ hsb:
           hostel: Hospoda
           hotel: Hotel
           information: Informacija
-          lean_to: Kólnja
           motel: Motel
           museum: Muzej
           picnic_site: Piknikowanišćo
           theme_park: Park zabawy
-          valley: Doł
           viewpoint: Wuhladnišćo
           zoo: Coo
         tunnel:
@@ -848,7 +815,6 @@ hsb:
           artificial: Kumštna wodowa dróha
           boatyard: Łódźnica
           canal: Kanal
-          connector: Zwisk mjez wódnymi pućemi
           dam: Nasyp
           derelict_canal: Zanjerodźeny kanal
           ditch: Hrjebja
@@ -856,15 +822,12 @@ hsb:
           drain: Wentok
           lock: Přepław
           lock_gate: Wrota přeplawnje
-          mineral_spring: Mineralne žórło
           mooring: Přistawnišćo
           rapids: Rěčne prohi
           river: Rěka
-          riverbank: Rěčny brjóh
           stream: rěčka
           wadi: Wadi
           waterfall: Wodopad
-          water_point: Wódne městno
           weir: Spušćadło
       admin_levels:
         level2: Statna hranica

config/locales/hu.yml

@@ -391,11 +391,8 @@ hu:
           taxiway: gurulóút
           terminal: Utasterminál
         amenity:
-          airport: Repülőtér
           arts_centre: Művészeti központ
-          artwork: Műalkotás
           atm: Bankautomata
-          auditorium: Auditórium
           bank: Bank
           bar: Bár
           bbq: Grillsütő
@@ -414,7 +411,6 @@ hu:
           charging_station: Elektromos töltőállomás
           cinema: Mozi
           clinic: Klinika
-          club: Klub
           college: Főiskola
           community_centre: Művelődési központ
           courthouse: Bíróság
@@ -435,22 +431,18 @@ hu:
           fuel: Benzinkút
           grave_yard: Kis temető
           gym: Fitnesz- / Tornaterem
-          hall: Csarnok
           health_centre: Egészségügyi központ
           hospital: Kórház
-          hotel: Szálloda
           hunting_stand: Magasles
           ice_cream: Jégkrém
           kindergarten: Óvoda
           library: Könyvtár
           market: Piac
           marketplace: Vásártér
-          mountain_rescue: Hegyimentők
           nightclub: Éjszakai bár
           nursery: Óvoda
           nursing_home: Idősek otthona
           office: Iroda
-          park: Park
           parking: Parkoló
           pharmacy: Gyógyszertár
           place_of_worship: Vallási hely
@@ -461,7 +453,6 @@ hu:
           prison: Börtön
           pub: Kocsma
           public_building: Középület
-          public_market: Piac
           reception_area: Recepció
           recycling: Szelektív hulladékgyűjtő
           restaurant: Étterem
@@ -470,13 +461,11 @@ hu:
           school: Iskola
           shelter: Esőház
           shop: Bolt
-          shopping: Bevásárlás
           shower: Zuhanyzó
           social_centre: Szociális központ
           social_club: Társasági klub
           social_facility: Szociális létesítmény
           studio: Stúdió
-          supermarket: Szupermarket
           swimming_pool: Úszómedence
           taxi: Taxi
           telephone: Nyilvános telefon
@@ -488,8 +477,6 @@ hu:
           veterinary: Állatorvosi rendelő
           village_hall: Községháza
           waste_basket: Szemétgyűjtő kosár
-          wifi: WiFi hozzáférés
-          WLAN: WiFi hozzáférés
           youth_centre: Ifjúsági központ
         boundary:
           administrative: Közigazgatási határ
@@ -505,13 +492,11 @@ hu:
         building:
           "yes": Épület
         emergency:
-          fire_hydrant: Tűzcsap
           phone: Segélyhívó
         highway:
           bridleway: Lovaglóút
           bus_guideway: Buszsín
           bus_stop: Buszmegálló
-          byway: Kiépítetlen ösvény
           construction: Építés alatt álló közút
           cycleway: Kerékpárút
           emergency_access_point: Vészhelyzeti hozzáférési pont
@@ -519,7 +504,6 @@ hu:
           ford: Gázló
           living_street: Pihenőút
           milestone: Kilométerkő
-          minor: Alárendelt út
           motorway: Autópálya
           motorway_junction: Autópálya-csomópont
           motorway_link: Autópálya
@@ -540,7 +524,6 @@ hu:
           speed_camera: Sebességmérő kamera
           steps: Lépcső
           street_lamp: Utcai lámpa
-          stile: Lépcsős átjáró
           tertiary: Bekötőút
           tertiary_link: Bekötőút
           track: Földút
@@ -564,7 +547,6 @@ hu:
           memorial: Emlékmű
           mine: Bánya
           monument: Műemlék
-          museum: Múzeum
           ruins: Rom
           tomb: Sírkő
           tower: Torony
@@ -592,9 +574,6 @@ hu:
           military: Katonai terület
           mine: Bánya
           orchard: Gyümölcsös
-          nature_reserve: Természetvédelmi terület
-          park: Park
-          piste: Sípálya
           quarry: Kőfejtő
           railway: Vasúti terület
           recreation_ground: Szabadidőpark
@@ -605,8 +584,6 @@ hu:
           road: Közúti terület
           village_green: Közös mező
           vineyard: Szőlős
-          wetland: Láp
-          wood: Erdő
         leisure:
           beach_resort: Tengerparti üdülőhely
           bird_hide: Madárles
@@ -641,11 +618,9 @@ hu:
           beach: Part
           cape: Partfok
           cave_entrance: Barlangbejárat
-          channel: Csatorna
           cliff: Szikla
           crater: Kráter
           dune: Dűne
-          feature: Tereptárgy
           fell: Kopár
           fjord: Fjord
           forest: Erdő
@@ -662,11 +637,9 @@ hu:
           point: Pont
           reef: Zátony
           ridge: Hegygerinc
-          river: Folyó
           rock: Szikla
           scree: Sziklatörmelék
           scrub: Cserjés
-          shoal: Zátony
           spring: Forrás
           stone: Kő
           strait: Tengerszoros
@@ -675,7 +648,6 @@ hu:
           volcano: Vulkán
           water: Tó
           wetland: Láp
-          wetlands: Láp
           wood: Erdő
         office:
           accountant: Könyvelő
@@ -740,7 +712,6 @@ hu:
           switch: Vasúti váltó
           tram: Villamos
           tram_stop: Villamosmegálló
-          yard: Rendező-pályaudvar
         shop:
           alcohol: Alkoholos italbolt
           antiques: Régiségek
@@ -829,12 +800,10 @@ hu:
           hostel: Turistaszálló
           hotel: Szálloda
           information: Információ
-          lean_to: Kunyhó
           motel: Motel
           museum: Múzeum
           picnic_site: Piknikezőhely
           theme_park: Vidámpark
-          valley: Völgy
           viewpoint: Kilátó
           zoo: Állatkert
         tunnel:
@@ -844,7 +813,6 @@ hu:
           artificial: Mesterséges víziút
           boatyard: Hajóhangár
           canal: Csatorna
-          connector: Vízi csatlakozó
           dam: Gát
           derelict_canal: Felhagyott csatorna
           ditch: Árok
@@ -852,15 +820,12 @@ hu:
           drain: Árok
           lock: Zsilip
           lock_gate: Zsilip
-          mineral_spring: Ásványos patak
           mooring: Kikötő
           rapids: Zuhatag
           river: Folyó
-          riverbank: Folyópart
           stream: Patak
           wadi: Vádi
           waterfall: Vízesés
-          water_point: Vízi fordítópont
           weir: Bukógát
       admin_levels:
         level2: Országhatár

config/locales/ia.yml

@@ -385,11 +385,8 @@ ia:
           taxiway: Via de circulation pro aviones
           terminal: Terminal
         amenity:
-          airport: Aeroporto
           arts_centre: Centro artistic
-          artwork: Obra de arte
           atm: Cassa automatic
-          auditorium: Auditorio
           bank: Banca
           bar: Bar
           bbq: Barbecue
@@ -408,7 +405,6 @@ ia:
           charging_station: Station de cargamento
           cinema: Cinema
           clinic: Clinica
-          club: Club
           college: Schola superior
           community_centre: Centro communitari
           courthouse: Tribunal
@@ -429,22 +425,18 @@ ia:
           fuel: Carburante
           grave_yard: Cemeterio
           gym: Centro de fitness / Gymnasio
-          hall: Hall
           health_centre: Centro de sanitate
           hospital: Hospital
-          hotel: Hotel
           hunting_stand: Posto de chassa
           ice_cream: Gelato
           kindergarten: Schola pro juvene infantes
           library: Bibliotheca
           market: Mercato
           marketplace: Mercato
-          mountain_rescue: Succurso de montania
           nightclub: Club nocturne
           nursery: Sala recreative pro parve infantes
           nursing_home: Casa de convalescentia
           office: Officio
-          park: Parco
           parking: Parking
           pharmacy: Pharmacia
           place_of_worship: Loco de adoration
@@ -455,7 +447,6 @@ ia:
           prison: Prision
           pub: Taverna
           public_building: Edificio public
-          public_market: Mercato public
           reception_area: Area de reception
           recycling: Puncto de recyclage
           restaurant: Restaurante
@@ -464,13 +455,11 @@ ia:
           school: Schola
           shelter: Refugio
           shop: Boteca
-          shopping: Compras
           shower: Ducha
           social_centre: Centro social
           social_club: Club social
           social_facility: Servicio social
           studio: Appartamento de un camera
-          supermarket: Supermercato
           swimming_pool: Piscina
           taxi: Taxi
           telephone: Telephono public
@@ -482,8 +471,6 @@ ia:
           veterinary: Clinica veterinari
           village_hall: Casa communal
           waste_basket: Corbe a papiro
-          wifi: Accesso WiFi
-          WLAN: Accesso WiFi
           youth_centre: Centro pro le juventute
         boundary:
           administrative: Limite administrative
@@ -499,13 +486,11 @@ ia:
         building:
           "yes": Edificio
         emergency:
-          fire_hydrant: Hydrante de incendio
           phone: Telephono de emergentia
         highway:
           bridleway: Sentiero pro cavallos
           bus_guideway: Via guidate de autobus
           bus_stop: Halto de autobus
-          byway: Via minor
           construction: Strata in construction
           cycleway: Pista cyclabile
           emergency_access_point: Puncto de accesso de emergentia
@@ -513,7 +498,6 @@ ia:
           ford: Vado
           living_street: Strata residential
           milestone: Petra milliari
-          minor: Via minor
           motorway: Autostrata
           motorway_junction: Junction de autostrata
           motorway_link: Via de communication a autostrata
@@ -534,7 +518,6 @@ ia:
           speed_camera: Detector de velocitate
           steps: Scalones
           street_lamp: Lanterna de strata
-          stile: Scalon o apertura de passage
           tertiary: Via tertiari
           tertiary_link: Via tertiari
           track: Pista
@@ -558,7 +541,6 @@ ia:
           memorial: Memorial
           mine: Mina
           monument: Monumento
-          museum: Museo
           ruins: Ruinas
           tomb: Tumba
           tower: Turre
@@ -586,9 +568,6 @@ ia:
           military: Area militar
           mine: Mina
           orchard: Verdiero
-          nature_reserve: Reserva natural
-          park: Parco
-          piste: Pista de ski
           quarry: Petreria
           railway: Ferrovia
           recreation_ground: Area recreative
@@ -599,8 +578,6 @@ ia:
           road: Area de cammino
           village_green: Parco de village
           vineyard: Vinia
-          wetland: Terra humide
-          wood: Bosco
         leisure:
           beach_resort: Loco de vacantias al plagia
           bird_hide: Observatorio de aves
@@ -635,11 +612,9 @@ ia:
           beach: Plagia
           cape: Capo
           cave_entrance: Entrata de caverna
-          channel: Canal
           cliff: Precipitio
           crater: Crater
           dune: Duna
-          feature: Attraction
           fell: Montania
           fjord: Fiord
           forest: Foreste
@@ -656,11 +631,9 @@ ia:
           point: Puncto
           reef: Scolio
           ridge: Cresta
-          river: Fluvio/Riviera
           rock: Rocca
           scree: Detrito cadite
           scrub: Arbusto
-          shoal: Banco de sablo
           spring: Fontana
           stone: Petra
           strait: Stricto
@@ -669,7 +642,6 @@ ia:
           volcano: Vulcano
           water: Aqua
           wetland: Terra humide
-          wetlands: Terreno paludose
           wood: Bosco
         office:
           accountant: Contabile
@@ -734,7 +706,6 @@ ia:
           switch: Agulia
           tram: Tramvia
           tram_stop: Halto de tram
-          yard: Station de manovras
         shop:
           alcohol: Magazin de bibitas alcoholic
           antiques: Antiquitates
@@ -823,12 +794,10 @@ ia:
           hostel: Albergo
           hotel: Hotel
           information: Information
-          lean_to: Barraca aperte
           motel: Motel
           museum: Museo
           picnic_site: Loco de picnic
           theme_park: Parco de attractiones
-          valley: Valle
           viewpoint: Puncto de vista
           zoo: Jardin zoologic
         tunnel:
@@ -838,7 +807,6 @@ ia:
           artificial: Via aquatic artificial
           boatyard: Cantier naval
           canal: Canal
-          connector: Connexion aquatic
           dam: Dica
           derelict_canal: Canal abandonate
           ditch: Fossato
@@ -846,15 +814,12 @@ ia:
           drain: Aquiero
           lock: Esclusa
           lock_gate: Porta de esclusa
-          mineral_spring: Fonte de aqua mineral
           mooring: Ammarrage
           rapids: Rapidos
           river: Fluvio/Riviera
-          riverbank: Ripa de fluvio/riviera
           stream: Rivo
           wadi: Wadi
           waterfall: Cascada
-          water_point: Puncto de aqua
           weir: Barrage
       admin_levels:
         level2: Frontiera de pais

config/locales/id.yml

@@ -403,11 +403,8 @@ id:
           taxiway: Jalur taxi
           terminal: Terminal
         amenity:
-          airport: Bandara
           arts_centre: Pusat Kesenian
-          artwork: Karya Seni
           atm: ATM
-          auditorium: Auditorium
           bank: Bank
           bar: Bar
           bbq: BBQ
@@ -426,7 +423,6 @@ id:
           charging_station: Stasiun Pengisian
           cinema: Bioskop
           clinic: Klinik
-          club: Klub
           college: Perguruan Tinggi
           community_centre: Gedung Serbaguna
           courthouse: Gedung Pengadilan
@@ -447,22 +443,18 @@ id:
           fuel: Stasiun Pengisian Bahan Bakar
           grave_yard: Kuburan
           gym: Pusat Kebugaran / Gym
-          hall: Aula/Gedung Pertemuan
           health_centre: Pusat Kesehatan
           hospital: Rumah Sakit
-          hotel: Hotel
           hunting_stand: Pos Berburu
           ice_cream: Es Krim
           kindergarten: Taman Kanak-Kanak
           library: Perpustakaan
           market: Pasar
           marketplace: Pasar
-          mountain_rescue: Penyelamat Gunung (SAR)
           nightclub: Klub Malam
           nursery: Pendidikan Anak Usia Dini (PAUD)
           nursing_home: Panti Jompo
           office: Kantor
-          park: Taman
           parking: Parkir
           pharmacy: Apotek
           place_of_worship: Tempat Ibadah
@@ -473,7 +465,6 @@ id:
           prison: Penjara
           pub: Pub
           public_building: Bangunan Publik
-          public_market: Pasar Publik
           reception_area: Area Bagian Penerima Tamu
           recycling: Titik Daur Ulang
           restaurant: Restoran
@@ -482,13 +473,11 @@ id:
           school: Sekolah
           shelter: Tempat Berlindung
           shop: Toko
-          shopping: Pusat Perbelanjaan
           shower: Tempat Pemandian Umum
           social_centre: Pusat Sosial
           social_club: Klub Sosial
           social_facility: Fasilitas Sosial
           studio: Studio
-          supermarket: Supermarket
           swimming_pool: Kolam Renang
           taxi: Taxi
           telephone: Telepon Umum
@@ -500,8 +489,6 @@ id:
           veterinary: Bedah Hewan
           village_hall: Balai Desa
           waste_basket: Keranjang Sampah
-          wifi: Akses WiFi
-          WLAN: Akses WiFi
           youth_centre: Pusat Pemuda
         boundary:
           administrative: Batas Administratif
@@ -517,13 +504,11 @@ id:
         building:
           "yes": Bangunan
         emergency:
-          fire_hydrant: Hidran Kebakaran
           phone: Telepon Darurat
         highway:
           bridleway: Jalan Tanah
           bus_guideway: Jalur Bus Terpandu
           bus_stop: Halte Bus
-          byway: Jalan Kampung
           construction: Jalan raya sedang dalam perbaikan
           cycleway: Jalur Sepeda
           emergency_access_point: Titik Akses Darurat
@@ -531,7 +516,6 @@ id:
           ford: Arungan
           living_street: Jalan Permukiman
           milestone: Patok Batu Batas Wilayah
-          minor: Jalan Kecil
           motorway: Jalan Tol
           motorway_junction: Persimpangan Jalan Tol
           motorway_link: Jalan Tol
@@ -552,7 +536,6 @@ id:
           speed_camera: Kamera Pendeteksi Kecepatan
           steps: Langkah-langkah
           street_lamp: Lampu Jalan
-          stile: Pijakan kaki pada pagar
           tertiary: Jalan Tersier
           tertiary_link: Jalan Tersier
           track: Trek
@@ -576,7 +559,6 @@ id:
           memorial: Memorial
           mine: Tambang
           monument: Monumen
-          museum: Museum
           ruins: Reruntuhan
           tomb: Makam
           tower: Menara
@@ -604,9 +586,6 @@ id:
           military: Kawasan militer
           mine: Tambang
           orchard: Kebun buah-buahan
-          nature_reserve: Cagar Alam
-          park: Taman
-          piste: Piste
           quarry: Tempat Penggalian
           railway: Rel Kereta
           recreation_ground: Taman Rekreasi
@@ -617,8 +596,6 @@ id:
           road: Wilayah Jalan
           village_green: Desa Hijau
           vineyard: Kebun anggur
-          wetland: Lahan Basah
-          wood: Kayu
         leisure:
           beach_resort: Resort Pantai
           bird_hide: Tempat Observasi Burung
@@ -653,11 +630,9 @@ id:
           beach: Pantai
           cape: Tanjung
           cave_entrance: Pintu Masuk Gua
-          channel: Kanal
           cliff: Tebing
           crater: Kawah
           dune: Bukit Pasir
-          feature: Fitur
           fell: Tebangan
           fjord: Arungan
           forest: Hutan
@@ -674,11 +649,9 @@ id:
           point: Titik
           reef: Batu Karang
           ridge: Punggung Bukit
-          river: Sungai
           rock: Batu
           scree: Kerikil
           scrub: Semak Belukar
-          shoal: Beting
           spring: Mata Air
           stone: Batu
           strait: Selat
@@ -687,7 +660,6 @@ id:
           volcano: Gunung berapi
           water: Air
           wetland: Lahan Basah
-          wetlands: Lahan Basah (jamak)
           wood: Kayu
         office:
           accountant: Akuntan
@@ -752,9 +724,6 @@ id:
           switch: Titik Kereta Api
           tram: Jalur Trem
           tram_stop: Perhentian Trem
-          yard: Emplasemen
-        route:
-          bus: Rute Bus
         shop:
           alcohol: Pub (di Inggris)
           antiques: Toko Benda Antik
@@ -843,12 +812,10 @@ id:
           hostel: Hostel
           hotel: Hotel
           information: Informasi
-          lean_to: Beristirahat
           motel: Motel
           museum: Museum
           picnic_site: Tempat Piknik
           theme_park: Taman Hiburan
-          valley: Lembah
           viewpoint: Sudut Pandang
           zoo: Kebun Binatang
         tunnel:
@@ -858,7 +825,6 @@ id:
           artificial: Jalur Air Buatan
           boatyard: Halaman Kapal
           canal: Kanal
-          connector: Penghubung Jalur Air
           dam: Bendungan
           derelict_canal: Kanal Air Terlantar
           ditch: Parit
@@ -866,15 +832,12 @@ id:
           drain: Saluran Air
           lock: Pintu Air
           lock_gate: Gerbang Pintu Air
-          mineral_spring: Mata Air Mineral
           mooring: Sandaran Kapal
           rapids: Jeram
           river: Sungai
-          riverbank: Bantaran Sungai
           stream: Arus
           wadi: Sungai Kering
           waterfall: Air Terjun
-          water_point: Titik Air
           weir: Tanggul Sungai
       admin_levels:
         level2: Batas Negara

config/locales/is.yml

@@ -242,9 +242,7 @@ is:
       prefix_format: '%{name}:'
       prefix:
         amenity:
-          airport: Flugvöllurinn
           atm: Hraðbankinn
-          auditorium: Áheyrandasalur
           bank: Bankinn
           bar: Barinn
           bench: Bekkur
@@ -259,7 +257,6 @@ is:
           casino: Spilavíti
           cinema: Kvikmyndarhúsið
           clinic: Heilsugæsla
-          club: Skemmtistaður
           college: Framhaldskóli
           community_centre: Samfélagsmiðstöð
           courthouse: Dómshús
@@ -278,16 +275,13 @@ is:
           grave_yard: Kirkjugarður
           gym: Líkamsræktarstöð
           hospital: Sjúkrahúsið
-          hotel: Hótelið
           ice_cream: Ís
           kindergarten: Leikskóli
           library: Bókasafnið
           market: Markaður
           marketplace: Markaður
-          mountain_rescue: Fjallabjörgun
           nightclub: Næturklúbbur
           office: Skrifstofa
-          park: Almenningsgarður
           parking: Bílastæði
           pharmacy: Apótek
           police: Lögreglustöð
@@ -303,7 +297,6 @@ is:
           shelter: Skýli
           shop: Verslunin
           studio: Stúdíó íbúð
-          supermarket: Stórmarkaður
           taxi: Leigubílastöð
           telephone: Almenningssími
           theatre: Leikhúsið
@@ -349,7 +342,6 @@ is:
           island: Eyjan
           peak: Fjallið eða tindurinn
           reef: Rifið
-          river: Áin
           tree: Tréð
           valley: Dalurinn
           volcano: Eldfjallið
@@ -404,7 +396,6 @@ is:
           information: Upplýsingar
           motel: Mótel
           museum: Safn
-          valley: Dalurinn
           zoo: Dýragarður
         waterway:
           dam: Vatnsaflsvirkjunin

config/locales/it.yml

@@ -146,6 +146,8 @@ it:
       relation: Relazioni (%{count})
       relation_paginated: Relazioni (%{x}-%{y} di %{count})
       comment: Commenti (%{count})
+      hidden_commented_by: Commento nascosto da %{user} <abbr title='%{exact_time}'>%{when}
+        fa</abbr>
       commented_by: Commento da %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
       changesetxml: Gruppo di modifiche XML
       osmchangexml: modificheOsm XML
@@ -238,6 +240,7 @@ it:
       title: Funzionalità di query
       introduction: Clicca sulla cartina per disponibilità nei pressi.
       nearby: Disponibilità nei pressi
+      enclosing: Elementi interni
   changeset:
     changeset_paging_nav:
       showing_page: Pagina %{page}
@@ -269,6 +272,10 @@ it:
       sorry: Siamo spiacenti, l'elenco delle modifiche che hai richiesto necessitava
         di troppo tempo per poter essere recuperato.
     rss:
+      title_all: Discussione sul gruppo di modifiche OpenStreetMap
+      title_particular: 'Discussione sul gruppo di modifiche OpenStreetMap #%{changeset_id}'
+      comment: 'Nuovo commento al gruppo di modifiche #%{changeset_id} da parte di
+        %{author}'
       commented_at_html: Aggiornato %{when} fa
       commented_at_by_html: Aggiornato %{when} fa da %{user}
       full: Discussione completa
@@ -424,11 +431,8 @@ it:
           taxiway: Pista di rullaggio
           terminal: Terminal
         amenity:
-          airport: Aeroporto
           arts_centre: Centro d'arte
-          artwork: Opera d'arte
           atm: Cassa automatica
-          auditorium: Auditorium
           bank: Banca
           bar: Bar
           bbq: Barbecue
@@ -447,7 +451,6 @@ it:
           charging_station: Stazione di ricarica
           cinema: Cinema
           clinic: Clinica
-          club: Club
           college: Accademia
           community_centre: Centro civico
           courthouse: Tribunale
@@ -468,22 +471,18 @@ it:
           fuel: Stazione di rifornimento
           grave_yard: Cimitero
           gym: Centro fitness / Palestra
-          hall: Sala
           health_centre: Casa di cura
           hospital: Ospedale
-          hotel: Hotel
           hunting_stand: Postazione di caccia
           ice_cream: Gelateria
           kindergarten: Asilo infantile
           library: Biblioteca
           market: Mercato
           marketplace: Mercato
-          mountain_rescue: Soccorso alpino
           nightclub: Night Club
           nursery: Asilo nido
           nursing_home: Asilo nido
           office: Ufficio
-          park: Parco
           parking: Parcheggio
           pharmacy: Farmacia
           place_of_worship: Luogo di culto
@@ -494,7 +493,6 @@ it:
           prison: Prigione
           pub: Pub
           public_building: Edificio pubblico
-          public_market: Mercato pubblico
           reception_area: Area accoglienza
           recycling: Punto riciclaggio rifiuti
           restaurant: Ristorante
@@ -503,13 +501,11 @@ it:
           school: Scuola
           shelter: Pensilina
           shop: Negozio
-          shopping: Acquisti
           shower: Doccia
           social_centre: Centro sociale
           social_club: Centro Sociale
           social_facility: Struttura sociale
           studio: Studio
-          supermarket: Supermercato
           swimming_pool: Piscina
           taxi: Taxi
           telephone: Telefono pubblico
@@ -521,8 +517,6 @@ it:
           veterinary: Veterinario
           village_hall: Municipio
           waste_basket: Cestino rifiuti
-          wifi: Punto di accesso WiFi
-          WLAN: Punto di accesso WiFi
           youth_centre: Centro Giovanile
         boundary:
           administrative: Confine amministrativo
@@ -538,13 +532,11 @@ it:
         building:
           "yes": Edificio
         emergency:
-          fire_hydrant: Idrante
           phone: Telefono di emergenza
         highway:
           bridleway: Percorso per equitazione
           bus_guideway: Corsia autobus a guida vincolata
           bus_stop: Fermata dell'autobus
-          byway: Byway (UK)
           construction: Strada in costruzione
           cycleway: Percorso ciclabile
           emergency_access_point: Colonnina SOS
@@ -552,7 +544,6 @@ it:
           ford: Guado
           living_street: Living Street
           milestone: Pietra miliare
-          minor: Strada minore
           motorway: Autostrada
           motorway_junction: Uscita autostradale
           motorway_link: Autostrada
@@ -573,7 +564,6 @@ it:
           speed_camera: Autovelox fissi
           steps: Scala
           street_lamp: Lampione
-          stile: Scaletta
           tertiary: Strada terziaria
           tertiary_link: Strada terziaria
           track: Strada forestale o agricola
@@ -597,7 +587,6 @@ it:
           memorial: Memoriale
           mine: Mina
           monument: Monumento
-          museum: Museo
           ruins: Rovine
           tomb: Tomba
           tower: Torre
@@ -625,9 +614,6 @@ it:
           military: Zona militare
           mine: Miniera
           orchard: Frutteto
-          nature_reserve: Riserva naturale
-          park: Parco
-          piste: Piste
           quarry: Cava
           railway: Ferrovia
           recreation_ground: Area di svago
@@ -638,8 +624,6 @@ it:
           road: Area della sede stradale
           village_green: Parco urbano
           vineyard: Vigneto
-          wetland: Zona umida
-          wood: Bosco
         leisure:
           beach_resort: Stabilimento balneare
           bird_hide: Osservatorio Camuffato
@@ -674,11 +658,9 @@ it:
           beach: Spiaggia
           cape: Capo
           cave_entrance: Entrata di grotta/caverna
-          channel: Canale
           cliff: Rupe
           crater: Cratere
           dune: Duna
-          feature: Caratteristica
           fell: Prato alpino
           fjord: Fiordo
           forest: Foresta
@@ -695,11 +677,9 @@ it:
           point: Punto
           reef: Scogliera
           ridge: Cresta montuosa
-          river: Fiume
           rock: Roccia
           scree: Ghiaione
           scrub: Boscaglia
-          shoal: Secca
           spring: Sorgente
           stone: Pietra
           strait: Stretto
@@ -708,7 +688,6 @@ it:
           volcano: Vulcano
           water: Acqua
           wetland: Zona umida
-          wetlands: Zona umida
           wood: Bosco
         office:
           accountant: Ragioniere
@@ -773,9 +752,6 @@ it:
           switch: Punti ferroviari
           tram: Tramvia
           tram_stop: Fermata del tram
-          yard: Zona di manovra ferroviaria
-        route:
-          bus: Percorso bus
         shop:
           alcohol: Alcolici
           antiques: Antiquario
@@ -864,12 +840,10 @@ it:
           hostel: Ostello
           hotel: Hotel
           information: Informazioni
-          lean_to: Tettoia
           motel: Motel
           museum: Museo
           picnic_site: Area picnic
           theme_park: Parco divertimenti
-          valley: Valle
           viewpoint: Punto panoramico
           zoo: Zoo
         tunnel:
@@ -879,7 +853,6 @@ it:
           artificial: Corso d'acqua artificiale
           boatyard: Cantiere nautico
           canal: Canale
-          connector: Canale connettore
           dam: Diga
           derelict_canal: Canale in disuso
           ditch: Fosso
@@ -887,15 +860,12 @@ it:
           drain: Fognatura/Canale di scolo
           lock: Chiusa
           lock_gate: Chiusa
-          mineral_spring: Sorgente di acqua minerale
           mooring: Ormeggio
           rapids: Rapide
           river: Fiume
-          riverbank: Argine/Banchina
           stream: Ruscello
           wadi: Uadì
           waterfall: Cascata
-          water_point: Punto di ristoro
           weir: Sbarramento idrico
       admin_levels:
         level2: Confine di paese
@@ -1295,7 +1265,12 @@ it:
           cui sei interessato'
         your_changeset: '%{commenter} ha lasciato un commento su uno dei tuoi changeset
           creato il %{time}'
+        commented_changeset: In data %{time},%{commenter} ha lasciato un commento
+          su un gruppo di modifiche di %{changeset_author} che stai osservando
+        partial_changeset_with_comment: con il commento '%{changeset_comment}'
         partial_changeset_without_comment: senza commento
+      details: Ulteriori dettagli sul gruppo di modifiche possono essere trovati su
+        %{url}.
   message:
     inbox:
       title: Posta in arrivo
@@ -2255,12 +2230,15 @@ it:
       createnote_disabled_tooltip: Ingrandisci la mappa per aggiungere una nota
       map_notes_zoom_in_tooltip: Zooma per vedere le note della mappa
       map_data_zoom_in_tooltip: Zooma per vedere i dati della mappa
+      queryfeature_tooltip: Ricerca di elementi
+      queryfeature_disabled_tooltip: Ingrandisci sugli elementi della ricerca
     changesets:
       show:
         comment: Commento
         subscribe: Iscriviti
         unsubscribe: Cancella iscrizione
         hide_comment: nascondi
+        unhide_comment: Rendi visibile
     notes:
       new:
         intro: Ti sei accorto di un errore o di qualcosa che manca? Fallo sapere agli
@@ -2280,7 +2258,12 @@ it:
     edit_help: Sposta la mappa e usa lo zoom sulla posizione che vuoi modificare,
       quindi clicca qui.
     query:
+      node: Nodo
+      way: Percorso
       relation: Relazione
+      nothing_found: Nessun elemento trovato
+      error: Errore durante la connessione a %{server}, %{error}
+      timeout: Tempo scaduto per la connessione a %{server}
   redaction:
     edit:
       description: Descrizione

config/locales/ja.yml

@@ -13,10 +13,12 @@
 # Author: Miya
 # Author: Nabetaro
 # Author: Nazotoko
+# Author: Nyampire
 # Author: OKANO Takayoshi
 # Author: Rxy
 # Author: Schu
 # Author: Shirayuki
+# Author: Sudachi
 # Author: Tombi-aburage
 # Author: Wrightbus
 # Author: 青子守歌
@@ -393,11 +395,8 @@ ja:
           taxiway: 空港誘導路
           terminal: ターミナル
         amenity:
-          airport: 空港
           arts_centre: アート センター
-          artwork: 芸術作品
           atm: ATM
-          auditorium: 講堂
           bank: 銀行
           bar: バー
           bbq: バーベキュー
@@ -416,7 +415,6 @@ ja:
           charging_station: 充電ステーション
           cinema: 映画館
           clinic: 診療所
-          club: クラブ
           college: 大学
           community_centre: コミュニティ センター
           courthouse: 裁判所
@@ -437,22 +435,18 @@ ja:
           fuel: 燃料
           grave_yard: 墓地
           gym: フィットネス センター/ジム
-          hall: ホール
           health_centre: 保健所
           hospital: 病院
-          hotel: ホテル
           hunting_stand: ハンティング スタンド
           ice_cream: アイスクリーム販売店
           kindergarten: 幼稚園
           library: 図書館
           market: 市場
           marketplace: 市場
-          mountain_rescue: 山岳救助
           nightclub: ナイト クラブ
           nursery: 保育所
           nursing_home: 特別養護老人ホーム
           office: オフィス
-          park: 公園
           parking: 駐車場
           pharmacy: 薬局
           place_of_worship: 神社仏閣
@@ -463,7 +457,6 @@ ja:
           prison: 刑務所
           pub: パブ
           public_building: 公共建築物
-          public_market: 公設市場
           reception_area: レセプションエリア
           recycling: リサイクル場
           restaurant: レストラン
@@ -472,13 +465,11 @@ ja:
           school: 学校
           shelter: 避難所
           shop: 店舗
-          shopping: ショッピング
           shower: シャワー
           social_centre: 社会センター
           social_club: 社交クラブ
           social_facility: 公共施設
           studio: スタジオ
-          supermarket: スーパーマーケット
           swimming_pool: 水泳用プール
           taxi: タクシー乗り場
           telephone: 公衆電話
@@ -490,8 +481,6 @@ ja:
           veterinary: 獣医外科
           village_hall: 役場
           waste_basket: ごみ箱
-          wifi: Wi-Fiアクセスポイント
-          WLAN: Wi-Fiアクセスポイント
           youth_centre: 青少年センター
         boundary:
           administrative: 行政境界
@@ -507,13 +496,11 @@ ja:
         building:
           "yes": 建造物
         emergency:
-          fire_hydrant: 消火栓
           phone: 緊急電話
         highway:
           bridleway: 乗馬道
           bus_guideway: 路面バス専用車線
           bus_stop: バス停
-          byway: 路地
           construction: 建設中の高速道路
           cycleway: 自転車道
           emergency_access_point: 緊急アクセスポイント
@@ -521,7 +508,6 @@ ja:
           ford: 砦
           living_street: 住宅街
           milestone: マイルストーン
-          minor: 補助道路
           motorway: 高速道路
           motorway_junction: 高速道路ジャンクション
           motorway_link: 高速道路
@@ -542,7 +528,6 @@ ja:
           speed_camera: 高速度カメラ
           steps: 階段
           street_lamp: 街灯
-          stile: 踏み越し段
           tertiary: 周辺道路
           tertiary_link: 周辺道路
           track: 農道・林道
@@ -566,7 +551,6 @@ ja:
           memorial: 記念碑
           mine: 鉱山
           monument: 記念碑
-          museum: 博物館
           ruins: 廃墟
           tomb: 墓地
           tower: 塔
@@ -594,9 +578,6 @@ ja:
           military: 軍用地域
           mine: 鉱山
           orchard: 果樹園
-          nature_reserve: 自然保護区
-          park: 公園
-          piste: スキー滑降コース
           quarry: 採石場
           railway: 鉄道
           recreation_ground: 遊園地
@@ -607,8 +588,6 @@ ja:
           road: 道路エリア
           village_green: 緑地広場
           vineyard: Vineyard
-          wetland: 湿地帯
-          wood: 森林
         leisure:
           beach_resort: ビーチ リゾート
           bird_hide: 観察小屋
@@ -643,11 +622,9 @@ ja:
           beach: 砂浜
           cape: 岬
           cave_entrance: 洞窟入口
-          channel: 水路
           cliff: 崖
           crater: クレーター
           dune: 砂丘
-          feature: 地物
           fell: 荒野
           fjord: フィヨルド
           forest: 森林
@@ -664,11 +641,9 @@ ja:
           point: 点
           reef: 砂州
           ridge: 海嶺
-          river: 河川
           rock: 岩場
           scree: がれ場
           scrub: 低木林
-          shoal: 浅瀬
           spring: 泉
           stone: 岩石
           strait: 海峡
@@ -677,7 +652,6 @@ ja:
           volcano: 噴火口
           water: 湖水
           wetland: 湿地帯
-          wetlands: 湿原
           wood: 森林
         office:
           accountant: 会計
@@ -742,9 +716,6 @@ ja:
           switch: 鉄道の分岐器
           tram: 路面軌道
           tram_stop: トラム停留所
-          yard: 車両基地
-        route:
-          bus: バス路線
         shop:
           alcohol: 酒屋
           antiques: 骨董品
@@ -833,12 +804,10 @@ ja:
           hostel: ホステル
           hotel: ホテル
           information: 案内所
-          lean_to: 東屋
           motel: モーテル
           museum: 博物館
           picnic_site: ピクニック サイト
           theme_park: テーマパーク
-          valley: 谷
           viewpoint: 景勝地
           zoo: 動物園
         tunnel:
@@ -848,7 +817,6 @@ ja:
           artificial: 人工的な水路
           boatyard: ボートヤード
           canal: 運河
-          connector: 水路コネクタ
           dam: ダム
           derelict_canal: 遺棄運河
           ditch: 溝
@@ -856,15 +824,12 @@ ja:
           drain: 排水溝
           lock: 岩場
           lock_gate: 水門
-          mineral_spring: 鉱泉
           mooring: 係留所
           rapids: 急流
           river: 河川
-          riverbank: 川岸
           stream: 小川
           wadi: 涸れ川
           waterfall: 滝
-          water_point: 給水所
           weir: ダム
       admin_levels:
         level2: 国境
@@ -965,7 +930,7 @@ ja:
         地図タイルの作成法やドキュメントは、<a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
         Commons Attribution-ShareAlike 2.0</a> ライセンス (CC BY-SA) に基づいてライセンスされます。
       credit_title_html: OpenStreetMap のクレジット表記の仕方
-      credit_1_html: 「&copy; OpenStreetMapへの協力者」のクレジットを必ず使用してください。
+      credit_1_html: 「&copy; OpenStreetMap contributors」のクレジットを必ず使用してください。
       credit_2_html: あなたはデータが Open Database License に基づいて提供されていること、そして地図タイルを使用する場合は、地図製作が
         CC BY-SA としてライセンスされていることを明確にしなければなりません。<a href="http://www.openstreetmap.org/copyright">著作権表示ページ</a>にリンクすることでこれを表現することができます。また、データの形式でOSMを配布する場合の要件として、名前を表示の上、ライセンスに直接リンクすることができます。リンクを張れないメディア（印刷など）の場合は、openstreetmap.org（OpenStreetMapをアドレスとして展開した形）、opendatacommons.org、あと関連があれば、creativecommons.orgに誘導することをお勧めします。
       credit_3_html: |-
@@ -1075,7 +1040,7 @@ ja:
       description: OSMの詳細な説明が書かれたWikiを参照してください。
   about_page:
     next: 次へ
-    copyright_html: <span>&copy;</span>OpenStreetMap<br>への協力者
+    copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
     used_by: '%{name} は、数多くのウェブ サイト、モバイル アプリ、ハードウェア機器で利用されています'
     lede_text: OpenStreetMapは、道路、通路、カフェ、鉄道駅など、世界中にあるすべてのものについてのデータを提供・メンテナンスしているマッパーのコミュニティによって構築されました。
     local_knowledge_title: 地元の情報
@@ -1259,7 +1224,7 @@ ja:
       search: 検索
       where_am_i: いまどこ?
       where_am_i_title: 検索エンジンを使用して現在の場所を記述
-      submit_text: 行く
+      submit_text: 検索
     key:
       table:
         entry:
@@ -2020,7 +1985,7 @@ ja:
         data: 地図データ
         overlays: トラブルシューティング用の地図オーバーレイ
         title: レイヤー
-      copyright: © <a href='%{copyright_url}'>OpenStreetMapへの協力者</a>
+      copyright: © <a href='%{copyright_url}'>OpenStreetMap contributors</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>寄付する</a>
     site:
       edit_tooltip: 地図を編集
@@ -2029,6 +1994,11 @@ ja:
       createnote_disabled_tooltip: メモを地図に追加するには拡大してください
       map_notes_zoom_in_tooltip: 地図メモを閲覧するには拡大してください
       map_data_zoom_in_tooltip: 地図データを閲覧するには拡大してください
+    changesets:
+      show:
+        comment: コメント
+        hide_comment: 非表示
+        unhide_comment: 非表示を解除
     notes:
       new:
         intro: スポットの間違いや情報の抜けがありましたか？他のマッパーが修正できるよう、お知らせください。マーカーを正しい位置に移動し、問題を説明するメモを入力します。（個人情報や著作権のある地図・一覧からの情報は入力しないでください。）

config/locales/ka.yml

@@ -229,10 +229,8 @@ ka:
           runway: ასაფრენ-დასაფრენი ბილიკი
           terminal: ტერმინალი
         amenity:
-          airport: აეროპორტი
           arts_centre: ხელოვნების ცენტრი
           atm: ბანკომატი
-          auditorium: აუდიტორია
           bank: ბანკი
           bar: ბარი
           bbq: ბარბექიუ
@@ -249,7 +247,6 @@ ka:
           casino: სამორინე
           cinema: კინოთეატრი
           clinic: პოლიკლინიკა
-          club: კლუბი
           college: კოლეჯი
           community_centre: საზოგადოებრივი ცენტრი
           courthouse: სასამართლო
@@ -269,22 +266,18 @@ ka:
           fuel: საწვავი
           grave_yard: საფლავი
           gym: ფიტნეს ცენტრი / სავარჯიშო დარბაზი
-          hall: დარბაზი
           health_centre: ჯანმრთელობის ცენტრი
           hospital: საავადმყოფო
-          hotel: სასტუმრო
           hunting_stand: სანადირო კოშკურა
           ice_cream: ნაყინი
           kindergarten: საბავშვო ბაღი
           library: ბიბლიოთეკა
           market: მაღაზია
           marketplace: ბაზარი
-          mountain_rescue: სამთო–სამაშველო სამსახური
           nightclub: ღამის კლუბი
           nursery: პანსიონატი
           nursing_home: მოხუცებულთა თავშესაფარი
           office: ოფისი
-          park: პარკი
           parking: ავტოსადგომი
           pharmacy: აფთიაქი
           place_of_worship: რელიგიური ადგილი
@@ -295,7 +288,6 @@ ka:
           prison: ციხე
           pub: პაბი
           public_building: საჯარო შენობა
-          public_market: ბაზრობა
           reception_area: მიმღები
           recycling: ნაგავსაყრელი
           restaurant: რესტორანი
@@ -304,11 +296,9 @@ ka:
           school: სკოლა
           shelter: თავშესაფარი
           shop: მაღაზია
-          shopping: სავაჭრო ცენტრი
           shower: შხაპი
           social_club: საზოგადოებრივი თავშეყრის ადგილი
           studio: სტუდია
-          supermarket: სუპერმარკეტი
           swimming_pool: საცურაო აუზი
           taxi: ტაქსი
           telephone: საზოგადოებრივი ტელეფონი
@@ -319,8 +309,6 @@ ka:
           vending_machine: სავაჭრო ავტომატი
           veterinary: ვეტერინარული კლინიკა
           waste_basket: ნაგვის ურნა
-          wifi: WiFi წერტილი
-          WLAN: WiFi წერტილი
           youth_centre: ახალგაზრდული ცენტრი
         boundary:
           administrative: ადმინისტრაციული საზღვარი
@@ -341,7 +329,6 @@ ka:
           emergency_access_point: სასწრაფო დახმარების პუნქტი
           footway: ტროტუარი
           living_street: საცხოვრებელი ქუჩა
-          minor: მეორადი გზა
           motorway: ავტომაგისტრალი
           motorway_junction: გზაჯვარედინი
           path: ბილიკი
@@ -375,7 +362,6 @@ ka:
           memorial: მემორიალი
           mine: მაღარო
           monument: მონუმენტი
-          museum: მუზეუმი
           ruins: ნანგრევები
           tower: კოშკი
         landuse:
@@ -397,8 +383,6 @@ ka:
           military: სამხედრო ტერიტორია
           mine: მაღარო
           orchard: ხილის ბაღი
-          nature_reserve: ნაკრძალი
-          park: პარკი
           quarry: კარიერი
           railway: რკინიგზა
           recreation_ground: რეკრეაციული ზონა
@@ -407,8 +391,6 @@ ka:
           retail: სავაჭრო ტერიტორია
           village_green: მწვანე სოფელი
           vineyard: ვენახი
-          wetland: ჭარბტენიანი ტერიტორია
-          wood: ტყე
         leisure:
           fishing: სათევზაო ტერიტორია
           garden: ბაღი
@@ -436,7 +418,6 @@ ka:
           beach: პლაჟი
           cape: კონცხი
           cave_entrance: გამოქვაბულში შესასვლელი
-          channel: არხი
           cliff: ხრამი
           crater: კრატერი
           dune: დიუნა
@@ -455,11 +436,9 @@ ka:
           point: კონცხი
           reef: რიფი
           ridge: ქედი
-          river: მდინარე
           rock: კლდე
           scree: კლდეზვავი
           scrub: ბუჩქნარი
-          shoal: თავთხელი
           spring: წყარო
           stone: ქვა
           strait: სრუტე
@@ -468,7 +447,6 @@ ka:
           volcano: ვულკანი
           water: წყალი
           wetland: ჭარბტენიანი ტერიტორია
-          wetlands: ჭარბტენიანი ტერიტორიები
           wood: ტყე
         office:
           architect: არქიტექტორი
@@ -517,7 +495,6 @@ ka:
           switch: სარკინიგზო ისარი
           tram: ტრამვაი
           tram_stop: ტრამვაის გაჩერება
-          yard: რკინიგზის დეპო
         shop:
           antiques: ანტიკვარიატი
           art: სამხატვრო სალონი
@@ -578,7 +555,6 @@ ka:
           museum: მუზეუმი
           picnic_site: საპიკნიკე ადგილი
           theme_park: თემატური პარკი
-          valley: ველი
           zoo: ზოოპარკი
         tunnel:
           "yes": გვირაბი
@@ -586,9 +562,7 @@ ka:
           canal: არხი
           dam: კაშხალი
           dock: ნავსადგური
-          mineral_spring: მინერალური წყარო
           river: მდინარე
-          riverbank: მდინარის ნაპირი
           stream: ნაკადული
           waterfall: ჩანჩქერი
     description:

config/locales/ko.yml

@@ -183,7 +183,7 @@ ko:
         way: 길
         relation: 관계
     start_rjs:
-      feature_warning: 기능 %{num_features}개를 불러오고 있으며, 브라우저가 느려지거나 응답하지 않을 수 있습니다.
+      feature_warning: 지물 %{num_features}개를 불러오고 있으며, 브라우저가 느려지거나 응답하지 않을 수 있습니다.
         이 데이터를 보여줄까요?
       load_data: 데이터 불러오기
       loading: 불러오는 중...
@@ -215,6 +215,11 @@ ko:
       reopened_by_anonymous: 익명이 <abbr title='%{exact_time}'>%{when} 전</abbr>에 다시
         활성화함
       hidden_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에 숨김'
+    query:
+      title: 지물 쿼리
+      introduction: 근처의 지물을 찾으려면 지도에서 클릭하세요.
+      nearby: 근처 지물
+      enclosing: 둘러싸는 지물
   changeset:
     changeset_paging_nav:
       showing_page: 페이지 %{page}
@@ -244,6 +249,9 @@ ko:
       load_more: 더 불러오기
     timeout:
       sorry: 죄송합니다, 요청하는 바뀜집합 목록을 얻는데 너무 오래 걸립니다.
+    rss:
+      commented_at_html: '%{when} 전에 업데이트함'
+      commented_at_by_html: '%{user} 사용자가 %{when} 전에 업데이트함'
   diary_entry:
     new:
       title: 새 일기 항목
@@ -390,11 +398,8 @@ ko:
           taxiway: 유도로
           terminal: 터미널
         amenity:
-          airport: 공항
           arts_centre: 예술 회관
-          artwork: 예술 작품
           atm: ATM
-          auditorium: 강당
           bank: 은행
           bar: 주점
           bbq: BBQ
@@ -413,7 +418,6 @@ ko:
           charging_station: 충전 스테이션
           cinema: 영화관
           clinic: 진료소
-          club: 클럽
           college: 전문대학
           community_centre: 커뮤니티 센터
           courthouse: 법원
@@ -434,22 +438,18 @@ ko:
           fuel: 주유소
           grave_yard: 묘지
           gym: 피트니스 센터 / 체육관
-          hall: 홀
           health_centre: 보건소
           hospital: 병원
-          hotel: 호텔
           hunting_stand: 사냥 스탠드
           ice_cream: 아이스크림
           kindergarten: 유치원
           library: 도서관
           market: 시장
           marketplace: 시장
-          mountain_rescue: 산악 구조대
           nightclub: 나이트 클럽
           nursery: 보육원
           nursing_home: 복지관
           office: 사무실
-          park: 공원
           parking: 주차장
           pharmacy: 약국
           place_of_worship: 예배당
@@ -460,22 +460,19 @@ ko:
           prison: 교도소
           pub: 술집
           public_building: 공공 건물
-          public_market: 공공 시장
           reception_area: 리셉션 지역
           recycling: 재활용장
           restaurant: 음식점
           retirement_home: 노인정
           sauna: 사우나
           school: 학교
-          shelter: 쉼터
+          shelter: 대피소
           shop: 상점
-          shopping: 상점
           shower: 샤워
           social_centre: 사회 센터
           social_club: 사교 클럽
           social_facility: 공공 시설
           studio: 스튜디오
-          supermarket: 슈퍼마켓
           swimming_pool: 수영장
           taxi: 택시 정류장
           telephone: 공중 전화
@@ -487,8 +484,6 @@ ko:
           veterinary: 동물병원
           village_hall: 주민센터
           waste_basket: 쓰레기통
-          wifi: 와이파이 액세스
-          WLAN: 와이파이 액세스
           youth_centre: 청소년 센터
         boundary:
           administrative: 행정 구역 경계
@@ -504,21 +499,18 @@ ko:
         building:
           "yes": 건물
         emergency:
-          fire_hydrant: 소화전
           phone: 긴급 전화
         highway:
           bridleway: 승마로
           bus_guideway: 가이드 버스 차선
           bus_stop: 버스 정류장
-          byway: 옆길
           construction: 건설 중인 고속도로
-          cycleway: 자전거 경로
+          cycleway: 자전거로
           emergency_access_point: 긴급 접근 지점
           footway: 보도
           ford: 여울
           living_street: 주택가
           milestone: 이정표
-          minor: 보조 도로
           motorway: 고속도로
           motorway_junction: 고속도로 교차점
           motorway_link: 고속도로
@@ -539,7 +531,6 @@ ko:
           speed_camera: 속도 카메라
           steps: 계단
           street_lamp: 가로등
-          stile: 회전식 문
           tertiary: 3차 도로
           tertiary_link: 3차 도로
           track: 추적
@@ -563,7 +554,6 @@ ko:
           memorial: 기념관
           mine: 광산
           monument: 기념물
-          museum: 박물관
           ruins: 유적
           tomb: 무덤
           tower: 탑
@@ -572,7 +562,7 @@ ko:
           wreck: 난파선
         landuse:
           allotments: 텃밭
-          basin: 분지
+          basin: 웅덩이
           brownfield: 재개발지역
           cemetery: 묘지
           commercial: 상업 지역
@@ -591,9 +581,6 @@ ko:
           military: 군사지
           mine: 광산
           orchard: 과수원
-          nature_reserve: 자연 보호구
-          park: 공원
-          piste: 스키 활강 코스
           quarry: 채석장
           railway: 철도
           recreation_ground: 놀이 공원
@@ -604,8 +591,6 @@ ko:
           road: 도로 지역
           village_green: 녹색 마을
           vineyard: 포도밭
-          wetland: 습지
-          wood: 산림
         leisure:
           beach_resort: 해수욕장
           bird_hide: 조류 관찰지
@@ -628,7 +613,7 @@ ko:
           stadium: 경기장
           swimming_pool: 수영장
           track: 육상 트랙
-          water_park: 워터파크
+          water_park: 워터 파크
         military:
           airfield: 군용 비행장
           barracks: 막사
@@ -640,11 +625,9 @@ ko:
           beach: 해변
           cape: 곶
           cave_entrance: 동굴 입구
-          channel: 수로
           cliff: 절벽
           crater: 크레이터
           dune: 모래 언덕
-          feature: 지물
           fell: 황야
           fjord: 피요르드
           forest: 숲
@@ -661,11 +644,9 @@ ko:
           point: 지점
           reef: 암초
           ridge: 산등성이
-          river: 강
           rock: 바위
           scree: 급사면
           scrub: 우거진 숲
-          shoal: 얕은 곳
           spring: 온천
           stone: 암석
           strait: 해협
@@ -674,7 +655,6 @@ ko:
           volcano: 화산
           water: 물
           wetland: 습지
-          wetlands: 습지
           wood: 산림
         office:
           accountant: 회계 사무소
@@ -724,7 +704,7 @@ ko:
           historic_station: 역사적인 철도역
           junction: 철도 분기점
           level_crossing: 건널목
-          light_rail: 경전철
+          light_rail: 경철도
           miniature: 미니어처 철도
           monorail: 모노레일
           narrow_gauge: 협궤 철도
@@ -739,9 +719,6 @@ ko:
           switch: 철도 분기
           tram: 전차
           tram_stop: 전차 정거장
-          yard: 철도 기지
-        route:
-          bus: 버스 노선
         shop:
           alcohol: 주점
           antiques: 골동품 상점
@@ -830,12 +807,10 @@ ko:
           hostel: 호스텔
           hotel: 호텔
           information: 안내소
-          lean_to: 오두막
           motel: 모텔
           museum: 박물관
           picnic_site: 피크닉장
           theme_park: 테마 파크
-          valley: 골짜기
           viewpoint: 경승지
           zoo: 동물원
         tunnel:
@@ -845,7 +820,6 @@ ko:
           artificial: 인공 수로
           boatyard: 보트야드
           canal: 운하
-          connector: 수로 연결로
           dam: 댐
           derelict_canal: 버려진 운하
           ditch: 구거
@@ -853,15 +827,12 @@ ko:
           drain: 배수로
           lock: 갑문
           lock_gate: 수문
-          mineral_spring: 온천장
           mooring: 계선
           rapids: 급류
           river: 강
-          riverbank: 강가
           stream: 개울
           wadi: 와디
           waterfall: 폭포
-          water_point: 급수소
           weir: 어량
       admin_levels:
         level2: 국가 경계
@@ -1067,7 +1038,7 @@ ko:
       on_html: |-
         OpenStreetMap은 <em>현실과 현재</em> 둘 다를 매핑하기 위한 장소입니다 -
         장소에 대한 건물, 도로와 기타 자세한 수백만 정보를 포함합니다. 흥미있는
-        현실 세계 기능은 무엇이든 매핑할 수 있습니다.
+        현실 세계 지물은 무엇이든 매핑할 수 있습니다.
       off_html: |-
         평점, 역사적이거나 가설적인 기능, 그리고 저작권이 있는 데이터와 같은
         고집된 데이터는 포함되지 <em>않습니다</em>. 특별한 허가가 없으면,
@@ -1369,12 +1340,12 @@ ko:
           track: 추적
           byway: 옆길
           bridleway: 승마로
-          cycleway: 자전거 도로
+          cycleway: 자전거로
           footway: 보도
           rail: 철도
           subway: 지하철
           tram:
-          - 경전철
+          - 경철도
           - 노면 전차
           cable:
           - 케이블 카
@@ -2140,6 +2111,7 @@ ko:
       createnote_disabled_tooltip: 지도에 참고를 추가하려면 확대
       map_notes_zoom_in_tooltip: 지도 참고를 보려면 확대
       map_data_zoom_in_tooltip: 지도 데이터를 보려면 확대
+      queryfeature_tooltip: 지물 쿼리
     changesets:
       show:
         comment: 덧글
@@ -2164,7 +2136,9 @@ ko:
       node: 노드
       way: 길
       relation: 관계
-      nothing_found: 기능을 찾을 수 없습니다
+      nothing_found: 지물을 찾을 수 없습니다
+      error: '%{server} 연결에 오류: %{error}'
+      timeout: '%{server} 연결에 시간 초과'
   redaction:
     edit:
       description: 설명

config/locales/lb.yml

@@ -85,6 +85,8 @@ lb:
       relation: Relatiounen (%{count})
       relation_paginated: Relatiounen (%{x}-%{y} vu(n) %{count})
       comment: Bemierkungen (%{count})
+      hidden_commented_by: Verstoppt Bemierkung vum %{user} <abbr title='%{exact_time}'>
+        viru(n) %{when}</abbr>
       changesetxml: XML mam Set vun Ännerungen
       osmchangexml: osmChange XML
       feed:
@@ -261,10 +263,7 @@ lb:
           runway: Start- a Landepist
           terminal: Terminal
         amenity:
-          airport: Fluchhafen
-          artwork: Konschtwierk
           atm: Bancomat
-          auditorium: Auditoire
           bank: Bank
           bar: Bar
           bbq: Grillplaz
@@ -281,7 +280,6 @@ lb:
           charging_station: Statioun fir ze lueden
           cinema: Kino
           clinic: Klinik
-          club: Club
           crematorium: Crematoire
           dentist: Zänndokter
           doctors: Dokteren
@@ -296,15 +294,12 @@ lb:
           grave_yard: Kiirfecht
           gym: Fitnessstudio
           hospital: Klinik
-          hotel: Hotel
           ice_cream: Glace
           kindergarten: Spillschoul
           library: Bibliothéik
           market: Maart
           marketplace: Maartplaz
-          mountain_rescue: Biergrettung
           office: Büro
-          park: Park
           parking: Parking
           pharmacy: Apdikt
           police: Police
@@ -313,7 +308,6 @@ lb:
           preschool: Spillschoul
           prison: Prisong
           pub: Bistro
-          public_market: Ëffentleche Maart
           reception_area: Rezeptiounsberäich
           recycling: Recycling-Center
           restaurant: Restaurant
@@ -324,7 +318,6 @@ lb:
           shower: Douche
           social_facility: Sozial Ariichtung
           studio: Studio
-          supermarket: Supermarché
           swimming_pool: Schwämm
           taxi: Taxi
           telephone: Telefonscabine
@@ -344,17 +337,14 @@ lb:
         building:
           "yes": Gebai
         emergency:
-          fire_hydrant: Hydrant
           phone: Noutruff-Telefon
         highway:
           bridleway: Wee fir Päerd
           bus_guideway: Busspur
-          byway: Niewewee
           construction: Autobunn (am Bau)
           footway: Fousswee
           ford: Fuert
           milestone: Kilometersteen
-          minor: Niewestrooss
           motorway: Autobunn
           path: Pad
           pedestrian: Fousswee
@@ -379,7 +369,6 @@ lb:
           house: Haus
           memorial: Monument
           monument: Monument
-          museum: Musée
           ruins: Ruinen
           tomb: Graf
           tower: Tuerm
@@ -395,15 +384,10 @@ lb:
           industrial: Industriezone
           military: Militairegebitt
           orchard: Bongert
-          nature_reserve: Naturschutzgebitt
-          park: Park
-          piste: Pist
           quarry: Steekaul
           railway: Eisebunn
           residential: Wunngéigend
           vineyard: Wéngert
-          wetland: Fiichtgebitt
-          wood: Bësch
         leisure:
           garden: Gaart
           golf_course: Golfterrain
@@ -426,7 +410,6 @@ lb:
           bay: Bucht
           beach: Plage
           cape: Kap
-          channel: Kanal
           crater: Krater
           fjord: Fjord
           forest: Bësch
@@ -437,7 +420,6 @@ lb:
           marsh: Mouer
           moor: Mouer
           point: Punkt
-          river: Floss
           rock: Steng
           spring: Quell
           stone: Steen
@@ -446,7 +428,6 @@ lb:
           volcano: Vulkan
           water: Waasser
           wetland: Fiichtgebitt
-          wetlands: Fiichtgebitter
           wood: Bësch
         office:
           architect: Architekt
@@ -460,11 +441,13 @@ lb:
           airport: Fluchhafen
           city: Stad
           country: Land
+          county: Bezierk
           farm: Bauerenhaff
           house: Haus
           houses: Haiser
           island: Insel
           islet: Insel
+          locality: Plaz
           moor: Mouer
           municipality: Gemeng
           neighbourhood: Noperschaft
@@ -534,7 +517,6 @@ lb:
           museum: Musée
           picnic_site: Piknikplaz
           theme_park: Fräizäitpark
-          valley: Dall
           viewpoint: Aussiichtspunkt
           zoo: Zoo
         tunnel:

config/locales/lt.yml

@@ -397,6 +397,8 @@ lt:
         geonames_reverse: Rezultatai iš <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix:
+        aerialway:
+          chair_lift: Keltuvas
         aeroway:
           aerodrome: Aerodromas
           apron: Oro uosto aikštelė
@@ -406,11 +408,8 @@ lt:
           taxiway: Riedėjimo takas
           terminal: Terminalas
         amenity:
-          airport: Oro uostas
           arts_centre: Menų centras
-          artwork: Meno dirbiniai
           atm: Bankomatas
-          auditorium: Auditorija
           bank: Bankas
           bar: Baras
           bbq: BBQ
@@ -429,7 +428,6 @@ lt:
           charging_station: Įkrovimo stotis
           cinema: Kino teatras
           clinic: Klinika
-          club: Klubas
           college: Koledžas
           community_centre: Bendruomenės centras
           courthouse: Teismo pastatas
@@ -450,22 +448,18 @@ lt:
           fuel: Degalinė
           grave_yard: Kapinės
           gym: Sveikatingumo centras / sporto salė
-          hall: Salė
           health_centre: Sveikatingumo centras
           hospital: Ligoninė
-          hotel: Viešbutis
           hunting_stand: Medžiotojų bokštelis
           ice_cream: Ledai
           kindergarten: Vaikų darželis
           library: Biblioteka
           market: Turgus
           marketplace: Turgavietė
-          mountain_rescue: Pagalba kalnuose
           nightclub: Naktinis klubas
           nursery: Seselės kabinetas
           nursing_home: Slaugos namai
           office: Biuras
-          park: Parkas
           parking: Stovėjimo aikštelė
           pharmacy: Vaistinė
           place_of_worship: Maldos namai
@@ -476,7 +470,6 @@ lt:
           prison: Kalėjimas
           pub: Aludė
           public_building: Visuomeninis pastatas
-          public_market: Visuomeninis turgus
           reception_area: Priėmimo zona
           recycling: Perdirbimo punktas
           restaurant: Restoranas
@@ -485,13 +478,11 @@ lt:
           school: Mokykla
           shelter: Pastogė
           shop: Parduotuvė
-          shopping: Apsipirkimo vieta
           shower: Dušas
           social_centre: Socialinių reikalų centras
           social_club: Socialinių reikalų klubas
           social_facility: Socialinė įstaiga
           studio: Studija
-          supermarket: Prekybos centras
           swimming_pool: Plaukiojimo baseinas
           taxi: Taksi
           telephone: Viešas telefonas
@@ -503,8 +494,6 @@ lt:
           veterinary: Veterinarijos chirurgija
           village_hall: Nedidelio miestelio valdžios būstinė
           waste_basket: Atliekų krepšelis
-          wifi: WiFi prieiga
-          WLAN: WiFi prieiga
           youth_centre: Jaunimo centras
         boundary:
           administrative: Administracinė riba
@@ -519,11 +508,12 @@ lt:
           "yes": Tiltas
         building:
           "yes": Pastatas
+        emergency:
+          phone: Avarinis telefonas
         highway:
           bridleway: Jodinėjimo takas
           bus_guideway: Bėginio autobuso linija
           bus_stop: Autobusų stotelė
-          byway: Keliukas
           construction: Statomas kelias
           cycleway: Dviračių takas
           emergency_access_point: Skubios prieigos punktas
@@ -531,7 +521,6 @@ lt:
           ford: Brasta
           living_street: Gyvenamosios zonos gatvė
           milestone: Riboženklis
-          minor: Šalutinis kelias
           motorway: Automagistralė
           motorway_junction: Automagistralės nuovaža
           motorway_link: Automagistralinis kelias
@@ -540,8 +529,9 @@ lt:
           platform: Platforma
           primary: Pirmosios reikšmės kelias
           primary_link: Pirmosios reikšmės kelias
+          proposed: Projektuojamas kelias
           raceway: Lenktynių trasa
-          residential: Gyvenamasis (-oji)
+          residential: Gyvenamasis kelias
           rest_area: Poilsio vieta
           road: Kelias
           secondary: Antros reikšmės kelias
@@ -550,7 +540,7 @@ lt:
           services: Automagistralės paslaugos
           speed_camera: Greičio kamera
           steps: Laiptai
-          stile: Kopynė
+          street_lamp: Gatvės žibintas
           tertiary: Trečios reikšmės kelias
           tertiary_link: Trečios reikšmės kelias
           track: Vėžės
@@ -566,6 +556,7 @@ lt:
           building: Pastatas
           castle: Pilis
           church: Bažnyčia
+          citywalls: Miesto sienos
           fort: Fortas
           house: Namas
           icon: Ikona
@@ -573,8 +564,8 @@ lt:
           memorial: Memorialas
           mine: Kasykla
           monument: Paminklas
-          museum: Muziejus
           ruins: Griuvėsiai
+          tomb: Kapas
           tower: Bokštas
           wayside_cross: Pakelės kryžius
           wayside_shrine: Koplytstulpis
@@ -600,9 +591,6 @@ lt:
           military: Karinė zona
           mine: Kasykla
           orchard: vaisių sodas
-          nature_reserve: Gamtosaugos draustinis
-          park: Parkas
-          piste: Slidinėjimo trasa
           quarry: Karjeras
           railway: Geležinkelis
           recreation_ground: Rekreacinė zona
@@ -613,8 +601,6 @@ lt:
           road: Pakelės
           village_green: Gyvenvietės žalioji zona
           vineyard: Vynuogynas
-          wetland: Pelkė
-          wood: Nedidelis miškas
         leisure:
           beach_resort: Pajūrio kurortas
           bird_hide: paukščių stebėjimo vieta
@@ -649,11 +635,9 @@ lt:
           beach: Paplūdimys
           cape: Kyšulys
           cave_entrance: Įėjimas į urvą
-          channel: Kanalas
           cliff: Uola
           crater: Krateris
           dune: Kopa
-          feature: Ypatybė
           fell: Kalnuota vieta
           fjord: Fiordas
           forest: Miškas
@@ -670,11 +654,9 @@ lt:
           point: Taškas
           reef: Rifas
           ridge: Ketera
-          river: Upė
           rock: Uola
           scree: Skardis
           scrub: Krūmai
-          shoal: Rėva
           spring: Šaltinis
           stone: Akmuo
           strait: Sąsiauris
@@ -683,7 +665,6 @@ lt:
           volcano: Ugnikalnis
           water: Vanduo
           wetland: Pelkė
-          wetlands: Pelkės
           wood: Medžiai
         office:
           accountant: Buhalteris
@@ -713,6 +694,7 @@ lt:
           locality: Vietovė
           moor: Dažnai užliejama vieta
           municipality: Savivaldybė
+          neighbourhood: Rajonas
           postcode: Pašto kodas
           region: Regionas
           sea: Jūra
@@ -738,14 +720,15 @@ lt:
           narrow_gauge: Siaurukas
           platform: Geležinkelio platforma
           preserved: Paveldo geležinkelis
+          proposed: Projektuojamas gelžkelis
           spur: Geležinkelio atsišakojimas
           station: Geležinkelio stotis
+          stop: Geležinkelio sustojimas
           subway: Metro stotis
           subway_entrance: Įėjimas į metro
           switch: Geležinkelio punktai
           tram: Tramvajus
           tram_stop: Tramvajaus stotelė
-          yard: Geležinkelio kiemas
         shop:
           alcohol: Licencijuotos parduotuvės
           antiques: Antikvariniai daiktai
@@ -755,6 +738,7 @@ lt:
           beverages: Gėrimų parduotuvė
           bicycle: Dviračių parduotuvė
           books: Knygynas
+          boutique: Butikas
           butcher: Mėsininkas
           car: Automobilių parduotuvė
           car_parts: Automobilių dalys
@@ -768,6 +752,7 @@ lt:
           convenience: Parduotuvė
           copyshop: Kanceliarinių prekių parduotuvė
           cosmetics: Kosmetikos parduotuvė
+          deli: Gastronomas
           department_store: Universalinė parduotuvė
           discount: Nukainotų prekių parduotuvė
           doityourself: Pasidaryk pats
@@ -804,17 +789,21 @@ lt:
           organic: Ekologiškų maisto produktų parduotuvė
           outdoor: Lauko parduotuvė
           pet: Naminių gyvūnėlių parduotuvė
+          pharmacy: Vaistinė
           photo: Foto prekių parduotuvė
           salon: Salonas
+          second_hand: Dėvėtų parduotuvė
           shoes: Batų parduotuvė
           shopping_centre: Prekybos centras
           sports: Sporto prekių parduotuvė
           stationery: Raštinės reikmenys
           supermarket: Prekybos centras
+          tailor: Siuvėjas
           toys: Žaislų parduotuvė
           travel_agency: Kelionių agentūra
           video: Video parduotuvė
           wine: Licencijuota parduotuvė
+          "yes": Parduotuvė
         tourism:
           alpine_hut: Kalnų trobelė
           artwork: Meno dirbiniai
@@ -828,21 +817,19 @@ lt:
           hostel: Hostelis
           hotel: Viešbutis
           information: Informacija
-          lean_to: Užuovėja
           motel: Motelis
           museum: Muziejus
           picnic_site: Poilsiavietė
           theme_park: Nuotykių parkas
-          valley: Slėnis
           viewpoint: Apžvalgos aikštelė
           zoo: Zoologijos sodas
         tunnel:
+          culvert: Vamzdis
           "yes": Tunelis
         waterway:
           artificial: Dirbtinis vandens kelias
           boatyard: Valčių priežiūra
           canal: Kanalas
-          connector: Vandens kelių jungtis
           dam: Užtvanka
           derelict_canal: Kanalas
           ditch: Griovys
@@ -850,15 +837,12 @@ lt:
           drain: Drenažo griovys
           lock: Šliuzas
           lock_gate: Šliuzo vartai
-          mineral_spring: Mineralinių vandenų šaltinis
           mooring: Švartavimas
           rapids: Upės slenksčiai
           river: Upė
-          riverbank: Upės krantas
           stream: Upeliukas
           wadi: Vadis
           waterfall: Krioklys
-          water_point: Vandens punktas
           weir: Slenkstis
       admin_levels:
         level2: Šalies sienos
@@ -896,21 +880,27 @@ lt:
   layouts:
     logo:
       alt_text: OpenStreetMap logotipas
-    home: namo
+    home: Eiti į namų vietą
     logout: Atsijungti
-    log_in: prisijungti
+    log_in: Prisijungti
     log_in_tooltip: Prisijungti prie esamos paskyros
-    sign_up: užsiregistruoti
+    sign_up: Užsiregistruoti
+    start_mapping: Pradėti žymėjimą
     sign_up_tooltip: Sukurkite paskyrą redagavimui
     edit: Keisti
     history: Istorija
     export: Eksportuoti
+    data: Duomenys
+    export_data: Eksportuoti duomenis
     gps_traces: GPS pėdsakai
     gps_traces_tooltip: Tvarkyti GPS pėdsakus
     user_diaries: Dienoraščiai
     user_diaries_tooltip: Peržiūrėti naudotojų dienoraščius
     edit_with: Redaguoti per %{editor}
     tag_line: Atviras wiki žemėlapis
+    intro_header: Sveiki atvykę į OpenStreetMap!
+    intro_text: OpenStreetMap yra pasaulio žemėlapis, kuriamas žmonių, tokių kaip
+      jūs. Jis atviras ir laisvas - naudojamas pagal atvirą licenciją.
     intro_2_create_account: sukurti naudotojo paskyrą
     partners_html: Serveris palaikomas %{ucl}, %{ic} ir %{bytemark}, ir kiti %{partners}.
     partners_ucl: UCL VR centras
@@ -923,6 +913,7 @@ lt:
       nes vykdomi esminiai priežiūros darbai.
     donate: Paremkite OpenStreetMap %{link} aparatinės įrangos atnaujinimo fondui.
     help: Pagalba
+    about: Apie
     copyright: Teisės ir licencija
     community: Bendruomenė
     community_blogs: Dienoraščiai
@@ -932,6 +923,8 @@ lt:
     make_a_donation:
       title: Paremkite OpenStreetMap finansiškai
       text: Paremkite
+    learn_more: Sužinoti daugiau
+    more: Daugiau
   license_page:
     foreign:
       title: Apie šį vertimą
@@ -1000,6 +993,10 @@ lt:
         Resources Canada), CanVec (&copy; Department of Natural
         Resources Canada), bei StatCan (Geography Division,
         Statistics Canada).
+      contributors_fi_html: '<strong>Suomija</strong>: Yra duomenų iš Nacionalinio
+        žemės tyrimo Suomijos topografijos duomenų bazės ir kitų duomenų rinkinių,
+        pagal <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI
+        Licensiją</a>.'
       contributors_fr_html: |-
         <strong>Prancūzija</strong>: Turi duomenis nuo:
         Direction Générale des Impôts.
@@ -1033,13 +1030,98 @@ lt:
         pildymų lapą</a>.
   welcome_page:
     title: Sveiki atvykę!
+    introduction_html: Sveikiname prisijungus prie OpenStreetMap - laisvo ir redaguojamo
+      pasaulio žemėlapio. Dabar, kai prisijungėte, galite pradėti žymėti. Čia trumpa
+      instrukcija su svarbiausiais dalykais, kuriuos turėtumėte žinoti.
     whats_on_the_map:
       title: Kas yra žemėlapyje
+      on_html: OpenStreetMap žymimi objektai, kurie yra <em>tikri ir dabartiniai</em>
+        - tai milijonai pastatų, kelių ir kitos vietovių informacijos. Galite žymėti
+        bet kokius jus dominančius realaus pasaulio objektus.
+      off_html: Kas tikrai <em>netinka</em>, tai subjektyvūs duomenys, tokie kaip
+        įvertinimai, istoriniai arba hipotetiniai objektai, taipogi duomenys iš autorinių
+        teisių saugomų duomenų šaltinių. Jei negavote specialaus leidimo - nekopijuokite
+        iš internetinių ar popierinių žemėlapių.
+    basic_terms:
+      title: Pagrindiniai žymėjimo terminai
+      paragraph_1_html: OpenStreetMap turi savo žodyną. Čia keli pagrindiniai naudojami
+        terminai/žodžiai.
+      editor_html: <strong>Redaktorius</strong> - tai programa arba svetainė, kurios
+        pagalba galite redaguoti žemėlapį.
+      node_html: <strong>node/taškas</strong> - taškas žemėlapyje, pavyzdžiui vienas
+        restoranas ar medis.
+      way_html: <strong>kelias/way</strong> - linija ar plotas, pavyzdžiui kelias,
+        upeliukas, ežeras ar pastatas.
+      tag_html: <strong>žyma/tag</strong> - informacija apie tašką ar liniją, pavyzdžiui
+        restorano pavadinimas arba kelio greičio apribojimas.
     questions:
       title: Turite klausimų?
+      paragraph_1_html: |-
+        Yra kelios vietos, kur galima rasti informacijos apie OpenStreetMap, užduoti klausimus, diskutuoti ir dokumentuoti žymėjimo temas.
+        <a href='%{help_url}'>Pagalbą rasite čia</a>.
     start_mapping: Pradėti žymėti
     add_a_note:
       title: Neturite laiko redaguoti? Pridėkite pastabą!
+      paragraph_1_html: Jei norite pataisyti kažką nedidelio ir neturite laiko registruotis
+        ir mokytis redaguoti - labai paprasta tiesiog palikti pastabą.
+      paragraph_2_html: 'Tiesiog eikite į <a href=''%{map_url}''>žemėlapį</a> ir spauskite
+        pastabų piktogramą: <span class=''icon note''></span>. Žemėlapyje bus pridėtas
+        žymeklis, kurį galite pertempti į kitą vietą. Pridėkite jūsų pranešimą, tada
+        spauskite įrašyti ir kiti žymėtojai patyrinės jūsų pastabą.'
+  fixthemap:
+    title: Pranešti apie problemą / taisyti žemėlapį
+    how_to_help:
+      title: Kaip padėti
+      join_the_community:
+        title: Prisijungti prie bendruomenės
+        explanation_html: Jei pastebėjote žemėlapio duomenų problemą, pavyzdžiui radote
+          trūkstamą kelią ar adresą, geriausias variantas yra prisijungti prie OpenStreetMap
+          bendruomenės ir pridėti ar pataisyti duomenis patiems.
+      add_a_note:
+        instructions_html: Tiesiog spauskite <a class='icon note'></a> arba tą pačią
+          piktogramą žemėlapyje. Žemėlapyje bus pridėtas žymeklis, kurį galėsite pertempti.
+          Pridėkite jūsų pranešimą, kurį kiti žymėtojai perskaitys ir ištirs.
+    other_concerns:
+      title: Kiti rūpesčiai
+      explanation_html: Jei abejojate, kaip mūsų duomenys naudojami arba dėl turinio,
+        prašome perskaityti mūsų <a href='/copyright'>teisių ir licencijos puslapį</a>,
+        kur rasite daugiau teisinės informacijos, arba susisiekite su atitinkama <a
+        href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF darbo grupe</a>.
+  help_page:
+    title: Pagalbos paieška
+    introduction: Yra kelios vietos, kur galima rasti informacijos apie OpenStreetMap,
+      užduoti klausimus, diskutuoti ir dokumentuoti žymėjimo temas.
+    welcome:
+      url: /welcome
+      title: Sveiki atvykę į OSM
+      description: Pradėkite šiuo greitu vadovu apie OpenStreetMap pagrindus.
+    help:
+      url: https://help.openstreetmap.org/
+      title: help.openstreetmap.org
+      description: Užduokite klausimą arba ieškokite atsakymą OSM klausimų-ir-atsakymų
+        svetainėje.
+    wiki:
+      url: http://wiki.openstreetmap.org/
+      title: wiki.openstreetmap.org
+      description: Naršykite OSM detalios dokumentacijos wiki.
+  about_page:
+    next: Kitas
+    copyright_html: <span>&copy;</span>OpenStreetMap<br>talkininkai
+    used_by: '%{name} duomenis naudoja šimtai svetainių, mobilių aplikacijų ir įrenginių'
+    lede_text: OpenStreetMap kuria bendruomenė žymėtojų, kuriančių ir prižiūrinčių
+      kelių, takų, kavinių, stočių ir kitokius pasaulio duomenis.
+    local_knowledge_title: Vietinės žinios
+    local_knowledge_html: OpenStreetMap išskiria vietines žinias. Talkininkai naudoja
+      orotofoto nuotraukas, GPS įrenginius ir paprastus lauko žemėlapius, tikrindami,
+      kad OSM duomenys yra teisingi ir aktualūs.
+    community_driven_title: Bendruomenės vystomas
+    open_data_title: Atviri duomenys
+    open_data_html: 'OpenStreetMap yra <i>atviri duomenys</i>: jūs galite laisvai
+      juos naudoti bet kokiems tikslams, tol kol nepamirštate paminėti OpenStreetMap
+      ir jo talkininkus. Jei keičiate arba pildote duomenis, galite rezultatą teikti
+      tik su tokia pačia licencija. Daugiau informacijos rasite <a href=''%{copyright_path}''>Teisės
+      ir licencija</a>.'
+    partners_title: Partneriai
   notifier:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} pakomentavo jūsų dienoraščio įrašą'
@@ -1051,6 +1133,8 @@ lt:
     message_notification:
       hi: Sveiki, %{to_user},
       header: '%{from_user} atsiuntė jums pranešimą per OpenStreetMap su tema „%{subject}“:'
+      footer_html: Pranešimą galite skaityti čia %{readurl}, o atsakyti galite čia
+        %{replyurl}
     friend_notification:
       subject: '[OpenStreetMap] %{user} prisidėjo jus kaip draugą'
       had_added_you: '%{user} pridėjo jus į savo OpenStreetMap draugų sąrašą.'
@@ -1077,8 +1161,8 @@ lt:
       confirm: Prieš ką nors darant kito, mes turime patvirtinti, kad ši užklausa
         atėjo nuo tavęs, tai atlikus spauskite nuorodą žemiau, kad patvirtintumėte
         savo paskyrą
-      welcome: Mes norėtume pasveikinti jus ir suteikti papildomos informacijos nuo
-        ko galėsite pradėti.
+      welcome: Po to, kai patvirtinsite savo paskyrą, mes suteiksime papildomos informacijos,
+        padėsiančios jums pradėti.
     email_confirm:
       subject: '[OpenStreetMap] Patvirtinkite savo e-pašto adresą'
     email_confirm_plain:
@@ -1130,6 +1214,19 @@ lt:
         commented_note: '%{commenter} aktyvavo žemėlapio pastabą, kurį jūs pakomentavote.
           Pastaba yra netoli %{place}.'
       details: Daugiau informacijos apie pastaba galima rasti %{url}.
+    changeset_comment_notification:
+      greeting: Labas,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} pakomentavo vieną iš jūsų pakeitimų'
+        subject_other: '[OpenStreetMap] %{commenter} pakomentavo vieną iš jus dominančių
+          pakeitimų'
+        your_changeset: '%{commenter} pakomentavo vieną iš jūsų pakeitimų, sukurtų
+          %{time}'
+        commented_changeset: '%{commenter} pakomentavo jūsų stebimą žemėlapio pakeitimą,
+          sukurtą %{changeset_author} %{time}'
+        partial_changeset_with_comment: su komentaru '%{changeset_comment}'
+        partial_changeset_without_comment: be komentaro
+      details: Daugiau informacijos apie pakeitimą rasite čia %{url}.
   message:
     inbox:
       title: Gautieji
@@ -1439,6 +1536,13 @@ lt:
     offline:
       heading: GPX laikmena išjungta
       message: GPX pėdsakų saugojimo ir įkėlimo sistema šiuo metu neveikia.
+    georss:
+      title: OpenStreetMap GPS pėdsakai
+    description:
+      description_with_count:
+        one: GPX failas su %{count} tašku, naudotojo %{user}
+        other: GPX failas su %{count} taškais, naudotojo %{user}
+      description_without_count: Naudotojo %{user} GPX failas
   application:
     require_cookies:
       cookies_needed: Panašu, kad išjungėte slapukus. Prieš tęsdami, įjunkite savo
@@ -1453,6 +1557,7 @@ lt:
         neprivalote su jomis sutikti, bet perskaityti - privalote.
   oauth:
     oauthorize:
+      title: Autorizuoti priėjimą prie jūsų paskyros
       request_access: Programa %{app_name} prašo prieigos prie jūsų paskyros, %{user}.
         Peržiūrėkite, ar jūs norėtumėte taikyti šias galimybes. Galite pasirinkti
         tiek kiek jums reikia.
@@ -1464,6 +1569,14 @@ lt:
       allow_read_gpx: skaityti jūsų asmeninius GPS pėdsakus.
       allow_write_gpx: įkelti GPS pėdsakus.
       allow_write_notes: modifikuoti pastabas.
+    oauthorize_success:
+      title: Autorizavimo užklausa leista
+      allowed: Jūs leidote aplikacijai %{app_name} prieiti prie savo paskyros.
+      verification: Patvirtinimo kodas yra %{code}.
+    oauthorize_failure:
+      title: Autorizacijos užklausa nepavyko
+      denied: Jūs neleidote aplikacijai %{app_name} prieiti prie savo paskyros.
+      invalid: Netinkamas autorizacijos žetonas.
     revoke:
       flash: Jūs atšaukėte savo ženklą programai %{application}
   oauth_clients:
@@ -1601,6 +1714,12 @@ lt:
       contact_webmaster: Prašome kreiptis į <a href="mailto:webmaster@openstreetmap.org">administratorių</a>,
         talkinant, kad paskyra būtų sukurta - mes pasižiūrėsime ir susitarsime kaip
         įmanoma greičiau.
+      about:
+        header: Laisvas ir redaguojamas
+        html: <p>Priešingai nei kiti žemėlapiai, OpenStreetMap kuriamas vien tik žmonių,
+          tokių kaip jūs, jis laisvas ir bet kas gali jį taisyti, atnaujinti, atsisiųsti
+          ir naudoti.</p> <p>Prisiregistruokite, norėdami pildyti. Mes išsiųsime laišką,
+          kad patvirtintume jūsų paskyrą.</p>
       license_agreement: Kai patvirtinsite savo paskyrą, turėsite sutikti su <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">talkininkų
         sąlygomis</a>.
       email address: 'E-pašto adresas:'
@@ -1624,7 +1743,7 @@ lt:
             Jei jau turite paskyrą, jūs galite prisijungti prie jūsų pakyros, naudojant savo naudotojo vardą ir slaptažodį ir tada susieti paskyrą su savo OpenID savo naudotojo nustatymuose
           </li>
         </ul>
-      continue: Tęsti
+      continue: Užsiregistruoti
       terms accepted: Ačiū, kad patvirtinote naująsias talkininkų sąlygas!
       terms declined: Atsiprašome, jei nesutinkate su naujomis Talkininkų sąlygomis.
         Daugiau informacijos rasite <a href="%{url}">čia</a>.
@@ -1659,12 +1778,13 @@ lt:
       my edits: Mano keitimai
       my traces: Mano pėdsakai
       my notes: Mano žemėlapio pastabos
+      my messages: Mano pranešimai
       my profile: Mano profilis
       my settings: Mano nustatymai
       my comments: Mano komentarai
       oauth settings: OAuth nustatymai
-      blocks on me: apribojimai man
-      blocks by me: mano sukurti apribojimai
+      blocks on me: Apribojimai man
+      blocks by me: Mano sukurti apribojimai
       send message: Siųsti žinutę
       diary: Dienoraštis
       edits: Keitimai
@@ -1786,13 +1906,17 @@ lt:
         kuriame patvirtinkite savo naują el. pašto adresą.
       flash update success: Naudotojo informacija sėkmingai atnaujinta.
     confirm:
-      heading: Patvirtinti naudotojo paskyrą.
+      heading: Patikrinkite savo pašto dėžutę!
       introduction_1: Mes išsiuntėme jums patvirtinimo laišką.
+      introduction_2: Patvirtinkite paskyrą spausdami ant nuorodos e-laiške ir tada
+        galėsite pradėti žymėti.
       press confirm button: Norėdami aktyvuoti savo paskyrą paspauskite žemiau esantį
         patvirtinimo mygtuką.
       button: Patvirtinti
       already active: Ši paskyra jau yra patvirtinta.
-      unknown token: Neatrodo, kad šis ženklas egzistuotų
+      unknown token: Šis patvirtinimo kodas nebegalioja arba neegzistuoja.
+      reconfirm_html: Jei norite iš naujo siųsti patvirtinimo laišką, <a href="%{reconfirm}">spauskite
+        čia</a>.
     confirm_resend:
       success: Mes nusiuntėme jums naują patvirtinimo pranešimą į  %{email} ir ten
         patvirtinsite savo paskyrą, kad galėtumėte pradėti žymėti.<br /><br />Jei
@@ -2007,30 +2131,62 @@ lt:
       image: Paveikslas
       link: Nuoroda arba HTML
       long_link: Nuoroda
+      short_link: TrumpaNuoroda
       embed: HTML
+      custom_dimensions: Nustatyti savo apimtį
+      format: 'Formatas:'
+      scale: 'Mastelis:'
       download: Atsisiųsti
+      short_url: Trumpas URL
+      include_marker: Įtraukti žymeklį
+      center_marker: Centruoti žemėlapį ties žymekliu
+      paste_html: Įkelkite HTML, kad įdėtumėte į svetainę
+      view_larger_map: Žiūrėti didesniame žemėlapyje
+    key:
+      title: Sutartiniai ženklai
+      tooltip: Sutartiniai ženklai
+      tooltip_disabled: Sutartiniai ženklai galimi tik standartiniame sluoksnyje
     map:
       zoom:
         in: Priartinti
         out: Nutolinti
       locate:
         title: Rodyti mano vietą
+        popup: Jūs esate {distance} {unit} nuo šio taško
       base:
         standard: Standartinis
         cycle_map: Dviračių žemėlapis
         transport_map: Transporto žemėlapis
+        hot: Humanitarinis
       layers:
+        header: Žemėlapio sluoksniai
         notes: Žemėlapio pastabos
+        data: Žemėlapio duomenys
+        title: Sluoksniai
+      copyright: © <a href='%{copyright_url}'>OpenStreetMap talkininkai</a>
+      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Paremkite</a>
     site:
       edit_tooltip: Redaguoti žemėlapį
       edit_disabled_tooltip: Norėdami redaguoti, priartinkite
       createnote_tooltip: Pridėti pastabą prie žemėlapio
       createnote_disabled_tooltip: Priartinkite, jei norite pridėti pastabą prie žemėlapio
+      map_notes_zoom_in_tooltip: Padidinkite, norėdami matyti žemėlapio pastabas
+      map_data_zoom_in_tooltip: Padidinkite, norėdami matyti žemėlapio duomenis
+      queryfeature_tooltip: Ieškoti objektų
+      queryfeature_disabled_tooltip: Padidinkite, norėdami ieškoti objektų
+    changesets:
+      show:
+        comment: Komentuoti
+        subscribe: Užsisakyti
+        unsubscribe: Atsisakyti
+        hide_comment: slėpti
+        unhide_comment: neslėpti
     notes:
       new:
-        intro: Siekiant pagerinti žemėlapyje įvesta informacija yra rodomas kitiems
-          žymėtojams, todėl prašome būti kaip aprašomasis ir tikslesnis kai perkeliate
-          žymeklį į teisingą padėtį ir į jūsų pastabą žemiau.
+        intro: Pastebėjote klaidą ar kažko trūksta? Praneškite kitiems žymėtojams,
+          kad jie galėtų pataisyti. Perkelkite žymeklį į teisingą poziciją ir įrašykite
+          pastabą, aprašančią problemą. (Prašome neįvedinėkite asmeninės informacijos
+          arba informacijos iš autorinių teisių apsaugotų žemėlapių ar katalogų/registrų.)
         add: Pridėti pastabą
       show:
         anonymous_warning: Ši Pastaba turi komentarų nuo anoniminių vartotojų, kurie
@@ -2040,6 +2196,13 @@ lt:
         reactivate: Iš naujo suaktyvinti
         comment_and_resolve: Komentuoti & išspręsti
         comment: Komentuoti
+    query:
+      node: Taškas
+      way: Kelias
+      relation: Ryšys
+      nothing_found: Nerasta objektų
+      error: 'Klaida jungiantis prie %{server}: %{error}'
+      timeout: Jungiantis prie %{server} baigėsi laikas
   redaction:
     edit:
       description: Aprašymas

config/locales/lv.yml

@@ -393,11 +393,8 @@ lv:
           taxiway: Manevrēšanas ceļš
           terminal: Terminālis
         amenity:
-          airport: Lidosta
           arts_centre: Mākslas centrs
-          artwork: Mākslas darbs
           atm: Bankomāts
-          auditorium: Auditorija
           bank: Banka
           bar: Bārs
           bbq: BBQ
@@ -416,7 +413,6 @@ lv:
           charging_station: Uzlādēšanas stacija
           cinema: Kino
           clinic: Klīnika
-          club: Klubs
           college: Koledža
           community_centre: Sabiedriskais centrs
           courthouse: Tiesa
@@ -437,22 +433,18 @@ lv:
           fuel: Degviela
           grave_yard: Kapsēta
           gym: Fitnesa centrs / Sporta zāle
-          hall: Zāle
           health_centre: Veselības centrs
           hospital: Slimnīca
-          hotel: Viesnīca
           hunting_stand: Medību tornis
           ice_cream: Saldējums
           kindergarten: Bērnudārzs
           library: Bibliotēka
           market: Tirgus
           marketplace: Tirgus
-          mountain_rescue: Kalnu glābēji
           nightclub: Naktsklubs
           nursery: Pirmsskolas mācību iestāde
           nursing_home: Pansionāts
           office: Birojs
-          park: Parks
           parking: Autostāvvieta
           pharmacy: Aptieka
           place_of_worship: Dievnams
@@ -463,7 +455,6 @@ lv:
           prison: Cietums
           pub: Krogs
           public_building: Sabiedriskā ēka
-          public_market: Tirgus
           reception_area: Uzņemšanas zona
           recycling: Pārstrādes punkts
           restaurant: Restorāns
@@ -472,13 +463,11 @@ lv:
           school: Skola
           shelter: Pajumte
           shop: Veikals
-          shopping: Iepirkšanās
           shower: Dušas
           social_centre: Sociālais centrs
           social_club: Sociālais klubs
           social_facility: Sociālā ēka
           studio: Studija
-          supermarket: Lielveikals
           swimming_pool: Peldbaseins
           taxi: Taksometrs
           telephone: Publisks telefons
@@ -490,8 +479,6 @@ lv:
           veterinary: Veterinārā ķirurģija
           village_hall: Pagastmāja
           waste_basket: Atkritumu grozs
-          wifi: WiFi piekļuves punkts
-          WLAN: WiFi piekļuves punkts
           youth_centre: Jauniešu centrs
         boundary:
           administrative: Administratīvā robeža
@@ -507,13 +494,11 @@ lv:
         building:
           "yes": Ēka
         emergency:
-          fire_hydrant: Hidrants
           phone: Telefons ārkārtas situācijai
         highway:
           bridleway: Izjādes taka
           bus_guideway: Vadāmais Autobuss
           bus_stop: Autobusa pietura
-          byway: Blakusceļš
           construction: Automaģistrāle būvniecības stadijā
           cycleway: Veloceliņš
           emergency_access_point: Ārkārtas piekļuves punkts
@@ -521,7 +506,6 @@ lv:
           ford: Fjords
           living_street: Dzīvojamā zona
           milestone: Ceļa stabs
-          minor: Otršķirīgs ceļš
           motorway: Automaģistrāle
           motorway_junction: Automaģistrāles krustojums
           motorway_link: Automaģistrāles pievedceļš
@@ -542,7 +526,6 @@ lv:
           speed_camera: Ātruma kamera
           steps: Pakāpieni
           street_lamp: Ielas Laterna
-          stile: Pakāpiens
           tertiary: Pašvaldību autoceļi
           tertiary_link: Pašvaldību autoceļš
           track: Zemesceļš
@@ -566,7 +549,6 @@ lv:
           memorial: Memoriāls
           mine: Raktuves
           monument: Piemineklis
-          museum: Muzejs
           ruins: Drupas
           tomb: Kaps
           tower: Tornis
@@ -594,9 +576,6 @@ lv:
           military: Militārā zona
           mine: Raktuves
           orchard: Dārza zona
-          nature_reserve: Dabas rezervāts
-          park: Parks
-          piste: Slēpošanas trase
           quarry: Karjers
           railway: Dzelzceļš
           recreation_ground: Atpūtas Zona
@@ -607,8 +586,6 @@ lv:
           road: Ceļa Apgabals
           village_green: Ciema Centrālais Parks
           vineyard: Vīna dārzs
-          wetland: Mitrājs
-          wood: Mežs
         leisure:
           beach_resort: Pludmales kūrorts
           bird_hide: Putnu Slēptuve
@@ -643,11 +620,9 @@ lv:
           beach: Pludmale
           cape: Zemesrags
           cave_entrance: Ieeja alā
-          channel: Kanāls
           cliff: Klints
           crater: Krāteris
           dune: Kāpa
-          feature: Iezīme
           fell: Skandināvisks Kalns
           fjord: Fjords
           forest: Mežs
@@ -664,11 +639,9 @@ lv:
           point: Punkts
           reef: Rifs
           ridge: Grēda
-          river: Upe
           rock: Klints
           scree: Nogāze
           scrub: Krūmājs
-          shoal: Sēklis
           spring: Avots
           stone: Akmens
           strait: Jūras šaurums
@@ -677,7 +650,6 @@ lv:
           volcano: Vulkāns
           water: Ūdens
           wetland: Mitrājs
-          wetlands: Mitrājs
           wood: Mežs
         office:
           accountant: Grāmatvedis
@@ -742,9 +714,6 @@ lv:
           switch: Dzelzceļa punkti
           tram: Tramvajs
           tram_stop: Tramvaja pietura
-          yard: Dzelzceļa Pagalms
-        route:
-          bus: Autobusa maršruts
         shop:
           alcohol: Alkohola Veikals
           antiques: Senlietas
@@ -833,12 +802,10 @@ lv:
           hostel: Hostelis
           hotel: Viesnīca
           information: Informācija
-          lean_to: Liekties uz
           motel: Motelis
           museum: Muzejs
           picnic_site: Piknika vieta
           theme_park: Atrakciju parks
-          valley: Ieleja
           viewpoint: Skatu punkts
           zoo: Zooloģiskais dārzs
         tunnel:
@@ -848,7 +815,6 @@ lv:
           artificial: Mākslīgais ūdensceļš
           boatyard: Jahtu piestātne
           canal: Kanāls
-          connector: Ūdensceļu savienotājs
           dam: Aizsprosts
           derelict_canal: Pamests Kanāls
           ditch: Grāvis
@@ -856,15 +822,12 @@ lv:
           drain: Grāvis
           lock: Slūžas
           lock_gate: Slūžu vārti
-          mineral_spring: Minerālavots
           mooring: Piestātne
           rapids: Krāces
           river: Upe
-          riverbank: Upes krasts
           stream: Strauts
           wadi: Izkaltusi upes gultne
           waterfall: Ūdenskritums
-          water_point: Ūdens punkts
           weir: Dambis
       admin_levels:
         level2: Valsts robeža

config/locales/mk.yml

@@ -404,11 +404,8 @@ mk:
           taxiway: Рулажна патека
           terminal: Терминал
         amenity:
-          airport: Аеродром
           arts_centre: Дом на уметности
-          artwork: Уметничко дело
           atm: Банкомат
-          auditorium: Аудиториум
           bank: Банка
           bar: Бар
           bbq: Скара
@@ -427,7 +424,6 @@ mk:
           charging_station: Напојна станица
           cinema: Кино
           clinic: Клиника
-          club: Клуб
           college: Колеџ
           community_centre: Центар на заедница
           courthouse: Суд
@@ -448,22 +444,18 @@ mk:
           fuel: Гориво
           grave_yard: Гробишта
           gym: Теретана / фитнес
-          hall: Соборна сала
           health_centre: Здравствен центар
           hospital: Болница
-          hotel: Хотел
           hunting_stand: Ловечка кула
           ice_cream: Сладолед
           kindergarten: Градинка
           library: Библиотека
           market: Пазар
           marketplace: Пазар
-          mountain_rescue: Планинарско спасување
           nightclub: Ноќен клуб
           nursery: Јасли
           nursing_home: Старечки дом
           office: Канцеларија
-          park: Парк
           parking: Паркинг
           pharmacy: Аптека
           place_of_worship: Верски објект
@@ -474,7 +466,6 @@ mk:
           prison: Затвор
           pub: Пивница
           public_building: Јавен објект
-          public_market: Градски пазар
           reception_area: Рецепција
           recycling: Рециклирање
           restaurant: Ресторан
@@ -483,13 +474,11 @@ mk:
           school: Училиште
           shelter: Засолниште
           shop: Дуќан
-          shopping: Дуќани
           shower: Туш
           social_centre: Социјален центар
           social_club: Друштвен клуб
           social_facility: Општествена постројка
           studio: Студио
-          supermarket: Супермаркет
           swimming_pool: Базен
           taxi: Такси
           telephone: Телефонска говорница
@@ -501,8 +490,6 @@ mk:
           veterinary: Ветеринарна клиника
           village_hall: Месна заедница
           waste_basket: Корпа за отпадоци
-          wifi: WiFi-пристап
-          WLAN: WiFi-пристап
           youth_centre: Младински центар
         boundary:
           administrative: Административна граница
@@ -518,13 +505,11 @@ mk:
         building:
           "yes": Градба
         emergency:
-          fire_hydrant: Хидрант
           phone: Итен телефон
         highway:
           bridleway: Коњски пат
           bus_guideway: Автобуски шини
           bus_stop: Автобуска постојка
-          byway: Спореден пат
           construction: Автопат во изградба
           cycleway: Велосипедска патека
           emergency_access_point: Прва помош
@@ -532,7 +517,6 @@ mk:
           ford: Брод
           living_street: Маалска улица
           milestone: Милјоказ
-          minor: Помал спореден пат
           motorway: Автопат
           motorway_junction: Клучка
           motorway_link: Приклучен пат
@@ -553,7 +537,6 @@ mk:
           speed_camera: Брзиноловец
           steps: Скалила
           street_lamp: Улична светилка
-          stile: Тарабен премин
           tertiary: Третостепен пат
           tertiary_link: Третостепен пат
           track: Полски пат
@@ -577,7 +560,6 @@ mk:
           memorial: Споменик
           mine: Рудник
           monument: Споменик
-          museum: Музеј
           ruins: Рушевини
           tomb: Гроб
           tower: Кула
@@ -605,9 +587,6 @@ mk:
           military: Воено подрачје
           mine: Рудник
           orchard: Овоштарник
-          nature_reserve: Природен резерват
-          park: Парк
-          piste: Писта
           quarry: Каменолом
           railway: Железница
           recreation_ground: Рекреативен терен
@@ -618,8 +597,6 @@ mk:
           road: Патно подрачје
           village_green: Селско зеленило
           vineyard: Лозници
-          wetland: Мочуриште
-          wood: Шума
         leisure:
           beach_resort: Крајбрежно одморалиште
           bird_hide: Набљудувалиште за птици
@@ -654,11 +631,9 @@ mk:
           beach: Плажа
           cape: ‘Рт
           cave_entrance: Влез во пештера
-          channel: Канал
           cliff: Гребен
           crater: Кратер
           dune: Дина
-          feature: Елемент
           fell: Фел
           fjord: Фјорд
           forest: Шума
@@ -675,11 +650,9 @@ mk:
           point: Точка
           reef: Гребен
           ridge: Срт
-          river: Река
           rock: Карпа
           scree: Сип
           scrub: Честак
-          shoal: Плитко место
           spring: Извор
           stone: Камен
           strait: Проток
@@ -688,7 +661,6 @@ mk:
           volcano: Вулкан
           water: Вода
           wetland: Мочуриште
-          wetlands: Мочуриште
           wood: Шума
         office:
           accountant: Сметководител
@@ -753,9 +725,6 @@ mk:
           switch: Железнички пунктови
           tram: Трамвајска линија
           tram_stop: Трамвајска постојка
-          yard: Железничко депо
-        route:
-          bus: Автобуска линија
         shop:
           alcohol: Алкохол на црно
           antiques: Старинарница
@@ -844,12 +813,10 @@ mk:
           hostel: Хостел
           hotel: Хотел
           information: Информации
-          lean_to: Прилепена стреа
           motel: Мотел
           museum: Музеј
           picnic_site: Излетничко место
           theme_park: Забавен парк
-          valley: Долина
           viewpoint: Видиковец
           zoo: Зоолошка
         tunnel:
@@ -859,7 +826,6 @@ mk:
           artificial: Вештачки воден пат
           boatyard: Чамцоградилиште
           canal: Канал
-          connector: Слив
           dam: Брана
           derelict_canal: Запуштен канал
           ditch: Канач
@@ -867,15 +833,12 @@ mk:
           drain: Одвод
           lock: Превојница
           lock_gate: Превојничка капија
-          mineral_spring: Минерален извор
           mooring: Сидриште
           rapids: Брзак
           river: Река
-          riverbank: Кеј
           stream: Поток
           wadi: Вади
           waterfall: Водопад
-          water_point: Пристап до вода
           weir: Јаз
       admin_levels:
         level2: Државна граница

config/locales/mr.yml

@@ -383,11 +383,8 @@ mr:
           taxiway: विमानखेचमार्ग
           terminal: अग्र
         amenity:
-          airport: विमानतळ
           arts_centre: कलाकेंद्र
-          artwork: कलाकृति
           atm: एटीएम
-          auditorium: श्रोतृगृह
           bank: बँक
           bar: मद्यगृह
           bbq: बार्बेक्यू
@@ -406,7 +403,6 @@ mr:
           charging_station: प्रभारण स्थानक
           cinema: चित्रपटगृह
           clinic: चिकित्सालय
-          club: क्लब
           college: महाविद्यालय
           community_centre: समाज भवन
           courthouse: न्यायमंदिर
@@ -427,22 +423,18 @@ mr:
           fuel: इंधन
           grave_yard: दफनभूमी
           gym: व्यायामशाळा
-          hall: सभागृह
           health_centre: आरोग्य केंद्र
           hospital: रुग्णालय
-          hotel: हॉटेल
           hunting_stand: मचाण
           ice_cream: आईसक्रिम
           kindergarten: बालवाडी
           library: ग्रंथालय
           market: बाजार
           marketplace: बाजार
-          mountain_rescue: पर्वत सुटकामार्ग
           nightclub: रात्री क्लब
           nursery: बालवाडी
           nursing_home: शुश्रुषागृह
           office: कार्यालय
-          park: उद्यान
           parking: वाहनतळ
           pharmacy: औषधालय
           place_of_worship: पूजास्थान
@@ -453,7 +445,6 @@ mr:
           prison: कारागृह
           pub: मद्यपानगृह
           public_building: सार्वजनिक इमारत
-          public_market: सार्वजनिक बाजार
           reception_area: स्वागत क्षेत्र
           recycling: पुनश्चक्रण केंद्र
           restaurant: उपाहारगृह
@@ -462,13 +453,11 @@ mr:
           school: शाळा
           shelter: आश्रयस्थान
           shop: दुकान
-          shopping: खरेदी
           shower: तुषारक
           social_centre: समाज केंद्र
           social_club: समाज क्लब
           social_facility: सामाजिक सुविधा
           studio: कलागृह
-          supermarket: सुपरमार्केट
           swimming_pool: जलतरण तलाव
           taxi: टॅक्सी
           telephone: सार्वजनिक दूरध्वनी
@@ -480,8 +469,6 @@ mr:
           veterinary: पशू शल्यक्रिया
           village_hall: गाव सभागृह
           waste_basket: कचरा टोपली
-          wifi: वायफाय पोहोच
-          WLAN: वायफाय पोहोच
           youth_centre: युवक केंद्र
         boundary:
           administrative: प्रशासकीय सीमा
@@ -497,13 +484,11 @@ mr:
         building:
           "yes": इमारत
         emergency:
-          fire_hydrant: अग्नि जलोत्सर्गी
           phone: संकटकालीन दूरध्वनी
         highway:
           bridleway: अश्वमार्ग
           bus_guideway: गायडेड बस लेन
           bus_stop: बस थांबा
-          byway: उपमार्ग
           construction: निर्माणाधीन महामार्ग
           cycleway: सायकल मार्ग
           emergency_access_point: आकस्मिक पोहोच बिंदू
@@ -511,7 +496,6 @@ mr:
           ford: पाय-उतार
           living_street: निवासी रस्ता
           milestone: मैलदगड
-          minor: किरकोळ रस्ता
           motorway: मोटारमार्ग
           motorway_junction: मोटारमार्ग जंक्शन
           motorway_link: मोटारमार्ग रस्ता
@@ -553,7 +537,6 @@ mr:
           memorial: स्मारक
           mine: खाण
           monument: स्मारक
-          museum: वस्तुसंग्रहालय
           ruins: भग्नावशेष
           tomb: थडगे
           tower: मनोरा
@@ -578,9 +561,6 @@ mr:
           military: सैनिकी क्षेत्र
           mine: खाण
           orchard: फळबाग
-          nature_reserve: अभयारण्य
-          park: उद्यान
-          piste: स्की उतार
           quarry: खुली खाण
           railway: लोहमार्ग
           recreation_ground: मैदान
@@ -591,8 +571,6 @@ mr:
           road: रस्त्याचे क्षेत्र
           village_green: गावहिरवळ
           vineyard: द्राक्षमळा
-          wetland: आर्द्र जमिन
-          wood: जंगल
         leisure:
           bird_hide: पक्षी आश्रयस्थान
           common: सार्वजनिक जागा
@@ -624,11 +602,9 @@ mr:
           beach: किनारा
           cape: भूशिर
           cave_entrance: गुंफा प्रवेश
-          channel: जलमार्ग
           cliff: कडा
           crater: विवर
           dune: धन्व
-          feature: रचना
           fell: वृक्ष तोड
           forest: वन
           geyser: उष्ण झरा
@@ -644,11 +620,9 @@ mr:
           point: बिंदू
           reef: प्रवाली
           ridge: पर्वतरांग
-          river: नदी
           rock: खडक
           scree: पायथा दगड
           scrub: खुरटी झाडी
-          shoal: धक्का
           spring: झरा
           stone: दगड
           strait: सामुद्रधुनी
@@ -657,7 +631,6 @@ mr:
           volcano: ज्वालामुखी
           water: पाणी
           wetland: आर्द्र जमिन
-          wetlands: आर्द्र जमिनी
           wood: जंगल
         office:
           accountant: लेखापाल
@@ -722,7 +695,6 @@ mr:
           switch: रेल्वे बिंदू
           tram: ट्राममार्ग
           tram_stop: ट्राम स्थानक
-          yard: रेल्वे आवार
         shop:
           alcohol: परवानाबाह्य
           antiques: पुरावस्तु
@@ -812,7 +784,6 @@ mr:
           museum: वस्तुसंग्रहालय
           picnic_site: सहल स्थान
           theme_park: सूत्र उद्यान
-          valley: दरी
           viewpoint: देखावाबिंदू
           zoo: प्राणीसंग्रहालय
         tunnel:
@@ -822,7 +793,6 @@ mr:
           artificial: कृत्रिम जलमार्ग
           boatyard: नौकाबांधणी
           canal: कालवा
-          connector: जलमार्ग अनुबंधक
           dam: धरण
           derelict_canal: त्यक्त कालवा
           ditch: चर
@@ -830,15 +800,12 @@ mr:
           drain: जलनिष्कास
           lock: जलपाश
           lock_gate: जलपाशद्वार
-          mineral_spring: खनिज झरा
           mooring: नौबंध
           rapids: जलदधारा
           river: नदी
-          riverbank: नदीकाठ
           stream: प्रवाह
           wadi: मरुघळ
           waterfall: धबधबा
-          water_point: जल केंद्र
           weir: बंधारा
       admin_levels:
         level2: देशसीमा

config/locales/ms.yml

@@ -386,11 +386,8 @@ ms:
           taxiway: Jalan Rayap
           terminal: Terminal
         amenity:
-          airport: Lapangan Terbang
           arts_centre: Pusat Seni
-          artwork: Karya Seni
           atm: ATM
-          auditorium: Auditorium
           bank: Bank
           bar: Kedai Arak
           bbq: BBQ
@@ -409,7 +406,6 @@ ms:
           charging_station: Stesen Cas
           cinema: Pawagam
           clinic: Klinik
-          club: Kelab
           college: Maktab
           community_centre: Pusat Komuniti
           courthouse: Mahkamah
@@ -430,22 +426,18 @@ ms:
           fuel: Minyak
           grave_yard: Perkuburan
           gym: Pusat Senaman / Gim
-          hall: Dewan
           health_centre: Pusat Kesihatan
           hospital: Hospital
-          hotel: Hotel
           hunting_stand: Pondok Memburu
           ice_cream: Aiskrim
           kindergarten: Tadika
           library: Perpustakaan
           market: Pasar
           marketplace: Tempat Pasar
-          mountain_rescue: Penyelamat Gunung
           nightclub: Kelab Malam
           nursery: Tabika
           nursing_home: Rumah Penjagaan
           office: Pejabat
-          park: Taman
           parking: Letak Kereta
           pharmacy: Farmasi
           place_of_worship: Tempat Ibadat
@@ -456,7 +448,6 @@ ms:
           prison: Penjara
           pub: Pab
           public_building: Bangunan Awam
-          public_market: Pasar Awam
           reception_area: Sambut Tetamu
           recycling: Kitar Semula
           restaurant: Kedai Makan
@@ -465,13 +456,11 @@ ms:
           school: Sekolah
           shelter: Perteduhan
           shop: Kedai
-          shopping: Beli-Belah
           shower: Pancuran
           social_centre: Pusat Sosial
           social_club: Kelab Sosial
           social_facility: Kemudahan Sosial
           studio: Studio
-          supermarket: Pasar Raya
           swimming_pool: Kolam Renang
           taxi: Teksi
           telephone: Telefon Awam
@@ -483,8 +472,6 @@ ms:
           veterinary: Doktor Haiwan
           village_hall: Balai Raya
           waste_basket: Bakul Sampah
-          wifi: Capaian WiFi
-          WLAN: Capaian WiFi
           youth_centre: Pusat Belia
         boundary:
           administrative: Sempadan Pentadbiran
@@ -500,13 +487,11 @@ ms:
         building:
           "yes": Bangunan
         emergency:
-          fire_hydrant: Pili Bomba
           phone: Telefon Kecemasan
         highway:
           bridleway: Lorong Kuda
           bus_guideway: Lorong Bas Berpandu
           bus_stop: Perhentian Bas
-          byway: Jalan Kecil
           construction: Lebuhraya dalam Pembinaan
           cycleway: Lorong Basikal
           emergency_access_point: Titik Capaian Kecemasan
@@ -514,7 +499,6 @@ ms:
           ford: Harungan
           living_street: Jalan Masyarakat
           milestone: Batu Tanda Jalan
-          minor: Jalan Sampingan
           motorway: Lebuhraya
           motorway_junction: Simpang Lebuhraya
           motorway_link: Jalan Lebuhraya
@@ -535,7 +519,6 @@ ms:
           speed_camera: Kamera Kelajuan
           steps: Tangga
           street_lamp: Lampu Jalan
-          stile: Tangga Pagar
           tertiary: Jalan Tertier
           tertiary_link: Jalan Tertier
           track: Laluan
@@ -559,7 +542,6 @@ ms:
           memorial: Peringatan
           mine: Lombong
           monument: Tugu
-          museum: Muzium
           ruins: Puing
           tomb: Makam
           tower: Menara
@@ -587,9 +569,6 @@ ms:
           military: Kawasan Tentera
           mine: Lombong
           orchard: Dusun
-          nature_reserve: Cagar Alam
-          park: Taman
-          piste: Padang Luncur Ais
           quarry: Kuari
           railway: Landasan Keretapi
           recreation_ground: Tempat Berekreasi
@@ -600,8 +579,6 @@ ms:
           road: Kawasan Jalan Raya
           village_green: Padang Kampung
           vineyard: Ladang Anggur
-          wetland: Tanah Lembap
-          wood: Hutan Kecil
         leisure:
           beach_resort: Peranginan Pantai
           bird_hide: Kurungan Burung
@@ -636,11 +613,9 @@ ms:
           beach: Pantai
           cape: Tanjung
           cave_entrance: Liang Gua
-          channel: Alur
           cliff: Cenuram
           crater: Kawah
           dune: Gumuk
-          feature: Rupa Muka
           fell: Fell
           fjord: Fjord
           forest: Hutan
@@ -657,11 +632,9 @@ ms:
           point: Titik
           reef: Terumbu
           ridge: Rabung
-          river: Sungai
           rock: Batu
           scree: Batu Runtuh
           scrub: Belukar
-          shoal: Beting
           spring: Mata Air
           stone: Batu
           strait: Selat
@@ -670,7 +643,6 @@ ms:
           volcano: Gunung Berapi
           water: Air
           wetland: Tanah Lembap
-          wetlands: Tanah Lembap
           wood: Hutan Kecil
         office:
           accountant: Juruakaun
@@ -735,7 +707,6 @@ ms:
           switch: Titik Landasan Keretapi
           tram: Landasan Trem
           tram_stop: Perhentian Trem
-          yard: Laman Keretapi
         shop:
           alcohol: Kedai Arak Tanpa Lesen
           antiques: Kedai Antik
@@ -824,12 +795,10 @@ ms:
           hostel: Hostel
           hotel: Hotel
           information: Maklumat
-          lean_to: Bangsal Pisang Sesikat
           motel: Motel
           museum: Muzium
           picnic_site: Tapak Berkelah
           theme_park: Taman Tema
-          valley: Lembah
           viewpoint: Sudut Pandangan
           zoo: Taman Haiwan
         tunnel:
@@ -839,7 +808,6 @@ ms:
           artificial: Jalan Air Buatan
           boatyard: Limbungan Bot
           canal: Terusan
-          connector: Penyambung Jalan Air
           dam: Empangan
           derelict_canal: Terusan Terbiar
           ditch: Parit
@@ -847,15 +815,12 @@ ms:
           drain: Longkang
           lock: Pintu Air
           lock_gate: Pintu Air
-          mineral_spring: Mata Air Mineral
           mooring: Tambatan
           rapids: Jeram
           river: Sungai
-          riverbank: Tebing Sungai
           stream: Anak Sungai
           wadi: Wadi
           waterfall: Air Terjun
-          water_point: Titik Jalan Air
           weir: Tebat
       admin_levels:
         level2: Sempadan Negara

config/locales/nb.yml

@@ -393,11 +393,8 @@ nb:
           taxiway: Taksebane
           terminal: Terminal
         amenity:
-          airport: Flyplass
           arts_centre: Kunstsenter
-          artwork: Kunstverk
           atm: Minibank
-          auditorium: Auditorium
           bank: Bank
           bar: Bar
           bbq: Grill
@@ -416,7 +413,6 @@ nb:
           charging_station: Ladestasjon
           cinema: Kino
           clinic: Klinikk
-          club: Klubb
           college: Høyskole
           community_centre: Samfunnshus
           courthouse: Rettsbygning
@@ -437,22 +433,18 @@ nb:
           fuel: Drivstoff
           grave_yard: Gravlund
           gym: Treningssenter
-          hall: Spisesal
           health_centre: Helsesenter
           hospital: Sykehus
-          hotel: Hotell
           hunting_stand: Jaktbod
           ice_cream: Iskrem
           kindergarten: Barnehage
           library: Bibliotek
           market: Marked
           marketplace: Markedsplass
-          mountain_rescue: Fjellredning
           nightclub: Nattklubb
           nursery: Førskole
           nursing_home: Pleiehjem
           office: Kontor
-          park: Park
           parking: Parkeringsplass
           pharmacy: Apotek
           place_of_worship: Tilbedelsesplass
@@ -463,7 +455,6 @@ nb:
           prison: Fengsel
           pub: Pub
           public_building: Offentlig bygning
-          public_market: Offentlig marked
           reception_area: Oppsamlingsområde
           recycling: Resirkuleringspunkt
           restaurant: Restaurant
@@ -472,13 +463,11 @@ nb:
           school: Skole
           shelter: Tilfluktsrom
           shop: Butikk
-          shopping: Handel
           shower: Dusj
           social_centre: Samfunnshus
           social_club: Sosial klubb
           social_facility: Sosialtjeneste
           studio: Studio
-          supermarket: Supermarked
           swimming_pool: Svømmebasseng
           taxi: Drosje
           telephone: Offentlig telefon
@@ -490,8 +479,6 @@ nb:
           veterinary: Veterinærklinikk
           village_hall: Forsamlingshus
           waste_basket: Søppelkasse
-          wifi: WiFi-tilgangspunkt
-          WLAN: Trådløs internettilgang
           youth_centre: Ungdomssenter
         boundary:
           administrative: Administrativ grense
@@ -507,13 +494,11 @@ nb:
         building:
           "yes": Bygning
         emergency:
-          fire_hydrant: Brannhydrant
           phone: Nødtelefon
         highway:
           bridleway: Ridevei
           bus_guideway: Ledet bussfelt
           bus_stop: Busstopp
-          byway: Stikkvei
           construction: Motorvei under konstruksjon
           cycleway: Sykkelsti
           emergency_access_point: Nødtilgangspunkt
@@ -521,7 +506,6 @@ nb:
           ford: Vadested
           living_street: Gatetun
           milestone: Milepæl
-          minor: Mindre vei
           motorway: Motorvei
           motorway_junction: Motorveikryss
           motorway_link: Vei til motorvei
@@ -542,7 +526,6 @@ nb:
           speed_camera: Fotoboks
           steps: Trapper
           street_lamp: Gatelys
-          stile: Stige
           tertiary: Tertiær vei
           tertiary_link: Lokalvei
           track: Sti
@@ -566,7 +549,6 @@ nb:
           memorial: Minne
           mine: Gruve
           monument: Monument
-          museum: Museum
           ruins: Ruiner
           tomb: Grav
           tower: Tårn
@@ -594,9 +576,6 @@ nb:
           military: Militært område
           mine: Gruve
           orchard: Frukthage
-          nature_reserve: Naturreservat
-          park: Park
-          piste: Løype
           quarry: Steinbrudd
           railway: Jernbane
           recreation_ground: Idrettsplass
@@ -607,8 +586,6 @@ nb:
           road: Veiområde
           village_green: landsbypark
           vineyard: Vingård
-          wetland: Våtland
-          wood: Skog
         leisure:
           beach_resort: Strandsted
           bird_hide: Fugletårn
@@ -643,11 +620,9 @@ nb:
           beach: Strand
           cape: Nes
           cave_entrance: Huleinngang
-          channel: Kanal
           cliff: Klippe
           crater: Krater
           dune: Sanddyne
-          feature: Egenskap
           fell: Fjellskrent
           fjord: Fjord
           forest: Skog
@@ -664,11 +639,9 @@ nb:
           point: Punkt
           reef: Rev
           ridge: Rygg
-          river: Elv
           rock: Stein
           scree: Ur
           scrub: Kratt
-          shoal: Grunning
           spring: Kilde
           stone: Stein
           strait: Stred
@@ -677,7 +650,6 @@ nb:
           volcano: Vulkan
           water: Vann
           wetland: Våtmark
-          wetlands: Våtland
           wood: Skog
         office:
           accountant: Revisor
@@ -742,7 +714,6 @@ nb:
           switch: Sporveksel
           tram: Sporvei
           tram_stop: Trikkestopp
-          yard: Skiftetomt
         shop:
           alcohol: Utenfor lisens
           antiques: Antikviteter
@@ -831,12 +802,10 @@ nb:
           hostel: Vandrerhjem
           hotel: Hotell
           information: Informasjon
-          lean_to: Lenne inntil
           motel: Motell
           museum: Museum
           picnic_site: Piknikplass
           theme_park: Fornøyelsespark
-          valley: Dal
           viewpoint: Utsiktspunkt
           zoo: Dyrepark
         tunnel:
@@ -846,7 +815,6 @@ nb:
           artificial: Kunstig vassdrag
           boatyard: Båthan
           canal: Kanal
-          connector: Vannveiforbindelse
           dam: Demning
           derelict_canal: Nedlagt kanal
           ditch: Grøft
@@ -854,15 +822,12 @@ nb:
           drain: Avløp
           lock: Sluse
           lock_gate: Sluseport
-          mineral_spring: Mineralkilde
           mooring: Fortøyning
           rapids: Stryk
           river: Elv
-          riverbank: Elvebredd
           stream: Strøm
           wadi: Elveleie
           waterfall: Foss
-          water_point: Vannpunkt
           weir: Overløpskant \
       admin_levels:
         level2: Riksgrense

config/locales/nl.yml

@@ -428,11 +428,8 @@ nl:
           taxiway: Taxibaan
           terminal: Terminal
         amenity:
-          airport: Luchthaven
           arts_centre: Kunstcollectief
-          artwork: Kunst
           atm: Geldautomaat
-          auditorium: Auditorium
           bank: Bank
           bar: Bar
           bbq: BBQ
@@ -451,7 +448,6 @@ nl:
           charging_station: Laadstation
           cinema: Bioscoop
           clinic: Kliniek
-          club: Club
           college: Hogeschool
           community_centre: Gemeenschapscentrum
           courthouse: Rechtbank
@@ -472,22 +468,18 @@ nl:
           fuel: Brandstof
           grave_yard: Begraafplaats
           gym: Fitnesscentrum
-          hall: Hal
           health_centre: Gezondheidscentrum
           hospital: Ziekenhuis
-          hotel: Hotel
           hunting_stand: Jachttoren
           ice_cream: IJs
           kindergarten: Kleuterschool
           library: Bibliotheek
           market: Markt
           marketplace: Marktplein
-          mountain_rescue: Reddingsdienst
           nightclub: Nachtclub
           nursery: Peuterspeelzaal
           nursing_home: Verpleeghuis
           office: Kantoor
-          park: Park
           parking: Parkeren
           pharmacy: Apotheek
           place_of_worship: Religieuze samenkomstplaats
@@ -498,7 +490,6 @@ nl:
           prison: Gevangenis
           pub: Café
           public_building: Openbaar gebouw
-          public_market: Openbare markt
           reception_area: Receptie
           recycling: Recyclingpunt
           restaurant: Restaurant
@@ -507,13 +498,11 @@ nl:
           school: School
           shelter: Beschutting
           shop: Winkel
-          shopping: Winkelen
           shower: Douche
           social_centre: Sociaal centrum
           social_club: Sociale club
           social_facility: Sociale voorziening
           studio: Eenkamerappartement
-          supermarket: Supermarkt
           swimming_pool: Zwembad
           taxi: Taxi
           telephone: Openbare telefoon
@@ -525,8 +514,6 @@ nl:
           veterinary: Dierenarts
           village_hall: Gemeentehuis
           waste_basket: Prullenbak
-          wifi: Wifi-toegang
-          WLAN: Wifi-toegang
           youth_centre: Jeugdcentrum
         boundary:
           administrative: Administratieve grens
@@ -542,13 +529,11 @@ nl:
         building:
           "yes": Gebouw
         emergency:
-          fire_hydrant: Brandkraan
           phone: Noodtelefoon
         highway:
           bridleway: Ruiterpad
           bus_guideway: Vrijliggende busbaan
           bus_stop: Bushalte
-          byway: Onverharde weg
           construction: Snelweg in aanbouw
           cycleway: Fietspad
           emergency_access_point: Noodafslag
@@ -556,7 +541,6 @@ nl:
           ford: Voorde
           living_street: Woonerf
           milestone: Mijlpaal
-          minor: Lokale weg
           motorway: Autosnelweg
           motorway_junction: Autosnelwegknooppunt
           motorway_link: Autosnelwegverbindingsweg
@@ -577,7 +561,6 @@ nl:
           speed_camera: Snelheidscamera
           steps: Trap
           street_lamp: Straatlantaarn
-          stile: Overstap
           tertiary: Tertiaire weg
           tertiary_link: Tertiaire weg
           track: Pad
@@ -601,7 +584,6 @@ nl:
           memorial: Herdenkingsmonument
           mine: Mijn
           monument: Monument
-          museum: Museum
           ruins: Ruïne
           tomb: Graf
           tower: Toren
@@ -629,9 +611,6 @@ nl:
           military: Miltair gebied
           mine: Mijn
           orchard: Boomgaard
-          nature_reserve: Natuurreservaat
-          park: Park
-          piste: Piste
           quarry: Steengroeve
           railway: Spoor
           recreation_ground: Recreatiegebied
@@ -642,8 +621,6 @@ nl:
           road: Weggebied
           village_green: Stadsgroen
           vineyard: Wijngaard
-          wetland: Moeras
-          wood: Hout
         leisure:
           beach_resort: Badplaats
           bird_hide: Nestplaats
@@ -678,11 +655,9 @@ nl:
           beach: Strand
           cape: Kaap
           cave_entrance: Grotingang
-          channel: Kanaal
           cliff: Klif
           crater: Krater
           dune: Duin
-          feature: Bezienswaardigheid
           fell: Fjell
           fjord: Fjord
           forest: Bos
@@ -699,11 +674,9 @@ nl:
           point: Punt
           reef: Rif
           ridge: Bergkam
-          river: Rivier
           rock: Rotsen
           scree: Puin
           scrub: Struikgewas
-          shoal: Zandbank
           spring: Bron
           stone: Steen
           strait: Zeeëngte
@@ -712,7 +685,6 @@ nl:
           volcano: Vulkaan
           water: Water
           wetland: Moeras
-          wetlands: Moeras
           wood: Bos
         office:
           accountant: Boekhouder
@@ -777,9 +749,6 @@ nl:
           switch: Wissel
           tram: Tramrails
           tram_stop: Tramhalte
-          yard: Rangeerterrein
-        route:
-          bus: Busroute
         shop:
           alcohol: Slijterij
           antiques: Antiek
@@ -868,12 +837,10 @@ nl:
           hostel: Jeugdherberg
           hotel: Hotel
           information: Gegevens
-          lean_to: Open schutplaats
           motel: Motel
           museum: Museum
           picnic_site: Picknickplaats
           theme_park: Pretpark
-          valley: Vallei
           viewpoint: Bijzonder uitzicht
           zoo: Dierentuin
         tunnel:
@@ -883,7 +850,6 @@ nl:
           artificial: Kunstmatige waterweg
           boatyard: Scheepswerf
           canal: Kanaal
-          connector: Waterverbinding
           dam: Dam
           derelict_canal: Onbeheerd kanaal
           ditch: Sloot
@@ -891,15 +857,12 @@ nl:
           drain: Afvoerkanaal
           lock: Schutsluis
           lock_gate: Sluisdeur
-          mineral_spring: Bron
           mooring: Aanlegplaats
           rapids: Stroomversnelling
           river: Rivier
-          riverbank: Rivierbedding
           stream: Stroom
           wadi: Beek
           waterfall: Waterval
-          water_point: Waterpunt
           weir: Stuwdam
       admin_levels:
         level2: Landsgrens

config/locales/nn.yml

@@ -297,11 +297,8 @@ nn:
           taxiway: Taksebane
           terminal: Terminal
         amenity:
-          airport: Flyplass
           arts_centre: Kunstsenter
-          artwork: Kunstverk
           atm: Minibank
-          auditorium: Auditorium
           bank: Bank
           bar: Bar
           bbq: Grill
@@ -320,7 +317,6 @@ nn:
           charging_station: Ladestation
           cinema: Kino
           clinic: Klinikk
-          club: Klubb
           college: Høgskule
           community_centre: Samfunnshus
           courthouse: Rettsbygning
@@ -341,22 +337,18 @@ nn:
           fuel: Drivstoff
           grave_yard: Gravlund
           gym: Treningssenter
-          hall: Spisesal
           health_centre: Helsesenter
           hospital: Sjukehus
-          hotel: Hotell
           hunting_stand: Jaktbod
           ice_cream: Iskrem
           kindergarten: Barnehage
           library: Bibliotek
           market: Marknad
           marketplace: Marknadsplass
-          mountain_rescue: Fjellredning
           nightclub: Nattklubb
           nursery: Førskule
           nursing_home: Pleieheim
           office: Kontor
-          park: Park
           parking: Parkeringsplass
           pharmacy: Apotek
           place_of_worship: Religiøst hus
@@ -367,7 +359,6 @@ nn:
           prison: Fengsel
           pub: Pub
           public_building: Offentleg bygning
-          public_market: Offentleg marknad
           reception_area: Oppsamlingsområde
           recycling: Resirkuleringspunkt
           restaurant: Restaurant
@@ -376,12 +367,10 @@ nn:
           school: Skule
           shelter: Tilfluktsrom
           shop: Butikk
-          shopping: Handel
           shower: Dusj
           social_centre: Samfunnshus
           social_club: Sosial klubb
           studio: Studio
-          supermarket: Supermarknad
           swimming_pool: Symjebaseng
           taxi: Drosje
           telephone: Offentleg telefon
@@ -393,8 +382,6 @@ nn:
           veterinary: Veterinærklinikk
           village_hall: Forsamlingshus
           waste_basket: Søppelkasse
-          wifi: WiFi-tilgangspunkt
-          WLAN: WiFi-tilgangspunkt
           youth_centre: Ungdomssenter
         boundary:
           administrative: Administrativ grense
@@ -413,7 +400,6 @@ nn:
           bridleway: Rideveg
           bus_guideway: Leidde bussfelt
           bus_stop: Busstopp
-          byway: Stikkveg
           construction: Motorveg under konstruksjon
           cycleway: Sykkelsti
           emergency_access_point: Nødtilgangspunkt
@@ -421,7 +407,6 @@ nn:
           ford: Vadestad
           living_street: Gatetun
           milestone: Milestolpe
-          minor: Mindre veg
           motorway: Motorveg
           motorway_junction: Motorvegkryss
           motorway_link: Veg til motorveg
@@ -440,7 +425,6 @@ nn:
           services: Motorveitjenester
           speed_camera: Fotoboks
           steps: Trapper
-          stile: Stige
           tertiary: Tertiær veg
           tertiary_link: Kommunal veg
           track: Sti
@@ -463,7 +447,6 @@ nn:
           memorial: Minne
           mine: Gruve
           monument: Monument
-          museum: Museum
           ruins: Ruinar
           tower: Tårn
           wayside_cross: Vegkant kross
@@ -490,9 +473,6 @@ nn:
           military: Militært område
           mine: Gruve
           orchard: Frukthage
-          nature_reserve: Naturreservat
-          park: Park
-          piste: Løype
           quarry: Steinbrot
           railway: Jernbane
           recreation_ground: Idrettsplass
@@ -503,8 +483,6 @@ nn:
           road: Vegområde
           village_green: landsbypark
           vineyard: Vingård
-          wetland: Våtmark
-          wood: Skog
         leisure:
           beach_resort: Strandsted
           bird_hide: Fugletårn
@@ -539,11 +517,9 @@ nn:
           beach: Strand
           cape: Nes
           cave_entrance: Holeinngang
-          channel: Kanal
           cliff: Klippe
           crater: Krater
           dune: Sanddyne
-          feature: Eigenskap
           fell: Fjellskrent
           fjord: Fjord
           forest: Skog
@@ -560,11 +536,9 @@ nn:
           point: Punkt
           reef: Rev
           ridge: Rygg
-          river: Elv
           rock: Stein
           scree: Ur
           scrub: Kratt
-          shoal: Grunning
           spring: Kjelde
           stone: Stein
           strait: Stred
@@ -573,7 +547,6 @@ nn:
           volcano: Vulkan
           water: Vatn
           wetland: Våtmark
-          wetlands: Våtland
           wood: Skog
         office:
           accountant: Revisor
@@ -635,7 +608,6 @@ nn:
           switch: Sporveksel
           tram: Sporveg
           tram_stop: Trikkestopp
-          yard: Skiftetomt
         shop:
           alcohol: Utanfor lisens
           antiques: Antikviteter
@@ -718,12 +690,10 @@ nn:
           hostel: Vandrerhjem
           hotel: Hotell
           information: Informasjon
-          lean_to: Gapehuk
           motel: Motell
           museum: Museum
           picnic_site: Piknikplass
           theme_park: Fornøyelsespark
-          valley: Dal
           viewpoint: Utsiktspunkt
           zoo: Dyrepark
         tunnel:
@@ -732,7 +702,6 @@ nn:
           artificial: Kunstig vassdrag
           boatyard: Båtverft
           canal: Kanal
-          connector: Vannvegforbindelse
           dam: Demning
           derelict_canal: Nedlagt kanal
           ditch: Grøft
@@ -740,15 +709,12 @@ nn:
           drain: Avløp
           lock: Sluse
           lock_gate: Sluseport
-          mineral_spring: Mineralkilde
           mooring: Fortøyning
           rapids: Bank
           river: Elv
-          riverbank: Elvebredd
           stream: Straum
           wadi: Elveleie
           waterfall: Foss
-          water_point: Vannpunkt
           weir: Overløpskant
     description:
       title:

config/locales/oc.yml

@@ -384,11 +384,8 @@ oc:
           taxiway: Via de manòbra
           terminal: Terminal
         amenity:
-          airport: Aeropòrt
           arts_centre: Centre artistic
-          artwork: Òbra d'art
           atm: Distribuidor automatic de bilhets
-          auditorium: Auditòrium
           bank: Banca
           bar: Bar
           bbq: Barbecue
@@ -407,7 +404,6 @@ oc:
           charging_station: Estacion de recarga
           cinema: Cinèma
           clinic: Clinica
-          club: Club
           college: Collègi
           community_centre: Sala polivalenta
           courthouse: Palais de justícia
@@ -428,22 +424,18 @@ oc:
           fuel: Carburant
           grave_yard: Cementèri
           gym: Fitness /gimnastica
-          hall: Sala
           health_centre: Centre de santat
           hospital: Espital
-          hotel: Ostalariá
           hunting_stand: Taulièr de tir
           ice_cream: Crema glaçada
           kindergarten: Jardin infantil
           library: Bibliotèca
           market: Mercat
           marketplace: Plaça del mercat
-          mountain_rescue: Secors en montanha
           nightclub: Discotèca
           nursery: Grépia
           nursing_home: Ostal de santat
           office: Burèu
-          park: Pargue
           parking: Parcatge
           pharmacy: Farmàcia
           place_of_worship: Luòc de culte
@@ -454,7 +446,6 @@ oc:
           prison: Preson
           pub: Bar
           public_building: Bastiment public
-          public_market: Mercat public
           reception_area: Zòna de recepcion
           recycling: Punt de reciclatge
           restaurant: Restaurant
@@ -463,13 +454,11 @@ oc:
           school: Escòla
           shelter: Refugi
           shop: Magazin
-          shopping: Comèrci
           shower: Docha
           social_centre: Centre social
           social_club: Club social
           social_facility: Servici social
           studio: Estúdio
-          supermarket: Supermercat
           swimming_pool: Piscina
           taxi: Taxi
           telephone: Telefòn public
@@ -481,8 +470,6 @@ oc:
           veterinary: Cirurgia veterinària
           village_hall: Sala comunala
           waste_basket: Escobilhièr
-          wifi: Accès WiFi
-          WLAN: Accès WiFi
           youth_centre: Centre per la joventud
         boundary:
           administrative: Limit administratiu
@@ -498,13 +485,11 @@ oc:
         building:
           "yes": Bastiment
         emergency:
-          fire_hydrant: Boca d'incendi
           phone: Telefòn d'urgéncia
         highway:
           bridleway: Camin per cavalièrs
           bus_guideway: Via de bus guidada
           bus_stop: Arrèst de bus
-          byway: Rota segondària
           construction: Autorota en construccion
           cycleway: Pista ciclabla
           emergency_access_point: Punt d'accès d'urgéncia
@@ -512,7 +497,6 @@ oc:
           ford: Ga
           living_street: Carrièra en zòna de rencontre
           milestone: Bòrna quilometrica
-          minor: Rota menora
           motorway: Autorota
           motorway_junction: Joncion d'autorota
           motorway_link: Rota autorotièra
@@ -533,7 +517,6 @@ oc:
           speed_camera: Radar de velocitat
           steps: Escalièr
           street_lamp: Lampadari
-          stile: Palenc
           tertiary: Rota terciària
           tertiary_link: Rota terciària
           track: Pista
@@ -557,7 +540,6 @@ oc:
           memorial: Memorial
           mine: Mina
           monument: Monument
-          museum: Musèu
           ruins: Roïnas
           tomb: Tombèl
           tower: Torre
@@ -585,9 +567,6 @@ oc:
           military: Zòna militara
           mine: Mina
           orchard: Vergièr
-          nature_reserve: Resèrva naturala
-          park: Pargue
-          piste: Pista
           quarry: Peirièra
           railway: Via ferrada
           recreation_ground: Airal de jòcs
@@ -598,8 +577,6 @@ oc:
           road: Zòna rotièra
           village_green: Zòna publica erborada
           vineyard: Vinhal
-          wetland: Zòna umida
-          wood: Bòsc
         leisure:
           beach_resort: Estacion belneara
           bird_hide: Obsevatòri ornitologic
@@ -634,11 +611,9 @@ oc:
           beach: Plaja
           cape: Cap
           cave_entrance: Entrada de cauna
-          channel: Canal
           cliff: Bauç
           crater: Cratèr
           dune: Duna
-          feature: Element
           fell: Lana
           fjord: Fjòrd
           forest: Bòsc
@@ -655,11 +630,9 @@ oc:
           point: Puncha
           reef: Estèu
           ridge: Cresta
-          river: Riu
           rock: Ròca
           scree: Esbudèl
           scrub: Boissa
-          shoal: Auçura
           spring: Font
           stone: Pèira
           strait: Estrech
@@ -668,7 +641,6 @@ oc:
           volcano: Volcan
           water: Aiga
           wetland: Zòna umida
-          wetlands: Zònas umidas
           wood: Bòsc
         office:
           accountant: Comptable
@@ -733,7 +705,6 @@ oc:
           switch: Agulhas
           tram: Tramvia
           tram_stop: Arrèst de tram
-          yard: Via de triatge
         shop:
           alcohol: Magazin oficial d'alcoòl
           antiques: Antiquari
@@ -822,12 +793,10 @@ oc:
           hostel: Albèrga
           hotel: Ostalariá
           information: Informacions
-          lean_to: Taulièr
           motel: Motèl
           museum: Musèu
           picnic_site: Site de picnic
           theme_park: Pargue a tèma
-          valley: Val
           viewpoint: Punt de vista
           zoo: Zoo
         tunnel:
@@ -837,7 +806,6 @@ oc:
           artificial: Riu artificial
           boatyard: Talhièr de construccion navala
           canal: Canal
-          connector: Connexion idrografica
           dam: Diga
           derelict_canal: Canal de deslaissament
           ditch: Valat
@@ -845,15 +813,12 @@ oc:
           drain: Toat
           lock: Esclusa
           lock_gate: Pòrta d'esclusa
-          mineral_spring: Font d'aiga minerala
           mooring: Ancoratge
           rapids: Raspas
           river: Riu
-          riverbank: Lièch de riu
           stream: Riuet
           wadi: Oèd
           waterfall: Cascada
-          water_point: Punt d'aiga
           weir: Barratge
       admin_levels:
         level2: Frontièra del país

config/locales/pa.yml

@@ -201,11 +201,8 @@ pa:
           taxiway: ਟੈਕਸੀਵੇਅ
           terminal: ਟਰਮੀਨਲ
         amenity:
-          airport: ਹਵਾਈ ਅੱਡਾ
           arts_centre: ਕਲਾ ਕੇਂਦਰ
-          artwork: ਕਲਾਕਾਰਜ
           atm: ਏ੦ਟੀ੦ਐੱਮ
-          auditorium: ਆਡੋਟੋਰੀਅਮ
           bank: ਬੈਂਕ
           bar: ਬਾਰ
           bbq: ਬਾਰਬੀਕਿਊ
@@ -224,7 +221,6 @@ pa:
           charging_station: ਚਾਰਜਿੰਗ ਸਟੇਸ਼ਨ
           cinema: ਸਿਨੇਮਾ
           clinic: ਕਲੀਨਿਕ
-          club: ਕਲੱਬ
           college: ਕਾਲਜ
           community_centre: ਭਾਈਚਾਰਾ ਕੇਂਦਰ
           courthouse: ਕਚਹਿਰੀ
@@ -245,22 +241,18 @@ pa:
           fuel: ਤੇਲ
           grave_yard: ਕਬਰਿਸਤਾਨ
           gym: ਜਿਮ/ਦਰੁਸਤੀ ਕੇਂਦਰ
-          hall: ਹਾਲ
           health_centre: ਸਿਹਤ ਕੇਂਦਰ
           hospital: ਹਸਪਤਾਲ
-          hotel: ਹੋਟਲ
           hunting_stand: ਸ਼ਿਕਾਰ ਸਟੈਂਡ
           ice_cream: ਆਈਸ ਕਰੀਮ
           kindergarten: ਬਾਲਵਾੜੀ
           library: ਪੁਸਤਕਾਲਾ
           market: ਮੰਡੀ
           marketplace: ਮੰਡੀ ਦੀ ਥਾਂ
-          mountain_rescue: ਪਹਾੜੀ ਬਚਾਉ ਦਸਤਾ
           nightclub: ਰਾਤ ਦਾ ਕਲੱਬ
           nursery: ਨਰਸਰੀ
           nursing_home: ਨਰਸਿੰਗ ਹੋਮ
           office: ਦਫ਼ਤਰ
-          park: ਬਾਗ਼
           parking: ਪਾਰਕਿੰਗ
           pharmacy: ਫ਼ਾਰਮੇਸੀ
           place_of_worship: ਭਗਤੀ ਦਾ ਘਰ
@@ -271,7 +263,6 @@ pa:
           prison: ਜੇਲ੍ਹ
           pub: ਪਬ
           public_building: ਜਨਤਕ ਇਮਾਰਤ
-          public_market: ਜਨਤਕ ਮੰਡੀ
           reception_area: ਸਵਾਗਤ ਖੇਤਰ
           recycling: ਰੀਸਾਈਕਲ ਬਿੰਦੂ
           restaurant: ਰੈਸਟੋਰੈਂਟ
@@ -280,12 +271,10 @@ pa:
           school: ਸਕੂਲ
           shelter: ਸ਼ਰਨ
           shop: ਹੱਟੀ
-          shopping: ਖ਼ਰੀਦਦਾਰੀ
           shower: ਸ਼ਾਵਰ
           social_centre: ਸਮਾਜਕ ਕੇਂਦਰ
           social_club: ਸਮਾਜਕ ਕਲੱਬ
           studio: ਸਟੂਡੀਉ
-          supermarket: ਵੱਡੀ ਮੰਡੀ
           swimming_pool: ਤੈਰਾਕੀ ਤਲਾਅ
           taxi: ਟੈਕਸੀ
           telephone: ਜਨਤਕ ਟੈਲੀਫ਼ੋਨ
@@ -297,8 +286,6 @@ pa:
           veterinary: ਡੰਗਰਾਂ ਦਾ ਹਸਪਤਾਲ
           village_hall: ਪਿੰਡ ਦਾ ਹਾਲ
           waste_basket: ਕੂੜਾਦਾਨ
-          wifi: ਵਾਈਫ਼ਾਈ ਪਹੁੰਚ
-          WLAN: ਵਾਈਫ਼ਾਈ ਪਹੁੰਚ
           youth_centre: ਨੌਜਵਾਨ ਕੇਂਦਰ
         boundary:
           administrative: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ
@@ -318,7 +305,6 @@ pa:
         highway:
           bridleway: ਘੋੜ-ਰਾਹ
           bus_stop: ਬੱਸ ਅੱਡਾ
-          byway: ਬਾਈਵੇ
           construction: ਉਸਾਰੀ ਹੇਠ ਹਾਈਵੇ
           cycleway: ਸਾਈਕਲ ਰਾਹ
           emergency_access_point: ਐਮਰਜੈਂਸੀ ਪਹੁੰਚ ਬਿੰਦੂ
@@ -326,7 +312,6 @@ pa:
           ford: ਫ਼ੋਰਡ
           living_street: ਲਿਵਿੰਗ ਸਟਰੀਟ
           milestone: ਮੀਲਪੱਥਰ
-          minor: ਛੋਟੀ ਸੜਕ
           motorway: ਮੋਟਰਵੇ
           motorway_junction: ਮੋਟਰਵੇ ਜੰਕਸ਼ਨ
           motorway_link: ਮੋਟਰਵੇ ਰੋਡ
@@ -345,7 +330,6 @@ pa:
           services: ਮੋਟਰਵੇ ਸੇਵਾਵਾਂ
           speed_camera: ਗਤੀ ਕੈਮਰਾ
           steps: ਪੌੜੀਆਂ
-          stile: ਪੌੜੀ
           tertiary: ਤੀਜੇ ਪੱਧਰ ਦੀ ਸੜਕ
           tertiary_link: ਤੀਜੇ ਪੱਧਰ ਦੀ ਸੜਕ
           track: ਟਰੈਕ
@@ -363,7 +347,6 @@ pa:
           memorial: ਯਾਦਗਾਰ
           mine: ਖਾਨ
           monument: ਸਮਾਰਕ
-          museum: ਅਜਾਇਬਘਰ
           ruins: ਖੰਡਰ
           tomb: ਮਕਬਰਾ
           tower: ਬੁਰਜ
@@ -383,16 +366,12 @@ pa:
           military: ਫ਼ੌਜੀ ਇਲਾਕਾ
           mine: ਖਾਨ
           orchard: ਬਗ਼ੀਚਾ
-          nature_reserve: ਕੁਦਰਤੀ ਰੱਖ
-          park: ਬਾਗ਼
           railway: ਰੇਲਵੇ
           residential: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ
           retail: ਪਰਚੂਨ
           road: ਸੜਕ ਇਲਾਕਾ
           village_green: ਪੇਂਡੂ ਹਰਿਆਵਲ
           vineyard: ਅੰਗੂਰਾਂ ਦਾ ਬਾਗ਼
-          wetland: ਨਮ ਇਲਾਕਾ
-          wood: ਜੰਗਲ
         leisure:
           common: ਸ਼ਾਮਲਾਟ
           fishing: ਮੱਛੀ-ਖੋਜ ਇਲਾਕਾ
@@ -422,11 +401,9 @@ pa:
           beach: ਬੀਚ
           cape: ਅੰਤਰੀਪ
           cave_entrance: ਗੁਫ਼ਾ ਦਾ ਪ੍ਰਵੇਸ਼
-          channel: ਨਹਿਰ
           cliff: ਟਿੱਲਾ
           crater: ਪਹਾੜ ਦਾ ਮੂੰਹ
           dune: ਟਿੱਬਾ
-          feature: ਮੁਹਾਂਦਰਾ
           forest: ਜੰਗਲ
           geyser: ਗੀਜ਼ਰ
           glacier: ਗਲੇਸ਼ੀਅਰ
@@ -441,11 +418,9 @@ pa:
           point: ਬਿੰਦੂ
           reef: ਰੀਫ਼
           ridge: ਰਿੱਜ
-          river: ਦਰਿਆ
           rock: ਚਟਾਨ
           scree: ਰੇੜ੍ਹ
           scrub: ਝਾੜ ਬਰੋਟਾ
-          shoal: ਬਰੇਤਾ
           spring: ਸੋਮਾ
           stone: ਪੱਥਰ
           strait: ਪਣਜੋੜ
@@ -454,7 +429,6 @@ pa:
           volcano: ਜਵਾਲਾਮੁਖੀ
           water: ਪਾਣੀ
           wetland: ਨਮ ਇਲਾਕਾ
-          wetlands: ਨਮ ਇਲਾਕੇ
           wood: ਜੰਗਲ
         office:
           accountant: ਅਕਾਊਂਟੈਂਟ
@@ -513,7 +487,6 @@ pa:
           subway_entrance: ਸਬਵੇ ਪ੍ਰਵੇਸ਼
           tram: ਟਰਾਮਵੇ
           tram_stop: ਟਰਾਮ ਅੱਡਾ
-          yard: ਰੇਲਵੇ ਯਾਰਡ
         shop:
           art: ਕਲਾ ਹੱਟੀ
           bakery: ਨਾਨਬਾਈ ਦੀ ਹੱਟੀ
@@ -600,7 +573,6 @@ pa:
           museum: ਅਜਾਇਬਘਰ
           picnic_site: ਪਿਕਨਿਕ ਟਿਕਾਣਾ
           theme_park: ਥੀਮ ਪਾਰਕ
-          valley: ਘਾਟੀ
           viewpoint: ਨੁਕਤਾ ਨਿਗਾਹ
           zoo: ਚਿੜੀਆਘਰ
         tunnel:
@@ -610,7 +582,6 @@ pa:
           artificial: ਬਣਾਉਟੀ ਨਹਿਰ
           boatyard: ਬੇੜੀ ਵਾੜਾ
           canal: ਨਹਿਰ
-          connector: ਨਹਿਰ-ਜੋੜ
           dam: ਬੰਨ੍ਹ
           derelict_canal: ਲਾਵਾਰਸ ਨਹਿਰ
           ditch: ਖਾਲ਼
@@ -618,14 +589,11 @@ pa:
           drain: ਨਾਲ਼ੀ
           lock: ਟੋਭਾ
           lock_gate: ਨਹਿਰ ਦਾ ਬੂਹਾ
-          mineral_spring: ਖਣਜੀ ਸੋਮਾ
           rapids: ਝਾਲ
           river: ਦਰਿਆ
-          riverbank: ਦਰਿਆ ਦਾ ਕੰਢਾ
           stream: ਨਾਲ਼ਾ
           wadi: ਬਰਸਾਤੀ ਨਾਲਾ
           waterfall: ਝਰਨਾ
-          water_point: ਪਾਣੀ ਬਿੰਦੂ
           weir: ਬੰਨ੍ਹ
       admin_levels:
         level2: ਦੇਸ਼ ਦੀ ਹੱਦ

config/locales/pl.yml

@@ -429,11 +429,8 @@ pl:
           taxiway: Droga kołowania
           terminal: Terminal
         amenity:
-          airport: Lonisko
           arts_centre: Centrum sztuki
-          artwork: Sztuka
           atm: Bankomat
-          auditorium: Audytorium
           bank: Bank
           bar: Bar
           bbq: Miejsce do grillowania
@@ -452,7 +449,6 @@ pl:
           charging_station: Stacja paliw
           cinema: Kino
           clinic: Przychodnia
-          club: Klub
           college: Uczelnia
           community_centre: Centrum społeczności
           courthouse: Sąd
@@ -473,22 +469,18 @@ pl:
           fuel: Stacja benzynowa
           grave_yard: Mniejszy cmentarz
           gym: Centrum Fitness / Sala Gimnastyczna
-          hall: Hala
           health_centre: Ośrodek zdrowia
           hospital: Szpital
-          hotel: Hotel
           hunting_stand: Ambona myśliwska
           ice_cream: Lodziarnia
           kindergarten: Przedszkole
           library: Biblioteka
           market: Targowisko
           marketplace: Plac targowy
-          mountain_rescue: Ratownictwo górskie
           nightclub: Klub nocny
           nursery: Żłobek
           nursing_home: Dom opieki
           office: Biuro
-          park: Park
           parking: Parking
           pharmacy: Apteka
           place_of_worship: Miejsce kultu
@@ -499,7 +491,6 @@ pl:
           prison: Więzienie
           pub: Pub
           public_building: Budynek publiczny
-          public_market: Rynek publiczny
           reception_area: Recepcja
           recycling: Miejsce recyklingu
           restaurant: Restauracja
@@ -508,13 +499,11 @@ pl:
           school: Szkoła
           shelter: Schron
           shop: Sklep
-          shopping: Zakupy
           shower: Prysznic
           social_centre: Centrum społeczne
           social_club: Klub towarzyski
           social_facility: Placówka społeczna
           studio: Studio
-          supermarket: Supermarket
           swimming_pool: Basen
           taxi: Postój taksówek
           telephone: Budka telefoniczna
@@ -526,8 +515,6 @@ pl:
           veterinary: Chirurgia weterynaryjna
           village_hall: Urząd gminy
           waste_basket: Kosz na śmieci
-          wifi: Dostęp do WiFi
-          WLAN: Dostęp do WiFi
           youth_centre: Centrum młodzieżowe
         boundary:
           administrative: Granica administracyjna
@@ -543,13 +530,11 @@ pl:
         building:
           "yes": Budynek
         emergency:
-          fire_hydrant: Hydrant
           phone: Telefon alarmowy
         highway:
           bridleway: Droga dla koni
           bus_guideway: Droga dla autobusów
           bus_stop: Przystanek autobusowy
-          byway: Boczna droga
           construction: Droga budowana
           cycleway: Ścieżka rowerowa
           emergency_access_point: Punkt awaryjny
@@ -557,7 +542,6 @@ pl:
           ford: Bród
           living_street: Strefa zamieszkania
           milestone: Punkt kontrolny
-          minor: Drobna droga
           motorway: Autostrada
           motorway_junction: Skrzyżowanie autostrad
           motorway_link: Autostrada – dojazd
@@ -578,7 +562,6 @@ pl:
           speed_camera: Radar
           steps: Schody
           street_lamp: Lampa uliczna
-          stile: Przełaz
           tertiary: Droga trzeciorzędna
           tertiary_link: Droga trzeciorzędna
           track: Droga gruntowa
@@ -602,7 +585,6 @@ pl:
           memorial: Mniejszy pomnik
           mine: Kopalnia
           monument: Pomnik
-          museum: Muzeum
           ruins: Ruiny
           tomb: Grób
           tower: Wieża
@@ -630,9 +612,6 @@ pl:
           military: Teren wojskowy
           mine: Kopalnia
           orchard: Sad
-          nature_reserve: Rezerwat przyrody
-          park: Park
-          piste: Trasa
           quarry: Kamieniołom
           railway: Teren kolejowy
           recreation_ground: Ziemia rekreacyjna
@@ -643,8 +622,6 @@ pl:
           road: Obszar drogowy
           village_green: Nawsie
           vineyard: Winnica
-          wetland: Tereny podmokłe
-          wood: Puszcza
         leisure:
           beach_resort: Strzeżona plaża
           bird_hide: Ukryj ptaki
@@ -679,11 +656,9 @@ pl:
           beach: Plaża
           cape: Przylądek
           cave_entrance: Wejście do jaskini
-          channel: Kanał
           cliff: Urwisko
           crater: Krater
           dune: Wydma
-          feature: Obiekt
           fell: Hale górskie
           fjord: Fiord
           forest: Las
@@ -700,11 +675,9 @@ pl:
           point: Punkt
           reef: Rafa
           ridge: Grzbiet
-          river: Rzeka
           rock: Skała
           scree: Zsypisko
           scrub: Zagajnik
-          shoal: Mielizna
           spring: Źródło
           stone: Kamieniołom
           strait: Cieśnina
@@ -713,7 +686,6 @@ pl:
           volcano: Wulkan
           water: Woda
           wetland: Obszar podmokły
-          wetlands: Obszary podmokłe
           wood: Puszcza
         office:
           accountant: Księgowy
@@ -778,9 +750,6 @@ pl:
           switch: Zwrotnica
           tram: Linia tramwajowa
           tram_stop: Przystanek tramwajowy
-          yard: Stacja postojowa, lokomotywownia
-        route:
-          bus: Linia autobusowa
         shop:
           alcohol: Sklep monopolowy
           antiques: Antyki
@@ -869,12 +838,10 @@ pl:
           hostel: Hostel
           hotel: Hotel
           information: Informacja turystyczna
-          lean_to: Nachylenie
           motel: Motel
           museum: Muzeum
           picnic_site: Miejsce na piknik
           theme_park: Park tematyczny
-          valley: Dolina
           viewpoint: Punkt widokowy
           zoo: Zoo
         tunnel:
@@ -884,7 +851,6 @@ pl:
           artificial: Sztuczne zbiorniki wodne
           boatyard: Stocznia
           canal: Kanał
-          connector: Złącze dróg wodnych
           dam: Tama
           derelict_canal: Opuszczony kanał
           ditch: Rów
@@ -892,15 +858,12 @@ pl:
           drain: Rów odpływowy
           lock: Zastawka
           lock_gate: Śluza
-          mineral_spring: Źródło mineralne
           mooring: Kotwicowisko
           rapids: Katarakty
           river: Rzeka
-          riverbank: Brzeg rzeki
           stream: Strumień
           wadi: Starorzecze
           waterfall: Wodospad
-          water_point: Punkt wodny
           weir: Jaz
       admin_levels:
         level2: Granica kraju

config/locales/pt-BR.yml

@@ -428,11 +428,8 @@ pt-BR:
           taxiway: Pista de taxiamento
           terminal: Terminal
         amenity:
-          airport: Aeroporto
           arts_centre: Centro Artístico
-          artwork: Obra de Arte
           atm: Caixa automático
-          auditorium: Auditório
           bank: Banco
           bar: Bar
           bbq: Churrasco
@@ -451,7 +448,6 @@ pt-BR:
           charging_station: Estação de Carga
           cinema: Cinema
           clinic: Clínica
-          club: Clube
           college: Faculdade
           community_centre: Centro comunitário/Salão de festas e eventos
           courthouse: Fórum
@@ -472,22 +468,18 @@ pt-BR:
           fuel: Combustível
           grave_yard: Cemitério
           gym: Academia
-          hall: Salão
           health_centre: Centro de saúde
           hospital: Hospital
-          hotel: Hotel
           hunting_stand: Estande de Caça
           ice_cream: Sorveteria
           kindergarten: Pré-Escola
           library: Biblioteca
           market: Mercado
           marketplace: Feira
-          mountain_rescue: Resgate em Montanha
           nightclub: Boate
           nursery: Berçário
           nursing_home: Asilo
           office: Escritório
-          park: Parque
           parking: Estacionamento
           pharmacy: Farmácia
           place_of_worship: Lugar de prática religiosa
@@ -498,7 +490,6 @@ pt-BR:
           prison: Prisão
           pub: Pub
           public_building: Edifício Público
-          public_market: Mercado Público
           reception_area: Área de Recepção
           recycling: Posto de Reciclagem
           restaurant: Restaurante
@@ -507,13 +498,11 @@ pt-BR:
           school: Escola
           shelter: Refúgio
           shop: Loja
-          shopping: Shopping
           shower: Chuveiro
           social_centre: Centro Social
           social_club: Clube Recreativo
           social_facility: Serviço Social
           studio: Estúdio
-          supermarket: Supermercado
           swimming_pool: Piscina
           taxi: Táxi
           telephone: Telefone Público
@@ -525,8 +514,6 @@ pt-BR:
           veterinary: Clínica veterinária
           village_hall: Prefeitura
           waste_basket: Cesto de Lixo
-          wifi: Acesso WiFi
-          WLAN: Acesso WiFi
           youth_centre: Centro Juvenil
         boundary:
           administrative: Limite Administrativo
@@ -542,13 +529,11 @@ pt-BR:
         building:
           "yes": Edifício
         emergency:
-          fire_hydrant: Hidrante
           phone: Telefone de emergência
         highway:
           bridleway: Pista para cavalos
           bus_guideway: Corredor de Ônibus
           bus_stop: Ponto de Ônibus
-          byway: Vicinal
           construction: Estrada em Construção
           cycleway: Ciclovia
           emergency_access_point: Ponto de Acesso de Emergência
@@ -556,7 +541,6 @@ pt-BR:
           ford: Vau
           living_street: Calçadão
           milestone: Marco
-          minor: Estrada Secundária
           motorway: Autoestrada
           motorway_junction: Trevo de Acesso
           motorway_link: Autoestrada
@@ -577,7 +561,6 @@ pt-BR:
           speed_camera: Radar
           steps: Degraus
           street_lamp: Iluminação Pública
-          stile: Passagem
           tertiary: Via Terciária
           tertiary_link: Via Terciária
           track: Trilha
@@ -601,7 +584,6 @@ pt-BR:
           memorial: Memorial
           mine: Mina histórica
           monument: Monumento
-          museum: Museu
           ruins: Ruínas
           tomb: Tumba
           tower: Torre histórica
@@ -629,9 +611,6 @@ pt-BR:
           military: Área militar
           mine: Mina
           orchard: Pomar
-          nature_reserve: Reserva Natural
-          park: Parque
-          piste: Pista de ski
           quarry: Pedreira
           railway: Terreno de ferrovia
           recreation_ground: Área recreacional
@@ -642,8 +621,6 @@ pt-BR:
           road: Área de estrada
           village_green: Parque municipal
           vineyard: Vinhedo
-          wetland: Pântano / Mangue
-          wood: Madeira
         leisure:
           beach_resort: Balneário
           bird_hide: Observatório de pássaros
@@ -678,11 +655,9 @@ pt-BR:
           beach: Praia
           cape: Cabo
           cave_entrance: Entrada de Gruta
-          channel: Canal
           cliff: Penhasco
           crater: Cratera
           dune: Duna
-          feature: Recurso natural
           fell: Encosta
           fjord: Fiorde
           forest: Floresta
@@ -699,11 +674,9 @@ pt-BR:
           point: Ponto
           reef: Recife
           ridge: Cordilheira
-          river: Rio
           rock: Rocha
           scree: Cascalho
           scrub: Arbusto
-          shoal: Barra
           spring: Nascente
           stone: Pedra
           strait: Estreito
@@ -712,7 +685,6 @@ pt-BR:
           volcano: Vulcão
           water: Água
           wetland: Pântano / Mangue
-          wetlands: Pântano
           wood: Madeira
         office:
           accountant: Contabilista
@@ -777,9 +749,6 @@ pt-BR:
           switch: Chave de ferrovia
           tram: Rota de bonde
           tram_stop: Parada de bonde
-          yard: Estação de classificação
-        route:
-          bus: Rota de Ônibus
         shop:
           alcohol: Loja de bebidas alcoolicas
           antiques: Antiguidades
@@ -868,12 +837,10 @@ pt-BR:
           hostel: Abrigo
           hotel: Hotel
           information: Informações
-          lean_to: Abrigo
           motel: Motel
           museum: Museu
           picnic_site: Área de Piquenique
           theme_park: Parque temático
-          valley: Vale
           viewpoint: Mirador
           zoo: Zoológico
         tunnel:
@@ -883,7 +850,6 @@ pt-BR:
           artificial: Via fluvial artificial
           boatyard: Estaleiro
           canal: Canal
-          connector: Eclusa
           dam: Represa
           derelict_canal: Canal Abandonado
           ditch: Vala
@@ -891,15 +857,12 @@ pt-BR:
           drain: Canal
           lock: Dique
           lock_gate: Portão de Dique
-          mineral_spring: Fonte mineral
           mooring: Ancoradouro
           rapids: Corredeiras
           river: Rio
-          riverbank: Margem de rio
           stream: Córrego
           wadi: Uádi
           waterfall: Queda de água
-          water_point: Ponto de água
           weir: Açude
       admin_levels:
         level2: Fronteira Nacional

config/locales/pt.yml

@@ -414,11 +414,8 @@ pt:
           taxiway: Pista de taxiamento
           terminal: Terminal
         amenity:
-          airport: Aeroporto
           arts_centre: Centro Artístico
-          artwork: Obra de Arte
           atm: Multibanco
-          auditorium: Auditório
           bank: Banco
           bar: Bar
           bbq: Churrasqueira
@@ -437,7 +434,6 @@ pt:
           charging_station: Estação de carregamento para veículos elétricos
           cinema: Cinema
           clinic: Clínica
-          club: Clube
           college: Colégio
           community_centre: Centro Comunitário
           courthouse: Tribunal
@@ -458,22 +454,18 @@ pt:
           fuel: Combustível
           grave_yard: Cemitério
           gym: Centro de Fitness / Ginásio
-          hall: Salão
           health_centre: Centro de Saúde
           hospital: Hospital
-          hotel: Hotel
           hunting_stand: Cabana de Caça
           ice_cream: Geladaria
           kindergarten: Jardim de infância
           library: Biblioteca
           market: Mercado
           marketplace: Feira
-          mountain_rescue: Resgate em Montanha
           nightclub: Clube Nocturno
           nursery: Creche
           nursing_home: Lar de Idosos
           office: Escritório
-          park: Parque
           parking: Estacionamento
           pharmacy: Farmácia
           place_of_worship: Lugar de Oração
@@ -484,7 +476,6 @@ pt:
           prison: Prisão
           pub: Pub
           public_building: Edifício Público
-          public_market: Mercado Público
           reception_area: Área de Receção
           recycling: Ecoponto
           restaurant: Restaurante
@@ -493,13 +484,11 @@ pt:
           school: Escola
           shelter: Abrigo
           shop: Loja
-          shopping: Compras
           shower: Chuveiro
           social_centre: Centro Social
           social_club: Clube Social
           social_facility: Serviços Sociais
           studio: Estúdio
-          supermarket: Supermercado
           swimming_pool: Piscina
           taxi: Táxi
           telephone: Telefone Público
@@ -511,8 +500,6 @@ pt:
           veterinary: Clínica Veterinária
           village_hall: Junta de Freguesia
           waste_basket: Caixote do Lixo
-          wifi: Acesso WiFi
-          WLAN: Acesso WLAN
           youth_centre: Casa da Juventude
         boundary:
           administrative: Divisão Administrativa
@@ -528,13 +515,11 @@ pt:
         building:
           "yes": Edifício
         emergency:
-          fire_hydrant: Boca de Incêndio
           phone: Telefone de Emergência
         highway:
           bridleway: Pista de Cavalos
           bus_guideway: Faixa para Autocarros Guiados
           bus_stop: Paragem de Autocarro
-          byway: Byway
           construction: Estrada em Construção
           cycleway: Ciclovia
           emergency_access_point: Ponto de Ccesso de Emergência
@@ -542,7 +527,6 @@ pt:
           ford: Vau
           living_street: Zona de Coexistência
           milestone: Marco Quilométrico
-          minor: Estrada menor
           motorway: Autoestrada
           motorway_junction: Interseção e Saída de Autoestradas
           motorway_link: Nó de ligação a uma Autoestrada
@@ -563,7 +547,6 @@ pt:
           speed_camera: Radar de Velocidade
           steps: Escadas
           street_lamp: Poste de Iluminação
-          stile: Passagem Anti-Gado
           tertiary: Estrada Terciária
           tertiary_link: Nó de ligação a uma Estrada Terciária
           track: Estrada Florestal ou Agrícula
@@ -587,7 +570,6 @@ pt:
           memorial: Memorial
           mine: Mina histórica
           monument: Monumento
-          museum: Museu
           ruins: Ruínas
           tomb: Tumba
           tower: Torre
@@ -615,9 +597,6 @@ pt:
           military: Zona Militar
           mine: Mina
           orchard: Pomar
-          nature_reserve: Reserva Natural
-          park: Parque
-          piste: Pista de Esqui
           quarry: Pedreira
           railway: Área da Ferrovia
           recreation_ground: Área Recreativa
@@ -628,8 +607,6 @@ pt:
           road: Área da Estrada
           village_green: Espaço Verde Urbano
           vineyard: Vinha
-          wetland: Pântano
-          wood: Madeira
         leisure:
           beach_resort: Resort de Praia
           bird_hide: Observatório de Áves
@@ -664,11 +641,9 @@ pt:
           beach: Praia
           cape: Cabo
           cave_entrance: Entrada de Gruta
-          channel: Canal
           cliff: Precipício
           crater: Cratera
           dune: Dunas
-          feature: Fenómeno Natural
           fell: Encosta
           fjord: Fiorde
           forest: Floresta
@@ -685,11 +660,9 @@ pt:
           point: Ponto
           reef: Recife
           ridge: Cordilheira
-          river: Rio
           rock: Rocha
           scree: Encosta de Rochas Soltas
           scrub: Matagal
-          shoal: Banco de Areia
           spring: Nascente
           stone: Pedra
           strait: Estreito
@@ -698,7 +671,6 @@ pt:
           volcano: Vulcão
           water: Água
           wetland: Zona Húmida
-          wetlands: Zonas Húmidas
           wood: Bosque
         office:
           accountant: Contabilista
@@ -763,9 +735,6 @@ pt:
           switch: Agulha Ferroviária
           tram: Linha de Elétrico
           tram_stop: Paragem de Elétrico
-          yard: Pátio de Manobras Ferroviário
-        route:
-          bus: Rota de Autocarros
         shop:
           alcohol: Venda de Bebidas (Off License)
           antiques: Antiguidades
@@ -854,12 +823,10 @@ pt:
           hostel: Pousada / Hostel
           hotel: Hotel
           information: Informação
-          lean_to: Abrigo
           motel: Motel
           museum: Museu
           picnic_site: Parque de merendas / piqueniques
           theme_park: Parque temático
-          valley: Vale
           viewpoint: Miradouro
           zoo: Jardim zoológico
         tunnel:
@@ -869,7 +836,6 @@ pt:
           artificial: Curso de água artificial
           boatyard: Estaleiro Naval
           canal: Canal
-          connector: Conector Aquático
           dam: Barragem
           derelict_canal: Canal abandonado
           ditch: Vala
@@ -877,15 +843,12 @@ pt:
           drain: Vala de drenagem
           lock: Eclusa
           lock_gate: Comporta de Eclusa
-          mineral_spring: Fonte de água mineral
           mooring: Ancoragem
           rapids: Rápidos
           river: Rio
-          riverbank: Margem de rio
           stream: Ribeiro
           wadi: Uádi
           waterfall: Queda de água
-          water_point: Ponto de água
           weir: Represa
       admin_levels:
         level2: Fronteira de País

config/locales/ro.yml

@@ -297,11 +297,8 @@ ro:
           taxiway: Pistă de manevră
           terminal: Terminal
         amenity:
-          airport: Aeroport
           arts_centre: Centru de arte
-          artwork: Operă de artă
           atm: Bancomat
-          auditorium: Auditoriu
           bank: Instituție bancară
           bar: Bar
           bbq: Grătar
@@ -319,7 +316,6 @@ ro:
           charging_station: Stație de taxare
           cinema: Cinematograf
           clinic: Clinică
-          club: Club
           college: Colegiu
           community_centre: Centru comunitar
           courthouse: Tribunal
@@ -339,22 +335,18 @@ ro:
           fuel: Benzinărie
           grave_yard: Cimitir
           gym: Sală de fitness / gimnastică
-          hall: Sală
           health_centre: Centru de sănătate
           hospital: Spital
-          hotel: Hotel
           hunting_stand: Stand de vânătoare
           ice_cream: Înghețată
           kindergarten: Grădiniță
           library: Bibliotecă
           market: Piață
           marketplace: Piață de mărfuri
-          mountain_rescue: Salvamont
           nightclub: Club de noapte
           nursery: Creșă
           nursing_home: Azil de bătrâni
           office: Birou
-          park: Parc
           parking: Parcare
           pharmacy: Farmacie
           place_of_worship: Lăcaș de cult
@@ -364,7 +356,6 @@ ro:
           prison: Închisoare
           pub: Pub
           public_building: Clădire publică
-          public_market: Piață publică
           reception_area: Zonă de recepție
           recycling: Punct de reciclare
           restaurant: Restaurant
@@ -373,12 +364,10 @@ ro:
           school: Școală
           shelter: Adăpost
           shop: Magazin
-          shopping: Cumpărături
           shower: Duș
           social_centre: Centru social
           social_club: Club social
           studio: Studio
-          supermarket: Supermarket
           swimming_pool: Bazin de înot
           taxi: Taxi
           telephone: Telefon public
@@ -390,8 +379,6 @@ ro:
           veterinary: Medic veterinar
           village_hall: Primărie comunală
           waste_basket: Coș de gunoi
-          wifi: Acces WiFi
-          WLAN: Acces WiFi
           youth_centre: Centru de tineret
         boundary:
           administrative: Graniță administrativă
@@ -409,7 +396,6 @@ ro:
           bridleway: Drum pentru călărie
           bus_guideway: Linie de autobuz ghidată
           bus_stop: Stație de autobuz
-          byway: Rută secundară
           construction: Drum în construcție
           cycleway: Pistă de biciclete
           emergency_access_point: Punct de acces de urgență
@@ -417,7 +403,6 @@ ro:
           ford: Vad
           living_street: Zonă pietonală
           milestone: Bornă kilometrică
-          minor: Drum minor
           motorway: Autostradă
           motorway_junction: Intersecție pe autostradă
           motorway_link: Autostradă
@@ -455,7 +440,6 @@ ro:
           memorial: Memorial
           mine: Mină
           monument: Monument
-          museum: Muzeu
           ruins: Ruine
           tower: Turn
           wayside_cross: Troiță
@@ -475,15 +459,12 @@ ro:
           meadow: Luncă
           military: Zonă militară
           mine: Mină
-          nature_reserve: Rezervație naturală
-          park: Parc
           quarry: Carieră
           railway: Cale ferată
           recreation_ground: Zonă de recreere
           reservoir: Rezervor
           residential: Zonă rezidențială
           vineyard: Podgorie
-          wood: Pădure
         leisure:
           beach_resort: Stațiune balneară
           fishing: Zonă de pescuit
@@ -505,7 +486,6 @@ ro:
           beach: Plajă
           cape: Cap
           cave_entrance: Intrare în peșteră
-          channel: Canal
           cliff: Stâncă
           crater: Crater
           fjord: Fiord
@@ -520,11 +500,9 @@ ro:
           peak: Vârf
           reef: Recif
           ridge: Creastă
-          river: Râu
           rock: Rocă
           scree: Grohotiș
           scrub: Tufăriș
-          shoal: Banc de nisip
           spring: Izvor
           strait: Strâmtoare
           tree: Copac
@@ -573,7 +551,6 @@ ro:
           subway_entrance: Intrare la metrou
           tram: Tramvai
           tram_stop: Stație de tramvai
-          yard: Depou
         shop:
           art: Magazin de artă
           bakery: Brutărie
@@ -627,7 +604,6 @@ ro:
           motel: Motel
           museum: Muzeu
           theme_park: Parc tematic
-          valley: Vale
           zoo: Gradină zoologică
         waterway:
           canal: Canal

config/locales/ru.yml

@@ -428,11 +428,8 @@ ru:
           taxiway: Рулёжная дорожка
           terminal: Терминал
         amenity:
-          airport: Аэропорт
           arts_centre: Дом искусств
-          artwork: Произведения искусства
           atm: Банкомат
-          auditorium: Аудитория
           bank: Банк
           bar: Бар
           bbq: Барбекю
@@ -451,7 +448,6 @@ ru:
           charging_station: Станция зарядки электромобилей
           cinema: Кинотеатр
           clinic: Поликлиника
-          club: Клуб
           college: Колледж
           community_centre: Общественный центр
           courthouse: Помещение суда
@@ -472,22 +468,18 @@ ru:
           fuel: Заправка
           grave_yard: Место захоронения
           gym: Фитнес-центр / Тренажёрный зал
-          hall: Холл
           health_centre: Оздоровительный центр
           hospital: Госпиталь
-          hotel: Гостинница
           hunting_stand: Охотничья вышка
           ice_cream: Мороженное
           kindergarten: Детский сад
           library: Библиотека
           market: Магазин
           marketplace: Рыночная площадь
-          mountain_rescue: Горная спасательная служба
           nightclub: Ночной клуб
           nursery: Пансионат
           nursing_home: Дом престарелых
           office: Офис
-          park: Парк
           parking: Стоянка
           pharmacy: Аптека
           place_of_worship: Место поклонения
@@ -498,7 +490,6 @@ ru:
           prison: Тюрьма
           pub: Паб
           public_building: Общественное здание
-          public_market: Городской рынок
           reception_area: Приёмная
           recycling: Место утилизации
           restaurant: Ресторан
@@ -507,13 +498,11 @@ ru:
           school: Школа
           shelter: Укрытие
           shop: Магазин
-          shopping: Торговый центр
           shower: Душ
           social_centre: Общественный центр
           social_club: Сообщество
           social_facility: Социальное учреждение
           studio: Студия
-          supermarket: Супермаркет
           swimming_pool: Бассейн
           taxi: Такси
           telephone: Телефон
@@ -525,8 +514,6 @@ ru:
           veterinary: Ветеринарная клиника
           village_hall: Усадьба
           waste_basket: Мусорка
-          wifi: WiFi доступ
-          WLAN: WiFi доступ
           youth_centre: Молодёжный центр
         boundary:
           administrative: Административная граница
@@ -542,13 +529,11 @@ ru:
         building:
           "yes": Здание
         emergency:
-          fire_hydrant: Пожарный гидрант
           phone: Телефон экстренной связи
         highway:
           bridleway: Конный путь
           bus_guideway: Автобусная полоса-рельс
           bus_stop: Автобусная остановка
-          byway: Закоулок
           construction: Ремонт дороги
           cycleway: Велодорожка
           emergency_access_point: Пункт первой помощи
@@ -556,7 +541,6 @@ ru:
           ford: Брод
           living_street: Жилая улица
           milestone: Километровый столб
-          minor: Второстепенная дорога
           motorway: Автомагистраль
           motorway_junction: Перекрёсток
           motorway_link: Развязка на автомагистрали
@@ -577,7 +561,6 @@ ru:
           speed_camera: Камера по контролю скорости
           steps: Ступеньки
           street_lamp: Уличный фонарь
-          stile: Турникет
           tertiary: Дорога третьего класса
           tertiary_link: Дорога третьего класса
           track: Неофициальная грунтовка
@@ -601,7 +584,6 @@ ru:
           memorial: Памятник
           mine: Рудник
           monument: Памятник
-          museum: Музей
           ruins: Развалины
           tomb: Могила
           tower: Башня
@@ -629,9 +611,6 @@ ru:
           military: Военная зона
           mine: Шахта
           orchard: Фруктовый сад
-          nature_reserve: Заповедник
-          park: Парк
-          piste: Лыжня
           quarry: Карьер
           railway: Железная дорога
           recreation_ground: Зона отдыха
@@ -642,8 +621,6 @@ ru:
           road: Зона дорожной сети
           village_green: Зелёная деревня
           vineyard: Виноградник
-          wetland: Заболоченность
-          wood: Обслуживаемый лес
         leisure:
           beach_resort: Пляж с насаждениями
           bird_hide: Засидка (пункт скрытого наблюдения за птицами)
@@ -678,11 +655,9 @@ ru:
           beach: Пляж
           cape: Мыс
           cave_entrance: Вход в пещеру
-          channel: Канал
           cliff: Обрыв
           crater: Кратер
           dune: Дюна
-          feature: Природный объект
           fell: Холм
           fjord: Фьорд
           forest: Лес
@@ -699,11 +674,9 @@ ru:
           point: Мыс
           reef: Риф
           ridge: Хребет
-          river: Река
           rock: Скала
           scree: Осыпь камней
           scrub: Кустарник
-          shoal: Мелководье
           spring: Родник
           stone: Камень
           strait: Пролив
@@ -712,7 +685,6 @@ ru:
           volcano: Вулкан
           water: Водоём
           wetland: Заболоченная территория
-          wetlands: Заболоченные земли
           wood: Лес
         office:
           accountant: Бухгалтер
@@ -777,9 +749,6 @@ ru:
           switch: Железнодорожная стрелка
           tram: Трамвай
           tram_stop: Трамвайная остановка
-          yard: Депо
-        route:
-          bus: Автобусный маршрут
         shop:
           alcohol: Винный магазин
           antiques: Антиквариат
@@ -868,12 +837,10 @@ ru:
           hostel: Хостел
           hotel: Гостиница
           information: Информация
-          lean_to: Наклон
           motel: Мотель
           museum: Музей
           picnic_site: Место для пикника
           theme_park: Аттракционы
-          valley: Долина
           viewpoint: Смотровая площадка
           zoo: Зоопарк
         tunnel:
@@ -883,7 +850,6 @@ ru:
           artificial: Искусственный водоток
           boatyard: Верфь
           canal: Канал
-          connector: Слияние рек
           dam: Дамба
           derelict_canal: Пересохший канал
           ditch: Водоотлив
@@ -891,15 +857,12 @@ ru:
           drain: Сточная канава
           lock: Шлюз
           lock_gate: Ворота шлюза
-          mineral_spring: Минеральный родник
           mooring: Место швартовки
           rapids: Речной порог
           river: Река
-          riverbank: Берег реки
           stream: Ручей
           wadi: Высохшее русло
           waterfall: Водопад
-          water_point: Пункт водоснабжения
           weir: Плотина
       admin_levels:
         level2: Граница страны

config/locales/sco.yml

@@ -379,11 +379,8 @@ sco:
           taxiway: Taxiway
           terminal: Terminal
         amenity:
-          airport: Airport
           arts_centre: Airts Centre
-          artwork: Airtwirk
           atm: ATM
-          auditorium: Auditorium
           bank: Bank
           bar: Bar
           bbq: BBQ
@@ -402,7 +399,6 @@ sco:
           charging_station: Chargin Station
           cinema: Cinema
           clinic: Clinic
-          club: Club
           college: College
           community_centre: Commonty Centre
           courthouse: Coorthoose
@@ -423,22 +419,18 @@ sco:
           fuel: Fuel
           grave_yard: Grave Yard
           gym: Fitness Centre / Gym
-          hall: Haw
           health_centre: Heal Centre
           hospital: Hospital
-          hotel: Hotel
           hunting_stand: Huntin Staund
           ice_cream: Ice Cream
           kindergarten: Kindergarten
           library: Library
           market: Mercat
           marketplace: Mercatplace
-          mountain_rescue: Moontain Rescue
           nightclub: Nicht Club
           nursery: Nursery
           nursing_home: Nursin Home
           office: Office
-          park: Pairk
           parking: Pairkin
           pharmacy: Pharmacy
           place_of_worship: Place o Worship
@@ -449,7 +441,6 @@ sco:
           prison: Prison
           pub: Pub
           public_building: Public Biggin
-          public_market: Public Mercat
           reception_area: Reception Aurie
           recycling: Recyclin Pynt
           restaurant: Restaurant
@@ -458,13 +449,11 @@ sco:
           school: Schuil
           shelter: Shelter
           shop: Shop
-          shopping: Shoppin
           shower: Shower
           social_centre: Social Centre
           social_club: Social Club
           social_facility: Social Facility
           studio: Studio
-          supermarket: Supermercat
           swimming_pool: Swimmin Puil
           taxi: Taxi
           telephone: Public Telephone
@@ -476,8 +465,6 @@ sco:
           veterinary: Veterinary Surgery
           village_hall: Veelage Haw
           waste_basket: Waste Basket
-          wifi: WiFi Access
-          WLAN: WiFi Access
           youth_centre: Youth Centre
         boundary:
           administrative: Admeenistrative Boondary
@@ -493,13 +480,11 @@ sco:
         building:
           "yes": Biggin
         emergency:
-          fire_hydrant: Fire Hydrant
           phone: Emergency Phone
         highway:
           bridleway: Bridleway
           bus_guideway: Guidit Bus Lane
           bus_stop: Bus Stap
-          byway: Byway
           construction: Highway unner Construction
           cycleway: Cycle Path
           emergency_access_point: Emergency Access Pynt
@@ -507,7 +492,6 @@ sco:
           ford: Ford
           living_street: Livin Street
           milestone: Milestane
-          minor: Meenor Road
           motorway: Motorway
           motorway_junction: Motorway Junction
           motorway_link: Motorway Road
@@ -528,7 +512,6 @@ sco:
           speed_camera: Speed Camera
           steps: Steps
           street_lamp: Street Lamp
-          stile: Stile
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road
           track: Track
@@ -552,7 +535,6 @@ sco:
           memorial: Memorial
           mine: Mine
           monument: Monument
-          museum: Museum
           ruins: Ruins
           tomb: Tomb
           tower: Touer
@@ -580,9 +562,6 @@ sco:
           military: Militar Aurie
           mine: Mine
           orchard: Orchard
-          nature_reserve: Naitur Reserve
-          park: Pairk
-          piste: Piste
           quarry: Quarry
           railway: Railway
           recreation_ground: Recreation Grund
@@ -593,8 +572,6 @@ sco:
           road: Road Aurie
           village_green: Village Green
           vineyard: Vineyard
-          wetland: Wetlaund
-          wood: Wid
         leisure:
           beach_resort: Beach Resort
           bird_hide: Bird Hide
@@ -629,11 +606,9 @@ sco:
           beach: Beach
           cape: Cape
           cave_entrance: Cave Entrance
-          channel: Channel
           cliff: Cliff
           crater: Crater
           dune: Dune
-          feature: Featur
           fell: Fell
           fjord: Fjord
           forest: Forest
@@ -650,11 +625,9 @@ sco:
           point: Pynt
           reef: Reef
           ridge: Ridge
-          river: River
           rock: Rock
           scree: Scree
           scrub: Scrub
-          shoal: Shoal
           spring: Spring
           stone: Stane
           strait: Strait
@@ -663,7 +636,6 @@ sco:
           volcano: Volcano
           water: Watter
           wetland: Wetlaund
-          wetlands: Wetlaunds
           wood: Wid
         office:
           accountant: Accoontant
@@ -728,7 +700,6 @@ sco:
           switch: Railway Pynts
           tram: Tramway
           tram_stop: Tram Stap
-          yard: Railway Yard
         shop:
           alcohol: Off License
           antiques: Antiques
@@ -817,12 +788,10 @@ sco:
           hostel: Hostel
           hotel: Hotel
           information: Information
-          lean_to: Lean Tae
           motel: Motel
           museum: Museum
           picnic_site: Picnic Steid
           theme_park: Theme Pairk
-          valley: Valley
           viewpoint: Viewpynt
           zoo: Zoo
         tunnel:
@@ -832,7 +801,6 @@ sco:
           artificial: Airtifeecial Watterway
           boatyard: Boatyard
           canal: Canal
-          connector: Watterway Connector
           dam: Dam
           derelict_canal: Derelict Canal
           ditch: Ditch
@@ -840,15 +808,12 @@ sco:
           drain: Drain
           lock: Lock
           lock_gate: Lock Gate
-          mineral_spring: Mineral Spring
           mooring: Moorin
           rapids: Rapids
           river: River
-          riverbank: Riverbank
           stream: Stream
           wadi: Wadi
           waterfall: Watterfaw
-          water_point: Watter Pynt
           weir: Weir
       admin_levels:
         level2: Kintra Boondary

config/locales/sk.yml

@@ -371,11 +371,8 @@ sk:
           taxiway: Pojazdová dráha
           terminal: Terminál
         amenity:
-          airport: Letisko
           arts_centre: Kultúrne stredisko
-          artwork: Umelecké dielo
           atm: Bankomat
-          auditorium: Auditórium
           bank: Banka
           bar: Bar
           bbq: Miesto na grilovanie
@@ -394,7 +391,6 @@ sk:
           charging_station: Nabíjacia stanica
           cinema: Kino
           clinic: Poliklinika
-          club: Klub
           college: Vysoká škola
           community_centre: Kultúrne stredisko
           courthouse: Súd
@@ -415,22 +411,18 @@ sk:
           fuel: Benzínová pumpa
           grave_yard: Cintorín
           gym: Fitnes centrum / telocvičňa
-          hall: Sála
           health_centre: Zdravotné stredisko
           hospital: Nemocnica
-          hotel: Hotel
           hunting_stand: Poľovnícky posed
           ice_cream: Zmrzlina
           kindergarten: Materská škola
           library: Knižnica
           market: Obchod
           marketplace: Tržnica
-          mountain_rescue: Horská služba
           nightclub: Nočný klub
           nursery: Jasle
           nursing_home: Sanatórium
           office: Úrad
-          park: Park
           parking: Parkovisko
           pharmacy: lekáreň
           place_of_worship: Miesto pre bohoslužby
@@ -441,7 +433,6 @@ sk:
           prison: Väzenie
           pub: Krčma
           public_building: Verejná budova
-          public_market: Verejné trhovisko
           reception_area: Recepcia
           recycling: Recyklačné miesto
           restaurant: Reštaurácia
@@ -450,13 +441,11 @@ sk:
           school: Škola
           shelter: Altánok
           shop: Obchod
-          shopping: Nákupné centrum
           shower: Sprchy
           social_centre: Komunitné centrum
           social_club: Spoločenský klub
           social_facility: Sociálne zariadenie
           studio: Ateliér
-          supermarket: Supermarket
           swimming_pool: Plaváreň, kúpalisko
           taxi: Taxi
           telephone: Verejný telefón
@@ -468,8 +457,6 @@ sk:
           veterinary: Veterinárna ordinácia
           village_hall: Spoločenská miestnosť
           waste_basket: Odpadkový kôš
-          wifi: Wi-Fi prístup
-          WLAN: Wi-Fi prístup
           youth_centre: Mládežnícke centrum
         boundary:
           administrative: Administratívna hranica
@@ -485,13 +472,11 @@ sk:
         building:
           "yes": Budova
         emergency:
-          fire_hydrant: Požiarny hydrant
           phone: Núdzový telefón
         highway:
           bridleway: Cesta pre kone
           bus_guideway: Bus so sprievodcom
           bus_stop: Zastávka autobusu
-          byway: Účelová komunikácia
           construction: Cesta vo výstavbe
           cycleway: Cyklistický chodník
           emergency_access_point: Stanica prvej pomoci
@@ -499,7 +484,6 @@ sk:
           ford: Brod
           living_street: Obytná zóna
           milestone: Kilometrovník
-          minor: Vedľajšia cesta
           motorway: Diaľnica
           motorway_junction: Diaľničná križovatka
           motorway_link: Diaľničný privádzač
@@ -520,7 +504,6 @@ sk:
           speed_camera: Radar
           steps: Schody
           street_lamp: Pouličná lampa
-          stile: Schodíky cez ohradu
           tertiary: Cesta III. triedy
           tertiary_link: Cesta III. triedy
           track: Nespevnená cesta
@@ -544,7 +527,6 @@ sk:
           memorial: Pomník
           mine: Baňa
           monument: Pamätník
-          museum: Múzeum
           ruins: Ruina
           tomb: Náhrobok
           tower: Veža
@@ -572,9 +554,6 @@ sk:
           military: Vojenský priestor
           mine: Baňa
           orchard: Sad
-          nature_reserve: Prírodná rezervácia
-          park: Park
-          piste: Zjazdovka
           quarry: Lom
           railway: Železnica
           recreation_ground: Rekreačná oblasť
@@ -585,8 +564,6 @@ sk:
           road: Cesty
           village_green: Verejná zeleň
           vineyard: Vinica
-          wetland: Mokrina
-          wood: Les (neudržiavaný)
         leisure:
           beach_resort: Plážové letovisko
           bird_hide: Vtáčia pozorovateľňa
@@ -621,11 +598,9 @@ sk:
           beach: Pláž
           cape: Mys
           cave_entrance: Vstup do jaskyne
-          channel: Kanál
           cliff: Útes, kamenná stena
           crater: Kráter
           dune: Duna
-          feature: Vlastnosť
           fell: Horská pastvina
           fjord: Fjord
           forest: Les (udržiavaný)
@@ -642,11 +617,9 @@ sk:
           point: Bod
           reef: Bradlo, Skalisko
           ridge: Hrebeň
-          river: Rieka
           rock: Skala
           scree: Sutina
           scrub: Rúbanisko
-          shoal: Plytčina
           spring: Prameň
           stone: Balvan
           strait: Úžina
@@ -655,7 +628,6 @@ sk:
           volcano: Sopka
           water: Voda
           wetland: Mokrina
-          wetlands: Mokrina
           wood: Les (neudržiavaný)
         office:
           accountant: Účtovník
@@ -720,7 +692,6 @@ sk:
           switch: Železničná výhybka
           tram: Električka
           tram_stop: Zastávka električky
-          yard: Železničné depo
         shop:
           alcohol: Mimo povolenia
           antiques: Starožitnosti
@@ -809,12 +780,10 @@ sk:
           hostel: Ubytovňa, internát
           hotel: Hotel
           information: Informácie
-          lean_to: Prístrešok
           motel: Motel
           museum: Múzeum
           picnic_site: Výletné miesto
           theme_park: Zábavný park
-          valley: Údolie
           viewpoint: Rozhľadňa, výhliadka
           zoo: Zoo
         tunnel:
@@ -824,7 +793,6 @@ sk:
           artificial: Vodný kanál, prieplav
           boatyard: Lodenica
           canal: Kanál
-          connector: Prepojenie vodných ciest
           dam: Priehrada,hrádza
           derelict_canal: Opustený kanál
           ditch: Priekopa
@@ -832,15 +800,12 @@ sk:
           drain: Odvodňovací kanál
           lock: Plavebná komora
           lock_gate: Brána plavebnej komory
-          mineral_spring: Minerálny prameň
           mooring: Kotvisko
           rapids: Pereje
           river: Rieka
-          riverbank: Breh rieky
           stream: Potok
           wadi: Občasné riečisko(Vádí)
           waterfall: Vodopád
-          water_point: Vodný bod
           weir: Splav
       admin_levels:
         level2: Štátna hranica

config/locales/sl.yml

@@ -380,11 +380,8 @@ sl:
           taxiway: Vozna steza
           terminal: Terminal
         amenity:
-          airport: Letališče
           arts_centre: Umetnostni center
-          artwork: Umetnina
           atm: Bankomat
-          auditorium: Avditorij
           bank: Banka
           bar: Bar
           bbq: Žar
@@ -403,7 +400,6 @@ sl:
           charging_station: Polnilna postaja
           cinema: Kinematograf
           clinic: Klinika
-          club: Klub
           college: Srednja šola
           community_centre: Center skupnosti
           courthouse: Sodišče
@@ -423,22 +419,18 @@ sl:
           fuel: Bencinska črpalka
           grave_yard: Pokopališče
           gym: Fitnes / Telovadnica
-          hall: Dvorana
           health_centre: Dom zdravja
           hospital: Bolnišnica
-          hotel: Hotel
           hunting_stand: Lovska opazovalnica
           ice_cream: Sladoled
           kindergarten: Vrtec
           library: Knjižnica
           market: Trg
           marketplace: Tržnica
-          mountain_rescue: GRS - Gorska reševalna služba
           nightclub: Nočni klub
           nursery: Vrtec
           nursing_home: Dom za ostarele
           office: Pisarne
-          park: Park
           parking: Parkirišče
           pharmacy: Lekarna
           place_of_worship: Cerkev
@@ -449,7 +441,6 @@ sl:
           prison: Zapor
           pub: Pivnica
           public_building: Javne zgradba
-          public_market: Javni trg
           reception_area: Recepcija
           recycling: Reciklirna točka
           restaurant: Restavracija
@@ -458,13 +449,11 @@ sl:
           school: Šola
           shelter: Zaklonišče
           shop: Trgovina
-          shopping: Nakupovanje
           shower: Tuš
           social_centre: Socialni center
           social_club: Društveni klub
           social_facility: Socialni objekt
           studio: Studio
-          supermarket: Supermarket
           swimming_pool: Bazen
           taxi: Taksi
           telephone: Telefonska govorilnica
@@ -476,8 +465,6 @@ sl:
           veterinary: Veterinarska klinika
           village_hall: Vaško središče
           waste_basket: Koš za odpadke
-          wifi: Dostop WiFi
-          WLAN: WiFi dostop
           youth_centre: Mladinski center
         boundary:
           administrative: Upravne meje
@@ -493,13 +480,11 @@ sl:
         building:
           "yes": Zgradba
         emergency:
-          fire_hydrant: Hidrant
           phone: Klic v sili
         highway:
           bridleway: Jahalna pot
           bus_guideway: Turistični avtobus
           bus_stop: Avtobusna postaja
-          byway: Obvoz
           construction: Autocesta v izgradnji
           cycleway: Kolesarska steza
           emergency_access_point: Dostop za interventna vozila
@@ -507,7 +492,6 @@ sl:
           ford: Prehod
           living_street: Ulica z umirjenim prometom
           milestone: Kilometerski kamen
-          minor: Manjša cesta
           motorway: Avtocesta
           motorway_junction: Avtocestno križišče
           motorway_link: Avtocestni priključek
@@ -528,7 +512,6 @@ sl:
           speed_camera: Hitrostna kamera
           steps: Stopnice
           street_lamp: Ulična svetilka
-          stile: Prehod preko ograje
           tertiary: Lokalna cesta
           tertiary_link: Terciarna cesta
           track: Kolovoz
@@ -552,7 +535,6 @@ sl:
           memorial: Spomenik
           mine: Rudnik
           monument: Spomenik
-          museum: Muzej
           ruins: Ruševine
           tomb: Grobnica
           tower: Stolp
@@ -580,9 +562,6 @@ sl:
           military: Vojaško območje
           mine: Minsko polje
           orchard: Sadovnjak
-          nature_reserve: Naravni rezervat
-          park: Park
-          piste: Proga
           quarry: Dnevni kop
           railway: Železnica
           recreation_ground: Rekreacijsko območje
@@ -592,8 +571,6 @@ sl:
           road: Območje ceste
           village_green: Zelenica
           vineyard: Vinograd
-          wetland: Mokrišče
-          wood: Pragozd
         leisure:
           beach_resort: kopališče
           bird_hide: Ptičja opazovalnica
@@ -628,11 +605,9 @@ sl:
           beach: Obala
           cape: Rt
           cave_entrance: Vhod v jamo
-          channel: Kanal
           cliff: Klif
           crater: Krater
           dune: Peščina
-          feature: Znamenitost
           fell: Višinski travnik
           fjord: Fjord
           forest: Gozd
@@ -649,11 +624,9 @@ sl:
           point: Točka
           reef: Greben
           ridge: Greben
-          river: Reka
           rock: Skala
           scree: Melišče
           scrub: Grmovje
-          shoal: Peščena plaža
           spring: Izvir
           stone: Skala
           strait: Ožina
@@ -662,7 +635,6 @@ sl:
           volcano: Vulkan
           water: Vodovje
           wetland: Mokrišče
-          wetlands: Mokrišča
           wood: Pragozd
         office:
           accountant: Računovodja
@@ -727,7 +699,6 @@ sl:
           switch: Kretnica
           tram: Tramvaj
           tram_stop: Tramvajska postaja
-          yard: Železniško dvorišče
         shop:
           alcohol: Trgovina alkoholnih pijač
           antiques: Starinarna
@@ -816,12 +787,10 @@ sl:
           hostel: Hostel
           hotel: Hotel
           information: Informacije
-          lean_to: Bivak
           motel: Motel
           museum: Muzej
           picnic_site: Prostor za piknike
           theme_park: Zabaviščni park
-          valley: Dolina
           viewpoint: Razgledna točka
           zoo: Živalski vrt
         tunnel:
@@ -831,7 +800,6 @@ sl:
           artificial: Umetni vodotok
           boatyard: Ladjedelnica
           canal: Prekop
-          connector: Vodne povezave
           dam: Jez
           derelict_canal: Zapuščen prekop
           ditch: Jarek
@@ -839,15 +807,12 @@ sl:
           drain: Jarek
           lock: Zapornica
           lock_gate: Velika zapornica
-          mineral_spring: Mineral vrelec
           mooring: Sidrišče
           rapids: Brzice
           river: Reka
-          riverbank: Breg
           stream: Potok
           wadi: Vadi
           waterfall: Slap
-          water_point: Pitna voda
           weir: Zapornica
       admin_levels:
         level2: Državna meja

config/locales/sr-Latn.yml

@@ -285,11 +285,8 @@ sr-Latn:
           taxiway: Rulna staza
           terminal: Terminal
         amenity:
-          airport: Aerodrom
           arts_centre: Umetnički centar
-          artwork: Umetničko delo
           atm: Bankomat
-          auditorium: Dvorana
           bank: Banka
           bar: Bar
           bbq: Roštilj
@@ -308,7 +305,6 @@ sr-Latn:
           charging_station: Napojna stanica
           cinema: Bioskop
           clinic: Klinika
-          club: Klub
           college: Fakultet
           community_centre: Društveni centar
           courthouse: Sud
@@ -329,22 +325,18 @@ sr-Latn:
           fuel: Benzinska pumpa
           grave_yard: Groblje
           gym: Fitnes centar
-          hall: Hala
           health_centre: Dom zdravlja
           hospital: Bolnica
-          hotel: Hotel
           hunting_stand: Lovački dom
           ice_cream: Prodavnica sladoleda
           kindergarten: Obdanište
           library: Biblioteka
           market: Pijaca
           marketplace: Pijaca
-          mountain_rescue: Gorska služba
           nightclub: Noćni klub
           nursery: Jaslice
           nursing_home: Starački dom
           office: Poslovnica
-          park: Park
           parking: Parking
           pharmacy: Apoteka
           place_of_worship: Mesto bogosluženja
@@ -355,7 +347,6 @@ sr-Latn:
           prison: Zatvor
           pub: Pab
           public_building: Ustanova
-          public_market: Pijaca
           reception_area: Prijemno područje
           recycling: Mesto za reciklažu
           restaurant: Restoran
@@ -364,12 +355,10 @@ sr-Latn:
           school: Škola
           shelter: Sklonište
           shop: Prodavnica
-          shopping: Trgovački centar
           shower: Tuš
           social_centre: Socijalni centar
           social_club: Društveni klub
           studio: Studio
-          supermarket: Supermarket
           swimming_pool: Bazen
           taxi: Taksi
           telephone: Telefonska govornica
@@ -381,8 +370,6 @@ sr-Latn:
           veterinary: Veterinarska hirurgija
           village_hall: Seoski dom
           waste_basket: Korpa za otpatke
-          wifi: Bežični internet
-          WLAN: Bežični internet
           youth_centre: Dom omladine
         boundary:
           administrative: Administrativna granica
@@ -401,7 +388,6 @@ sr-Latn:
           bridleway: Konjička staza
           bus_guideway: Autobuska traka
           bus_stop: Autobuska stanica
-          byway: Prečica
           construction: Auto-put u izgradnji
           cycleway: Biciklistička staza
           emergency_access_point: Izlaz za slučaj opasnosti
@@ -409,7 +395,6 @@ sr-Latn:
           ford: Gaz
           living_street: Ulica smirenog prometa
           milestone: Miljokaz
-          minor: Drugorazredni put
           motorway: Auto-put
           motorway_junction: Petlja
           motorway_link: Moto-put
@@ -428,7 +413,6 @@ sr-Latn:
           services: Usluge na auto-putu
           speed_camera: Foto-radar
           steps: Stepenice
-          stile: Prelaz preko ograde
           tertiary: Lokalni put
           tertiary_link: Lokalni put
           track: Makadam
@@ -451,7 +435,6 @@ sr-Latn:
           memorial: Spomenik
           mine: Rudnik
           monument: Spomenik
-          museum: Muzej
           ruins: Ruševine
           tower: Toranj
           wayside_cross: Krajputaš
@@ -478,9 +461,6 @@ sr-Latn:
           military: Vojno područje
           mine: Rudnik
           orchard: Voćnjak
-          nature_reserve: Rezervat prirode
-          park: Park
-          piste: Skijaška staza
           quarry: Kamenolom
           railway: Železnička pruga
           recreation_ground: Rekreacijsko područje
@@ -491,8 +471,6 @@ sr-Latn:
           road: Putno područje
           village_green: Seosko polje
           vineyard: Vinograd
-          wetland: Močvara
-          wood: Šuma
         leisure:
           beach_resort: Morsko odmaralište
           bird_hide: Sklonište za ptice
@@ -525,11 +503,9 @@ sr-Latn:
           beach: Plaža
           cape: Rt
           cave_entrance: Ulaz u pećinu
-          channel: Kanal
           cliff: Litica
           crater: Krater
           dune: Dina
-          feature: Obeležje
           fell: Brdo
           fjord: Fjord
           forest: Šuma
@@ -546,11 +522,9 @@ sr-Latn:
           point: Tačka
           reef: Greben
           ridge: Greben
-          river: Reka
           rock: Stena
           scree: Osulina
           scrub: Guštara
-          shoal: Sprud
           spring: Izvor
           stone: Kamen
           strait: Moreuz
@@ -559,7 +533,6 @@ sr-Latn:
           volcano: Vulkan
           water: Voda
           wetland: Močvara
-          wetlands: Močvara
           wood: Šuma
         office:
           accountant: Računovođa
@@ -621,7 +594,6 @@ sr-Latn:
           switch: Skretnica
           tram: Tramvaj
           tram_stop: Tramvajsko stajalište
-          yard: Ranžirna stanica
         shop:
           alcohol: Trgovina pićem
           antiques: Antikvarnica
@@ -704,12 +676,10 @@ sr-Latn:
           hostel: Hostel
           hotel: Hotel
           information: Podaci
-          lean_to: Sklonište
           motel: Motel
           museum: Muzej
           picnic_site: Mesto za piknik
           theme_park: Tematski park
-          valley: Dolina
           viewpoint: Vidikovac
           zoo: Zoološki vrt
         tunnel:
@@ -718,7 +688,6 @@ sr-Latn:
           artificial: Veštački vodeni put
           boatyard: Brodogradilište
           canal: Kanal
-          connector: Spoj vodnih puteva
           dam: Brana
           derelict_canal: Odbačeni kanal
           ditch: Jarak
@@ -726,15 +695,12 @@ sr-Latn:
           drain: Odvod
           lock: Brana
           lock_gate: Vrata brane
-          mineral_spring: Mineralni izvor
           mooring: Sidrište
           rapids: Brzaci
           river: Reka
-          riverbank: Rečna obala
           stream: Potok
           wadi: Suvo korito reke
           waterfall: Vodopad
-          water_point: Tačka vodotoka
           weir: Brana
     description:
       title:

config/locales/sr.yml

@@ -1,6 +1,7 @@
 # Messages for Serbian (Cyrillic script) (српски (ћирилица)‎)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Aktron
 # Author: Magnumns
 # Author: Milicevic01
 # Author: Nemo bis
@@ -122,6 +123,7 @@ sr:
       way_paginated: Путање (%{x}-%{y} од %{count})
       relation: Односи (%{count})
       relation_paginated: Односи (%{x}-%{y} од %{count})
+      comment: Коментари (%{count})
       changesetxml: XML скуп измена
       osmchangexml: osmChange XML
       feed:
@@ -185,7 +187,7 @@ sr:
     note:
       title: Белешкаː %{id}
       new_note: Нова белешка
-      description: 'Опис:'
+      description: Опис
       open_title: 'Нерешена белешка #%{note_name}'
       closed_title: 'Решена белешка #%{note_name}'
       hidden_title: 'Скривена белешка #%{note_name}'
@@ -373,11 +375,8 @@ sr:
           taxiway: Рулна стаза
           terminal: Терминал
         amenity:
-          airport: Аеродром
           arts_centre: Уметнички центар
-          artwork: Уметничко дело
           atm: Банкомат
-          auditorium: Дворана
           bank: Банка
           bar: Бар
           bbq: Роштиљ
@@ -396,7 +395,6 @@ sr:
           charging_station: Напојна станица
           cinema: Биоскоп
           clinic: Клиника
-          club: Клуб
           college: Факултет
           community_centre: Друштвени центар
           courthouse: Суд
@@ -417,22 +415,18 @@ sr:
           fuel: Бензинска пумпа
           grave_yard: Гробље
           gym: Фитнес центар
-          hall: Сала
           health_centre: Дом здравља
           hospital: Болница
-          hotel: Хотел
           hunting_stand: Ловачки дом
           ice_cream: Продавница сладоледа
           kindergarten: Обданиште
           library: Библиотека
           market: Продавница
           marketplace: Пијаца
-          mountain_rescue: Горска служба
           nightclub: Ноћни клуб
           nursery: Јаслице
           nursing_home: Дом за негу
           office: Пословница
-          park: Парк
           parking: Паркинг
           pharmacy: Апотека
           place_of_worship: Место богослужења
@@ -443,7 +437,6 @@ sr:
           prison: Затвор
           pub: Паб
           public_building: Установа
-          public_market: Пијаца
           reception_area: Пријемно подручје
           recycling: Место за рециклажу
           restaurant: Ресторан
@@ -452,13 +445,11 @@ sr:
           school: Школа
           shelter: Склониште
           shop: Продавница
-          shopping: Трговачки центар
           shower: Туш
           social_centre: Друштвени центар
           social_club: Друштвени клуб
           social_facility: Социјална установа
           studio: Студио
-          supermarket: Супермаркет
           swimming_pool: Базен
           taxi: Такси
           telephone: Телефонска говорница
@@ -470,8 +461,6 @@ sr:
           veterinary: Ветеринарска хирургија
           village_hall: Сеоски дом
           waste_basket: Корпа за отпатке
-          wifi: Бежични интернет
-          WLAN: Бежични интернет
           youth_centre: Дом омладине
         boundary:
           administrative: Административна граница
@@ -487,13 +476,11 @@ sr:
         building:
           "yes": Зграда
         emergency:
-          fire_hydrant: Хидрант
           phone: Телефон за хитне случајеве
         highway:
           bridleway: Коњичка стаза
           bus_guideway: Аутобуска трака
           bus_stop: Аутобуска станица
-          byway: Пречица
           construction: Ауто-пут у изградњи
           cycleway: Бициклистичка стаза
           emergency_access_point: Приступ за случај опасности
@@ -501,7 +488,6 @@ sr:
           ford: Газ
           living_street: Улица смиреног промета
           milestone: Миљоказ
-          minor: Другоразредни пут
           motorway: Ауто-пут
           motorway_junction: Петља
           motorway_link: Мото-пут
@@ -522,7 +508,6 @@ sr:
           speed_camera: Фото-радар
           steps: Степенице
           street_lamp: Улична светиљка
-          stile: Прелаз преко ограде
           tertiary: Главна улица
           tertiary_link: Локални пут
           track: Макадам
@@ -546,7 +531,6 @@ sr:
           memorial: Споменик
           mine: Рудник
           monument: Споменик (монумент)
-          museum: Музеј
           ruins: Рушевине
           tomb: Гробница
           tower: Торањ
@@ -574,9 +558,6 @@ sr:
           military: Војно подручје
           mine: Рудник
           orchard: Воћњак
-          nature_reserve: Резерват природе
-          park: Парк
-          piste: Скијашка стаза
           quarry: Каменолом
           railway: Железничка пруга
           recreation_ground: Подручје за рекреацију
@@ -587,8 +568,6 @@ sr:
           road: Путно подручје
           village_green: Сеоско поље
           vineyard: Виноград
-          wetland: Мочвара
-          wood: Шума
         leisure:
           beach_resort: Одмаралиште на плажи
           bird_hide: Склониште за птице
@@ -623,11 +602,9 @@ sr:
           beach: Плажа
           cape: Рт
           cave_entrance: Улаз у пећину
-          channel: Канал
           cliff: Литица
           crater: Кратер
           dune: Дина
-          feature: Обележје
           fell: Брдо
           fjord: Фјорд
           forest: Шума
@@ -644,11 +621,9 @@ sr:
           point: Тачка
           reef: Гребен
           ridge: Гребен
-          river: Река
           rock: Стена
           scree: Осулина
           scrub: Гуштара
-          shoal: Спруд
           spring: Извор
           stone: Камен
           strait: Мореуз
@@ -657,7 +632,6 @@ sr:
           volcano: Вулкан
           water: Вода
           wetland: Мочвара
-          wetlands: Мочваре
           wood: Шума
         office:
           accountant: Рачуновођа
@@ -722,7 +696,6 @@ sr:
           switch: Скретница
           tram: Трамвај
           tram_stop: Трамвајско стајалиште
-          yard: Ранжирна станица
         shop:
           alcohol: Трговина пићем
           antiques: Антикварница
@@ -811,12 +784,10 @@ sr:
           hostel: Хостел
           hotel: Хотел
           information: Информације
-          lean_to: Склониште
           motel: Мотел
           museum: Музеј
           picnic_site: Место за пикник
           theme_park: Тематски парк
-          valley: Долина
           viewpoint: Видиковац
           zoo: Зоолошки врт
         tunnel:
@@ -826,7 +797,6 @@ sr:
           artificial: Вештачки водени пут
           boatyard: Бродоградилиште
           canal: Канал
-          connector: Спој водних путева
           dam: Брана
           derelict_canal: Одбачени канал
           ditch: Јарак
@@ -834,15 +804,12 @@ sr:
           drain: Одвод
           lock: Устава
           lock_gate: Поље уставе
-          mineral_spring: Минерални извор
           mooring: Сидриште
           rapids: Брзаци
           river: Река
-          riverbank: Речна обала
           stream: Поток
           wadi: Суво корито реке
           waterfall: Водопад
-          water_point: Тачка водотока
           weir: Брана
       admin_levels:
         level2: Државна граница
@@ -1173,6 +1140,10 @@ sr:
     note_comment_notification:
       anonymous: Анонимни корисник
       greeting: Поздрав,
+    changeset_comment_notification:
+      greeting: Поздрав,
+      commented:
+        partial_changeset_without_comment: без коментара
   message:
     inbox:
       title: Примљене
@@ -1620,7 +1591,7 @@ sr:
       flash changed: Ваша лозинка је промењена.
       flash token bad: Такав новчић није пронађен. Проверите адресу.
     new:
-      title: Отварање налога
+      title: Пријави се
       no_auto_account_create: Нажалост, тренутно нисмо у могућности да отворимо нови
         налог.
       contact_webmaster: Контактирајте <a href="mailto:webmaster@openstreetmap.org">администратора</a>
@@ -2078,6 +2049,11 @@ sr:
       createnote_disabled_tooltip: Увећај да додаш белешку на карту
       map_notes_zoom_in_tooltip: Увећај да видиш белешке на карти
       map_data_zoom_in_tooltip: Увећај да видиш податке са карте
+    changesets:
+      show:
+        comment: Коментар
+        hide_comment: сакриј
+        unhide_comment: прикажи
     notes:
       new:
         intro: Видиш грешку или недостатак? Обавести остале картографе. Помери ознаку

config/locales/sv.yml

@@ -421,11 +421,8 @@ sv:
           taxiway: Taxibana
           terminal: Terminal
         amenity:
-          airport: Flygplats
           arts_centre: Konstcenter
-          artwork: Konstverk
           atm: Bankomat
-          auditorium: Auditorium
           bank: Bank
           bar: Bar
           bbq: BBQ
@@ -444,7 +441,6 @@ sv:
           charging_station: Laddningsstation
           cinema: Biograf
           clinic: Klinik
-          club: Klubb
           college: College
           community_centre: Allaktivitetshus
           courthouse: Tingshus
@@ -465,10 +461,8 @@ sv:
           fuel: Bränsle
           grave_yard: Begravningsplats
           gym: Fitnesscenter / Gym
-          hall: Samlingslokal
           health_centre: Vårdcentral
           hospital: Sjukhus
-          hotel: Hotell
           hunting_stand: Jakttorn
           ice_cream: Glass
           kindergarten: Dagis
@@ -477,12 +471,10 @@ sv:
           marketplace: |2-
 
             Marknad
-          mountain_rescue: Fjällräddning
           nightclub: Nattklubb
           nursery: Förskola
           nursing_home: Vårdhem
           office: Kontor
-          park: Park
           parking: Parkeringsplats
           pharmacy: Apotek
           place_of_worship: Plats för tillbedjan
@@ -493,7 +485,6 @@ sv:
           prison: Fängelse
           pub: Pub
           public_building: Offentlig byggnad
-          public_market: Marknadsplats
           reception_area: Reception
           recycling: Återvinningsstation
           restaurant: Restaurang
@@ -502,13 +493,11 @@ sv:
           school: Skola
           shelter: Hydda
           shop: Affär
-          shopping: Handel
           shower: Dusch
           social_centre: Nöjescenter
           social_club: Kamratförening
           social_facility: Socialtjänst
           studio: Studio
-          supermarket: Stormarknad
           swimming_pool: Simbassäng
           taxi: Taxi
           telephone: Telefonkiosk
@@ -520,8 +509,6 @@ sv:
           veterinary: Veterinärkirurgi
           village_hall: Byastuga
           waste_basket: Papperskorg
-          wifi: WiFi-åtkomst
-          WLAN: WiFi-åtkomst
           youth_centre: Ungdomscenter
         boundary:
           administrative: Administrativ gräns
@@ -537,13 +524,11 @@ sv:
         building:
           "yes": Byggnad
         emergency:
-          fire_hydrant: Brandpost
           phone: Nödtelefon
         highway:
           bridleway: Ridstig
           bus_guideway: Spårbussväg
           bus_stop: Busshållplats
-          byway: Omfartsväg
           construction: Väg under konstruktion
           cycleway: Cykelspår
           emergency_access_point: Utryckningsplats
@@ -551,7 +536,6 @@ sv:
           ford: Vadställe
           living_street: Gångfartsområde
           milestone: Milstolpe
-          minor: Mindre väg
           motorway: Motorväg
           motorway_junction: Motorvägskorsning
           motorway_link: Påfart/avfart till motorväg
@@ -572,7 +556,6 @@ sv:
           speed_camera: Trafiksäkerhetskamera
           steps: Trappa
           street_lamp: Gatlykta
-          stile: Stätta
           tertiary: Landsväg
           tertiary_link: Landsväg
           track: Traktorväg
@@ -596,7 +579,6 @@ sv:
           memorial: Minnesmärke
           mine: Gruva
           monument: Monument
-          museum: Museum
           ruins: Ruin
           tomb: Grav
           tower: Torn
@@ -624,9 +606,6 @@ sv:
           military: Militärområde
           mine: Gruva
           orchard: Fruktträdgård
-          nature_reserve: Naturreservat
-          park: Park
-          piste: Pist
           quarry: Stenbrott
           railway: Järnväg
           recreation_ground: Rekreationsområde
@@ -637,8 +616,6 @@ sv:
           road: Vägområde
           village_green: Landsbypark
           vineyard: Vingård
-          wetland: Våtmark
-          wood: Skog
         leisure:
           beach_resort: Badort
           bird_hide: Fågeltorn
@@ -673,11 +650,9 @@ sv:
           beach: Strand
           cape: Udde
           cave_entrance: Grottmynning
-          channel: Kanal
           cliff: Klippa
           crater: Krater
           dune: Sanddyn
-          feature: Funktioner
           fell: Fjäll
           fjord: Fjord
           forest: Skog
@@ -694,11 +669,9 @@ sv:
           point: Punkt
           reef: Rev
           ridge: Bergskam
-          river: Flod
           rock: Klippa
           scree: Taluskon
           scrub: Buskskog
-          shoal: Sandbank
           spring: Källa
           stone: Sten
           strait: Sund
@@ -707,7 +680,6 @@ sv:
           volcano: Vulkan
           water: Vatten
           wetland: Våtmark
-          wetlands: Våtmarker
           wood: Skog
         office:
           accountant: Revisor
@@ -772,9 +744,6 @@ sv:
           switch: Järnvägsväxel
           tram: Spårväg
           tram_stop: Spårvagnshållplats
-          yard: Bangård
-        route:
-          bus: Busslinje
         shop:
           alcohol: Spritbutik
           antiques: Antikviteter
@@ -863,12 +832,10 @@ sv:
           hostel: Vandrarhem
           hotel: Hotell
           information: Turistinformation
-          lean_to: Skjul
           motel: Motell
           museum: Museum
           picnic_site: Picknickplats
           theme_park: Nöjespark
-          valley: Dal
           viewpoint: Utsiktspunkt
           zoo: Djurpark
         tunnel:
@@ -878,7 +845,6 @@ sv:
           artificial: Artificiellt vattendrag
           boatyard: Båtvarv
           canal: Kanal
-          connector: Förbindelsepunkt för farled
           dam: Damm
           derelict_canal: Nerlagd kanal
           ditch: Dike
@@ -886,15 +852,12 @@ sv:
           drain: Avlopp
           lock: Sluss
           lock_gate: Slussport
-          mineral_spring: Mineralvattenskälla
           mooring: Förtöjning
           rapids: Fors
           river: Flod
-          riverbank: Flodbank
           stream: Bäck
           wadi: Uttorkad flod
           waterfall: Vattenfall
-          water_point: Vattenpunkt
           weir: Överfallsvärn
       admin_levels:
         level2: Landsgräns

config/locales/te.yml

@@ -220,9 +220,7 @@ te:
           runway: రన్‍వే
           taxiway: ట్యాక్సీదారి
         amenity:
-          airport: విమానాశ్రయం
           atm: ఏటీఎం
-          auditorium: ప్రదర్శనశాల
           bank: బ్యాంకు
           bar: బార్
           bench: బెంచీ
@@ -237,7 +235,6 @@ te:
           casino: జూదగృహం
           cinema: సినిమా
           clinic: ఆసుపత్రి
-          club: క్లబ్బు
           college: కళాశాల
           community_centre: సామాజిక కేంద్రం
           courthouse: న్యాయస్థానం
@@ -254,14 +251,12 @@ te:
           grave_yard: స్మశానం
           health_centre: ఆరోగ్య కేంద్రం
           hospital: ఆసుపత్రి
-          hotel: హోటెల్
           ice_cream: ఐస్ క్రీం
           library: గ్రంథాలయం
           market: సంత
           marketplace: సంత
           nursery: పిల్లల బడి
           office: కార్యాలయం
-          park: పార్కు
           pharmacy: మందుల దుకాణం
           place_of_worship: పూజా స్థలం
           police: పోలీసు
@@ -293,7 +288,7 @@ te:
           pedestrian: కాలిబాట
           primary: ప్రధాన రహదారి
           primary_link: ప్రధాన రహదారి
-          residential: నివాసప్రాంతం
+          residential: నివాసప్రాంత దారి
           rest_area: విశ్రాంతి స్థలమ
           road: దారి
           secondary: ద్వితీయ శ్రేణి రహదారి
@@ -313,7 +308,6 @@ te:
           memorial: జ్ఞాపిక
           mine: గని
           monument: స్మారకం
-          museum: ప్రదర్శన శాల
           ruins: శిథిలాలు
           tomb: సమాధి
           tower: గోపురం
@@ -332,13 +326,11 @@ te:
           military: సైనిక ప్రాంతం
           mine: గని
           orchard: పళ్ళతోట
-          park: పార్కు
           quarry: క్వారీ
           railway: రైల్వే
           reservoir: జలాశయం
           reservoir_watershed: జలాశయం
           residential: నివాస ప్రాంతం
-          wood: కలప
         leisure:
           beach_resort: బీచి రిసార్టు
           bird_hide: పక్షులకు ఆవాసం
@@ -358,7 +350,6 @@ te:
           land: నేల
           mud: బురద
           peak: శిఖరం
-          river: నది
           rock: రాయి
           spring: ఊట
           stone: రాయి
@@ -368,7 +359,6 @@ te:
           volcano: అగ్ని పర్వతం
           water: నీరు
           wetland: చిత్తడి నేల
-          wetlands: చిత్తడి నేలలు
           wood: అడవి
         office:
           architect: వాస్తుశిల్పి
@@ -403,7 +393,6 @@ te:
           hotel: హోటెల్
           information: సమాచారం
           museum: ప్రదర్శన శాల
-          valley: లోయ
           zoo: జంతుప్రదర్శనశాల
         tunnel:
           culvert: చప్టా

config/locales/tl.yml

@@ -314,11 +314,8 @@ tl:
           taxiway: Daanan ng Taksi
           terminal: Terminal
         amenity:
-          airport: Paliparan
           arts_centre: Lunduyan ng Sining
-          artwork: Likhang Sining
           atm: ATM
-          auditorium: Awditoryum
           bank: Bangko
           bar: Tindahang Inuman ng Alak
           bbq: Barbikyuhan
@@ -337,7 +334,6 @@ tl:
           charging_station: Himpilang Kargahan
           cinema: Sinehan
           clinic: Klinika
-          club: Kapisanan
           college: Dalubhasaan
           community_centre: Lunduyan ng Pamayanan
           courthouse: Gusali ng Hukuman
@@ -358,22 +354,18 @@ tl:
           fuel: Panggatong
           grave_yard: Sementeryo
           gym: Lunduyang Pangkalusugan / Himnasyo
-          hall: Bulwagan
           health_centre: Lunduyan ng Kalusugan
           hospital: Ospital
-          hotel: Otel
           hunting_stand: Pook-tayuan na Pangpangangaso
           ice_cream: Sorbetes
           kindergarten: Kindergarten
           library: Aklatan
           market: Pamilihan
           marketplace: Palengke
-          mountain_rescue: Pagliligtas na Pangbundok
           nightclub: Alibangbang
           nursery: Alagaan ng mga Bata
           nursing_home: Alagaan ng mga Matatanda
           office: Tanggapan
-          park: Liwasan
           parking: Paradahan
           pharmacy: Botika
           place_of_worship: Sambahan
@@ -384,7 +376,6 @@ tl:
           prison: Bilangguan
           pub: Pangmadlang Bahay
           public_building: Pangmadlang Gusali
-          public_market: Pangmadlang Pamilihan
           reception_area: Tanggapang Pook
           recycling: Pook ng Muling Paggamit
           restaurant: Kainan
@@ -393,12 +384,10 @@ tl:
           school: Paaralan
           shelter: Kanlungan
           shop: Tindahan
-          shopping: Pamimili
           shower: Dutsahan
           social_centre: Lunduyan ng Pakikipagkapuwa
           social_club: Kapisanang Panglipunan
           studio: Istudyo
-          supermarket: Malaking Pamilihan
           swimming_pool: Palanguyan
           taxi: Taksi
           telephone: Teleponong Pangmadla
@@ -410,8 +399,6 @@ tl:
           veterinary: Paninistis na Pangbeterinarya
           village_hall: Bulwagan ng Nayon
           waste_basket: Basurahan
-          wifi: Pagpunta sa WiFi
-          WLAN: Pagpunta sa WiFi
           youth_centre: Lunduyan ng Kabataan
         boundary:
           administrative: Hangganang Pampangangasiwa
@@ -427,13 +414,11 @@ tl:
         building:
           "yes": Gusali
         emergency:
-          fire_hydrant: Panubig ng Bumbero
           phone: Teleponong Pangsakuna
         highway:
           bridleway: Daanan ng Kabayo
           bus_guideway: Daanan ng Ginagabayang Bus
           bus_stop: Hintuan ng Bus
-          byway: Landas na Hindi Madaanan
           construction: Ginagawang Punong Lansangan
           cycleway: Daanan ng Bisikleta
           emergency_access_point: Tuldok na Puntahan na Pangsakuna
@@ -441,7 +426,6 @@ tl:
           ford: Bagtasan ng Tao
           living_street: Buhay na Lansangan
           milestone: Poste ng Milya
-          minor: Kalsadang Hindi Pangunahin
           motorway: Daanan ng Sasakyang De-motor
           motorway_junction: Sugpungan ng Daanan ng Sasakyang De-motor
           motorway_link: Lansangang Daanan ng Sasakyang De-motor
@@ -460,7 +444,6 @@ tl:
           services: Mga Palingkuran sa Daanan ng Sasakyang De-motor
           speed_camera: Kamera ng Tulin
           steps: Mga hakbang
-          stile: Hagdanan ng Bakod
           tertiary: Pampangatlong Kalsada
           tertiary_link: Pampangatlong Kalsada
           track: Pinak
@@ -483,7 +466,6 @@ tl:
           memorial: Muog na Pang-alaala
           mine: Minahan
           monument: Bantayog
-          museum: Museo
           ruins: Mga Guho
           tomb: Nitso/Puntod
           tower: Tore
@@ -511,9 +493,6 @@ tl:
           military: Pook ng Militar
           mine: Minahan
           orchard: Halamanan ng Bunga
-          nature_reserve: Lupaing Laan sa Kalikasan
-          park: Liwasan
-          piste: Piste ng Iski
           quarry: Hukay na Tibagan
           railway: Daambakal
           recreation_ground: Lupaing Libangan
@@ -524,8 +503,6 @@ tl:
           road: Pook na Daanan
           village_green: Nayong Lunti
           vineyard: Ubasan
-          wetland: Babad na Lupain
-          wood: Kahoy
         leisure:
           beach_resort: Liwaliwang Dalampasigan
           bird_hide: Pook-Matyagan ng Ibon
@@ -558,11 +535,9 @@ tl:
           beach: Dalampasigan
           cape: Tangway
           cave_entrance: Pasukan ng Yungib
-          channel: Bambang
           cliff: Bangin
           crater: Uka
           dune: Burol ng Buhangin
-          feature: Tampok
           fell: Pulak
           fjord: Tubigang Mabangin
           forest: Gubat
@@ -579,11 +554,9 @@ tl:
           point: Tuldok
           reef: Bahura
           ridge: Tagaytay
-          river: Ilog
           rock: Bato
           scree: Batuhang Buhaghag
           scrub: Palumpong
-          shoal: Banlik
           spring: Bukal
           stone: Bato
           strait: Kipot
@@ -592,7 +565,6 @@ tl:
           volcano: Bulkan
           water: Tubig
           wetland: Babad na Lupain
-          wetlands: Mga Babad na Lupain
           wood: Kahoy
         office:
           accountant: Tagatuos
@@ -654,7 +626,6 @@ tl:
           switch: Mga Tuldok na Pangdaambakal
           tram: Riles ng Trambya
           tram_stop: Hintuan ng Trambya
-          yard: Bakuran ng Daambakal
         shop:
           alcohol: Wala sa Lisensiya
           antiques: Mga Antigo
@@ -738,12 +709,10 @@ tl:
           hostel: Hostel
           hotel: Otel
           information: Kabatiran
-          lean_to: Sibi
           motel: Motel
           museum: Museo
           picnic_site: Pook na Pampiknik
           theme_park: Liwasang may Tema
-          valley: Lambak
           viewpoint: Tuldok ng pananaw
           zoo: Hayupan
         tunnel:
@@ -752,7 +721,6 @@ tl:
           artificial: Daanan ng Tubig na Gawang-Tao
           boatyard: Bakuran ng bangka
           canal: Paralanan
-          connector: Pandugtong sa Daanan ng Tubig
           dam: Saplad
           derelict_canal: Pinabayaang Paralanan
           ditch: Bambang
@@ -760,15 +728,12 @@ tl:
           drain: Limasan
           lock: Kandado
           lock_gate: Tarangkahan ng Kandado
-          mineral_spring: Balong na Mineral
           mooring: Pugalan
           rapids: Mga lagaslasan
           river: Ilog
-          riverbank: Pampang ng Ilog
           stream: Batis
           wadi: Tuyot na Ilog
           waterfall: Talon
-          water_point: Tuldok ng Tubigan
           weir: Pilapil
     description:
       title:

config/locales/tr.yml

@@ -133,6 +133,7 @@ tr:
       way_paginated: Yol (%{x}-%{y} - toplam %{count})
       relation: Relasyonlar (%{count})
       relation_paginated: Relasyon (%{x}-%{y} - toplam %{count})
+      comment: Yorumlar (%{count})
       changesetxml: Değişiklik takımı XML
       osmchangexml: osmChange XML
       feed:
@@ -208,6 +209,9 @@ tr:
         önceki</abbr> yorumu
     query:
       title: Özellikleri Göster
+      introduction: Yakın diğer özellikleri bulmak için harita üzerine tıklayın.
+      nearby: Yakındaki özellikleri
+      enclosing: Kapsayan özellikleri
   changeset:
     changeset_paging_nav:
       showing_page: 'Sayfa: %{page}'
@@ -228,12 +232,18 @@ tr:
       title_user: '%{user} tarafından değişiklik setleri'
       title_friend: Arkadaşların değişiklik kayıtları
       title_nearby: Yakındaki kullanıcıların değişiklik kayıtları
+      empty: Değişiklik kümeleri bulunamadı.
+      empty_area: Bu alanda da değişiklik kümesi bulunmuyor.
+      empty_user: Bu kullanıcının hiçbir değişiklik kümeleri yok.
+      no_more: Daha fazla değişiklik kümeleri yok.
       load_more: Daha fazla
     timeout:
       sorry: Üzgünüz, değişiklik kayıtlarının listelenmesi fazla sürdü.
     rss:
       title_all: Değişiklik takımı tartışması
       title_particular: 'Değişiklik takımı #%{changeset_id} tartışması'
+      commented_at_html: '%{when} önce güncelleştirilmiş'
+      commented_at_by_html: '%{when} önce %{user} tarafından güncelleştirilmiş'
       full: Bütün tartışma
   diary_entry:
     new:
@@ -378,11 +388,8 @@ tr:
           taxiway: Taksi yolu
           terminal: Terminal
         amenity:
-          airport: Havaalanı
           arts_centre: Sanat Merkezi
-          artwork: Sanat eseri
           atm: Bankamatik
-          auditorium: Oditoryum
           bank: Banka
           bar: Bar
           bbq: Mangal alanı
@@ -401,7 +408,6 @@ tr:
           charging_station: Şarj İstasyonu
           cinema: Sinema
           clinic: Klinik
-          club: Kulüp
           college: Lise
           courthouse: Adliye
           crematorium: Krematoryum
@@ -420,22 +426,18 @@ tr:
           fuel: Petrol ofisi
           grave_yard: Mezarlık
           gym: Fitness Merkezi / Spor Salonu
-          hall: Toplantı salonu
           health_centre: Sağlık Merkezi
           hospital: Hastane
-          hotel: Hotel
           hunting_stand: Avcılık Standı
           ice_cream: Dondurma
           kindergarten: Kreş
           library: Kütüphane
           market: Pazar yeri
           marketplace: Pazar yeri
-          mountain_rescue: Dağ Kurtarma
           nightclub: Gece Kulübü
           nursery: Kreş
           nursing_home: Huzurevi
           office: Ofis
-          park: Park
           parking: Otopark
           pharmacy: Eczane
           place_of_worship: İbadethane / Tapınak
@@ -446,7 +448,6 @@ tr:
           prison: Cezaevi
           pub: Birahane
           public_building: Kamu Binası
-          public_market: Halk Pazarı
           reception_area: Resepsiyon Alanı
           recycling: Geri dönüşüm noktası
           restaurant: Restoran
@@ -455,13 +456,11 @@ tr:
           school: Okul
           shelter: Korunak
           shop: Dükkan
-          shopping: Alışveriş Merkezi
           shower: Duş
           social_centre: Sosyal Merkez
           social_club: Sosyal kulübü
           social_facility: Sosyal Tesis
           studio: Stüdyo
-          supermarket: Süpermarket
           swimming_pool: Yüzme Havuzu
           taxi: Taksi
           telephone: Telefon
@@ -473,8 +472,6 @@ tr:
           veterinary: Veteriner
           village_hall: Köy odası
           waste_basket: Çöp sepeti
-          wifi: WiFi erişim
-          WLAN: WiFi Erişim Noktası
           youth_centre: Gençlik Merkezi
         boundary:
           administrative: İdari Sınır
@@ -489,13 +486,11 @@ tr:
         building:
           "yes": Bina
         emergency:
-          fire_hydrant: Yangın Musluğu
           phone: Acil Durum Telefonu
         highway:
           bridleway: At yürüyüş yolu
           bus_guideway: Güdümlü otobüs yolu
           bus_stop: Otobüs durağı
-          byway: Yan yolu
           construction: İnşaa halinde yolu
           cycleway: Bisiklet Yolu
           emergency_access_point: Acil Erişim Noktası
@@ -503,7 +498,6 @@ tr:
           ford: Akarsu geçidi
           living_street: Yaşam sokağı
           milestone: Kilometre taşı
-          minor: Ufak yol
           motorway: Otoyol
           motorway_junction: Otoyol Kavşağı
           motorway_link: Otoyol bağlantısı
@@ -524,7 +518,6 @@ tr:
           speed_camera: Hız Kamerası
           steps: Merdiven
           street_lamp: Sokak Lambası
-          stile: Çit basamağı
           tertiary: Köy arası yolu
           tertiary_link: Köy arası yolu
           track: Toprak yolu
@@ -548,7 +541,6 @@ tr:
           memorial: Anıt
           mine: Maden Ocağı
           monument: Anıt
-          museum: Müze
           ruins: Harabe
           tomb: Mezar
           tower: Kule
@@ -574,9 +566,6 @@ tr:
           military: Askeri Bölge
           mine: Maden Ocağı
           orchard: Meyve Bahçesi
-          nature_reserve: Doğa Koruma Alanı
-          park: Park
-          piste: Pist
           quarry: Ocak
           railway: Demiryolu
           recreation_ground: Eğlence Parkı
@@ -587,8 +576,6 @@ tr:
           road: Yol Alanı
           village_green: Yeşil Alan
           vineyard: Bağ
-          wetland: Sulak Alan
-          wood: Orman
         leisure:
           beach_resort: Plajlı tatilköyü
           bird_hide: Kuş Gözleme Yeri
@@ -623,11 +610,9 @@ tr:
           beach: Plaj
           cape: Burun
           cave_entrance: Mağara girişi
-          channel: Kanal
           cliff: Uçurum
           crater: Krater
           dune: Kumul
-          feature: Özelliği
           fell: Ağaçsız tepe
           fjord: Haliç
           forest: Orman
@@ -644,11 +629,9 @@ tr:
           point: Nokta
           reef: Resif
           ridge: Sırt
-          river: Nehir
           rock: Kayaç
           scree: Kayşat
           scrub: Çalılık
-          shoal: Sığlık
           spring: Pınar
           stone: Taş
           strait: Boğaz
@@ -657,7 +640,6 @@ tr:
           volcano: Yanardağ
           water: Su
           wetland: Sulak alan
-          wetlands: Sulak Alanlar
           wood: Orman
         office:
           accountant: Muhasebeci
@@ -716,7 +698,6 @@ tr:
           switch: Demiryolu makası
           tram: Tramvay
           tram_stop: Tramvay Durağı
-          yard: Tren Avlusu
         shop:
           alcohol: Tekel bayii
           antiques: Antikacı
@@ -802,12 +783,10 @@ tr:
           hostel: Hostel
           hotel: Hotel
           information: Bilgi
-          lean_to: Ek binası
           motel: Motel
           museum: Müze
           picnic_site: Piknik yeri
           theme_park: Lunapark
-          valley: Dere/vadi
           viewpoint: Panoramik view
           zoo: Hayvanat bahçesi
         tunnel:
@@ -817,7 +796,6 @@ tr:
           artificial: Yapay su yolu
           boatyard: Tersane
           canal: Kanal
-          connector: Su yolu bağlantısı
           dam: Baraj
           derelict_canal: Sahipsiz kanal
           ditch: Sulama kanalı
@@ -825,15 +803,12 @@ tr:
           drain: Atık su kanalı
           lock: İskele
           lock_gate: Menfez
-          mineral_spring: Maden Suyu
           mooring: Baba
           rapids: Akıntı
           river: Nehir
-          riverbank: Irmak kenarı
           stream: Çay
           wadi: Vadi
           waterfall: Şelale
-          water_point: İçme suyu
           weir: Küçük köprü
       admin_levels:
         level2: Ülke Sınırı
@@ -1048,6 +1023,13 @@ tr:
         tıkla.
     note_comment_notification:
       greeting: Merhaba,
+      commented:
+        subject_own: '[OpenStreetMap] notlarından birisini %{commenter} tarafından
+          yorumlandı'
+    changeset_comment_notification:
+      greeting: Merhaba,
+      commented:
+        partial_changeset_without_comment: yorumsuz
   message:
     inbox:
       title: Gelen Kutusu
@@ -1113,6 +1095,9 @@ tr:
     edit:
       user_page_link: kullanıcı sayfası
       anon_edits: (%{link})
+      id_not_configured: iD yapılandırılmamış
+      no_iframe_support: Bu özelliği görüntülemek için gerekli olan HTML iframe tarayıcınız
+        desteklemiyor.
     sidebar:
       search_results: Arama Sonuçları
       close: Kapat

config/locales/uk.yml

@@ -426,11 +426,8 @@ uk:
           taxiway: Руліжна доріжка
           terminal: Термінал
         amenity:
-          airport: Аеропорт
           arts_centre: Мистецький центр
-          artwork: Образотворче мистецтво
           atm: Банкомат
-          auditorium: Конференц-зала
           bank: Банк
           bar: Бар
           bbq: Барбекю
@@ -449,7 +446,6 @@ uk:
           charging_station: Станція для зарядки електромобілів
           cinema: Кінотеатр
           clinic: Клініка
-          club: Клуб
           college: Коледж
           community_centre: Громадський центр
           courthouse: Суд
@@ -470,22 +466,18 @@ uk:
           fuel: Пальне
           grave_yard: Цвинтар
           gym: Тренажерний зал
-          hall: Зала
           health_centre: Центр здоров'я
           hospital: Лікарня
-          hotel: Готель
           hunting_stand: Мисливська вежа
           ice_cream: Морозиво
           kindergarten: Дитячий садок
           library: Бібліотека
           market: Ринок
           marketplace: Ринок
-          mountain_rescue: Гірські рятувальники
           nightclub: Нічний клуб
           nursery: Дитсадок
           nursing_home: Будинок престарілих
           office: Офіс
-          park: Парк
           parking: Автостоянка
           pharmacy: Аптека
           place_of_worship: Культова споруда
@@ -496,7 +488,6 @@ uk:
           prison: В’язниця
           pub: Паб
           public_building: Громадський заклад
-          public_market: Базар
           reception_area: Зона прийому
           recycling: Місце переробки відходів
           restaurant: Ресторан
@@ -505,13 +496,11 @@ uk:
           school: Школа
           shelter: Укриття
           shop: Магазин
-          shopping: Торговельний центр
           shower: Душ
           social_centre: Суспільний центр
           social_club: Клуб за інтересами
           social_facility: Соціальна установа
           studio: Студія
-          supermarket: Супермаркет
           swimming_pool: Басейн
           taxi: Таксі
           telephone: Телефон
@@ -523,8 +512,6 @@ uk:
           veterinary: Ветлікарня
           village_hall: Сільрада
           waste_basket: Контейнер для сміття
-          wifi: Wi-Fi доступ
-          WLAN: WiFi доступ
           youth_centre: Молодіжний центр
         boundary:
           administrative: Адміністративний кордон
@@ -540,13 +527,11 @@ uk:
         building:
           "yes": Будівля
         emergency:
-          fire_hydrant: Пожежний гідрант
           phone: Телефон для екстрених викликів
         highway:
           bridleway: Дорога для їзди кіньми
           bus_guideway: Рейковий автобус
           bus_stop: Автобусна зупинка
-          byway: Боковий шлях
           construction: Будівництво автомагістралі
           cycleway: Велосипедна доріжка
           emergency_access_point: Пункт швидкої допомоги
@@ -554,7 +539,6 @@ uk:
           ford: Броди
           living_street: Житлова зона
           milestone: Віха
-          minor: Другорядна дорога
           motorway: Автомагістраль
           motorway_junction: В’їзд на автомагістраль
           motorway_link: З’єднання з автомагістраллю
@@ -575,7 +559,6 @@ uk:
           speed_camera: Камера контролю швидкості
           steps: Сходи
           street_lamp: Вуличний ліхтар
-          stile: Турнікет
           tertiary: Третинна дорога
           tertiary_link: Виїзд на третинну дорогу
           track: Путівець
@@ -599,7 +582,6 @@ uk:
           memorial: Меморіал
           mine: Копальня
           monument: Пам’ятник
-          museum: Музей
           ruins: Руїни
           tomb: Гробниця
           tower: Башта
@@ -627,9 +609,6 @@ uk:
           military: Військова зона
           mine: Копальня
           orchard: Сад
-          nature_reserve: Заповідник
-          park: Парк
-          piste: Лижня
           quarry: Кар’єр
           railway: Залізниця
           recreation_ground: База відпочинку
@@ -640,8 +619,6 @@ uk:
           road: Зона дорожньої мережі
           village_green: Сільська галявина
           vineyard: Виноградник
-          wetland: Болота
-          wood: Дерева
         leisure:
           beach_resort: Пляжний курорт
           bird_hide: Засідка (пункт спостереження за птахами)
@@ -676,11 +653,9 @@ uk:
           beach: Пляж
           cape: Мис
           cave_entrance: Вхід до печери
-          channel: Канал
           cliff: Скеля
           crater: Кратер
           dune: Дюна
-          feature: Елемент
           fell: Вирубка
           fjord: Фіорд
           forest: Ліс
@@ -697,11 +672,9 @@ uk:
           point: Точка
           reef: Риф
           ridge: Гірський хребет
-          river: Ріка
           rock: Скеля
           scree: Щебінь
           scrub: Чагарник
-          shoal: Мілина
           spring: Джерело
           stone: Камінь
           strait: Перешийок
@@ -710,7 +683,6 @@ uk:
           volcano: Вулкан
           water: Вода
           wetland: Заболочені землі
-          wetlands: Водно-болотні угіддя
           wood: Дерева
         office:
           accountant: Бухгалтер
@@ -775,9 +747,6 @@ uk:
           switch: Стрілка
           tram: Трамвайні колії
           tram_stop: Трамвайна зупинка
-          yard: Депо
-        route:
-          bus: Автобусний Маршрут
         shop:
           alcohol: Спиртні напої
           antiques: Антикваріат
@@ -866,12 +835,10 @@ uk:
           hostel: Хостел
           hotel: Готель
           information: Інформація
-          lean_to: Навіс
           motel: Мотель
           museum: Музей
           picnic_site: Місце для пікніків
           theme_park: Тематичний парк
-          valley: Долина
           viewpoint: Оглядовий майданчик
           zoo: Зоопарк
         tunnel:
@@ -881,7 +848,6 @@ uk:
           artificial: Штучні водний шлях
           boatyard: Верф
           canal: Канал
-          connector: З’єднання водних шляхів
           dam: Дамба
           derelict_canal: Покинутий канал
           ditch: Рів
@@ -889,15 +855,12 @@ uk:
           drain: Дренажний канал
           lock: Шлюз
           lock_gate: Шлюзові ворота
-          mineral_spring: Мінеральне джерело
           mooring: Якірна стоянка
           rapids: Пороги
           river: Річка
-          riverbank: Берег ріки
           stream: Струмок
           wadi: Ваді
           waterfall: Водоспад
-          water_point: Пункт водопостачання
           weir: Гребля
       admin_levels:
         level2: Державний кордон

config/locales/vi.yml

@@ -399,11 +399,8 @@ vi:
           taxiway: Đường lăn
           terminal: Nhà ga Sân bay
         amenity:
-          airport: Sân bay
           arts_centre: Trung tâm Nghệ thuật
-          artwork: Tác phẩm Nghệ thuật
           atm: Máy Rút tiền Tự động
-          auditorium: Phòng hội họp
           bank: Ngân hàng
           bar: Quán rượu
           bbq: Bếp Nướng Ngoài trời
@@ -422,7 +419,6 @@ vi:
           charging_station: Trạm Sạc Pin
           cinema: Rạp phim
           clinic: Phòng khám
-          club: Câu lạc bộ
           college: Trường Cao đẳng
           community_centre: Trung tâm Cộng đồng
           courthouse: Tòa
@@ -443,22 +439,18 @@ vi:
           fuel: Cây xăng
           grave_yard: Nghĩa địa
           gym: Nhà Thể dục
-          hall: Hội trường
           health_centre: Trung tâm Y tế
           hospital: Bệnh viện
-          hotel: Khách sạn
           hunting_stand: Ghế Dựng để Săn bắn
           ice_cream: Tiệm Kem
           kindergarten: Tiểu học
           library: Thư viện
           market: Chợ
           marketplace: Chợ phiên
-          mountain_rescue: Đội Cứu nạn Núi
           nightclub: Câu lạc bộ Đêm
           nursery: Nhà trẻ
           nursing_home: Viện Dưỡng lão
           office: Văn phòng
-          park: Công viên
           parking: Chỗ Đậu xe
           pharmacy: Nhà thuốc
           place_of_worship: Nơi Thờ phụng
@@ -469,7 +461,6 @@ vi:
           prison: Nhà tù
           pub: Quán rượu
           public_building: Tòa nhà Công cộng
-          public_market: Chợ phiên
           reception_area: Phòng Tiếp khách
           recycling: Trung tâm hoặc Thùng Tái sinh
           restaurant: Nhà hàng
@@ -478,13 +469,11 @@ vi:
           school: Trường học
           shelter: Nơi Trú ẩn
           shop: Tiệm
-          shopping: Tiệm
           shower: Vòi tắm
           social_centre: Hội trường
           social_club: Câu lạc bộ Xã hội
           social_facility: Cơ quan Xã hội
           studio: Studio
-          supermarket: Siêu thị
           swimming_pool: Hồ tắm
           taxi: Taxi
           telephone: Điện thoại Công cộng
@@ -496,8 +485,6 @@ vi:
           veterinary: Phẫu thuật Thú y
           village_hall: Trụ sở Làng
           waste_basket: Thùng rác
-          wifi: Điểm Truy cập Wi-Fi
-          WLAN: Điểm Truy cập Wi-Fi
           youth_centre: Trung tâm Thanh niên
         boundary:
           administrative: Biên giới Hành chính
@@ -513,13 +500,11 @@ vi:
         building:
           "yes": Tòa nhà
         emergency:
-          fire_hydrant: Trụ Cứu hỏa
           phone: Điện thoại Khẩn cấp
         highway:
           bridleway: Đường Cưỡi ngựa
           bus_guideway: Làn đường Dẫn Xe buýt
           bus_stop: Trạm Xe buýt
-          byway: Đường mòn Đa mốt
           construction: Đường Đang Xây
           cycleway: Đường Xe đạp
           emergency_access_point: Địa điểm Truy nhập Khẩn cấp
@@ -527,7 +512,6 @@ vi:
           ford: Khúc Sông Cạn
           living_street: Đường Hàng xóm
           milestone: Mốc
-          minor: Đường Nhỏ
           motorway: Đường Cao tốc
           motorway_junction: Ngã tư Đường Cao tốc
           motorway_link: Đường Cao tốc
@@ -548,7 +532,6 @@ vi:
           speed_camera: Máy chụp hình Tốc độ
           steps: Cầu thang
           street_lamp: Đèn Đường phố
-          stile: Cửa xoay
           tertiary: Phố
           tertiary_link: Phố
           track: Đường mòn
@@ -572,7 +555,6 @@ vi:
           memorial: Vật Tưởng niệm
           mine: Mỏ
           monument: Công trình Tưởng niệm
-          museum: Bảo tàng
           ruins: Tàn tích
           tomb: Mộ
           tower: Tháp
@@ -600,9 +582,6 @@ vi:
           military: Khu vực Quân sự
           mine: Mỏ
           orchard: Vườn Cây
-          nature_reserve: Khu Bảo tồn Thiên niên
-          park: Công viên
-          piste: Đường Trượt tuyết
           quarry: Mỏ Đá
           railway: Đường sắt
           recreation_ground: Sân chơi
@@ -613,8 +592,6 @@ vi:
           road: Đất của con Đường
           village_green: Sân Làng
           vineyard: Vườn Nho
-          wetland: Đầm lầy
-          wood: Rừng
         leisure:
           beach_resort: Khu Nghỉ mát Ven biển
           bird_hide: Căn nhà Quan sát Chim
@@ -649,11 +626,9 @@ vi:
           beach: Bãi biển
           cape: Mũi đất
           cave_entrance: Cửa vào Hang
-          channel: Eo biển
           cliff: Vách đá
           crater: Miệng Núi
           dune: Cồn cát
-          feature: Đối tượng Thiên nhiên
           fell: Đồi Cằn cỗi
           fjord: Vịnh hẹp
           forest: Rừng
@@ -670,11 +645,9 @@ vi:
           point: Mũi đất
           reef: Rạn san hô
           ridge: Luống đất
-          river: Sông
           rock: Đá
           scree: Sườn Núi Đá
           scrub: Đất Bụi rậm
-          shoal: Bãi cạn
           spring: Suối
           stone: Đá
           strait: Eo biển
@@ -683,7 +656,6 @@ vi:
           volcano: Núi lửa
           water: Nước
           wetland: Đầm lầy
-          wetlands: Đầm lầy
           wood: Rừng
         office:
           accountant: Kế toán viên
@@ -748,9 +720,6 @@ vi:
           switch: Ghi Đường sắt
           tram: Đường Xe điện
           tram_stop: Ga Xép Điện
-          yard: Sân ga
-        route:
-          bus: Tuyến Xe buýt
         shop:
           alcohol: Tiệm Rượu
           antiques: Tiệm Đồ cổ
@@ -839,12 +808,10 @@ vi:
           hostel: Nhà trọ
           hotel: Khách sạn
           information: Thông tin
-          lean_to: Nhà chái
           motel: Khách sạn Dọc đường
           museum: Bảo tàng
           picnic_site: Bàn ăn Ngoài trời
           theme_park: Công viên Giải trí
-          valley: Thung lũng
           viewpoint: Thắng cảnh
           zoo: Vườn thú
         tunnel:
@@ -854,7 +821,6 @@ vi:
           artificial: Dòng nước Nhân tạo
           boatyard: Bãi Thuyền
           canal: Kênh
-          connector: Đường thủy Nối
           dam: Đập
           derelict_canal: Kênh Bỏ rơi
           ditch: Mương
@@ -862,15 +828,12 @@ vi:
           drain: Cống
           lock: Âu tàu
           lock_gate: Âu tàu
-          mineral_spring: Suối Nước khoáng
           mooring: Cột neo tàu
           rapids: Thác ghềnh
           river: Sông
-          riverbank: Bờ sông
           stream: Dòng suối
           wadi: Dòng sông Vào mùa
           waterfall: Thác
-          water_point: Máy bơm nước
           weir: Đập Tràn
       admin_levels:
         level2: Biên giới Quốc gia

config/locales/zh-CN.yml

@@ -411,11 +411,8 @@ zh-CN:
           taxiway: 滑行道
           terminal: 航站楼
         amenity:
-          airport: 机场
           arts_centre: 艺术中心
-          artwork: 艺术品
           atm: 自动提款机
-          auditorium: 礼堂
           bank: 银行
           bar: 酒吧
           bbq: 烧烤
@@ -434,7 +431,6 @@ zh-CN:
           charging_station: 充电站
           cinema: 电影院
           clinic: 诊所
-          club: 俱乐部
           college: 学院
           community_centre: 社区中心
           courthouse: 法院
@@ -455,22 +451,18 @@ zh-CN:
           fuel: 加油站
           grave_yard: 墓地
           gym: 健身中心/健身房
-          hall: 会堂
           health_centre: 医疗中心
           hospital: 医院
-          hotel: 酒店
           hunting_stand: 狩猎站
           ice_cream: 冰淇淋
           kindergarten: 幼儿园
           library: 图书馆
           market: 市场
           marketplace: 市场
-          mountain_rescue: 山地救援
           nightclub: 夜总会
           nursery: 托儿所
           nursing_home: 疗养院
           office: 办公室
-          park: 公园
           parking: 停车场
           pharmacy: 药店
           place_of_worship: 宗教场所
@@ -481,7 +473,6 @@ zh-CN:
           prison: 监狱
           pub: 酒馆
           public_building: 公共建筑
-          public_market: 集市
           reception_area: 接待区
           recycling: 回收点
           restaurant: 餐馆
@@ -490,13 +481,11 @@ zh-CN:
           school: 学校
           shelter: 亭
           shop: 商店
-          shopping: 购物
           shower: 淋浴
           social_centre: 社区中心
           social_club: 社交俱乐部
           social_facility: 公共设施
           studio: 工作室
-          supermarket: 超市
           swimming_pool: 游泳池
           taxi: 出租车
           telephone: 公共电话
@@ -508,8 +497,6 @@ zh-CN:
           veterinary: 兽医
           village_hall: 村政厅
           waste_basket: 垃圾桶
-          wifi: WiFi 热点
-          WLAN: WiFi 热点
           youth_centre: 青少年中心
         boundary:
           administrative: 行政区边界
@@ -525,13 +512,11 @@ zh-CN:
         building:
           "yes": 建筑物
         emergency:
-          fire_hydrant: 消防栓
           phone: 紧急电话
         highway:
           bridleway: 马道
           bus_guideway: 导轨公交车道
           bus_stop: 公共汽车站
-          byway: 小路
           construction: 在建公路
           cycleway: 自行车道
           emergency_access_point: 紧急求救点
@@ -539,7 +524,6 @@ zh-CN:
           ford: 浅滩
           living_street: 生活街
           milestone: 里程碑
-          minor: 次要道路
           motorway: 高速公路
           motorway_junction: 高速公路连接线
           motorway_link: 高速公路
@@ -560,7 +544,6 @@ zh-CN:
           speed_camera: 测速摄像头
           steps: 楼梯
           street_lamp: 路灯
-          stile: 跨越围栏的台阶
           tertiary: 三级道路
           tertiary_link: 三级道路
           track: 小路
@@ -584,7 +567,6 @@ zh-CN:
           memorial: 纪念碑
           mine: 矿井
           monument: 纪念碑
-          museum: 博物馆
           ruins: 遗迹
           tomb: 墓
           tower: 塔
@@ -612,9 +594,6 @@ zh-CN:
           military: 军事区
           mine: 矿井
           orchard: 果园
-          nature_reserve: 自然保护区
-          park: 公园
-          piste: 滑雪场
           quarry: 采石场
           railway: 铁路
           recreation_ground: 游乐场
@@ -625,8 +604,6 @@ zh-CN:
           road: 道路区
           village_green: 乡村草坪
           vineyard: 葡萄园
-          wetland: 湿地
-          wood: 树林
         leisure:
           beach_resort: 海滩度假村
           bird_hide: 野生动物观察站
@@ -661,11 +638,9 @@ zh-CN:
           beach: 滩
           cape: 海岬
           cave_entrance: 洞口
-          channel: 海峡
           cliff: 峭壁
           crater: 火山口
           dune: 沙丘
-          feature: 特征
           fell: 费尔地貌
           fjord: 峡湾
           forest: 森林
@@ -682,11 +657,9 @@ zh-CN:
           point: 点
           reef: 礁
           ridge: 山脊
-          river: 河
           rock: 岩
           scree: 岩屑堆
           scrub: 灌木丛
-          shoal: 暗沙
           spring: 泉
           stone: 石
           strait: 海峡
@@ -695,7 +668,6 @@ zh-CN:
           volcano: 火山
           water: 水
           wetland: 湿地
-          wetlands: 湿地
           wood: 树林
         office:
           accountant: 会计师事务所
@@ -760,9 +732,6 @@ zh-CN:
           switch: 道岔
           tram: 电车轨道
           tram_stop: 有轨电车站
-          yard: 车辆段
-        route:
-          bus: 公交路线
         shop:
           alcohol: 无许可证
           antiques: 古玩店
@@ -851,12 +820,10 @@ zh-CN:
           hostel: 招待所
           hotel: 酒店
           information: 信息
-          lean_to: 棚屋
           motel: 汽车旅馆
           museum: 博物馆
           picnic_site: 野餐地
           theme_park: 主题公园
-          valley: 谷
           viewpoint: 观景点
           zoo: 动物园
         tunnel:
@@ -866,7 +833,6 @@ zh-CN:
           artificial: 人工航道
           boatyard: 船坞
           canal: 运河
-          connector: 航道连接器
           dam: 水坝
           derelict_canal: 废弃运河
           ditch: 沟
@@ -874,15 +840,12 @@ zh-CN:
           drain: 渠
           lock: 船闸
           lock_gate: 船闸
-          mineral_spring: 矿泉
           mooring: 系泊设备
           rapids: 急流
           river: 河
-          riverbank: 河岸
           stream: 溪
           wadi: 干河
           waterfall: 瀑布
-          water_point: 取水点
           weir: 堰
       admin_levels:
         level2: 国界

config/locales/zh-TW.yml

@@ -405,11 +405,8 @@ zh-TW:
           taxiway: 滑行道
           terminal: 終端
         amenity:
-          airport: 機場
           arts_centre: 藝術中心
-          artwork: 藝術品
           atm: ATM
-          auditorium: 演講廳
           bank: 銀行
           bar: 酒吧
           bbq: 燒烤場
@@ -428,7 +425,6 @@ zh-TW:
           charging_station: 充電站
           cinema: 電影院
           clinic: 診所
-          club: 俱樂部
           college: 學院
           community_centre: 社區中心
           courthouse: 法院
@@ -449,22 +445,18 @@ zh-TW:
           fuel: 油店
           grave_yard: 墓地
           gym: 健身中心 / 健身房
-          hall: 禮堂
           health_centre: 健康中心
           hospital: 醫院
-          hotel: 酒店
           hunting_stand: 狩獵站
           ice_cream: 冰淇淋
           kindergarten: 幼稚園
           library: 圖書館
           market: 市場
           marketplace: 市場
-          mountain_rescue: 山地救援
           nightclub: 夜總會
           nursery: 托兒所
           nursing_home: 護理院
           office: 辦公室
-          park: 公園
           parking: 停車場
           pharmacy: 藥房
           place_of_worship: 宗教場所
@@ -475,7 +467,6 @@ zh-TW:
           prison: 監獄
           pub: 酒吧
           public_building: 公共建築
-          public_market: 市集
           reception_area: 接待區
           recycling: 回收點
           restaurant: 餐廳
@@ -484,13 +475,11 @@ zh-TW:
           school: 學校
           shelter: 庇護所
           shop: 商店
-          shopping: 購物
           shower: 淋浴
           social_centre: 社交中心
           social_club: 社交會所
           social_facility: 社會福利設施
           studio: 錄音室
-          supermarket: 超級市場
           swimming_pool: 游泳池
           taxi: 出租車
           telephone: 公共電話
@@ -502,8 +491,6 @@ zh-TW:
           veterinary: 獸醫
           village_hall: 村公所
           waste_basket: 垃圾桶
-          wifi: 無線網路
-          WLAN: 無線網路
           youth_centre: 青少年中心
         boundary:
           administrative: 行政區邊界
@@ -519,13 +506,11 @@ zh-TW:
         building:
           "yes": 建築物
         emergency:
-          fire_hydrant: 消防栓
           phone: 緊急電話
         highway:
           bridleway: 馬道
           bus_guideway: 軌道巴士線
           bus_stop: 巴士站
-          byway: 小路
           construction: 建造中道路
           cycleway: 單車徑
           emergency_access_point: 緊急求助點
@@ -533,7 +518,6 @@ zh-TW:
           ford: 淺灘
           living_street: 生活街
           milestone: 里程碑
-          minor: 次要道路
           motorway: 高速公路
           motorway_junction: 高速公路交匯處
           motorway_link: 高速公路連接路
@@ -554,7 +538,6 @@ zh-TW:
           speed_camera: 測速照相機
           steps: 梯級
           street_lamp: 路燈
-          stile: 跨越圍欄的台階
           tertiary: 三級道路
           tertiary_link: 三級道路連接路
           track: 軌道
@@ -578,7 +561,6 @@ zh-TW:
           memorial: 紀念館
           mine: 礦場
           monument: 古蹟
-          museum: 博物館
           ruins: 廢墟
           tomb: 墳墓
           tower: 塔
@@ -606,9 +588,6 @@ zh-TW:
           military: 軍事區
           mine: 礦場
           orchard: 果園
-          nature_reserve: 自然保護區
-          park: 公園
-          piste: 滑雪場
           quarry: 採石場
           railway: 鐵路
           recreation_ground: 遊樂場
@@ -619,8 +598,6 @@ zh-TW:
           road: 道路用地
           village_green: 鄉村草地
           vineyard: 葡萄園
-          wetland: 濕地
-          wood: 樹林
         leisure:
           beach_resort: 海灘度假村
           bird_hide: 鳥類觀察站
@@ -655,11 +632,9 @@ zh-TW:
           beach: 海灘
           cape: 海角
           cave_entrance: 洞穴入口
-          channel: 海峽
           cliff: 峭壁
           crater: 火山口
           dune: 沙丘
-          feature: 特徵
           fell: 高原荒地
           fjord: 峽灣
           forest: 森林
@@ -676,11 +651,9 @@ zh-TW:
           point: 點
           reef: 礁
           ridge: 山脊
-          river: 河
           rock: 岩石
           scree: 岩屑堆
           scrub: 灌木
-          shoal: 暗沙
           spring: 泉
           stone: 石
           strait: 海峡
@@ -689,7 +662,6 @@ zh-TW:
           volcano: 火山
           water: 水
           wetland: 濕地
-          wetlands: 濕地
           wood: 樹林
         office:
           accountant: 會計師事務所
@@ -754,9 +726,6 @@ zh-TW:
           switch: 道岔
           tram: 電車軌道
           tram_stop: 電車站
-          yard: 鐵路站場
-        route:
-          bus: 公車路線
         shop:
           alcohol: 無許可證
           antiques: 古玩店
@@ -845,12 +814,10 @@ zh-TW:
           hostel: 旅舍
           hotel: 酒店
           information: 資訊
-          lean_to: 棚屋
           motel: 汽車旅館
           museum: 博物館
           picnic_site: 野餐地
           theme_park: 主題公園
-          valley: 山谷
           viewpoint: 觀景點
           zoo: 動物園
         tunnel:
@@ -860,7 +827,6 @@ zh-TW:
           artificial: 人工航道
           boatyard: 船塢
           canal: 運河
-          connector: 水路連接器
           dam: 水壩
           derelict_canal: 廢棄運河
           ditch: 溝
@@ -868,15 +834,12 @@ zh-TW:
           drain: 渠
           lock: 鎖
           lock_gate: 船閘
-          mineral_spring: 礦泉
           mooring: 繫泊設備
           rapids: 急流
           river: 河流
-          riverbank: 河岸
           stream: 小溪
           wadi: 乾河
           waterfall: 瀑布
-          water_point: 取水處
           weir: 堰
       admin_levels:
         level2: 國界