diff --git a/config/locales/af.yml b/config/locales/af.yml
index c751cb026..14a434b00 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1,6 +1,8 @@
 af: 
   activerecord: 
     attributes: 
+      diary_comment: 
+        body: Teks
       diary_entry: 
         language: Taal
         latitude: Breedtegraad
@@ -11,20 +13,33 @@ af:
         friend: Vriend
         user: Gebruiker
       message: 
+        body: Teks
+        recipient: Ontvanger
+        sender: Afsender
         title: Titel
       trace: 
         description: Beskrywing
         latitude: Breedtegraad
         longitude: Lengtegraad
         name: Naam
+        public: Openbaar
+        size: Grootte
+        user: Gebruiker
+        visible: Sigbaar
       user: 
+        active: Aktief
         description: Beskrywing
         email: E-pos
         languages: Tale
         pass_crypt: Wagwoord
     models: 
       country: Land
+      diary_comment: Dagboekopmerking
+      diary_entry: Dagboekinskrywing
+      friend: Vriend
       language: Taal
+      message: Boodskap
+      notifier: Melding
       session: Sessie
       user: Gebruiker
       way: Weg
@@ -32,9 +47,20 @@ af:
     changeset_details: 
       belongs_to: "Behoort aan:"
       box: boks
+      closed_at: "Gesluit op:"
       created_at: "Geskep op:"
+    changeset_navigation: 
+      all: 
+        next_tooltip: Volgende stel wysigings
+        prev_tooltip: Vorige stel wysigings
+      user: 
+        name_tooltip: Wys wysigings deur {{user}}
+        next_tooltip: Volgende wysiging deur {{user}}
+        prev_tooltip: Vorige wysiging deur {{user}}
     common_details: 
       changeset_comment: "Opmerking:"
+      edited_at: "Gewysig op:"
+      edited_by: "Opgedateer deur:"
       version: "Weergawe:"
     containing_relation: 
       entry: Relasie {{relation_name}}
@@ -74,6 +100,7 @@ af:
       of: van
       showing_page: Bladsy
     relation: 
+      download: "{{download_xml_link}} of {{view_history_link}}"
       download_xml: Laai XML af
       view_history: geskiedenis weergeven
     relation_details: 
@@ -100,6 +127,7 @@ af:
       load_data: Laai data
       loaded_an_area_with_num_features: Hierdie area het [[num_features]] items. Party webblaaiers mag stadig raak wanneer hulle om soveel data te vertoon. Om nietemin aan te gaan, kies die skakel hier onder.
       loading: Laai...
+      manually_select: Kies 'n ander gebied handmatig
       object_list: 
         api: Verkry die data van hierdie gebied
         back: Vertoon objeklys
@@ -141,71 +169,175 @@ af:
       way_history_title: "Weggeskiedenis: {{way_name}}"
   changeset: 
     changeset: 
+      anonymous: Anoniem
       big_area: (groot)
+      no_comment: (geen)
+      no_edits: (geen wysigings)
+    changeset_paging_nav: 
+      of: van
+      showing_page: Besig om bladsy te wys
     changesets: 
       area: Gebied
       comment: Opmerking
       id: ID
+      saved_at: Gestoor op
       user: Gebruiker
   diary_entry: 
     diary_entry: 
       comment_count: 
         one: 1 reaksie
         other: "{{count}} reaksies"
+      edit_link: Wysig hierdie inskrywing
     edit: 
+      body: "Teks:"
       language: "Taal:"
       latitude: "Breedtegraad:"
+      location: "Ligging:"
       longitude: "Lengtegraad:"
       save_button: Stoor
       subject: "Onderwerp:"
+      title: Wysig dagboekinskrywing
+      use_map_link: gebruik kaart
+    list: 
+      in_language_title: Dagboekinkrywings in {{language}}
+      new: Nuwe dagboekinskrywing
+      newer_entries: Nuwer inskrywings
+      no_entries: Geen dagboekinskrywings nie
+      older_entries: Ouer inskrywings
+      title: Gebruikersdagboeke
+      user_title: Dagboek van {{user}}
+    no_such_user: 
+      heading: Die gebruiker {{user}} bestaan nie
+      title: Geen sodanige gebruiker nie
     view: 
       login: Teken in
+      login_to_leave_a_comment: U moet eers {{login_link}} alvorens u kommentaar kan lewer
       save_button: Stoor
+      title: Gebruikersdagboeke | {{user}}
+      user_title: Dagboek van {{user}}
   export: 
     start: 
       licence: Lisensie
       max: max
+      options: Voorkeure
+      scale: Skaal
     start_rjs: 
       export: Eksporteer
   geocoder: 
     description: 
+      title: 
+        geonames: Ligging vanaf <a href="http://www.geonames.org/">GeoNames</a>
       types: 
         cities: Stede
         places: Plekke
         towns: Dorpe
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} van {{type}}"
     direction: 
       east: oos
       north: noord
       north_east: noordoos
       north_west: noordwes
       south: suid
+      south_east: suid-oos
       south_west: suidwes
       west: wes
+    distance: 
+      one: ongeveer 1km
+      other: ongeveer {{count}}km
+      zero: minder as 1km
+    results: 
+      no_results: Geen resultate gevind nie
+    search: 
+      title: 
+        ca_postcode: Resultate vanaf <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Resultate vanaf <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Resultate vanaf <a href="http://openstreetmap.org/">intern</a>
+        osm_namefinder: Resultate vanaf <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Resultate vanaf <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Resultate vanaf <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} van {{placename}}"
   layouts: 
+    alt_donation: Skenk 'n donasie
+    donate_link_text: skenk
     edit: Wysig
+    edit_tooltip: Wysig kaarte
+    export: Eksporteer
+    help_wiki: Help &amp; Wiki
     history: Geskiedenis
+    home: tuis
+    home_tooltip: Gaan na tuisligging
+    inbox: Posvak IN ({{count}})
+    inbox_tooltip: 
+      one: U inboks bevat 1 ongeleesde boodskap
+      other: U inboks bevat {{count}} ongeleesde boodskappe
+      zero: U inboks bevat geen ongelees boodskappe nie
+    log_in: Teken in
+    logout: teken uit
     logout_tooltip: Teken uit
+    news_blog: Nuusjoernale
+    shop: Winkel
+    sign_up: registreer
+    user_diaries: Gebruikersdagboeke
+    user_diaries_tooltip: Wys gebruikersdagboeke
+    view: Wys
+    welcome_user: Welkom, {{user_link}}
+    welcome_user_link_tooltip: U gebruikersblad
   map: 
     coordinates: "Koördinate:"
     edit: Wysig
     view: Wys
   message: 
+    delete: 
+      deleted: Boodskap is verwyder
     inbox: 
       date: Datum
+      from: Vanaf
+      my_inbox: My inboks
+      outbox: Posvak UIT
       subject: Onderwerp
+      title: Posvak IN
+      you_have: U het {{new_count}} nuwe boodskappe en {{old_count}} ou boodskappe
+    mark: 
+      as_read: Boodskap gemerk as gelees
+      as_unread: Boodskap gemerk as ongelees
     message_summary: 
       delete_button: Verwyder
+      read_button: Merk as gelees
+      reply_button: Antwoord
+      unread_button: Merk as ongelees
     new: 
+      body: Teks
+      message_sent: Boodskap is gestuur
+      send_button: Stuur
       subject: Onderwerp
+      title: Stuur boodskap
+    no_such_user: 
+      heading: Geen sodanige gebruiker of boodskap nie
+      title: Geen sodanige gebruiker of boodskap nie
     outbox: 
       date: Datum
+      inbox: Posvak IN
+      my_inbox: My {{inbox_link}}
+      outbox: Posvak UIT
       subject: Onderwerp
+      to: Aan
+      you_have_sent_messages: U het {{sent_count}} gestuurde boodskappe
     read: 
+      date: Datum
       from: Van
+      reply_button: Antwoord
       subject: Onderwerp
+      title: Lees boodskap
+      to: Aan
+      unread_button: Merk as ongelees
     sent_message_summary: 
       delete_button: Verwyder
   notifier: 
+    diary_comment_notification: 
+      hi: Hallo {{to_user}},
     email_confirm: 
       subject: "[OpenStreetMap] Bevestig u e-posadres"
     email_confirm_html: 
@@ -213,38 +345,98 @@ af:
     email_confirm_plain: 
       greeting: Hallo,
     gpx_notification: 
+      failure: 
+        more_info_2: "hulle kan gevind word by:"
       greeting: Hallo,
+      with_description: met die beskrywing
+      your_gpx_file: Dit lyk soos jou GPX-lêer
     lost_password_html: 
       greeting: Hallo,
     lost_password_plain: 
       greeting: Hallo,
+    message_notification: 
+      banner1: "*                  Moet asseblief nie op hierdie e-pos reageer nie.                    *"
+      hi: Hallo {{to_user}},
     signup_confirm_html: 
       greeting: Hallo daar!
+      hopefully_you: Iemand (hopelik u) wil graag 'n rekening skep op
+      more_videos: Daar is {{more_videos_link}}.
+      more_videos_here: meer video's hier
+      video_to_openstreetmap: inleidende video vir OpenStreetMap
+    signup_confirm_plain: 
+      greeting: Hallo daar!
   oauth_clients: 
     edit: 
       submit: Wysig
     form: 
       name: Naam
+    index: 
+      revoke: Herroep!
+    new: 
+      submit: Registreer
+    show: 
+      allow_write_api: wysig die kaart.
+      edit: Wysig details
   site: 
+    edit: 
+      user_page_link: gebruikersbladsy
+    index: 
+      shortlink: Kort skakel
     key: 
       table: 
         entry: 
+          admin: Administratiewe grens
+          apron: 
+            - Lughaweplatform
+            - terminaal
+          building: Belangrike gebou
+          cable: 
+            - Kabelkar
+          cemetery: Begraafplaas
+          centre: Sport-sentrum
+          commercial: Kommersiële gebied
+          common: 
+            - weide
+          cycleway: Fietspad
           farm: Plaas
+          footway: Voetpad
           forest: Bos
           golf: Gholfbaan
+          heathland: Heide
+          lake: 
+            - Meer
+            - reservoir
+          military: Militêre gebied
+          motorway: Snelweg
           park: Park
+          private: Privaat toegang
           rail: Spoorweg
+          reserve: Natuurreservaat
+          resident: Woongebied
+          retail: Winkelgebied
+          runway: 
+            - Lughawe aanloopbaan
+            - taxibaan
           school: 
             - Skool
+            - universiteit
+          secondary: Sekondêre pad
           summit: 
+            - Piek
             - piek
+          tourist: Toerisme-trekpleister
+          track: Spoor
           wood: Bos
     search: 
       search: Soek
       submit_text: OK
+      where_am_i: Waar is ek?
     sidebar: 
+      close: Sluit
       search_results: Soekresultate
   trace: 
+    delete: 
+      scheduled_for_deletion: Spoor is geskeduleer vir verwydering
     edit: 
       description: "Beskrywing:"
       download: aflaai
@@ -254,52 +446,134 @@ af:
       owner: "Eienaar:"
       points: "Punte:"
       save_button: Stoor wysigings
+      start_coord: "Beginkoördinaat:"
+      tags_help: met kommas geskei
+      uploaded_at: "Opgelaai by:"
       visibility: "Sigbaarheid:"
+      visibility_help: wat beteken dit?
+    make_public: 
+      made_public: Spoor is openbaar gemaak
     no_such_user: 
       heading: Die gebruiker {{user}} bestaan nie
       title: Die gebruiker bestaan nie
     trace: 
+      ago: "{{time_in_words_ago}} gelede"
       by: deur
+      count_points: "{{count}} punte"
       edit: wysig
       edit_map: Kaart bewysig
       in: in
+      map: kaart
       more: meer
+      pending: BESIG
+      private: PRIVAAT
+      public: OPENBAAR
+      view_map: Wys kaart
     trace_form: 
       description: Beskrywing
       help: Hulp
+      tags_help: met kommas geskei
+      upload_button: Laai op
+      upload_gpx: Laai GPX-lêer op
+      visibility: Sigbaarheid
+      visibility_help: wat beteken dit?
     trace_paging_nav: 
       of: van
     view: 
+      delete_track: Verwyder hierdie spoor
       description: "Beskrywing:"
       edit: wysig
+      edit_track: Wysig hierdie spoor
       filename: "Lêernaam:"
       map: kaart
       none: Geen
       owner: "Eienaar:"
       pending: BESIG
       points: "Punte:"
+      start_coordinates: "Beginkoördinaat:"
+      uploaded: "Opgelaai by:"
+      visibility: "Sigbaarheid:"
   user: 
     account: 
+      email never displayed publicly: (word nie openbaar gemaak nie)
+      home location: "Tuisligging:"
       latitude: "Breedtegraad:"
       longitude: "Lengtegraad:"
       my settings: My voorkeure
+      no home location: U het nog nie u huis se ligging ingevoer nie.
+      preferred languages: "Voorkeur tale:"
+      public editing: 
+        disabled link text: hoekom kan ek niks wysig nie?
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: wat is dit?
+      return to profile: Terug na profiel
       save changes button: Stoor wysigings
+      title: Wysig rekening
+    confirm: 
+      button: Bevestig
     confirm_email: 
       button: Bevestig
+      success: U e-posadres is bevestig, dankie dat u geregistreer het!
     friend_map: 
       your location: U ligging
     login: 
+      create_account: registreer
+      email or username: "E-posadres of gebruikersnaam:"
       heading: Teken in
       login_button: Teken in
+      lost password link: Wagwoord vergeet?
       password: "Wagwoord:"
+      please login: Teken in of {{create_user_link}}.
       title: Teken in
+    lost_password: 
+      email address: "E-posadres:"
+      new password button: Herstel wagwoord
+      title: Wagwoord vergeet
+    make_friend: 
+      already_a_friend: U is reeds met {{name}} bevriend.
+      failed: Jammer, kon nie {{name}} as 'n vriend byvoeg nie.
+      success: "{{name}} is nou u vriend."
     new: 
+      confirm email address: "Bevestig E-posadres:"
+      confirm password: "Bevestig wagwoord:"
+      email address: "E-posadres:"
+      heading: Skep 'n rekening
       password: "Wagwoord:"
+      signup: Registreer
+      title: Skep rekening
+    no_such_user: 
+      heading: Die gebruiker {{user}} bestaan nie
+      title: Gebruiker bestaan nie
+    remove_friend: 
+      not_a_friend: "{{name}} is nie een van u vriende nie."
+      success: "{{name}} is uit u lys van vriende verwyder."
     reset_password: 
       confirm password: "Bevestig wagwoord:"
+      flash changed: U wagwoord is verander.
+      heading: Herstel wagwoord vir {{name}}
       password: "Wagwoord:"
       reset: Kry nuwe wagwoord
+      title: Herstel wagwoord
     view: 
+      add as friend: voeg by as vriend
+      add image: Voeg prent by
+      ago: ({{time_in_words_ago}} gelede)
+      change your settings: verander u voorkeure
+      delete image: Verwyder prent
       description: Beskrywing
+      diary: dagboek
       edits: wysigings
+      km away: "{{count}}km vêr"
+      m away: "{{count}}m vêr"
+      my diary: my dagboek
+      my edits: my wysigings
+      my settings: my voorkeure
+      my traces: my spore
+      nearby users: "Nabygeleë gebruikers:"
+      new diary entry: nuwe dagboekinskrywing
+      no friends: U het nog geen vriende bygevoeg nie.
+      remove as friend: verwyder as vriend
       settings_link_text: voorkeure
+      traces: spore
+      user image heading: Foto van gebruiker
+      your friends: U vriende
diff --git a/config/locales/br.yml b/config/locales/br.yml
index ef9745970..f6b6ce3c9 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -47,9 +47,14 @@ br:
       old_node: Skoulm kozh
       old_node_tag: balizenn ar skoulm kozh
       old_way: Hent kozh
+      old_way_node: Skoulm an hent kozh
       old_way_tag: Balizenn an hent kozh
       relation: Darempred
+      relation_tag: Balizenn darempred
       session: Dalc'h
+      trace: Roud
+      tracepoint: Poent eus ar roud
+      tracetag: Balizenn roud
       user: Implijer
       user_preference: Penndibaboù Implijer
       user_token: Jedouer an implijer
@@ -60,6 +65,7 @@ br:
     changeset: 
       changeset: "Strollad kemmoù : {{id}}"
       changesetxml: Strollad kemmoù XML
+      download: Pellgargañ {{changeset_xml_link}} pe {{osmchange_xml_link}}
       feed: 
         title: Strollad kemmoù {{id}}
         title_comment: Strollad kemmoù {{id}} - {{comment}}
@@ -70,6 +76,15 @@ br:
       box: boest
       closed_at: "Serret d'an :"
       created_at: "Krouet d'an :"
+      has_nodes: 
+        one: "Zo gantañ an {{count}} skoulm-mañ :"
+        other: "Zo gantañ an {{count}} skoulm-mañ :"
+      has_relations: 
+        one: "Zo gantañ an {{count}} darempred-mañ :"
+        other: "Zo gantañ an {{count}} darempred-mañ :"
+      has_ways: 
+        one: "Zo gantañ an {{count}} hent-mañ :"
+        other: "Zo gantañ an {{count}} hent-mañ :"
       show_area_box: Diskouez boest an takad
     changeset_navigation: 
       all: 
@@ -77,6 +92,8 @@ br:
         prev_tooltip: Strollad kemmoù kent
       user: 
         name_tooltip: Gwelet an aozadennoù gant {{user}}
+        next_tooltip: Aozadenn da-heul gant {{user}}
+        prev_tooltip: Aozadenn gent gant {{user}}
     common_details: 
       changeset_comment: "Addispleg :"
       edited_at: "Aozet d'an :"
@@ -135,16 +152,19 @@ br:
       relation_history_title: "Istor an darempred : {{relation_name}}"
       view_details: gwelet ar munudoù
     relation_member: 
+      entry_role: "{{type}} {{name}} evel {{role}}"
       type: 
         node: Skoulm
         relation: Darempred
         way: Hent
     start: 
       manually_select: Diuzañ un takad disheñvel gant an dorn
+      view_data: Gwelet ar roadennoù evit gwel red ar gartenn
     start_rjs: 
       data_frame_title: Roadennoù
       data_layer_name: Roadennoù
       details: Munudoù
+      drag_a_box: Tresit ur voest war ar gartenn evit diuzañ un takad
       edited_by_user_at_timestamp: Aozet gant [[user]] da [[timestamp]]
       history_for_feature: Istor evit [[feature]]
       load_data: Kargañ ar roadennoù
@@ -180,6 +200,9 @@ br:
       way: Hent
       way_title: "Hent : {{way_name}}"
     way_details: 
+      also_part_of: 
+        one: lodenn ivez eus an hent {{related_ways}}
+        other: lodenn ivez eus an hentoù {{related_ways}}
       nodes: "Skoulmoù :"
       part_of: "Lodenn eus :"
     way_history: 
@@ -198,6 +221,7 @@ br:
       view_changeset_details: Gwelet munudoù ar strollad kemmoù
     changeset_paging_nav: 
       of: eus
+      showing_page: O tiskouez ar bajenn
     changesets: 
       area: Takad
       comment: Addispleg
@@ -218,6 +242,11 @@ br:
       title_user: Strolladoù kemmoù gant {{user}}
       title_user_bbox: Strolladoù kemmoù gant {{user}} e-barzh {{bbox}}
   diary_entry: 
+    diary_entry: 
+      comment_count: 
+        one: 1 addispleg
+        other: "{{count}} addispleg"
+      posted_by: Postet gant {{link_user}} da {{created}} e {{language_link}}
     edit: 
       body: "Korf :"
       language: "Yezh :"
@@ -233,12 +262,15 @@ br:
     no_such_user: 
       title: N'eus implijer ebet evel-se
     view: 
+      leave_a_comment: Lezel un addispleg
+      login: Kevreañ
       save_button: Enrollañ
       user_title: Deizlevr {{user}}
   export: 
     start: 
       add_marker: Ouzhpennañ ur merker d'ar gartenn
       area_to_export: Takad da ezporzhiañ
+      embeddable_html: HTML enkorfadus
       export_button: Ezporzhiañ
       format: Furmad
       format_to_export: Furmad da ezporzhiañ
@@ -252,11 +284,13 @@ br:
       options: Dibarzhioù
       osm_xml_data: Roadennoù XML OpenStreetMap
       osmarender_image: Skeudenn Osmarender
+      paste_html: Pegañ HTML evit bezañ enkorfet en ul lec'hienn web
       scale: Skeuliad
       zoom: Zoum
     start_rjs: 
       add_marker: Ouzhpennañ ur merker d'ar gartenn
       change_marker: Cheñch lec'hiadur ar merker
+      click_add_marker: Klikit war ar gartenn evit ouzhpennañ ur merker
       export: Ezporzhiañ
       manually_select: Diuzañ un takad disheñvel gant an dorn
       view_larger_map: Gwelet ur gartenn vrasoc'h
@@ -286,7 +320,12 @@ br:
     search: 
       title: 
         ca_postcode: Disoc'hoù diwar <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Disoc'hoù diwar <a href="http://openstreetmap.org/">Internal</a>
+        osm_namefinder: Disoc'hoù diwar <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
         us_postcode: Disoc'hoù diwar <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} eus {{parentname}})"
   layouts: 
     alt_donation: Ober un donezon
     donate_link_text: oc'h ober un donezon
@@ -294,6 +333,8 @@ br:
     edit_tooltip: Aozañ kartennoù
     export: Ezporzhiañ
     export_tooltip: Ezporzhiañ roadennoù ar gartenn
+    gps_traces: Roudoù GPS
+    gps_traces_tooltip: Merañ ar roudoù
     help_wiki: Skoazell &amp; Wiki
     help_wiki_tooltip: Skoazell &amp; lec'hienn Wiki evit ar raktres
     history: Istor
@@ -302,10 +343,18 @@ br:
     inbox: boest resev ({{count}})
     inbox_tooltip: 
       one: 1 gemennadenn anlennet zo en ho poest resev
+      other: E-barzh ho poest resev ez eus {{count}} kemennadenn anlennet
       zero: N'eus kemennadenn anlennet ebet en ho poest resev
+    log_in: kevreañ
+    logo: 
+      alt_text: Logo OpenStreetMap
+    logout: digevreañ
+    logout_tooltip: Digevreañ
     shop: Stal
+    sign_up: En em enskrivañ
     sign_up_tooltip: Krouiñ ur gont evit aozañ
     user_diaries: Deizlevrioù an implijer
+    user_diaries_tooltip: Gwelet deizlevrioù an implijerien
     view: Gwelet
     view_tooltip: Gwelet ar c'hartennoù
     welcome_user: Degemer mat, {{user_link}}
@@ -335,6 +384,7 @@ br:
       body: Korf
       message_sent: Kemennadenn kaset
       send_button: Kas
+      send_message_to: Kas ur gemennadenn nevez da {{name}}
       subject: Danvez
       title: Kas ur gemennadenn
     outbox: 
@@ -346,13 +396,17 @@ br:
       title: Boest kas
       to: Da
     read: 
+      back_to_inbox: Distreiñ d'ar voest resev
+      back_to_outbox: Distreiñ d'ar voest kas
       date: Deiziad
       from: A-berzh
       reading_your_messages: O lenn ho kemennadennoù
+      reading_your_sent_messages: O lenn ho kemennadennoù kaset
       reply_button: Respont
       subject: Danvez
       title: Lenn ar gemennadenn
       to: Da
+      unread_button: Merkañ evel anlennet
     sent_message_summary: 
       delete_button: Dilemel
   notifier: 
@@ -370,6 +424,8 @@ br:
     gpx_notification: 
       and_no_tags: ha balizenn ebet.
       and_the_tags: "hag ar balizennoù-mañ :"
+      failure: 
+        more_info_2: "a c'hall bezañ kavet war :"
       greeting: Demat,
       with_description: gant an deskrivadur
     lost_password_html: 
@@ -377,17 +433,24 @@ br:
     lost_password_plain: 
       greeting: Demat,
     message_notification: 
+      banner1: "*                  Na respontit ket d'ar postel-mañ, mar plij.                                                *"
+      footer2: ha gallout a rit respont da {{replyurl}}
       hi: Demat {{to_user}},
     signup_confirm_html: 
       greeting: Demat !
+      introductory_video: Gallout a rit sellet ouzh un {{introductory_video_link}}.
       more_videos: Bez' ez eus {{more_videos_link}}.
       more_videos_here: muioc'h a videoioù amañ
     signup_confirm_plain: 
+      current_user_2: "a c'haller kaout diwar :"
       greeting: Demat !
       more_videos: "Muioc'h a videoioù zo amañ :"
   oauth: 
     oauthorize: 
+      allow_read_gpx: lenn ho roudoù GPS prevez.
+      allow_to: "Lezel an arload arval da :"
       allow_write_api: kemmañ ar gartenn.
+      allow_write_gpx: kas roudoù GPS.
       allow_write_prefs: kemmañ ho penndibaboù implijer.
   oauth_clients: 
     edit: 
@@ -395,17 +458,29 @@ br:
       title: Aozañ hoc'h arload
     form: 
       allow_write_api: kemmañ ar gartenn.
+      allow_write_gpx: kas roudoù GPS.
       name: Anv
       required: Rekis
+      url: URL pennañ an arload
     index: 
       application: Anv an arload
       issued_at: Kaset da
+      my_tokens: Ma arloadoù aotreet
       revoke: Terriñ !
+      title: Ma munudoù OAuth
     show: 
+      allow_read_gpx: lenn o roudoù GPS prevez.
       allow_write_api: kemmañ ar gartenn.
+      allow_write_gpx: kas roudoù GPS.
+      allow_write_prefs: kemmañ o fenndibaboù implijerien.
       edit: Aozañ ar munudoù
+      key: "Alc'hwez an implijer :"
+      url: "URL ar jedouer reked :"
+    update: 
+      flash: Hizivaet eo bet titouroù an arval
   site: 
     edit: 
+      anon_edits_link_text: Kavit perak.
       not_public: N'hoc'h eus ket lakaet hoc'h aozadennoù da vezañ foran.
       user_page_link: pajenn implijer
     index: 
@@ -419,9 +494,20 @@ br:
         entry: 
           admin: Bevenn velestradurel
           allotments: Lodennaouegoù
+          apron: 
+            - Roudenn aerborzh
+          bridleway: Hent evit kezeg
+          brownfield: Takad greanterezh
+          building: Savadur pouezus
+          cable: 
+            - Teleferik
+            - fungador
           cemetery: Bered
           centre: Kreizenn sport
           commercial: Takad kenwerzhel
+          common: 
+            - prad
+          construction: Hentoù war ar stern
           cycleway: Roudenn divrodegoù
           farm: Ti-feurm
           footway: Hent evit an dud war droad
@@ -431,22 +517,33 @@ br:
           industrial: Takad greantel
           lake: 
             - Lenn
+            - mirlec'h
           military: Takad milourel
           motorway: Gourhent
           park: Park
+          pitch: Tachenn sport
           private: Moned prevez
           rail: Hent-houarn
           reserve: Gwarezva natur
+          resident: Takad annez
           retail: Takad kenwerzh
+          runway: 
+            - Roudenn evit an taksioù
           school: 
             - Skol
             - skol-veur
           station: Porzh-houarn
           subway: Linenn vetro
+          summit: 
+            - Lein
+            - pikern
           track: Roudenn
           tram: 
             - tramgarr
+            - tramgarr
+          trunk: Hent broadel
           unclassified: Hent n'eo ket rummet
+          unsurfaced: Hent n'eo ket goloet
           wood: Koad
         heading: Alc'hwez evit z{{zoom_level}}
     search: 
@@ -455,12 +552,18 @@ br:
       where_am_i: Pelec'h emaon ?
     sidebar: 
       close: Serriñ
+      search_results: Disoc'hoù an enklask
   trace: 
+    create: 
+      upload_trace: Kas ar roud GPS
+    delete: 
+      scheduled_for_deletion: Roudenn da vezañ dilamet
     edit: 
       description: "Deskrivadur :"
       download: pellgargañ
       edit: aozañ
       filename: "Anv ar restr :"
+      heading: Oc'h aozañ ar roud {{name}}
       map: kartenn
       owner: "Perc'henn :"
       points: "Poentoù :"
@@ -468,11 +571,15 @@ br:
       start_coord: "Daveennoù orin :"
       tags: "Balizennoù :"
       tags_help: bevennet gant virgulennoù
+      title: Oc'h aozañ ar roud {{name}}
       uploaded_at: "Kaset da :"
       visibility: "Gwelusted :"
       visibility_help: Petra a dalvez an dra-mañ ?
     list: 
+      public_traces: Roudoù GPS foran
+      public_traces_from: Roudoù GPS foran gant {{user}}
       tagged_with: " balizennet gant {{tags}}"
+      your_traces: Ho roudoù GPS
     make_public: 
       made_public: Roudenn lakaet da vezañ foran
     no_such_user: 
@@ -490,6 +597,7 @@ br:
       pending: WAR C'HORTOZ
       private: PREVEZ
       public: FORAN
+      trace_details: Gwelet munudoù ar roud
       view_map: Gwelet ar gartenn
     trace_form: 
       description: Deskrivadur
@@ -500,6 +608,10 @@ br:
       upload_gpx: Kas ar restr GPX
       visibility: Gwelusted
       visibility_help: Petra a dalvez ?
+    trace_header: 
+      see_all_traces: Gwelet an holl roudoù
+      see_just_your_traces: Gwelet ho roudoù hepken, pe kas ur roud
+      see_your_traces: Gwelet hoc'h holl roudoù
     trace_optionals: 
       tags: Balizennoù
     trace_paging_nav: 
@@ -512,16 +624,23 @@ br:
       edit: aozañ
       edit_track: Aozañ ar roudenn-mañ
       filename: "Anv ar restr :"
+      heading: O welet ar roud {{name}}
       map: kartenn
       none: Hini ebet
       owner: Perc'henn
       pending: WAR C'HORTOZ
       points: "Poentoù :"
+      start_coordinates: "Daveennoù orin :"
       tags: "Balizennoù :"
+      title: O welet ar roud {{name}}
+      trace_not_found: N'eo ket bet kavet ar roud !
       uploaded: "Karget da :"
       visibility: "Gwelusted :"
+    visibility: 
+      private: Prevez (rannet ent dizanv hepken, poentoù hep urzh)
   user: 
     account: 
+      flash update success: Hizivaet eo bet titouroù an implijer.
       latitude: "Ledred :"
       longitude: "Hedred :"
       make edits public button: Lakaat ma holl aozadennoù da vezañ foran
@@ -538,20 +657,29 @@ br:
       title: Aozañ ar gont
     confirm: 
       button: Kadarnaat
+      failure: Ur gont implijer gant ar jedouer-mañ zo bet kadarnaet dija.
       heading: Kadarnaat kont un implijer
+      press confirm button: Pouezit war ar bouton kadarnaat amañ dindan evit gweredekaat ho kont.
+      success: Kadarnaet eo ho kont, trugarez evit bezañ en em enskrivet !
     confirm_email: 
       button: Kadarnaat
       failure: Kadarnaet ez eus bet ur chomlec'h postel dija gant art jedouer-mañ.
       heading: Kadarnaat ur c'hemm chomlec'h postel
+      press confirm button: Pouezit war ar bouton kadarnaat evit kadarnaat ho chomlec'h postel nevez.
     friend_map: 
+      nearby mapper: "Kartennour en ardremez : [[nearby_user]]"
       your location: Ho lec'hiadur
     go_public: 
       flash success: Foran eo hoc'h holl aozadennoù bremañ, ha n'oc'h ket aotreet da aozañ.
     login: 
       create_account: krouiñ ur gont
       email or username: "Chomlec'h postel pe anv implijer :"
+      heading: Kevreañ
+      login_button: Kevreañ
       lost password link: Kollet hoc'h eus ho ker-tremen ?
       password: "Ger-tremen :"
+      please login: Kevreit, mar plij, pe {{create_user_link}}.
+      title: Kevreañ
     lost_password: 
       email address: "Chomlec'h postel :"
       heading: Ankouaet hoc'h eus ho ker-tremen ?
@@ -559,6 +687,7 @@ br:
       title: Ger-tremen kollet
     make_friend: 
       already_a_friend: Mignon oc'h gant {{name}} dija.
+      success: "{{name}} zo ho mignon bremañ."
     new: 
       confirm email address: "Kadarnaat ar chomlec'h postel :"
       confirm password: "Kadarnaat ar ger-tremen :"
@@ -567,6 +696,7 @@ br:
       fill_form: Leugnit ar furmskrid hag e kasimp deoc'h ur postel evit gweredekaat ho kont.
       heading: Krouiñ ur gont implijer
       password: "Ger-tremen :"
+      signup: En em enskrivañ
       title: Krouiñ ur gont
     no_such_user: 
       heading: N'eus ket eus an implijer {{user}}
@@ -577,6 +707,7 @@ br:
     reset_password: 
       confirm password: "Kadarnaat ar ger-tremen :"
       flash changed: Cheñchet eo bet ho ker-tremen.
+      flash token bad: N'eo ket bet kavet ar jedouer-se, gwiriañ an URL marteze ?
       heading: Adderaouekaat ar ger-tremen evit {{user}}
       password: "Ger-tremen :"
       reset: Adderaouekaat ar ger-tremen
@@ -590,17 +721,20 @@ br:
       description: Deskrivadur
       diary: deizlevr
       edits: kemmoù
+      km away: war-hed {{count}} km
       m away: war-hed {{count}} m
       mapper since: "Kartennour abaoe :"
       my diary: ma deizlevr
       my edits: ma aozadennoù
       my settings: ma arventennoù
+      my traces: ma roudoù
       my_oauth_details: Gwelet ma munudoù OAuth
       nearby users: "Implijerien tost deoc'h :"
       no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh.
       remove as friend: Lemel evel mignon
       send message: Kas ur gemennadenn
       settings_link_text: arventennoù
+      traces: roudoù
       upload an image: Kas ur skeudenn
       user image heading: Skeudenn implijer
       user location: Lec'hiadur an implijer
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c327781dd..25620e58a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -563,7 +563,7 @@ de:
       click_the_link_1: Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile, um dein
       click_the_link_2: Benutzerkonto zu bestätigen. Lies danach weiter, denn es folgen mehr Informationen über OSM.
       current_user_1: Eine Liste mit allen Benutzern in einer Kategorie,
-      current_user_2: " die anzeigt wo sie auf der Welt sind, ist hier verfügbar:"
+      current_user_2: "die anzeigt wo sie auf der Welt sind, ist hier verfügbar:"
       greeting: Hallo!
       hopefully_you: Jemand (hoffentlich du) möchte ein Benutzerkonto erstellen für
       introductory_video: "Ein Einführungsvideo zu OpenStreetMap kannst du dir hier anschauen:"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 892782a6e..9b9adc310 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -48,9 +48,12 @@ eo:
       title: Redakti vian programon
   trace: 
     edit: 
+      description: "Priskribo:"
       edit: redakti
       filename: "Dosiernomo:"
       save_button: Konservi Ŝanĝojn
+      tags: "Etikedoj:"
+      visibility: "Videbleco:"
     trace: 
       edit: redakti
       edit_map: Redakti Mapon
@@ -58,28 +61,44 @@ eo:
     trace_form: 
       description: Priskribo
       help: Helpo
+      tags: Etikedoj
+      upload_button: Alŝuti
       visibility: Videbleco
     trace_optionals: 
       tags: Etikedoj
     view: 
+      description: "Priskribo:"
       edit: redakti
       filename: "Dosiernomo:"
       tags: "Etikedoj:"
       visibility: "Videbleco:"
   user: 
     account: 
+      my settings: Miaj agordoj
       public editing: 
         disabled link text: kial mi ne povas redakti?
       return to profile: Reen al profilo
       save changes button: Konservi Ŝanĝojn
       title: Redakti konton
+    confirm: 
+      button: Konfirmi
+      heading: Konfirmi uzantan konton
     confirm_email: 
       button: Konfirmi
     friend_map: 
       your location: Via loko
+    login: 
+      heading: Ensaluti
+      login_button: Ensaluti
+      title: Ensaluti
+    lost_password: 
+      email address: "Retpoŝtadreso:"
     new: 
       confirm password: "Konfirmi Pasvorton:"
       title: Krei konton
     reset_password: 
       confirm password: "Konfirmi Pasvorton:"
       password: "Pasvorto:"
+    view: 
+      upload an image: Alŝuti bildon
+      your friends: Viaj amikoj
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f6dcc780a..b564918b7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -87,6 +87,7 @@ es:
         one: "Tiene el siguiente {{count}} nodo:"
         other: "Tiene los siguientes {{count}} nodos:"
       has_relations: 
+        one: "Tiene la siguiente {{count}} relación:"
         other: "Tiene las siguientes {{count}} relaciones:"
       has_ways: "Tiene {{count}} vías:"
       no_bounding_box: No se ha guardado una envoltura para este conjunto de cambios
@@ -294,6 +295,7 @@ es:
     no_such_entry: 
       body: Lo sentimos, no hay ninguna entrada del diario para la ID {{id}}. Por favor, comprueba que la dirección esté correctamente escrita.
       heading: No hay entrada con la ID {{id}}
+      title: No existe esa entrada de diario
     no_such_user: 
       body: Lo sentimos, no hay ningún usuario llamado {{user}}. Por favor, comprueba que la dirección es correcta.
       heading: El usuario {{user}} no existe
@@ -647,6 +649,7 @@ es:
           admin: Límites administrativos
           apron: 
             - terminal
+            - terminal
           bridleway: Vía ecuestre
           building: Edificio significativo
           cemetery: Cementerio
@@ -681,8 +684,12 @@ es:
           station: Estación de tren
           subway: Metro
           tourist: Atracción turística
+          tram: 
+            - Metro ligero
+            - Tranvía
           trunk: Carretera principal
           unclassified: Carretera sin clasificar
+          unsurfaced: Carretera sin asfaltar
           wood: Madera
         heading: Leyenda para z{{zoom_level}}
     search: 
@@ -723,7 +730,7 @@ es:
     make_public: 
       made_public: Traza hecha publica
     no_such_user: 
-      body: Lo sentimo, no hay un usuario con el nombre {{user}}. Por favor revise la redacción o quizas el enlace al que hizo click esta errado.
+      body: Lo sentimos, no hay un usuario con el nombre {{user}}. Por favor revise la redacción o quizás el enlace al que hizo click esta errado.
       heading: El usuario {{user}} no existe
       title: No existe este usuario
     trace: 
@@ -829,6 +836,7 @@ es:
       login_button: Iniciar sesión
       lost password link: ¿Ha perdido su contraseña?
       password: Contraseña
+      please login: Por favor inicie sesión o {{create_user_link}}.
       title: Iniciar sesión
     lost_password: 
       email address: "Dirección de correo:"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 731f91fcc..c5afd337f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -292,7 +292,7 @@ fi:
     history: Historia
     home: koti
     home_tooltip: Siirry kotisijaintiin
-    inbox: inbox ({{size}})
+    inbox: inbox ({{count}})
     inbox_tooltip: 
       one: Sinulla on yksi lukematon viesti.
       other: Sinulla on {{count}} lukematonta viestiä.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a71401d12..fa690c933 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -79,25 +79,26 @@ fr:
       title: Groupe de modifications
     changeset_details: 
       belongs_to: "Appartient à :"
-      bounding_box: "Bounding box :"
-      box: boite
+      bounding_box: "Cadre de délimitation :"
+      box: cadre
       closed_at: "Terminé le :"
       created_at: "Créé le :"
       has_nodes: 
         one: "Concerne le {{count}} nœud suivant :"
         other: "Concerne les {{count}} nœuds suivants :"
       has_relations: 
+        one: "Concerne la relation suivante :"
         other: "Concerne les {{count}} relations suivantes :"
       has_ways: "A les {{count}} ways suivants :"
-      no_bounding_box: Aucune bounding box n'a été stockée pour ce changeset.
-      show_area_box: Montrer la boite
+      no_bounding_box: Aucun cadre de délimitation n'a été stocké pour ce changeset.
+      show_area_box: Montrer le cadre
     changeset_navigation: 
       all: 
         next_tooltip: Groupe de modifications suivant
         prev_tooltip: Groupe de modifications précédent
       user: 
         name_tooltip: Voir les modifications par {{user}}
-        next_tooltip: Prochaines modifications par {{user}}
+        next_tooltip: Modifications suivantes par {{user}}
         prev_tooltip: Modifications précédentes par {{user}}
     common_details: 
       changeset_comment: "Commentaire :"
@@ -158,6 +159,7 @@ fr:
       relation_history_title: "Historique de la relation : {{relation_name}}"
       view_details: afficher les détails
     relation_member: 
+      entry_role: "{{type}} {{name}} avec le rôle {{role}}"
       type: 
         node: Nœud
         relation: Relation
@@ -169,11 +171,11 @@ fr:
       data_frame_title: Données
       data_layer_name: Données
       details: Détails
-      drag_a_box: Dessiner une boite sur la carte pour sélectionner une zone
+      drag_a_box: Dessiner un cadre sur la carte pour sélectionner une zone
       edited_by_user_at_timestamp: Édité par [[user]] le [[timestamp]]
       history_for_feature: Historique pour [[feature]]
       load_data: Charger les données
-      loaded_an_area_with_num_features: "Vous avez chargé une zone qui contient [[num_features]] un grand nombre d'éléments. En général, les navigateurs ne supportent pas bien l'affichage de tant de données, et travaillent mieux lorsqu'ils affichent moins de 100 éléments : accepter peut rendre votre navigateur lent ou non fonctionnel. Si vous etes sûr de vouloir afficher ces données, vous pouvez le faire en appuyant sur le bouton ci-dessous."
+      loaded_an_area_with_num_features: "Vous avez chargé une zone qui contient [[num_features]] éléments. En général, les navigateurs ne supportent pas bien l'affichage de tant de données, et travaillent mieux lorsqu'ils affichent moins de 100 éléments : accepter peut rendre votre navigateur lent ou non fonctionnel. Si vous êtes sûr de vouloir afficher ces données, vous pouvez le faire en appuyant sur le bouton ci-dessous."
       loading: Chargement...
       manually_select: Sélectionner manuellement une zone différente
       object_list: 
@@ -194,7 +196,7 @@ fr:
           way: Chemin
       private_user: utilisateur privé
       show_history: Montrer l'historique
-      unable_to_load_size: "Impossible de charger les données : la Bounding box d'une taille de [[bbox_size]] est trop grande (elle doit être plus petite que {{max_bbox_size}})"
+      unable_to_load_size: "Impossible de charger les données : le cadre de délimitation d'une taille de [[bbox_size]] est trop grand (il doit être inférieur à {{max_bbox_size}})"
       wait: Patienter...
       zoom_or_select: Zoomer ou sélectionner une zone de la carte pour la visualiser
     tag_details: 
@@ -376,7 +378,7 @@ fr:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    alt_donation: Faites une donation
+    alt_donation: Faire un don
     donate: Soutenez OpenStreetMap, {{link}} au fond pour améliorer le matériel.
     donate_link_text: participez
     edit: Éditer
@@ -391,7 +393,7 @@ fr:
     history_tooltip: Historique du groupe de modifications
     home: Chez moi
     home_tooltip: Aller à l'emplacement de mon domicile
-    inbox: Boite aux lettres ({{count}})
+    inbox: Boîte aux lettres ({{count}})
     inbox_tooltip: 
       one: Votre boîte aux lettres contient 1 message non lu
       other: Votre boîte aux lettres contient {{count}} messages non lus
@@ -516,6 +518,7 @@ fr:
         subject: "[OpenStreetMap] Erreur lors de l'import GPX"
       greeting: Bonjour,
       success: 
+        loaded_successfully: s'est chargé correctement avec {{trace_points}} points sur {{possible_points}}.
         subject: "[OpenStreetMap] Import GPX réussi"
       with_description: avec les description
       your_gpx_file: Il semble que votre fichier GPX
@@ -542,6 +545,7 @@ fr:
       subject: "[OpenStreetMap] Confirmer votre adresse de courriel"
     signup_confirm_html: 
       click_the_link: Si vous êtes à l'origine de cette action, bienvenue ! Cliquez sur le lien ci-dessous pour confirmer la création de compte et avoir plus d'informations sur OpenStreetMap
+      current_user: Une liste par catégories des utilisateurs actuels, basée sur leur position géographique, est disponible dans <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
       get_reading: Plus d’informations sur OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/FR:Beginners_Guide">sur le wiki</a> ou <a href="http://www.opengeodata.org/">sur le blog opengeodata</a> qui propose également des  <a href="http://www.opengeodata.org/?cat=13">podcasts à écouter</a> !
       greeting: Bonjour !
       hopefully_you: Quelqu'un (probablement vous) aimerait créer un compte sur
@@ -647,14 +651,15 @@ fr:
         license_name: Creative Commons Attribution-Share Alike 2.0
         notice: Sous license {{license_name}} par le {{project_name}} et ses contributeurs.
         project_name: projet OpenStreetMap
-      permalink: Permalink
+      permalink: Lien permanent
       shortlink: Lien court
     key: 
       map_key: Légende de la carte
+      map_key_tooltip: Légende pour le rendu Mapnik à ce niveau de zoom
       table: 
         entry: 
           admin: Limite administrative
-          allotments: Lotissements
+          allotments: Jardins familiaux
           apron: 
             - Piste d'aéroport
             - terminal
@@ -671,6 +676,7 @@ fr:
           commercial: Zone commerciale
           common: 
             - prairie
+            - Prairie
           construction: Routes en construction
           cycleway: Voie cyclable
           farm: Ferme
@@ -713,11 +719,12 @@ fr:
           trunk: Route nationale
           tunnel: Bord en pointillés = tunnel
           unclassified: Route non classifiée
+          unsurfaced: Route non revêtue
           wood: Bois
         heading: Légende pour z{{zoom_level}}
     search: 
       search: Recherche
-      search_help: "exemples : 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', ou 'bureaux de poste près de Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>Autres d'exemples...</a>"
+      search_help: "exemples : 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', ou 'bureaux de poste près de Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>Autres exemples...</a>"
       submit_text: Envoyer
       where_am_i: Où suis-je ?
     sidebar: 
@@ -818,7 +825,7 @@ fr:
     account: 
       email never displayed publicly: (jamais affiché publiquement)
       flash update success: Informations sur l'utilisateur mises à jour avec succès.
-      flash update success confirm needed: Informations sur l'utilisateur mises à jour avec succès. Vérifiez votre boite mail afin de valider la vérification de votre nouvelle adresse e-mail.
+      flash update success confirm needed: Informations sur l'utilisateur mises à jour avec succès. Vérifiez votre boîte mail afin de valider la vérification de votre nouvelle adresse e-mail.
       home location: "Emplacement du domicile :"
       latitude: "Latitude:"
       longitude: "Longitude:"
diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index ec4c11e9f..37307b171 100644
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -1,7 +1,23 @@
 gsw: 
   browse: 
+    changeset: 
+      changeset: "Changeset: {{id}}"
+      changesetxml: Changeset-XML
+      download: "{{changeset_xml_link}} oder {{osmchange_xml_link}} abelade"
+      feed: 
+        title: Changeset {{id}}
+        title_comment: Changeset {{id}} - {{comment}}
+      osmchangexml: osmChange XML
+      title: Changeset
     changeset_details: 
+      belongs_to: "Aagleit vu:"
+      bounding_box: "Beryych:"
+      box: Chaschte
       closed_at: "Zuegmacht am:"
+      created_at: "Aagleit am:"
+      has_nodes: 
+        one: "Do het s die {{count}} Chnote din:"
+        other: "Do het s die {{count}} Chnote din:"
       has_relations: 
         one: "Het die {{count}} Relation:"
         other: "Het die {{count}} Relatione:"
@@ -10,6 +26,20 @@ gsw:
         other: "Het die {{count}} Wäg:"
       no_bounding_box: Fir des Changeset isch kei Beryych gspycheret.
       show_area_box: Beryychsgränzen aazeige
+    changeset_navigation: 
+      all: 
+        next_tooltip: Negscht Changeset
+        prev_tooltip: Vorig Changeset
+      user: 
+        name_tooltip: Änderige vu {{user}} aazeige
+        next_tooltip: Negschti Änderig vu {{user}}
+        prev_tooltip: Vorigi Änderig vu {{user}}
+    common_details: 
+      changeset_comment: "Kommentar:"
+      edited_at: "Bearbeitet am:"
+      edited_by: "Bearbeitet vu:"
+      in_changeset: "Im Changeset:"
+      version: "Version:"
     containing_relation: 
       entry: Relation {{relation_name}}
       entry_role: Relation {{relation_name}} (as {{relation_role}})
@@ -47,6 +77,12 @@ gsw:
     paging_nav: 
       of: vu
       showing_page: Syte zeige
+    relation: 
+      download: "{{download_xml_link}} oder {{view_history_link}}"
+      download_xml: XML abelade
+      relation: Relation
+      relation_title: "Relation: {{relation_name}}"
+      view_history: Chronik aazeige
     relation_details: 
       members: "Mitglider:"
       part_of: "Mitglid vu:"
@@ -62,6 +98,8 @@ gsw:
         node: Chnote
         relation: Relation
         way: Wäg
+    start: 
+      view_data: Date vum aktuälle Chartenuusschnitt aazeige
     start_rjs: 
       data_frame_title: Date
       data_layer_name: Date
@@ -94,6 +132,8 @@ gsw:
       unable_to_load_size: "Het nit chenne glade wäre: Beryych vu dr Greßi [[bbox_size]] isch z groß (sott chleiner syy wie {{max_bbox_size}})"
       wait: E Momänt bitte ...
       zoom_or_select: Charte vergreßere oder e Beryych uf dr Charten uuswehle
+    tag_details: 
+      tags: "Tags:"
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
       download_xml: XML abelade
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 81d49eea4..439d59537 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -99,6 +99,7 @@ he:
     node: 
       download: "{{download_xml_link}} or {{view_history_link}}"
       download_xml: Download XML
+      edit: עריכה
       node: Node
       node_title: "Node: {{node_name}}"
       view_history: view history
@@ -109,9 +110,14 @@ he:
       download: "{{download_xml_link}} or {{view_details_link}}"
       download_xml: Download XML
       node_history: Node History
+      node_history_title: "היסטוריית הצומת: {{node_name}}"
       view_details: view details
     not_found: 
       sorry: Sorry, the {{type}} with the id {{id}}, could not be found.
+      type: 
+        node: צומת
+        relation: קשר
+        way: דרך
     paging_nav: 
       of: of
       showing_page: Showing page
@@ -127,6 +133,12 @@ he:
     relation_history: 
       relation_history: Relation History
       relation_history_title: "Relation History: {{relation_name}}"
+    relation_member: 
+      entry_role: "{{type}} {{name}} בתור {{role}}"
+      type: 
+        node: צומת
+        relation: קשר
+        way: דרך
     start: 
       manually_select: Manually select a different area
       view_data: View data for current map view
@@ -150,6 +162,7 @@ he:
     way: 
       download: "{{download_xml_link}} or {{view_history_link}}"
       download_xml: Download XML
+      edit: עריכה
       view_history: view history
       way: Way
       way_title: "Way: {{way_name}}"
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index b348c7016..d1dc30be5 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -29,7 +29,7 @@ hsb:
       user: 
         active: Aktiwny
         description: Wopisanje
-        display_name: Pokazowanske mjeno
+        display_name: Wužiwarske mjeno
         email: E-mejl
         languages: Rěče
         pass_crypt: Hesło
@@ -99,7 +99,7 @@ hsb:
         next_tooltip: Přichodna sadźba změnow
         prev_tooltip: Předchadna sadźba změnow
       user: 
-        name_tooltip: Změny wot wužiwarja {{user}} sej wobhladać
+        name_tooltip: Změny wot wužiwarja {{user}} pokazać
         next_tooltip: Přichodna změna wot wužiwarja {{user}}
         prev_tooltip: Předchadna změna wot wužiwarja {{user}}
     common_details: 
@@ -125,7 +125,7 @@ hsb:
       edit: wobdźěłać
       node: Suk
       node_title: "Suk: {{node_name}}"
-      view_history: historiju sej wobhladać
+      view_history: historiju pokazać
     node_details: 
       coordinates: "Koordinaty:"
       part_of: "Dźěl wot:"
@@ -134,7 +134,7 @@ hsb:
       download_xml: XML sćahnyć
       node_history: Sukata historija
       node_history_title: "Sukata historija: {{node_name}}"
-      view_details: podrobnosće sej wobhladać
+      view_details: podrobnosće pokazać
     not_found: 
       sorry: Wodaj, {{type}} z id {{id}} njebu namakany.
       type: 
@@ -150,7 +150,7 @@ hsb:
       download_xml: XML sćahnyć
       relation: Relacija
       relation_title: "Relacija: {{relation_name}}"
-      view_history: historiju sej wobhladać
+      view_history: historiju pokazać
     relation_details: 
       members: "Čłonojo:"
       part_of: "Dźěl wot:"
@@ -386,7 +386,7 @@ hsb:
     donate_link_text: Darjenje
     edit: Wobdźěłać
     edit_tooltip: Karty wobdźěłać
-    export: Eksportować
+    export: Eksport
     export_tooltip: Kartowe daty eksportować
     gps_traces: GPS-ćěrje
     gps_traces_tooltip: Ćěrje zrjadować
@@ -396,13 +396,13 @@ hsb:
     history_tooltip: Historija sadźbow změnow
     home: domoj
     home_tooltip: Domoj hić
-    inbox: póstowy kašćik ({{count}})
+    inbox: póst ({{count}})
     inbox_tooltip: 
       one: Twój póstowy kašćik 1 njepřečitanu powěsć wobsahuje
       other: Twój póstowy kašćik wobsahuje {{count}} njepřečitanych powěsćow
       zero: Twój póstowy kašćik žane njepřečitane powěsće njewobsahuje.
     intro_1: OpenStreetMap je swobodna wobdźěłujomna karta cyłeho swěta. Bu za ludźi kaž wy wutworjena.
-    intro_2: OpenStreetMap ći dowola geografiske daty na zhromadne wašnje wot něhdźe na zemi sej wobhladać, wobdźěłać a wužiwać.
+    intro_2: OpenStreetMap ći dowola geografiske daty na zhromadne wašnje wot něhdźe na zemi pokazać, wobdźěłać a wužiwać.
     intro_3: Hospodowanje OpenStreetMap so přećelnje wot {{ucl}} a {{bytemark}} podpěruje.
     log_in: přizjewić
     log_in_tooltip: Do eksistowaceho konta so přizjewić
@@ -419,17 +419,17 @@ hsb:
     sign_up: registrować
     sign_up_tooltip: Konto za wobdźěłowanje załožić
     sotm: Wopytaj konferencu OpenStreetMap, The State of the Map, 10.-12. julija 2009 w Amsterdamje!
-    tag_line: Swobodna swětowa karta wikija
-    user_diaries: Wužiwarske dźeniki
+    tag_line: Swobodna swětowa wikikarta
+    user_diaries: Dźeniki
     user_diaries_tooltip: Wužiwarske dźeniki čitać
-    view: Sej wobhladać
-    view_tooltip: Karty sej wobhladać
+    view: Karta
+    view_tooltip: Karty pokazać
     welcome_user: Witaj, {{user_link}}
     welcome_user_link_tooltip: Twoja wužiwarska strona
   map: 
     coordinates: "Koordinaty:"
     edit: Wobdźěłać
-    view: Sej wobhladać
+    view: Karta
   message: 
     delete: 
       deleted: Powěsć zničena
@@ -781,8 +781,8 @@ hsb:
       pending: NJESČINJENY
       private: PRIWATNY
       public: ZJAWNY
-      trace_details: Podrobnosće ćěrje sej wobhladać
-      view_map: Kartu sej wobhladać
+      trace_details: Podrobnosće ćěrje pokazać
+      view_map: Kartu pokazać
     trace_form: 
       description: Wopisanje
       help: Pomoc
@@ -809,7 +809,7 @@ hsb:
       edit: wobdźěłać
       edit_track: Tutu čaru wobdźěłać
       filename: "Datajowe mjeno:"
-      heading: Ćěr {{name}} sej wobhladać
+      heading: Ćěr {{name}} pokazać
       map: karta
       none: Žadyn
       owner: "Wobsedźer:"
@@ -817,7 +817,7 @@ hsb:
       points: "Dypki:"
       start_coordinates: "Startowa koordinata:"
       tags: "Atributy:"
-      title: Ćěr {{name}} sej wobhladać
+      title: Ćěr {{name}} pokazać
       trace_not_found: Ćěr njenamakana!
       uploaded: "Nahraty dnja:"
       visibility: "Widźomnosć:"
@@ -828,7 +828,7 @@ hsb:
       trackable: Čarujomny (jenož jako anonymny dźěleny, zrjadowane dypki z časowymi kołkami)
   user: 
     account: 
-      email never displayed publicly: (ženje zjawnje pokazany)
+      email never displayed publicly: (njeje ženje zjawnje widźomna)
       flash update success: Wužiwarske informacije wuspěšnje zaktualizowane.
       flash update success confirm needed: Wužiwarske informacije wuspěšnje zaktualizowane. Dóstanješ e-mejl z namołwu swoju nowu e-mejlowu adresu wobkrućić.
       home location: "Domjace stejnišćo:"
@@ -842,7 +842,7 @@ hsb:
       public editing: 
         disabled: Znjemóžnjeny a daty njehodźa so wobdźěłać, wšě prjedawše změny su anonymne.
         disabled link text: čehodla njemóžu wobdźěłać?
-        enabled: Zmóžnjeny. Nic anonymny a daty hodźa so wobdźěłać.
+        enabled: Zmóžnjene. Nic anonymne a daty hodźa so wobdźěłać.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: što to je?
         heading: "Zjawne wobdźěłowanje:"
@@ -893,7 +893,7 @@ hsb:
       confirm email address: "E-mejlowu adresu wobkrućić:"
       confirm password: "Hesło wobkrućić:"
       contact_webmaster: Prošu staj so z <a href="mailto:webmaster@openstreetmap.org">webmasterom</a> do zwiska, zo by so konto załožiło - budźemy pospytać naprašowanje tak spěšnje kaž móžno wobdźěłać.
-      display name: "Pokazowanske mjeno:"
+      display name: "Wužiwarske mjeno:"
       email address: "E-mejlowa adresa:"
       fill_form: Wupjelń formular a budźemy ći hnydom e-mejl, zo by swoje konto aktiwizował.
       flash create success message: Wužiwarske konto bu wuspěšnje załožene. W e-mejlu, kotruž dóstanješ, namakaš wobkrućenski wotkaz, a móžeš so hnydom do kartěrowanja dać :-)<br /><br />Prošu dźiwaj na to, zo njemóžeš so přizjewić, doniž njejsy swoju e-mejlowu addresu wobkrućił.<br /><br /> Jeli přećiwospamowy system wužiwaš, kotryž wobkrućenske naprašowanja sćele, da přewzmi adresu webmaster@openstreetmap.org do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske naprašowanja wotmołwić.
@@ -938,7 +938,7 @@ hsb:
       my edits: moje změny
       my settings: moje nastajenja
       my traces: moje ćěrje
-      my_oauth_details: Moje podrobnosće OAuth sej wobhladać
+      my_oauth_details: Moje podrobnosće OAuth pokazać
       nearby users: "Wužiwarjo w bliskosći:"
       new diary entry: nowy dźenikowy zapisk
       no friends: Hišće njejsy přećelow přidał.
diff --git a/config/locales/km.yml b/config/locales/km.yml
index 4046b7f1d..9f6b4aff8 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -30,6 +30,7 @@ km:
       changeset: សំនុំ​បំលាស់ប្តូរ​
       changeset_tag: ស្លាកនៃសំនុំ​បំលាស់ប្តូរ​
       country: ប្រទេស​
+      diary_comment: មតិយោបល់​នៃសៀវភៅកំណត់ហេតុ​
       friend: មិត្ត​
       language: ភាសា​
       message: សារ​
@@ -61,12 +62,15 @@ km:
         next_tooltip: កំណែប្រែ​បន្ទាប់ ដោយ {{user}}
         prev_tooltip: កំណែប្រែ​មុខ ដោយ {{user}}
     common_details: 
+      changeset_comment: មតិយោបល់​៖
       edited_at: បានកែប្រែនៅ​៖
       edited_by: បានកែប្រែដោយ​​៖
       in_changeset: ក្នុងសំនុំ​បំលាស់ប្តូរ​៖
     containing_relation: 
       entry: ទំនាក់ទំនង​ {{relation_name}}
       entry_role: ទំនាក់ទំនង {{relation_name}} (ជា {{relation_role}})
+    map: 
+      loading: កំពុងផ្ទុក​...
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} ឬ {{edit_link}}"
       download_xml: ទាញយក XML
@@ -113,6 +117,7 @@ km:
       load_data: ផ្ទុកទិន្នន័យ​
       loading: កំពុងផ្ទុក​...
       object_list: 
+        details: ព័ត៌មានលម្អិត​
         history: 
           type: 
             way: ផ្លូវ​ [[id]]
@@ -153,6 +158,7 @@ km:
     changeset_paging_nav: 
       of: នៃ​
     changesets: 
+      comment: មតិយោបល់​
       saved_at: បានរក្សាទុក​នៅ​
       user: អ្នកប្រើប្រាស់​
     list: 
@@ -168,6 +174,12 @@ km:
       title_user: សំនុំ​បំលាស់ប្តូរ​ ដោយ {{user}}
       title_user_bbox: សំនុំ​បំលាស់ប្តូរ​ ដោយ {{user}} នៅក្នុង {{bbox}}
   diary_entry: 
+    diary_comment: 
+      comment_from: មតិយោបល់​ពី​ {{link_user}} នៅ {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 មតិយោបល់​
+        other: "{{count}} មតិយោបល់​"
     edit: 
       body: តួ​សេចក្ដី​៖
       language: ភាសា​៖
@@ -175,6 +187,8 @@ km:
       subject: ប្រធានបទ​៖
       use_map_link: ប្រើផែនទី​
     view: 
+      leave_a_comment: បញ្ចេញមតិយោបល់​
+      login_to_leave_a_comment: "{{login_link}} ដើម្បីបញ្ចេញមតិយោបល់​"
       save_button: រក្សាទុក​
   export: 
     start: 
@@ -183,6 +197,7 @@ km:
       image_size: ទំហំ​រូបភាព​
       licence: អាជ្ញាបណ្ណ
       max: អតិ.
+      scale: រង្វាស់​
     start_rjs: 
       export: នាំចេញ​
       view_larger_map: មើលផែនទីធំជាងនេះ​
@@ -190,6 +205,15 @@ km:
     description: 
       types: 
         cities: ក្រុង​
+    direction: 
+      east: ទិសខាងកើត​
+      north: ទិសខាងជើង​
+      north_east: ទិសខាងជើង​ឆៀង​ខាងកើត​
+      north_west: ទិសខាងជើង​ឆៀង​ខាងលិច​
+      south: ទិសខាងត្បូង​
+      south_east: ទិសខាងត្បូង​ឆៀងខាង​កើត​
+      south_west: ទិសខាងត្បូង​ឆៀង​ខាងលិច​
+      west: ទិសខាងលិច​
     search: 
       title: 
         ca_postcode: លទ្ធផលពី <a href="http://geocoder.ca/">Geocoder.CA</a>
@@ -199,16 +223,25 @@ km:
         uk_postcode: លទ្ធផលពី <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: លទ្ធផលពី <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
+    alt_donation: ជួយ​ឧបត្ថម្ភ​
     edit: កែប្រែ​
+    edit_tooltip: កែប្រែ​ផែនទី​
     export: នាំចេញ​
     export_tooltip: នាំចេញ​ទិន្នន័យផែនទី​
+    help_wiki_tooltip: ជំនួយ &amp; តំបន់​វិគីសម្រាប់​គម្រោង​នេះ
     history: ប្រវត្តិ​
     history_tooltip: ប្រវត្តិនៃសំនុំ​បំលាស់ប្តូរ​
     home_tooltip: ទៅទីតាំងដើម​
-    intro_2: OpenStreetMap អនុញ្ញាតឲ្យអ្នក​មើល កែប្រែ និងប្រើប្រាស់ទិន្នន័យភូមិសាស្រ្ត ក្នុងភាពរួមសហការគ្នាពីគ្រប់ទិសទី​លើផែនដី​។
-    tag_line: ផែនទីពិភពលោក​វិគីសេរី (The Free Wiki World Map)
+    inbox: ប្រអប់សំបុត្រ​ ({{count}})
+    intro_2: OpenStreetMap អនុញ្ញាតឲ្យអ្នក​មើល កែប្រែ និងប្រើប្រាស់​ទិន្នន័យ​ភូមិសាស្រ្ត ក្នុងភាពរួមសហការគ្នា​ពីគ្រប់ទិសទី​លើផែនដី​។
+    log_in: ឡុកអ៊ីន​
+    logout: ចាកចេញ​
+    news_blog: ប្លក់​ព័ត៌មាន​
+    sign_up: ចុះឈ្មោះ​
+    tag_line: "ផែនទីពិភពលោក​វិគីសេរី <br/>\n(The Free Wiki World Map)"
     view: មើល​
     view_tooltip: មើលផែនទី
+    welcome_user_link_tooltip: ទំព័រអ្នកប្រើប្រាស់​របស់អ្នក​
   map: 
     edit: កែប្រែ​
     view: មើល​
@@ -218,19 +251,24 @@ km:
       from: ពី​
       subject: ប្រធានបទ​
     new: 
+      back_to_inbox: ត្រឡប់ទៅប្រអប់សំបុត្រ​
+      send_button: ផ្ញើ​
       subject: ប្រធានបទ​
     outbox: 
       date: កាលបរិច្ឆេទ​
       subject: ប្រធានបទ​
+      to: ទៅ​
     read: 
+      back_to_inbox: ត្រឡប់ទៅ​ប្រអប់សំបុត្រ​
       date: កាលបរិច្ឆេទ​
       from: ពី​
       subject: ប្រធានបទ​
+      to: ទៅ​
   notifier: 
     diary_comment_notification: 
       hi: សួស្ដី {{to_user}},
     email_confirm: 
-      subject: "[OpenStreetMap] បញ្ជាក់​អាសយដ្ឋាន​អ៊ីម៉ែលរបស់អ្នក​"
+      subject: "[OpenStreetMap] បញ្ជាក់​អាសយដ្ឋាន​អ៊ីមែលរបស់អ្នក​"
     email_confirm_html: 
       greeting: សួស្ដី​,
     email_confirm_plain: 
@@ -251,7 +289,7 @@ km:
       hi: សួស្ដី {{to_user}},
       subject: "[OpenStreetMap] {{user}} បានផ្ញើសារថ្មីមួយ​មកអ្នក​"
     signup_confirm: 
-      subject: "[OpenStreetMap] បញ្ជាក់​អាសយដ្ឋាន​អ៊ីម៉ែលរបស់អ្នក​"
+      subject: "[OpenStreetMap] បញ្ជាក់​អាសយដ្ឋាន​អ៊ីមែលរបស់អ្នក​"
     signup_confirm_html: 
       greeting: សួស្ដី!
       video_to_openstreetmap: វិដេអូណែនាំអំពី OpenStreetMap
@@ -263,6 +301,7 @@ km:
       title: កែប្រែ​ទំរង់បែបបទរបស់អ្នក​
     form: 
       allow_write_api: កែសម្រួលផែនទី​
+      name: ឈ្មោះ​
     new: 
       submit: ចុះឈ្មោះ​
     show: 
@@ -272,6 +311,19 @@ km:
     edit: 
       not_public: អ្នកមិនបានកំណត់​កំណែប្រែរបស់អ្នកជាសាធារណៈ​។
       user_page_link: ទំព័រអ្នកប្រើប្រាស់​
+    key: 
+      table: 
+        entry: 
+          centre: មជ្ឈមណ្ឌល​កីឡា​
+          farm: កសិដ្ឋាន​
+          forest: ព្រៃឈើ​
+          industrial: តំបន់ឧស្សាហកម្ម​
+          park: ឧទ្យាន​
+          school: 
+            - សាលារៀន​
+            - សាកលវិទ្យាល័យ​
+          station: ស្ថានីយរថភ្លើង​
+          tourist: តំបន់ទេសចរណ៍​
     search: 
       search: ស្វែងរក​
       submit_text: ទៅ​
@@ -289,6 +341,7 @@ km:
       save_button: រក្សាទុក​បំលាស់ប្តូរនានា​
       tags: ស្លាក​៖
       uploaded_at: បានផ្ទុកឡើង​នៅ​៖
+      visibility_help: តើនេះមានន័យ​ដូចម្ដេច​​?
     list: 
       tagged_with: "  បានដាកស្លាកជា {{tags}}"
     no_such_user: 
@@ -306,9 +359,11 @@ km:
       view_map: មើលផែនទី​
     trace_form: 
       description: បរិយាយ​
+      help: ជំនួយ​
       tags: ស្លាក​
       upload_button: ផ្ទុកឡើង​
       upload_gpx: ផ្ទុកឡើង​ឯកសារ GPX
+      visibility_help: តើនេះមានន័យ​ដូចម្ដេច​?
     trace_optionals: 
       tags: ស្លាក​
     trace_paging_nav: 
@@ -336,8 +391,15 @@ km:
       heading: បញ្ជាក់គណនីអ្នកប្រើប្រាស់​
     confirm_email: 
       button: បញ្ជាក់​
+      heading: បញ្ជាក់ការផ្លាស់ប្ដូរ​អាសយដ្ឋានអ៊ីមែល
+      press confirm button: ចុចលើប៉ូតុងខាងក្រោមដើម្បីបញ្ជាក់អាសយដ្ឋានអ៊ីមែលថ្មីរបស់អ្នក​។
+      success: បានបញ្ជាក់អាសយដ្ឋានអ៊ីមែលរបស់អ្នករូចរាល់ហើយ សូមអរគុណចំពោះការចុះឈ្មោះ​!
     login: 
       email or username: អាសយដ្ឋានអ៊ីមែល ឬឈ្មោះអ្នកប្រើប្រាស់​៖
+      heading: ឡុកអ៊ីន​
+      login_button: ឡុកអ៊ីន​
+      please login: សូម ឡុកអ៊ីន​ ឬ {{create_user_link}} ។
+      title: ឡុកអ៊ីន​
     make_friend: 
       already_a_friend: អ្នកគឺជាមិត្តជាមួយ {{name}} រួចហើយ​។
       failed: អភ័យទោស, បរាជ័យក្នុងការបន្ដែម {{name}} ជាមិត្ត​។
diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index d1e8fae32..eef1ed3ce 100644
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -40,6 +40,11 @@ nds:
       belongs_to: "Höört to:"
       closed_at: "Slaten an’n:"
       created_at: "Opstellt an’n:"
+    changeset_navigation: 
+      user: 
+        name_tooltip: Ännern von {{user}} ankieken
+        next_tooltip: Tokamen Ännern von {{user}}
+        prev_tooltip: Vörig Ännern von {{user}}
     common_details: 
       changeset_comment: "Kommentar:"
       edited_at: "Ännert an’n:"
@@ -47,9 +52,14 @@ nds:
       version: "Version:"
     map: 
       deleted: Wegdaan
+      larger: 
+        way: Weg op en grötter Koort ankieken
       loading: Laden...
     node: 
+      download_xml: XML dalladen
       edit: ännern
+      node: Knütt
+      node_title: "Knütt: {{node_name}}"
       view_history: Geschicht wiesen
     node_details: 
       coordinates: "Koordinaten:"
@@ -59,6 +69,7 @@ nds:
       view_details: Details wiesen
     not_found: 
       type: 
+        node: Knütt
         way: Weg
     paging_nav: 
       of: von
@@ -73,29 +84,49 @@ nds:
       download_xml: XML dalladen
       view_details: Details wiesen
     relation_member: 
+      entry_role: "{{type}} {{name}} as {{role}}"
       type: 
+        node: Knütt
         way: Weg
     start_rjs: 
       data_frame_title: Daten
       data_layer_name: Daten
       details: Details
+      history_for_feature: Geschicht för [[feature]]
+      loading: An’t Laden...
       object_list: 
         details: Details
         heading: Objektlist
+        history: 
+          type: 
+            node: Knütt [[id]]
+            way: Weg [[id]]
+        selected: 
+          type: 
+            node: Knütt [[id]]
+            way: Weg [[id]]
         type: 
+          node: Knütt
           way: Weg
       private_user: anonym Bruker
       show_history: Geschicht wiesen
       wait: Tööv en Stoot...
     way: 
+      download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
       download_xml: XML dalladen
       edit: ännern
       view_history: Geschicht wiesen
       way: Weg
+      way_title: "Weg: {{way_name}}"
     way_details: 
+      nodes: "Knütten:"
       part_of: "Deel von:"
+    way_history: 
+      download_xml: XML dalladen
+      view_details: Details ankieken
   changeset: 
     changeset: 
+      anonymous: Anonym
       big_area: (groot)
       no_comment: (keen)
       no_edits: (keen Ännern)
@@ -104,7 +135,9 @@ nds:
       of: von
       showing_page: an’t Sied weddergeven
     changesets: 
+      area: Rebeed
       comment: Kommentar
+      id: ID
       saved_at: Spiekert an’n
       user: Bruker
   diary_entry: 
@@ -112,12 +145,14 @@ nds:
       comment_count: 
         one: 1 Kommentar
         other: "{{count}} Kommentare"
+      comment_link: Kommentar op dissen Indrag
       edit_link: Dissen Indrag ännern
     edit: 
       language: "Spraak:"
       latitude: "Bredengraad:"
       location: "Oort:"
       longitude: "Längengraad:"
+      marker_text: Oort von’n Indrag
       save_button: Spiekern
       title: Dagbook-Indrag ännern
       use_map_link: Koort bruken
@@ -133,21 +168,30 @@ nds:
       user_title: "{{user}} sien Dagbook"
     new: 
       title: Ne’en Dagbook-Indrag
+    no_such_entry: 
+      heading: Keen Indrag mit de Nummer {{id}}
+    no_such_user: 
+      title: Bruker nich funnen
     view: 
       leave_a_comment: Kommentar schrieven
       login: Anmellen
       save_button: Spiekern
       title: Bruker-Dagbook | {{user}}
+      user_title: "{{user}} sien Dagbook"
   export: 
     start: 
+      add_marker: Sett en Markteken op de Koort
       export_button: Export
       format: Format
       image_size: Bildgrött
       latitude: "Breed:"
+      licence: Lizenz
       longitude: "Läng:"
       mapnik_image: Mapnik-Bild
       max: max.
+      osmarender_image: Osmarender-Bild
       output: Utgaav
+      scale: Skaal
       zoom: Zoom
     start_rjs: 
       export: Export
@@ -173,9 +217,15 @@ nds:
       one: üm un bi 1 km
       other: üm un bi {{count}} km
       zero: ünner 1 km
+    results: 
+      no_results: nix funnen
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} von {{placename}}"
   layouts: 
     alt_donation: Spenn wat
     donate_link_text: Spennen
+    edit: Ännern
     export: Export
     export_tooltip: Koortendaten exporteren
     help_wiki: Hülp & Wiki
@@ -192,6 +242,8 @@ nds:
     sign_up: Nee Brukerkonto opstellen
     user_diaries: Bruker-Dagböker
     user_diaries_tooltip: Bruker-Dagböker wiesen
+    view: ankieken
+    view_tooltip: Koorten ankieken
     welcome_user: Willkamen, {{user_link}}
     welcome_user_link_tooltip: Dien Brukersied
   map: 
@@ -222,6 +274,7 @@ nds:
       my_inbox: Mien {{inbox_link}}
       subject: Thema
       title: Postfack Utgang
+      to: An
     read: 
       date: Datum
       reply_button: Antern
@@ -264,12 +317,14 @@ nds:
       permalink: Permalink
       shortlink: Kortlink
     key: 
+      map_key: Legenn
       table: 
         entry: 
           admin: Grenz
           allotments: Schrebergoorns
           apron: 
             - Terminal
+            - Terminal
           bridge: Fett Rand = Brügg
           bridleway: Riedpadd
           brownfield: Industrie-Braakland
@@ -283,6 +338,7 @@ nds:
           commercial: Hannelsrebeed
           common: 
             - Wisch
+            - Wisch
           construction: Straat, an de noch boot warrt
           cycleway: Fohrradpadd
           farm: Buurnhoff
@@ -335,13 +391,18 @@ nds:
       close: Sluten
   trace: 
     edit: 
+      description: "Beschrieven:"
       download: dalladen
       edit: ännern
       filename: "Dateinaam:"
       map: Koort
       owner: "Besitter:"
       save_button: Ännern spiekern
+      start_coord: "Startkoordinaat:"
+      tags_help: dör Kommas trennt
+      uploaded_at: "Hoochladen an’n:"
       visibility: "Sichtborkeit:"
+      visibility_help: wat bedüüdt dat?
     no_such_user: 
       title: gifft den Bruker nich
     trace: 
@@ -351,25 +412,32 @@ nds:
       in: in
       map: Koort
       more: mehr
+      private: PRIVAAT
+      public: APEN
+      view_map: Koort ankieken
     trace_form: 
       description: Beschrieven
       help: Hülp
       upload_button: Hoochladen
       upload_gpx: GPX-Datei hoochladen
+      visibility: Sichtborkeit
     trace_paging_nav: 
       of: von
     view: 
+      description: "Beschrieven:"
       download: dalladen
       edit: ännern
       filename: "Dateinaam:"
       map: Koort
       none: Keen
       owner: "Besitter:"
+      visibility: "Sichtborkeit:"
   user: 
     account: 
       email never displayed publicly: (nich apen wiesen)
       latitude: "Bredengraad:"
       longitude: "Längengraad:"
+      make edits public button: All mien Ännern apen wiesen
       no home location: Du hest dien Standoort nich angeven.
       public editing: 
         disabled link text: Worüm kann ik nix ännern?
@@ -382,13 +450,17 @@ nds:
       your location: Dien Standoort
     login: 
       create_account: Brukerkonto opstellen
+      email or username: "E-Mail-Adress oder Brukernaam:"
       heading: Anmellen
       login_button: Anmellen
+      lost password link: Passwoord vergeten?
       password: "Passwoord:"
       title: Anmellen
     lost_password: 
       email address: "E-Mail-Adress:"
+      heading: Passwoord vergeten?
       new password button: Passwoord trüchsetten
+      title: Passwoord vergeten
     make_friend: 
       already_a_friend: "{{name}} is al dien Fründ."
       failed: Dat hett nich klappt,  {{name}} as Fründ totofögen.
@@ -400,11 +472,15 @@ nds:
       password: "Passwoord:"
       signup: Brukerkonto opstellen
       title: Brukerkonto opstellen
+    no_such_user: 
+      heading: Den Bruker {{user}} gifft dat nich
+      title: Bruker nich funnen
     remove_friend: 
       not_a_friend: "{{name}} is keen von dien Frünn."
       success: "{{name}} is rutnahmen bi de Frünn."
     reset_password: 
       flash changed: Dien Passwoord is nu ännert.
+      heading: Passwoord för {{user}} trüchsetten
       password: "Passwoord:"
       reset: Passwoord trüchsetten
       title: Passwoord trüchsetten
@@ -425,7 +501,9 @@ nds:
       my edits: mien Ännern
       nearby users: "Brukers in de Neegd:"
       new diary entry: Nee Dagbook-Indrag
+      no home location: Keen Standoort angeven.
       remove as friend: as Fründ rutnehmen
       send message: Naricht sennen
+      upload an image: Bild hoochladen
       user image heading: Brukerbild
       your friends: Dien Frünn
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 79dc603be..e7df3b6bf 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -87,6 +87,7 @@ nl:
         one: "Heeft de volgende node:"
         other: "Heeft de volgende {{count}} nodes:"
       has_relations: 
+        one: "Heeft de volgende relatie:"
         other: "Heeft de volgende {{count}} relaties:"
       has_ways: "Bevat de volgende {{count}} ways:"
       no_bounding_box: Er is geen selectiekader opgeslagen voor deze set wijzigingen.
@@ -543,6 +544,7 @@ nl:
       more_videos: Er zijn {{more_videos_link}}.
       more_videos_here: Er zijn nog meer video's
       user_wiki_page: We adviseren u een gebruikerspagina aan te maken met onder andere categorieën die aangeven waar u verblijft, zoals <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Amsterdam">[[Category:Users_in_Amsterdam]]</a>.
+      video_to_openstreetmap: introductievideo over OpenStreetMap bekijken
       wiki_signup: U kunt je ook <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">registreren op de OpenStreetMap-wiki</a>.
     signup_confirm_plain: 
       click_the_link_1: Als u dat bent, welkom! Volg de verwijzing hieronder om uw gebruiker te bevestigen
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 82a1e543b..ecc7c7dff 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -87,6 +87,7 @@ ru:
         one: "Имеет следующий {{count}} узел:"
         other: "Имеет следующие {{count}} узлов:"
       has_relations: 
+        one: "Имеет следующие {{count}} отношение:"
         other: "Имеет следующие {{count}} отношений:"
       has_ways: "Содержит {{count}} линий:"
       no_bounding_box: Для этого набора изменений границы не установлены.
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 1c67b0143..88aa83eac 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -112,6 +112,8 @@ sv:
       coordinates: "Koordinater:"
       part_of: "Del av:"
     node_history: 
+      download: "{{download_xml_link}} eller {{view_details_link}}"
+      download_xml: Ladda ner XML
       node_history: Nodhistorik
       node_history_title: "Nodhistorik: {{node_name}}"
       view_details: se detaljer
@@ -122,6 +124,9 @@ sv:
         node: nod
         relation: relation
         way: way
+    paging_nav: 
+      of: av
+      showing_page: Visar sida
     relation: 
       download: "{{download_xml_link}} eller {{view_history_link}}"
       relation_title: "Relation: {{relation_name}}"
@@ -130,11 +135,14 @@ sv:
     relation_history: 
       download_xml: Ladda hem XML
       relation_history: Relationhistorik
+      relation_history_title: "Relations historia: {{relation_name}}"
       view_details: se detaljer
     relation_member: 
+      entry_role: "{{type}} {{name}} som {{role}}"
       type: 
         node: Nod
         relation: Relation
+        way: Väg
     start_rjs: 
       data_layer_name: Data
       details: Detaljer
@@ -214,3 +222,6 @@ sv:
       private: Privat (spåret delas anonymt och utan ordning)
       public: Publik (Visas i GPS spår listan och som anonyma punkter utan ordning)
       trackable: Spårbar (delas bara som anonyma ordnade punker med tidsstämpel)
+  user: 
+    account: 
+      home location: "Hem position:"