From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Thu, 10 Sep 2015 08:38:58 +0000 (+0200)
Subject: Localisation updates from https://translatewiki.net.
X-Git-Tag: live~4558
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ec9b21bf1e858d2bfcdc19d368f761a6d5144648

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 0e817943d..d329a011c 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -13,8 +13,8 @@ af:
       friendly: '%e %B %Y om %H:%M'
   activerecord:
     models:
-      acl: Toegangsbeheer
-      changeset: Stel wysigings
+      acl: Toegangsbeheerlys
+      changeset: Wysigingstel
       country: Land
       diary_comment: Dagboekopmerking
       diary_entry: Dagboekinskrywing
@@ -22,7 +22,7 @@ af:
       language: Taal
       message: Boodskap
       node: Node
-      notifier: Melding
+      notifier: Kennisgewer
       old_node: Ou Node
       session: Sessie
       trace: Spoor
@@ -74,17 +74,17 @@ af:
       type:
         node: Node
         way: Weg
-        relation: Relasie
+        relation: Verwantskap
     containing_relation:
-      entry: Relasie %{relation_name}
-      entry_role: Relasie %{relation_name} (as %{relation_role})
+      entry: Verwantskap %{relation_name}
+      entry_role: Verwantskap %{relation_name} (as %{relation_role})
     not_found:
       sorry: 'Jammer, %{type} #%{id} kan nie gevind word nie.'
       type:
         node: node
         way: weg
-        relation: relasie
-        changeset: Veranderingstel
+        relation: verwantskap
+        changeset: veranderingstel
     timeout:
       sorry: Jammer, dit het te lank geneem om data vir die %{type} met die id %{id}
         op te soek.
@@ -99,7 +99,7 @@ af:
     changeset_paging_nav:
       showing_page: Bladsy %{page}
       next: Volgende »
-      previous: » Vorige
+      previous: « Vorige
     changeset:
       anonymous: Anoniem
       no_edits: (geen wysigings)
@@ -136,7 +136,7 @@ af:
     view:
       title: '%{user} se dagboek | %{title}'
       user_title: Dagboek van %{user}
-      leave_a_comment: Los opmerking agter
+      leave_a_comment: Los 'n opmerking
       login_to_leave_a_comment: U moet eers %{login_link} alvorens u kommentaar kan
         lewer
       login: Meld aan
@@ -148,7 +148,7 @@ af:
         nie. Kontroleer u spelling, of miskien is die skakel waarop u gekliek het
         verkeerd.
     diary_entry:
-      posted_by: Gepos deur %{link_user} op %{created} in die %{language_link}
+      posted_by: Gepos deur %{link_user} op %{created} in %{language_link}
       comment_link: Lewer kommentaar op hierdie bydrae
       reply_link: Antwoord op hierdie bydrae
       comment_count:
@@ -188,9 +188,9 @@ af:
       export_details: OpenStreetMap se data is gelisensieer onder die <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.af">Creative
         Commons Erkenning-Insgelyks Deel 2.0 lisensie</a>.
       options: Voorkeure
-      format: 'Formaat:'
+      format: Formaat
       scale: Skaal
-      max: max
+      max: maksimum
       image_size: 'Prentgrootte:'
       zoom: Zoom
       add_marker: Plaas 'n merker op die kaart
@@ -315,7 +315,7 @@ af:
           cycleway: Fietspad
           emergency_access_point: Noodtoeganspunt
           footway: Voetpad
-          ford: Fort
+          ford: Drif
           motorway: Snelweg
           motorway_junction: Snelwegknooppunt
           path: Pad
@@ -336,13 +336,13 @@ af:
           tertiary: Tersiêre pad
           track: Spoor
           trail: Wandelpad
-          trunk: Trokpad
-          trunk_link: Trokpad
+          trunk: Hoofroete
+          trunk_link: Hoofroete
           unclassified: Ongeklassifiseerde pad
           unsurfaced: Grondpad
           "yes": Straat
         historic:
-          archaeological_site: Argeologiese vindplaas
+          archaeological_site: Argeologiese werf
           battlefield: Slagveld
           building: Gebou
           castle: Kasteel
@@ -350,7 +350,7 @@ af:
           house: Huis
           icon: Ikoon
           manor: Landgoed
-          memorial: Herdenkingsmonument
+          memorial: Gedenkteken
           mine: Myn
           monument: Monument
           ruins: Ruïnes
@@ -373,7 +373,7 @@ af:
           military: Militêre gebied
           mine: Myn
           quarry: Steengroewe
-          railway: Spoor
+          railway: Spoorweg
           reservoir: Reservoir
           residential: Woongebied
           retail: Kleinhandel
@@ -433,7 +433,7 @@ af:
           country: Land
           county: Distrik
           farm: Plaas
-          hamlet: Gehug
+          hamlet: Dorpie
           house: Huis
           houses: Huise
           island: Eiland
@@ -444,10 +444,10 @@ af:
           region: Streek
           sea: See
           state: Staat
-          subdivision: Deelgebied
+          subdivision: Onderverdeling
           suburb: Voorstad
           town: Dorp
-          unincorporated_area: Geïnkorporeerde Ruimte
+          unincorporated_area: Uitgesluite Ruimte
           village: Dorp
         railway:
           construction: Spoor in aanbou
@@ -456,16 +456,16 @@ af:
           halt: Treinhalte
           historic_station: Historiese spoorwegstasie
           junction: Spoorwegkruising
-          level_crossing: Gelykvloerse kruising
-          monorail: Monorail
-          narrow_gauge: Smalspoor
+          level_crossing: Spooroorgang
+          monorail: Monospoor
+          narrow_gauge: Smalspoorweg
           platform: Spoorweg-platform
-          preserved: Historiese spoor
+          preserved: Historiese spoorweg
           station: Spoorwegstasie
           subway: Metrostasie
-          subway_entrance: Metroingang
+          subway_entrance: Ondergrondse spoorwegingang
           switch: Spoogwegpunte
-          tram_stop: Tramhalte
+          tram_stop: Tremhalte
         shop:
           art: Kunswinkel
           bakery: Bakkery
@@ -502,7 +502,7 @@ af:
           grocery: Kruideniersware-winkel
           hairdresser: Haarkapper
           hardware: Hardwarewinkel
-          hifi: Hi-fi
+          hifi: Hi-Fi
           insurance: Versekering
           jewelry: Juwelierswinkel
           kiosk: Kioskwinkel
@@ -516,7 +516,7 @@ af:
           optician: Oogkundige
           organic: Organiese koswinkel
           outdoor: Buitelug-winkel
-          pet: Dierewinkel
+          pet: Troeteldierwinkel
           photo: Fotowinkel
           salon: Skoonheidssalon
           shoes: Skoenwinkel
@@ -537,7 +537,7 @@ af:
           caravan_site: Karavaanpark
           chalet: Chalet
           guest_house: Gastehuis
-          hostel: Hotel
+          hostel: Jeugherberg
           hotel: Hotel
           information: Inligting
           motel: Motel
@@ -591,7 +591,7 @@ af:
     tag_line: Die vrye wiki-wêreldkaart
     intro_header: Welkom by OpenStreetMap!
     intro_text: OpenStreetMap is 'n kaart van die wêreld, geskep deur gewone mense.
-      Dis gratis onder 'n oop lisensie.
+      Dis gratis om te gebruik onder 'n oop lisensie.
     intro_2_create_account: Skep gebruikerrekening
     osm_read_only: Die OpenStreetMap-databasis kan op die oomblik slegs gelees word
       aangesien noodsaaklik onderhoud tans uitgevoer word.
@@ -602,7 +602,7 @@ af:
     community: Gemeenskap
     foundation_title: Die OpenStreetMap-stigting
     make_a_donation:
-      title: Ondersteun OpenStreetMap met'n geldelike donasie
+      title: Ondersteun OpenStreetMap met 'n geldelike donasie
       text: Maak 'n donasie
     learn_more: Meer inligting
     more: Meer
@@ -643,7 +643,7 @@ af:
       click_the_link: As dit u is, kliek op die onderstaande skakel om die verandering
         te bevestig.
     lost_password:
-      subject: '[OpenStreetMap] Versoek nuwe wagwoord'
+      subject: '[OpenStreetMap] Versoek herstel van wagwoord'
     lost_password_plain:
       greeting: Hallo,
       click_the_link: As dit u is, kliek op die onderstaande skakel om die wagwoord
@@ -654,7 +654,7 @@ af:
     inbox:
       title: Inboks
       my_inbox: My inboks
-      outbox: outboks
+      outbox: uitboks
       from: Vanaf
       subject: Onderwerp
       date: Datum
@@ -678,7 +678,7 @@ af:
       title: Die boodskap bestaan nie
       heading: Die boodskap bestaan nie
     outbox:
-      title: Gestuur
+      title: Uitboks
       my_inbox: My %{inbox_link}
       inbox: inboks
       outbox: uitboks
@@ -717,25 +717,24 @@ af:
       search: Soek
       get_directions_title: Kry aanwysings tussen twee punte
       where_am_i: Waar is ek?
-      submit_text: OK
+      submit_text: Soek
     key:
       table:
         entry:
           motorway: Snelweg
-          trunk: Trokpad
+          trunk: Hoofroete
           primary: Primêre pad
           secondary: Sekondêre pad
           unclassified: Ongeklassifiseerde pad
-          unsurfaced: Grondpad
           track: Spoor
           bridleway: Ruiterpad
           cycleway: Fietspad
           footway: Voetpad
           rail: Spoorweg
-          subway: Metro
+          subway: Ondergrondse spoorweg
           tram:
           - Ligte spoor
-          - tram
+          - trem
           cable:
           - Kabelkar
           - stoelhyser
@@ -746,15 +745,14 @@ af:
           - Lughaweplatform
           - terminaal
           admin: Administratiewe grens
-          forest: Bos
+          forest: Woud
           wood: Bos
           golf: Gholfbaan
           park: Park
           resident: Woongebied
-          tourist: Toerisme-trekpleister
           common:
-          - weide
-          - weide
+          - Gemeen
+          - weiland
           retail: Winkelgebied
           industrial: Industriële gebied
           commercial: Kommersiële gebied
@@ -763,7 +761,7 @@ af:
           - Meer
           - reservoir
           farm: Plaas
-          brownfield: Braakliggende terrein
+          brownfield: Braakveld terrein
           cemetery: Begraafplaas
           allotments: Volkstuine
           pitch: Sportveld
@@ -778,10 +776,9 @@ af:
           summit:
           - Piek
           - piek
-          tunnel: Tonnel
-          bridge: Brug
+          tunnel: Strepieomhulsel = tonnel
+          bridge: Swartomhulsel = brug
           private: Privaat toegang
-          permissive: Beperkte toegang
           destination: Bestemmingsverkeer
           construction: Paaie onder konstruksie
   trace:
@@ -805,11 +802,11 @@ af:
       visibility: 'Sigbaarheid:'
       visibility_help: wat beteken dit?
     trace_form:
-      upload_gpx: Laai GPX-lêer op
-      description: Beskrywing
-      tags: Etikette
+      upload_gpx: 'Laai GPX-lêer op:'
+      description: 'Beskrywing:'
+      tags: 'Etikette:'
       tags_help: met kommas geskei
-      visibility: Sigbaarheid
+      visibility: 'Sigbaarheid:'
       visibility_help: wat beteken dit?
       upload_button: Laai op
       help: Hulp
@@ -819,7 +816,7 @@ af:
     trace_optionals:
       tags: Etikette
     view:
-      title: Besigting spoor %{name}
+      title: Besigtig spoor %{name}
       heading: Besigtig spoor %{name}
       pending: BESIG
       filename: 'Lêernaam:'
@@ -847,7 +844,7 @@ af:
       trace_details: Wys spoor besonderhede
       view_map: Wys kaart
       edit: wysig
-      edit_map: Kaart bewysig
+      edit_map: Wysig kaart
       public: OPENBAAR
       identifiable: IDENTIFISEERBAAR
       private: PRIVAAT
@@ -865,19 +862,19 @@ af:
       made_public: Spoor is openbaar gemaak
   oauth:
     oauthorize:
-      allow_read_prefs: u gebruikersvoorkeure te lees.
+      allow_read_prefs: lees u gebruikersvoorkeure.
       allow_write_prefs: verander jou gebruikersvoorkeure.
-      allow_write_api: die kaart te wysig.
-      allow_write_gpx: Laai GPS-spore op.
+      allow_write_api: die kaart wysig.
+      allow_write_gpx: laai GPS-spore op.
   oauth_clients:
     new:
-      title: Registreer 'n nuwe applikasie
+      title: Registreer 'n nuwe toepassing
       submit: Registreer
     edit:
-      title: Wysig u applikasie
+      title: Wysig u toepassing
       submit: Wysig
     show:
-      authorize_url: 'URL vir magtiging:'
+      authorize_url: 'Magtig URL:'
       edit: Wysig details
       allow_read_prefs: lees hulle gebruikersvoorkeure.
       allow_write_diary: skep dagboekinskrywings, lewer kommentaar en maak vriende.
@@ -885,15 +882,15 @@ af:
       allow_write_gpx: laai GPS-spore op.
     index:
       title: My OAuth-details
-      application: Applikasienaam
+      application: Toepassingnaam
       issued_at: Uitgereik op
       revoke: Herroep!
-      my_apps: My kliënt-applikasies
-      register_new: Registreer u applikasie
+      my_apps: My kliënt-toepassing
+      register_new: Registreer u toepassing
     form:
       name: Naam
       required: Verplig
-      url: Applikasie-URL
+      url: Toepassing-URL
       support_url: Ondersteunings-URL
       allow_read_prefs: lees hulle gebruikersvoorkeure.
       allow_write_prefs: verander hulle gebruikersvoorkeure.
@@ -906,7 +903,7 @@ af:
       heading: Meld aan
       email or username: 'E-posadres of gebruikersnaam:'
       password: 'Wagwoord:'
-      remember: 'Onthou my:'
+      remember: Onthou my
       lost password link: Wagwoord vergeet?
       login_button: Meld aan
       auth failure: Jammer, kon nie met hierdie inligting aanmeld nie.
@@ -925,7 +922,7 @@ af:
       heading: Herstel wagwoord vir %{user}
       password: 'Wagwoord:'
       confirm password: 'Bevestig wagwoord:'
-      reset: Kry nuwe wagwoord
+      reset: Herstel wagwoord
       flash changed: U wagwoord is verander.
     new:
       title: Skep rekening
@@ -936,7 +933,7 @@ af:
       email address: 'E-posadres:'
       confirm email address: 'Bevestig E-posadres:'
       not displayed publicly: Word nie publiek vertoon nie (sien <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
-        title="wiki-geheimhoudingbeleid insluitend afdeling oor e-posadresse">geheimhoudingbeleid</a>)
+        title="wiki privacy policy including section on email addresses">geheimhoudingbeleid</a>)
       display name: 'Vertoon naam:'
       password: 'Wagwoord:'
       confirm password: 'Bevestig wagwoord:'
@@ -944,7 +941,7 @@ af:
       terms accepted: Dankie dat u die nuwe bydraerooreenkoms aanvaar het!
     terms:
       title: Bydraerooreenkoms
-      heading: Voorwaardes vir bydraes
+      heading: Voorwaardes vir bydraers
       agree: Aanvaar
       decline: Weier
       legale_names:
@@ -957,21 +954,21 @@ af:
       body: Daar is geen gebruiker met die naam %{user} nie. Kontroleer u spelling,
         of die skakel waarop u gekliek het is verkeerd.
     view:
-      my diary: my dagboek
+      my diary: My dagboek
       new diary entry: nuwe dagboekinskrywing
-      my edits: my wysigings
-      my traces: my spore
-      my settings: my voorkeure
+      my edits: My wysigings
+      my traces: My spore
+      my settings: My voorkeure
       oauth settings: Oauth-instellings
       blocks on me: blokkades op my
       blocks by me: blokkades deur my
-      send message: stuur boodskap
-      diary: dagboek
-      edits: wysigings
-      traces: spore
-      remove as friend: verwyder as vriend
-      add as friend: voeg by as vriend
-      mapper since: 'Karteer sedert:'
+      send message: Stuur boodskap
+      diary: Dagboek
+      edits: Wysigings
+      traces: Spore
+      remove as friend: Verwyder as vriend
+      add as friend: Voeg by as vriend
+      mapper since: 'Karteerder sedert:'
       ago: (%{time_in_words_ago} gelede)
       email address: 'E-posadres:'
       created from: 'Geskep vanaf:'
@@ -987,13 +984,13 @@ af:
       km away: '%{count}km vêr'
       m away: '%{count}m vêr'
       nearby users: Ander nabygeleë gebruikers
-      no nearby users: Daar is nog geen gebruikers wat herken dat hulle nabygeleë
-        karterinswerk doen nie.
+      no nearby users: Daar is nog geen gebruikers wat erken dat hulle nabygeleë karterinswerk
+        doen nie.
       role:
         administrator: Hierdie gebruiker is 'n administrateur
         moderator: Hierdie gebruiker is 'n moderator
         grant:
-          administrator: Trek adminregte terug
+          administrator: Ken adminregte toe
           moderator: Ken moderatorregte toe
         revoke:
           administrator: Trek adminregte terug
@@ -1041,17 +1038,17 @@ af:
       return to profile: Terug na profiel
       flash update success: U gebruikersinligting is verander.
     confirm:
-      heading: Bevestig 'n gebruiker se rekening
+      heading: Kontroleer u e-pos!
       press confirm button: Kliek op "Bevestig" hieronder om u rekening aktiveer.
       button: Bevestig
     confirm_email:
       heading: Bevestig verandering van e-posadres
       button: Bevestig
-      success: U e-posadres is bevestig, dankie dat u geregistreer het!
+      success: U e-posadres verandering is bevestig!
     set_home:
-      flash success: U tuisligging is suksesvol gebêre
+      flash success: U tuisligging is suksesvol gestoor
     make_friend:
-      success: '%{name} is nou u vriend.'
+      success: '%{name} is nou u vriend!'
       failed: Jammer, kon nie %{name} as 'n vriend byvoeg nie.
       already_a_friend: U is reeds met %{name} bevriend.
     remove_friend:
@@ -1103,29 +1100,29 @@ af:
       heading: Lys van gebruikersblokkades
       empty: Daar is nog geen blokkades ingestel nie.
     revoke:
-      confirm: Is u seker u wil hierdie blokkade terugtrek?
-      revoke: Terugtrek
-      flash: Hierdie blokkade is teruggetrek.
+      confirm: Is u seker u wil hierdie blokkade herroep?
+      revoke: Herroep!
+      flash: Hierdie blokkade is herroep.
     period:
       one: 1 uur
       other: '%{count} ure'
     partial:
       show: Wys
       edit: Wysig
-      revoke: Terugtrek
+      revoke: Herroep!
       confirm: Is u seker?
       display_name: Geblokkeerde gebruiker
       creator_name: Skepper
       reason: Rede vir blokkade
       status: Status
-      revoker_name: Teruggetrek deur
+      revoker_name: Herroep deur
       not_revoked: (nie herroep nie)
     helper:
       time_future: Verval oor %{time}.
       until_login: Aktief totdat die gebruiker aanmeld.
       time_past: Het %{time} gelede verval.
     blocks_on:
-      title: Blokkades vir %{name}
+      title: Blokkades op %{name}
       heading: Lys van blokkades teen %{name}
       empty: '%{name} is nog nooit geblokkeer nie.'
     blocks_by:
@@ -1140,11 +1137,11 @@ af:
       status: Status
       show: Wys
       edit: Wysig
-      revoke: Terugtrek
+      revoke: Herroep!
       confirm: Is u seker?
       reason: 'Rede vir blokkade:'
       back: Wys alle blokkades
-      revoker: 'Teruggetrek deur:'
+      revoker: 'Herroep deur:'
       needs_view: Die gebruiker moet aanmeld alvorens hierdie blokkade verwyder sal
         word.
   javascripts:
@@ -1152,15 +1149,15 @@ af:
       title: Deel
     map:
       zoom:
-        in: Zoem in
+        in: Zoom in
       locate:
         title: Wys my ligging
       base:
         cycle_map: Fietskaart
     site:
-      edit_disabled_tooltip: Zoem in om die kaart te redigeer
-      createnote_disabled_tooltip: Zoem in om 'n nota by die kaart te voeg
-      map_data_zoom_in_tooltip: Zoem in om kaartdata te sien
+      edit_disabled_tooltip: Zoom in om die kaart te wysig
+      createnote_disabled_tooltip: Zoom in om 'n nota by die kaart te voeg
+      map_data_zoom_in_tooltip: Zoom in om kaartdata te sien
     directions:
       engines:
         graphhopper_bicycle: Fiets (GraphHopper)
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index b7d7dfd24..7600184cc 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -7,6 +7,7 @@
 # Author: Fitim
 # Author: Gent
 # Author: Heroid
+# Author: Kosovastar
 # Author: Mdupont
 # Author: MicroBoy
 # Author: Nemo bis
@@ -887,9 +888,7 @@ aln:
           primary: Udhë kryesore
           secondary: rrugë e mesme
           unclassified: Udhë e paklasifikume
-          unsurfaced: rrugë Unsurfaced
           track: Udhë
-          byway: I parrahur
           bridleway: Bridleway
           cycleway: Cycleway
           footway: Këmbësore
@@ -913,7 +912,6 @@ aln:
           golf: fushë e golfit
           park: Park
           resident: Zonë Rezidenciale
-          tourist: tërheqje Turistike
           common:
           - I përbashkët
           - livadh
@@ -943,7 +941,6 @@ aln:
           tunnel: tunel zorrë thye =
           bridge: Shtresë e jashtme e Zi = urë
           private: qasje privat
-          permissive: qasje tolerant
           destination: qasje Destinacioni
           construction: Rrugët në ndërtim e sipër
   trace:
@@ -1251,7 +1248,7 @@ aln:
       my settings: Preferencat e mia
       current email address: 'Email adresa e tanishme:'
       new email address: 'Email adresa e re:'
-      email never displayed publicly: (asniher su kan publike)
+      email never displayed publicly: (asnjëherë nuk është publikuar)
       public editing:
         heading: 'Ndryshime publike:'
         enabled: E pranishme. Jo anonime dhe muni me i ndryshue t'dhanat.
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 5f1fa6b53..01d39c4c8 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1140,9 +1140,7 @@ ar:
           primary: طريق رئيسي
           secondary: طريق ثانوي
           unclassified: طريق غير مصنّف
-          unsurfaced: طريق غير معبد
           track: مسار
-          byway: طريق فرعي
           bridleway: مسلك خيول
           cycleway: طريق دراجات
           footway: طريق مشاة
@@ -1166,7 +1164,6 @@ ar:
           golf: ملعب غولف
           park: منتزه
           resident: منطقة سكنية
-          tourist: مزار سياحي
           common:
           - شائع
           - مرج
@@ -1196,7 +1193,6 @@ ar:
           tunnel: غطاء متقطع = نفق
           bridge: غطاء أسود = جسر
           private: استخدام خصوصي
-          permissive: استخدام متسامح
           destination: استخدام إلى الوجهة
           construction: الطرق تحت الإنشاء
     richtext_area:
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 0a74f4c34..f9a4e88ba 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -730,9 +730,7 @@ arz:
           primary: طريق رئيسي
           secondary: طريق ثانوي
           unclassified: طريق غير مصنّف
-          unsurfaced: طريق غير معبد
           track: مسار
-          byway: طريق فرعي
           bridleway: مسلك خيول
           cycleway: طريق دراجات
           footway: طريق مشاة
@@ -753,7 +751,6 @@ arz:
           golf: ملعب غولف
           park: منتزه
           resident: منطقه سكنية
-          tourist: مزار سياحي
           common:
           - شائع
           - مرج
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 8e8f13ae0..576cb7720 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1436,9 +1436,7 @@ ast:
           primary: Carretera primaria
           secondary: Carretera secundaria
           unclassified: Carretera ensin clasificar
-          unsurfaced: Carretera ensin asfaltar
           track: Pista
-          byway: Camín
           bridleway: Caleya
           cycleway: Carril bici
           footway: Camín peatonal
@@ -1462,7 +1460,6 @@ ast:
           golf: Campu de golf
           park: Parque
           resident: Área residencial
-          tourist: Atracción turística
           common:
           - Espaciu comunal
           - prau
@@ -1492,7 +1489,6 @@ ast:
           tunnel: Borde de rayes = túnel
           bridge: Borde prietu = ponte
           private: Accesu priváu
-          permissive: Accesu permisivu
           destination: Accesu pa destín
           construction: Carreteres en construcción
     richtext_area:
diff --git a/config/locales/az.yml b/config/locales/az.yml
index b1cdf39f8..45b9e7b4a 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -901,7 +901,6 @@ az:
           primary: Birinci dərəcəli yol
           secondary: İkici dərəcəli yol
           unclassified: Təsnifatsız yol
-          unsurfaced: Torpaq yol
           track: Cığır
           footway: Piyada yolu
           rail: Dəmir yolu
@@ -916,7 +915,6 @@ az:
           forest: Meşə
           park: Park
           resident: Yaşayış sahəsi
-          tourist: Turist attraksionu
           common:
             1: çəmənlik
           retail: Ticarət sahəsi
@@ -939,7 +937,6 @@ az:
           - Zirvə
           - pik
           private: Xüsusi giriş
-          permissive: Açıq giriş
     richtext_area:
       preview: Sınaq görüntüsü
     markdown_help:
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 5f4a2a1d4..c53c414e5 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -985,9 +985,7 @@ be-Tarask:
           primary: Галоўная дарога
           secondary: Другасная дарога
           unclassified: Дарога раённага значэньня
-          unsurfaced: Дарога без пакрыцьця
           track: Грунтовая дарога
-          byway: Завулак
           bridleway: Дарога для коней
           cycleway: Роварная дарога
           footway: Пешаходная дарога
@@ -1011,7 +1009,6 @@ be-Tarask:
           golf: Поле для гольфу
           park: Парк
           resident: Жылы раён
-          tourist: Славутасьць
           common:
           - Грамадзкая зямля
           - луг
@@ -1041,7 +1038,6 @@ be-Tarask:
           tunnel: Пункцір = тунэль
           bridge: Чорная лінія = мост
           private: Прыватны доступ
-          permissive: Доступ па дазволах
           destination: Мэтавы доступ
           construction: Будаўніцтва дарогаў
     richtext_area:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index f99b80ec8..e89d38d2a 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -24,19 +24,19 @@ be:
       friend: Сябар
       language: Мова
       message: Паведамленне
-      node: Вузел
-      node_tag: Тэг вузла
+      node: Кропка
+      node_tag: Тэг кропкі
       notifier: Абвяшчэнне
-      old_node: Стары вузел
-      old_node_tag: Стары тэг вузла
+      old_node: Старая кропка
+      old_node_tag: Стары тэг кропкі
       old_relation: Старыя адносіны
-      old_relation_member: Стары ўдзельнік сувязі
+      old_relation_member: Стары ўдзельнік адносін
       old_relation_tag: Стары тэг адносін
       old_way: Старая лінія
-      old_way_node: Стары вузел лініі
+      old_way_node: Старая кропка лініі
       old_way_tag: Стары тэг лініі
       relation: Адносіны
-      relation_member: Удзельнік сувязі
+      relation_member: Удзельнік адносін
       relation_tag: Тэг адносін
       session: Сеанс
       trace: След
@@ -46,7 +46,7 @@ be:
       user_preference: Налады карыстальніка
       user_token: Токен карыстальніка
       way: Лінія
-      way_node: Вузел лініі
+      way_node: Кропка лініі
       way_tag: Тэг лініі
     attributes:
       diary_comment:
@@ -67,7 +67,7 @@ be:
         size: Памер
         latitude: Шырата
         longitude: Даўгата
-        public: Публічны
+        public: Агульны
         description: Апісанне
       message:
         sender: Ад
@@ -116,12 +116,12 @@ be:
     changeset:
       title: 'Набор змен: %{id}'
       belongs_to: Аўтар
-      node: Вузлы (%{count})
-      node_paginated: Вузлы (%{x}-%{y} з %{count})
-      way: Крывыя (%{count})
+      node: Кропкі (%{count})
+      node_paginated: Кропкі (%{x}-%{y} з %{count})
+      way: Лініі (%{count})
       way_paginated: Лініі (%{x}-%{y} з %{count})
       relation: Адносіны (%{count})
-      relation_paginated: Сувязі (%{x}-%{y} з %{count})
+      relation_paginated: Адносіны (%{x}-%{y} з %{count})
       comment: Каментары (%{count})
       hidden_commented_by: Схаваны каментар ад %{user} <abbr title='%{exact_time}'>%{when}
         таму</abbr>
@@ -134,23 +134,23 @@ be:
       join_discussion: Увайдзіце ў сістэму, каб далучыцца да абмеркавання
       discussion: Абмеркаванне
     node:
-      title: 'Вузел: %{name}'
-      history_title: 'Гісторыя вузла: %{name}'
+      title: 'Кропка: %{name}'
+      history_title: 'Гісторыя кропкі: %{name}'
     way:
       title: 'Лінія: %{name}'
-      history_title: 'Гісторыя крывой: %{name}'
-      nodes: Вузлы
+      history_title: 'Гісторыя лініі: %{name}'
+      nodes: Кропкі
       also_part_of:
-        one: з'яўляецца часткай крывой %{related_ways}
-        other: з'яўляецца часткай крывых % {related_ways}
+        one: частка лініі %{related_ways}
+        other: частка ліній %{related_ways}
     relation:
       title: 'Адносіны: %{name}'
-      history_title: 'Гісторыя сувязі: %{name}'
+      history_title: 'Гісторыя адносін: %{name}'
       members: Удзельнікі
     relation_member:
       entry_role: '%{type} %{name} як %{role}'
       type:
-        node: Вузел
+        node: Кропка
         way: Лінія
         relation: Адносіны
     containing_relation:
@@ -159,7 +159,7 @@ be:
     not_found:
       sorry: Прабачце, %{type} з нумарам %{id} не знойдзены.
       type:
-        node: вузел
+        node: кропка
         way: лінія
         relation: адносіны
         changeset: набор змен
@@ -167,16 +167,16 @@ be:
       sorry: Прабачце, дадзеныя для %{type} з ідэнтыфікатарам %{id} занадта доўгія
         для атрымання.
       type:
-        node: вузел
+        node: кропка
         way: лінія
         relation: адносіны
         changeset: набор змен
     redacted:
       redaction: Рэдакцыя %{id}
-      message_html: Версія %{version} гэтага %{type} не можа быць паказаная, бо яна
+      message_html: Версія %{version} гэтай %{type} не можа быць паказаная, бо яна
         была адрэдагаваная. Глядзіце %{redaction_link} для падрабязнасцяў.
       type:
-        node: вузел
+        node: кропка
         way: лінія
         relation: адносіны
     start_rjs:
@@ -259,7 +259,7 @@ be:
       title: Новы запіс дзённіку
     list:
       title: Дзённікі карыстальнікаў
-      title_friends: Дзеннікі сяброў
+      title_friends: Дзённікі сяброў
       title_nearby: Дзённікі карыстальнікаў паблізу
       user_title: Дзённік %{user}
       in_language_title: Дзённік запісаў у %{language}
@@ -272,7 +272,7 @@ be:
     edit:
       title: Правіць запіс у дзённіку
       subject: 'Тэма:'
-      body: 'Цела:'
+      body: 'Змест:'
       language: 'Мова:'
       location: 'Месца:'
       latitude: 'Шырата:'
@@ -288,7 +288,7 @@ be:
       login: Увайсці
       save_button: Запісаць
     no_such_entry:
-      title: Няма такіх запісаў у дзенніку
+      title: Няма такіх запісаў у дзённіку
       heading: 'Няма запісу з нумарам: %{id}'
       body: Прабаце, не існуе запісу ў дзённіку ці каментара з нумарам %{id}. Праверце
         свой правапіс, ці, магчыма, вам далі няправільную спасылку.
@@ -310,7 +310,7 @@ be:
     location:
       location: 'Месца:'
       view: Прагляд
-      edit: Рэдагаваць
+      edit: Правіць
     feed:
       user:
         title: Запісы ў дзённіку OpenStreetMap карыстальніка %{user}
@@ -904,11 +904,11 @@ be:
           "yes": Водны маршрут
       admin_levels:
         level2: Мяжа краіны
-        level4: Дзяржаўная мяжа
+        level4: Мяжа сталіцы і абласцей
         level5: Мяжа рэгіёна
-        level6: Мяжа акругі
+        level6: Мяжа райцэнтра і раёна
         level8: Мяжа горада
-        level9: Мяжа вёскі
+        level9: Мяжа раёну н/п
         level10: Мяжа прыгараду
     description:
       title:
@@ -1103,12 +1103,12 @@ be:
         слоў, якія могуць быць карыснымі.
       editor_html: <Strong>Рэдактар</strong> - гэта праграма або вэб-сайт, які вы
         можаце выкарыстоўваць для рэдагавання карты.
-      node_html: <Strong>Вузел (node)</strong> - гэта кропка на карце, напрыклад,
+      node_html: <Strong>Кропка (node)</strong> - гэта пункт на карце, напрыклад,
         рэстаран ці дрэва.
       way_html: <Strong>Лінія (way)</strong> - гэта лінія або многавугольнік, напрыклад,
         дарогі, рэкі, азёры або будынкі.
       tag_html: |-
-        <strong>Цэтлік (tag)</strong> - гэта элемент апісання вузла або лініі, напрыклад,
+        <strong>Тэг (tag)</strong> - гэта элемент апісання кропкі або лініі, напрыклад,
         назва рэстарана або абмежаванне хуткасці на дарозе.
     rules:
       title: Правілы!
@@ -1457,9 +1457,7 @@ be:
           primary: Асноўная дарога
           secondary: Другасная дарога
           unclassified: Некласіфікаваная дарога
-          unsurfaced: Дарога без пакрыцця
           track: Палявая дарога
-          byway: Сцежка
           bridleway: Дарога для коней
           cycleway: Веласіпедная дарожка
           footway: Пешаходная дарожка
@@ -1483,7 +1481,6 @@ be:
           golf: Поле для гольфа
           park: Парк
           resident: Жылы раён
-          tourist: Турыстычная славутасць
           common:
           - Агульныя
           - луг
@@ -1513,7 +1510,6 @@ be:
           tunnel: Тунэль (пункцірам)
           bridge: Мост (суцэльная лінія)
           private: Прыватны доступ
-          permissive: Доступ з дазволу
           destination: Мэтавы доступ
           construction: Дарогі ў стадыі будаўніцтва
     richtext_area:
@@ -1542,7 +1538,7 @@ be:
       identifiable: Ідэнтыфікуемы (паказваецца ў сьпісе слядоў як ідэнтыфікуемы са
         спарадкаванымі кропкамі і меткамі часу)
     create:
-      upload_trace: Зацягнуць GPS-трэк
+      upload_trace: Адаслаць GPS-след
       trace_uploaded: Ваш GPX-файл быў адасланы і чакае ўстаўкі ў базу дадзеных. Гэта
         звычайна робіцца не больш за паўгадзіны. Вы атрымаеце працврджанне аб заканчэнні
         працэсу па электроннай пошце
@@ -1622,7 +1618,7 @@ be:
       map: карта
     list:
       public_traces: Агульныя GPS-сляды
-      your_traces: Вашыя GPS-трэкі
+      your_traces: Вашыя GPS-сляды
       public_traces_from: Агульныя GPS-сляды карыстальніка %{user}
       description: Агляд нядаўна дададзеных GPS-слядоў
       tagged_with: ' адмечана як %{tags}'
@@ -2359,11 +2355,11 @@ be:
         courtesy: Маршрут прадастаўлены %{link}
       time: Час
     query:
-      node: Вузел
+      node: Кропка
       way: Лінія
       relation: Адносіны
       nothing_found: Аб’екты не знойдзены
-      error: 'Памылка сувязі %{server}: %{error}'
+      error: 'Памылка сувязі з %{server}: %{error}'
       timeout: Тайм-аўт падключэння да %{server}
   redaction:
     edit:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 26684983c..de8814893 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -986,9 +986,8 @@ br:
     legal_babble:
       title_html: Copyright hag aotre-implijout
       intro_1_html: |-
-        OpenStreetMap zo <i>dindan un aotre-implijout digor</i>, a c'haller kavout en <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        OpenStreetMap <sup><a href="#trademarks">&reg;</a></sup>  zo <i>dindan un aotre-implijout digor</i>, Open Data
+        Commons Open Database License</a> (ODbL) gant <sup><a href="#trademarks">&reg;</a></sup>
       intro_2_html: "Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n
         \ hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n  genlabourerien.
         Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n
@@ -1018,9 +1017,9 @@ br:
         alt: Skouer eus penaos deverkañ OpenStreetMap war ur bajenn web
         title: Skouer deverkadur
       more_title_html: Titouroù ouzhpenn
-      more_1_html: |-
-        Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor roadennoù, lennit <a
-          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">FAG ar reolennoù</a>.
+      more_1_html: Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor
+        roadennoù, lennit  <a href="http://osmfoundation.org/Licence"> Licence OSMF
+        Licence page</a> hag ar gumuniezh <a
       more_2_html: |-
         Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp ket evit pourchas
           un API digoust evit an diorroerien diavaez.
@@ -1148,11 +1147,24 @@ br:
       url: /welcome
       title: Deuet-mat oc'h en OSM
       description: Krogit gant ar sturlevr-mañ evit deskiñ diazezoù OpenStreetMap
+    beginners_guide:
+      title: Sturlevr evit deraouidi
+      description: Sturlevr evit an deraouidi dalc'het gant ar gumuniezh
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Ober ur goulenn pe klask respontoù e lec'hienn goulennoù-respontoù
         OSM
+    mailing_lists:
+      title: Roll skignañ
+    forums:
+      title: Foromoù
+    irc:
+      title: IRC
+      description: Flap etreoberiat e meur a yezh disheñvel ha diwar-benn danvezioù
+        a bep seurt.
+    switch2osm:
+      title: switch2osm
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1179,6 +1191,7 @@ br:
       warnañ. Ma cheñchit ar roadennoù pe ma harpit warno e doareoù zo, e c''hallit
       skignañ an disoc''h dindan ar memes aotre-implij hepken. Sellit ouzh <a href=''%{copyright_path}''>Aotre-eilañ
       ha pajenn an aotre-implij</a> evit gouzout hiroc''h.'
+    legal_title: Lezennel
     partners_title: Kevelerien
   notifier:
     diary_comment_notification:
@@ -1429,9 +1442,7 @@ br:
           primary: Hent bras
           secondary: Hent bihan
           unclassified: Hent n'eo ket rummet
-          unsurfaced: Hent n'eo ket goloet
           track: Roudenn
-          byway: Gwenodenn
           bridleway: Hent evit kezeg
           cycleway: Roudenn divrodegoù
           footway: Hent evit an dud war droad
@@ -1455,7 +1466,6 @@ br:
           golf: Tachenn golf
           park: Park
           resident: Takad annez
-          tourist: Diduañs evit an douristed
           common:
           - prad
           - prad
@@ -1485,7 +1495,6 @@ br:
           tunnel: Bord poentoùigoù = riboul
           bridge: Bord du = pont
           private: Moned prevez
-          permissive: Moned aotreüs
           destination: Moned d'ar pal
           construction: Hentoù war ar stern
     richtext_area:
@@ -1740,6 +1749,28 @@ br:
       auth failure: Ho tigarez, met n'eus ket bet gallet hoc'h anavezout gant an titouroù
         pourchaset.
       openid_logo_alt: Kevreañ gant un OpenID
+      auth_providers:
+        openid:
+          title: Kevreañ ouzh OpenID
+          alt: Kevreañ ouzh un URL OpenID
+        google:
+          title: Kevreañ ouzh Google
+          alt: Kevreañ ouzh OpenID Google
+        facebook:
+          title: Kevreañ ouzh Facebook
+          alt: Kevreañ ouzh ur gont facebook
+        windowslive:
+          title: Kevreañ ouzh Windows Live
+          alt: Kevreañ ouzh ur gont Windows Live
+        yahoo:
+          title: Kevreañ ouzh Yahoo
+          alt: Kevreañ ouzh Yahoo OpenID
+        wordpress:
+          title: Kevreañ ouzh Wordpress
+          alt: Kevreañ ouzh OpenID Wordpress
+        aol:
+          title: Kevreañ ouzh AOL
+          alt: Kevreañ ouzh AOL OpenID
     logout:
       title: Digevreañ
       heading: Kuitaat OpenStreetMap
@@ -1783,6 +1814,7 @@ br:
       display name: 'Anv diskwelet :'
       display name description: Emañ hoc'h anv implijer a-wel d'an holl. Se a c'hallit
         cheñch diwezhatoc'h en ho penndibaboù.
+      external auth: 'Dilesadur trede :'
       password: 'Ger-tremen :'
       confirm password: 'Kadarnaat ar ger-tremen :'
       continue: En em enskrivañ
@@ -1893,6 +1925,7 @@ br:
       current email address: 'Chomlec''h postel a-vremañ :'
       new email address: 'Chomlec''h postel nevez :'
       email never displayed publicly: (n'eo ket diskwelet d'an holl morse)
+      external auth: 'Dilesadur diavaez :'
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: petra eo se ?
@@ -1972,8 +2005,7 @@ br:
       press confirm button: Pouezit war ar bouton kadarnaat evit kadarnaat ho chomlec'h
         postel nevez.
       button: Kadarnaat
-      success: Kadarnaet eo ho chomlec'h postel, trugarez evit bezañ en em enskrivet
-        !
+      success: Kadarnaet eo ho chomlec'h postel !
       failure: Kadarnaet ez eus bet ur chomlec'h postel dija gant art jedouer-mañ.
     set_home:
       flash success: Enrollet eo bet lec'hiadur ar gêr
@@ -2015,6 +2047,9 @@ br:
         <p>
         Gwiriet e vo an diviz-se a-benn nebeut gant ur merour. Gallout a rit mont e darempred gant ar%{webmaster} m'hoc'h eus c'hoant da gaozeal diwar-benn an dra-se.
         </p>
+    auth_failure:
+      connection_failed: C'hwitet eo ar gevreadenn ouzh ur pourchaser dilesa
+      unknown_signature_algorithm: Kod aotre dianav
   user_role:
     filter:
       not_an_administrator: N'eus nemet ar verourien a c'hall merañ ar rolloù, ha
@@ -2132,6 +2167,7 @@ br:
       heading: '%{block_on} stanket gant %{block_by}'
       time_future: Echuiñ a ray a-benn %{time}
       time_past: Echuet %{time} zo
+      created: Krouet
       status: Statud
       show: Diskouez
       edit: Aozañ
@@ -2266,6 +2302,16 @@ br:
         no_route: Ne c'haller ket kavout un hent etre an daou lec'h-mañ.
         no_place: Ho tigarez, ne c'haller ket kavout al lec'h-mañ.
       instructions:
+        turn_right_without_exit: Treiñ a-zehoù war %{name}
+        turn_left_without_exit: Treiñ a-gleiz war %{name}
+        follow_without_exit: Heuliañ %{name}
+        roundabout_without_exit: Er c'hroashent-tro, troit %{name}
+        leave_roundabout_without_exit: Kuitaat ar c'roashent-tro - %{name}
+        stay_roundabout_without_exit: Chom war ar c'hroashent-tro -%{name}
+        start_without_exit: Loc'hañ e dibenn %{name}
+        against_oneway_without_exit: Mont gant ar straed untu war %{name}
+        end_oneway_without_exit: Dibenn an tremen untun war %{name}
+        roundabout_with_exit: Er c'hroashent-tro, kemer an hent-maez %{exit} war %{name}
         unnamed: hep anv
         courtesy: Hent a-berzh %{link}
       time: Eur
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 7f48be0d9..c512b5496 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -7,6 +7,7 @@
 # Author: Edinwiki
 # Author: KWiki
 # Author: Maxmus
+# Author: Palapa
 # Author: Ruila
 # Author: Srdjan m
 ---
@@ -99,6 +100,8 @@ bs:
   browse:
     created: Napravljeno
     closed: Zatvoreno
+    created_html: Kreirano <abbr title='%{title}'>%{time} prije</abbr>
+    closed_html: Zatvoreno <abbr title='%{title}'>%{time} prije</abbr>
     version: Verzija
     in_changeset: Skup promijena
     anonymous: anonimno
@@ -111,11 +114,25 @@ bs:
     changeset:
       title: 'Skup promjena: %{id}'
       belongs_to: Autor
+      node: Čvorovi (%{count})
+      node_paginated: Čvorovi (%{x}-%{y} of %{count})
+      way: Putevi (%{count})
+      way_paginated: Putevi (%{x}-%{y} of %{count})
+      relation: Relacije (%{count})
+      relation_paginated: Relacije (%{x}-%{y} of %{count})
+      comment: Komentari (%{count})
+      hidden_commented_by: Skriveni komentar korisnika %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by: Komentar korisnika %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
       changesetxml: XML seta promjena
       osmchangexml: osmChange XML
       feed:
         title: Set promjena %{id}
         title_comment: Set promjena %{id} - %{comment}
+      discussion: Diskusija
+    node:
+      title: 'Čvor: %{name}'
     way:
       nodes: Tačke
     relation:
@@ -163,6 +180,10 @@ bs:
       wikipedia_link: Članak o %{page} na Wikipediji
     note:
       new_note: Nova bilješka
+      description: Opis
+    query:
+      nearby: Obližnje značajke
+      enclosing: Značajke okruženja
   changeset:
     changeset_paging_nav:
       showing_page: Stranica %{page}
@@ -187,6 +208,8 @@ bs:
     timeout:
       sorry: Žao nam je, listi seta promjena koju ste tražili je predugo trajalo za
         preuzimanje.
+    rss:
+      full: Cijela diskusija
   diary_entry:
     new:
       title: Novi unos u dnevnik
@@ -336,6 +359,7 @@ bs:
           charging_station: Stanica za punjenje
           cinema: Kino
           clinic: Klinika
+          clock: Sat
           college: Koledž
           community_centre: Društveni centar
           courthouse: Sud
@@ -354,6 +378,7 @@ bs:
           food_court: Dvorište restorana
           fountain: Fontana
           fuel: Benzinska pumpa
+          gambling: Kockanje
           grave_yard: Groblje
           gym: Fitness centar
           health_centre: Zdravstveni centar
@@ -364,11 +389,14 @@ bs:
           library: Biblioteka
           market: Tržnica
           marketplace: Tržnica
+          monastery: Manastir
+          motorcycle_parking: Parking za motore
           nightclub: Noćni klub
           nursery: Čuvanje djece
           nursing_home: Starački dom
           office: Kancelarija
           parking: Parking
+          parking_entrance: Ulaz u parking
           pharmacy: Apoteka
           place_of_worship: Bogomolja
           police: Policija
@@ -402,6 +430,7 @@ bs:
           veterinary: Veterinar
           village_hall: Seoski Dom
           waste_basket: Kanta za otpatke
+          waste_disposal: Odlaganje otpada
           youth_centre: Centar za omladinu
         boundary:
           administrative: Administrativna granica
@@ -416,6 +445,15 @@ bs:
           "yes": Most
         building:
           "yes": Građevina
+        craft:
+          carpenter: Stolar
+          electrician: Električar
+          gardener: Vrtlar
+          painter: Slikar
+          photographer: Fotograf
+          plumber: Vodoinstalater
+          shoemaker: Obućar
+          tailor: Krojač
         emergency:
           phone: S.O.S. Telefon
         highway:
@@ -461,7 +499,8 @@ bs:
           archaeological_site: Arheološko nalazište
           battlefield: Bojno polje
           boundary_stone: Granični kamen
-          building: Građevina
+          building: Historijska građevina
+          bunker: Bunker
           castle: Dvorac
           church: Crkva
           citywalls: Gradski zidovi
@@ -473,11 +512,14 @@ bs:
           mine: Rudnik
           monument: Spomenik
           ruins: Ruševine
+          stone: Kamen
           tomb: Grobnica
           tower: Toranj
           wayside_cross: Krajputaš
           wayside_shrine: Usputni hram
           wreck: Olupina
+        junction:
+          "yes": Raskršće
         landuse:
           allotments: Vrtovi
           basin: Bazen
@@ -512,6 +554,7 @@ bs:
         leisure:
           beach_resort: Odmaralište - plaža
           bird_hide: Posmatračnica ptica
+          club: Klub
           common: Općinsko zemljište
           fishing: Ribolovno područje
           fitness_station: Fitnes centar
@@ -525,6 +568,7 @@ bs:
           pitch: Sportski teren
           playground: Igralište
           recreation_ground: Teren za rekreaciju
+          resort: Boravište
           sauna: Sauna
           slipway: Navoz
           sports_centre: Sportski centar
@@ -713,6 +757,7 @@ bs:
           camp_site: Kamp
           caravan_site: Kamp-kućice (mjesto)
           chalet: Planinska kuća
+          gallery: Galerija
           guest_house: Apartman
           hostel: Hostel
           hotel: Hotel
@@ -922,8 +967,11 @@ bs:
       url: /dobrodošlica
     beginners_guide:
       url: http://wiki.openstreetmap.org/wiki/Bs:Beginners%27_guide
+    irc:
+      title: IRC
   about_page:
     next: Slijedeće
+    open_data_title: Open Data
   notifier:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} je komentirao tvoj unos u dnevnik'
@@ -989,6 +1037,13 @@ bs:
         njihovim e-mail adresama openstreetmap.org računa.
       click_the_link: Ako ste ovo Vi, kliknite na link ispod za ponovno postavljanje
         lozinke.
+    note_comment_notification:
+      greeting: Zdravo,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} je dao komentar na jednu od tvojih
+          bilješki.'
+    changeset_comment_notification:
+      greeting: Zdravo,
   message:
     inbox:
       title: Dolazna pošta
@@ -1098,6 +1153,8 @@ bs:
       close: Zatvoriti
     search:
       search: Pretraga
+      from: Od
+      to: Za
       where_am_i: Gdje sam?
       where_am_i_title: Opišite trenutnu lokaciju koristeći pretraživač
       submit_text: Idi
@@ -1109,9 +1166,7 @@ bs:
           primary: Državna cesta
           secondary: Sekundarna cesta
           unclassified: Neklasificirana cesta
-          unsurfaced: Neasfaltirana cesta
           track: Staza
-          byway: Prečica
           bridleway: Konjička staza
           cycleway: Biciklistička staza
           footway: Pješačka staza
@@ -1135,7 +1190,6 @@ bs:
           golf: Golf teren
           park: Park
           resident: Stambeno područje
-          tourist: Turistička atrakcija
           common:
           - Travnjaci
           - Livada
@@ -1165,7 +1219,6 @@ bs:
           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most
           private: Privatni pristup
-          permissive: Pristup uz dozvolu
           destination: Pristup odredištu
           construction: Ceste u izgradnji
     richtext_area:
@@ -1279,6 +1332,7 @@ bs:
       public_traces: Javne GPS trase
       your_traces: Vaše GPS trase
       public_traces_from: Javne GPS trase korisnika %{user}
+      description: Pretraži nedavno objavljene GPS tragove
       tagged_with: ' označeno sa %{tags}'
       empty_html: JNoš uvijek nema ništa ovdje. <a href='%{upload_link}'>Postavite
         novu trasu</a> ili naučite više o GPS trasiranju na <a href='http://wiki.openstreetmap.org/wiki/Bs:Beginners'_guide'>wiki
@@ -1343,6 +1397,7 @@ bs:
       allow_write_api: Izmijenite kartu.
       allow_read_gpx: Pročitajte njihove privatne GPS trase.
       allow_write_gpx: Postaviti GPS trase.
+      allow_write_notes: izmijeni bilješke.
     index:
       title: Moji OAuth detalji
       my_tokens: Moje ovlaštene aplikacije
@@ -1369,6 +1424,7 @@ bs:
       allow_write_api: Izmijenite kartu.
       allow_read_gpx: Pročitajte njihove privatne GPS trase.
       allow_write_gpx: Postaviti GPS trase.
+      allow_write_notes: izmijeni bilješke.
     not_found:
       sorry: Žao mi je, taj se %{type} ne može naći.
     create:
@@ -1403,6 +1459,13 @@ bs:
         da diskutujete o ovome.
       auth failure: Žao mi je, ne možemo Vas prijaviti s ovim detaljima.
       openid_logo_alt: Prijavite se sa OtvorenimID
+      auth_providers:
+        yahoo:
+          title: Prijavite se sa Yahoo nalogom
+          alt: Prijavite se sa Yahoo OpenID
+        wordpress:
+          title: Prijavite se sa Wordpress nalogom
+          alt: Prijavite se sa Wordpress OpenID
     logout:
       title: Odjava
       heading: Odjava iz OpenStreetMap
@@ -1478,6 +1541,7 @@ bs:
       new diary entry: Novi unos u dnevnik
       my edits: Moje promjene
       my traces: Moje trase
+      my profile: Moj profil
       my settings: Moja podešavanja
       my comments: Moji komentari
       oauth settings: Oauth podešavanja
@@ -1765,6 +1829,8 @@ bs:
       heading: '%{block_on} blokiran od strane %{block_by}'
       time_future: Završava u %{time}
       time_past: Završeno prije %{time}
+      created: Napravljeno
+      ago: '%{time} prije'
       status: Stanje
       show: Pokazati
       edit: Urediti
@@ -1775,8 +1841,11 @@ bs:
       revoker: 'Opozivalac:'
       needs_view: Korisnik se mora prijaviti prije nego se blokada očisti.
   note:
+    description:
+      opened_at_html: Kreirano prije %{when}
     mine:
       id: Id
+      creator: Izradio
       description: Opis
       created_at: 'Napravljeno:'
       last_changed: Posljednji put promijenjeno
@@ -1790,9 +1859,11 @@ bs:
       link: Veza ili HTML
       long_link: Veza
       short_link: Kratki link
+      geo_uri: Geo URI
       embed: HTML
       custom_dimensions: Postavi prilagođene dimenzije
       format: 'Format:'
+      scale: 'Mjerilo:'
       download: Preuzmi
       short_url: Kratki URL
       include_marker: Uključi oznaku
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index a08e74574..ac81381db 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -4,6 +4,7 @@
 # Author: Aleator
 # Author: Alvaro Vidal-Abarca
 # Author: Annamerida
+# Author: Eduardo Martinez
 # Author: El libre
 # Author: Fitoschido
 # Author: Gemmaa
@@ -949,7 +950,7 @@ ca:
       h1: OpenStreetMap
     logo:
       alt_text: logotip de l'OpenStreetMap
-    home: Anar a la localització de casa
+    home: Vés a la ubicació d'inici
     logout: Tancar sessió
     log_in: Inicia sessió
     log_in_tooltip: Inicia una sessió amb un compte existent
@@ -1081,6 +1082,9 @@ ca:
       contributors_nz_html: |-
         <strong>Nova Zelanda</strong>: conté dades d'origen de
             Informació Nova Zelanda de la terra. Corona de drets d'autor reservat.
+      contributors_si_html: '<strong>Eslovènia</strong>: Conté dades de l''<a href="http://www.gu.gov.si/en/">Autoritat
+        de Topografia i Cartografia</a> i el <a href="http://www.mkgp.gov.si/en/">Ministeri
+        d''Agricultura, Silvicultura i Alimentació</a> (informació pública d''Eslovènia).'
       contributors_za_html: |-
         <strong>Sud-àfrica</strong>: conté dades del
         <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1107,6 +1111,10 @@ ca:
         per eliminar dades protegides pels drets d'autor</a> o empleneu aquest <a
         href="http://dmca.openstreetmap.org/">formulari en línia.</a>.
       trademarks_title_html: <span id="trademarks"></span>Marques registrades
+      trademarks_1_html: OpenStreetMap i el logotip de la lupa són marques registrades
+        de la Fundació OpenStreetMap. Si vostè té preguntes sobre l'ús de les marques,
+        si us plau envieu les vostres preguntes a la <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Grup
+        de Treball de Llicències</a>.
   welcome_page:
     title: Benvingut!
     introduction_html: Us donem la benvinguda a l'OpenStreetMap, el mapa lliure i
@@ -1135,6 +1143,14 @@ ca:
         sèquia, llac o edifici.
       tag_html: Una <strong>etiqueta</strong> és un recull de dades sobre un node
         o una via, com ara el nom d'un restaurant o la velocitat màxima d'una carretera.
+    rules:
+      title: Regles
+      paragraph_1_html: "OpenStreetMap té poques les regles formals, pel que esperem
+        que tots els participants col·laborin i es comuniquin amb la comunitat. Si
+        està considerant\naltres activitats que no sigui l'edició manual, si us plau,
+        llegiu i seguiu les directrius d' \n<a href=\"http://wiki.openstreetmap.org/wiki/Import/Guidelines\">Importació</a>
+        i \n<a href=\"http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct\">Edició
+        Automàtica</a>."
     questions:
       title: Alguna pregunta més?
       paragraph_1_html: OpenStreetMap té multitud de recursos per conèixer aquest
@@ -1190,10 +1206,19 @@ ca:
         respostes d'OSM.
     mailing_lists:
       title: Llistes de correu
+      description: Pregunta o debat sobre qüestions interessants en relació a una
+        àmplia sèrie de llistes de correu tòpiques o regionals.
     forums:
       title: Fòrums
+      description: Preguntes i debats, per a aquells que prefereixen l'estil de la
+        interfície d'un tauler d'anuncis.
     irc:
       title: IRC
+      description: Xat interactiu en llengües diferents i sobre diferents temes.
+    switch2osm:
+      title: switch2osm
+      description: Ajuda per a empreses i organitzacions que canviïn als mapes i altres
+        serveis basats en OpenStreetMap.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1221,6 +1246,11 @@ ca:
       podeu distribuir el resultat només sota la mateixa llicència. Vegeu la <a href=''%{copyright_path}''>pàgina
       de copyright i llicència</a> per a més detalls.'
     legal_title: Avisos legals
+    legal_html: "Aquest lloc web i molts altres serveis relacionats són operats formalment
+      per l' \n<a href=\"http://osmfoundation.org/\">OpenStreetMap Fundació</a> (OSMF)
+      \ en nom de la comunitat.\n<br> \nSi us plau <a href=\"http://osmfoundation.org/Contact\">contacteu
+      amb l'OSMF</a> \nsi teniu qüestions sobre llicències, drets d'autor o altres
+      aspectes legals."
     partners_title: Socis
   notifier:
     diary_comment_notification:
@@ -1463,9 +1493,7 @@ ca:
           primary: Carretera principal
           secondary: Carretera secundària
           unclassified: Carretera sense classificar
-          unsurfaced: Unsurfaced road
           track: Pista
-          byway: Byway
           bridleway: Camí de ferradura
           cycleway: Carril bici
           footway: Footway
@@ -1489,7 +1517,6 @@ ca:
           golf: Camp de golf
           park: Parc
           resident: Zona residencial
-          tourist: Atracció turística
           common:
           - Comú
           - Prat
@@ -1519,7 +1546,6 @@ ca:
           tunnel: Carcassa de guions = túnel
           bridge: Embolcall negre = bridge
           private: Accés privat
-          permissive: Permissiva accés
           destination: Accés de destinació
           construction: Carreteres en construcció
     richtext_area:
@@ -1765,6 +1791,7 @@ ca:
       register now: Registreu-vos-hi ara
       with username: 'Ja teniu un compte de l''OpenStreetMap? Incieu sessió amb el
         nom d''usuari i contrasenya:'
+      with external: Alternativament, inicieu una sessió mitjançant un tercer
       new to osm: Nou a OpenStreetMap?
       to make changes: Per fer canvis a les dades de OpenStreetMap, ha de tenir un
         compte.
@@ -1778,6 +1805,28 @@ ca:
         si voleu parlar-ne.
       auth failure: Ho sentim, no podeu registrar-vos amb aquesta informació.
       openid_logo_alt: Inicia sessió amb un compte OpenID
+      auth_providers:
+        openid:
+          title: Inicia sessió amb un compte OpenID
+          alt: Inicia sessió amb un compte OpenID
+        google:
+          title: Inicieu la sessió amb Google
+          alt: Inici de sessió amb un compte OpenID de Google
+        facebook:
+          title: Inicieu la sessió amb Facebook
+          alt: Entrar amb un Compte de Facebook
+        windowslive:
+          title: Inici de sessió amb Windows Live
+          alt: Inici de sessió amb un Compte de Windows Live
+        yahoo:
+          title: Inicieu la sessió amb Yahoo
+          alt: Inici de sessió amb un compte OpenID de Yahoo
+        wordpress:
+          title: Inicieu sessió amb Wordpress
+          alt: Inici de sessió amb un compte OpenID de Wordpress
+        aol:
+          title: Inici de sessió amb AOL
+          alt: Inici de sessió amb un compte OpenID d'AOL
     logout:
       title: Tanca la sessió
       heading: Tanca la sessió d'OpenStreetMap
@@ -1822,8 +1871,20 @@ ca:
       display name: 'Nom visible:'
       display name description: El nom d'usuari que es motrarà públicament. El podeu
         canviar més endavant a les preferències.
+      external auth: 'Autenticació mitjançant tercers:'
       password: 'Contrasenya:'
       confirm password: 'Confirmeu la contrasenya:'
+      use external auth: Alternativament, inicieu una sessió mitjançant un tercer
+      auth no password: Amb l'autentificació per tercers no es requereix una contrasenya,
+        però alguns servidors o eines extres poden encara necessitar una.
+      auth association: |-
+        <p>El ID no està associat encara amb cap compte d'OpenStreetMap.</p>
+        <ul>
+         <li>Si sou nou a OpenStreetMap, si us plau creeu un compte utilitzant el formulari següent.</li>
+         <li>
+         Si ja teniu un compte, podeu iniciar la sessió al vostre compte  utilitzant el seu nom d'usuari i contrasenya i, a continuació associar el compte amb el seu ID a la seva configuració d'usuari.
+         </li>
+        </ul>
       continue: Crear un compte
       terms accepted: Gràcies per a l'acceptació de les condicions de col. laborador
         nou!
@@ -1980,7 +2041,7 @@ ca:
       no home location: No heu especificat la ubicació d'origen.
       latitude: 'Latitud:'
       longitude: 'Longitud:'
-      update home location on click: Localització de casa d'actualització quan faig
+      update home location on click: Voleu actualitzar la ubicació d'inici en fer
         clic al mapa?
       save changes button: Desa els canvis
       make edits public button: Fes totes les meves modificacions públiques
@@ -2013,10 +2074,11 @@ ca:
       press confirm button: Premeu el botó de confirmar sota per confirmar la seva
         adreça de correu electrònic nou.
       button: Confirma
-      success: S'ha confirmat l'adreça electrònica, gràcies per registrar-vos-hi!
+      success: S'ha confirmat el canvi de la teva adreça electrònica!
       failure: Una adreça de correu electrònic ja ha estat confirmat amb aquesta fitxa.
+      unknown_token: Aquest codi de confirmació ha expirat o no existeix.
     set_home:
-      flash success: Localització de casa desat correctament
+      flash success: La ubicació d'inici s'ha desat correctament
     go_public:
       flash success: Ara totes les vostres edicions són públiques i ja teniu autorització
         per editar
@@ -2057,6 +2119,12 @@ ca:
           Aquesta decisió serà revisat per un administrador en breu, o
           es pot contactar amb el %{webmaster} si desitgeu discutir això.
         </p>
+    auth_failure:
+      connection_failed: La connexió al proveïdor d'autenticació ha fallat
+      invalid_credentials: Credencials d'autenticació no vàlides
+      no_authorization_code: Sense codi d'autorització
+      unknown_signature_algorithm: Algorisme de signatura desconegut
+      invalid_scope: Àmbit no vàlid
   user_role:
     filter:
       not_an_administrator: Només els administradors poden realitzar l'administració
@@ -2174,6 +2242,8 @@ ca:
       heading: '%{block_on} bloquejat per %{block_by}'
       time_future: Finalitza en %{time}
       time_past: Va acabar fa %{time}
+      created: Creat
+      ago: fa %{time}
       status: Estat
       show: Mostra
       edit: Edició
@@ -2224,6 +2294,7 @@ ca:
       link: Enllaç o HTML
       long_link: Enllaç
       short_link: Enllaç curt
+      geo_uri: Geo-URI
       embed: HTML
       custom_dimensions: Estableix dimensions personalitzades
       format: 'Format:'
@@ -2316,13 +2387,16 @@ ca:
         sharp_left_without_exit: Gira a l'esquerra a %{name}
         turn_left_without_exit: Gira a l'esquerra per %{name}
         slight_left_without_exit: Gira lleugerament a l'esquerra a %{name}
+        via_point_without_exit: (pel punt)
         follow_without_exit: Segueix %{name}
         roundabout_without_exit: A la rotonda agafa %{name}
         leave_roundabout_without_exit: Surt de la rotonda %{name}
         stay_roundabout_without_exit: Segueix a la rotonda - %{name}
         start_without_exit: Comença al final de %{name}
         destination_without_exit: Arriba a la destinació.
+        against_oneway_without_exit: Anar en contra-direcció a %{name}
         end_oneway_without_exit: Fi del sentit únic a %{name}
+        roundabout_with_exit: A la rotonda, agafar la sortida %{exit} a %{name}
         unnamed: sense nom
         courtesy: Direccions cortesia de %{link}
       time: Temps
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 98e3b932d..a791ab9fb 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1453,9 +1453,7 @@ cs:
           primary: Silnice první třídy
           secondary: Silnice druhé třídy
           unclassified: Silnice
-          unsurfaced: Nezpevněná cesta
           track: Lesní a polní cesta
-          byway: Cesta
           bridleway: Koňská stezka
           cycleway: Cyklostezka
           footway: Pěší cesta
@@ -1479,7 +1477,6 @@ cs:
           golf: Golfové hřiště
           park: Park
           resident: Obytná oblast
-          tourist: Turistická atrakce
           common:
           - Pastvina
           - louka
@@ -1509,7 +1506,6 @@ cs:
           tunnel: Čárkované obrysy = tunel
           bridge: Černé obrysy = most
           private: Soukromý pozemek
-          permissive: Přístup tolerován
           destination: Průjezd zakázán
           construction: Cesta ve výstavbě
     richtext_area:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index e2650c14f..ea1ee3192 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -923,7 +923,6 @@ cy:
           primary: Priffordd
           secondary: Ffordd eilaidd
           unclassified: Ffordd annosbarthedig
-          unsurfaced: Ffordd heb arwyneb
           track: Trac
           footway: Ffordd droed
           rail: Rheilffordd
@@ -936,7 +935,6 @@ cy:
           wood: Coed
           golf: Cwrs golff
           park: Parc
-          tourist: Atyniad twristiaid
           common:
           - Comin
           - dôl
@@ -963,7 +961,6 @@ cy:
           - Copa
           - Crib
           private: Mynediad preifat
-          permissive: Mynediad gyda chaniatâd
           destination: Mynediad cyrchfan
     richtext_area:
       edit: Golygu
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 7b0660afc..e81d19cb6 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1434,9 +1434,7 @@ da:
           primary: Hovedvej (primærrute)
           secondary: Hovedvej (sekundærrute)
           unclassified: Anden vej
-          unsurfaced: Uasfalteret vej
           track: Hjulspor
-          byway: Stikvej
           bridleway: Ridesti
           cycleway: Cykelsti
           footway: Gangsti
@@ -1460,7 +1458,6 @@ da:
           golf: Golfbane
           park: Park
           resident: Boligområde
-          tourist: Seværdighed
           common:
           - Fælled
           - eng
@@ -1490,7 +1487,6 @@ da:
           tunnel: Stiplet kant = tunnel
           bridge: Sort kant = bro
           private: Privat adgang
-          permissive: Adgang kræver tilladelse
           destination: Ærindekørsel tilladt
           construction: Veje under konstruktion
     richtext_area:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a7b9f3e43..a8d002b80 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1264,13 +1264,12 @@ de:
       abänderst oder auf bestimmte Art einbaust, darfst du das Ergebnis nur unter
       der gleichen Lizenz verbreiten. Siehe die
       <a href='%{copyright_path}'>Urheberrechts- und Lizenzseite</a> für Einzelheiten.
-    legal_title: Gesetzliche Hinweise
-    legal_html: |-
-      Diese Website und viele andere ähnliche Dienste werden im Auftrag der Gemeinschaft
-      formal betrieben von der <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF).
-      <br>
-      Bitte <a href='http://osmfoundation.org/Contact'>kontaktiere die OSMF</a>,
-      falls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen und Probleme hast.
+    legal_title: Rechtliche Hinweise
+    legal_html: "Diese Website und viele damit in Zusammenhang stehende Dienste werden
+      \nvon der <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+      für die OSM-Gemeinschaft betrieben.\n<br>\nBitte <a href='http://osmfoundation.org/Contact'>kontaktiere
+      die OSMF</a>,\nfalls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen
+      und Probleme hast."
     partners_title: Partner
   notifier:
     diary_comment_notification:
@@ -1517,9 +1516,7 @@ de:
           primary: Bundesstraße
           secondary: Landes-, Kreisstraße
           unclassified: Straße
-          unsurfaced: Unbefestigte Straße
           track: Wald-, Feldweg
-          byway: Seitenweg (brit.)
           bridleway: Reitweg
           cycleway: Radweg
           footway: Fußweg
@@ -1543,7 +1540,6 @@ de:
           golf: Golfplatz
           park: Park
           resident: Wohngebiet
-          tourist: Sehenswürdigkeit
           common:
           - öffentliche Grünfläche (brit.)
           - Wiese
@@ -1573,7 +1569,6 @@ de:
           tunnel: Strichlierter Rand = Tunnel
           bridge: Dicker Rand = Brücke
           private: Privater Zugang
-          permissive: Eingeschänkter Zugang
           destination: Nur für Anrainer
           construction: Straße im Bau
     richtext_area:
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 75578d9d6..9d90c821e 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -487,7 +487,6 @@ diq:
       table:
         entry:
           track: Raya Herın
-          byway: Raya Bınêk
           bridleway: Raya Ancınıştan
           cycleway: Raya Bisiklet
           apron:
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 764381ddb..f59d4e007 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1312,9 +1312,7 @@ dsb:
           primary: Zwězkowa droga
           secondary: Nakrajna droga
           unclassified: Njeklasificěrowana droga
-          unsurfaced: Njewobtwarźona droga
           track: Cera
-          byway: Bocna droga
           bridleway: Rejtarska drožka
           cycleway: Sćažka za kolesowarjow
           footway: Drožka
@@ -1338,7 +1336,6 @@ dsb:
           golf: Golfowišćo
           park: Park
           resident: Bydleński wobcerk
-          tourist: Turistowa atrakcija
           common:
           - Powšykny
           - łuka
@@ -1368,7 +1365,6 @@ dsb:
           tunnel: Smužkowane wobcerjenje = tunel
           bridge: Carne wobcerjenje = móst
           private: Priwatny pśistup
-          permissive: Dowólony pśistup
           destination: Jano za pśigranicujucych
           construction: Drogi w twari
     richtext_area:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 6afb3f2c5..99e85a89d 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -16,6 +16,7 @@
 # Author: Protnet
 # Author: Ruila
 # Author: Shirayuki
+# Author: Stam.nikos
 # Author: Zserdx
 # Author: 아라
 ---
@@ -644,7 +645,9 @@ el:
           beach_resort: Παραθαλάσσιο Θέρετρο
           bird_hide: Καταφύγιο Πουλιών
           common: Κοινόχρηστη Γη
+          dog_park: Πάρκο σκύλων
           fishing: Αλιευτική Περιοχή
+          fitness_centre: Κέντρο αδυνατίσματος
           fitness_station: Γυμναστήριο
           garden: Κήπος
           golf_course: Γήπεδο Γκολφ
@@ -657,6 +660,7 @@ el:
           pitch: Γήπεδο Αθλητισμού
           playground: Παιδική Χαρά
           recreation_ground: Χώρος Αναψυχής
+          resort: Θέρετρο
           sauna: Σάουνα
           slipway: Γλίστρα
           sports_centre: Αθλητικό Κέντρο
@@ -974,9 +978,9 @@ el:
       mapping_link: αρχίστε τη χαρτογράφηση
     legal_babble:
       title_html: Πνευματικά Δικαιώματα και Άδεια Χρήσης
-      intro_1_html: Το OpenStreetMap είναι βάση <i>ανοικτών δεδομένων</i> αδειοδοτημένα
-        υπό την <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons
-        Open Database License</a> (ODbL).
+      intro_1_html: |-
+        Το OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> είναι βάση <i>ανοικτών δεδομένων</i> αδειοδοτημένα υπό την <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) από το <a
+        href="http://osmfoundation.org/">Ίδρυμα OpenStreetMap</a> (OSMF).
       intro_2_html: Είστε ελεύθεροι να αντιγράψετε, να διανείμετε, μεταδώσετε και
         προσαρμόσετε τα δεδομένα μας εφόσον μνημονέψετε το OpenStreetMap και τους
         συνεισφέροντές του. Εάν αλλοιώσετε ή αξιοποιήσετε τα δεδομένα μας, μπορείτε
@@ -1001,8 +1005,8 @@ el:
         title: Παράδειγμα αναφοράς δημιουργού
       more_title_html: Μαθαίνοντας περισσότερα
       more_1_html: |-
-        Διαβάστε περισσότερα σχετικά με τη χρήση των δεδομένων μας, και πώς να μας μνημονεύσετε στην σελίδα περί <a
-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">συχνές νομικές ερωτήσεις</a>.
+        Διαβάστε περισσότερα σχετικά με τη χρήση των δεδομένων μας, και πώς να μας μνημονεύσετε στην <a href="http://osmfoundation.org/Licence">σελίδα Άδειας OSMF</a> και τις <a
+        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">συχνές νομικές ερωτήσεις</a> της κοινότητας.
       more_2_html: |-
         Παρόλο που το OpenStreetMap αποτελείται από ανοικτά δεδομένα, δεν μπορούμε να προσφέρουμε ένα
         δωρεάν API χαρτών για τρίτους προγραμματιστές.
@@ -1018,6 +1022,12 @@ el:
         <a href="http://data.wien.gv.at/">Stadt Wien</a> (υπό  <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
         <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> και
         Land Tirol (υπό <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT με τροποποιήσεις</a>).
+      contributors_ca_html: |-
+        <strong>Καναδάς</strong>: Περιέχει δεδομένα από τα
+        GeoBase®, GeoGratis (© Τμήμα Φυσικών
+        Πόρων Καναδά), CanVec (© Τμήμα Φυσικών
+        Πόρων Καναδά) και StatCan (Γεωγραφική Διαίρεση,
+        Στατιστική Υπηρεσία Καναδά).
       contributors_fi_html: "<strong>Φινλανδία</strong>: Περιέχει δεδομένα από το
         National Land Survey of Finland's Topographic Database\nκαι άλλα datasets,
         υπό την \n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI
@@ -1026,6 +1036,13 @@ el:
         από το Direction Générale des Impôts.'
       contributors_nl_html: '<strong>Ολλανδία</strong>: Περιέχει δεδομένα που προέρχονται
         από το AND &copy; 2007 (<a href="http://www.and.com">www.and.com</a>)'
+      contributors_nz_html: '<strong>Νέα Ζηλανδία</strong>: Περιέχει δεδομένα που
+        πηγάζουν από την Υπηρεσία Πληροφοριών Γης Νέας Ζηλανδίας. Τα Πνευματικά Δικαιώματα
+        Crown είναι κατωχυρωμένα.'
+      contributors_si_html: |-
+        <strong>Σλοβενία</strong>: Περιέχει δεδομένα από την
+        <a href="http://www.gu.gov.si/en/">Αρχή Τοπογραφίας και Χαρτογράφησης</a> και το <a href="http://www.mkgp.gov.si/en/">Υπουργείο Γεωργίας, Δασών και Τροφίμων</a>
+        (δημόσιες πληροφορίες της Σλοβενίας).
       contributors_za_html: |-
         <strong>Νότια Αφρική</strong>: Περιεχέι δεδομένα που προέρχονται από το
         <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1042,6 +1059,7 @@ el:
         τον ιστότοπο, παρακαλούμε απευθυνθείτε στη <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">
         διαδικασία απομάκρυνσης </a> ή καταθέστε άμεσα μια αίτηση στην <a href="http://dmca.openstreetmap.org/">on-line
         σελίδα αιτήσεων</a>.
+      trademarks_title_html: <span id="trademarks"></span>Εμπορικά σήματα
   welcome_page:
     title: Καλώς ήρθατε!
     introduction_html: Σας καλωσορίζουμε στο OpenStreetMap, τον ελεύθερο και επεξεργάσιμο
@@ -1070,6 +1088,8 @@ el:
       tag_html: Τα <strong>χαρακτηριστικά</strong> είναι δεδομένα που σχετίζονται
         με κόμβους ή διαδρομές, όπως τα ονόματα εστιατορίως ή τα όριο ταχύτητας διάφορων
         δρόμων.
+    rules:
+      title: Κανόνες!
     questions:
       title: Ερωτήσεις;
       paragraph_1_html: |-
@@ -1114,11 +1134,17 @@ el:
         OpenStreetMap.
     beginners_guide:
       url: http://wiki.openstreetmap.org/wiki/El:Beginners%27_guide
+      title: Οδηγός Αρχαρίων
+      description: Οδηγός αρχαρίων διατηρούμενη από την κοινότητα.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Κάνετε ένα ερώτημα ή αναζητήσετε απαντήσεις στην ιστοσελίδα ερωτήσεων
         και απαντήσεων του OSM.
+    mailing_lists:
+      title: Λίστες Αλληλογραφίας
+      description: Κάντε μία ερώτηση ή συζητήστε ενδιαφέροντα θέματα σε ένα ευρύ φάσμα
+        τοπικών ή περιφερειακών λιστών αλληλογραφίας.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1365,6 +1391,8 @@ el:
       close: Κλείσιμο
     search:
       search: Αναζήτηση
+      get_directions: Λάβετε οδηγίες
+      get_directions_title: Βρείτε οδηγίες μεταξύ δύο σημείων
       from: Από
       to: Προς
       where_am_i: Πού είμαι;
@@ -1378,9 +1406,7 @@ el:
           primary: Κύρια Οδός
           secondary: Δευτερεύουσα Οδός
           unclassified: Αταξινόμητη Οδός
-          unsurfaced: Δρόμος χωρίς Επίστρωση
           track: Χωματόδρομος
-          byway: Παράδρομος
           bridleway: Μονοπάτι για Άλογα
           cycleway: Ποδηλατόδρομος
           footway: Μονοπάτι
@@ -1403,7 +1429,6 @@ el:
           golf: Γήπεδο γκολφ
           park: Πάρκο
           resident: Κατοικημένη περιοχή
-          tourist: Τουριστικό αξιοθέατο
           common:
           - Κοινόχρηστο
           - λιβάδι
@@ -1433,7 +1458,6 @@ el:
           tunnel: Διακεκομμένο περίβλημα = σήραγγα
           bridge: Μαύρο περίβλημα = γέφυρα
           private: Ιδιωτική πρόσβαση
-          permissive: Ανεκτική πρόσβαση
           destination: Πρόσβαση προορισμού
           construction: Δρόμοι υπό κατασκευή
     richtext_area:
@@ -1645,6 +1669,28 @@ el:
         εάν θέλετε να το συζητήσετε.
       auth failure: Λυπάμαι, δεν μπορείτε να συνδεθείτε με αυτές τις λεπτομέρειες.
       openid_logo_alt: Σύνδεση με ένα OpenID
+      auth_providers:
+        openid:
+          title: Σύνδεση με ένα OpenID
+          alt: Σύνδεση με ένα OpenID URL
+        google:
+          title: Σύνδεση με το Google
+          alt: Σύνδεση με ένα Google OpenID
+        facebook:
+          title: Σύνδεση με το Facebook
+          alt: Σύνδεση με έναν Λογαριασμό Facebook
+        windowslive:
+          title: Σύνδεση με το Windows Live
+          alt: Σύνδεση με ένα Λογαριασμό Windows Live
+        yahoo:
+          title: Σύνδεση με το Yahoo
+          alt: Σύνδεση με ένα Yahoo OpenID
+        wordpress:
+          title: Σύνδεση με το Wordpress
+          alt: Σύνδεση με ένα Wordpress OpenID
+        aol:
+          title: Σύνδεση με την AOL
+          alt: Σύνδεση με ένα AOL OpenID
     logout:
       title: Αποσύνδεση
       heading: Αποσύνδεση από το OpenStreetMap
@@ -1670,6 +1716,11 @@ el:
       flash changed: Ο κωδικός σας αλλάχτηκε.
     new:
       title: Εγγραφή
+      no_auto_account_create: Δυστυχώς δεν μπορούμε να δημιουργήσουμε αυτόματα έναν
+        λογαριασμό για εσάς.
+      contact_webmaster: Επικοινωνήστε με τον <a href="mailto:webmaster@openstreetmap.org">webmaster</a>
+        για να κανονίσετε για τη δημιουργία ενός λογαριασμού - θα προσπαθήσουμε να
+        ικανοποιήσουμε το αίτημά σας το συντομότερο δυνατόν.
       about:
         header: Ελεύθερος και επεξεργάσιμος
         html: |-
@@ -1794,6 +1845,7 @@ el:
       current email address: 'Τωρινή Διεύθυνση Ηλεκτρονικού Ταχυδρομείου:'
       new email address: 'Νέα Διεύθυνση ηλεκτρονικού ταχυδρομείου:'
       email never displayed publicly: (όχι δημόσια εμφάνιση)
+      external auth: 'Εξωτερικός Έλεγχος Ταυτότητας:'
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: τι είναι αυτό;
@@ -1871,10 +1923,10 @@ el:
       press confirm button: Πατήστε το κουμπί «Επιβεβαίωση» παρακάτω για να επιβεβαιώσετε
         τη νέα διεύθυνση ηλεκτρονικού ταχυδρομείου σας.
       button: Επιβεβαίωση
-      success: Επιβεβαιώθηκε η διεύθυνση ηλεκτρονικού ταχυδρομείου σας, σας ευχαριστούμε
-        για την εγγραφή σας!
+      success: Επιβεβαιώθηκε η αλλαγή της διεύθυνσης ηλεκτρονικού ταχυδρομείου σας!
       failure: Μια διεύθυνση ηλεκτρονικού ταχυδρομείου έχει ήδη επιβεβαιωθεί με αυτό
         το διακριτικό.
+      unknown_token: Αυτός ο κωδικός επιβεβαίωσης έχει λήξει ή δεν υπάρχει.
     set_home:
       flash success: Η τοποθεσία σπιτιού αποθηκεύτηκε επιτυχώς
     go_public:
@@ -1995,6 +2047,8 @@ el:
       heading: Ο %{block_on} έχει φραχτεί από τον %{block_by}
       time_future: Τελειώνει σε %{time}
       time_past: Τελείωσε %{time} πριν
+      created: Δημιουργήθηκε
+      ago: πρίν από %{time}
       status: Κατάσταση
       show: Εμφάνιση
       edit: Επεξεργασία
@@ -2125,8 +2179,27 @@ el:
         mapquest_car: Αυτοκίνητο (MapQuest)
         mapquest_foot: Με τα πόδια (MapQuest)
         osrm_car: Αυτοκίνητο (OSRM)
+      directions: Οδηγίες
       distance: Απόσταση
+      errors:
+        no_route: Δεν βρέθηκε διαδρομή ανάμεσα σε αυτά τα δύο μέρη.
+        no_place: Συγγνώμη, δεν βρέθηκε αυτό το μέρος.
       instructions:
+        continue_without_exit: Συνεχίστε στην %{name}
+        slight_right_without_exit: Ελαφριά δεξιά στην %{name}
+        turn_right_without_exit: Στρίψτε δεξιά στην %{name}
+        sharp_right_without_exit: Κλειστά δεξιά στην %{name}
+        uturn_without_exit: Αναστροφή στην %{name}
+        sharp_left_without_exit: Κλειστά αριστερά στην %{name}
+        turn_left_without_exit: Στρίψτε αριστερά στην %{name}
+        slight_left_without_exit: Ελαφριά αριστερά στην %{name}
+        follow_without_exit: Ακολουθήστε την %{name}
+        roundabout_without_exit: Στον κυκλικό κόμβο πάρτε την %{name}
+        leave_roundabout_without_exit: Βγείτε από τον κυκλικό κόμβο - %{name}
+        stay_roundabout_without_exit: Μείνετε στον κυκλικό κόμβο - %{name}
+        destination_without_exit: Φτάσατε στον προορισμό σας
+        against_oneway_without_exit: Πηγαίνετε αντίθετα στον μονόδρομο %{name}
+        end_oneway_without_exit: Τέλος του μονόδρομου %{name}
         roundabout_with_exit: Στην κυκλική διασταύρωση, πάρτε την έξοδο %{exit} προς
           %{name}
         unnamed: ανώνυμος δρόμος
@@ -2136,6 +2209,8 @@ el:
       way: Διαδρομή
       relation: Σχέση
       nothing_found: Δεν βρέθηκαν χαρακτηριστικά
+      error: 'Σφάλμα επικοινωνίας με τον %{server}: %{error}'
+      timeout: Έληξε το χρονικό όριο επικοινωνίας με %{server}
   redaction:
     edit:
       description: Περιγραφή
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index feb0c4f2f..f7eeb09fc 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -6,6 +6,7 @@
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
+# Author: Jagwar
 # Author: Shirayuki
 ---
 en-GB:
@@ -1360,9 +1361,7 @@ en-GB:
           primary: Primary road
           secondary: Secondary road
           unclassified: Unclassified road
-          unsurfaced: Unsurfaced road
           track: Track
-          byway: Byway
           bridleway: Bridleway
           cycleway: Cycleway
           footway: Footway
@@ -1386,7 +1385,6 @@ en-GB:
           golf: Golf course
           park: Park
           resident: Residential area
-          tourist: Tourist attraction
           common:
           - Common
           - meadow
@@ -1416,7 +1414,6 @@ en-GB:
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
-          permissive: Permissive access
           destination: Destination access
           construction: Roads under construction
     richtext_area:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3c697a26c..77b8de783 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,6 +1,7 @@
 # Messages for Spanish (español)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Alberto Chung
 # Author: Armando-Martin
 # Author: Carlosz22
 # Author: Crazymadlover
@@ -1479,9 +1480,7 @@ es:
           primary: Vía primaria
           secondary: Vía secundaria
           unclassified: Carretera sin clasificar
-          unsurfaced: Carretera sin asfaltar
           track: Pista
-          byway: Camino
           bridleway: Vía ecuestre
           cycleway: Bicisenda
           footway: Vía peatonal
@@ -1505,7 +1504,6 @@ es:
           golf: Campo de golf
           park: Parque
           resident: Zona residencial
-          tourist: Atracción turística
           common:
           - Común
           - pradera
@@ -1535,7 +1533,6 @@ es:
           tunnel: Borde a rayas = túnel
           bridge: Borde negro = puente
           private: Acceso privado
-          permissive: Acceso permisivo
           destination: Acceso a destino
           construction: Vías en construcción
     richtext_area:
@@ -2377,6 +2374,7 @@ es:
         slight_right_without_exit: Gire un poco a la derecha hacia %{name}
         turn_right_without_exit: Gire a la derecha hacia %{name}
         sharp_right_without_exit: Giro brusco a la derecha hacia %{name}
+        uturn_without_exit: Vuelta en U a lo largo de %{name}
         sharp_left_without_exit: Giro brusco a la izquierda hacia %{name}
         turn_left_without_exit: Gire a la izquierda hacia %{name}
         slight_left_without_exit: Gire un poco a la izquierda hacia %{name}
@@ -2385,7 +2383,10 @@ es:
         roundabout_without_exit: En la rotonda, tomar %{name}
         leave_roundabout_without_exit: Salir de la rotonda - %{name}
         stay_roundabout_without_exit: Permanecer en la rotonda - %{name}
+        start_without_exit: Iniciar al final de %{name}
         destination_without_exit: Llegue a su destino
+        against_oneway_without_exit: Ir en contra de una vía de un solo sentido en
+          %{name}
         end_oneway_without_exit: Final de un solo sentido en %{name}
         roundabout_with_exit: En la rotonda, tomar la salida %{exit} hacia %{name}
         unnamed: sin nombre
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 3298f7327..67149d556 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1248,9 +1248,7 @@ et:
           primary: Põhimaantee
           secondary: Tugimaantee
           unclassified: Klassifitseerimata tee
-          unsurfaced: Katteta tee
           track: Rada
-          byway: Kõrvaltee
           bridleway: Ratsatee
           cycleway: Jalgrattatee
           footway: Jalgtee
@@ -1274,7 +1272,6 @@ et:
           golf: Golfiväljak
           park: Park
           resident: Elamurajoon
-          tourist: Turismimagnet
           common:
           - Heinamaa
           - luht
@@ -1304,7 +1301,6 @@ et:
           tunnel: Katkendlik ümbris = tunnel
           bridge: Must ümbris = sild
           private: Üksnes omanikule
-          permissive: Pääs ainult lubadega
           destination: Üksnes läbisõiduks
           construction: Ehitatavad teed
     richtext_area:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 1ad045d29..558f816ca 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1427,9 +1427,7 @@ fa:
           primary: جادهٔ اصلی
           secondary: جاده دوم
           unclassified: جاده طبقه بندی نشده
-          unsurfaced: جاده ی ظاهر نشده
           track: پیگیری
-          byway: Byway
           bridleway: راه حیوان رو
           cycleway: راه دوچرخه
           footway: راه پیاده
@@ -1453,7 +1451,6 @@ fa:
           golf: زمین گلف
           park: پارک
           resident: منطقه مسکونی
-          tourist: جاذبه ی توریستی
           common:
           - عمومی
           - علفزار
@@ -1483,7 +1480,6 @@ fa:
           tunnel: پوشش خط چین شده = تونل
           bridge: پوشش سیاه = پل
           private: دسترسی شخصی
-          permissive: دسترسی مجاز
           destination: دسترسی به مقصد
           construction: جاده در دست ساخت
     richtext_area:
@@ -1796,7 +1792,7 @@ fa:
       license_agreement: وقتی ایمیلتان را تأیید کردید نیاز است که با <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">شرایط
         همکاری</a> موافقت کنید.
       email address: 'آدرس ایمیل:'
-      confirm email address: 'تأیید آدرس ایمیل:'
+      confirm email address: 'تأیید نشانی ایمیل:'
       not displayed publicly: به عموم نشان داده نمیشود (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
         title="wiki privacy policy including section on email addresses">حفظ حریم
         خصوصی</a>را ببینید)
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 83d55d93f..29a8654ee 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -18,6 +18,7 @@
 # Author: Olli
 # Author: Ramilehti
 # Author: Ruila
+# Author: SMAUG
 # Author: Samoasambia
 # Author: Silvonen
 # Author: Snidata
@@ -761,6 +762,7 @@ fi:
           town: Kaupunki
           unincorporated_area: Ei-liitetty alue
           village: Kylä
+          "yes": Paikka
         railway:
           abandoned: Hylätty rautatie
           construction: Rakenteilla oleva rautatie
@@ -781,7 +783,7 @@ fi:
           spur: Pistoraide
           station: Rautatieasema
           stop: Rautatieseisake
-          subway: Metroasema
+          subway: Metro
           subway_entrance: Metron sisäänkäynti
           switch: Ratavaihde
           tram: Raitiotie
@@ -1048,6 +1050,10 @@ fi:
         (<a href="http://www.and.com">www.and.com</a>)
       contributors_nz_html: '<strong>Uusi-Seelanti</strong>: Sisältää karttatietoja
         Land Information New Zealandista. Crown Copyright.'
+      contributors_si_html: "<strong>Slovenia</strong>: Sisältää \n<a href=\"http://www.gu.gov.si/en/\">Maanmittaus-
+        ja kartoitusviranomaisen</a> sekä\n<a href=\"http://www.mkgp.gov.si/en/\">Maatalous-,
+        metsä- ja ruokaministeriön</a> tuottamia karttatietoja\n(Slovenian julkista
+        karttamateriaalia)."
       contributors_za_html: |-
         <strong>Etelä-Afrikka</strong>: Sisältää karttatietoja
         <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1069,6 +1075,10 @@ fi:
         karttatietoja on otettu luvattomasta lähteestä OSM:n karttatietoihin tai sivustolle,
         siitä tulee tehdä <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">poistopyyntö</a>
         tai <a href="http://dmca.openstreetmap.org/">ilmoittaa suoraan</a>.
+      trademarks_title_html: <span id="trademarks"></span>Tavaramerkit
+      trademarks_1_html: OpenStreetMap ja sen logo ovat OpenStreetMap-säätiön rekisteröityjä
+        tavaramerkkejä. <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Lisensointiryhmämme
+        (englanniksi)</a> vastaa mielellään kysymyksiin tavaramerkkien käytöstä.
   welcome_page:
     title: Tervetuloa!
     introduction_html: Tervetuloa OpenStreetMapiin, ilmaiseen ja vapaasti muokattavaan
@@ -1097,6 +1107,8 @@ fi:
       tag_html: <strong>Tagi</strong> eli <strong>ominaisuustieto</strong> kuvaa pisteen,
         viivan tai alueen käyttötarkoitusta. Tällaisia tietoja ovat esimerkiksi ravintolan
         nimi tai kadun nopeusrajoitus.
+    rules:
+      title: Pelisäännöt
     questions:
       title: Kysyttävää?
       paragraph_1_html: OpenStreetMapin käyttötukea on saatavilla useilla eri tavoilla.
@@ -1413,9 +1425,7 @@ fi:
           primary: Kantatie
           secondary: Seututie
           unclassified: Luokittelematon tie
-          unsurfaced: Päällystämätön tie
           track: Metsätie
-          byway: Sivutie
           bridleway: Ratsastustie
           cycleway: Pyörätie
           footway: Jalankulkutie
@@ -1439,7 +1449,6 @@ fi:
           golf: Golfkenttä
           park: Puisto
           resident: Asuinalue
-          tourist: Turistikohde
           common:
           - Niitty
           - keto
@@ -1469,7 +1478,6 @@ fi:
           tunnel: Katkoviivallinen kehys = tunneli
           bridge: Musta kehys = silta
           private: Yksityinen
-          permissive: Luvanvarainen pääsy
           destination: Ei läpikulkua
           construction: Rakenteilla olevia teitä
     richtext_area:
@@ -2147,6 +2155,7 @@ fi:
       heading: '%{block_on} estetty käyttäjän %{block_by} toimesta'
       time_future: Päättymiseen aikaa %{time}
       time_past: Loppui %{time} sitten
+      ago: '%{time} sitten'
       status: Tila
       show: Näytä
       edit: Muokkaa
@@ -2278,6 +2287,23 @@ fi:
         no_route: Reittiä näiden paikkojen välille ei löytynyt.
         no_place: Paikkaa ei löytynyt.
       instructions:
+        continue_without_exit: Jatka tiellä %{name}
+        slight_right_without_exit: Kaarra oikealle tielle %{name}
+        turn_right_without_exit: Käänny oikealle tielle %{name}
+        sharp_right_without_exit: Käänny jyrkästi oikealle tielle %{name}
+        uturn_without_exit: Tee U-käännös tiellä %{name}
+        sharp_left_without_exit: Käänny jyrkästi vasemmalle tielle %{name}
+        turn_left_without_exit: Käänny vasemmalle tielle %{name}
+        slight_left_without_exit: Kaarra vasemmalle tielle %{name}
+        via_point_without_exit: (reittipiste)
+        follow_without_exit: Seuraa tietä %{name}
+        roundabout_without_exit: Poistu liikenneympyrästä tielle %{name}
+        leave_roundabout_without_exit: Poistu liikenneympyrästä - %{name}
+        stay_roundabout_without_exit: Pysy liikenneympyrässä - %{name}
+        start_without_exit: Aloita tien %{name} päästä
+        destination_without_exit: Olet saapunut perille
+        against_oneway_without_exit: Aja yksisuuntaista tietä %{name} väärään suuntaan
+        end_oneway_without_exit: Yksisuuntaisen tien %{name} pää
         roundabout_with_exit: Liikenneympyrässä poistu %{exit}. liittymästä tielle
           %{name}
         unnamed: nimetön tie
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0114f526a..70b48dc93 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -47,6 +47,7 @@
 # Author: Urhixidur
 # Author: Vcalame
 # Author: Verdy p
+# Author: Wladek92
 # Author: Yodaspirine
 # Author: Yvecai
 ---
@@ -308,7 +309,7 @@ fr:
       user_title: Journal de %{user}
       in_language_title: Entrées du journal en %{language}
       new: Nouvelle entrée du journal
-      new_title: Écrire une nouvelle entrée dans votre journal
+      new_title: Écrire une nouvelle entrée dans votre journal utilisateur
       no_entries: Aucun article de journal
       recent_entries: Articles récents du journal
       older_entries: Entrées plus anciennes
@@ -580,7 +581,7 @@ fr:
           landing_site: Terrain d'atterrissage d'urgence
           phone: Borne d’appel d’urgence
         highway:
-          abandoned: Voie ferrée abandonnée
+          abandoned: Autoroute abandonnée
           bridleway: Chemin pour cavaliers
           bus_guideway: Voie de bus guidé / trolley
           bus_stop: Arrêt de bus
@@ -1506,9 +1507,7 @@ fr:
           primary: Route principale
           secondary: Route secondaire
           unclassified: Route non classifiée
-          unsurfaced: Route non revêtue
           track: Piste
-          byway: Chemin
           bridleway: Sentier pour chevaux
           cycleway: Voie cyclable
           footway: Voie piétonne
@@ -1532,7 +1531,6 @@ fr:
           golf: Parcours de golf
           park: Parc
           resident: Zone résidentielle
-          tourist: Attraction touristique
           common:
           - Espace commun
           - prairie
@@ -1562,7 +1560,6 @@ fr:
           tunnel: Bord en pointillés = tunnel
           bridge: Bord noir = pont
           private: Accès privé
-          permissive: Accès toléré
           destination: Réservé aux riverains
           construction: Routes en construction
     richtext_area:
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 93f1369fe..4656ff08d 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -883,7 +883,6 @@ fur:
           motorway: Autostrade
           primary: Strade primarie
           secondary: Strade secondarie
-          unsurfaced: Strade blancje
           rail: Ferade
           subway: Metropolitane
           tram:
@@ -898,7 +897,6 @@ fur:
           golf: Troi di golf
           park: Parc
           resident: Aree residenziâl
-          tourist: Atrazion turistiche
           common:
           - Comugnâi
           - prâts
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 9d47a1698..608a1c65e 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1471,9 +1471,7 @@ gd:
           primary: Prìomh-rathad
           secondary: Rathad dàrnach
           unclassified: Rathad neo-sheòrsaichte
-          unsurfaced: Rathad gun uachdar
           track: Slighe
-          byway: Seach-rathad
           bridleway: Ceum marcachd
           cycleway: Slighe baidhseagail
           footway: Àrainn-choisichean
@@ -1497,7 +1495,6 @@ gd:
           golf: Raon goilf
           park: Pàirc
           resident: Raon-còmhnaidh
-          tourist: Àite inntinneach
           common:
           - Coitcheann
           - Faiche
@@ -1527,7 +1524,6 @@ gd:
           tunnel: Oir-strìochagan = tunail
           bridge: Oir-loidhnichean = drochaid
           private: Cead-inntrigidh prìobhaideach
-          permissive: Cead-inntrigidh cuingichte
           destination: Inntrigeadh a' chinn-uidhe
           construction: Rathaidean 'gan togail
     richtext_area:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 25a5f2f9b..fa6757578 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1476,9 +1476,7 @@ gl:
           primary: Estrada principal
           secondary: Estrada secundaria
           unclassified: Estrada sen clasificar
-          unsurfaced: Estrada non pavimentada
           track: Pista
-          byway: Camiño secundario
           bridleway: Pista de cabalos
           cycleway: Pista de bicicletas
           footway: Vía peonil
@@ -1502,7 +1500,6 @@ gl:
           golf: Campo de golf
           park: Parque
           resident: Zona residencial
-          tourist: Atracción turística
           common:
           - Espazo común
           - pradaría
@@ -1532,7 +1529,6 @@ gl:
           tunnel: Bordo a raias = túnel
           bridge: Bordo negro = ponte
           private: Acceso privado
-          permissive: Acceso limitado
           destination: Acceso a destino
           construction: Estradas en construción
     richtext_area:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 759db7489..ddfd5271a 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -949,14 +949,14 @@ he:
     edit_with: לעריכה עם %{editor}
     tag_line: מפת עולם חופשית בשיטת הוויקי
     intro_header: ברוכים הבאים ל־OpenStreetMap!
-    intro_text: OpenStreetMap הוא מפה של העולם, נוצר על־ידי אנשים כמוך, וחופשי לשימוש
-      תחת רשיון פתוח.
+    intro_text: OpenStreetMap היא מפה של העולם, שנוצרת על־ידי אנשים כמוך, וחופשית
+      לשימוש תחת רישיון פתוח.
     intro_2_create_account: נא ליצור חשבון משתמש
     partners_html: האירוח נתמך על־ידי מרכז %{ucl}‏, %{ic} ו%{bytemark}, ועל־ידי %{partners}
       אחרים.
     partners_ucl: מרכז UCL VR
     partners_ic: המכללה המלכותית של לונדון
-    partners_bytemark: בייטמארק
+    partners_bytemark: אירוח בייטמארק
     partners_partners: שותפים
     partners_url: http://wiki.openstreetmap.org/wiki/Partners
     osm_offline: מסד הנתונים של אתר OpenStreetMap אינו מקוון כעת בשל עבודות תחזוקה
@@ -1449,9 +1449,7 @@ he:
           primary: כביש ראשי
           secondary: כביש משני
           unclassified: דרך לא מסווגת
-          unsurfaced: דרך לא סלולה
           track: מסלול מרוצים
-          byway: דרך צדדית
           bridleway: מסלול לרכיבת סוסים
           cycleway: דרך לאופניים
           footway: דרך להולכי רגל
@@ -1475,7 +1473,6 @@ he:
           golf: מסלול גולף
           park: פארק
           resident: אזור מגורים
-          tourist: אתר תיירותי
           common:
           - מרעה
           - מרעה
@@ -1505,7 +1502,6 @@ he:
           tunnel: קו מקווקו = מנהרה
           bridge: קו שחור = גשר
           private: גישה פרטית
-          permissive: גישה מותרת
           destination: גישה ליעד
           construction: דרכים בבנייה
     richtext_area:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 5f8a7c2bf..6f7106337 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1129,9 +1129,7 @@ hr:
           primary: Primarna cesta
           secondary: Sekundarna cesta
           unclassified: Nerazvrstana cesta
-          unsurfaced: Neasfaltirana cesta
           track: Neasfaltirani put
-          byway: Usputna staza
           bridleway: Staza za konje
           cycleway: Biciklistička staza
           footway: Pješačka staza
@@ -1155,7 +1153,6 @@ hr:
           golf: Golf teren
           park: Park
           resident: Stambeno područje
-          tourist: Turistička atrakcija
           common:
           - Travnjaci
           - livade
@@ -1185,7 +1182,6 @@ hr:
           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most
           private: Privatni pristup
-          permissive: Pristup uz dozvolu
           destination: Pristup odredištu
           construction: Ceste u izgradnji
     richtext_area:
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 7cdfb5ad7..8b1b51921 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1062,8 +1062,8 @@ hsb:
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
-      description: Prašej so něčeho abo pytaj za wotmołwami na stronje prašenjow a
-        wotmołwow OpenStreetMap.
+      description: Prašej so za něčim abo pytaj za wotmołwami na stronje prašenjow
+        a wotmołwow OpenStreetMap.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1323,9 +1323,7 @@ hsb:
           primary: Zwjazkowa dróha
           secondary: Krajna dróha, statna dróha
           unclassified: Njeklasifikowana dróha
-          unsurfaced: Njewobtwjerdźena dróha
           track: Čara
-          byway: Pódlanski puć
           bridleway: Jěchanski puć
           cycleway: Kolesowarska šćežka
           footway: Chódnik
@@ -1349,7 +1347,6 @@ hsb:
           golf: Golfownišćo
           park: Park
           resident: Bydlenski wobwod
-          tourist: Turistiska atrakcija
           common:
           - Powšitkowny
           - łuka
@@ -1379,7 +1376,6 @@ hsb:
           tunnel: Smužkowana kroma = tunl
           bridge: Čorna kroma = móst
           private: Priwatny přistup
-          permissive: Dowoleny přistup
           destination: Jenož za přidróžnych
           construction: Dróhi w twarje
     richtext_area:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5c3252751..c305e4a55 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1297,9 +1297,7 @@ hu:
           primary: Főút
           secondary: Összekötő út
           unclassified: Egyéb út
-          unsurfaced: Burkolatlan út
           track: Földút
-          byway: Ösvény
           bridleway: Lovaglóút
           cycleway: Kerékpárút
           footway: Gyalogút
@@ -1323,7 +1321,6 @@ hu:
           golf: Golfpálya
           park: Park
           resident: Gyalogos övezet
-          tourist: Turisztikai látványosság
           common:
           - Füves terület
           - rét
@@ -1353,7 +1350,6 @@ hu:
           tunnel: Szaggatott szegély = alagút
           bridge: Fekete szegély = híd
           private: Behajtás csak engedéllyel
-          permissive: Behajtás engedélyezett
           destination: Csak célforgalom
           construction: Utak építés alatt
     richtext_area:
@@ -1497,6 +1493,7 @@ hu:
         Ezt nem kell elfogadnod, de meg kell tekintened.
   oauth:
     oauthorize:
+      title: A fiókodhoz való hozzáférés engedélyezése
       request_access: A(z) %{app_name} alkalmazás hozzáférést kér a felhasználói fiókodhoz,
         %{user}. Kérlek, jelöld, ha azt szeretnéd, hogy az alkalmazás rendelkezzen
         a következő képességekkel. Választhatsz olyan sokat vagy keveset, amennyit
@@ -1510,9 +1507,12 @@ hu:
       allow_write_gpx: GPS nyomvonalak feltöltése.
       allow_write_notes: jegyzet módosítása
     oauthorize_success:
+      title: Hozzáférési kérés jóváhagyva
+      allowed: '%{app_name} számára hozzáférést biztosítottál a fiókodhoz.'
       verification: 'Az ellenőrző kód: %{code}.'
     oauthorize_failure:
       title: Az azonosítás sikertelen.
+      denied: '%{app_name} alkalmazástól megtagadtad, hogy hozzáférhessen a fiókodhoz.'
       invalid: A hitelesítő token érvénytelen.
     revoke:
       flash: Visszavontad az utalványt a(z) %{application} alkalmazáshoz
@@ -1584,7 +1584,7 @@ hu:
       email or username: 'E-mail cím vagy felhasználónév:'
       password: 'Jelszó:'
       openid: '%{logo} OpenID:'
-      remember: 'Emlékezz rám:'
+      remember: Emlékezz rám
       lost password link: Elfelejtetted a jelszavad?
       login_button: Bejelentkezés
       register now: Regisztrálj most
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 77880f15c..92e639d66 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -467,6 +467,7 @@ ia:
           nursing_home: Casa de convalescentia
           office: Officio
           parking: Parking
+          parking_entrance: Entrata de autoparco
           pharmacy: Pharmacia
           place_of_worship: Loco de adoration
           police: Policia
@@ -500,6 +501,7 @@ ia:
           veterinary: Clinica veterinari
           village_hall: Casa communal
           waste_basket: Corbe a papiro
+          waste_disposal: Tractamento de immunditias
           youth_centre: Centro pro le juventute
         boundary:
           administrative: Limite administrative
@@ -514,14 +516,30 @@ ia:
           "yes": Ponte
         building:
           "yes": Edificio
+        craft:
+          brewery: Fabrica de bira
+          carpenter: Carpentero
+          electrician: Electricista
+          gardener: Jardinero
+          painter: Pictor
+          photographer: Photographo
+          plumber: Plumbero
+          shoemaker: Scarpero
+          tailor: Sartor
+          "yes": Boteca de artisanato
         emergency:
+          ambulance_station: Station de ambulantias
+          defibrillator: Defibrillator
+          landing_site: Loco de atterrage de emergentia
           phone: Telephono de emergentia
         highway:
+          abandoned: Via abandonate
           bridleway: Sentiero pro cavallos
           bus_guideway: Via guidate de autobus
           bus_stop: Halto de autobus
           construction: Strata in construction
           cycleway: Pista cyclabile
+          elevator: Ascensor
           emergency_access_point: Puncto de accesso de emergentia
           footway: Sentiero pro pedones
           ford: Vado
@@ -562,22 +580,29 @@ ia:
           battlefield: Campo de battalia
           boundary_stone: Lapide de frontiera
           building: Edificio historic
+          bunker: Bunker
           castle: Castello
           church: Ecclesia
+          city_gate: Porta de citate
           citywalls: Muro del citate
           fort: Forte
+          heritage: Sito de patrimonio
           house: Casa
           icon: Icone
           manor: Casa seniorial
           memorial: Memorial
           mine: Mina
           monument: Monumento
+          roman_road: Via roman
           ruins: Ruinas
+          stone: Petra
           tomb: Tumba
           tower: Turre
           wayside_cross: Cruce juxta le via
           wayside_shrine: Reliquario juxta le via
           wreck: Naufragio
+        junction:
+          "yes": Intersection
         landuse:
           allotments: Jardines familial
           basin: Bassino
@@ -609,14 +634,19 @@ ia:
           road: Area de cammino
           village_green: Parco de village
           vineyard: Vinia
+          "yes": Uso de terreno
         leisure:
           beach_resort: Loco de vacantias al plagia
           bird_hide: Observatorio de aves
+          club: Club
           common: Terreno commun
+          dog_park: Parco pro canes
           fishing: Area de pisca
+          fitness_centre: Centro de fitness
           fitness_station: Gymnasio
           garden: Jardin
           golf_course: Campo de golf
+          horse_riding: Equitation
           ice_rink: Patinatorio
           marina: Porto de yachts
           miniature_golf: Minigolf
@@ -625,6 +655,7 @@ ia:
           pitch: Campo sportive
           playground: Area de jocos
           recreation_ground: Terreno de recreation
+          resort: Centro touristic
           sauna: Sauna
           slipway: Rampa de barca
           sports_centre: Centro sportive
@@ -632,6 +663,13 @@ ia:
           swimming_pool: Piscina
           track: Pista de athletismo
           water_park: Parco aquatic
+          "yes": Tempore libere
+        man_made:
+          lighthouse: Pharo
+          pipeline: Tubulatura
+          tower: Turre
+          works: Fabrica
+          "yes": Artificial
         military:
           airfield: Aerodromo militar
           barracks: Barracas
@@ -651,6 +689,7 @@ ia:
           forest: Foreste
           geyser: Geyser
           glacier: Glaciero
+          grassland: Prato
           heath: Landa
           hill: Collina
           island: Insula
@@ -663,6 +702,8 @@ ia:
           reef: Scolio
           ridge: Cresta
           rock: Rocca
+          saddle: Sella
+          sand: Sablo
           scree: Detrito cadite
           scrub: Arbusto
           spring: Fontana
@@ -676,6 +717,7 @@ ia:
           wood: Bosco
         office:
           accountant: Contabile
+          administrative: Administration
           architect: Architecto
           company: Compania
           employment_agency: Agentia de empleo
@@ -688,6 +730,8 @@ ia:
           travel_agent: Agentia de viages
           "yes": Officio
         place:
+          allotments: Jardines familial
+          block: Bloco
           airport: Aeroporto
           city: Citate
           country: Pais
@@ -712,6 +756,7 @@ ia:
           town: Urbe
           unincorporated_area: Area sin municipalitate
           village: Village
+          "yes": Loco
         railway:
           abandoned: Ferrovia abandonate
           construction: Ferrovia in construction
@@ -732,7 +777,7 @@ ia:
           spur: Ramification de ferrovia
           station: Station ferroviari
           stop: Halto ferroviari
-          subway: Station de metro
+          subway: Metro
           subway_entrance: Entrata al metro
           switch: Agulia
           tram: Tramvia
@@ -814,6 +859,7 @@ ia:
           "yes": Boteca
         tourism:
           alpine_hut: Cabana alpin
+          apartment: Appartamento
           artwork: Obra de arte
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
@@ -821,6 +867,7 @@ ia:
           camp_site: Terreno de camping
           caravan_site: Terreno pro caravanas
           chalet: Chalet
+          gallery: Galeria
           guest_house: Albergo
           hostel: Albergo
           hotel: Hotel
@@ -852,6 +899,7 @@ ia:
           wadi: Wadi
           waterfall: Cascada
           weir: Barrage
+          "yes": Curso de aqua
       admin_levels:
         level2: Frontiera de pais
         level4: Frontiera de stato
@@ -938,9 +986,10 @@ ia:
     legal_babble:
       title_html: Copyright e Licentia
       intro_1_html: |-
-        OpenStreetMap es <i>datos aperte</i>, licentiate sub le <a
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> es <i>datos aperte</i>, licentiate sub le <a
         href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        Commons Open Database License</a> (ODbL) per le <a
+        href="http://osmfoundation.org/">Fundation OpenStreetMap</a> (OSMF).
       intro_2_html: |2-
           Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas
           e datos, a condition que vos da recognoscentia a OpenStreetMap e su
@@ -965,10 +1014,9 @@ ia:
         alt: Exemplo de como recognoscer OpenStreetMap in un pagina web
         title: Exemplo de recognoscentia
       more_title_html: Pro saper plus
-      more_1_html: |2-
-          Lege plus super le uso de nostre datos, e como recognoscer nos, al <a
-          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">FAQ
-          Legal</a>.
+      more_1_html: |-
+        Lege plus sur le uso de nostre datos, e como recognoscer nos, in le <a
+        href="http://osmfoundation.org/Licence">pagina de licentia OSMF</a> e in le <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">FAQ juridic</a> communitari.
       more_2_html: |-
         Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro disveloppatores tertie. Vide nostre <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">politica pro le uso del API</a>,
         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">politica pro le uso de tegulas</a>
@@ -1000,6 +1048,11 @@ ia:
       contributors_nz_html: |-
         <strong>Nove Zelandia</strong>: Contine datos proveniente de
            Land Information New Zealand. Crown Copyright reservate.
+      contributors_si_html: |-
+        <strong>Slovenia</strong>: Contine datos ab le
+        <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> e del
+        <a href="http://www.mkgp.gov.si/en/">Ministerio del Agricultura, Silvicultura e Alimento</a>
+        (information public de Slovenia).
       contributors_za_html: |-
         <strong>Africa del Sud</strong>: Contine datos proveniente del
            <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1027,6 +1080,11 @@ ia:
         favor consulta nostre <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura
         de remotion</a> o submitte un plancto immediate usante nostre <a href="http://dmca.openstreetmap.org/">formulario
         in linea</a>.
+      trademarks_title_html: <span id="trademarks"></span>Marcas commercial
+      trademarks_1_html: OpenStreetMap e le logotypo con le lupa es marcas registrate
+        del Fundation OpenStreetMap. Si vos ha questiones sur vostre uso del marcas,
+        invia los al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo
+        de labor sur licentias</a>.
   welcome_page:
     title: Benvenite!
     introduction_html: Bevenite a OpenStreetMap, le carta libere e modificabile del
@@ -1053,6 +1111,14 @@ ia:
       tag_html: Un <strong>etiquetta</strong> es un unitate de information sur un
         nodo o via, como le nomine de un restaurante o le limite de velocitate de
         un strata.
+    rules:
+      title: Regulas!
+      paragraph_1_html: OpenStreetMap ha poc regulas formal, ma nos expecta que tote
+        le participantes collabora e communica con le communitate. Si vos considera
+        un activitate altere que modification per mano, lege e seque le directivas
+        sur le <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>importation</a>
+        e sur le <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>modification
+        automatisate</a>.
     questions:
       title: Questiones?
       paragraph_1_html: |-
@@ -1095,11 +1161,29 @@ ia:
       url: /welcome
       title: Benvenite a OSM
       description: Comencia con iste guida rapide sur le fundamentos de OpenStreetMap.
+    beginners_guide:
+      title: Guida pro comenciantes
+      description: Guida pro comenciantes, mantenite per le communitate.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Pone un question o cerca responsas sur le sito de questiones e
         responsas de OSM.
+    mailing_lists:
+      title: Listas de diffusion
+      description: Pone un question o discute cosas interessante sur un varietate
+        de listas de diffusion thematic o regional.
+    forums:
+      title: Foros
+      description: Questiones e discussiones pro qui prefere un interfacie in stilo
+        de tabuliero de bulletines.
+    irc:
+      title: IRC
+      description: Conversation interactive in multe linguas differente e sur multe
+        themas.
+    switch2osm:
+      description: Adjuta pro companias e organisationes qui vole migrar a cartas
+        e altere servicios a base de OpenStreetMap.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1118,6 +1202,15 @@ ia:
       imageria aeree, apparatos GPS e cartas ordinari de terreno pro verificar que OSM
       es accurate e actual.
     community_driven_title: Dirigite per le communitate
+    community_driven_html: |-
+      Le communitate de OpenStreetMap es diverse, passionate e cresce cata die. Nostre contributores include cartographos enthusiasta, professionales de GIS, ingenieros gerente le servitores de OSM, humanitarios cartographiante areas devastate per un disastro, e multe alteres.
+      Pro apprender plus sur le communitate, vide le <a href='%{diary_path}'>diarios del usatores</a>, le
+      <a href='http://blogs.openstreetmap.org/'>blogs del communitate</a> e le sito web del <a href='http://www.osmfoundation.org/'>Fundation OSM</a>.
+    open_data_title: Datos aperte
+    open_data_html: |-
+      OpenStreetMap es constituite per <i>datos aperte</i>: tu es libere de usar lo pro qualcunque scopo a condition que tu da credito a OpenStreetMap e su contributores. Si tu altera o extende le datos in certe manieras, tu pote distribuer le resultato solmente sub le mesme licentia. Vide le pagina <a href='%{copyright_path}'>Copyright e
+      Licentia</a> pro detalios.
+    legal_title: Juridic
   notifier:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commentava un entrata de tu diario'
@@ -1334,9 +1427,7 @@ ia:
           primary: Via primari
           secondary: Via secundari
           unclassified: Via non classificate
-          unsurfaced: Cammino de terra
           track: Pista
-          byway: Via minor
           bridleway: Sentiero pro cavallos
           cycleway: Via cyclabile
           footway: Sentiero pro pedones
@@ -1360,7 +1451,6 @@ ia:
           golf: Percurso de golf
           park: Parco
           resident: Area residential
-          tourist: Attraction touristic
           common:
           - Commun
           - prato
@@ -1390,7 +1480,6 @@ ia:
           tunnel: Bordo a lineettas = tunnel
           bridge: Bordo nigre = ponte
           private: Accesso private
-          permissive: Accesso subjecte a permission
           destination: Traffico local
           construction: Vias in construction
     richtext_area:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 02ad3677e..5d1c31160 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -10,6 +10,7 @@
 # Author: Ilham151096
 # Author: Irwangatot
 # Author: Iwan Novirion
+# Author: Jagwar
 # Author: JakArtisan
 # Author: Kenrick95
 # Author: Relly Komaruzaman
@@ -420,7 +421,7 @@ id:
           gate: Gerbang
           helipad: Helipad
           runway: Landasan pacu
-          taxiway: Jalur taxi
+          taxiway: Landas hubung
           terminal: Terminal
         amenity:
           animal_shelter: Tempat Perlindungan Hewan
@@ -432,7 +433,7 @@ id:
           bench: Bangku
           bicycle_parking: Parkir Sepeda
           bicycle_rental: Penyewaan Sepeda
-          biergarten: Beer Garden
+          biergarten: Taman Bir
           boat_rental: Penyewaan Perahu
           brothel: Bordil
           bureau_de_change: Penukaran Valuta Asing
@@ -472,7 +473,7 @@ id:
           hospital: Rumah Sakit
           hunting_stand: Pos Berburu
           ice_cream: Es Krim
-          kindergarten: Taman Kanak-Kanak
+          kindergarten: Taman Kanak-kanak
           library: Perpustakaan
           market: Pasar
           marketplace: Pasar
@@ -586,8 +587,8 @@ id:
           track: Trek
           traffic_signals: Lampu Lalu Lintas
           trail: Jejak
-          trunk: Jalan Utama
-          trunk_link: Jalan Utama Bukan Tol
+          trunk: Jalan Nasional
+          trunk_link: Jalan Nasional
           unclassified: Jalan Tidak Terklasifikasi
           unsurfaced: Jalan Tanpa Permukaan
           "yes": Jalan
@@ -988,15 +989,15 @@ id:
   license_page:
     foreign:
       title: Tentang terjemahan ini
-      text: Saat terjadi konflik antara halaman diterjemahkan dan %{english_original_link},
+      text: Saat terjadi konflik antara halaman terjemahan dan %{english_original_link},
         halaman bahasa Inggris akan diutamakan
-      english_link: Bahasa Inggris asli
+      english_link: asli bahasa Inggris
     native:
-      title: Tentang Halaman ini
+      title: Tentang halaman ini
       text: Anda melihat versi bahasa Inggris dari halaman hak cipta. Anda dapat kembali
-        ke %{native_link} dari Halaman ini atau Anda dapat berhenti membaca tentang
+        ke %{native_link} dari halaman ini atau Anda dapat berhenti membaca tentang
         hak cipta dan %{mapping_link}.
-      native_link: Versi Bahasa Indonesia
+      native_link: versi bahasa Indonesia
       mapping_link: memulai pemetaan
     legal_babble:
       title_html: Hak Cipta & Lisensi
@@ -1006,26 +1007,24 @@ id:
         Commons Open Database License</a> (ODbL) oleh  <a
         href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: |-
-        Anda dibebaskan untuk menyalin, mendistribusikan, mentransfer dan mengadaptasi data kami,
-        selama Anda menyertakan OpenStreetMap dan kontributornya. Jika anda merubah atau membangun
-        data kami, Anda harus mendistribusikan hasilnya dalam lisensi yang sama.
-        <a href="http://opendatacommons.org/licenses/odbl/1.0/">kode legal
-        code</a> akan menjelaskan hak dan kewajiban Anda
+        Anda dibebaskan untuk menyalin, menyalurkan, mentransfer dan mengadaptasi data kami,
+        selama Anda menyertakan OpenStreetMap dan kontributornya. Jika Anda mengubah atau membangun
+        data kami, Anda harus menyalurkan hasilnya dalam lisensi yang sama.
+        <a href="http://opendatacommons.org/licenses/odbl/1.0/">Kode legal</a> berisi penjelasan hak dan kewajiban Anda.
       intro_3_html: |-
         Kartografi dalam tampilan peta dan dokumentasi kami
          berlisensi di bawah <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
         Commons Attribution-ShareAlike 2.0</a> lisensi (CC-BY-SA).
       credit_title_html: Cara memberikan kredit pada OpenStreetMap
-      credit_1_html: |-
-        Kami meminta anda untuk menggunakan kredit &ldquo;&copy; Kontributor OpenStreetMap
-        &rdquo;.
+      credit_1_html: Kami mewajibkan Anda untuk menggunakan kredit &ldquo;&copy; Kontributor
+        OpenStreetMap&rdquo;.
       credit_2_html: Anda juga harus memperjelas bahwa data tersedia di bawah Lisensi
         Database Terbuka, dan jika menggunakan tiles peta kami, kartografi berlisensi
         sebagai CC-BY-SA. Anda dapat melakukannya dengan menghubungkan ke <a href="http://www.openstreetmap.org/copyright">halaman
         hak cipta</a>. Alternatifnya, dan sebagai sebuah persyaratan jika Anda mendistribusikan
         OSM dalam bentuk data, Anda dapat menamakan dan menghubungkannya langsung
-        pada lisensinya. Pada media dimana tautan tidak dimungkinkan (misalnya hasil
-        cetak), kami menyarankan anda untuk mengarahkan pembaca anda pada openstreetmap.org
+        pada lisensinya. Pada media yang tidak memungkinkan tautan (misalnya hasil
+        cetak), kami menyarankan Anda untuk mengarahkan pembaca Anda pada openstreetmap.org
         (mungkin dengan memperluas halaman 'OpenStreetMap' secara penuh), untuk opendatacommons.org,
         dan jika relevan, untuk creativecommons.org.
       credit_3_html: |-
@@ -1087,8 +1086,8 @@ id:
         Survey &copy; Hak cipta dan basis data milik Kerajaan
         2010-12.
       contributors_footer_1_html: |-
-        Untuk rincian lebih lanjut, dan sumber-sumber lainnya yang telah digunakan untuk meningkatkan OpenStreetMap, silahkan lihat <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">Kontributor halaman</a> pada Wiki OpenStreetMap.
+        Untuk rincian lebih lanjut, dan sumber-sumber lainnya yang telah digunakan untuk meningkatkan OpenStreetMap, silakan lihat <a
+        href="http://wiki.openstreetmap.org/wiki/Contributors">halaman Kontributor</a> pada Wiki OpenStreetMap.
       contributors_footer_2_html: Dimasukkannya data dalam OpenStreetMap tidak berarti
         bahwa penyedia data yang asli mendukung OpenStreetMap, menyediakan jaminan,
         atau menerima tanggung jawab apapun.
@@ -1216,7 +1215,7 @@ id:
       banyak lagi, di seluruh dunia."
     local_knowledge_title: Pengetahuan Lokal
     local_knowledge_html: "OpenStreetMap menekankan pengetahuan lokal. Kontributor
-      menggunakan \ncitra udara, perangkat GPS, dan lapangan berteknologi rendah peta
+      menggunakan \ncitra udara, perangkat GPS, dan peta lapangan berteknologi rendah
       untuk memverifikasi bahwa OSM akurat dan termutakhir."
     community_driven_title: Berbasis Masyarakat
     community_driven_html: |-
@@ -1226,7 +1225,7 @@ id:
       dan lain-lain.
       Untuk mengetahui lebih lanjut, baca <a href='%{diary_path}'>catatan harian pengguna</a>,
       <a href='http://blogs.openstreetmap.org/'>blog komunitas</a>, dan situs web <a href='http://www.osmfoundation.org/'>OSM Foundation</a>.
-    open_data_title: Buka Data
+    open_data_title: Data Terbuka
     open_data_html: 'OpenStreetMap adalah <i>data terbuka</i>: Anda bebas untuk menggunakannya
       untuk tujuan apapun selama Anda memberi penghargaan pada OpenStreetMap dan kontributornya.
       Jika Anda mengubah atau membangun dari data dengan cara tertentu, Anda dapat
@@ -1457,7 +1456,7 @@ id:
       potlatch2_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk
         menyimpannya dengan Potlatch 2, Anda dapat klik simpan.)
       id_not_configured: iD belum dikonfigurasikan
-      no_iframe_support: Browser Anda tidak mendukung iframes HTML yang diperlukan
+      no_iframe_support: Peramban Anda tidak mendukung iframe HTML yang diperlukan
         untuk fitur ini.
     sidebar:
       search_results: Hasil Pencarian
@@ -1475,13 +1474,11 @@ id:
       table:
         entry:
           motorway: Jalan Tol
-          trunk: Jalan Utama Bukan Tol
+          trunk: Jalan nasional
           primary: Jalan Primer
           secondary: Jalan Sekunder
           unclassified: Jalan Tidak Terklasifikasi
-          unsurfaced: Jalan Tanpa Permukaan
           track: Trek
-          byway: Jalan Kampung
           bridleway: Jalan Tanah
           cycleway: Jalur Sepeda
           footway: Jalan Setapak
@@ -1495,7 +1492,7 @@ id:
           - Kereta Gantung
           runway:
           - Landasan bandara
-          - Jalur taxi
+          - landas hubung
           apron:
           - Tempat Parkir Pesawat
           - terminal
@@ -1505,11 +1502,10 @@ id:
           golf: Lapangan Golf
           park: Taman
           resident: Area Permukiman
-          tourist: Objek wisata
           common:
           - Umum
           - Padang rumput
-          retail: Area pertokoan retail
+          retail: Area pertokoan
           industrial: Kawasan industri
           commercial: Area komersial
           heathland: Semak
@@ -1535,8 +1531,7 @@ id:
           tunnel: Dashed Casing = terowongan
           bridge: Black casing = jembatan
           private: Akses pribadi
-          permissive: Akses Permisif
-          destination: Akses Tujuan
+          destination: Akses tujuan
           construction: Jalan sedang diperbaiki
     richtext_area:
       edit: Edit
@@ -1565,16 +1560,16 @@ id:
       identifiable: Dapat Diidentifikasi (ditampilkan dalam daftar jejak dan sebagai
         diidentifikasi, mengatur poin dengan waktu pengambilan)
     create:
-      upload_trace: Upload trek GPS
-      trace_uploaded: File GPX Anda telah di-upload dan menunggu penyisipan dalam
-        database. Ini biasanya akan membutuhkan waktu setengah jam, dan sebuah email
-        akan dikirim kepada Anda ketika sudah selesai.
+      upload_trace: Unggah Jejak GPS
+      trace_uploaded: File GPX Anda telah diunggah dan menunggu penyisipan dalam database.
+        Ini biasanya membutuhkan waktu setengah jam, dan sebuah email akan dikirim
+        kepada Anda saat selesai.
     edit:
       title: Mengedit jejak %{name}
       heading: Mengedit dijitasi %{name}
       filename: 'Nama File:'
-      download: download
-      uploaded_at: 'Diupload:'
+      download: unduh
+      uploaded_at: 'Diunggah:'
       points: 'Poin/Titik:'
       start_coord: 'Koordinat awal:'
       map: peta
@@ -1587,7 +1582,7 @@ id:
       visibility: Visibilitas
       visibility_help: apa artinya ini?
     trace_form:
-      upload_gpx: 'Upload File GPX:'
+      upload_gpx: 'Unggah File GPX:'
       description: Deskripsi
       tags: 'Tags:'
       tags_help: dipisahkan oleh koma
@@ -1597,7 +1592,7 @@ id:
       help: Bantuan
     trace_header:
       upload_trace: Unggah jejak GPS
-      see_all_traces: Lihat semua dijitasi
+      see_all_traces: Lihat semua jejak
       see_your_traces: Melihat jejak Anda
       traces_waiting:
         one: Anda memiliki %{count} jejak GPS yang menunggu untuk diunggah. Harap
@@ -1693,7 +1688,7 @@ id:
       allow_write_diary: membuat entri buku harian, komentar dan berteman.
       allow_write_api: memodifikasi peta.
       allow_read_gpx: baca jejak GPS pribadi Anda.
-      allow_write_gpx: Upload trek GPS
+      allow_write_gpx: unggah jejak GPS.
       allow_write_notes: memodifikasi catatan.
     oauthorize_success:
       title: Permintaan otorisasi diperbolehkan
@@ -1729,7 +1724,7 @@ id:
       allow_write_diary: membuat entri buku harian, komentar dan membuat pertemanan.
       allow_write_api: modifikasi peta.
       allow_read_gpx: baca jejak GPS pribadi mereka.
-      allow_write_gpx: upload trek GPS.
+      allow_write_gpx: unggah jejak GPS.
       allow_write_notes: memodifikasi catatan.
     index:
       title: Rincian OAuth saya
@@ -1756,7 +1751,7 @@ id:
       allow_write_diary: membuat entri buku harian, komentar dan buat pertemanan.
       allow_write_api: modifikasi peta
       allow_read_gpx: baca jejak GPS pribadi mereka.
-      allow_write_gpx: upload trek GPS
+      allow_write_gpx: unggah jejak GPS.
       allow_write_notes: memodifikasi catatan.
     not_found:
       sorry: Maaf, %{type} tidak dapat ditemukan.
@@ -1891,7 +1886,7 @@ id:
         Anda yang sudah ada dan di masa yang akan datang.
       consider_pd: Sebagai tambahan perjanjian di atas, saya menganggap kontribusi
         saya berada di dalam Domain Publik
-      consider_pd_why: Apa ini?
+      consider_pd_why: apa ini?
       guidance: 'Informasi untuk membantu Anda memahami persyaratan ini: sebuah <a
         href="%{summary}">ringkasan yang mudah dibaca</a> dan beberapa <a href="%{translations}">terjemahan
         informal</a>'
@@ -1903,7 +1898,7 @@ id:
       legale_names:
         france: Perancis
         italy: Italia
-        rest_of_world: Bagian Lainnya dari Dunia
+        rest_of_world: Bagian lain dari dunia
     no_such_user:
       title: Pengguna tersebut tidak ditemukan
       heading: Pengguna %{user} tidak dapat ditemukan
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 939b79a1c..77012aed6 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -621,9 +621,7 @@ is:
           primary: Stofnvegur
           secondary: Tengivegur
           unclassified: Héraðsvegur
-          unsurfaced: Óbundið slitlag
           track: Slóði
-          byway: Merkt (bresk) hjólaleið
           bridleway: Reiðstígur
           cycleway: Hjólastígur
           footway: Göngustígur
@@ -647,7 +645,6 @@ is:
           golf: Golfvöllur
           park: Almenningsgarður
           resident: Íbúðasvæði
-          tourist: Ferðamannasvæði
           common:
           - Almenningur
           - lundur
@@ -677,7 +674,6 @@ is:
           tunnel: Umkringt punktalínum = göng
           bridge: Umkringt svartri línu = brú
           private: Í einkaeigu
-          permissive: Umferð leyfileg
           destination: Umferð leyfileg á ákveðinn áfangastað
           construction: Vegur í byggingu
   trace:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index f42df06dc..c8ae2aba9 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -27,6 +27,7 @@
 # Author: Od1n
 # Author: Ontsed
 # Author: Paolopoz
+# Author: Purodha
 # Author: Raoli
 # Author: Ricordisamoa
 # Author: Rippitippi
@@ -34,6 +35,7 @@
 # Author: Shirayuki
 # Author: Simone
 # Author: SimoneSVC
+# Author: Tuxfuzz
 # Author: Ximo17
 # Author: ZioNicco
 ---
@@ -101,7 +103,7 @@ it:
         sender: Mittente
         title: Soggetto
         body: Corpo del messaggio
-        recipient: Recipiente
+        recipient: Destinatario
       user:
         email: Email
         active: Attivo
@@ -146,8 +148,8 @@ it:
       belongs_to: Autore
       node: Nodi (%{count})
       node_paginated: Nodi (%{x}-%{y} di %{count})
-      way: Ways (%{count})
-      way_paginated: Ways (%{x}-%{y} di %{count})
+      way: Percorsi (%{count})
+      way_paginated: Percorsi (%{x}-%{y} di %{count})
       relation: Relazioni (%{count})
       relation_paginated: Relazioni (%{x}-%{y} di %{count})
       comment: Commenti (%{count})
@@ -159,18 +161,18 @@ it:
       feed:
         title: Gruppo di modifiche %{id}
         title_comment: Gruppo di modifiche %{id} - %{comment}
-      join_discussion: Fai login per unirti alla discussione
+      join_discussion: Accedi per unirti alla discussione
       discussion: Discussione
     node:
       title: 'Nodo: %{name}'
       history_title: 'Cronologia nodo: %{name}'
     way:
-      title: 'Way: %{name}'
-      history_title: 'Cronologia way: %{name}'
+      title: 'Percorso: %{name}'
+      history_title: 'Cronologia percorso: %{name}'
       nodes: Nodi
       also_part_of:
-        one: parte di way %{related_ways}
-        other: parte di way %{related_ways}
+        one: parte del percorso %{related_ways}
+        other: parte dei percorsi %{related_ways}
     relation:
       title: 'Relazione: %{name}'
       history_title: 'Cronologia relazione: %{name}'
@@ -315,7 +317,7 @@ it:
       user_title: Diario dell'utente %{user}
       leave_a_comment: Lascia un commento
       login_to_leave_a_comment: '%{login_link} per lasciare un commento'
-      login: Login
+      login: Accedi
       save_button: Salva
     no_such_entry:
       title: Nessuna voce del diario
@@ -477,7 +479,7 @@ it:
           ferry_terminal: Terminal traghetti
           fire_hydrant: Pompa antincendio
           fire_station: Vigili del fuoco
-          food_court: Food Court
+          food_court: Area ristorazione
           fountain: Fontana
           fuel: Stazione di rifornimento
           gambling: Gioco d'azzardo
@@ -495,7 +497,7 @@ it:
           motorcycle_parking: Parcheggio per Moto
           nightclub: Night Club
           nursery: Asilo nido
-          nursing_home: Asilo nido
+          nursing_home: Residenza sanitaria assistenziale
           office: Ufficio
           parking: Parcheggio
           parking_entrance: Entrata del parcheggio
@@ -518,9 +520,9 @@ it:
           shop: Negozio
           shower: Doccia
           social_centre: Centro sociale
-          social_club: Centro Sociale
+          social_club: Associazione
           social_facility: Struttura sociale
-          studio: Studio
+          studio: Studio audio/video
           swimming_pool: Piscina
           taxi: Taxi
           telephone: Telefono pubblico
@@ -593,7 +595,7 @@ it:
           secondary_link: Strada secondaria
           service: Strada di servizio
           services: Stazione di servizio
-          speed_camera: Autovelox fissi
+          speed_camera: Autovelox fisso
           steps: Scala
           street_lamp: Lampione
           tertiary: Strada terziaria
@@ -832,7 +834,7 @@ it:
           chemist: Farmacia
           clothes: Negozio di abbigliamento
           computer: Negozio di computer
-          confectionery: Pasticceria
+          confectionery: Negozio di dolciumi
           convenience: Minimarket
           copyshop: Copisteria
           cosmetics: Negozio cosmetici
@@ -1108,6 +1110,7 @@ it:
         Se ritieni che materiale protetto da copyright sia stato impropriamente aggiunto al database di OpenStreetMap o a questo sito, consulta la nostra
          <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura di rimozione per violazione del copyright</a> o segnalacelo direttamente alla nostra
         <a href="http://dmca.openstreetmap.org/">pagina di segnalazione on-line</a>.
+      trademarks_title_html: <span id="trademarks"></span>Marchi registrati
   welcome_page:
     title: Benvenuto!
     introduction_html: Benvenuti in OpenStreetMap, la mappa del mondo libera e modificabile.
@@ -1184,7 +1187,7 @@ it:
       gli argomenti di mappatura.
     welcome:
       url: /welcome
-      title: Benvenuti a OSM
+      title: Benvenuti in OSM
       description: Inizia con questa guida rapida che copre le basi di OpenStreetMap.
     beginners_guide:
       url: http://wiki.openstreetmap.org/wiki/IT:Beginners%27_guide
@@ -1486,9 +1489,7 @@ it:
           primary: Strada primaria
           secondary: Strada secondaria
           unclassified: Strada non classificata
-          unsurfaced: Strada non pavimentata
           track: Strada forestale o agricola
-          byway: Byway (UK)
           bridleway: Percorso per equitazione
           cycleway: Pista Ciclabile
           footway: Percorso pedonale
@@ -1512,7 +1513,6 @@ it:
           golf: Campo da golf
           park: Parco
           resident: Zona residenziale
-          tourist: Attrazione turistica
           common:
           - Area comune
           - prato
@@ -1542,7 +1542,6 @@ it:
           tunnel: Linea tratteggiata = tunnel
           bridge: Quadrettatura nera = ponte
           private: Accesso privato
-          permissive: Accesso permissivo
           destination: Servitù di passaggio
           construction: Strade in costruzione
     richtext_area:
@@ -1812,6 +1811,12 @@ it:
         google:
           title: Accedi con Google
           alt: Accedi con un OpenID di Google
+        facebook:
+          title: Accedi con Facebook
+          alt: Accedi con un Account Facebook
+        windowslive:
+          title: Accedi con Windows Live
+          alt: Accedi con un Account Windows Live
         yahoo:
           title: Accedi con Yahoo
           alt: Accedi con un OpenID di Yahoo
@@ -2117,6 +2122,8 @@ it:
     auth_failure:
       connection_failed: Connessione al provider di autenticazione non riuscita
       invalid_credentials: Le credenziali di autenticazione non sono valide
+      no_authorization_code: Nessun codice di autorizzazione
+      unknown_signature_algorithm: Algoritmo di firma sconosciuto
   user_role:
     filter:
       not_an_administrator: Solo gli amministratori possono gestire i ruoli degli
@@ -2233,6 +2240,7 @@ it:
       heading: '%{block_on} bloccato da %{block_by}'
       time_future: Termina fra %{time}
       time_past: Terminato %{time} fa
+      ago: '%{time} fa'
       status: Stato
       show: Mostra
       edit: Modifica
@@ -2283,6 +2291,7 @@ it:
       link: Link o HTML
       long_link: Link
       short_link: Link breve
+      geo_uri: Geo URI
       embed: HTML
       custom_dimensions: Imposta dimensioni personalizzate
       format: 'Formato:'
@@ -2361,12 +2370,25 @@ it:
         mapquest_car: Auto (MapQuest)
         mapquest_foot: A piedi (MapQuest)
         osrm_car: Auto (OSRM)
-      directions: Direzioni
+      directions: Indicazioni
       distance: Distanza
       errors:
         no_route: Impossibile trovare un percorso fra questi due posti.
         no_place: Spiacenti, non è possibile trovare quel luogo.
       instructions:
+        continue_without_exit: Prosegui su %{name}
+        slight_right_without_exit: Svolta leggermente a destra in %{name}
+        turn_right_without_exit: Svolta a destra in %{name}
+        sharp_right_without_exit: Svolta tutto a destra in %{name}
+        uturn_without_exit: Effettua un'inversione a U lungo %{name}
+        sharp_left_without_exit: Svolta tutto a sinistra in %{name}
+        turn_left_without_exit: Svolta a sinistra in %{name}
+        slight_left_without_exit: Svolta leggermente a sinistra in %{name}
+        follow_without_exit: Segui %{name}
+        roundabout_without_exit: Alla rotonda prendi %{name}
+        leave_roundabout_without_exit: Esci dalla rotonda - %{name}
+        destination_without_exit: Raggiungi la destinazione
+        roundabout_with_exit: Alla rotonda prendi l'uscita n° %{exit} su %{name}
         unnamed: senza nome
         courtesy: Indicazioni per gentile concessione di %{link}
       time: Tempo
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 19708c8f0..88ff80907 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1263,9 +1263,7 @@ ja:
           primary: 主要地方道
           secondary: 一般県道
           unclassified: 未分類の道路
-          unsurfaced: 未舗装道路
           track: 農道・林道
-          byway: 路地
           bridleway: 乗馬道
           cycleway: 自転車道
           footway: 歩道
@@ -1289,7 +1287,6 @@ ja:
           golf: ゴルフ場
           park: 公園
           resident: 住宅地
-          tourist: 観光名所
           common:
           - 共有地
           - 牧草地
@@ -1319,7 +1316,6 @@ ja:
           tunnel: 点線の枠 = トンネル
           bridge: 黒枠 = 橋梁
           private: 私的通行
-          permissive: 許可制通行
           destination: 目的通行
           construction: 建設中の道路
     richtext_area:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index dab202715..78a9705b7 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -732,9 +732,7 @@ ka:
           primary: მაგისტრალური საერთაშორისო მნიშვნელობის გზა
           secondary: სახელმწიფო მნიშვნელობის გზა
           unclassified: ადგილობრივი მნიშვნელობის გზა
-          unsurfaced: ყამირი გზა
           track: სოფლის გზა
-          byway: ბილიკი
           bridleway: საცხენოსნო გზა
           cycleway: ველოსიპედის გზა
           footway: საფეხმავლო გზა
@@ -754,7 +752,6 @@ ka:
           golf: გოლფის მოედანი
           park: პარკი
           resident: საცხოვრებელი ტერიტორია
-          tourist: ღირსშესანიშნაობა
           commercial: კომერციული ტერიტორია
           lake:
           - ტბა
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 714acccaa..c4a552c39 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -28,7 +28,7 @@ ko:
       changeset: 바뀜집합
       changeset_tag: 바뀜집합 태그
       country: 국가
-      diary_comment: 일기 덧글
+      diary_comment: 일기 댓글
       diary_entry: 일기 항목
       friend: 친구
       language: 언어
@@ -49,7 +49,7 @@ ko:
       relation_tag: 관계 태그
       session: 세션
       trace: 추적
-      tracepoint: 추적 지점
+      tracepoint: 추적 점
       tracetag: 추적 태그
       user: 사용자
       user_preference: 사용자 환경 설정
@@ -133,9 +133,9 @@ ko:
       relation_paginated: 관계 (%{count} 중 %{x}-%{y})
       comment: 의견 (%{count})
       hidden_commented_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에
-        남긴 숨겨진 덧글'
+        남긴 숨겨진 댓글'
       commented_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에
-        덧글을 남김'
+        댓글을 남김'
       changesetxml: 바뀜집합 XML
       osmchangexml: osmChange XML
       feed:
@@ -183,7 +183,7 @@ ko:
     redacted:
       redaction: 개정 %{id}
       message_html: 이 %{type}의 %{version}판은 비공개 처리되었기 때문에 볼 수 없습니다. 자세한 내용은 %{redaction_link}(을)를
-        참고하세요.
+        참조하세요.
       type:
         node: 노드
         way: 길
@@ -211,9 +211,9 @@ ko:
       open_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에 만듦'
       open_by_anonymous: 익명 사용자가 <abbr title='%{exact_time}'>%{when} 전</abbr>에 만듦
       commented_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에
-        덧글을 남김'
+        댓글을 남김'
       commented_by_anonymous: 익명 사용자가 <abbr title='%{exact_time}'>%{when} 전</abbr>에
-        덧글을 남김
+        댓글을 남김
       closed_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에 해결함'
       closed_by_anonymous: 익명 사용자가 <abbr title='%{exact_time}'>%{when} 전</abbr>에 해결함
       reopened_by: '%{user} 사용자가 <abbr title=''%{exact_time}''>%{when} 전</abbr>에 다시
@@ -239,7 +239,7 @@ ko:
       id: ID
       saved_at: 저장된 시간
       user: 사용자
-      comment: 덧글
+      comment: 댓글
       area: 지역
     list:
       title: 바뀜집합
@@ -258,7 +258,7 @@ ko:
     rss:
       title_all: OpenStreetMap 바뀜집합 토론
       title_particular: 'OpenStreetMap 바뀜집합 #%{changeset_id} 토론'
-      comment: '바뀜집합 #%{changeset_id}에 %{author}님이 새 덧글을 남김'
+      comment: '바뀜집합 #%{changeset_id}에 %{author}님이 새 댓글을 남김'
       commented_at_html: '%{when} 전에 업데이트함'
       commented_at_by_html: '%{user} 사용자가 %{when} 전에 업데이트함'
       full: 전체 토론
@@ -291,28 +291,28 @@ ko:
     view:
       title: '%{user}의 일기 | %{title}'
       user_title: '%{user}의 일기'
-      leave_a_comment: 덧글 남기기
-      login_to_leave_a_comment: 덧글을 남기려면 로그인해야 합니다. %{login_link}
+      leave_a_comment: 댓글 남기기
+      login_to_leave_a_comment: 댓글을 남기려면 로그인해야 합니다. %{login_link}
       login: 로그인
       save_button: 저장
     no_such_entry:
       title: 이러한 일기 항목이 없음
       heading: 'id에 항목 없음: %{id}'
-      body: 죄송합니다, %{id} id로 된 일기 항목이나 덧글이 없습니다. 맞춤법이나 클릭한 링크가 잘못됐는지 확인하세요.
+      body: 죄송합니다, %{id} id로 된 일기 항목이나 댓글이 없습니다. 맞춤법이나 클릭한 링크가 잘못됐는지 확인하세요.
     diary_entry:
       posted_by: '%{link_user} 사용자가 %{language_link}로 %{created}에 게시함'
-      comment_link: 이 항목에 덧글 남기기
+      comment_link: 이 항목에 댓글 남기기
       reply_link: 이 항목에 답변하기
       comment_count:
-        zero: 덧글 없음
-        one: 덧글 %{count}개
-        other: 덧글 %{count}개
+        zero: 댓글 없음
+        one: 댓글 %{count}개
+        other: 댓글 %{count}개
       edit_link: 이 항목 편집
       hide_link: 이 항목 숨기기
       confirm: 확인
     diary_comment:
-      comment_from: '%{comment_created_at}에 %{link_user}에 대한 덧글'
-      hide_link: 이 덧글 숨기기
+      comment_from: '%{comment_created_at}에 %{link_user}에 대한 댓글'
+      hide_link: 이 댓글 숨기기
       confirm: 확인
     location:
       location: '위치:'
@@ -329,13 +329,13 @@ ko:
         title: OpenStreetMap 일기 항목
         description: OpenStreetMap의 사용자의 최근 일기 항목
     comments:
-      has_commented_on: '%{display_name} 사용자가 다음 일기 항목에 덧글을 남겼습니다'
+      has_commented_on: '%{display_name} 사용자가 다음 일기 항목에 댓글을 남겼습니다'
       post: 게시물
       when: 날짜
-      comment: 덧글
+      comment: 댓글
       ago: '%{ago} 전'
-      newer_comments: 새 덧글
-      older_comments: 이전 덧글
+      newer_comments: 새 댓글
+      older_comments: 이전 댓글
   export:
     title: 내보내기
     start:
@@ -543,7 +543,7 @@ ko:
           construction: 건설 중인 고속도로
           cycleway: 자전거로
           elevator: 엘리베이터
-          emergency_access_point: 긴급 접근 지점
+          emergency_access_point: 긴급 액세스 포인트
           footway: 보도
           ford: 여울
           living_street: 주택가
@@ -701,7 +701,7 @@ ko:
           moor: 습지
           mud: 진흙
           peak: 산정상
-          point: 지점
+          point: 점
           reef: 암초
           ridge: 산등성이
           rock: 바위
@@ -780,7 +780,7 @@ ko:
           spur: 지선
           station: 철도역
           stop: 철도 정거장
-          subway: 지하철역
+          subway: 지하철
           subway_entrance: 지하철 입구
           switch: 철도 분기
           tram: 전차
@@ -982,7 +982,8 @@ ko:
     legal_babble:
       title_html: 저작권 및 라이선스
       intro_1_html: |-
-        OpenStreetMap은 <i>오픈 데이터</i>로 <a
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>은 <i>오픈 데이터</i>로 <a
+        href="http://osmfoundation.org/">OpenStreetMap 재단</a> (OSMF)의 <a
         href="http://opendatacommons.org/licenses/odbl/">오픈 데이터
         커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
       intro_2_html: |-
@@ -1026,7 +1027,7 @@ ko:
         지도 API는 무료로 제공할 수 없습니다.
         <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API 사용 정책</a>,
         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">타일 사용 정책</a>과
-        <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim(이름) 사용 정책</a>를 참고하세요.
+        <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim(이름) 사용 정책</a>를 참조하세요.
       contributors_title_html: 우리의 기여자
       contributors_intro_html: |-
         우리의 기여자는 수천 명의 개인입니다. 또한 국립지도 제작 기관과
@@ -1083,6 +1084,7 @@ ko:
         추가되었다고 생각하면 <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">게시
         중단 절차</a>를 참고하거나 <a href="http://dmca.openstreetmap.org/">온라인
         신고 페이지</a>에서 직접 제출하세요.
+      trademarks_title_html: <span id="trademarks"></span>등록 상표
   welcome_page:
     title: 환영합니다!
     introduction_html: |-
@@ -1104,7 +1106,7 @@ ko:
       paragraph_1_html: OpenStreetMap은 자신의 용어 중 일부가 있습니다. 여기에 편리하게 사용할 수 있는 몇 가지 핵심
         단어가 있습니다.
       editor_html: <strong>편집기</strong>는 지도를 편집하는 데 사용할 수 있는 프로그램이나 웹사이트입니다.
-      node_html: <strong>노드</strong>는 음식점 한 곳이나 나무와 같은, 지도에 있는 지점입니다.
+      node_html: <strong>노드</strong>는 음식점 한 곳이나 나무와 같은, 지도에 있는 점입니다.
       way_html: <strong>길</strong>은 도로, 개울, 호수나 건물과 같은, 선이나 지역입니다.
       tag_html: |-
         <strong>태그</strong>는 음식점의 이름이나 도로의 속도 제한과 같은,
@@ -1193,21 +1195,22 @@ ko:
       재해 피해를 입은 지역을 매핑하는 인도주의자, 그리고 더 많은 기여자를
       포함합니다.
       공동체에 대해 더 알아보려면, <a href='%{diary_path}'>사용자 일기</a>,
-      <a href='http://blogs.openstreetmap.org/'>공동체 블로그</a>와, <a href='http://www.osmfoundation.org/'>OSM 재단</a> 웹사이트를 참고하세요.
+      <a href='http://blogs.openstreetmap.org/'>공동체 블로그</a>와, <a href='http://www.osmfoundation.org/'>OSM 재단</a> 웹사이트를 참조하세요.
     open_data_title: 오픈 데이터
     open_data_html: |-
       OpenStreetMap은 <i>오픈 데이터</i>입니다: OpenStreetMap과 기여자를 제작진으로
       어떤 목적으로도 자유롭게 사용할 수 있습니다. 특정 방법으로 바꾸거나
       데이터에 빌드한다면, 동일한 라이선스에 따라 결과를 배포할 수 있습니다.
       자세한 내용은 <a href='%{copyright_path}'>저작권 및 라이선스 페이지</a>를
-      참고하세요.
+      참조하세요.
+    legal_title: 법률
     partners_title: 파트너
   notifier:
     diary_comment_notification:
-      subject: '[OpenStreetMap] %{user}님이 당신의 일기 항목에 덧글을 남겼습니다'
+      subject: '[OpenStreetMap] %{user}님이 당신의 일기 항목에 댓글을 남겼습니다'
       hi: 안녕하세요 %{to_user}님,
-      header: '%{from_user}님이 %{subject} 제목의 OpenStreetMap 일기 항목에 덧글을 남겼습니다:'
-      footer: '%{readurl}에서도 덧글을 확인할 수 있습니다. %{commenturl}에서 덧글을 남기거나 %{replyurl}에서
+      header: '%{from_user}님이 %{subject} 제목의 OpenStreetMap 일기 항목에 댓글을 남겼습니다:'
+      footer: '%{readurl}에서도 댓글을 확인할 수 있습니다. %{commenturl}에서 댓글을 남기거나 %{replyurl}에서
         답글을 남길 수 있습니다.'
     message_notification:
       hi: 안녕하세요 %{to_user}님,
@@ -1231,8 +1234,7 @@ ko:
         more_info_2: '다음에서 찾을 수 있습니다:'
       success:
         subject: '[OpenStreetMap] GPX 가져오기 성공'
-        loaded_successfully: 가능한 %{possible_points} 지점 중 %{trace_points} 지점을 성공적으로
-          불러왔습니다.
+        loaded_successfully: 가능한 %{possible_points} 점 중 %{trace_points} 점을 성공적으로 불러왔습니다.
     signup_confirm:
       subject: '[OpenStreetMap] OpenStreetMap에 오신 것을 환영합니다'
       greeting: 안녕하세요!
@@ -1264,34 +1266,34 @@ ko:
       anonymous: 익명 사용자
       greeting: 안녕하세요,
       commented:
-        subject_own: '[OpenStreetMap] %{commenter} 사용자가 당신의 참고에 덧글을 남겼습니다'
-        subject_other: '[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 참고에 덧글을 남겼습니다'
-        your_note: '%{commenter} 사용자가 %{place} 근처의 당신의 지도에 덧글을 남겼습니다.'
-        commented_note: '%{commenter} 사용자가 당신이 덧글을 남긴 지도 참고에 덧글을 남겼습니다. 참고는 %{place}
+        subject_own: '[OpenStreetMap] %{commenter} 사용자가 당신의 참고에 댓글을 남겼습니다'
+        subject_other: '[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 참고에 댓글을 남겼습니다'
+        your_note: '%{commenter} 사용자가 %{place} 근처의 당신의 지도에 댓글을 남겼습니다.'
+        commented_note: '%{commenter} 사용자가 당신이 댓글을 남긴 지도 참고에 댓글을 남겼습니다. 참고는 %{place}
           근처에 있습니다.'
       closed:
         subject_own: '[OpenStreetMap] %{commenter} 사용자가 당신의 참고 중 하나를 해결했습니다'
         subject_other: '[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 참고를 해결했습니다'
         your_note: '%{commenter} 사용자가 %{place} 근처의 당신의 지도 참고 중 하나를 해결했습니다.'
-        commented_note: '%{commenter} 사용자가 당신이 덧글을 남긴 지도 참고를 해결했습니다. 참고는 %{place}
+        commented_note: '%{commenter} 사용자가 당신이 댓글을 남긴 지도 참고를 해결했습니다. 참고는 %{place}
           근처에 있습니다.'
       reopened:
         subject_own: '[OpenStreetMap] %{commenter} 사용자가 당신의 참고 중 하나를 다시 활성했습니다'
         subject_other: '[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 참고를 다시 활성했습니다'
         your_note: '%{commenter} 사용자가 %{place} 근처의 당신의 지도 참고 중 하나를 다시 활성했습니다.'
-        commented_note: '%{commenter} 사용자가 당신이 덧글을 남긴 지도 참고를 다시 활성했습니다. 참고는 %{place}
+        commented_note: '%{commenter} 사용자가 당신이 댓글을 남긴 지도 참고를 다시 활성했습니다. 참고는 %{place}
           근처에 있습니다.'
       details: 참고에 대한 자세한 사항은 %{url} 에서 찾을 수 있습니다.
     changeset_comment_notification:
       greeting: 안녕하세요,
       commented:
-        subject_own: '[OpenStreetMap] %{commenter} 사용자가 당신의 바뀜집합에 덧글을 남겼습니다'
-        subject_other: '[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 바뀜집합에 덧글을 남겼습니다'
-        your_changeset: '%{commenter} 사용자가 당신이 %{time}에 만든 바뀜집합에 덧글을 달았습니다'
+        subject_own: '[OpenStreetMap] %{commenter} 사용자가 당신의 바뀜집합에 댓글을 남겼습니다'
+        subject_other: '[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 바뀜집합에 댓글을 남겼습니다'
+        your_changeset: '%{commenter} 사용자가 당신이 %{time}에 만든 바뀜집합에 댓글을 달았습니다'
         commented_changeset: '%{commenter} 사용자가 %{changeset_author}이 %{time}에 만든,
-          주시 중인 지도 바뀜집합에 덧글을 달았습니다'
+          주시 중인 지도 바뀜집합에 댓글을 달았습니다'
         partial_changeset_with_comment: '''%{changeset_comment}'' 덧글로'
-        partial_changeset_without_comment: 덧글 없이
+        partial_changeset_without_comment: 댓글 없이
       details: 바뀜집합에 대한 자세한 사항은 %{url} 에서 찾을 수 있습니다.
   message:
     inbox:
@@ -1385,7 +1387,7 @@ ko:
         플래시 플레이어를 다운로드</a>할 수 있습니다. <a href="http://wiki.openstreetmap.org/wiki/Editing">몇
         가지 다른 설정</a> 또한 OpenStreetMap 편집을 위해 사용할 수 있습니다.
       potlatch_unsaved_changes: 바뀜을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는 경우,
-        현재의 방식이나 지점을 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.)
+        현재 길이나 점을 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.)
       potlatch2_not_configured: Potlatch 2가 설정되지 않았습니다 - 자세한 정보는 http://wiki.openstreetmap.org/wiki/The_Rails_Port
       potlatch2_unsaved_changes: 바뀜을 저장하지 않았습니다. (Potlatch 2에서 저장하려면 저장을 클릭해야 합니다.)
       id_not_configured: iD가 설정되지 않았습니다
@@ -1396,7 +1398,7 @@ ko:
     search:
       search: 검색
       get_directions: 길 찾기
-      get_directions_title: 두 지점 사이의 길 찾기
+      get_directions_title: 두 점 사이의 길 찾기
       from: 출발지
       to: 도착지
       where_am_i: 내가 어디있나요?
@@ -1410,9 +1412,7 @@ ko:
           primary: 주요 도로
           secondary: 보조 도로
           unclassified: 분류하지 않은 도로
-          unsurfaced: 비포장 도로
           track: 추적
-          byway: 옆길
           bridleway: 승마로
           cycleway: 자전거로
           footway: 보도
@@ -1436,7 +1436,6 @@ ko:
           golf: 골프장
           park: 공원
           resident: 주거 지역
-          tourist: 관광 명소
           common:
           - 공유지
           - 목초지
@@ -1466,7 +1465,6 @@ ko:
           tunnel: 점선 테두리 = 터널
           bridge: 검은 테두리 = 다리
           private: 개인 통행
-          permissive: 허용 통행
           destination: 목적 통행
           construction: 공사 중인 도로
     richtext_area:
@@ -1489,10 +1487,10 @@ ko:
       url: URL
   trace:
     visibility:
-      private: 비공개 (익명으로만 공유, 정렬하지 않은 지점)
-      public: 공개 (익명으로 추적 목록 보임, 정렬하지 않은 지점)
-      trackable: 추적 가능 (익명으로만 공유, 시간 기록으로 정렬한 지점)
-      identifiable: 식별 가능 (식별 가능한 추적 목록 보임, 시간 기록으로 정렬한 지점)
+      private: 비공개 (익명으로만 공유, 정렬하지 않은 점)
+      public: 공개 (익명으로 추적 목록 보임, 정렬하지 않은 점)
+      trackable: 추적 가능 (익명으로만 공유, 시간 기록으로 정렬한 점)
+      identifiable: 식별 가능 (식별 가능한 추적 목록 보임, 시간 기록으로 정렬한 점)
     create:
       upload_trace: GPS 추적 올리기
       trace_uploaded: GPX 파일을 올리고 있으며 데이터베이스에 삽입을 기다리고 있습니다. 이 작업은 보통 반 시간 내에 수행하며
@@ -1503,7 +1501,7 @@ ko:
       filename: '파일 이름:'
       download: 다운로드
       uploaded_at: '올려짐:'
-      points: '지점:'
+      points: '점:'
       start_coord: '시작 좌표:'
       map: 지도
       edit: 편집
@@ -1541,7 +1539,7 @@ ko:
       filename: '파일 이름:'
       download: 다운로드
       uploaded: '올려짐:'
-      points: '지점:'
+      points: '점:'
       start_coordinates: '시작 좌표:'
       map: 지도
       edit: 편집
@@ -1559,7 +1557,7 @@ ko:
       newer: 다음 추적
     trace:
       pending: 보류 중
-      count_points: '%{count} 지점'
+      count_points: 점 %{count}개
       ago: '%{time_in_words_ago} 전'
       more: 더 보기
       trace_details: 추적 자세한 정보 보기
@@ -1594,8 +1592,8 @@ ko:
       title: OpenStreetMap GPS 추적
     description:
       description_with_count:
-        one: '%{user}에서의 %{count} 지점으로 된 GPX 파일'
-        other: '%{user}에서의 %{count} 지점으로 된 GPX 파일'
+        one: '%{user}에서의 점 %{count}개로 된 GPX 파일'
+        other: '%{user}에서의 점 %{count}개으로 된 GPX 파일'
       description_without_count: '%{user}에서의 GPX 파일'
   application:
     require_cookies:
@@ -1614,7 +1612,7 @@ ko:
       allow_to: '다음 클라이언트 애플리케이션을 허용합니다:'
       allow_read_prefs: 사용자 환경 설정을 읽습니다.
       allow_write_prefs: 사용자 환경 설정을 수정합니다.
-      allow_write_diary: 일기 항목을 만들고 덧글을 달고 친구를 만듭니다.
+      allow_write_diary: 일기 항목을 만들고 댓글을 달고 친구를 만듭니다.
       allow_write_api: 지도를 수정합니다.
       allow_read_gpx: 비공개 GPS 추적을 읽습니다.
       allow_write_gpx: GPS 추적을 올립니다.
@@ -1650,7 +1648,7 @@ ko:
       requests: '사용자가 다음 권한을 요청합니다:'
       allow_read_prefs: 사용자 환경 설정을 읽습니다.
       allow_write_prefs: 사용자 환경 설정을 수정합니다.
-      allow_write_diary: 일기 항목을 만들고 덧글을 달고 친구를 만듭니다.
+      allow_write_diary: 일기 항목을 만들고 댓글을 달고 친구를 만듭니다.
       allow_write_api: 지도를 수정합니다.
       allow_read_gpx: 비공개 GPS 추적을 읽습니다.
       allow_write_gpx: GPS 추적을 올립니다.
@@ -1676,7 +1674,7 @@ ko:
       requests: '사용자가 다음 권한을 요청합니다:'
       allow_read_prefs: 사용자 환경 설정을 읽습니다.
       allow_write_prefs: 사용자 환경 설정을 수정합니다.
-      allow_write_diary: 일기 항목을 만들고 덧글을 달고 친구를 만듭니다.
+      allow_write_diary: 일기 항목을 만들고 댓글을 달고 친구를 만듭니다.
       allow_write_api: 지도를 수정합니다.
       allow_read_gpx: 비공개 GPS 추적을 읽습니다.
       allow_write_gpx: GPS 추적을 올립니다.
@@ -1770,13 +1768,14 @@ ko:
       email address: '이메일 주소:'
       confirm email address: '이메일 주소 확인:'
       not displayed publicly: 공개적으로 보이지 않습니다 (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
-        title="이메일 주소에 대한 부분을 포함한 위키 개인 정보 정책">개인 정보 정책</a>을 참고하세요)
+        title="이메일 주소에 대한 부분을 포함한 위키 개인 정보 정책">개인 정보 정책</a>을 참조하세요)
       display name: '보여줄 이름:'
       display name description: 공개적으로 보여질 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다.
       external auth: '제3자 인증:'
       password: '비밀번호:'
       confirm password: '비밀번호 확인:'
       use external auth: 다른 제3자 로그인 방식 사용하기
+      auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다.
       auth association: |-
         <p>당신의 계정은 아직 오픈스트리트맵 계정과 연동되어 있지 않습니다.</p>
         <ul>
@@ -1790,7 +1789,7 @@ ko:
       continue: 가입하기
       terms accepted: 새 기여자 약관에 동의하셔서 감사합니다!
       terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이
-        위키 문서</a>를 참고하세요.
+        위키 문서</a>를 참조하세요.
     terms:
       title: 기여자 약관
       heading: 기여자 약관
@@ -1820,7 +1819,7 @@ ko:
       my messages: 내 메시지
       my profile: 내 프로필
       my settings: 프로필 설정
-      my comments: 내 덧글
+      my comments: 내 댓글
       oauth settings: oauth 설정
       blocks on me: 나를 차단
       blocks by me: 나한테 차단
@@ -1863,7 +1862,7 @@ ko:
           moderator: 운영자 권한 해제
       block_history: 사용자가 차단을 받았습니다
       moderator_history: 사용자가 차단을 주었습니다
-      comments: 덧글
+      comments: 댓글
       create_block: 이 사용자를 차단
       activate_user: 이 사용자 활성화
       deactivate_user: 이 사용자 비활성화
@@ -1886,7 +1885,7 @@ ko:
       current email address: '현재 이메일 주소:'
       new email address: '새 이메일 주소:'
       email never displayed publicly: (절대 공개하지 않습니다)
-      external auth: '외부 인증:'
+      external auth: '바깥 인증:'
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: 이게 뭐죠?
@@ -1998,9 +1997,11 @@ ko:
           이 문제를 토론하려면 %{webmaster}에게 문의할 수 있습니다.
         </p>
     auth_failure:
-      connection_failed: 인증 서버와의 연결에 실패했습니다.
+      connection_failed: 인증 제공자와 연결하는 데 실패했습니다
+      invalid_credentials: 잘못된 인증 자격 증명
       no_authorization_code: 인증 코드가 없습니다.
       unknown_signature_algorithm: 알려지지 않은 인증 알고리즘
+      invalid_scope: 잘못된 범위
   user_role:
     filter:
       not_an_administrator: 관리자만 사용자 역할 관리를 수행할 수 있습니다, ​​당신은 관리자가 아닙니다.
@@ -2104,6 +2105,8 @@ ko:
       heading: '%{block_on} 사용자가 %{block_by} 사용자에 의해 차단됨'
       time_future: '%{time}에 끝남'
       time_past: '%{time} 전에 끝남'
+      created: 만들어짐
+      ago: '%{time} 전'
       status: 상태
       show: 보기
       edit: 편집
@@ -2126,19 +2129,19 @@ ko:
     rss:
       title: OpenStreetMap 참고
       description_area: 내 지역[(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]에
-        참고, 덧글 또는 닫힌 참고 목록
+        참고, 댓글 또는 닫힌 참고 목록
       description_item: '%{id} 참고에 대한 RSS 피드'
       opened: 새 참고 (%{place} 근처)
-      commented: 새 덧글 (%{place} 근처)
+      commented: 새 댓글 (%{place} 근처)
       closed: 닫힌 참고 (%{place} 근처)
       reopened: 다시 활성된 참고 (%{place} 근처)
     entry:
-      comment: 덧글
+      comment: 댓글
       full: 전체 참고
     mine:
-      title: '%{user} 사용자가 제출했거나 덧글을 남긴 참고'
+      title: '%{user} 사용자가 제출했거나 댓글을 남긴 참고'
       heading: '%{user}의 참고'
-      subheading: '%{user} 사용자가 제출했거나 덧글을 남긴 참고'
+      subheading: '%{user} 사용자가 제출했거나 댓글을 남긴 참고'
       id: ID
       creator: 만든이
       description: 설명
@@ -2175,7 +2178,7 @@ ko:
         out: 축소
       locate:
         title: 내 위치 보기
-        popup: 이 지점의 {distance} {unit} 안에 있습니다
+        popup: 이 점의 {distance} {unit} 안에 있습니다
       base:
         standard: 표준
         cycle_map: 사이클 지도
@@ -2197,10 +2200,10 @@ ko:
       map_notes_zoom_in_tooltip: 지도 참고를 보려면 확대
       map_data_zoom_in_tooltip: 지도 데이터를 보려면 확대
       queryfeature_tooltip: 지물 정보
-      queryfeature_disabled_tooltip: 지물 정보를 확인하려면 지도를 확대하세요
+      queryfeature_disabled_tooltip: 지물 정보를 확인하려면 확대
     changesets:
       show:
-        comment: 덧글
+        comment: 댓글
         subscribe: 구독
         unsubscribe: 구독 해지
         hide_comment: 숨기기
@@ -2215,8 +2218,8 @@ ko:
         hide: 숨기기
         resolve: 해결
         reactivate: 다시 활성화
-        comment_and_resolve: 덧글 & 해결
-        comment: 덧글
+        comment_and_resolve: 댓글 & 해결
+        comment: 댓글
     edit_help: 편집하려는 위치에 지도를 이동하고 확대한 다음, 여기를 클릭하세요.
     directions:
       engines:
@@ -2232,8 +2235,26 @@ ko:
         no_route: 두 장소 사이의 경로를 찾을 수 없습니다.
         no_place: 죄송합니다 - 그 장소를 찾을 수 없습니다.
       instructions:
+        continue_without_exit: '%{name}로 계속가세요'
+        slight_right_without_exit: '%{name}을(를) 따라 오른쪽으로 완만하게 도세요'
+        turn_right_without_exit: '%{name}을(를) 따라 오른쪽으로 도세요'
+        sharp_right_without_exit: '%{name}을(를) 따라 오른쪽으로 꺾으세요'
+        uturn_without_exit: '%{name}을(를) 따라 유턴하세요'
+        sharp_left_without_exit: '%{name}을(를) 따라 왼쪽으로 꺾으세요'
+        turn_left_without_exit: '%{name}을(를) 따라 왼쪽으로 도세요'
+        slight_left_without_exit: '%{name}을(를) 따라 왼쪽으로 완만하게 도세요'
+        via_point_without_exit: (점을 통해)
+        follow_without_exit: '%{name}을(를) 따라가세요'
+        roundabout_without_exit: '%{name}의 회전교차로에서'
+        leave_roundabout_without_exit: 회전교차로를 떠나세요 - %{name}
+        stay_roundabout_without_exit: 회전교차로에 머무세요 - %{name}
+        start_without_exit: '%{name}의 끝에서 시작'
+        destination_without_exit: 목적지에 도달합니다
+        against_oneway_without_exit: '%{name}(으)로 한 방향으로 가세요'
+        end_oneway_without_exit: '%{name}에서의 한 방향의 끝'
+        roundabout_with_exit: '%{name}에서의 회전교차로에서 %{exit} 출구로 떠나세요'
         unnamed: 이름 없음
-        courtesy: '%{link}의 길 풍습'
+        courtesy: '%{link}의 가는 방향'
       time: 시간
     query:
       node: 노드
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 77a2f124f..05b4652aa 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -753,7 +753,6 @@ lb:
           motorway: Autobunn
           secondary: Niewestrooss
           unclassified: Net klasséiert Strooss
-          byway: Niewewee
           bridleway: Wee fir Päerd
           cycleway: Vëlospiste
           footway: Fousswee
@@ -767,7 +766,6 @@ lb:
           wood: Bësch
           golf: Golfterrain
           park: Park
-          tourist: Touristenattraktioun
           industrial: Industriezone
           lake:
           - Séi
@@ -1187,6 +1185,7 @@ lb:
         sharp_right_without_exit: Schaarf riets op %{name}
         sharp_left_without_exit: Schaarf lénks op %{name}
         via_point_without_exit: (iwwer de Punkt)
+        roundabout_without_exit: Am Kreesverkéier huelt %{name}
         leave_roundabout_without_exit: Aus dem Kreesverkéier erausgoen - %{name}
         stay_roundabout_without_exit: Am Kreesverkéier bleiwen - %{name}
         unnamed: Strooss ouni Numm
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 1993a5bff..0b6504c9c 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1453,9 +1453,7 @@ lt:
           primary: Pirmosios reikšmės kelias
           secondary: Antros reikšmės kelias
           unclassified: Neklasifikuotas kelias
-          unsurfaced: Kelias be dangos
           track: Pėdsakas
-          byway: Keliukas
           bridleway: Takas galvijams varyti
           cycleway: Dviračių takas
           footway: Pėsčiųjų takas
@@ -1479,7 +1477,6 @@ lt:
           golf: Golfo laukas
           park: Parkas
           resident: Gyvenamoji zona
-          tourist: Turistų atrakcija
           common:
           - Bendras
           - pieva
@@ -1509,7 +1506,6 @@ lt:
           tunnel: Punktyriniai kraštai = tiltas
           bridge: Tamsūs kraštai = tiltas
           private: Privati prieiga
-          permissive: Leidimo reikalaujantis įvažiavimas
           destination: Atvykimo susisiekimas
           construction: Statomi keliai
     richtext_area:
@@ -2334,6 +2330,24 @@ lt:
         no_route: Nepavyko rasti maršruto tarp šių dviejų vietų.
         no_place: Atsiprašome - nerandame tokios vietos.
       instructions:
+        continue_without_exit: Tęskite kelionę %{name}
+        slight_right_without_exit: Dešiniau į %{name}
+        turn_right_without_exit: Sukite dešinėn į %{name}
+        sharp_right_without_exit: Staigus posūkis dešinėn į %{name}
+        uturn_without_exit: Apsisukite ties %{name}
+        sharp_left_without_exit: Staigus posūkis kairėn į %{name}
+        turn_left_without_exit: Sukite kairėn į %{name}
+        slight_left_without_exit: Kairiau į %{name}
+        via_point_without_exit: (per tašką)
+        follow_without_exit: Sekite %{name}
+        roundabout_without_exit: Žiede išvažiuokite į %{name}
+        leave_roundabout_without_exit: Išvažiuokite iš žiedo - %{name}
+        stay_roundabout_without_exit: Likite žiede - %{name}
+        start_without_exit: Pradėkite %{name} pabaigoje
+        destination_without_exit: Pasiekite tikslą
+        against_oneway_without_exit: Važiuokite prieš eismą %{name}
+        end_oneway_without_exit: Vienpusio eismo pabaiga %{name}
+        roundabout_with_exit: Žiede išvažiuokite %{exit} išvažiavime į %{name}
         unnamed: bevardis
         courtesy: Nuorodas pateikė %{link}
       time: Laikas
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 849312e94..4048847c9 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1318,9 +1318,7 @@ lv:
           primary: Galvenais valsts ceļš
           secondary: Sekundāras nozīmes ceļš
           unclassified: Neklasificēts ceļš
-          unsurfaced: Ceļš bez seguma
           track: Zemesceļš
-          byway: Blakusceļš
           bridleway: Izjādes taka
           cycleway: Veloceliņš
           footway: Gājēju ceļš
@@ -1344,7 +1342,6 @@ lv:
           golf: Golfa laukums
           park: Parks
           resident: Dzīvojamā zona
-          tourist: TÅ«risma atrakcija
           common:
           - Koplietošanas zeme
           - Pļava
@@ -1374,7 +1371,6 @@ lv:
           tunnel: Tunelis
           bridge: Tilts
           private: Privāta pieeja
-          permissive: Brīva pieeja
           destination: Galamērķa pieeja
           construction: Ceļi būvniecības stadijā
     richtext_area:
@@ -2126,6 +2122,9 @@ lv:
         comment_and_resolve: Komentēt un Atrisināt
         comment: Komentēt
     edit_help: Pārvieto karti un pietuvini vietai, kuru vēlies labot, tad spied šeit.
+    directions:
+      instructions:
+        follow_without_exit: Sekot %{name}
   redaction:
     edit:
       description: Apraksts
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 03a7b271b..608869d99 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1461,9 +1461,7 @@ mk:
           primary: Главен пат
           secondary: Спореден пат
           unclassified: Некласификуван пат
-          unsurfaced: Неасфалтиран пат
           track: Патека
-          byway: Спореден пат
           bridleway: Пешачко-влечен пат
           cycleway: Велосипедска патека
           footway: Пешачка патека
@@ -1487,7 +1485,6 @@ mk:
           golf: Голф-терен
           park: Парк
           resident: Станбено подрачје
-          tourist: Туристичка атракција
           common:
           - Општествена земја
           - ливада
@@ -1517,7 +1514,6 @@ mk:
           tunnel: Испрекината линија = тунел
           bridge: Црна линија = мост
           private: Доверлив пристап
-          permissive: Дозволив пристап
           destination: Пристап до одредницата
           construction: Патишта во изградба
     richtext_area:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 189662668..172685621 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1084,9 +1084,7 @@ mr:
           primary: प्राथमिक रस्ता
           secondary: दुय्यम रस्ता
           unclassified: अवर्गीकृत रस्ता
-          unsurfaced: कच्चा रस्ता
           track: वाट
-          byway: उपमार्ग
           bridleway: अश्वमार्ग
           cycleway: सायकल मार्ग
           footway: पदपथ
@@ -1110,7 +1108,6 @@ mr:
           golf: गोल्फ कोर्स
           park: उद्यान
           resident: निवासी क्षेत्र
-          tourist: पर्यटन आकर्षण
           common:
           - सार्वजनिक जमीन
           - कुरण
@@ -1138,7 +1135,6 @@ mr:
           tunnel: तुटक कड = बोगदा
           bridge: काळी कड = पूल
           private: खाजगी प्रवेश
-          permissive: परवानगीने प्रवेश
           destination: केवळ गंतव्यासाठी प्रवेश
           construction: निर्माणाधीन रस्ते
     richtext_area:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index f5ef1b9c9..eb674253a 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1386,9 +1386,7 @@ ms:
           primary: Jalan utama
           secondary: Jalan sekunder
           unclassified: Jalan tidak terkelas
-          unsurfaced: Jalan tanpa turapan
           track: Laluan
-          byway: Jalan kecil
           bridleway: Lorong kuda
           cycleway: Lorong basikal
           footway: Laluan pejalan kaki
@@ -1412,7 +1410,6 @@ ms:
           golf: Padang golf
           park: Taman
           resident: Kawasan perumahan
-          tourist: Tarikan pelancong
           common:
           - Tanah awam
           - padang rumput
@@ -1442,7 +1439,6 @@ ms:
           tunnel: Kasing bertitik-titik = terowong
           bridge: Kasing hitam = jambatan
           private: Jalan masuk persendirian
-          permissive: Jalan masuk permisif
           destination: Jalan masuk destinasi
           construction: Jalan dalam pembinaan
     richtext_area:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 294fc5813..23dd14427 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -784,7 +784,7 @@ nb:
           spur: Jernbaneforgrening
           station: Jernbanestasjon
           stop: Jernbaneknutepunkt
-          subway: T-banestasjon
+          subway: Undergrunn
           subway_entrance: T-baneinngang
           switch: Sporveksel
           tram: Sporvei
@@ -1057,6 +1057,11 @@ nb:
       contributors_nz_html: |-
         <strong>New Zealand</strong>: Inneholder data hentet fra
            Land Information New Zealand. Crown Copyright reservert.
+      contributors_si_html: |-
+        <strong>Slovenia</strong>: Inneholder data fra
+        <a href="http://www.gu.gov.si/en/">Geologisk undersøkelse og kartmyndighet</a> and
+        <a href="http://www.mkgp.gov.si/en/">Departemanget for jordbruk, skog og mat</a>
+        (offentlig informasjonsopphav fra Slovenia).
       contributors_za_html: '<strong>Sør-Afrika</strong>: Inneholder data fra <a href="http://www.ngi.gov.za/">Chief
         Directorate: National Geo-Spatial Information</a>, State copyright reservert.'
       contributors_gb_html: |-
@@ -1078,6 +1083,11 @@ nb:
         lagt til OpenStreetMap-databasen eller dette nettstedet, ber vi deg se på
         vår <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">prosedyre for fjerning av materiale</a> eller send inn klagen direkte på
         <a href="http://dmca.openstreetmap.org/">nettsiden</a>.
+      trademarks_title_html: <span id="trademarks"></span>Varemerker
+      trademarks_1_html: OpenStreetMap og forstørrelsesglasset er varemerker beskyttet
+        på vegne av OpenStreetMap-stiftelsen. Hvis du har spørsmål vedrørende bruken
+        av varemerkene, rett spørsmål mot <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">arbeidsgruppen
+        for lisenser</a>.
   welcome_page:
     title: Velkommen!
     introduction_html: Velkommen til OpenStreetMap, det fri brukerredigerte verdenskartet.
@@ -1106,6 +1116,8 @@ nb:
         vei, elv, innsjø eller en bygning.
       tag_html: En <strong>tagg</strong> er et informasjonselement om en node eller
         strekning, f.eks. navnet på en restaurant eller fartsgrensen på en vei.
+    rules:
+      title: Regler!
     questions:
       title: Noen spørsmål?
       paragraph_1_html: |-
@@ -1145,10 +1157,25 @@ nb:
       url: /velkommen
       title: Velkommen til OSM
       description: Start med denne hurtigguiden som dekker det grunnleggende om OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Nn:Beginners%27_guide
+      title: Hjelp for nygebynnere
+      description: Dugnadsbasert guide for nybegynnere.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Still spørsmål eller sjekk svar på OSM sine spørsmål- og svar-sider.
+    mailing_lists:
+      title: E-postlister
+      description: Still et spørsmål eller diskuter interessante tema på en rekke
+        område eller saksbestemte e-postlister.
+    forums:
+      title: Forum
+    irc:
+      title: IRC
+      description: Interaktiv sludrekanal på flere ulike språk som dekker mange tema.
+    switch2osm:
+      title: switch2osm
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1176,6 +1203,7 @@ nb:
       du gjør endringer eller bygger på dataene på enkelte måter, kan du kun distribuere
       resultatet under samme lisens. Se <a href=''%{copyright_path}''>Opphavsrett
       og lisenssiden</a> for detaljer.'
+    legal_title: Juridisk
     partners_title: Partnere
   notifier:
     diary_comment_notification:
@@ -1407,9 +1435,7 @@ nb:
           primary: Primær vei
           secondary: Sekundær vei
           unclassified: Uklassifisert vei
-          unsurfaced: Vei uten dekke
           track: Spor
-          byway: Stikkvei
           bridleway: Ridevei
           cycleway: Sykkelvei
           footway: Gangvei
@@ -1433,7 +1459,6 @@ nb:
           golf: Golfbane
           park: Park
           resident: Boligområde
-          tourist: Turistattraksjon
           common:
           - Vanlig
           - eng
@@ -1463,7 +1488,6 @@ nb:
           tunnel: Streket kant = tunnel
           bridge: Sort kant = bru
           private: Privat tilgang
-          permissive: Betinget tilgang
           destination: Destinasjonstilgang
           construction: Veier under konstruksjon
     richtext_area:
@@ -1708,6 +1732,7 @@ nb:
       register now: Registrer deg nå
       with username: 'Har du allerede en OpenStreetMap-konto? Logg inn med brukernavnet
         og passordet ditt:'
+      with external: 'Alternativt kan du bruke en tredjepart til å logge inn:'
       new to osm: Ny på OpenStreetMap?
       to make changes: For å gjøre endringer på OpenStreetMap-data, må du ha en konto.
       create account minute: Opprett en konto. Det tar bare ett minutt.
@@ -1720,6 +1745,28 @@ nb:
         du ønsker å diskutere dette.
       auth failure: Beklager, kunne ikke logge inn med den informasjonen
       openid_logo_alt: Logg inn med en OpenID
+      auth_providers:
+        openid:
+          title: Logg inn med OpenID
+          alt: Logg inn med en OpenID-URL
+        google:
+          title: Logg inn med Google
+          alt: Logg inn med Google OpenID
+        facebook:
+          title: Logg inn med Facebook
+          alt: Logg inn med Facebook-konto
+        windowslive:
+          title: Logg inn med Windows Live
+          alt: Logg inn med en Windows Live-konto
+        yahoo:
+          title: Logg inn med Yahoo
+          alt: Logg inn med Yahoo OpenID
+        wordpress:
+          title: Logg inn med Wordpress
+          alt: Logg inn med Wordpress OpenID
+        aol:
+          title: Logg inn med AOL
+          alt: Logg inn med en AOL OpenID
     logout:
       title: Logg ut
       heading: Logg ut fra OpenStreetMap
@@ -1763,8 +1810,20 @@ nb:
       display name: 'Visningsnavn:'
       display name description: Ditt offentlig fremviste brukernavn. Du kan endre
         dette senere i innstillingene.
+      external auth: 'Tredjepartsgodkjenning:'
       password: 'Passord:'
       confirm password: 'Bekreft passord:'
+      use external auth: Alternativt kan du bruke en tredjepart til å logge inn
+      auth no password: Med tredjepartsbekreftelse er passord ikke påkrevd, men en
+        del ekstra verktøy og tjenere kan trenge det.
+      auth association: |-
+        <p>Din ID er ikke tilknyttet en OpenStreetMap konto enda.</p>
+        <ul>
+          <li>Hvis du er ny på OpenStreetMap, opprett en konto ved bruk av skjemaet nedenfor.</li>
+          <li>
+            Hvis du allerede har en konto kan du logge inn med brukernavn og passord, og deretter tilknytte dem til din ID i brukerinnstillingene.
+          </li>
+        </ul>
       continue: Registrer deg
       terms accepted: Takk for at du godtok de nye bidragsytervilkårene!
       terms declined: Vi beklager at du har besluttet å ikke akseptere de nye bidragsytervilkårene.
@@ -1871,6 +1930,7 @@ nb:
       current email address: 'Nåværende e-postadresse:'
       new email address: 'Ny e-postadresse:'
       email never displayed publicly: ' (vises aldri offentlig)'
+      external auth: 'Ekstern bekreftelse:'
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: hva er dette?
@@ -1946,8 +2006,9 @@ nb:
       heading: Bekreft endring av e-postadresse
       press confirm button: Klikk bekreftknappen nedenfor for å bekrefte din nye e-postadressse.
       button: Bekreft
-      success: E-postadressen din er bekreftet - takk for at du registrerte deg.
+      success: Bytte av e-postadresse bekreftet!
       failure: En e-postadresse er allerede bekreftet med denne nøkkelen.
+      unknown_token: Denne bekreftelseskoden finnes ikke eller har utløpt.
     set_home:
       flash success: Hjemmeposisjon lagret
     go_public:
@@ -1986,6 +2047,12 @@ nb:
         </p>
         <p>
         Denne avgjørelsen vil bli gjennomgått av en administrator snart, eller du kan kontakte %{webmaster} hvis du ønsker å diskutere dette.
+    auth_failure:
+      connection_failed: Tilkobling til bekreftelsestilbyder feilet
+      invalid_credentials: Ugyldige bekreftelsesopplysninger
+      no_authorization_code: Mangler bekreftelseskode
+      unknown_signature_algorithm: Ukjent signeringsalgoritme
+      invalid_scope: Ugyldig avgensning
   user_role:
     filter:
       not_an_administrator: Kun administratorer kan forandre roller, og du er ikke
@@ -2100,6 +2167,8 @@ nb:
       heading: '%{block_on} blokkert av %{block_by}'
       time_future: Slutter om %{time}
       time_past: Sluttet %{time} siden
+      created: Opprettet
+      ago: '%{time} siden'
       status: Status
       show: Vis
       edit: Rediger
@@ -2150,6 +2219,7 @@ nb:
       link: Lenke eller HTML
       long_link: Lenke
       short_link: Kort lenke
+      geo_uri: Geo-URI
       embed: HTML
       custom_dimensions: Sett egendefinerte dimensjoner
       format: 'Format:'
@@ -2234,6 +2304,23 @@ nb:
         no_place: Beklager - kunne ikke finne det stedet.
       instructions:
         continue_without_exit: Fortsett på %{name}
+        slight_right_without_exit: Slak høyre inn på %{name}
+        turn_right_without_exit: Ta til høyre inn på %{name}
+        sharp_right_without_exit: Skarp høyresving inn på %{name}
+        uturn_without_exit: Helomvending på %{name}
+        sharp_left_without_exit: Skarp venstresving inn på %{name}
+        turn_left_without_exit: Ta til venstre inn på %{name}
+        slight_left_without_exit: Slak venstre inn på %{name}
+        via_point_without_exit: (via punkt)
+        follow_without_exit: Følg %{navn}
+        roundabout_without_exit: Ved rundkjøringen, ta til %{name}
+        leave_roundabout_without_exit: Forlat rundkjøringen - %{name}
+        stay_roundabout_without_exit: Bli i rundkjøringen - %{name}
+        start_without_exit: Begynn ved slutten av %{name}
+        destination_without_exit: Nå mål
+        against_oneway_without_exit: Kjør mot enveiskjøring på %{name}
+        end_oneway_without_exit: Slutt på enveiskjøring på %{name}
+        roundabout_with_exit: Ved rundkjøring, ta utvei %{exit} mot %{navn}
         unnamed: ikke navngitt
         courtesy: Veianvisninger gitt av %{link}
       time: Tid
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index fbe3bf750..999c1a883 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -35,8 +35,8 @@ nl:
   activerecord:
     models:
       acl: Rechtenoverzicht
-      changeset: Set wijzigingen
-      changeset_tag: Label van set wijzigingen
+      changeset: Wijzigingenset
+      changeset_tag: Tag van wijzigingenset
       country: Land
       diary_comment: Dagboekopmerking
       diary_entry: Dagboekbericht
@@ -1000,9 +1000,9 @@ nl:
   license_page:
     foreign:
       title: Over deze vertaling
-      text: In het geval deze taalversie en het %{english_original_link} elkaar tegenspreken,
+      text: In het geval deze taalversie en %{english_original_link} elkaar tegenspreken,
         hebben de bepalingen op de Engelstalige pagina voorrang.
-      english_link: Engelstalige origineel
+      english_link: het Engelstalige origineel
     native:
       title: Over deze pagina
       text: U bent de Engelstalige versie van de auteursrechtenpagina aan het bekijken.
@@ -1013,47 +1013,47 @@ nl:
     legal_babble:
       title_html: Auteursrechten en licentie
       intro_1_html: |-
-        OpenStreetMap<sup><a href="#trademarks">®</a></sup> is <i>open data</i>, onder licentie van de <a
-        href="http: opendatacommons.org="" licenses="" odbl="" "="">Open Data
+        OpenStreetMap<sup><a href="#trademarks">®</a></sup> is <i>open data</i>, vrijgegeven onder de <a
+        href="http://opendatacommons.org/licenses/odbl/">Open Data
         Commons Open Database License</a> (ODbL) door de <a
-        href="http: osmfoundation.org="" "="">OpenStreetMap Foundation</a> (OSMF).
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: |-
         Het staat u vrij onze gegevens te kopiëren, te distribueren,
-        weer te geven en aan te passen, zo lang als u OpenStreetMap en haar
+        weer te geven en aan te passen, zo lang u OpenStreetMap en haar
         auteurs vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,
-        mag u de resultaten onder dezelfde licentie distribueren. In de
+        mag u het resultaat enkel onder dezelfde licentie distribueren. In de
         volledige <a href="http://opendatacommons.org/licenses/odbl/1.0/">juridische
         tekst</a> worden uw rechten en verantwoordelijkheden uitgelegd.
       intro_3_html: |-
         De cartografie in onze kaarttegels en onze documentatie zijn
-        gelicenseerd onder de licentie <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-        Commons Naamsvermelding-Gelijk delen 2.0</a> license (CC-BY-SA).
+        vrijgegeven onder de <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        Commons Naamsvermelding-Gelijk delen 2.0</a>-licentie (CC BY-SA).
       credit_title_html: Hoe OpenStreetMap te vermelden
       credit_1_html: |-
-        Wij vereisen dat u het volgende vermeld bij gebruik:
-        &ldquo;Kaartgegevens &copy; OpenStreetMap-auteurs&rdquo;.
+        We vereisen dat u het volgende vermeldt bij gebruik:
+        &ldquo;&copy; OpenStreetMap-auteurs&rdquo;.
       credit_2_html: "U moet ook duidelijk maken dat de gegevens beschikbaar zijn
-        onder de Open\nDatabase License en als u onze kaarttegels gebruikt, dat de
-        cartografie\nde licentie CC-BY-SA heeft. U kunt dit doen door te verwijzen
-        naar\n<a href=\"http://www.openstreetmap.org/copyright\">deze pagina over
-        auteursrechten</a>. \nAls alternatief, en verplicht als u de gegevens van
-        OSM distribueert, kunt u\ndirect verwijzen naar de licentie(s). In media waar\nverwijzen
-        niet mogelijk is, bijvoorbeeld in gedrukte werken, raden we u aan\nuw lezer
-        te verwijzen naar openstreetmap.org, mogelijk door \n\"OpenStreetMap\" hiernaar
-        uit te breiden, naar opendatacommons.org en\nals van toepassing, naar creativecommons.org."
+        onder de Open\nDatabase License, en als u onze kaarttegels gebruikt, dat de
+        cartografie\nde licentie CC BY-SA heeft. U kunt dit doen door te verwijzen
+        naar\n<a href=\"http://www.openstreetmap.org/copyright\">deze pagina</a>.
+        \nU kunt ook direct verwijzen naar de licentie(s). Dat laatste is verplicht
+        als u OSM in data-vorm distribueert. In media waar\nhyperlinks niet mogelijk
+        zijn, bijvoorbeeld in gedrukte werken, raden we u aan\nuw lezer te verwijzen
+        naar openstreetmap.org (mogelijks door de naam 'OpenStreetMap' naar dit webadres
+        uit te breiden), naar opendatacommons.org en naar – indien van toepassing
+        – creativecommons.org."
       credit_3_html: |-
-        Voor een doorbladerbare kaart, moet de naamsvermelding in een hoek van de kaart weergegeven worden.
+        Voor een doorbladerbare, digitale kaart, moet de naamsvermelding in een hoek van de kaart weergegeven worden.
         Bijvoorbeeld:
       attribution_example:
         alt: Voorbeeld van hoe de naamsvermelding voor OpenStreetMap toe te passen
           op een webpagina
         title: Voorbeeld naamsvermelding
       more_title_html: Meer informatie
-      more_1_html: |-
-        Lees meer over het gebruik van onze gegevens, en hoe credit ons, op de <a
-        href="http: osmfoundation.org="" Licence"="">OSMF Licentie pagina</a> en de gemeenschap <a
-        href="http: wiki.openstreetmap.org="" wiki="" Legal_FAQ"="">Legaal
-        FAQ</a>.
+      more_1_html: Lees meer over het gebruik van onze gegevens, en hoe u OpenStreetMap
+        moet vermelden, op de <a href="http://osmfoundation.org/Licence">Licentiepagina
+        van de OSMF</a> en de gemeenschapspagina <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Wettelijke
+        vaakgestelde vragen</a>.
       more_2_html: |-
         Hoewel OpenStreetMap open data is, kunnen we geen gratis
         kaart-API voor derde partijen aanbieden.
@@ -1062,14 +1062,14 @@ nl:
         en <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatimgebruikbeleid</a>.
       contributors_title_html: Onze bijdragers
       contributors_intro_html: |-
-        Onze bijdragers zijn duizenden individuen. We bieden ook
+        Onze bijdragers zijn duizenden individuen. OSM bevat ook
         open gelicenseerde gegevens van nationale kaartenbureaus
-        en andere bronnen afkomstig zijn, waaronder:
+        en andere bronnen, waaronder:
       contributors_at_html: |-
-        <strong>Austria</strong>: Bevat gegevens van de
+        <strong>Oostenrijk</strong>: Bevat gegevens van de
         <a href="http://data.wien.gv.at/">Stad Wenen</a> (onder
         <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> en
-        Land Tirol (onder <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT met aanvullingen</a>).
+        Land Tirol (onder <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY-AT met aanvullingen</a>).
       contributors_ca_html: |-
         <strong>Canada</strong>: Bevat gegevens van
         GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -1099,7 +1099,7 @@ nl:
         National Geo-Spatial Information</a>, auteursrechten voor de Staat voorbehouden.
       contributors_gb_html: |-
         <strong>Verenigd Koninkrijk</strong>: Bevat gegevens van
-        de Ordnance Survey &copy; Crown Copyright en databaserechten
+        Ordnance Survey &copy; Crown Copyright en databaserechten
         2010-2012.
       contributors_footer_1_html: |-
         Voor meer gegevens over deze en andere bronnen die gebruikt zijn
@@ -1112,19 +1112,18 @@ nl:
         aansprakelijkheid aanvaardt.
       infringement_title_html: Auteursrechtenschending
       infringement_1_html: |-
-        Bijdragers aan OSM mogen nooit gegevens toevoegen
+        Bijdragers aan OSM worden eraan herinnerd nooit gegevens toe te voegen
         uit bronnen waarvan de licentie niet vrij is (bijvoorbeeld Google Maps of gedrukte kaarten)
         zonder expliciete toestemming van de auteursrechtenhouders.
       infringement_2_html: |-
         Als u van mening bent dat auteursrechtelijk beschermd en niet vrij gelicenseerd materiaal
-        ongeoorloofd aan de database van OpenStreetMap is toegevoegd, raadpleeg dan
+        ongeoorloofd aan de database van OpenStreetMap of aan deze website is toegevoegd, raadpleeg dan
         onze <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedownprocedure</a>
         of meld het direct en formeel via onze <a href="http://dmca.openstreetmap.org/">online claimpagina</a>.
       trademarks_title_html: <span id="trademarks"></span>Handelsmerken
-      trademarks_1_html: OpenStreetMap en de looking glass-logo zijn geregistreerde
+      trademarks_1_html: OpenStreetMap en het vergrootglaslogo zijn geregistreerde
         handelsmerken van de OpenStreetMap Foundation. Als u vragen hebt over uw gebruik
-        van de merken, stuur uw vragen dan naar de <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Vergunning
-        werkgroep</a>.
+        van deze merken, stuur dan uw vragen dan naar de <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licentiewerkgroep</a>.
   welcome_page:
     title: Welkom!
     introduction_html: Welkom bij OpenStreetMap, de open en te bewerken kaart van
@@ -1207,7 +1206,7 @@ nl:
     beginners_guide:
       url: http://wiki.openstreetmap.org/wiki/NL:Beginnershandleiding
       title: Handleiding voor beginners
-      description: Gemeenschap onderhouden handleiding voor beginners.
+      description: Handleiding voor beginners, onderhouden door de gemeenschap.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
@@ -1215,8 +1214,8 @@ nl:
         van OSM.
     mailing_lists:
       title: Mailinglijsten
-      description: Een vraag stellen of het bespreken van interessante zaken op een
-        breed scala van actuele of regionale mailinglijsten.
+      description: Stel een vraag of bespreek interessante zaken op een hele reeks
+        onderwerpsgebonden of regionale mailinglijsten.
     forums:
       title: Forums
       description: Vragen en overleg voor als u liever met een interface in bulletin
@@ -1226,7 +1225,7 @@ nl:
       description: Interactieve chat in vele verschillende talen en over tal van onderwerpen.
     switch2osm:
       title: switch2osm
-      description: Hulp voor bedrijven en organisaties schakelen om op basis van OpenStreetMap
+      description: Hulp voor bedrijven en organisaties om over te schakelen op OpenStreetMap-gebaseerde
         kaarten en andere diensten.
     wiki:
       url: http://wiki.openstreetmap.org/
@@ -1245,8 +1244,8 @@ nl:
       of OSM accuraat en bij de tijd is.
     community_driven_title: Communitygedreven
     community_driven_html: |-
-      De gemeenschap van OpenStreetMap is divers, gepassioneerd en groeiende dagelijks. Onder onze bijdragers zitten mensen die kaarten maken als hobby, GIS-professionals, IT-specialisten die de servers van OSM draaiende houden, filantropen die rampgebieden in kaart brengen en nog veel meer.
-      Bekijk de <a href='%{diary_path}'>gebruikersdagboeken</a> of de <a href='http://blogs.openstreetmap.org/'>gemeenschapsblogs</a> voor meer informatie over de gemeenschap of de website van de <a href='http://www.osmfoundation.org/'>OSM Foundation</a>.�
+      De gemeenschap van OpenStreetMap is divers, gepassioneerd en wordt elke dag groter. Onder onze bijdragers zitten mensen die kaarten maken als hobby, GIS-professionals, IT-specialisten die de servers van OSM draaiende houden, filantropen die rampgebieden in kaart brengen en nog veel meer.
+      Bekijk de <a href='%{diary_path}'>gebruikersdagboeken</a> of de <a href='http://blogs.openstreetmap.org/'>gemeenschapsblogs</a> voor meer informatie over de gemeenschap of de website van de <a href='http://www.osmfoundation.org/'>OSM Foundation</a>.
     open_data_title: Open data
     open_data_html: 'OpenStreetMap is <i>open data</i>: u mag de gegevens gebruiken
       voor ieder doel, als u de naam van OpenStreetMap en haar bijdragers maar vermeldt.
@@ -1254,11 +1253,11 @@ nl:
       alleen onder dezelfde licentie verder verspreiden. Zie de <a href=''%{copyright_path}''>pagina
       over Auteursrechten en Licentie</a> voor details.'
     legal_title: Toegestaan
-    legal_html: "Deze site en tal van andere diensten zijn formeel bediend door \n<a
-      href=\"http://osmfoundation.org/\">OpenStreetMap Foundation</a> (OSMF) \nnamens
-      de gemeenschap.\n<br> \nNeem dan <a href=\"http://osmfoundation.org/Contact\">contact
-      op met de OSMF</a> \nals u licenties, auteursrechten of andere juridische vragen
-      en problemen."
+    legal_html: "Deze site en tal van andere diensten worden formeel beheerd door
+      \n<a href=\"http://osmfoundation.org/\">OpenStreetMap Foundation</a> (OSMF)
+      \nnamens de gemeenschap.\n<br> \n<a href=\"http://osmfoundation.org/Contact\">Neem
+      contact op met de OSMF</a> \nals u vragen of problemen hebt in verband met licenties,
+      auteursrechten of andere juridische zaken."
     partners_title: Partners
   notifier:
     diary_comment_notification:
@@ -1418,7 +1417,7 @@ nl:
       outbox: Postvak UIT
       messages:
         one: U hebt één verzonden bericht
-        other: U hebt%{count} verzonden berichten
+        other: U hebt %{count} verzonden berichten
       to: Aan
       subject: Onderwerp
       date: Datum
@@ -1500,9 +1499,7 @@ nl:
           primary: Primaire weg
           secondary: Secundaire weg
           unclassified: Ongeclassificeerde weg
-          unsurfaced: Onverharde weg
           track: Spoor
-          byway: Ventweg
           bridleway: Ruiterpad
           cycleway: Fietspad
           footway: Voetpad
@@ -1526,7 +1523,6 @@ nl:
           golf: Golfbaan
           park: Park
           resident: Bewoond gebied
-          tourist: Touristische attractie
           common:
           - Algemeen
           - weide
@@ -1556,7 +1552,6 @@ nl:
           tunnel: Tunnel
           bridge: Brug
           private: Privétoegang
-          permissive: Beperkte toegang
           destination: Bestemmingsverkeer
           construction: Weg in aanbouw
     richtext_area:
@@ -1825,11 +1820,11 @@ nl:
           title: Aanmelden met Google
           alt: Aanmelden met een Google OpenID
         facebook:
-          title: Login met Facebook
-          alt: Inloggen met een Facebook-Account
+          title: Aanmelden met Facebook
+          alt: Aanmelden met een Facebook-account
         windowslive:
-          title: Login met Windows Live
-          alt: Inloggen met een Windows Live-Account
+          title: Aanmelden met Windows Live
+          alt: Aanmelden met een Windows Live-account
         yahoo:
           title: Aanmelden met Yahoo
           alt: Aanmelden met een Yahoo OpenID
@@ -2130,7 +2125,7 @@ nl:
       invalid_credentials: Ongeldige verificatiereferenties
       no_authorization_code: Geen autorisatiecode
       unknown_signature_algorithm: Onbekend algoritme voor handtekening
-      invalid_scope: Ongeldige toepassingsgebied
+      invalid_scope: Ongeldig toepassingsgebied
   user_role:
     filter:
       not_an_administrator: Alleen beheerders kunnen gebruikersrollen beheren. U bent
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 4c784def7..5c9b182d4 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1067,9 +1067,7 @@ nn:
           primary: Primærveg
           secondary: Sekundærveg
           unclassified: Uklassifisert veg
-          unsurfaced: Veg utan dekke
           track: Spor
-          byway: Stikkveg
           bridleway: Rideveg
           cycleway: Sykkelveg
           footway: Gangveg
@@ -1093,7 +1091,6 @@ nn:
           golf: Golfbane
           park: Park
           resident: Boligområde
-          tourist: Turistattraksjon
           common:
           - Vanleg
           - snever
@@ -1123,7 +1120,6 @@ nn:
           tunnel: Streka kant = tunnel
           bridge: Sort kant = bru
           private: Privat tilgjenge
-          permissive: Betinget tilgjenge
           destination: Destinasjonstilgang
           construction: Vegar under konstruksjon
     richtext_area:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 60d995994..6ee8d383c 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1227,9 +1227,7 @@ oc:
           primary: Rota principala
           secondary: Rota segondària
           unclassified: Rota pas classificada
-          unsurfaced: Rota sens revestiment
           track: Pista
-          byway: Camin
           bridleway: Camin per cavalièrs
           cycleway: Via ciclabla
           footway: Via pietonièra
@@ -1253,7 +1251,6 @@ oc:
           golf: Percors de gòlf
           park: Pargue
           resident: Zòna residenciala
-          tourist: Atraccion toristica
           common:
           - Espaci comun
           - prada
@@ -1283,7 +1280,6 @@ oc:
           tunnel: Bòrd en puntilhats = tunèl
           bridge: Bòrd negre = pont
           private: Accès privat
-          permissive: Accès tolerat
           destination: Reservat als ribairencs
           construction: Rotas en construccion
     richtext_area:
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index d80d9c4c3..10ab2fbb6 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -747,7 +747,6 @@ pa:
           primary: ਮੁੱਢਲੀ ਸੜਕ
           secondary: ਸਕੈਂਡਰੀ ਸੜਕ
           track: ਟਰੈਕ
-          byway: ਬਾਈਵੇਅ
           bridleway: ਘੋੜ-ਰਾਹ
           cycleway: ਸਾਈਕਲ ਦਾ ਰਾਹ
           footway: ਪੈਦਲ ਰਾਹ
@@ -771,7 +770,6 @@ pa:
           golf: ਗੋਲਫ਼ ਮੈਦਾਨ
           park: ਪਾਰਕ
           resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ
-          tourist: ਸੈਲਾਨੀ ਟਿਕਾਣਾ
           common:
           - ਸ਼ਾਮਲਾਟ
           - ਚਰਗਾਹ
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 681ac8a01..b4f7c5245 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -28,6 +28,7 @@
 # Author: Ruila
 # Author: Soeb
 # Author: Sp5uhe
+# Author: The Polish
 # Author: Ty221
 # Author: Woytecr
 # Author: Wpedzich
@@ -118,7 +119,7 @@ pl:
       name: Potlatch 2
       description: Potlatch 2 (w przeglądarce)
     remote:
-      name: Zdalne sterowanie
+      name: Zewnętrzny edytor
       description: Zdalne sterowanie (JOSM lub Merkaartor)
   browse:
     created: Utworzone
@@ -565,7 +566,7 @@ pl:
           bus_guideway: Droga dla autobusów
           bus_stop: Przystanek autobusowy
           construction: Droga w trakcie budowy
-          cycleway: Ścieżka rowerowa
+          cycleway: Droga rowerowa
           elevator: Winda
           emergency_access_point: Punkt awaryjny
           footway: Chodnik
@@ -588,7 +589,7 @@ pl:
           secondary: Droga drugorzędna
           secondary_link: Droga drugorzędna – dojazd
           service: Droga serwisowa
-          services: Usługi autostrady
+          services: Miejsce Obsługi Podróżnych
           speed_camera: Radar
           steps: Schody
           street_lamp: Lampa uliczna
@@ -597,7 +598,7 @@ pl:
           track: Droga polna lub leśna
           traffic_signals: Sygnalizacja świetlna
           trail: Szlak
-          trunk: Droga szybkiego ruchu
+          trunk: Droga główna
           trunk_link: Droga szybkiego ruchu – dojazd
           unclassified: Droga czwartorzędna
           unsurfaced: Droga polna lub leśna
@@ -1011,9 +1012,8 @@ pl:
     legal_babble:
       title_html: Prawa autorskie i&nbsp;licencja
       intro_1_html: |-
-        OpenStreetMap zawiera <i>wolne dane</i>, rozpowszechniane na licencji <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        OpenStreetMap<sup><a href="#trademarks">®</a></sup> to projekt <i>open data</i>, rozpowszechniany na licencji <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) przez <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: Możesz swobodnie kopiować, rozpowszechniać, przekazywać innym
         i dostosowywać nasze dane, pod warunkiem podania OpenStreetMap i jego autorów
         jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze dane, wynik
@@ -1039,9 +1039,10 @@ pl:
         alt: Przykład, jak przypisywać OpenStreetMap na stronie internetowej
         title: Przykład uznania autorstwa
       more_title_html: Dowiedz się więcej
-      more_1_html: Więcej informacji o możliwości wykorzystania danych OpenStreetMap
-        można znaleźć w <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-        FAQ</a>.
+      more_1_html: |-
+        Dowiedz się więcej o korzystaniu z naszych danych i o tym, jak określić nas jako źródło z którego pochodzą dane na <a
+        href="http://osmfoundation.org/License">stronie OSMF License</a> i <a
+        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">stronie odpowiedzi na pytania prawne</a>.
       more_2_html: Chociaż dane OpenStreetMap są otwarte, nie jesteśmy w stanie zapewnić
         nieograniczonego dostępu do naszego API wszystkim chętnym. Zapoznaj się z
         naszą <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Polityką
@@ -1099,6 +1100,10 @@ pl:
         usuwania danych</a> lub <a href="http://dmca.openstreetmap.org/">wypełnij
         formularz on-line</a>.
       trademarks_title_html: <span id="trademarks"></span>Znaki towarowe
+      trademarks_1_html: OpenStreetMap i jej logo są zastrzeżonymi znakami towarowymi
+        fundacji OpenStreetMap. Jeśli masz pytania dotyczące używania znaków, prosimy,
+        prześlij Swoje pytania do <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">grupie
+        roboczej ds. licencji</a>.
   welcome_page:
     title: Witaj!
     introduction_html: Witamy w OpenStreetMap, wolnej mapie świata. Teraz gdy masz
@@ -1125,6 +1130,12 @@ pl:
         Nazwa ulicy lub jej  ograniczenie prędkości.
     rules:
       title: Zasady!
+      paragraph_1_html: W OpenStreetMap jest kilka formalnych zasad, ale spodziewamy
+        się, że wszyscy uczestnicy będą współpracować i komunikować się ze społecznością.
+        Jeśli planujesz jakieś działania inne niż same edycje manualne, proszę przeczytaj
+        i dostosuj się do zaleceń dotyczących <a href="http://wiki.openstreetmap.org/wiki/Import/Guidelines">wytycznych</a>
+        i <a href="http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct">automatycznych
+        edycji</a>.
     questions:
       title: Jakieś pytania?
       paragraph_1_html: OpenStreetMap ma wiele zasobów pomocnych w poznawaniu projektu,
@@ -1159,7 +1170,7 @@ pl:
       explanation_html: "Jeśli masz obawy o jak nasze dane są używane lub zawartość
         proszę zapoznać się ze\n<a href='/copyright'>stroną o prawach autorskich</a>
         po więcej informacji prawnych lub skontaktować się z \n<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>grupą
-        rooboczą OSMF</a>."
+        roboczą OSMF</a>."
   help_page:
     title: Uzyskiwanie pomocy
     introduction: OpenStreetMap ma wiele zasobów pomocnych w poznawaniu projektu,
@@ -1218,6 +1229,10 @@ pl:
       ale tylko na tej samej licencji. Zobacz <a href=''%{copyright_path}''>Prawa
       autorskie i licencja</a> by zobaczyć szczegóły.'
     legal_title: Pytania prawne
+    legal_html: |-
+      Ta strona internetowa i inne usługi z tym związane prowadzone są formalnie przez <a href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) w imieniu społeczeństwa.
+      <br>
+      Proszę, <a href="http://osmfoundation.org/Contact">skontaktuj się z OSMF</a>, jeśli masz problem z licencjami, prawami autorskimi lub innymi prawnymi problemami.
     partners_title: Partnerzy
   notifier:
     diary_comment_notification:
@@ -1453,16 +1468,14 @@ pl:
       table:
         entry:
           motorway: Autostrada
-          trunk: Droga szybkiego ruchu
+          trunk: Droga główna
           primary: Droga pierwszorzędna
           secondary: Droga drugorzędna
           unclassified: Drogi niesklasyfikowane
-          unsurfaced: Droga polna lub leśna
-          track: Ścieżka
-          byway: Droga boczna
-          bridleway: Ścieżka dla koni
-          cycleway: Ścieżka rowerowa
-          footway: Chodnik
+          track: Droga polna lub leśna
+          bridleway: Droga dla koni
+          cycleway: Droga rowerowa
+          footway: Droga dla pieszych
           rail: Tory kolejowe
           subway: Metro
           tram:
@@ -1483,7 +1496,6 @@ pl:
           golf: Pole golfowe
           park: Park
           resident: Teren mieszkalny
-          tourist: Atrakcja turystyczna
           common:
           - Pole
           - łąka
@@ -1513,7 +1525,6 @@ pl:
           tunnel: Kreskowany obrys – tunel
           bridge: Czarny obrys – most
           private: Wstęp prywatny
-          permissive: Możliwy wstęp
           destination: Dostęp do punktu docelowego
           construction: Drogi w budowie / planowane
     richtext_area:
@@ -2094,6 +2105,7 @@ pl:
       invalid_credentials: Nieprawidłowe dane logownia
       no_authorization_code: Brak kodu autoryzacyjnego
       unknown_signature_algorithm: Nieznany algorytm podpisu
+      invalid_scope: Nieprawidłowy zakres
   user_role:
     filter:
       not_an_administrator: Tylko administratorzy mogą zarządzać rolami użytkowników,
@@ -2264,6 +2276,7 @@ pl:
       link: Link lub HTML
       long_link: Link
       short_link: Krótki link
+      geo_uri: Geo URI
       embed: HTML
       custom_dimensions: Ustaw własne wymiary
       format: 'Format:'
@@ -2356,9 +2369,13 @@ pl:
         slight_left_without_exit: Lekko w lewo w %{name}
         via_point_without_exit: (przez punkt)
         follow_without_exit: Jedź wzdłuż %{name}
+        roundabout_without_exit: Na rondzie, wybierz %{name}
         leave_roundabout_without_exit: Opuść rondo - %{name}
         stay_roundabout_without_exit: Zostań na rondzie - %{name}
+        start_without_exit: Zacznij na końcu %{name}
         destination_without_exit: Dojechałeś do celu
+        against_oneway_without_exit: Ruszaj na przeciwko jednostronnego ruchu na %{name}
+        end_oneway_without_exit: Koniec jednostronnego ruchu na %{name}
         roundabout_with_exit: Na rondzie zjedź %{exit} zjazdem w %{name}
         unnamed: bez nazwy
         courtesy: Wyznaczanie trasy dzięki uprzejmości %{link}
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index b584a46df..936afd764 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -13,6 +13,7 @@
 # Author: Gmare
 # Author: Gusta
 # Author: Jgpacker
+# Author: L
 # Author: Leosls
 # Author: Luckas
 # Author: Luckas Blade
@@ -24,6 +25,7 @@
 # Author: Ruila
 # Author: Tuliouel
 # Author: Vgeorge
+# Author: Walesson
 # Author: Wille
 # Author: 555
 ---
@@ -35,19 +37,19 @@ pt-BR:
       friendly: '%e de %B de %Y às %H:%M'
   activerecord:
     models:
-      acl: Lista de Controle de acesso
+      acl: Lista de controle de acesso
       changeset: Conjunto de alterações
       changeset_tag: Etiqueta do conjunto de alterações
       country: País
       diary_comment: Comentário do diário
-      diary_entry: Entrada do Diário
+      diary_entry: Entrada do diário
       friend: Amigo
       language: Idioma
       message: Mensagem
       node: Ponto
       node_tag: Etiqueta do ponto
       notifier: Notificador
-      old_node: Ponto Antigo
+      old_node: Ponto antigo
       old_node_tag: Etiqueta do ponto antigo
       old_relation: Relação Antiga
       old_relation_member: Membro da Relação Antiga
@@ -1492,9 +1494,7 @@ pt-BR:
           primary: Via primária
           secondary: Via secundária
           unclassified: Via não classificada
-          unsurfaced: Via não pavimentada
           track: Estrada rústica
-          byway: Trilha larga
           bridleway: Hipovia
           cycleway: Ciclovia
           footway: Caminho de pedestre
@@ -1518,7 +1518,6 @@ pt-BR:
           golf: Campo de golfe
           park: Parque
           resident: Área residencial
-          tourist: Atração turística
           common:
           - Baldio comunitário
           - prado
@@ -1548,7 +1547,6 @@ pt-BR:
           tunnel: Túnel (contorno tracejado)
           bridge: Ponte/viaduto (contorno contínuo)
           private: Acesso restrito
-          permissive: Acesso sob autorização
           destination: Acesso local apenas
           construction: Vias em construção
     richtext_area:
@@ -2233,6 +2231,8 @@ pt-BR:
       heading: '%{block_on} bloqueado por %{block_by}'
       time_future: Termina em %{time}
       time_past: Terminou há %{time}
+      created: Criado
+      ago: '%{time} atrás'
       status: Estado
       show: Exibir
       edit: Editar
@@ -2283,6 +2283,7 @@ pt-BR:
       link: Link ou HTML
       long_link: Link
       short_link: Link Curto
+      geo_uri: Geo URI
       embed: HTML
       custom_dimensions: Definir dimensões personalizadas
       format: 'Formato:'
@@ -2366,6 +2367,24 @@ pt-BR:
         no_route: Rota entre esses dois lugares não encontrada.
         no_place: Não foi possível encontrar esse lugar.
       instructions:
+        continue_without_exit: Continue %{name}
+        slight_right_without_exit: Ligeira direita para %{name}
+        turn_right_without_exit: Vire à direita para %{name}
+        sharp_right_without_exit: Curva acentuada à direita para %{name}
+        uturn_without_exit: U-turn, juntamente %{name}
+        sharp_left_without_exit: Curva acentuada à esquerda para %{name}
+        turn_left_without_exit: Vire à esquerda na %{name}
+        slight_left_without_exit: Leve à esquerda para %{name}
+        via_point_without_exit: (ponto de passagem)
+        follow_without_exit: Segue %{name}
+        roundabout_without_exit: No take rotunda %{name}
+        leave_roundabout_without_exit: Deixe rotunda - %{name}
+        stay_roundabout_without_exit: Mantenha-se na rotunda - %{name}
+        start_without_exit: Comece no final de %{name}
+        destination_without_exit: Alcance destino
+        against_oneway_without_exit: Ir contra one-way on %{name}
+        end_oneway_without_exit: End of one-way on %{name}
+        roundabout_with_exit: Na rotatória, pegue a saída %{exit} em %{name}
         unnamed: sem nome
         courtesy: Itinerário cortesia de %{link}
       time: Duração
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index def72bc56..eef037fb0 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -924,7 +924,7 @@ pt-PT:
       admin_levels:
         level2: Fronteira de País
         level4: Região
-        level5: Ilha
+        level5: Sub-região / Ilha
         level6: Distrito
         level8: Freguesia
         level9: Localidade
@@ -1127,6 +1127,8 @@ pt-PT:
         um rio, um lago ou um prédio.
       tag_html: Uma <strong>etiqueta</strong> é um peça de informação sob um nó ou
         uma linha, como o nome do restaurante ou o limite de velocidade duma estrada.
+    rules:
+      title: Regras!
     questions:
       title: Tens perguntas ?
       paragraph_1_html: |-
@@ -1472,9 +1474,7 @@ pt-PT:
           primary: Estrada Nacional (Primária)
           secondary: Estrada Regional (Secundária)
           unclassified: Estrada sem classificação oficial
-          unsurfaced: Estrada não pavimentada
           track: Carreiro florestal ou agrícola
-          byway: Byway (atalho proibido a veículos motorizados)
           bridleway: Via para cavaleiros
           cycleway: Ciclovia
           footway: Via pedonal
@@ -1498,7 +1498,6 @@ pt-PT:
           golf: Campo de golfe
           park: Parque
           resident: Área residencial
-          tourist: Atração turística
           common:
           - Baldio
           - prado
@@ -1528,7 +1527,6 @@ pt-PT:
           tunnel: Linha tracejada = túnel
           bridge: Linha cheia = ponte
           private: Acesso restrito (propriedade privada)
-          permissive: Acesso permitido
           destination: Acesso a clientes / fornecedores
           construction: Estradas em construção
     richtext_area:
@@ -2229,6 +2227,8 @@ pt-PT:
       heading: '%{block_on} bloqueado por %{block_by}'
       time_future: Termina em %{time}
       time_past: Terminou há %{time} atrás
+      created: Criado
+      ago: há %{time}
       status: Estado
       show: Mostrar
       edit: Editar
@@ -2279,6 +2279,7 @@ pt-PT:
       link: Ligação ou HTML
       long_link: Link
       short_link: Lig.Curta
+      geo_uri: Geo URI
       embed: HTML
       custom_dimensions: Definir dimensões personalizadas
       format: 'Formato:'
@@ -2364,6 +2365,7 @@ pt-PT:
         no_route: Não foi encontrada uma rota entre os dois pontos.
         no_place: Desculpe - não foi possível encontrar esse local.
       instructions:
+        continue_without_exit: Continuar em %{name}
         unnamed: sem nome
         courtesy: Direções fornecidas por %{link}
       time: Tempo
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index e6ac5f1d2..d2e201336 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -4,7 +4,9 @@
 # Author: EddyPetrisor
 # Author: McDutchie
 # Author: Minisarm
+# Author: Ruila
 # Author: Strainu
+# Author: Wintereu
 ---
 ro:
   time:
@@ -41,6 +43,7 @@ ro:
       tracetag: Etichetă înregistrare GPS
       user: Utilizator
       user_preference: Preferințe utilizator
+      user_token: Jeton utilizator
       way: Cale
       way_node: Nod cale
       way_tag: Etichetă cale
@@ -82,28 +85,66 @@ ro:
     potlatch:
       name: Potlatch 1
       description: Potlatch 1 (editor înglobat în navigator)
+    id:
+      name: iD
+      description: iD (editor-în-navigator)
     potlatch2:
       name: Potlatch 2
       description: Potlatch 2 (editor înglobat în navigator)
     remote:
+      name: Control la distanță
       description: Control de la distanță (JOSM sau Merkaartor)
   browse:
+    created: Creat
+    closed: Închis
+    created_html: Creat <abbr title='%{title}'>cu %{time} în urmă</abbr>
+    closed_html: Închis <abbr title='%{title}'>cu %{time} în urmă</abbr>
+    created_by_html: Creat <abbr title='%{title}'>cu %{time} în urmă</abbr> de %{user}
+    deleted_by_html: Șters <abbr title='%{title}'>cu %{time} în urmă</abbr> de %{user}
+    edited_by_html: Modificat <abbr title='%{title}'>cu %{time} în urmă</abbr> de
+      %{user}
+    closed_by_html: Închis <abbr title='%{title}'>cu %{time} în urmă</abbr> de %{user}
     version: Versiune
     in_changeset: Set de modificări
     anonymous: anonim
     no_comment: (niciun comentariu)
+    part_of: Parte din
+    download_xml: Descarcă XML
+    view_history: Vezi istoric
+    view_details: Vezi detalii
+    location: 'Amplasament:'
     changeset:
       title: 'Set de modificări: %{id}'
       belongs_to: Autor
       node: Noduri (%{count})
       node_paginated: Noduri (%{x}-%{y} din %{count})
+      way: Căi (%{count})
+      way_paginated: Căi (%{x}-%{y} din %{count})
+      relation: Comunicații (%{count})
+      relation_paginated: Comunicații (%{x}-%{y} din %{count})
+      comment: Comentarii (%{count})
+      hidden_commented_by: Ascuns comentariu scris de %{user} <abbr title='%{exact_time}'>cu
+        %{when} în urmă</abbr>
+      commented_by: Comentariu scris de %{user} <abbr title='%{exact_time}'>cu %{when}
+        în urmă</abbr>
       changesetxml: Set de modificări XML
       osmchangexml: XML osmChange
       feed:
         title: 'Set de modificări: %{id}'
         title_comment: Set de modificări %{id} — %{comment}
+      join_discussion: Conectați-vă pentru a vă alătura discuției
+      discussion: Discuție
+    node:
+      title: 'Nod: %{name}'
+      history_title: 'Istoricul nodului: %{name}'
     way:
+      title: 'Cale: %{name}'
+      history_title: 'Istoricul căii: %{name}'
       nodes: Noduri
+    relation:
+      title: 'Relație: %{name}'
+      history_title: 'Istoricul relației: %{name}'
+      members: Membri
     relation_member:
       entry_role: '%{type} %{name} ca %{role}'
       type:
@@ -145,9 +186,16 @@ ro:
       wiki_link:
         key: Pagina de pe wiki pentru tagul %{key}
         tag: Pagina de pe wiki pentru tagul %{key}=%{value}
+      wikidata_link: Elementul %{page} pe Wikidata
       wikipedia_link: Articolul %{page} pe Wikipedia
+      telephone_link: Sună %{phone_number}
     note:
       title: 'Notă: %{id}'
+      new_note: Notă nouă
+      description: Descriere
+      open_title: 'Notă nerezolvată #%{note_name}'
+      closed_title: 'Notă rezolvată #%{note_name}'
+      hidden_title: 'Notă ascunsă #%{note_name}'
   changeset:
     changeset_paging_nav:
       showing_page: Pagina %{page}
@@ -178,6 +226,10 @@ ro:
     timeout:
       sorry: Ne pare rău, preluarea listei de modificări pe care ați solicitat-o a
         durat prea mult.
+    rss:
+      commented_at_html: Actualizat acum %{when}
+      commented_at_by_html: Actualizat acum %{when} de %{user}
+      full: Discuție completă
   diary_entry:
     new:
       title: O nouă înregistrare în jurnal
@@ -264,6 +316,13 @@ ro:
       format_to_export: Format de exportat
       osm_xml_data: Date XML OpenStreetMap
       licence: Licență
+      too_large:
+        planet:
+          title: Planeta OSM
+        overpass:
+          title: Overpass API
+        other:
+          title: Alte surse
       options: Opțiuni
       format: Format
       scale: Scară
@@ -316,6 +375,7 @@ ro:
           charging_station: Stație de taxare
           cinema: Cinematograf
           clinic: Clinică
+          clock: Ceas
           college: Colegiu
           community_centre: Centru comunitar
           courthouse: Tribunal
@@ -343,16 +403,20 @@ ro:
           library: Bibliotecă
           market: Piață
           marketplace: Piață de mărfuri
+          monastery: Mănăstire
+          motorcycle_parking: Parcare pentru motociclete
           nightclub: Club de noapte
           nursery: Creșă
           nursing_home: Azil de bătrâni
           office: Birou
           parking: Parcare
+          parking_entrance: Intrare în parcare
           pharmacy: Farmacie
           place_of_worship: Lăcaș de cult
           police: Poliție
           post_box: Cutie poștală
           post_office: Oficiu poștal
+          preschool: Preșcolar
           prison: Închisoare
           pub: Pub
           public_building: Clădire publică
@@ -392,12 +456,24 @@ ro:
           "yes": Pod
         building:
           "yes": Clădire
+        craft:
+          electrician: Electrician
+          gardener: Grădinar
+          painter: Pictor
+          photographer: Fotograf
+          plumber: Instalator
+          shoemaker: Cizmar
+          tailor: Croitor
+        emergency:
+          ambulance_station: Stație de ambulanță
+          defibrillator: Defibrilator
         highway:
           bridleway: Drum pentru călărie
           bus_guideway: Linie de autobuz ghidată
           bus_stop: Stație de autobuz
           construction: Drum în construcție
           cycleway: Pistă de biciclete
+          elevator: Lift
           emergency_access_point: Punct de acces de urgență
           footway: Cale pietonală
           ford: Vad
@@ -412,7 +488,7 @@ ro:
           primary: Drum principal
           primary_link: Drum principal
           raceway: Pistă
-          residential: Rezidențial
+          residential: Stradă rezidențială
           rest_area: Zonă pentru odihnă
           road: Drum
           secondary: Drum secundar
@@ -431,7 +507,8 @@ ro:
           archaeological_site: Sit arheologic
           battlefield: Câmp de luptă
           boundary_stone: Bornă de graniță
-          building: Clădire
+          building: Clădire istorică
+          bunker: Buncăr
           castle: Castel
           church: Biserică
           fort: Fort
@@ -625,23 +702,10 @@ ro:
     results:
       no_results: Niciun rezultat găsit
       more_results: Mai multe rezultate
-    distance:
-      one: circa 1 km
-      zero: mai puțin de 1 km
-      other: circa %{count} km
-    direction:
-      south_west: sud-vest
-      south: sud
-      south_east: sud-est
-      east: est
-      north_east: nord-est
-      north: nord
-      north_west: nord-vest
-      west: vest
   layouts:
     logo:
       alt_text: Logoul OpenStreetMap
-    home: acasă
+    home: Mergi la locul de reședință
     logout: Închide sesiunea
     log_in: Autentificare
     log_in_tooltip: Autentificare cu un cont existent
@@ -681,6 +745,9 @@ ro:
     how_to_help:
       join_the_community:
         title: Alăturați-vă comunității
+  help_page:
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Ro:Beginners%27_guide
   message:
     message_summary:
       delete_button: Şterge
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2c317a1a3..ef45dd227 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -30,10 +30,12 @@
 # Author: Mechano
 # Author: Mixaill
 # Author: Nemo bis
+# Author: Nzeemin
 # Author: Okras
 # Author: Putnik
 # Author: Riliam
 # Author: Ruila
+# Author: Sanail
 # Author: Santacloud
 # Author: Spider
 # Author: TarzanASG
@@ -822,7 +824,7 @@ ru:
           spur: Ответвление ж/д пути
           station: Железнодорожная станция
           stop: Железнодорожная остановка
-          subway: Станция метро
+          subway: Метро
           subway_entrance: Вход в метро
           switch: Железнодорожная стрелка
           tram: Трамвай
@@ -1030,9 +1032,10 @@ ru:
     legal_babble:
       title_html: Авторские права и лицензирование
       intro_1_html: |-
-        OpenStreetMap содержит <i>свободные данные</i>, распространяемые по лицензии <a
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> содержит <i>свободные данные</i>, распространяемые по лицензии <a
         href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        Commons Open Database License</a> (ODbL) организацией  <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: Вы можете свободно копировать, распространять, передавать и дорабатывать
         наши данные до тех пор, пока вы ссылаетесь на OpenStreetMap и его сообщество.
         Если вы изменяете или берёте наши данные за основу, то вы должны распространять
@@ -1089,6 +1092,9 @@ ru:
         2007 (<a href="http://www.and.com">www.and.com</a>)'
       contributors_nz_html: <strong>Новая Зеландия.</strong> Данные из сведений о
         земельных ресурсах Новой Зеландии. Crown Copyright reserved.
+      contributors_si_html: '<strong>Словения</strong>: содержит данные от <a href="http://www.gu.gov.si/en/">Геодезического
+        и картографического управления</a> и <a href="http://www.mkgp.gov.si/en/">Министерства
+        сельского, лесного хозяйства и продовольствия</a> (открытая информация Словении).'
       contributors_za_html: |-
         <strong>ЮАР</strong>: Имеются данные из
         <a href="http://www.ngi.gov.za/">Главное управление:
@@ -1112,6 +1118,11 @@ ru:
          к нашей <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">процедуре
          изымания</a> или непосредственно на нашу
         <a href="http://dmca.openstreetmap.org/">вебстраницу регистрации</a>.
+      trademarks_title_html: <span id="trademarks"></span>Товарные знаки
+      trademarks_1_html: OpenStreetMap и логотип с увеличительным стеклом являются
+        зарегистрированными товарными знаками Фонда OpenStreetMap. Если у вас есть
+        вопросы об использовании знаков, пожалуйста, отправьте ваши вопросы <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">рабочей
+        группе по лицензированию</a>.
   welcome_page:
     title: Добро пожаловать!
     introduction_html: Добро пожаловать на OpenStreetMap, открытую и свободную карту
@@ -1138,6 +1149,8 @@ ru:
         обозначающая, к примеру, дорогу, ручей, контур озера или здания.
       tag_html: <strong>Тег</strong> – это единица описания точки или линии, например
         название ресторана или скоростное ограничение конкретной дороги.
+    rules:
+      title: Правила!
     questions:
       title: Появились вопросы?
       paragraph_1_html: |-
@@ -1190,10 +1203,14 @@ ru:
       description: Задать вопрос или найти ответы на сайте вопросов и ответов OSM.
     mailing_lists:
       title: Списки рассылок
+      description: Задайте вопрос или обсудите насущные вопросы в списке рассылок
+        (количество активных пользователей зависит от языка).
     forums:
       title: Форумы
+      description: Вопросы и обсуждения для тех кто предпочитает форумы для общения
     irc:
       title: IRC
+      description: Интерактивный чат на разных языках и на разные темы.
     switch2osm:
       title: switch2osm
       description: Помощь компаниям и организациям в переходе на OpenStreetMap карты
@@ -1227,6 +1244,10 @@ ru:
       Смотрите <a href=''%{copyright_path}''>Авторские права и Страница лицензии</a>
       для более подробной информации.'
     legal_title: Юридический
+    legal_html: Этот сайт, как и многие другие сервисы, формально подчиняется <a href='http://osmfoundation.org/'>OpenStreetMap
+      Foundation</a> (OSMF) от имени сообщества.<br/> Пожалуйста <a href='http://osmfoundation.org/Contact'>свяжитесь
+      с  OSMF</a> если у вас есть вопросы относительно лицензирования, авторских прав
+      либо другие правовые вопросы или проблемы.
     partners_title: Партнёры
   notifier:
     diary_comment_notification:
@@ -1249,7 +1270,7 @@ ru:
       befriend_them: Вы также можете добавить их в качестве друзей в %{befriendurl}.
     gpx_notification:
       greeting: Привет,
-      your_gpx_file: Это выглядит как ваш файл GPX
+      your_gpx_file: Похоже, ваш файл GPX
       with_description: с описанием
       and_the_tags: 'и следующими тегами:'
       and_no_tags: и без меток.
@@ -1477,9 +1498,7 @@ ru:
           primary: Магистральная дорога
           secondary: Второстепенная дорога
           unclassified: Дорога местного значения
-          unsurfaced: Грунтовая дорога
           track: Просёлочная дорога
-          byway: Тропинка
           bridleway: Дорога для верховой езды
           cycleway: Велосипедная дорога
           footway: Пешеходная дорожка
@@ -1503,7 +1522,6 @@ ru:
           golf: Площадка для гольфа
           park: Парк
           resident: Жилой район
-          tourist: Достопримечательность
           common:
           - Общественная земля
           - луг
@@ -1533,7 +1551,6 @@ ru:
           tunnel: Туннель (пунктир)
           bridge: Мост (жирная линия)
           private: Частный доступ
-          permissive: Разрешительный доступ
           destination: Целевой доступ
           construction: Строительство дороги
     richtext_area:
@@ -1688,17 +1705,17 @@ ru:
     oauthorize:
       title: Разрешить доступ к вашей учётной записи
       request_access: Приложение %{app_name} запрашивает доступ к вашей учётной записи,
-        %{user}. Пожалуйста, проверьте желаете ли вы, чтобы приложение имело следующие
-        возможности. Вы можете выбрать любое количество.
-      allow_to: 'Разрешить клиентскому приложению:'
+        %{user}. Пожалуйста, проверьте хотите ли вы, чтобы приложение имело следующие
+        возможности. Вы можете выбрать любые из них или все.
+      allow_to: 'Разрешить этому приложению:'
       allow_read_prefs: читать ваши пользовательские настройки
-      allow_write_prefs: изменять ваши пользовательские настройки
-      allow_write_diary: создавать дневниковые записи, комментарии, устанавливать
-        друзей
-      allow_write_api: изменять карту
-      allow_read_gpx: читать ваши частные GPS-треки
-      allow_write_gpx: передавать GPS-треки на сервер.
-      allow_write_notes: изменять заметки.
+      allow_write_prefs: изменять ваши настройки на сайте
+      allow_write_diary: создавать дневниковые записи, комментарии, заводить друзей
+      allow_write_api: изменять данные
+      allow_read_gpx: читать ваши <a herf="https://wiki.openstreetmap.org/wiki/RU:%D0%92%D0%B8%D0%B4%D0%B8%D0%BC%D0%BE%D1%81%D1%82%D1%8C_GPS-%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2">частные
+        GPS-треки</a>
+      allow_write_gpx: передавать GPS-треки на сервер
+      allow_write_notes: изменять заметки
     oauthorize_success:
       title: Запрос на авторизацию разрешён
       allowed: Вы предоставили приложению %{app_name} доступ к вашей учётной записи.
@@ -1785,6 +1802,7 @@ ru:
       register now: Зарегистрируйтесь
       with username: 'У вас уже есть учётная запись OpenStreetMap? Пожалуйста, войдите
         с вашим именем пользователя и паролем:'
+      with external: 'Кроме того, можете воспользоваться аккаунтом на другом сайте:'
       new to osm: Впервые на OpenStreetMap?
       to make changes: Чтобы вносить изменения в данные OpenStreetMap, вы должны иметь
         учётную запись.
@@ -1805,6 +1823,12 @@ ru:
         google:
           title: Войти с помощью Google
           alt: Войти с помощью  Google OpenID
+        facebook:
+          title: Войти с помощью Facebook
+          alt: Войти с помощью учётной записи в Facebook
+        windowslive:
+          title: Войти с помощью Windows Live
+          alt: Войти с помощью учётной записи Windows Live
         yahoo:
           title: Войти с помощью Yahoo
           alt: Войти с помощью Yahoo OpenID
@@ -1860,8 +1884,12 @@ ru:
       display name: 'Отображаемое имя:'
       display name description: Ваше имя, как оно будет видно другим пользователям.
         Вы сможете изменить его позже в настройках.
+      external auth: 'Внешний сайт с учётной записью:'
       password: 'Пароль:'
       confirm password: 'Повторите пароль:'
+      use external auth: Либо воспользуйтесь аккаунтом с другого сайта
+      auth no password: С внешним логином пароль не обязателен, но в некоторых случаях
+        он необходим
       continue: Зарегистрироваться
       terms accepted: Спасибо за принятие новых условий участия!
       terms declined: Нам жаль, что вы решили не принимать новые условия участия.
@@ -1872,8 +1900,8 @@ ru:
       read and accept: Пожалуйста, прочтите приведённое ниже соглашение и нажмите
         кнопку «Согласен», чтобы подтвердить, что вы согласны с условиями этого соглашения
         относительно вашего существующего и будущего вклада.
-      consider_pd: В дополнение к вышеизложенному соглашению, я считаю, что мой вклад
-        находиться в общественном достоянии
+      consider_pd: В дополнение к вышеизложенному соглашению, я принимаю во внимание,
+        что мой вклад находится в общественном достоянии
       consider_pd_why: что это значит?
       guidance: 'Информация, которая поможет понять эти условия: <a href="%{summary}">краткое
         описание</a> и несколько <a href="%{translations}">неофициальных переводов</a>'
@@ -2096,7 +2124,10 @@ ru:
           вы можете связаться с %{webmaster}, если вы хотите это обсудить.
         </p>
     auth_failure:
+      connection_failed: Не удалось соединиться с сервером авторизации
       invalid_credentials: Недопустимые учётные данные для аутентификации
+      no_authorization_code: Нет кода авторизации
+      unknown_signature_algorithm: Неизвестный алгоритм подписи
   user_role:
     filter:
       not_an_administrator: Только администраторы могут управлять ролями пользователей,
@@ -2217,6 +2248,7 @@ ru:
       heading: '%{block_on}, наложил блокировку: %{block_by}'
       time_future: Заканчивается %{time}
       time_past: Закончилась %{time} назад
+      created: Создано
       ago: '%{time} назад'
       status: Состояние
       show: Показывать
@@ -2263,12 +2295,13 @@ ru:
   javascripts:
     close: Закрыть
     share:
-      title: Поделиться
+      title: Вставить на сайт
       cancel: Отмена
       image: Изображение
       link: Ссылка или код для вставки
       long_link: Полная ссылка
       short_link: Короткая ссылка
+      geo_uri: Geo URI
       embed: Код
       custom_dimensions: Выбрать размер вручную
       format: 'Формат:'
@@ -2353,6 +2386,23 @@ ru:
         no_route: Не удалось найти маршрут между этими двумя точками.
         no_place: К сожалению, данное место не найдено.
       instructions:
+        continue_without_exit: Продолжите по %{name}
+        slight_right_without_exit: Слегка направо на %{name}
+        turn_right_without_exit: Поверните направо на %{name}
+        sharp_right_without_exit: Резко направо на %{name}
+        uturn_without_exit: Разворот по %{name}
+        sharp_left_without_exit: Резко налево на %{name}
+        turn_left_without_exit: Поверните налево на %{name}
+        slight_left_without_exit: Слегка влево на %{name}
+        via_point_without_exit: (через точку)
+        follow_without_exit: Следуйте %{name}
+        roundabout_without_exit: На развязке сверните к %{name}
+        leave_roundabout_without_exit: Покиньте развязку - %{name}
+        stay_roundabout_without_exit: Оставайтесь на развязке - %{name}
+        start_without_exit: Начните в конце %{name}
+        against_oneway_without_exit: Идите против одностороннего движения на %{name}
+        end_oneway_without_exit: Конец одностороннего движения на %{name}
+        roundabout_with_exit: На развязке выберите выход %{exit} на %{name}
         unnamed: без имени
         courtesy: Маршрут предоставлен %{link}
       time: Время
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index e22eb3b5b..93d2bb75d 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -97,7 +97,7 @@ scn:
     created_html: Criatu <abbr title='%{title}'>%{time} fa</abbr>
     closed_html: Chiudutu <abbr title='%{title}'>%{time} fa</abbr>
     created_by_html: Criatu <abbr title='%{title}'>%{time} fa</abbr> di %{user}
-    deleted_by_html: Cancillatu <abbr title='%{title}'>%{time} fa</abbr> di %{user}
+    deleted_by_html: Scancillatu <abbr title='%{title}'>%{time} fa</abbr> di %{user}
     edited_by_html: Canciatu <abbr title='%{title}'>%{time} fa</abbr> di %{user}
     closed_by_html: Chiudutu <abbr title='%{title}'>%{time} fa</abbr> di %{user}
     version: Virsioni
@@ -123,7 +123,7 @@ scn:
         fa</abbr>
       commented_by: Cummentu di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
       changesetxml: XML dû gruppu di canciamenti
-      osmchangexml: osmChange XML
+      osmchangexml: XML osmChange
       feed:
         title: Gruppu di canciamenti %{id}
         title_comment: Gruppu di canciamenti %{id} - %{comment}
@@ -347,14 +347,15 @@ scn:
           massizzu di dati adòpira una dî fonti ccassutta.
         planet:
           title: Pianeta OSM
-          description: Copî aggiurnati rigularmenti dâ basi di dati cumpleta di OpenStreetMap
+          description: Copî dâ basi di dati cumpleta di OpenStreetMap ca vènunu aggiurnati
+            rigularmenti
         overpass:
           title: API Overpass
           description: Scàrrica stu riquatru dûn mirror dâ basi di dati di OpenStreetMap
         geofabrik:
           title: Scarricamenti dâ Geofabrik
-          description: Estratti di cuntinenti, paìsi, e na silizzioni di città aggiurnati
-            rigularmenti
+          description: Astratti di cuntinenti, di paìsi, e di na silizzioni di città
+            ca vènunu aggiurnati rigularmenti
         metro:
           title: Metro Extracts
           description: Estratti dî principali città dû munnu e ill’àrii circustanti
@@ -1069,10 +1070,10 @@ scn:
         dati chi’ vènunu di fonti prutetti dû drittu d’auturi (ad esempiu Google Maps
         o puru i carti stampati) senza aviri n’auturizzazzioni esplìcita dû titulari
         dû drittu d'auturi.
-      infringement_2_html: "Si’ pensi chi fu’ gghiunciutu a’ manera indèbita matiriali
-        prutettu dû drittu d’auturi ntâ basi di dati di OpenStreetMap o puru ntâ stu
-        situ, pi’ favuri fai rifirimentu â nostra\n <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">prucidura
-        di cancillazzioni</a> o puru signalinnillu direttamenti pi’ menzu dû nostru
+      infringement_2_html: "Si’ pensi chi fu’ gghiunciutu di manera indèbbita matiriali
+        prutettu dû drittu d’auturi o ntâ basi di dati di OpenStreetMap o puru nta
+        stu situ, pi’ favuri fai rifirimentu â nostra\n <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">prucidura
+        di scancillazzioni</a> o puru signalinnillu direttamenti pi’ menzu dû nostru
         \n<a href=\"http://dmca.openstreetmap.org/\">mòdulu di signalazzioni in linia</a>."
       trademarks_title_html: <span id="trademarks"></span>Marchi riggistrati
       trademarks_1_html: OpenStreetMap e u logu dâ lenti di ngrannimentu sunnu marchi
@@ -1360,7 +1361,7 @@ scn:
       unread_button: Signa comu di lèggiri
       read_button: Signa comu gia’ liggiutu
       reply_button: Rispunni
-      delete_button: Cancella
+      delete_button: Scancella
     new:
       title: Manna un missaggiu
       send_message_to: Manna un missaggiu novu a’ %{name}
@@ -1406,12 +1407,12 @@ scn:
         nun fu’ mannatu a’ ḍḍ’utenti. Pi’ favuri trasi comu l’utenti giustu pû putiri
         lèggiri.
     sent_message_summary:
-      delete_button: Cancella
+      delete_button: Scancella
     mark:
       as_read: Missaggiu signatu comu già liggiutu
       as_unread: Missaggiu marcatu comu di lèggiri
     delete:
-      deleted: Missaggiu cancillatu
+      deleted: Missaggiu scancillatu
   site:
     index:
       js_1: O stai adupirannu nu browser chi’ nun supporta u JavaScript, o puru hai
@@ -1466,9 +1467,7 @@ scn:
           primary: Strata primaria
           secondary: Strata secunnaria
           unclassified: Strata senza classificazzioni
-          unsurfaced: Strata stirrata
           track: Trazzera
-          byway: Trazzera
           bridleway: Caminu pî cavaḍḍi
           cycleway: Pista ciclàbbili
           footway: Caminu pidunali
@@ -1492,7 +1491,6 @@ scn:
           golf: Campu di golf
           park: Villa
           resident: Zona risidinziali
-          tourist: Attrazzioni turìstica
           common:
           - Cumuni
           - Pratu
@@ -1522,7 +1520,6 @@ scn:
           tunnel: Cuntornu trattizzatu = gallarìa
           bridge: Cuntornu nirittu = ponti
           private: Accessu privatu
-          permissive: Accesso permissivu
           destination: Sirvitù di passaggiu
           construction: Strati in custruzzioni
     richtext_area:
@@ -1574,14 +1571,14 @@ scn:
       visibility: 'Visibbilità:'
       visibility_help: chi’ voli diri?
     trace_form:
-      upload_gpx: 'Càrrica u file GPX:'
+      upload_gpx: 'Càrricari u file GPX:'
       description: 'Discrizzioni:'
       tags: 'Etichetti:'
       tags_help: spartuti câ vìrgula
       visibility: 'Visibbilità:'
       visibility_help: chi’ voli diri?
       upload_button: Càrrica
-      help: Ajutu
+      help: Guida
     trace_header:
       upload_trace: Càrrica nu tracciatu
       see_all_traces: Talìa tutti i tracciati
@@ -1604,14 +1601,14 @@ scn:
       uploaded: 'Carricatu u:'
       points: 'Punti:'
       start_coordinates: 'Coordinata di principiu:'
-      map: mappa
+      map: cartina
       edit: cancia
       owner: 'Prupietariu:'
       description: 'Discrizzioni:'
       tags: 'Etichetti:'
       none: Nuḍḍa
       edit_track: Cancia stu tracciatu
-      delete_track: Cancella stu tracciatu
+      delete_track: Scancella stu tracciatu
       trace_not_found: Tracciatu nun truvatu!
       visibility: 'Visibbilità:'
     trace_paging_nav:
@@ -1624,9 +1621,9 @@ scn:
       ago: '%{time_in_words_ago} fa'
       more: dittagghî
       trace_details: Talìa i dittagghî dû tracciatu
-      view_map: Talìa supra â carta
+      view_map: Talìa u tracciatu supra dâ cartina
       edit: cancia
-      edit_map: Cancia a carta unni stu tracciatu
+      edit_map: Cancia a cartina unni stu tracciatu
       public: PÙBBLICA
       identifiable: IDINTIFICÀBBILI
       private: PRIVATA
@@ -1645,7 +1642,7 @@ scn:
         <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pàggina dâ
         wiki</a>.
     delete:
-      scheduled_for_deletion: Tracciatu ntâ spittata dâ cancillazzioni
+      scheduled_for_deletion: Tracciatu ntâ spittata dâ scancillazzioni
     make_public:
       made_public: Tracciatu fattu pùbblicu
     offline_warning:
@@ -1713,7 +1710,7 @@ scn:
       authorize_url: 'URL di auturizzazzioni:'
       support_notice: Suppurtamu i firmi HMAC-SHA1 (cunsigghiati) e RSA-SHA1.
       edit: Cancia i dittagghî
-      delete: Cancella stu clienti
+      delete: Scancella stu clienti
       confirm: Si’ sicuru?
       requests: 'Dumanna a’ l’utenti sti pirmissi:'
       allow_read_prefs: lèggiri i so mpustazzioni ill’utenti.
@@ -1913,7 +1910,7 @@ scn:
       my profile: U me prufilu
       my settings: I me mpustazzioni
       my comments: I me cummenti
-      oauth settings: mpustazzioni di oauth
+      oauth settings: Mpustazzioni di oauth
       blocks on me: Cu blocca a’ mia
       blocks by me: A’ cu bloccu io
       send message: Manna nu missaggiu
@@ -1964,7 +1961,7 @@ scn:
       confirm_user: cunfirma a’ st’utenti
       hide_user: mmuccia a’ st’utenti
       unhide_user: mmustra a st’utenti
-      delete_user: cancella a’ st’utenti
+      delete_user: scancella a’ st’utenti
       confirm: Cunfirma
       friends_changesets: gruppa di canciamenti ill’amici
       friends_diaries: vuci dî diarî ill’amici
@@ -2033,7 +2030,7 @@ scn:
       make edits public button: Renni tutti i me canciamenti pùbblici
       return to profile: Ritorna ô prufilu
       flash update success confirm needed: I nfurmazziuni ill’utenti furu aggiurnati
-        boni. Cuntrolla a to posta elittronica chi’ t’havi a’ rrivari un missaggiu
+        boni. Cuntrolla a to posta elittrònica chi’ t’havi a’ rrivari nu missaggiu
         pi’ cunfirmari u nnirizzu di posta novu.
       flash update success: I nfurmazziuni ill’utenti furu aggiurnati boni.
     confirm:
@@ -2151,7 +2148,7 @@ scn:
       submit: Crìa u bloccu
       tried_contacting: Haju cuntattatu l’utenti e cc’haju dumannatu di finìrila.
       tried_waiting: Cci desi tempu a’ sufficienza pi’ rispùnniri â me cumunicazzioni.
-      needs_view: L’utenti havi a’ tràsiri prima chi’ stu bloccu veni cancillatu
+      needs_view: L’utenti havi a’ tràsiri prima chi’ stu bloccu veni livatu
       back: Talìa tutti i blocchi
     edit:
       title: Canciamentu dû bloccu di %{name}
@@ -2165,7 +2162,7 @@ scn:
       submit: Aggiorna u bloccu
       show: Talìa stu bloccu
       back: Talìa tutti i blocchi
-      needs_view: Havi a’ tràsiri l’utenti avanti chi’ stu bloccu veni cancillatu?
+      needs_view: Havi a’ tràsiri l’utenti avanti chi’ stu bloccu veni livatu?
     filter:
       block_expired: U bloccu già scadìu e nun si po’ canciari.
       block_period: U pirìudu di bloccu havi a’ jèssiri unu di valuri chi’ si ponnu
@@ -2235,7 +2232,7 @@ scn:
       reason: 'Mutivu dû bloccu:'
       back: Talìa tutti i blocchi
       revoker: 'Rivucaturi:'
-      needs_view: L’utenti havi a’ tràsiri prima chi’ stu bloccu veni cancillatu.
+      needs_view: L’utenti havi a’ tràsiri prima chi’ stu bloccu veni livatu.
   note:
     description:
       opened_at_html: Criatu %{when} fa
@@ -2309,7 +2306,7 @@ scn:
         header: Strati dâ cartina
         notes: Noti dâ cartina
         data: Dati dâ cartina
-        overlays: Attiva i strati chi’ giùvunu pi’ risòlviri i prubblemi dâ cartina
+        overlays: Attiva i suprapusizzioni pi’ risòlviri i prubblemi dâ cartina
         title: Strati
       copyright: © <a href='%{copyright_url}'>i cuntribbutura di OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Fai na dunazzioni</a>
@@ -2324,7 +2321,7 @@ scn:
       queryfeature_disabled_tooltip: Zumma pi’ putiri circari l’elimenti
     changesets:
       show:
-        comment: Cummentu
+        comment: Cummenta
         subscribe: Abbòniti
         unsubscribe: Annulla l’abbunamentu
         hide_comment: mmuccia
@@ -2349,12 +2346,12 @@ scn:
       cca.
     directions:
       engines:
-        graphhopper_bicycle: Bicicletta (GraphHopper)
+        graphhopper_bicycle: Câ bicicletta (GraphHopper)
         graphhopper_foot: A’ pedi (GraphHopper)
-        mapquest_bicycle: Bicicletta (MapQuest)
-        mapquest_car: Màchina (MapQuest)
+        mapquest_bicycle: Câ bicicletta (MapQuest)
+        mapquest_car: Câ màchina (MapQuest)
         mapquest_foot: A’ pedi (MapQuest)
-        osrm_car: Màchina (OSRM)
+        osrm_car: Câ màchina (OSRM)
       directions: Innicazzioni
       distance: Distanza
       errors:
@@ -2378,8 +2375,8 @@ scn:
         destination_without_exit: Arrivu â distinazzioni
         against_oneway_without_exit: Caminari contra dû sensu ùnicu nta %{name}
         end_oneway_without_exit: Fini dû sensu ùnicu nta %{name}
-        roundabout_with_exit: Â rutunna pigghiari a nisciuta %{exit} nta %{name}
-        unnamed: senza nomu
+        roundabout_with_exit: Â rutunna pigghiari a nisciuta %{exit} pi’ %{name}
+        unnamed: strata senza nomu
         courtesy: Innicazzioni pi’ gintili cuncissioni di %{link}
       time: Tempu
     query:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 2a2174cf0..157f670a8 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1266,9 +1266,7 @@ sk:
           primary: Cesta prvej triedy
           secondary: Cesta druhej triedy
           unclassified: Neklasifikovaná cesta
-          unsurfaced: Nespevnená cesta
           track: Lesná, poľná cesta
-          byway: Súkromná cesta
           bridleway: Chodník pre kone
           cycleway: Cyklotrasa
           footway: Chodník pre peších
@@ -1292,7 +1290,6 @@ sk:
           golf: Golfové ihrisko
           park: Park
           resident: Obytná oblasť
-          tourist: Turistická atrakcia
           common:
           - Pastvina
           - lúka
@@ -1322,7 +1319,6 @@ sk:
           tunnel: Čiarkovaný obrys = tunel
           bridge: Čireny obrys = most
           private: Súkromný prístup
-          permissive: Voľný prístup
           destination: Prejazd zakázaný
           construction: Cesta vo výstavbe
     richtext_area:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 046be9255..c53c66b8f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1276,9 +1276,7 @@ sl:
           primary: Glavna cesta
           secondary: Regionalna cesta
           unclassified: Ostale ceste izven naselij
-          unsurfaced: Neasfaltirana cesta
           track: Kolovoz
-          byway: Obvoz
           bridleway: Jahalna pot
           cycleway: Kolesarska steza
           footway: Pešpot
@@ -1302,7 +1300,6 @@ sl:
           golf: Igrišče za Golf
           park: Park
           resident: Naselje
-          tourist: Turistična znamenitost
           common:
           - Travniki
           - travnik
@@ -1332,7 +1329,6 @@ sl:
           tunnel: Črtkana obroba = predor
           bridge: Krepka obroba = most
           private: Zasebni dostop
-          permissive: Dostopno z dovolilnico
           destination: Dovoljeno za dostavo
           construction: Ceste v gradnji
     richtext_area:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 24d884de5..aad392ef5 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -3,10 +3,12 @@
 # Export driver: phpyaml
 # Author: Euriditi
 # Author: GretaDoci
+# Author: Kosovastar
 # Author: Mdupont
 # Author: MicroBoy
 # Author: Mikullovci11
 # Author: Nemo bis
+# Author: Ruila
 # Author: Techlik
 # Author: Vinie007
 # Author: 아라
@@ -17,17 +19,17 @@ sq:
       friendly: '%e %B %Y te %H:%M'
   activerecord:
     models:
-      acl: Qasu në Listën e Kontrollit
-      changeset: Ndryshim
-      changeset_tag: Ndryshim tag
-      country: Shteti
-      diary_comment: Koment Ditari
+      acl: Qasja në listën e kontrollit
+      changeset: Grupi i ndryshimeve
+      changeset_tag: Etiketa e grupit të ndryshimeve
+      country: Vendi
+      diary_comment: Koment ditari
       diary_entry: Shënim në ditar
       friend: Mik
       language: Gjuha
-      message: Porosi
+      message: Mesazh
       node: Nyjë
-      node_tag: Etiketë nyjë
+      node_tag: Etiketë nyje
       notifier: Lajmëruesi
       old_node: Nyjë e vjetër
       old_node_tag: Etiketë e vjetër e nyjës
@@ -37,11 +39,11 @@ sq:
       old_way: Rrugë e vjetër
       old_way_node: Nyje rrugore e vjetër
       old_way_tag: Etiketë rrugore e vjetër
-      relation: Lidhja
+      relation: Lidhje
       relation_member: Anëtar me lidhje të vjetër
       relation_tag: Etiketë lidhjeje
-      session: Seksioni
-      trace: Gjurma
+      session: Seancë
+      trace: Gjurmë
       tracepoint: Pika e gjurmës
       tracetag: Etiketa e gjurmës
       user: Përdoruesi
@@ -77,7 +79,7 @@ sq:
         body: Trupi i mesazhit
         recipient: Marrësi
       user:
-        email: Email
+        email: Emaili
         active: Aktiv
         display_name: Emër i dukshëm
         description: Përshkrimi
@@ -92,25 +94,22 @@ sq:
       description: Potlatch 1 (editor në shfletues)
     id:
       name: iD
-      description: iD (në shfletuesin editor)
+      description: iD (në redaktorin e shfletuesit)
     potlatch2:
       name: Potlatch 2
-      description: Potlatch 2 (editor në shfletues)
+      description: Potlatch 2 (në redaktorin e shfletuesit)
     remote:
       name: Kontrollë prej së largu
       description: Kontrollë prej së largu (JOSM apo Merkaartor)
   browse:
     created: Krijuar
-    closed: I Mbyllur
+    closed: Mbyllur
     created_html: Krijuar <abbr title='%{title}'>%{time} më parë</abbr>
-    closed_html: Të mbyllura <abbr title='%{title}'>%{time} më parë</abbr>
-    created_by_html: Të Krijuar <abbr title='%{title}'>%{time} më parë</abbr> nga
-      %{user}
-    deleted_by_html: Të Fshira <abbr title='%{title}'>%{time} më parë</abbr> nga %{user}
-    edited_by_html: të Redaktuara <abbr title='%{title}'>%{time} më parë</abbr> nga
-      %{user}
-    closed_by_html: Të mbyllura <abbr title='%{title}'>%{time} më parë</abbr> nga
-      %{user}
+    closed_html: Mbyllur <abbr title='%{title}'>%{time} më parë</abbr>
+    created_by_html: Krijuar <abbr title='%{title}'>%{time} më parë</abbr> nga %{user}
+    deleted_by_html: Fshirë <abbr title='%{title}'>%{time} më parë</abbr> nga %{user}
+    edited_by_html: Redaktuar <abbr title='%{title}'>%{time} më parë</abbr> nga %{user}
+    closed_by_html: Mbyllur <abbr title='%{title}'>%{time} më parë</abbr> nga %{user}
     version: Versioni
     in_changeset: Grupi i ndryshimeve
     anonymous: Anonim
@@ -121,69 +120,115 @@ sq:
     view_details: Shiko detajet
     location: Vendndodhja
     changeset:
-      title: Ndryshim%{id}
+      title: 'Grupi i ndryshimeve: %{id}'
       belongs_to: Autori
       node: Nyjet (%{count})
       node_paginated: Nyjet (%{x}-%{y} nga %{count})
-      way: Mënyra (%{count})
-      way_paginated: Mënyra (%{x}-%{y} nga %{count})
+      way: Mënyrat (%{count})
+      way_paginated: Mënyrat (%{x}-%{y} nga %{count})
       relation: Marrëdhëniet (%{count})
       relation_paginated: Marrëdhëniet (%{x}-%{y} nga %{count})
+      comment: Komentet (%{count})
+      hidden_commented_by: Koment i fshehur nga %{user} në <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      commented_by: Koment nga %{user} në <abbr title="%{exact_time}">%{when} më parë</abbr>
       changesetxml: Ndryshim en XML
       osmchangexml: Ndrsyhim i OSM-s en XML
       feed:
-        title: Ndryshim %{id}
-        title_comment: Ndryshimi %{id} - %{comment}
+        title: 'Grupi i ndryshimeve: %{id}'
+        title_comment: Grupi i ndryshimeve %{id} - %{comment}
+      join_discussion: Identifikohuni për t'iu bashkuar diskutimit
+      discussion: Diskutim
     node:
       title: 'Nyje: %{name}'
-      history_title: 'Nyja e Historisë: %{name}'
+      history_title: 'Historiati i nyjës: %{name}'
     way:
       title: 'Rruga: %{name}'
-      history_title: 'Rrugën e Historisë: %{name}'
+      history_title: 'Historiati i rrugës: %{name}'
+      nodes: Nyjet
+      also_part_of:
+        other: një=pjesë e rrugës %{related_ways}
+    relation:
+      title: 'Lidhja: %{name}'
+      history_title: 'Historiati i lidhjes: %{name}'
+      members: Anëtarët
     relation_member:
       entry: '%{type} %{name}'
-      entry_role: '%{type} %{name} asht si %{role}'
+      entry_role: '%{type} %{name} është si %{role}'
       type:
-        node: Pikë
-        way: Udhë
-        relation: Lidhje
+        node: Nyje
+        way: Rruga
+        relation: Lidhja
     containing_relation:
       entry: Lidhja %{relation_name}
       entry_role: Lidhja %{relation_name} (sikur %{relation_role})
     not_found:
-      sorry: Na fal, %{type} me %{id}, nuk mujtem mi gjet
+      sorry: 'Na vjen keq, %{type} #%{id} nuk mund të gjendet.'
       type:
-        node: pikë
-        way: udhë
+        node: nyjë
+        way: rrugë
         relation: lidhje
-        changeset: shka asht ndrrue
+        changeset: grupi i ndryshimeve
     timeout:
-      sorry: Na fal, senet per %{type} me %{id}, u vanun shum per mu gjet.
+      sorry: Na vjen keq, të dhënat për %{type} me id %{id}, morën shumë kohë për
+        tu tërhequr.
       type:
-        node: pikë
+        node: nyjë
         way: rrugë
         relation: lidhje
-        changeset: shka asht ndrryshu
+        changeset: grupi i ndryshimeve
     redacted:
-      redaction: Redaktim %{id}
-      message_html: Versioni %{version} i këtij/kësaj %{type} nuk mund të shfaqet
-        pasi është redaktuar. Ju lutem shiko %{redaction_link} për detaje.
+      redaction: Redaktimi %{id}
+      message_html: Versioni %{version} i %{type} nuk mund të shfaqet pasiqë është
+        redaktuar. Ju lutem shiko %{redaction_link} për detaje.
       type:
         node: nyjë
         way: rrugë
         relation: lidhje
     start_rjs:
-      load_data: Zgedhi senet
-      loading: Tu u mush...
+      feature_warning: Duke ngarkuar %{num_features} karakteristika, të cilat mund
+        ta bëjnë shfletuesin tuaj të ngadalshëm ose të pavëmendshëm. Jeni të sigurt
+        që dëshironi ti shfaqni këto të dhëna?
+      load_data: Ngarko të dhënat
+      loading: Duke ngarkuar...
     tag_details:
-      tags: 'Etiketat:'
+      tags: Etiketat
       wiki_link:
-        key: Pērshkrimi i wiki faqes pēr %{key} tag
-        tag: Pērshkrimi i wiki faqes pēr %{key}=%{value} tag
+        key: Pērshkrimi i faqes në wiki pēr etiketën %{key}
+        tag: Pērshkrimi i faqes në wiki pēr etiketën %{key}=%{value}
+      wikidata_link: Artikulli %{page} në Wikidata
       wikipedia_link: '%{page} artikulli nē Wikipedia'
+      telephone_link: Thirr %{phone_number}
+    note:
+      title: 'Shënim: %{id}'
+      new_note: Shënim i ri
+      description: Përshkrimi
+      open_title: 'Shënim i pazgjidhur #%{note_name}'
+      closed_title: 'Shënim i zgjidhur #%{note_name}'
+      hidden_title: 'Shënim i fshehur #%{note_name}'
+      open_by: Krijuar nga %{user} në <abbr title="%{exact_time}">%{when} më parë</abbr>
+      open_by_anonymous: Krijuar nga person anonim <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      commented_by: Krijuar nga %{user} në <abbr title="%{exact_time}">%{when} më
+        parë</abbr>
+      commented_by_anonymous: Krijuar nga person anonim <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      closed_by: Zgjidhur nga %{user} në <abbr title="%{exact_time}">%{when} më parë</abbr>
+      closed_by_anonymous: Zgjidhur nga person anonim <abbr title='%{exact_time}'>%{when}
+        më parë</abbr>
+      reopened_by: Riaktivizuar nga %{user} në <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      reopened_by_anonymous: Riaktivizuar nga person anonim <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      hidden_by: Fshehur nga %{user} në <abbr title="%{exact_time}">%{when} më parë</abbr>
+    query:
+      title: Tiparet e pyetsorit
+      introduction: Kliko në hartë për të gjetur tipare në afërsi.
+      nearby: Tiparet në afërsi
+      enclosing: Tipare të bashkangjitura
   changeset:
     changeset_paging_nav:
-      showing_page: Duke shfaqun faqen %{{page}}
+      showing_page: Faqe %{page}
       next: Vazhdo »
       previous: « Mëparshëm
     changeset:
@@ -192,76 +237,123 @@ sq:
       view_changeset_details: Shiko detajet e grupit të ndryshimeve
     changesets:
       id: ID
-      saved_at: Ruaje në
+      saved_at: Të ruajtura në
       user: Përdoruesi
-      comment: Komentoni
+      comment: Koment
       area: Zona
     list:
       title: Grupi i ndryshimeve
       title_user: Grupi i ndryshimeve të %{user}
       title_friend: Ndryshime nga miqtë e tu
       title_nearby: Ndryshime nga përdorues të zonës
+      empty: Nuk u gjet grupi i ndryshimeve.
+      empty_area: Nuk ka grupndryshime në këtë fushë.
+      empty_user: Nuk grupndryshime nga ky përdorues.
+      no_more: Nuk u gjetë më shum grupndryshime.
+      no_more_area: Nuk ka më grupndryshime në këtë fushë.
+      no_more_user: Nuk më grupndryshime nga ky përdorues.
+      load_more: Ngarko më shumë
     timeout:
-      sorry: Na vjen keq, lista e grupit të ndryshimeve që u kërkua morri shumë kohë
+      sorry: Na vjen keq, lista e grupit të ndryshimeve që u kërkua mori shumë kohë
         për tu shkarkuar.
   diary_entry:
     new:
-      title: Hyrje e re në ditar
+      title: Shënim i ri në ditar
     list:
-      title: Ditatët e përdoruesve
+      title: Ditarët e përdoruesve
       title_friends: Ditarët e miqve
-      title_nearby: Ditarët e përdoruesve pranë
+      title_nearby: Ditarët e përdoruesve këtu pranë
       user_title: Ditari i %{user}
-      in_language_title: Hyrje në ditar në %{language}
-      new: Hyrje e re në ditar
-      new_title: Krijo një hyrje të re në ditarin tënd
-      no_entries: Nuk u gjet asnjë hyrje në ditar
-      recent_entries: 'Shënime në ditar së fundmi:'
-      older_entries: Shënimet e Vjetra
+      in_language_title: Shënimet në ditar në %{language}
+      new: Shë i ri në ditar
+      new_title: Shkruaj një shënim të ri në ditarin tënd
+      no_entries: Nuk ka shënime në ditar
+      recent_entries: 'Shënimet më të fundit në ditar:'
+      older_entries: Shënimet e vjetra
       newer_entries: Shënimet e fundit
     edit:
       title: Redakto shënimin në ditar
-      subject: 'Subjekti:'
-      body: Trupi i mesazhit
+      subject: 'Titulli:'
+      body: 'Trupi i mesazhit:'
       language: 'Gjuha:'
       location: 'Lokacioni:'
-      latitude: Gjerësia gjeografike
-      longitude: Gjatësia gjeografike
+      latitude: 'Gjerësia gjeografike:'
+      longitude: 'Gjatësia gjeografike:'
       use_map_link: përdor hartën
-      save_button: Ruje
+      save_button: Ruaj
+      marker_text: Lokacioni i shënimit në ditar
     view:
+      title: Ditari i %{user} | %{title}
       user_title: Ditari i %{user}
-      leave_a_comment: Lene naj koment
-      login: Kyçuni
+      leave_a_comment: Lëre ndonjë koment
+      login_to_leave_a_comment: '%{login_link} për të lënë një koment'
+      login: Identifikohu
       save_button: Ruaj
     no_such_entry:
+      title: Nuk ka shënim të tillë në ditar
       heading: 'Nuk ka shënim me id: %{id}'
+      body: Na vjen keq, nuk ka përdorues me këtë id %{id}. Të lutem kontrollo drejtshkrimin
+        ose ndoshta linku ku ke klikuar është gabim.
     diary_entry:
+      posted_by: Postuar nga %{link_user} më %{created} në %{language_link}
       comment_link: Komento në këtë shënim
+      reply_link: Përgjigju në këtë shënim
       comment_count:
-        one: 1 koment
-        other: '%{count} komente'
-      edit_link: Ndryshoje qët shënim
-      hide_link: Mshefe qët shënim
-      confirm: Konfirmoje
+        zero: Nuk ka komente
+        other: një=%{count} koment
+      edit_link: Redakto këtë shënim
+      hide_link: Fshih këtë shënim
+      confirm: Konfirmo
     diary_comment:
+      comment_from: Koment nga %{link_user} më %{comment_created_at}
+      hide_link: Fshih këtë koment
       confirm: Konfirmo
     location:
       location: 'Lokacioni:'
-      view: Kshyre
+      view: Shfaq
       edit: Redakto
+    feed:
+      user:
+        title: OpenStreetMap shënime ditari për %{user}
+        description: Shënimet e fundit në ditarin e OpenStreetMap nga %{user}
+      language:
+        title: Shënimet e ditarit të OpenStreetMap në %{language_name}
+        description: Shënimet e fundit në ditar nga përdoruesit e OpenStreetMap në
+          %{language_name}
+      all:
+        title: Shënimet e ditarit të OpenStreetMap
+        description: Shënimet e fundit në ditar nga përdoruesit e OpenStreetMap
+    comments:
+      has_commented_on: '%{display_name} ka komentuar në këto të shënime ditari'
+      post: Posto
+      when: Kur
+      comment: Komenti
+      ago: '%{ago} më parë'
+      newer_comments: Komentet më të fundit
+      older_comments: Komentet e vjetra
   export:
+    title: Eksporto
     start:
-      area_to_export: Zona per Eksport
-      manually_select: Manualisht zgedhe ni zon te ndryshme
-      format_to_export: Formati per Eksport
-      osm_xml_data: OpenStreetMap XML të dhana
+      area_to_export: Zona për tu eksportuar
+      manually_select: Zgjidh me dorë një zonë tjetër
+      format_to_export: Formati per eksportim
+      osm_xml_data: Të dhëna XML të OpenStreetMap
+      map_image: Imzhi i hartës (shfaq shtresën e parazgjedhur)
       licence: Licensa
-      export_details: Të dhënat e OpenStreetMap janë të licencuara nëpërmjet <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-        Commons Attribution-ShareAlike 2.0 license</a>.
+      export_details: Të dhënat e OpenStreetMap janë të licencuara nën <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+        Data Commons Open Database License</a> (ODbL).
       too_large:
-        body: Kjo zonë është shum e madhe që të eksportohet si XML në OpenStreetMap.
-          Të lutna  afroje ma ngat ose mere një zonë ma të vogel.
+        advice: 'Në qoftë se dështon eksporti i mësipërm, të lutem konsidero përdorimin
+          e një nga burimet e renditura më poshtë:'
+        body: Kjo zonë është shumë e madhe për të eksportuar të dhënat XML të OpenStreetMap.
+          Të lutem zmadho (zoom) ose zgjidh një zonë më të vogël, ose përdor një nga
+          burimet e listuara më poshtë për të shkarkuar pjesë të mëdha të të dhënave.
+        planet:
+          title: Planet OSM
+          description: Kopje të plota të përditësuara rregullisht të bazës së të dhënave
+            të OpenStreetMap
+        overpass:
+          title: API mbikalues
       options: Opcionet
       format: Formati
       scale: Shkallë
@@ -283,16 +375,26 @@ sq:
     search_osm_nominatim:
       prefix_format: '%{name}'
       prefix:
+        aeroway:
+          aerodrome: Aeroport
+          apron: Platformë
+          gate: Portë
+          helipad: Helipad
+          runway: Pistë
+          taxiway: Rrugë taksie
+          terminal: Terminal
         amenity:
-          airport: Aeroport
+          animal_shelter: Strehim i kafshëve
           arts_centre: Qendër arti
           atm: Bankomat
-          auditorium: Auditor
           bank: Bankë
           bar: Lokal
+          bbq: Zgarë
           bench: Stol
           bicycle_parking: Parkim biçikletash
           bicycle_rental: Biçikleta me qera
+          biergarten: Birrari
+          boat_rental: Varka me qera
           brothel: Shtëpi publike
           bureau_de_change: Këmbim valute
           bus_station: Stacion autobuzi
@@ -301,43 +403,48 @@ sq:
           car_sharing: Car Sharing
           car_wash: Lavazh për makina
           casino: Kazino
+          charging_station: Stacion mbushës
+          childcare: Kujdesi për fëmijët
           cinema: Kinema
           clinic: Klinikë
-          club: Klub
+          clock: Orë
           college: Kolegj
           community_centre: Qendër komunitare
           courthouse: Gjykatë
           crematorium: Krematorium
           dentist: Dentist
+          doctors: Mjekët
           dormitory: Konvikt
           drinking_water: Ujë i pijshëm
+          driving_school: Autoshkollë
           embassy: Ambasada
           emergency_phone: Kabinë telefoni për emergjencë
           fast_food: Ushqim i shpejtë
           ferry_terminal: Terminal i trageteve
           fire_hydrant: Pompë zjarrfikse
           fire_station: Zjarrëfiksat
+          food_court: Kënd ushqimi
           fountain: Shatërvan
           fuel: Stacion karburanti
+          gambling: Kumar
           grave_yard: Varrezë
           gym: Qendër fitness / Palestër
-          hall: Sallë
           health_centre: Qendër shëndetsore
           hospital: Spital
-          hotel: Hotel
           hunting_stand: Vend gjuetie
           ice_cream: Akullore
           kindergarten: Kopësht për fëmijë
           library: Biblioteka
           market: Market
           marketplace: Treg
-          mountain_rescue: Forca e shpëtimit në mal
+          monastery: Manastir
+          motorcycle_parking: Vendparkim motoçikletash
           nightclub: Klub nate
           nursery: Çerdhe
           nursing_home: Çerdhe
           office: Zyra
-          park: Park
           parking: Vend parkim
+          parking_entrance: Hyrje parkimi
           pharmacy: Barnatore
           place_of_worship: Vend kulti
           police: Policia
@@ -347,7 +454,6 @@ sq:
           prison: Burg
           pub: Pub
           public_building: Ndërtesë publike
-          public_market: Treg publik
           reception_area: Zona e pritjes
           recycling: Pikë e riciklimit
           restaurant: Restorant
@@ -355,10 +461,8 @@ sq:
           school: Shkollë
           shelter: Strehë
           shop: Dyqan
-          shopping: Tregtar
           social_club: Klub shoqëror
           studio: Studio
-          supermarket: Supermarket
           taxi: Taksi
           telephone: Telefon publik
           theatre: Teatër
@@ -369,17 +473,124 @@ sq:
           veterinary: Veterinari
           village_hall: Komuna
           waste_basket: Kosh plehrash
-          wifi: Shërbim WiFi
           youth_centre: Qendër Rinore
         boundary:
           administrative: Kufi administrativ
+        craft:
+          photographer: Fotograf
+          plumber: Hidraulik
+          shoemaker: Këpuctar
+          tailor: Rrobaqepës
+          "yes": Dyqan zeje
+        emergency:
+          ambulance_station: Stacion ambulance
+          defibrillator: Defibrilator
         highway:
           bridleway: Rrugë për kalërim
+          cycleway: Rrugë biçikletash
+          elevator: Ashensor
+          footway: Rrugë këmbësorësh
           ford: Va
           living_street: Rrugë për këmbësorë
+          milestone: Piketë
+          motorway: Autostradë
+          motorway_link: Autostradë
+          path: Shteg
+          pedestrian: Rrugë këmbësorësh
+          platform: Platformë
+          primary: Rrugë primare
+          primary_link: Rrugë primare
+          proposed: Rrugë e propozuar
+          residential: Rrugë banimi
+          rest_area: Zonë pushimi
+          road: Rrugë
+          secondary: Rrugë dytësore
+          secondary_link: Rrugë dytësore
+          service: Rrugë shërbimi
+          services: Shërbime autostrade
+          speed_camera: Kamerë shpejtësie (radar)
+          steps: Hapat
+          street_lamp: Llambë rruge
+          tertiary: Rrugë terciare
+          tertiary_link: Rrugë terciare
+          track: Gjurmë
+          traffic_signals: Shenja trafiku
+          trail: Shteg
+          trunk: Rrugë magjistrale
+          trunk_link: Rrugë magjistrale
+          unclassified: Rrugë e paklasifikuar
+          unsurfaced: Rrugë me kalldrëm
+          "yes": Rrugë
         historic:
-          church: Kisha
-          museum: Muze
+          archaeological_site: Vend arkeologjik
+          battlefield: Fushëbetejë
+          boundary_stone: Gur kufiri
+          building: Ndërtesë historike
+          bunker: Bunker
+          castle: Kala
+          church: Kishë
+          city_gate: Portë qyteti
+          citywalls: Mure qyteti
+          fort: Fortesë
+          heritage: Vend trashigimie
+          house: Shtëpi
+          icon: Ikonë
+          manor: Pronë e madhe
+          memorial: Memorial
+          mine: Minierë
+          monument: Monument
+          roman_road: Rrugë romake
+          ruins: Rrënoja
+          stone: Gur
+          tomb: Varr
+          tower: Kullë
+          wayside_cross: Kryq përgjatë rrugës
+          wayside_shrine: Kuti reliktesh përgjatë rrugës
+          wreck: Anije e mbytur
+        junction:
+          "yes": Kryqëzim
+        landuse:
+          allotments: Kopsht i vogël
+          basin: Pellg
+          brownfield: Deponi industriale
+          cemetery: Varreza
+          commercial: Zonë tregtare
+          conservation: Mbrojtje natyre
+          construction: Ndërtimtari
+          farm: Fermë
+          farmland: Tokë bujqësore
+          farmyard: Oborr ferme
+          forest: Pyll
+          garages: Garazha
+          grass: Bar
+          greenfield: Fushë jeshile (kullosë)
+          industrial: Zonë industriale
+          landfill: Deponi
+          meadow: Luadh
+          military: Zonë ushtarake
+          mine: Minierë
+          orchard: Pemishte
+          quarry: Gurore
+          railway: Hekurudhë
+          recreation_ground: Hapsirë rekreacioni
+          reservoir: Rezervuar
+          reservoir_watershed: Rezervuar ujëmbledhës
+          residential: Zonë e banuar
+          retail: Me pakicë
+          road: Zonë rruge
+          village_green: Fshat me gjelbrim
+          vineyard: Vreshtë
+          "yes": Përdorim toke
+        leisure:
+          beach_resort: Plazh
+          bird_hide: Kamuflim zogjësh
+          club: Klub
+          common: Tokë e përbashkët
+          dog_park: Park qenësh
+          fishing: Zonë peshkimi
+          fitness_centre: Qendër fitnesi
+          fitness_station: Saticion palestre
+          garden: Kopsht
         natural:
           cave_entrance: Shpella Hyrja
           island: Ishull
@@ -402,7 +613,7 @@ sq:
           village: Fshati
         shop:
           bakery: Dyqan buke
-          computer: Shitore e kompjuterave
+          computer: Dyqan kompjuterësh
         tourism:
           artwork: Puna artistike
           bed_and_breakfast: Bujtin dhe Mengjes
@@ -414,7 +625,6 @@ sq:
           motel: Motel
           museum: Muze
           picnic_site: Vend per Piknik
-          valley: Lugine
           zoo: Kopsht zoologjik
     description:
       title:
@@ -422,21 +632,12 @@ sq:
     results:
       no_results: Nuk është gjetur asnjë rezultat
       more_results: Më shumë rezultate
-    direction:
-      south_west: jug-perëndim
-      south: jug
-      south_east: jug-lindje
-      east: lindja
-      north_east: veri-lindje
-      north: veriu
-      north_west: veri-perendim
-      west: perëndim
   layouts:
     project_name:
       title: OpenStreetMap
       h1: OpenStreetMap
-    logout: Ç'kyçu
-    log_in: Kyçuni
+    logout: Çidentifikohu
+    log_in: Identifikohu
     log_in_tooltip: Hyni ne me një llogari ekzistuese
     edit: Redakto
     make_a_donation:
@@ -467,11 +668,8 @@ sq:
         e\n  e plotë <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n
         \ code</a> shpjegon të drejtat dhe përgjegjësitë tuaja."
       credit_title_html: Si të citoni OpenStreetMap
-      credit_1_html: "  Nëse ju përdorni imazhe të hartave të OpenStreetMap, ne kërkojmë
-        që \n  së paku citimet tuaja të përfshijnë &ldquo;&copy; OpenStreetMap\n  kontribuuesit,
-        CC BY-SA&rdquo;. Nëse ju përdorni vetëm të dhëna të hartave\n  ne kërkojmë
-        citimin e kontribuuesve &ldquo;të të dhënave të hartave &copy; të OpenStreetMap,\n
-        \ CC BY-SA&rdquo;."
+      credit_1_html: Ne kërkojmë që ju të përdorni kreditet e &ldquo;&copy; OpenStreetMap
+        contributors&rdquo;.
       credit_2_html: "  Ku është e mundur, OpenStreetMap duhet të hyperlinked to <a\n
         \ href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n
         \ dhe  CC BY-SA to <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.
@@ -511,6 +709,9 @@ sq:
       contributors_footer_2_html: "  Përfshirja e të dhënave në OpenStreetMap nuk
         thekson se të ofruesi origjinal i të \n  dhënave përdor OpenStreetMap, ofron
         garancion, apo\n  pranon çfarëdo anekse."
+  help_page:
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Sq:Beginners%27_guide
   notifier:
     message_notification:
       subject_header: '[OpenStreetMap] %{subject}'
@@ -732,44 +933,49 @@ sq:
       agree: Pajtohem
       declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: Nuk e pranoj
-      legale_select: 'Ju lutem zgjidhni vendin tuaj të qëndrimit:'
+      legale_select: 'Vendi i banimit:'
       legale_names:
         france: Francë
         italy: Itali
         rest_of_world: Pjesa tjetër e botës
     no_such_user:
-      title: Ska ksi shfrytezuesi
+      title: Nuk ka përdorues të tillë
       heading: Anëtari %{user} nuk ekziston
-      body: Na vje keq, ska shfrytzues me ket emen %{user}. Ju lutmi kontrolloni shkrimin,
-        ose nashta linku ku keni kliku asht gabim.
+      body: Na vjen keq, nuk ka përdorues me këtë id %{id}. Të lutem kontrollo drejtshkrimin
+        ose ndoshta linku ku ke klikuar është gabim.
     view:
-      my diary: ditari im
-      new diary entry: hyrje e re ne ditar
-      my edits: ndryshimet e mia
-      my traces: gjurmet e mia
-      my settings: preferencat e mia
+      my diary: Ditari im
+      new diary entry: shënim i ri në ditar
+      my edits: Redaktimet e mia
+      my traces: Gjurmët e mia
+      my notes: Shënimet e mia
+      my messages: Mesazhet e mia
+      my profile: Profili im
+      my settings: Parametrat e mi
+      my comments: Komentet e mia
       oauth settings: Konfigurimet oauth
-      blocks on me: bllokimet e mia
-      blocks by me: bllokimet e dhana nga un
-      send message: dergo mesazh
-      diary: ditari
-      edits: ndryshimet
-      traces: gjurmet
-      remove as friend: heke si shok
-      add as friend: shtoje si shoq
-      mapper since: 'Hartues qe prej:'
+      blocks on me: Blloqet mbi mua
+      blocks by me: Bllokimet nga unë
+      send message: Dërgo mesazh
+      diary: Ditari
+      edits: Redaktimet
+      traces: Gjurmët
+      notes: Shënimet e hartës
+      remove as friend: Largo mikun
+      add as friend: Shto mikun
+      mapper since: 'Hartues që prej:'
       ago: (para %{time_in_words_ago})
       email address: 'Email adresa:'
       created from: 'Krijuar nga:'
       status: 'Statusi:'
       spam score: 'Rezultati me Spam:'
       description: Përshkrimi
-      user location: Veni i shfyrtezuesit
-      if set location: Nqofse e zgedh venin, shum harta edhe sene kan me u paraqit
-        ktu. Ju muni me caktu venin ton ne %{settings_link} .
+      user location: Vendi i përdoruesit
+      if set location: Vendosni vendndodhjen e shtëpisë suaj në faqen %{settings_link}
+        për të parë përdoruesit që ndodhen afër.
       settings_link_text: ndryshimet
       your friends: Miqtë e juaj
-      no friends: Hala nuk ke shtue asni shoq.
+      no friends: Akoma nuk ke shtuar ndonjë mik.
       km away: '%{count}km larg'
       m away: '%{count}m larg'
       nearby users: Shfrytezuesit e tjer qe jan afer
@@ -783,8 +989,8 @@ sq:
         revoke:
           administrator: heq qasjen e administratorit
           moderator: heq qasjen e moderatorit
-      block_history: shih blokimet e marrne
-      moderator_history: shihe kan e ke blloku
+      block_history: bllokimet e pranuara
+      moderator_history: bllokimet e dhëna
       create_block: blloko ket shfrytzues
       activate_user: aktivizo ket shfrytezues
       deactivate_user: c'aktivizoje ket shfrytezues
@@ -802,7 +1008,7 @@ sq:
       my settings: Preferencat e mia
       current email address: 'Email adresa e tanishme:'
       new email address: 'Email adresa e re:'
-      email never displayed publicly: (asniher su kan publike)
+      email never displayed publicly: (asnjëherë nuk është publikuar)
       public editing:
         heading: 'Ndryshime publike:'
         enabled: E pranishme. Jo anonime dhe muni me i ndryshue t'dhanat.
@@ -837,19 +1043,20 @@ sq:
       latitude: 'Latituda:'
       longitude: 'Longituda:'
       update home location on click: Ndryshoma venin kur te klikoj ne hart?
-      save changes button: Ruaj Ndryshimet
-      make edits public button: Boni gjith ndryshimet e mija publike
+      save changes button: Ruaj ndryshimet
+      make edits public button: Të gjitha redaktimet e mia bëjë publike
       return to profile: Kthehu te profili
       flash update success confirm needed: Informatat e shfyrtezuesit u ndryshan me
         sukses. Shihni emailin per konfirmim.
       flash update success: Informatat e anëtarit janë ndryshuar me sukses.
     confirm:
-      heading: Konfirmo nje akount te shfrytezuesit
+      heading: Kontrollo emailin tënd!
       press confirm button: Shtypni butonin e mëposhtëm për të aktivizuar llogarinë
         tuaj.
       button: Konfirmo
+      success: Akounti juaj u konfirmua, ju falemnderit per regjistrim!
       already active: Kjo llogari tashmë është konfirmuar.
-      unknown token: Ajo shenjë duket se nuk ekziston.
+      unknown token: Kodi i konfirmimit ka skaduar ose nuk ekziston.
     confirm_resend:
       success: Ne kemi dërguar një shënim konfrimimi tek %{email} juaj dhe sapo të
         konfirmoni llogarnië ju do të jeni në gjendje të filloni punën me harta.<br
@@ -863,7 +1070,7 @@ sq:
       press confirm button: Shtypni butonin e mëposhtëm për të konfirmuar e-mail adresën
         tuaj të re.
       button: Konfirmo
-      success: Emaili juaj është konfirmuar, faleminderit që jeni regjistruar!
+      success: Konfirmohet ndryshimi i adresës së emailit!
       failure: Ni email adres tashma osht konfirmue me ket token.
     set_home:
       flash success: Lokacioni i shtëpisë është ruajtur me sukses
@@ -871,7 +1078,7 @@ sq:
       flash success: Gjitha ndryshimet tuja janë publike tash, edhe tash t'lejohet
         me ndryshue
     make_friend:
-      success: '%{name} eshte shok/shoqe jot/e.'
+      success: '%{name} është tani mik i juaj.'
       failed: Na vjen keq, deshtuam ta shtojm %{name} si shok/qe.
       already_a_friend: Ju tashmë jeni shok me %{name}.
     remove_friend:
@@ -883,7 +1090,7 @@ sq:
       title: Përdoruesit
       heading: Përdorues
       showing:
-        other: një=Faqe e shfaqur %{page} (%{first_item} e %{items})
+        other: një=Faqe %{page} (%{first_item} nga %{items})
       summary: '%{name} krijuar nga %{ip_address} më %{date}'
       summary_no_ip: '%{name} krijuar më %{date}'
       confirm: Konfirmo përdoruesit e zgjedhur
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 7d87a61ac..aca40b4fb 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1021,9 +1021,7 @@ sr-Latn:
           primary: Glavni put
           secondary: Sporedni put
           unclassified: Nekategorisani put
-          unsurfaced: Neasfaltirani put
           track: Makadam
-          byway: Sporedni put
           bridleway: Konjička staza
           cycleway: Biciklistička staza
           footway: Pešačka staza
@@ -1047,7 +1045,6 @@ sr-Latn:
           golf: Golf teren
           park: Park
           resident: Stambeno područje
-          tourist: Turistička atrakcija
           common:
           - Poljana
           - livada
@@ -1077,7 +1074,6 @@ sr-Latn:
           tunnel: Isprekidan okvir – tunel
           bridge: Crni okvir – most
           private: Privatni posed
-          permissive: Pristup uz dozvolu
           destination: Pristup odredištu
           construction: Putevi u izgradnji
     richtext_area:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 9cf10f448..e6c5ad8e7 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -8,6 +8,7 @@
 # Author: Nikola Smolenski
 # Author: Rancher
 # Author: Sawa
+# Author: Srdjan m
 # Author: Жељко Тодоровић
 # Author: Милан Јелисавчић
 # Author: Обрадовић Горан
@@ -129,6 +130,7 @@ sr:
       feed:
         title: Скуп измена %{id}
         title_comment: Скуп измена %{id} – %{comment}
+      discussion: Разговор
     node:
       title: 'Чвор: %{name}'
       history_title: 'Историја чвора: %{name}'
@@ -363,6 +365,7 @@ sr:
       prefix_format: '%{name}'
       prefix:
         aerialway:
+          cable_car: Жичара
           chair_lift: Лифт столица
           drag_lift: Лифт који вуче
           station: Ваздушна станица
@@ -1249,9 +1252,7 @@ sr:
           primary: Магистрални пут
           secondary: Регионални пут
           unclassified: Некатегорисани пут
-          unsurfaced: Неасфалтирани пут
           track: Макадам
-          byway: Споредни пут
           bridleway: Коњичка стаза
           cycleway: Бициклистичка стаза
           footway: Пешачка стаза
@@ -1275,7 +1276,6 @@ sr:
           golf: Голф терен
           park: Парк
           resident: Стамбено подручје
-          tourist: Туристичка атракција
           common:
           - Пољана
           - ливада
@@ -1305,7 +1305,6 @@ sr:
           tunnel: Испрекидан оквир – тунел
           bridge: Црни оквир – мост
           private: Приватни посед
-          permissive: Приступ уз дозволу
           destination: Приступ одредишту
           construction: Путеви у изградњи
     richtext_area:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 1a9f5c83b..0a1b28720 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -244,6 +244,7 @@ sv:
       title: Frågan Funktioner
       introduction: Klicka på kartan för att hitta närliggande funktioner.
       nearby: Finns i närheten
+      enclosing: Inkapslade funktioner
   changeset:
     changeset_paging_nav:
       showing_page: Sida %{page}
@@ -1088,6 +1089,11 @@ sv:
       contributors_nz_html: |-
         <strong>Nya Zeeland</strong>: Innehåller data från
         Land Information New Zealand. Crown Copyright reserved.
+      contributors_si_html: |-
+        <strong>Slovenien</strong>: Innehåller uppgifter från
+        <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> och
+        <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        (offentlig information i Slovenien).
       contributors_za_html: |-
         <strong>Sydafrika</strong>: Innehåller data från
         <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1114,6 +1120,11 @@ sv:
         lagts in i OpenStreetMaps databas eller till den här webbplatsen, se
         vårt <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">borttagningsförfarande</a>
         eller fyll i vårt <a href="http://dmca.openstreetmap.org/">online-formulär</a> direkt.
+      trademarks_title_html: <span id="trademarks"></span>Varumärken
+      trademarks_1_html: OpenStreetMap och förstoringsglas-logotypen är registrerade
+        varumärken hos OpenStreetMap Foundation. Om du har frågor gällande din användning
+        av varumärkena, vänligen skicka frågorna till <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">arbetsgruppen
+        för licenser</a>.
   welcome_page:
     title: Välkommen!
     introduction_html: Välkommen till OpenStreetMap, den fria och redigerbara kartan
@@ -1141,6 +1152,14 @@ sv:
         en väg, bäck, sjö eller byggnad.
       tag_html: En <strong>tagg</strong> är en bit data om en nod eller väg, till
         exempel en restaurangs namn eller en vägs hastighetsbegränsning.
+    rules:
+      title: Regler!
+      paragraph_1_html: "OpenStreetMap har få formella regler, men vi förväntar oss
+        att alla deltagare samarbetar och kommunicerar med gemenskapen. Om du funderar
+        på\nnågon annan aktivitet än manuell redigering av sidan, läs och följ anvisningarna
+        på \n<a href=\"http://wiki.openstreetmap.org/wiki/Import/Guidelines\">Import</a>
+        och \n<a href=\"http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct\">Automatiserade
+        redigeringar</a>."
     questions:
       title: Några frågor?
       paragraph_1_html: |-
@@ -1235,6 +1254,11 @@ sv:
       distribuera resultatet under samma licens. Se <a href=''%{copyright_path}''>sidan
       för Upphovsrätt och Licens</a> för detaljer.'
     legal_title: Juridik
+    legal_html: "Denna sida och många andra liknande tjänster drivs formellt av \n<a
+      href=\"http://osmfoundation.org/\">OpenStreetMap Foundation</a> (OSMF) \npå
+      gemenskapens vägnar.\n<br> \nVänligen <a href=\"http://osmfoundation.org/Contact\">kontakta
+      OSMF</a> \nom du har frågor eller funderingar om licenser, upphovsrätt eller
+      andra rättsliga frågor."
     partners_title: Partners
   notifier:
     diary_comment_notification:
@@ -1472,9 +1496,7 @@ sv:
           primary: Primär väg (riksväg)
           secondary: Sekundär väg (större länsväg)
           unclassified: Oklassificerad väg
-          unsurfaced: Oasfalterad väg
           track: Spår
-          byway: Förbifart
           bridleway: Ridstig
           cycleway: Cykelväg
           footway: Gångväg
@@ -1498,7 +1520,6 @@ sv:
           golf: Golfbana
           park: Park
           resident: Bostadsområde
-          tourist: Turistattraktion
           common:
           - Allmänning
           - äng
@@ -1528,7 +1549,6 @@ sv:
           tunnel: Streckade kanter = tunnel
           bridge: Svarta kanter = bro
           private: Privat tillgång
-          permissive: Endast tillträde för behöriga
           destination: Förbjuden genomfart
           construction: Vägar under konstruktion
     richtext_area:
@@ -1855,6 +1875,16 @@ sv:
       use external auth: Alternativt kan du använda en tredje part för att logga in
       auth no password: Med autentisering av tredje part krävs inte lösenord, men
         en del extra verktyg eller server kan fortfarande behöva det.
+      auth association: |-
+        <p>Ditt ID är inte associerat med ett OpenStreetMap-konto ännu.</p>
+        <ul>
+         <li>Om du är ny på OpenStreetMap, vänligen skapa ett nytt konto med hjälp av formuläret nedan.</li>
+         <li>
+         Om du redan har ett konto, kan du logga in på ditt konto
+         med hjälp av ditt användarnamn och lösenord och sedan associera kontot
+         med ditt ID i dina användarinställningar.
+         </li>
+        </ul>
       continue: Skapa ett konto
       terms accepted: Tack för att du accepterat de nya villkoren för bidrag till
         kartan!
@@ -2088,6 +2118,9 @@ sv:
     auth_failure:
       connection_failed: Anslutning till autentiseringsleverantören misslyckades
       invalid_credentials: Ogiltiga autentiseringsuppgifter
+      no_authorization_code: Ingen behörighetskod
+      unknown_signature_algorithm: Okänd signaturalgoritm
+      invalid_scope: Ogiltiga omfattning
   user_role:
     filter:
       not_an_administrator: Endast adminstratörer kan ändra användares roller och
@@ -2203,6 +2236,8 @@ sv:
       heading: '%{block_on} blockerad av %{block_by}'
       time_future: Upphör om %{time}
       time_past: Slutade för %{time} sedan
+      created: Skapad
+      ago: '%{time} sedan'
       status: Status
       show: Visa
       edit: Redigera
@@ -2253,6 +2288,7 @@ sv:
       link: Länk eller HTML
       long_link: Länk
       short_link: Kort länk
+      geo_uri: Geo-URI
       embed: HTML
       custom_dimensions: Ange anpassade dimensioner
       format: 'Format:'
@@ -2335,6 +2371,24 @@ sv:
         no_route: Kunde inte hitta en väg mellan dessa två platser.
         no_place: Ledsen - kunde inte hitta platsen.
       instructions:
+        continue_without_exit: Fortsätt på %{name}
+        slight_right_without_exit: Svag högersväng in på %{name}
+        turn_right_without_exit: Högersväng in på %{name}
+        sharp_right_without_exit: Skarp högersväng in på %{name}
+        uturn_without_exit: U-sväng längs %{name}
+        sharp_left_without_exit: Skarp vänstersväng in på %{name}
+        turn_left_without_exit: Vänstersväng in på %{name}
+        slight_left_without_exit: Svag vänstersväng in på %{name}
+        via_point_without_exit: (via punkt)
+        follow_without_exit: Följ %{name}
+        roundabout_without_exit: I rondellen ta av mot %{name}
+        leave_roundabout_without_exit: Lämna rondellen - %{name}
+        stay_roundabout_without_exit: Stanna kvar i rondellen - %{name}
+        start_without_exit: Börja vid slutet av %{name}
+        destination_without_exit: NÃ¥ destination
+        against_oneway_without_exit: Kör mot enkelriktat på %{name}
+        end_oneway_without_exit: Slutet av enkelriktat på %{name}
+        roundabout_with_exit: Vid rondellen, ta avfart %{exit} mot %{name}
         unnamed: namnlös
         courtesy: Vägbeskrivning med tillstånd av %{link}
       time: Tid
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 814d02f28..039871078 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Arjunaraoc
 # Author: Chaduvari
+# Author: Gayatri
 # Author: Kiranmayee
 # Author: Ravichandra
 # Author: Veeven
@@ -102,12 +103,15 @@ te:
     not_found:
       sorry: 'క్షమించండి, %{type} #%{id} కనబడలేదు.'
       type:
+        way: దారి
         relation: సంబంధం
     timeout:
       type:
+        way: దారి
         relation: సంబంధం
     redacted:
       type:
+        way: దారి
         relation: సంబంధం
     start_rjs:
       loading: లోడవుతోంది...
@@ -118,6 +122,8 @@ te:
       title: 'గమనిక: %{id}'
       new_note: కొత్త గమనిక
       description: వివరణ
+    query:
+      nearby: daggarlo unna lakshanalu
   changeset:
     changeset_paging_nav:
       showing_page: పేజీ %{page}
@@ -151,6 +157,7 @@ te:
       older_entries: పాత పద్దులు
       newer_entries: కొత్త పద్దులు
     edit:
+      title: dairy lo unna entry ni marchu
       subject: 'విషయం:'
       body: 'వివరణ:'
       language: 'భాష:'
@@ -297,6 +304,10 @@ te:
           "yes": వంతెన
         building:
           "yes": భవనం
+        craft:
+          painter: chitrakarudu
+          photographer: చాయాగ్రాహకుడు
+          tailor: దర్జీ
         highway:
           footway: కాలినడక దారి
           milestone: మైలురాయి
@@ -551,7 +562,6 @@ te:
           wood: కలప
           park: పార్కు
           resident: నివాస ప్రాంతం
-          tourist: పర్యాటక ఆకర్షణ
           common:
           - పచ్చికబయలు
           - పచ్చికబయలు
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 1c204048b..3f0758996 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1085,9 +1085,7 @@ tl:
           primary: Pangunahing kalsada
           secondary: Pampangalawang kalsada
           unclassified: Kalsadang walang kaurian
-          unsurfaced: Kalsadang hindi patag
           track: Bakas
-          byway: Landas na hindi madaanan
           bridleway: Daanan ng Kabayo
           cycleway: Daanan ng motorsiklo o bisikleta
           footway: Lakaran ng tao
@@ -1111,7 +1109,6 @@ tl:
           golf: Kurso ng golp
           park: Liwasan
           resident: Pook na panuluyan
-          tourist: Pang-akit ng turista
           common:
           - Karaniwan
           - kaparangan
@@ -1141,7 +1138,6 @@ tl:
           tunnel: Ginitlingang pambalot = lagusan
           bridge: Itim na pambalot = tulay
           private: Pribadong pagpunta
-          permissive: Mapagpaubayang pagpapapunta
           destination: Pagpapapunta sa patutunguhan
           construction: Mga kalsadang ginagawa
     richtext_area:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index cd1aeb282..7d0bb5686 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Alerque
+# Author: Captantrips
 # Author: Emperyan
 # Author: Erdemaslancan
 # Author: George Animal
@@ -10,7 +11,9 @@
 # Author: Joseph
 # Author: Katpatuka
 # Author: Mavrikant
+# Author: McAang
 # Author: Meelo
+# Author: Rapsar
 # Author: Ruila
 # Author: SalihB
 # Author: Sayginer
@@ -926,7 +929,7 @@ tr:
     sign_up: Kaydol
     start_mapping: Harita Çizmeye Başla
     sign_up_tooltip: Düzenleme moduna girmek için bir hesap oluştur
-    edit: Düzenle
+    edit: Değiştir
     history: Geçmiş
     export: Dışa aktar
     data: Veri
@@ -1037,6 +1040,7 @@ tr:
   help_page:
     title: Yardım Almak
     welcome:
+      url: /hoşgeldiniz
       title: OSM'ye hoşgeldin!
       description: OpenStreetMap temellerini öğrenmek için kısa bir kılavuz ile başla.
     beginners_guide:
@@ -1114,6 +1118,7 @@ tr:
       click_the_link: Bu istek sana aitse şifre sıfırlamak için aşağıdaki bağlantıyı
         tıkla.
     note_comment_notification:
+      anonymous: Anonim kullanıcı
       greeting: Merhaba,
       commented:
         subject_own: '[OpenStreetMap] notlarından birisini %{commenter} tarafından
@@ -1195,6 +1200,7 @@ tr:
       close: Kapat
     search:
       search: Ara
+      get_directions: Yol tarifi al
       where_am_i: Ben neredeyim?
       where_am_i_title: Arama motoru kullanarak geçerli konumunu tanımlar
       submit_text: Git
@@ -1206,9 +1212,7 @@ tr:
           primary: Devlet Yolu
           secondary: Ä°l yolu
           unclassified: Sınıflandırılmamış yol
-          unsurfaced: Ham yolu
           track: Toprak yolu
-          byway: Yan yolu
           bridleway: Binici yolu
           cycleway: Bisiklet yolu
           footway: Yaya yolu
@@ -1232,7 +1236,6 @@ tr:
           golf: Golf sahası
           park: Park
           resident: Yerleşim bölgesi
-          tourist: Turistik yer
           common:
           - Çimen
           - mera
@@ -1262,6 +1265,7 @@ tr:
           tunnel: çizgili kenar = tünel
           bridge: Siyah kenar = köprü
           private: Özel giriş
+          destination: Hedef noktası
           construction: yapım aşamasında yolu
     richtext_area:
       edit: Düzenle
@@ -1461,6 +1465,8 @@ tr:
         'tercihlerim' bölümünde değiştirebilirsin.
       password: 'Şifre:'
       confirm password: 'Şifre Onayla:'
+      use external auth: Bunun yerine, oturum açmak için üçüncü taraf bir uygulama
+        kullanın
       continue: Kaydol
       terms accepted: Yeni katılımcı şartları kabul ettiğin için teşekkür ederiz!
     terms:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index d89bd99af..320542d00 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -263,10 +263,10 @@ uk:
       title_nearby: Набори змін користувачів поряд з вами
       empty: Жодного набору змін не знайдено.
       empty_area: На цій ділянці набори змін відсутні.
-      empty_user: Немає наборів змін від цього учасника.
+      empty_user: Немає наборів змін від цього користувача.
       no_more: Наборів змін більше не знайдено.
       no_more_area: Наборів змін на цій ділянці більше немає.
-      no_more_user: Немає більше наборів змін від цього учасника.
+      no_more_user: Немає більше наборів змін від цього користувача.
       load_more: Завантажити ще
     timeout:
       sorry: На жаль, список наборів змін, який ви запросили, потребує забагато часу
@@ -1081,8 +1081,8 @@ uk:
         дані Ordnance Survey &copy; Crown copyright and database right 2012.'
       contributors_footer_1_html: Щоб отримати більш докладну інформацію про ці та
         інші джерела, що були використані для покращення мапи OpenStreetMap, будь
-        ласка, перегляньте сторінку  <a href="http://wiki.openstreetmap.org/wiki/Contributors">Учасники</a>
-        у OpenStreetMap Вікі.
+        ласка, перегляньте сторінку <a href="http://wiki.openstreetmap.org/wiki/Contributors">Дописувачі</a>
+        OpenStreetMap Вікі.
       contributors_footer_2_html: |2-
           Включення даних до OpenStreetMap не означає, що постачальник
           цих даних якимось чином підтримує OpenStreetMap, надає
@@ -1162,7 +1162,7 @@ uk:
       add_a_note:
         instructions_html: |-
           Просто натисніть <a class='icon note'></a> або подібну піктограму на мапі.
-          В результаті на на мапі з’явиться маркер, який ви зможете переміщувати шляхом перетягування. Додайте ваше повідомлення, а потім натисніть кнопку Зберегти, і інші учасники матимуть змогу з цим розбіратись.
+          У результаті, на мапі з'явиться маркер, який Ви зможете переміщувати шляхом перетягування. Додайте Ваше повідомлення, а потім натисніть кнопку Зберегти, і інші учасники матимуть змогу з цим розбіратись.
     other_concerns:
       title: Інші проблеми
       explanation_html: |-
@@ -1207,7 +1207,7 @@ uk:
       description: Перегляньте вікі щоб отримати докладу OSM документацію.
   about_page:
     next: Далі
-    copyright_html: <span>&copy;</span>Учасники OpenStreetMap<br>
+    copyright_html: <span>&copy;</span>Дописувачі<br>OpenStreetMap
     used_by: '%{name} надає картографічні дані для сотень веб-сайтів, мобільних застосунків
       та апаратних пристроїв'
     lede_text: OpenStreetMap створений спільнотою маперів, які вносять і підтримують
@@ -1223,8 +1223,8 @@ uk:
       <a href='http://blogs.openstreetmap.org/'>блоги спільноти</a> і сайт <a href='http://www.osmfoundation.org/'>фундації OSM</a>.
     open_data_title: Відкриті дані
     open_data_html: |-
-      OpenStreetMap — це <i>відкриті дані</i>: ви можете вільно використовувати їх для будь-яких цілей до тих пір, поки ви згадуєте OpenStreetMap і його учасників. Якщо ви змінюєте дані або на основі даних будуєте власні певним чином, ви можете розповсюджувати результат лише під тією ж самою ліцензією. Дивіться сторінку <a href='%{copyright_path}'>авторські права і
-      ліцензії</a>, щоб отримати докладну інформацію.
+      OpenStreetMap — це <i>відкриті дані</i>: Ви можете вільно використовувати їх для будь-яких цілей доти, поки вказуєте OpenStreetMap і його дописувачів. Якщо Ви змінюєте дані або на основі даних будуєте певним чином власні, Ви можете розповсюджувати результат лише під тією самою ліцензією. Дивіться сторінку <a href='%{copyright_path}'>«Авторські права і
+      ліцензії»</a>, щоб отримати докладну інформацію.
     legal_title: Правова інформація
     legal_html: "Цей сайт та багато інших пов’язаних сервісів формально керуються
       \n<a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) \nвід
@@ -1430,15 +1430,15 @@ uk:
       remote_failed: Редагування не вдалося — переконайтеся, що JOSM або Merkaartor
         завантажений та втулок дистанційного керування увімкнений.
     edit:
-      not_public: Ви не зробили свої правки загальнодоступними.
+      not_public: Ви не зробили свої редагування загальнодоступними.
       not_public_description: 'Ви не можете більше анонімно редагувати мапу. Ви можете
         зробити ваші редагування загальнодоступними тут: %{user_page}.'
       user_page_link: сторінка користувача
       anon_edits_link_text: З’ясувати в чому справа.
       flash_player_required: Для використання редактора Potlatch потрібний Flash-плеєр.
         Ви можете <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">завантажити
-        Flash-плеєр з Adobe.com</a>. Існують й <a href="http://wiki.openstreetmap.org/wiki/Uk:Editing">інші
-        можливості</a> для правки в OpenStreetMap.
+        Flash-плеєр з Adobe.com</a>. Існують також <a href="http://wiki.openstreetmap.org/wiki/Uk:Editing">інші
+        можливості</a> редагування OpenStreetMap.
       potlatch_unsaved_changes: Є незбережені зміни. (Для збереження в Potlatch зніміть
         виділення з колії або точки, якщо редагуєте «вживу», або натисніть кнопку
         «зберегти», якщо ви в режимі відкладеного збереження.)
@@ -1469,9 +1469,7 @@ uk:
           primary: Головна дорога
           secondary: Другорядна дорога
           unclassified: Дорога без класифікації
-          unsurfaced: Дорога без покриття
           track: Путівець
-          byway: Стежка
           bridleway: Дорога для їзди кіньми
           cycleway: Вело-доріжка
           footway: Пішохідна доріжка
@@ -1495,7 +1493,6 @@ uk:
           golf: Поле для гольфу
           park: Парк
           resident: Жила зона
-          tourist: Визначні пам'ятки
           common:
           - Суспільні землі
           - левада
@@ -1525,7 +1522,6 @@ uk:
           tunnel: Тунель (пунктиром)
           bridge: Міст (жирна лінія)
           private: Приватний доступ
-          permissive: Дозвільний доступ
           destination: Цільовий доступ
           construction: Будівництво дороги
     richtext_area:
@@ -1559,15 +1555,15 @@ uk:
       trace_uploaded: Ваш GPX-файл був надісланий та чекає додання у базу даних. Це
         зазвичай відбувається протягом півгодини, після чого вам буде надіслано листа.
     edit:
-      title: Правка треку %{name}
-      heading: Правка треку %{name}
+      title: Редагування треку %{name}
+      heading: Редагування треку %{name}
       filename: 'Ім’я файлу:'
       download: завантажити
       uploaded_at: 'Завантажено на сервер:'
       points: 'Кількість точок:'
       start_coord: 'Координати початку:'
       map: мапа
-      edit: правка
+      edit: редагувати
       owner: 'Власник:'
       description: 'Опис:'
       tags: 'Теґи:'
@@ -1894,7 +1890,7 @@ uk:
     view:
       my diary: Мій щоденник
       new diary entry: новий запис
-      my edits: Мої правки
+      my edits: Мої редагування
       my traces: Мої треки
       my notes: Мої нотатки
       my messages: Мої повідомлення
@@ -1906,7 +1902,7 @@ uk:
       blocks by me: Заблоковано мною
       send message: Надіслати повідомлення
       diary: Щоденник
-      edits: Правки
+      edits: Редагування
       traces: Треки
       notes: Нотатки
       remove as friend: Вилучити із списку друзів
@@ -1917,7 +1913,7 @@ uk:
       ct undecided: Невизначились
       ct declined: Відхилили
       ct accepted: Прийняті %{ago} тому
-      latest edit: 'Остання правка %{ago}:'
+      latest edit: 'Останнє редагування %{ago}:'
       email address: 'Адреса Е-пошти:'
       created from: 'Створено з:'
       status: 'Статус:'
@@ -1963,7 +1959,7 @@ uk:
       nearby mapper: Користувач поруч з вами
       friend: Друг
     account:
-      title: Правка облікового запису
+      title: Редагувати обліковий запис
       my settings: Мої налаштування
       current email address: 'Поточна адреса електронної пошти:'
       new email address: 'Нова адреса електронної пошти:'
@@ -1976,13 +1972,13 @@ uk:
         link text: що це?
       public editing:
         heading: 'Загальнодоступне редагування:'
-        enabled: Включено. Можна редагувати. Правки не анонімні.
+        enabled: Увімкнено. Не анонім і можна редагувати дані.
         enabled link: http://wiki.openstreetmap.org/wiki/Uk:Anonymous_edits
         enabled link text: що це?
-        disabled: Відключений і не може вносити правки, всі попередні зміни анонімні.
+        disabled: Вимкнено й не можна редагувати дані, всі попередні редагування анонімні.
         disabled link text: чому я не можу вносити зміни?
       public editing note:
-        heading: Загальнодоступна правка
+        heading: Загальнодоступне редагування
         text: На даний момент ваші редагування анонімні й ніхто не може відправляти
           вам повідомлення або бачити ваше місце розташування. Щоб показати, що ви
           редагували і дозволити людям зв'язатися з вами через веб-сайт, натисніть
@@ -2020,7 +2016,7 @@ uk:
       update home location on click: Оновлювати моє місце розташування, коли я клацаю
         на мапу?
       save changes button: Зберегти зміни
-      make edits public button: Зробити всі мої правки загальнодоступними
+      make edits public button: Зробити всі мої редагування загальнодоступними
       return to profile: Повернення до профілю
       flash update success confirm needed: Інформацію про користувача успішно оновлено.
         Перевірте свою електронну пошту, щоб підтвердити вашу нову адресу.
@@ -2058,8 +2054,8 @@ uk:
     set_home:
       flash success: Ваше місце розташування збережено
     go_public:
-      flash success: Всі ваші правки тепер є загальнодоступними, і ви тепер можете
-        правити.
+      flash success: Усі Ваші редагування тепер є загальнодоступними, і Ви тепер можете
+        редагувати.
     make_friend:
       heading: Додати %{user} як друга?
       button: Додати як друга
@@ -2306,7 +2302,7 @@ uk:
         data: Дані
         overlays: Увімкніть наступні шари для пошуку і усунення помилок на мапі
         title: Шари
-      copyright: © <a href='%{copyright_url}'>Учасники OpenStreetMap</a>
+      copyright: © <a href='%{copyright_url}'>Дописувачі OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Зробити внесок</a>
     site:
       edit_tooltip: Редагування мапи
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 2a3bd44b6..86f7a2d3b 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1437,9 +1437,7 @@ vi:
           primary: Đường chính
           secondary: Đường lớn
           unclassified: Đường không phân loại
-          unsurfaced: Đường không lát
           track: Đường mòn
-          byway: Đường mòn đa mốt
           bridleway: Đường cưỡi ngựa
           cycleway: Đường xe đạp
           footway: Đường đi bộ
@@ -1463,7 +1461,6 @@ vi:
           golf: Sân golf
           park: Công viên
           resident: Khu vực nhà ở
-          tourist: Nơi du lịch
           common:
           - Đất công
           - bãi cỏ
@@ -1493,7 +1490,6 @@ vi:
           tunnel: Đường đứt nét = đường hầm
           bridge: Đường rắn = cầu
           private: Đường riêng
-          permissive: Đường cho phép
           destination: Chỉ giao thông địa phương
           construction: Đường đang xây
     richtext_area:
@@ -2251,7 +2247,7 @@ vi:
         in: Phóng to
         out: Thu nhỏ
       locate:
-        title: Nhảy tới Vị trí của Tôi
+        title: Bay tới Vị trí của Tôi
         popup: Bạn hiện đang ở cách đây {distance} {unit}
       base:
         standard: Chuẩn
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 58243e8cc..1594c81ae 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -18,6 +18,7 @@
 # Author: NigelSoft
 # Author: PhiLiP
 # Author: Qiyue2001
+# Author: RyRubyy
 # Author: Shizhao
 # Author: StephDC
 # Author: Xiaomingyan
@@ -1065,6 +1066,8 @@ zh-CN:
       tag_html: <strong>标签</strong>是关于节点或路径的简短数据，例如餐馆的名字或者道路的速度限制。
     rules:
       title: 规则！
+      paragraph_1_html: OpenStreetMap很少有正式规则，但我们期待所有参与者能合作，并与社区沟通。如果你在考虑任何除手工编辑的活动，请阅读并遵守<a
+        href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>导入</a>和<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>自动编辑</a>的指导。
     questions:
       title: 还有疑问吗？
       paragraph_1_html: OpenStreetMap 有若干资源用于学习该项目，提问和回答问题，以及讨论与制作地图相关的话题并且撰写相关文档。<a
@@ -1105,8 +1108,10 @@ zh-CN:
       description: 在 OSM 的问答网站提问或查找回答。
     mailing_lists:
       title: 邮件列表
+      description: 询问问题或在广泛或局部的邮件列表中讨论有趣事件
     forums:
       title: 论坛
+      description: 面向更喜欢电子公告栏样式界面的用户的问题和讨论。
     irc:
       title: IRC
       description: 在很多不同的语言和在很多话题间交互聊天。
@@ -1334,9 +1339,7 @@ zh-CN:
           primary: 一级道路
           secondary: 二级道路
           unclassified: 无等级道路
-          unsurfaced: 无铺面道路
           track: 小路
-          byway: 小路
           bridleway: 马道
           cycleway: 自行车道
           footway: 步道
@@ -1360,7 +1363,6 @@ zh-CN:
           golf: 高尔夫球场
           park: 公园
           resident: 住宅区
-          tourist: 旅游景点
           common:
           - 公地
           - 草地
@@ -1390,7 +1392,6 @@ zh-CN:
           tunnel: 双虚线 = 隧道
           bridge: 双实线 = 桥
           private: 私人
-          permissive: 允许访问
           destination: 目标访问
           construction: 在建道路
     richtext_area:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7837908d0..abe92e8b4 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1032,6 +1032,10 @@ zh-TW:
       contributors_nz_html: |-
         <strong>紐西蘭</strong>: 包含來自
         Land Information New Zealand (Crown Copyright reserved) 的資料。
+      contributors_si_html: |-
+        <strong>斯洛維尼亞</strong>：包含來自<a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a>和
+        <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        (斯洛維尼亞公開資訊).
       contributors_za_html: |-
         <strong>南非</strong>: 包含來自
         <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1052,6 +1056,8 @@ zh-TW:
       infringement_2_html: 如果你認為有版權的材料被不恰當地加入到 OpenStreetMap 資料庫或此網站，請請參考我們的<a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我們的<a
         href="http://dmca.openstreetmap.org/">網上申報頁面</a>提出。
       trademarks_title_html: <span id="trademarks"></span>商標
+      trademarks_1_html: 開放街圖和放大鏡logo是開放街圖基金會的註冊商標。如果你對於使用這些商標有疑問的話，請將你的問題寄到<a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">授權條款工作小組
+        (Licence Working Group)</a>。
   welcome_page:
     title: 歡迎！
     introduction_html: 歡迎來到 OpenStreetMap，自由和可編輯的世界地圖。您目前已經登入，可以開始繪製地圖。這裡有一份您須知道最重要事項的快速指南。
@@ -1071,6 +1077,8 @@ zh-TW:
       tag_html: <strong>標籤</strong>是關於節點或路徑的簡要資料，例如餐廳的名字或道路的速度限制。
     rules:
       title: 規則！
+      paragraph_1_html: 開放街圖沒有多少正式規則，除了所有參與者都得與社群合作和溝通。如果你有想過用人工以外的方式參與的話，請先熟讀和遵循<a
+        href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>匯入</a>以及<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>自動化編輯</a>守則。
     questions:
       title: 有任何問題嗎？
       paragraph_1_html: OpenStreetMap 有一些資源，可用於學習本專案、提出和回答問題，以及討論和紀錄與製作地圖相關的話題。 <a
@@ -1112,8 +1120,10 @@ zh-TW:
       description: 在 OSM 的問答網站提出問題或搜尋答案。
     mailing_lists:
       title: 郵件論壇
+      description: 在不同主題或是地區的郵件論壇問問題或是討論有趣的事物。
     forums:
       title: 論壇
+      description: 給習慣論壇型式的地方問問題和討論
     irc:
       title: IRC
       description: 使用各種不同語言在各種主題聊天互動。
@@ -1346,9 +1356,7 @@ zh-TW:
           primary: 主要道路
           secondary: 次要道路
           unclassified: 未分級道路
-          unsurfaced: 未鋪設道路
           track: 行車小徑
-          byway: 小路
           bridleway: 馬道
           cycleway: 自行車道
           footway: 步道
@@ -1372,7 +1380,6 @@ zh-TW:
           golf: 高爾夫球場
           park: 公園
           resident: 住宅區
-          tourist: 旅遊景點
           common:
           - 共有地
           - 草地
@@ -1402,7 +1409,6 @@ zh-TW:
           tunnel: 虛線邊框 = 隧道
           bridge: 黑線邊框 = 橋樑
           private: 私人進出
-          permissive: 許可進出
           destination: 目的地進出
           construction: 道路施工中
     richtext_area:
@@ -2065,6 +2071,7 @@ zh-TW:
       link: 連結或 HTML
       long_link: 連結
       short_link: 簡短連結
+      geo_uri: Geo URL
       embed: HTML
       custom_dimensions: 設定自訂的尺寸
       format: 格式：
@@ -2160,7 +2167,7 @@ zh-TW:
         destination_without_exit: 到達目地
         against_oneway_without_exit: 沿著單行道 %{name} 行駛
         end_oneway_without_exit: 單行道終點於 %{name}
-        roundabout_with_exit: 於圓環進入出口 %{name} 至 %{name}
+        roundabout_with_exit: 從圓環出口 %{exit} 離開至 %{name}
         unnamed: 未命名
         courtesy: 感謝 %{link} 提供路線資訊
       time: 時間