From: translatewiki.net <l10n-bot@translatewiki.net>
Date: Thu, 27 Aug 2020 13:56:58 +0000 (+0200)
Subject: Localisation updates from https://translatewiki.net.
X-Git-Tag: live~1966
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e2892ecae75ac7706a3d9d52aeef0bd534f74a60

Localisation updates from https://translatewiki.net.
---

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 2543f4b19..63a5009d8 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -710,6 +710,7 @@ da:
           roofer: Taglægger
           sawmill: Savværk
           shoemaker: Skomager
+          stonemason: Stenhugger
           tailor: Skrædder
           window_construction: Vinduessnedker
           winery: Vingård
diff --git a/config/locales/de.yml b/config/locales/de.yml
index bef6160fb..6507d1d60 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -27,6 +27,7 @@
 # Author: GerdP
 # Author: Gravitystorm
 # Author: Grille chompa
+# Author: Günther03
 # Author: Hakuchi
 # Author: Hendrik-17
 # Author: Hikemaniac
@@ -79,7 +80,7 @@ de:
       friendly: '%e. %B %Y um %H:%M Uhr'
   helpers:
     file:
-      prompt: Datei wählen
+      prompt: Datei auswählen
     submit:
       diary_comment:
         create: Speichern
diff --git a/config/locales/el.yml b/config/locales/el.yml
index c6e4230d1..6c0069512 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -53,7 +53,7 @@ el:
         create: Αποστολή
       client_application:
         create: Εγγραφή
-        update: Επεξεργασία
+        update: Ενημέρωση
       redaction:
         create: Δημιουργία παράλειψης
         update: Αποθήκευση παράλειψης
@@ -106,6 +106,7 @@ el:
       way_tag: Ετικέτα διαδρομής
     attributes:
       client_application:
+        name: Όνομα (Υποχρεωτικό)
         callback_url: URL Επανάκλησης
         support_url: URL Υποστήριξης
       diary_comment:
@@ -643,10 +644,12 @@ el:
           public: Δημόσιο κτήριο
           residential: Πολυκατοικία
           school: Σχολικό Κτήριο
-          train_station: Σιδηροδρομικός Σταθμός
+          train_station: Κτίριο Σιδηροδρομικού Σταθμού
           university: Κτήριο Πανεπιστημίου
+          warehouse: Αποθήκη
           "yes": Κτίριο
         craft:
+          blacksmith: Σιδηρουργός
           brewery: Ζυθοποιείο
           carpenter: Ξυλουργός
           electrician: Ηλεκτρολόγος
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 465eb1e80..722c4d1fc 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -50,7 +50,7 @@ en-GB:
         create: Send
       client_application:
         create: Register
-        update: Edit
+        update: Update
       redaction:
         create: Create redaction
         update: Save redaction
@@ -117,15 +117,15 @@ en-GB:
       trace:
         user: User
         visible: Visible
-        name: Name
+        name: Filename
         size: Size
         latitude: Latitude
         longitude: Longitude
         public: Public
         description: Description
-        gpx_file: 'Upload GPX File:'
-        visibility: 'Visibility:'
-        tagstring: 'Tags:'
+        gpx_file: Upload GPX File
+        visibility: Visibility
+        tagstring: Tags
       message:
         sender: Sender
         title: Subject
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 55cc79b17..c1ae34b36 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -519,7 +519,7 @@ fr:
       location: 'Lieu :'
       view: Afficher
       edit: Modifier
-      coordinates: '%{latitude} ; %{longitude}'
+      coordinates: '%{latitude} ; %{longitude}'
     feed:
       user:
         title: Entrées du journal OpenStreetMap de %{user}
@@ -794,8 +794,13 @@ fr:
           ambulance_station: Dépôt d’ambulances
           assembly_point: Point de rassemblement
           defibrillator: Défibrillateur
+          fire_xtinguisher: Extincteur
+          fire_water_pond: Prise d’eau pompier
           landing_site: Terrain d’atterrissage d’urgence
+          life_ring: Bouée de sauvetage d’urgence
           phone: Borne d’appel d’urgence
+          siren: Sirène d’urgence
+          suction_point: Point d’aspiration d’urgence
           water_tank: Citerne d’eau d’urgence
           "yes": Urgence
         highway:
@@ -808,6 +813,7 @@ fr:
           cycleway: Piste cyclable
           elevator: Ascenseur
           emergency_access_point: Point d’accès d’urgence
+          emergency_bay: Zone de secours
           footway: Chemin piéton
           ford: Gué
           give_way: Panneau « Cédez le passage »
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 62a64c430..ca8a96a2f 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -57,6 +57,8 @@ it:
     formats:
       friendly: '%e %B %Y alle %H:%M'
   helpers:
+    file:
+      prompt: Scegli file
     submit:
       diary_comment:
         create: Salva
@@ -124,6 +126,7 @@ it:
     attributes:
       client_application:
         name: Nome (obbligatorio)
+        url: URL principale dell'applicazione (obbligatorio)
         callback_url: URL di richiamata
         support_url: Indirizzo URL di supporto
         allow_read_prefs: leggi le sue preferenze utente
@@ -582,6 +585,7 @@ it:
           clock: Orologio
           college: Accademia
           community_centre: Centro civico
+          conference_centre: Centro conferenze
           courthouse: Tribunale
           crematorium: Crematorio
           dentist: Dentista
@@ -602,10 +606,12 @@ it:
           hunting_stand: Postazione di caccia
           ice_cream: Gelateria
           kindergarten: Asilo infantile
+          language_school: Scuola di lingue
           library: Biblioteca
           marketplace: Mercato
           monastery: Monastero
           motorcycle_parking: Parcheggio per Moto
+          music_school: Scuola di musica
           nightclub: Night Club
           nursing_home: Residenza sanitaria assistenziale
           parking: Parcheggio
@@ -619,6 +625,7 @@ it:
           prison: Prigione
           pub: Pub
           public_building: Edificio pubblico
+          ranger_station: Stazione dei ranger
           recycling: Punto riciclaggio rifiuti
           restaurant: Ristorante
           school: Scuola
@@ -634,6 +641,7 @@ it:
           toilets: Bagni pubblici
           townhall: Municipio
           university: Università
+          vehicle_inspection: Ispezione dei veicoli
           vending_machine: Distributore automatico
           veterinary: Veterinario
           village_hall: Municipio
@@ -645,6 +653,7 @@ it:
           census: Limite di censimento
           national_park: Parco nazionale
           protected_area: Area protetta
+          "yes": Confine
         bridge:
           aqueduct: Acquedotto
           boardwalk: Passerella
@@ -653,13 +662,18 @@ it:
           viaduct: Viadotto
           "yes": Ponte
         building:
+          apartment: Appartamenti
           apartments: Appartamenti
           chapel: Cappella
           church: Chiesa
           commercial: Uffici
+          construction: Edificio in costruzione
           dormitory: Dormitorio
           farm: Fattoria
           garage: Autorimessa
+          garages: Garage
+          greenhouse: Serra
+          hangar: Hangar
           hospital: Ospedale
           hotel: Albergo
           house: Casa
@@ -668,16 +682,25 @@ it:
           public: Edificio pubblico
           residential: Edificio residenziale
           retail: Edificio commerciale
+          roof: Tettoia
+          ruins: Edificio in rovina
           school: Edificio scolastico
+          stable: Stalle
+          temple: Edificio di un tempio
           terrace: Terrazza
           train_station: Stazione ferroviaria
           university: Sede universitaria
           "yes": Edificio
         craft:
+          beekeper: Apicoltore
+          blacksmith: Fabbro
           brewery: Birrificio
           carpenter: Carpentiere
           electrician: Elettricista
+          electronics_repair: Riparatore elettronico
           gardener: Giardiniere
+          glaziery: Vetraio
+          handicraft: Artigianato
           painter: Pittore
           photographer: Fotografo
           plumber: Idraulico
@@ -688,8 +711,10 @@ it:
           ambulance_station: Stazione delle ambulanze
           assembly_point: Punto di ritrovo
           defibrillator: Defibrillatore
+          fire_xtinguisher: Estintore
           landing_site: Luogo per l'atterraggio di emergenza
           phone: Telefono di emergenza
+          siren: Sirena di emergenza
           water_tank: Serbatoio d'acqua di emergenza
           "yes": Emergenza
         highway:
@@ -732,6 +757,7 @@ it:
           tertiary: Strada terziaria
           tertiary_link: Strada terziaria
           track: Strada forestale o agricola
+          traffic_mirror: Specchio parabolico
           traffic_signals: Semaforo
           trunk: Superstrada
           trunk_link: Superstrada
@@ -739,11 +765,14 @@ it:
           unclassified: Strada non classificata
           "yes": Strada
         historic:
+          aircraft: Aereo storico
           archaeological_site: Sito archeologico
+          bomb_crater: Cratere storico
           battlefield: Campo di battaglia
           boundary_stone: Pietra confinaria
           building: Edificio storico
           bunker: Bunker
+          cannon: Cannone storico
           castle: Castello
           church: Chiesa
           city_gate: Porta della città
@@ -761,6 +790,7 @@ it:
           stone: Pietra
           tomb: Tomba
           tower: Torre
+          wayside_chapel: Cappella votiva
           wayside_cross: Croce
           wayside_shrine: Edicola votiva
           wreck: Relitto
@@ -801,6 +831,7 @@ it:
         leisure:
           beach_resort: Stabilimento balneare
           bird_hide: Osservatorio Camuffato
+          bleachers: Gradinata
           common: Area comune
           dog_park: Parco per cani
           firepit: Braciere
@@ -815,6 +846,7 @@ it:
           miniature_golf: Minigolf
           nature_reserve: Riserva naturale
           park: Parco
+          picnic_table: Tavolo da picnic
           pitch: Campo sportivo
           playground: Parco giochi
           recreation_ground: Area di svago
@@ -829,13 +861,17 @@ it:
           "yes": Tempo libero
         man_made:
           adit: Galleria mineraria
+          advertising: Pubblicità
+          antenna: Antenna
           beacon: Fanale
           beehive: Alveare
           breakwater: Frangiflutti
           bridge: Ponte
           bunker_silo: Bunker
           chimney: Ciminiera
+          communications_tower: Torre per telecomunicazioni
           crane: Gru
+          cross: Croce
           dolphin: Briccola
           dyke: Argine
           embankment: Terrapieno
@@ -844,6 +880,7 @@ it:
           groyne: Pennello
           kiln: Fornace
           lighthouse: Faro
+          manhole: Chiusino
           mast: Pilone
           mine: Miniera
           mineshaft: Pozzo minerario
@@ -851,12 +888,16 @@ it:
           petroleum_well: Pozzo petrolifero
           pier: Molo
           pipeline: Tubazione
+          pumping_station: Stazione di pompaggio
           silo: Silo
           storage_tank: Cisterna di stoccaggio
+          street_cabinet: Armadio stradale
           surveillance: Sorveglianza
+          telescope: Telescopio
           tower: Torre
           wastewater_plant: Impianto di depurazione delle acque
           watermill: Mulino ad acqua
+          water_tap: Rubinetto dell'acqua
           water_tower: Torre dell'acqua
           water_well: Pozzo
           water_works: Impianto idrico
@@ -912,9 +953,11 @@ it:
         office:
           accountant: Ragioniere
           administrative: Amministrazione
+          advertising_agency: Agenzia pubblicitaria
           architect: Architetto
           association: Associazione
           company: Azienda
+          diplomatic: Ufficio diplomatico
           educational_institution: Istituto d'istruzione
           employment_agency: Agenzia di lavoro
           estate_agent: Agente immobiliare
@@ -923,6 +966,7 @@ it:
           it: Ufficio IT
           lawyer: Avvocato
           ngo: Ufficio di una ONG (Organizzazione Non Governativa)
+          notary: Notaio
           telecommunication: Ufficio di telecomunicazioni
           travel_agent: Agenzia di viaggi
           "yes": Ufficio
@@ -978,10 +1022,13 @@ it:
           tram_stop: Fermata del tram
           yard: Zona di manovra ferroviaria
         shop:
+          agrarian: Negozio di agraria
           alcohol: Alcolici
           antiques: Antiquario
           art: Negozio d'arte
+          bag: Negozio di borse
           bakery: Panetteria
+          bathroom_furnishing: Arredamento bagno
           beauty: Prodotti cosmetici
           beverages: Negozio bevande
           bicycle: Negozio biciclette
@@ -994,24 +1041,32 @@ it:
           car_repair: Autofficina
           carpet: Tappeti
           charity: Negozio solidale
+          cheese: Negozio di formaggi
           chemist: Farmacia
           clothes: Negozio di abbigliamento
+          coffee: Negozio di caffè
           computer: Negozio di computer
           confectionery: Negozio di dolciumi
           convenience: Minimarket
           copyshop: Copisteria
           cosmetics: Negozio cosmetici
+          dairy: Latteria
           deli: Specialità gastronomiche
           department_store: Grande magazzino
           discount: Discount
           doityourself: Fai da-te
           dry_cleaning: Lavasecco
+          e-cigarette: Negozio di sigarette elettroniche
           electronics: Elettronica
+          erotic: Sexy shop
           estate_agent: Agenzia immobiliare
+          fabric: Negozio di tessuti
           farm: Negozio di fattoria
           fashion: Negozio moda
+          fishing: Negozio per la pesca
           florist: Fioraio
           food: Alimentari
+          frame: Negozio di cornici
           funeral_directors: Agenzia funebre
           furniture: Arredamenti
           garden_centre: Centro giardinaggio
@@ -1021,8 +1076,10 @@ it:
           grocery: Fruttivendolo
           hairdresser: Parrucchiere
           hardware: Ferramenta
+          herbalist: Erboristeria
           hifi: Hi-Fi
           houseware: Negozio di casalinghi
+          ice_cream: Negozio di gelati
           interior_decoration: Decorazione d'interni
           jewelry: Gioielleria
           kiosk: Edicola
@@ -1031,24 +1088,34 @@ it:
           lottery: Lotteria
           mall: Centro commerciale
           massage: Massaggio
+          medical_supply: Negozio di articoli sanitari
           mobile_phone: Centro telefonia mobile
           motorcycle: Concessionario di motociclette
+          motorcycle_repair: Riparatore di moto
           music: Articoli musicali
+          musical_instrument: Strumenti musicali
           newsagent: Giornalaio
+          nutrition_supplements: Integratori alimentari
           optician: Ottico
           organic: Negozio di prodotti naturali ed ecologici
           outdoor: Negozio di articoli per sport all'aperto
           paint: Negozio di vernici
+          pastry: Pasticceria
           pawnbroker: Banco dei pegni
+          perfumery: Profumeria
           pet: Negozio animali
+          pet_grooming: Toilettatura animali
           photo: Articoli fotografici
           seafood: Frutti di mare
           second_hand: Negozio oggetti usati
+          sewing: Merceria
           shoes: Negozio di calzature
           sports: Articoli sportivi
           stationery: Cartoleria
           supermarket: Supermercato
           tailor: Sarto
+          tattoo: Centro tatuaggi
+          tea: Negozio di tè
           ticket: Biglietteria
           tobacco: Tabaccheria
           toys: Negozio di giocattoli
@@ -1057,6 +1124,7 @@ it:
           vacant: Spazio commerciale libero
           variety_store: Negozio a prezzi fissi
           video: Videoteca
+          video_games: Negozio di videogiochi
           wine: Negozio di vini
           "yes": Negozio
         tourism:
@@ -1066,6 +1134,7 @@ it:
           attraction: Attrazione turistica
           bed_and_breakfast: Bed and Breakfast
           cabin: Cabina
+          camp_pitch: Piazzola campeggio
           camp_site: Campeggio
           caravan_site: Area caravan e camper
           chalet: Casetta (chalet)
@@ -1079,6 +1148,7 @@ it:
           picnic_site: Area picnic
           theme_park: Parco divertimenti
           viewpoint: Punto panoramico
+          wilderness_hut: Bivacco
           zoo: Zoo
         tunnel:
           building_passage: Passaggio sotto edificio
@@ -1964,6 +2034,7 @@ it:
           aspettare il completamento prima di caricarne altri, per non bloccare la
           lista di attesa ad altri utenti.
     edit:
+      cancel: Annulla
       title: Modifica al tracciato %{name}
       heading: Modifica al tracciato %{name}
       visibility_help: che cosa significa questo?
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 153220d89..741795ffe 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -26,7 +26,7 @@ lb:
         create: Schécken
       client_application:
         create: Registréieren
-        update: Änneren
+        update: Aktualiséieren
       trace:
         create: Eroplueden
         update: Ännerunge späicheren
@@ -52,6 +52,9 @@ lb:
       user_preference: Benotzerastellung
       way: Wee
     attributes:
+      client_application:
+        name: Numm (Obligatoresch)
+        allow_write_api: d'Kaart änneren
       diary_entry:
         user: Benotzer
         title: Sujet
@@ -324,6 +327,7 @@ lb:
           bench: Bänk
           bicycle_parking: Vëlos-Parking
           bicycle_rental: Locatioun vu Vëloen
+          bicycle_repair_station: Vëlosatelier
           biergarten: Béiergaard
           brothel: Bordell
           bureau_de_change: Wiesselbüro
@@ -401,6 +405,7 @@ lb:
           farm: Bauerenhaff
           garages: Garagen
           greenhouse: Zär
+          hangar: Hangar
           hotel: Hotelgebai
           house: Haus
           houseboat: Hausboot
@@ -410,7 +415,8 @@ lb:
           shed: Schapp
           stable: Stall
           terrace: Terrasse
-          train_station: Gare (Eisebunn)
+          train_station: Gebai vun der Gare (Eisebunn)
+          warehouse: Lager
           "yes": Gebai
         club:
           sport: Sportsclub
@@ -420,6 +426,7 @@ lb:
           carpenter: Zammermann
           electrician: Elektriker
           gardener: Gäertner
+          handicraft: Handwierk
           painter: Usträicher
           photographer: Fotograf
           shoemaker: Schouster
@@ -481,6 +488,7 @@ lb:
         junction:
           "yes": Kräizung
         landuse:
+          aquaculture: Aquakultur
           cemetery: Kierfecht
           construction: Chantier
           farm: Bauerenhaff
@@ -638,6 +646,7 @@ lb:
           hairdresser: Coiffeur
           hardware: Quincaillerie
           hearing_aids: Hörapparat
+          ice_cream: Glacëbuttek
           jewelry: Bijouterie
           laundry: Botzerei
           lottery: Lotterie
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 3c4ac1bc9..fc7eb7863 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -7,6 +7,7 @@
 # Author: Eitvys200
 # Author: Empers
 # Author: Garas
+# Author: Kris2paz
 # Author: Macofe
 # Author: Mantak111
 # Author: Manvydasz
@@ -24,6 +25,8 @@ lt:
     formats:
       friendly: '%Y m. %B %e d., %H:%M'
   helpers:
+    file:
+      prompt: Pasirinkti failą
     submit:
       diary_comment:
         create: Įrašyti
@@ -36,7 +39,7 @@ lt:
         create: Siųsti
       client_application:
         create: Registruotis
-        update: Keisti
+        update: Atnaujinti
       redaction:
         create: Kurti redakciją
         update: Išsaugoti redakciją
@@ -76,6 +79,7 @@ lt:
       relation: Ryšys
       relation_member: Ryšio narys
       relation_tag: Ryšio žyma
+      report: Pranešti
       session: Sesija
       trace: Pėdsakas
       tracepoint: Pėdsako taškas
@@ -88,8 +92,16 @@ lt:
       way_tag: Kelio žyma
     attributes:
       client_application:
+        name: Vardas (Privalomas)
+        url: Pagrindinis aplikacijos URL (Privalomas)
         callback_url: Atgalinio ryšio nuoroda
         support_url: Palaikymo URL
+        allow_read_prefs: peržiūrėti jų naudotojo nustatymus
+        allow_write_prefs: redaguoti jų naudotojo nustatymus
+        allow_write_api: redaguoti žemėlapį
+        allow_read_gpx: peržiūrėti jų privačius GPS pėdsakus
+        allow_write_gpx: įkelti GPS pėdsakus
+        allow_write_notes: redaguoti užrašus
       diary_comment:
         body: Tekstas
       diary_entry:
@@ -104,21 +116,22 @@ lt:
       trace:
         user: Naudotojas
         visible: Matomas
-        name: Vardas
+        name: Failo vardas
         size: Dydis
         latitude: Platuma
         longitude: Ilguma
         public: Viešas
         description: Aprašymas
-        gpx_file: 'Įkelti GPX failą:'
-        visibility: 'Matomumas:'
-        tagstring: 'Žymos:'
+        gpx_file: Įkelti GPX failą
+        visibility: Matomumas
+        tagstring: Žymos
       message:
         sender: Siuntėjas
         title: Antraštė
         body: Tekstas
         recipient: Gavėjas
       report:
+        category: Pasirinkti pranešimo priežastį
         details: Prašoma pateikti daugiau informacijos apie problemą (privaloma).
       user:
         email: El. paštas
@@ -185,6 +198,7 @@ lt:
       description: nuotolinį valdymą (JOSM arba Merkaartor)
   auth:
     providers:
+      none: Nei vienas
       openid: OpenID
       google: Google
       facebook: Facebook
@@ -420,7 +434,7 @@ lt:
     diary_entry:
       posted_by_html: Parašė %{link_user}, laikas %{created}, kalba %{language_link}
       comment_link: Komentuoti šį įrašą
-      reply_link: Atsakyti į šį įrašą
+      reply_link: Siųsti žinutę autoriui
       comment_count:
         one: '%{count} komentaras'
         zero: Nėra komentarų
@@ -487,6 +501,7 @@ lt:
           chair_lift: Keltuvas
           drag_lift: Velkamas keltuvas
           gondola: Gondola
+          pylon: Stulpas
           station: Lyno stotis
         aeroway:
           aerodrome: Aerodromas
@@ -508,7 +523,9 @@ lt:
           bench: Suoliukas
           bicycle_parking: Dviračių stovėjimo aikštelė
           bicycle_rental: Dviračių nuoma
+          bicycle_repair_station: Dviračių Taisykla
           biergarten: Lauko baras
+          blood_bank: Kraujo Bankas
           boat_rental: Valčių nuoma
           brothel: Viešieji namai
           bureau_de_change: Valiutos keitimo punktas
@@ -525,6 +542,7 @@ lt:
           clock: Laikrodis
           college: Koledžas
           community_centre: Bendruomenės centras
+          conference_centre: Konferencijų Centras
           courthouse: Teismo pastatas
           crematorium: Krematoriumas
           dentist: Dantistas
@@ -544,11 +562,16 @@ lt:
           hospital: Ligoninė
           hunting_stand: Medžiotojų bokštelis
           ice_cream: Ledai
+          internet_cafe: Kavinė su Interneto prieiga
           kindergarten: Vaikų darželis
+          language_school: Kalbų mokykla
           library: Biblioteka
+          love_hotel: Meilės Viešbutis
           marketplace: Turgavietė
           monastery: Vienuolynas
+          money_transfer: Pinigų Perkėlimas
           motorcycle_parking: Motociklų stovėjimo aikštelė
+          music_school: Muzikos Mokykla
           nightclub: Naktinis klubas
           nursing_home: Slaugos namai
           parking: Stovėjimo aikštelė
@@ -561,6 +584,7 @@ lt:
           post_office: Paštas
           prison: Kalėjimas
           pub: Aludė
+          public_bath: Vieša Pirtis
           public_building: Visuomeninis pastatas
           recycling: Perdirbimo punktas
           restaurant: Restoranas
@@ -577,11 +601,13 @@ lt:
           toilets: Tualetas
           townhall: Rotušė
           university: Universitetas
+          vehicle_inspection: Automobilių Apžiūra
           vending_machine: Vendingas
           veterinary: Veterinarijos chirurgija
           village_hall: Nedidelio miestelio valdžios būstinė
           waste_basket: Atliekų krepšelis
           waste_disposal: Atliekų šalinimas
+          water_point: Vandens Punktas
         boundary:
           administrative: Administracinė riba
           census: Gyventojų surašymo teritorijos riba
@@ -594,24 +620,31 @@ lt:
           viaduct: Viadukas
           "yes": Tiltas
         building:
-          apartments: Gyvenamasis kvartalas
+          apartment: Apartamentas
+          apartments: Apartamentai
+          barn: Tvartas
           chapel: Koplyčia
-          church: Bažnyčia
+          church: Bažnyčios Pastatas
+          college: Koledžo Pastatas
           commercial: Komercinės paskirties pastatas
           dormitory: Bendrabutis
-          farm: Ūkio pastatas
+          farm: Ūkinis Namas
           garage: Garažas
+          garages: Garažai
+          greenhouse: Å iltnamis
+          hangar: Angaras
           hospital: Ligoninės pastatas
-          hotel: Viešbutis
+          hotel: Viešbučio Pastatas
           house: Namas
           industrial: Pramoninis pastatas
+          kindergarten: Darželio Pastatas
           office: Biurų pastatas
           public: Visuomeninis pastatas
           residential: Gyvenamasis pastatas
           retail: Mažmeninės prekybos pastatas
           school: Mokyklos pastatas
-          terrace: Terasa
-          train_station: Geležinkelio stotis
+          terrace: Terasos Pastatas
+          train_station: Traukinių Stoties Pastatas
           university: Universiteto pastatas
           "yes": Pastatas
         craft:
@@ -975,7 +1008,7 @@ lt:
           "yes": Parduotuvė
         tourism:
           alpine_hut: Kalnų trobelė
-          apartment: Apartamentai
+          apartment: Poilsio Apartamentai
           artwork: Meno dirbiniai
           attraction: Lankytina vieta
           bed_and_breakfast: Nakvynės namai (viešbutis)
@@ -1186,13 +1219,13 @@ lt:
       hi: Sveiki, %{to_user},
       header: '%{from_user} pakomentavo jūsų OpenStreetMap dienoraščio įrašą su tema
         %{subject}:'
-      footer: Taip pat galite perskaityti komentarą adresu %{readurl}, komentuoti
-        galite adresu %{commenturl}, o atsakyti - adresu %{replyurl}
+      footer: Taip pat galite perskaityti komentarą adresu %{readurl} ir komentuoti
+        galite adresu %{commenturl} arba nusiųsti žinutę autoriui adresu %{replyurl}
     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}
+      footer_html: Pranešimą galite skaityti čia %{readurl}, o nusiųsti žinutę autoriui
+        galite čia %{replyurl}
     friendship_notification:
       hi: Labas, %{to_user},
       subject: '[OpenStreetMap] %{user} prisidėjo jus kaip draugą'
@@ -1212,7 +1245,9 @@ lt:
         more_info_2: 'galima rasti čia:'
       success:
         subject: '[OpenStreetMap] Sėkmingai įkeltas pėdsakas (GPX)'
-        loaded_successfully: sėkminga įkelta su %{trace_points} taškų iš galimų %{possible_points}.
+        loaded_successfully: '{{PLURAL|one=sėkmingai įkelta su %{trace_points} iš
+          galimo 1 taško.|sėkmingai įkelta su %{trace_points} iš galimų %{possible_points}
+          taškų.'
     signup_confirm:
       subject: '[OpenStreetMap] Sveiki atvykę į OpenStreetMap'
       greeting: Sveiki!
@@ -1280,8 +1315,8 @@ lt:
         subject_other: '[OpenStreetMap] %{commenter} pakomentavo vieną iš jus dominančių
           pakeitimų'
         your_changeset: '%{commenter} %{time} pakomentavo vieną iš jūsų pakeitimų'
-        commented_changeset: '%{commenter} pakomentavo jūsų stebimą žemėlapio pakeitimą,
-          sukurtą %{changeset_author} %{time}'
+        commented_changeset: '%{commenter} paliko komentarą %{time} prie jūsų stebimo
+          pakeitimo sukurto %{changeset_author}'
         partial_changeset_with_comment: su komentaru '%{changeset_comment}'
         partial_changeset_without_comment: be komentaro
       details: Daugiau informacijos apie pakeitimą rasite čia %{url}.
@@ -1366,8 +1401,8 @@ lt:
     about:
       next: Kitas
       copyright_html: <span>&copy;</span>OpenStreetMap<br>talkininkai
-      used_by_html: '%{name} duomenis naudoja šimtai svetainių, mobilių aplikacijų
-        ir įrenginių'
+      used_by_html: '%{name} pateikia žemėlapio duomenis tūkstančiams puslapių, mobilių
+        aplikacijų ir techninės įrangos į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
@@ -1391,13 +1426,9 @@ lt:
       legal_1_html: "Šis puslapis ir daugelis kitų susijusių paslaugų yra formaliai
         valdomi \n<a href='https://osmfoundation.org/'>OpenStreetMap fondo</a> (OSMF)
         \nbendruomenės vardu. Visų OSMF valdomų paslaugų naudojimas turi <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">naudojimo
-        sąlygas</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\npriimtino
+        sąlygas</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nPriimtino
         naudojimo politiką</a> ir mūsų <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">privatumo
-        politiką</a>.\n<br> \n<a href='https://osmfoundation.org/Contact'>Susisiekite
-        su OSMF</a>, \njei turite licencijavimo, autoriaus teisių ar kitų teisinių
-        klausimų ar problemų.\n<br>\nOpenStreetMap, lupos logo ir State of the Map
-        yra <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">registruoti
-        OSMF prekių ženklai</a>."
+        politiką</a>."
       partners_title: Partneriai
     copyright:
       foreign:
@@ -1751,7 +1782,7 @@ lt:
       edit: Redaguoti
       preview: Peržiūra
     markdown_help:
-      title_html: IÅ¡analizuota su <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: IÅ¡analizuota su <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
       headings: Antraštės
       heading: Antraštė
       subheading: Paantraštė
@@ -1874,7 +1905,7 @@ lt:
       newer: Naujesni pėdsakai
     trace:
       pending: LAUKIAMA
-      count_points: '%{count} taškai(-ų)'
+      count_points: '{{PLURAL|one=1 taškas|%{count} taškai(-ų)'
       more: daugiau
       trace_details: Žiūrėti pėdsako detales
       view_map: Žemėlapis
@@ -2115,8 +2146,7 @@ lt:
       contributor_terms_explain: Ši sutartis valdo jūsų dabartinį ir būsimą indėlį.
       read_ct: Aš perskaičiau ir sutinku su aukščiau pateiktomis talkininko sąlygomis
       read_tou: Aš perskaičiau ir sutinku su naudojimo sąlygomis
-      consider_pd: Be pirmiau minėto susitarimo, manau, kad mano indėlis būtų viešo
-        naudojimo
+      consider_pd: Be pirmiau paminėtų, laikau, kad mano indėlis būtų Viešo Naudojimo
       consider_pd_why: kas tai?
       guidance_html: 'Informacija, kuri padėti suprasti šias sąlygas: <a href="%{summary}">Paprasto
         stiliaus aprašymas</a> ir keletas <a href="%{translations}">neoficialių vertimų</a>'
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index a8fe550a3..918094e43 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -23,6 +23,8 @@ ro:
       friendly: '%e %B %Y la %H:%M'
       blog: '%e %B %Y'
   helpers:
+    file:
+      prompt: Selectează fişier
     submit:
       diary_comment:
         create: Salvează
@@ -35,7 +37,7 @@ ro:
         create: Trimite
       client_application:
         create: Înregistrează
-        update: Editează
+        update: Actualizează
       redaction:
         create: Creați redacție
         update: Salvați redacția
@@ -88,8 +90,17 @@ ro:
       way_tag: Etichetă cale
     attributes:
       client_application:
+        name: Nume (Obligatoriu)
+        url: URL-ul principal al aplicației (Obligatoriu)
         callback_url: Adresă URL cu inversare
         support_url: Suport URL
+        allow_read_prefs: citiți preferințele utilizatorului
+        allow_write_prefs: modifică preferințele utilizatorului
+        allow_write_diary: creați intrări în jurnal, comentarii și faceți prieteni
+        allow_write_api: modifică harta
+        allow_read_gpx: citiți traseele GPS private
+        allow_write_gpx: încărcați urma GPS
+        allow_write_notes: modificați notele
       diary_comment:
         body: Textul mesajului
       diary_entry:
@@ -104,21 +115,22 @@ ro:
       trace:
         user: Utilizator
         visible: Vizibil
-        name: Nume
+        name: Nume fișier
         size: Dimensiune
         latitude: Latitudine
         longitude: Longitudine
         public: Public
         description: Descriere
-        gpx_file: 'Încărcați fișier GPX:'
-        visibility: 'Vizibilitate:'
-        tagstring: 'Etichete:'
+        gpx_file: Încărcați fișier GPX
+        visibility: Vizibilitate
+        tagstring: Etichete
       message:
         sender: Expeditor
         title: Subiect
         body: Textul mesajului
         recipient: Destinatar
       report:
+        category: Selectați un motiv pentru raportul dvs
         details: Vă rugăm să furnizați mai multe detalii despre problemă (necesar).
       user:
         email: E-mail
@@ -236,6 +248,8 @@ ro:
     view_history: Vezi istoric
     view_details: Vezi detalii
     location: 'Amplasament:'
+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 'Set de modificări: %{id}'
       belongs_to: Autor
@@ -339,6 +353,7 @@ ro:
       reopened_by_anonymous: Reactivat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: Ascunsă de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Raportează această notă
+      coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Interogări ale funcțiilor
       introduction: Dați clic pe hartă pentru a găsi obiectivele din apropiere.
@@ -428,7 +443,7 @@ ro:
     diary_entry:
       posted_by_html: Postat de către %{link_user} pe %{created} în %{language_link}
       comment_link: Comentează la această înregistrare
-      reply_link: Răspunde la această înregistrare
+      reply_link: Trimite un mesaj autorului
       comment_count:
         zero: Niciun comentariu
         one: '%{count} comentariu'
@@ -448,6 +463,7 @@ ro:
       location: 'Localizare:'
       view: Vizualizează
       edit: Modifică
+      coordinates: '%{latitude}; %{longitude}'
     feed:
       user:
         title: Înregistrări în jurnalul OpenStreetMap pentru %{user}
@@ -498,10 +514,12 @@ ro:
           chair_lift: Telescaun
           drag_lift: Teleschiu
           gondola: Telecabină
+          magic_carpet: Tele Covorul Magic
           platter: Platter Lift
           pylon: Pilon
           station: Stație de antenă
           t-bar: Teleschi
+          "yes": Cale aeriană
         aeroway:
           aerodrome: Aerodrom
           airstrip: Pistă de aterizare
@@ -510,11 +528,15 @@ ro:
           hangar: Hangar
           helipad: Helipad
           holding_position: Păstrează poziția
+          navigationaid: Ajutor de navigație aeriană
           parking_position: Poziția de parcare
           runway: Pistă
+          taxilane: Banda de taxi
           taxiway: Pistă de manevră
           terminal: Terminal
+          windsock: Con de vânt
         amenity:
+          animal_boarding: Îmbarcarea animalelor
           animal_shelter: Adăpost de animale
           arts_centre: Centru de arte
           atm: Bancomat
@@ -524,7 +546,9 @@ ro:
           bench: Bancă
           bicycle_parking: Parcare de biciclete
           bicycle_rental: Închiriere de biciclete
+          bicycle_repair_station: Stația de reparare a bicicletelor
           biergarten: Braserie în aer liber
+          blood_bank: Banca de sânge
           boat_rental: Închiriere de bărci
           brothel: Bordel
           bureau_de_change: Casă de schimb valutar
@@ -541,6 +565,7 @@ ro:
           clock: Ceas
           college: Colegiu
           community_centre: Centru comunitar
+          conference_centre: Centru de conferințe
           courthouse: Tribunal
           crematorium: Crematoriu
           dentist: Dentist
@@ -548,6 +573,7 @@ ro:
           drinking_water: Cișmea
           driving_school: Școală de șoferi
           embassy: Ambasadă
+          events_venue: Sală de evenimente
           fast_food: Fast-food
           ferry_terminal: Terminal pentru feriboturi
           fire_station: Stație de pompieri
@@ -560,16 +586,24 @@ ro:
           hospital: Spital
           hunting_stand: Stand de vânătoare
           ice_cream: Înghețată
+          internet_cafe: Internet Cafe
           kindergarten: Grădiniță
+          language_school: Școală de limbi
           library: Bibliotecă
+          loading_dock: Doc de încărcare
+          love_hotel: Hotel de dragoste
           marketplace: Piață de mărfuri
+          mobile_money_agent: Agent de bani mobil
           monastery: Mănăstire
+          money_transfer: Transfer de bani
           motorcycle_parking: Parcare pentru motociclete
+          music_school: Şcoală de muzică
           nightclub: Club de noapte
           nursing_home: Azil de bătrâni
           parking: Parcare
           parking_entrance: Intrare în parcare
           parking_space: Spațiu de parcare
+          payment_terminal: Terminal de plăţi
           pharmacy: Farmacie
           place_of_worship: Lăcaș de cult
           police: Poliție
@@ -577,9 +611,13 @@ ro:
           post_office: Oficiu poștal
           prison: Închisoare
           pub: Pub
+          public_bath: Baie publică
+          public_bookcase: Bibliotecă publică
           public_building: Clădire publică
+          ranger_station: Cabană de pădurar
           recycling: Punct de reciclare
           restaurant: Restaurant
+          sanitary_dump_station: Stație de scurgere sanitară
           school: Școală
           shelter: Adăpost
           shower: Duș
@@ -592,18 +630,27 @@ ro:
           theatre: Teatru
           toilets: Toalete
           townhall: Primărie
+          training: Facilitatea de instruire
           university: Universitate
+          vehicle_inspection: Inspecția vehiculului
           vending_machine: Vendomat
           veterinary: Operație veterinară
           village_hall: Primărie comunală
           waste_basket: Coș de gunoi
           waste_disposal: Eliminarea deșeurilor
+          waste_dump_site: Groapă de gunoi
+          watering_place: Loc de irigare
           water_point: Punct de apă
+          weighbridge: Pod basculă
+          "yes": Infrastructură
         boundary:
+          aboriginal_lands: Pământuri aborigene
           administrative: Graniță administrativă
           census: Limită de recensământ
           national_park: Parc național
+          political: Granița electorală
           protected_area: Zonă protejată
+          "yes": Graniţa
         bridge:
           aqueduct: Apeduct
           boardwalk: Promenadă
@@ -612,39 +659,94 @@ ro:
           viaduct: Viaduct
           "yes": Pod
         building:
-          apartments: Bloc de apartamente
+          apartment: Apartment
+          apartments: Apartamente
+          barn: Hambar
+          bungalow: Bungalou
+          cabin: Cabană
           chapel: Capelă
-          church: Biserică
+          church: Clădire de Biserică
+          civic: Clădire Municipală
+          college: Clădirea colegiu
           commercial: Clădire comercială
+          construction: Clădire în construcție
+          detached: Casă decomandată
+          dormitory: Dormitor
+          duplex: Casă duplex
+          farm: Casă fermă
+          farm_auxiliary: Casă fermă auxiliară
           garage: Garaj
+          garages: Garaje
+          greenhouse: Seră
+          hangar: Hangar
           hospital: Clădire de spital
-          hotel: Hotel
+          hotel: Clădire de hotel
           house: Casă
+          houseboat: Casă ambarcaţiune
+          hut: Colibă
           industrial: Clădire industrială
+          kindergarten: Clădirea Grădiniței
+          manufacture: Clădire de Producţie
           office: Clădire de birouri
           public: Clădire publică
           residential: Clădire rezidențială
+          retail: Clădire de vânzare cu amănuntul
+          roof: Acoperiş
+          ruins: Clădire ruină
           school: Clădire școlară
-          terrace: Terasă
+          semidetached_house: Casă semidetaşată
+          service: Clădire de servicii
+          shed: Șură
+          stable: Grajd
+          static_caravan: Rulotă
+          temple: Clădire templu
+          terrace: Case înșiruite
           train_station: Gară
+          university: Clădire de Universitate
+          warehouse: Depozit
           "yes": Clădire
+        club:
+          scout: Sediu Grup de Cercetaşi
+          sport: Club Sportiv
+          "yes": Club
         craft:
+          beekeper: Apicultor
+          blacksmith: Fierar
           brewery: Berărie
           carpenter: Tâmplar
+          caterer: firmă de catering
+          confectionery: Cofetărie
+          dressmaker: Croitoreasă
           electrician: Electrician
+          electronics_repair: Reparații Electronice
           gardener: Grădinar
+          glaziery: Sticlărie
+          handicraft: Tehnici de lucru manual
+          hvac: Fabricant de încălzire, ventilație și aer condiționat
+          metal_construction: Constructor în metal
           painter: Pictor
           photographer: Fotograf
           plumber: Instalator
+          roofer: Constructor de acoperişuri
+          sawmill: Gater
           shoemaker: Cizmar
+          stonemason: Pietrar
           tailor: Croitor
+          window_construction: Construcție ferestre
+          winery: Domeniu viticol
           "yes": Magazin de artizanat
         emergency:
+          access_point: Punct de acces
           ambulance_station: Stație de ambulanță
           assembly_point: Punct de ansamblare
           defibrillator: Defibrilator
+          fire_xtinguisher: Extinctor
+          fire_water_pond: Bazinul cu apă pentru foc
           landing_site: Sit pentru aterizarea de urgență
+          life_ring: Colac de salvare de urgenţă
           phone: Telefon de urgență
+          siren: Sirenă de Urgenţă
+          suction_point: Punct de aspirare de urgenţă
           water_tank: Rezervor de apă de urgență
           "yes": Urgență
         highway:
@@ -657,6 +759,7 @@ ro:
           cycleway: Pistă de biciclete
           elevator: Lift
           emergency_access_point: Punct de acces de urgență
+          emergency_bay: Loc oprire de urgenţă
           footway: Cale pietonală
           ford: Vad
           give_way: Semn de cedează trecerea
@@ -687,35 +790,45 @@ ro:
           tertiary: Drum terțiar
           tertiary_link: Drum terțiar
           track: Drum forestier sau agricol
+          traffic_mirror: Oglindă de trafic
           traffic_signals: Semafor
+          trailhead: Punct pornire traseu
           trunk: Drum strategic
           trunk_link: Drum strategic
           turning_loop: Buclă de întoarcere
           unclassified: Drum neclasificat
           "yes": Drum
         historic:
+          aircraft: Avion istoric
           archaeological_site: Sit arheologic
+          bomb_crater: Crater de bombă istoric
           battlefield: Câmp de luptă
           boundary_stone: Bornă de graniță
           building: Clădire istorică
           bunker: Buncăr
+          cannon: Tun istoric
           castle: Castel
+          charcoal_pile: Gramadă de carbonizare istorică
           church: Biserică
           city_gate: Poarta orașului
           citywalls: Zidurile orașului
           fort: Fort
           heritage: Sit de patrimoniu
+          hollow_way: Drum tranşeu
           house: Casă
           manor: Conac
           memorial: Memorial
+          milestone: Bornă kilometrică istorică
           mine: Mină
           mine_shaft: Puțul minei
           monument: Monument
+          railway: Cale ferată istorică
           roman_road: Drumul roman
           ruins: Ruine
           stone: Piatră
           tomb: Mormânt
           tower: Turn
+          wayside_chapel: Wayside Chapel
           wayside_cross: Troiță
           wayside_shrine: Altar
           wreck: Epavă
@@ -724,6 +837,7 @@ ro:
           "yes": Intersecție
         landuse:
           allotments: Repartizări
+          aquaculture: Acvacultură
           basin: Bazin
           brownfield: Teren brun
           cemetery: Cimitir
@@ -743,6 +857,7 @@ ro:
           military: Zonă militară
           mine: Mină
           orchard: Livadă
+          plant_nursery: Pepinieră
           quarry: Carieră
           railway: Cale ferată
           recreation_ground: Zonă de recreere
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index dfe6002bb..359c5d29a 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -17,6 +17,7 @@
 # Author: CM3X
 # Author: Calibrator
 # Author: Chilin
+# Author: Cjaushe4ka
 # Author: D1g
 # Author: DCamer
 # Author: Diralik
@@ -92,6 +93,8 @@ ru:
     formats:
       friendly: '%e %B %Y в %H:%M'
   helpers:
+    file:
+      prompt: Выберите файл
     submit:
       diary_comment:
         create: Сохранить
@@ -157,8 +160,12 @@ ru:
       way_tag: Тег линии
     attributes:
       client_application:
+        name: Имя (Обязательно)
+        url: Url приложения (обязательно)
         callback_url: Callback URL
         support_url: URL пользовательской поддержки
+        allow_write_gpx: Загрузить GPS треки
+        allow_write_notes: исправить заметки
       diary_comment:
         body: Текст
       diary_entry:
@@ -173,7 +180,7 @@ ru:
       trace:
         user: Пользователь
         visible: Видимость
-        name: Название
+        name: Название файла
         size: Размер
         latitude: Широта
         longitude: Долгота
@@ -631,16 +638,20 @@ ru:
           hospital: Госпиталь
           hunting_stand: Охотничья вышка
           ice_cream: Мороженое
+          internet_cafe: Интернет кафе
           kindergarten: Детский сад
           library: Библиотека
           marketplace: Рынок
           monastery: Монастырь
+          money_transfer: Перевод денег
           motorcycle_parking: Парковка для мотоциклов
+          music_school: Музыкальная школа
           nightclub: Ночной клуб
           nursing_home: Дом престарелых
           parking: Стоянка
           parking_entrance: Въезд на стоянку
           parking_space: Парковка
+          payment_terminal: Платежный терминал
           pharmacy: Аптека
           place_of_worship: Место поклонения
           police: Полиция
@@ -648,6 +659,7 @@ ru:
           post_office: Почтовое отделение
           prison: Тюрьма
           pub: Паб
+          public_bath: Общественная баня
           public_building: Общественное здание
           recycling: Место утилизации
           restaurant: Ресторан
@@ -694,15 +706,21 @@ ru:
           hotel: Гостиница
           house: Дом
           industrial: Промышленное здание
+          kindergarten: Детский сад
           office: Офисное здание
           public: Общественное здание
           residential: Жилой дом
           retail: Здание на продажу
+          roof: Крыша
           school: Здание школы
+          shed: Сарай
           terrace: Ряд жилых домов
-          train_station: трамвайная остановка
+          train_station: Железнодорожный вокзал
           university: Университет
+          warehouse: Склад
           "yes": Здание
+        club:
+          "yes": Клуб
         craft:
           brewery: Пивоварня
           carpenter: Плотник
@@ -866,6 +884,7 @@ ru:
           bunker_silo: Бункер
           chimney: Дымовая труба
           crane: Кран
+          cross: Перекресток
           dolphin: Причальная тумба
           dyke: Прибрежная насыпь
           embankment: Насыпь
@@ -881,6 +900,7 @@ ru:
           petroleum_well: Скважина
           pier: Пирс
           pipeline: Трубопровод
+          pumping_station: Насосная станция
           silo: Силос
           storage_tank: Крытый резервуар
           surveillance: Камера наблюдения
@@ -1037,6 +1057,7 @@ ru:
           doityourself: Сделай сам
           dry_cleaning: Химчистка
           electronics: Магазин электроники
+          erotic: Магазин эротических товаров
           estate_agent: Агенство недвижимости
           farm: Магазин фермерских продуктов
           fashion: Магазин модной одежды
@@ -1079,6 +1100,7 @@ ru:
           stationery: Канцелярские товары
           supermarket: Супермаркет
           tailor: Портной
+          tea: Чайный магазин
           ticket: Касса
           tobacco: Табачный магазин
           toys: Магазин игрушек
@@ -1087,6 +1109,7 @@ ru:
           vacant: Пустующий магазин
           variety_store: Магазин одной цены
           video: Магазин видеозаписей
+          video_games: Магазин видеоигр
           wine: Винный магазин
           "yes": Магазин
         tourism:
@@ -1980,6 +2003,7 @@ ru:
           окончания передачи этих треков, перед тем как начать передавать на сервер
           другие. Это позволит не блокировать сервер для других пользователей.'
     edit:
+      cancel: Отменить
       title: Редактирование трека %{name}
       heading: Редактирование трека %{name}
       visibility_help: Что это значит?
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 7122c1946..86940a87f 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -62,6 +62,8 @@ zh-CN:
       friendly: '%Y 年%B %e 日 %H:%M'
       blog: '%Y年%B%e日'
   helpers:
+    file:
+      prompt: 选择文件
     submit:
       diary_comment:
         create: 保存
@@ -133,6 +135,7 @@ zh-CN:
         allow_read_prefs: 读取其用户设置
         allow_write_api: 修改地图
         allow_write_gpx: 上传GPS轨迹
+        allow_write_notes: 修改注记
       diary_comment:
         body: 正文
       diary_entry:
@@ -162,6 +165,7 @@ zh-CN:
         body: 正文
         recipient: 收件人
       report:
+        category: 选择您举报的原因
         details: 请提供一些有关问题的更多详情（必填）。
       user:
         email: 电子邮件
@@ -379,6 +383,7 @@ zh-CN:
       reopened_by_anonymous: 匿名用户重新激活于<abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: '%{user}隐藏于<abbr title=''%{exact_time}''>%{when}</abbr>'
       report: 举报此注记
+      coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: 查询要素
       introduction: 点击地图以查找附近要素。
@@ -548,8 +553,10 @@ zh-CN:
           holding_position: 等车位置
           parking_position: 停车位置
           runway: 飞机跑道
+          taxilane: 滑行道
           taxiway: 滑行道
           terminal: 航站楼
+          windsock: 风向袋
         amenity:
           animal_shelter: 动物收容所
           arts_centre: 艺术中心
@@ -561,6 +568,7 @@ zh-CN:
           bicycle_parking: 自行车停车处
           bicycle_rental: 自行车出租点
           biergarten: 露天啤酒店
+          blood_bank: 血库
           boat_rental: 租船处
           brothel: 妓院
           bureau_de_change: 外汇兑换点
@@ -577,6 +585,7 @@ zh-CN:
           clock: 时钟
           college: 学院
           community_centre: 社区中心
+          conference_centre: 会议中心
           courthouse: 法院
           crematorium: 火葬场
           dentist: 牙科
@@ -596,11 +605,15 @@ zh-CN:
           hospital: 医院
           hunting_stand: 狩猎站
           ice_cream: 冰淇淋
+          internet_cafe: 网咖
           kindergarten: 幼儿园
+          language_school: 语言学校
           library: 图书馆
+          loading_dock: 装卸码头
           marketplace: 商场
           monastery: 修道院
           motorcycle_parking: 摩托车停车场
+          music_school: 音乐学校
           nightclub: 夜总会
           nursing_home: 疗养院
           parking: 停车场
@@ -613,6 +626,7 @@ zh-CN:
           post_office: 邮局
           prison: 监狱
           pub: 酒馆
+          public_bath: 公共浴场
           public_building: 公共建筑
           recycling: 回收点
           restaurant: 餐馆
@@ -629,17 +643,22 @@ zh-CN:
           toilets: 洗手间
           townhall: 市政厅
           university: 大学
+          vehicle_inspection: 车辆检测站
           vending_machine: 自动售货机
           veterinary: 兽医
           village_hall: 村政厅
           waste_basket: 垃圾桶
           waste_disposal: 废物处理
+          waste_dump_site: 垃圾倾倒场
           water_point: 引水点
+          weighbridge: 地磅
+          "yes": 便利设施
         boundary:
           administrative: 行政区边界
           census: 人口普查边界
           national_park: 国家公园
           protected_area: 保护区
+          "yes": 边界
         bridge:
           aqueduct: 沟渠
           boardwalk: 木板路
@@ -648,26 +667,42 @@ zh-CN:
           viaduct: 高架桥
           "yes": æ¡¥
         building:
+          apartment: 公寓
           apartments: 公寓
+          barn: 谷仓
+          bungalow: 平房
+          cabin: 小屋
           chapel: 教堂
           church: 教堂建筑
+          college: 学院建筑
           commercial: 商业建筑物
+          detached: 独立式住宅
           dormitory: 宿舍
+          duplex: 双拼住宅
           farm: 农场屋
           garage: 车库
+          garages: 车库
+          greenhouse: 温室
           hospital: 医院建筑物
           hotel: 酒店建筑
           house: 房屋
+          houseboat: 船屋
           industrial: 工业建筑物
+          kindergarten: 幼儿园建筑
+          manufacture: 制造业建筑
           office: 办公楼
           public: 公共建筑物
           residential: 住宅建筑物
           retail: 零售建筑物
+          roof: 屋顶
           school: 学校建筑物
+          temple: 庙宇建筑
           terrace: 阳台建筑
           train_station: 火车站建筑
           university: 大学建筑物
           "yes": 建筑物
+        club:
+          sport: 体育俱乐部
         craft:
           brewery: 啤酒厂
           carpenter: 木匠工坊
@@ -678,6 +713,7 @@ zh-CN:
           plumber: 管道工坊
           shoemaker: 鞋匠工坊
           tailor: 裁缝店
+          winery: 酿酒厂
           "yes": 工艺品店
         emergency:
           ambulance_station: 救护站
@@ -849,6 +885,7 @@ zh-CN:
           silo: 发射井
           storage_tank: 储油罐
           surveillance: 监视
+          telescope: 望远镜
           tower: 塔
           wastewater_plant: 污水处理厂
           watermill: 水磨
@@ -879,7 +916,7 @@ zh-CN:
           geyser: 间歇泉
           glacier: 冰川
           grassland: 草原
-          heath: 希思地貌
+          heath: 荒野
           hill: 希尔地貌
           island: 岛
           land: 陆地
@@ -917,6 +954,7 @@ zh-CN:
           insurance: 保险办公室
           it: IT办公室
           lawyer: 律师事务所
+          newspaper: 报社
           ngo: 非政府组织办公室
           telecommunication: 电信办公室
           travel_agent: 旅行社
@@ -989,8 +1027,11 @@ zh-CN:
           car_repair: 汽车修理店
           carpet: 地毯店
           charity: 慈善商店
+          cheese: 奶酪店
           chemist: 化学品店
+          chocolate: 巧克力店
           clothes: 服装店
+          coffee: 咖啡店
           computer: 电脑店
           confectionery: 糖果店
           convenience: 便利店
@@ -1001,6 +1042,7 @@ zh-CN:
           discount: 折扣商品店
           doityourself: DIY
           dry_cleaning: 干洗店
+          e-cigarette: 电子烟店
           electronics: 电子产品店
           estate_agent: 地产代理
           farm: 农产品店
@@ -1044,6 +1086,8 @@ zh-CN:
           stationery: 文具店
           supermarket: 超市
           tailor: 裁缝店
+          tattoo: 纹身店
+          tea: 茶馆
           ticket: 售票处
           tobacco: 烟草店
           toys: 玩具店
@@ -1052,6 +1096,7 @@ zh-CN:
           vacant: 空店
           variety_store: 杂货店
           video: 音像店
+          video_games: 电子游戏商店
           wine: 葡萄酒店
           "yes": 商店
         tourism:
@@ -1698,7 +1743,7 @@ zh-CN:
           retail: 零售区
           industrial: 工业区
           commercial: 商业区
-          heathland: 荒野
+          heathland: 荒原
           lake:
           - 湖
           - 水库
@@ -1791,6 +1836,7 @@ zh-CN:
       upload_failed: 抱歉，GPX上传失败。管理员已收到错误警报。请再试一次
       traces_waiting: 您有 %{count} 条轨迹正等待上传，请在上传更多轨迹前等待这些传完，以确保不会给其他用户造成队列拥堵。
     edit:
+      cancel: 取消
       title: 编辑轨迹 %{name}
       heading: 编辑轨迹 %{name}
       visibility_help: 这是什么意思？