Merging 17846:17904 from trunk.

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,23 @@ af:
     changeset_details: 
       belongs_to: "Behoort aan:"
       box: boks
+      closed_at: "Gesluit op:"
       created_at: "Geskep op:"
+      has_nodes: 
+        one: "Het die volgende node:"
+        other: "Het die volgende {{count}} nodes:"
+    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}}
@@ -51,8 +80,6 @@ af:
       download: "{{download_xml_link}}, {{view_history_link}} of {{edit_link}}"
       download_xml: Laai XML af
       edit: wysig
-      node: Node
-      node_title: "Node: {{node_name}}"
       view_history: besigtig geskiedenis
     node_details: 
       coordinates: "Koördinate:"
@@ -67,13 +94,13 @@ af:
       sorry: Jammer, {{type}} {{id}} kan nie gevind word nie.
       type: 
         changeset: Veranderingstel
-        node: node
         relation: relasie
         way: weg
     paging_nav: 
       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: 
@@ -86,20 +113,17 @@ af:
       relation_history_title: "Relasie Geskiedenis: {{relation_name}}"
       view_details: besigtig besonderhede
     relation_member: 
-      entry_role: "{{type}} {{name}} as {{role}}"
       type: 
-        node: Node
         relation: Relasie
         way: Weg
     start_rjs: 
       data_frame_title: Gegewens
-      data_layer_name: Data
-      details: Details
       edited_by_user_at_timestamp: Verander deur [[user]] om [[timestamp]]
       history_for_feature: Geskiedenis van [[feature]]
       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
@@ -107,14 +131,11 @@ af:
         heading: Objeklys
         history: 
           type: 
-            node: Node [[id]]
             way: Weg [[id]]
         selected: 
           type: 
-            node: Node [[id]]
             way: Weg [[id]]
         type: 
-          node: Node
           way: Weg
       private_user: private gebruiker
       show_history: Wys Geskiedenis
@@ -131,7 +152,6 @@ af:
       also_part_of: 
         one: ook deel van weg {{related_ways}}
         other: ook deel van weë {{related_ways}}
-      nodes: "Nodes:"
       part_of: "Deel van:"
     way_history: 
       download: "{{download_xml_link}} of {{view_details_link}}"
@@ -141,71 +161,194 @@ 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"
+      comment_link: Lewer kommentaar op hierdie bydrae
+      edit_link: Wysig hierdie inskrywing
+      reply_link: Antwoord op hierdie bydrae
     edit: 
+      body: "Teks:"
       language: "Taal:"
       latitude: "Breedtegraad:"
+      location: "Ligging:"
       longitude: "Lengtegraad:"
+      marker_text: Ligging van dagboekinskrywing
       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: 
+      leave_a_comment: Los opmerking agter
       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: 
+      add_marker: Plaas 'n merker op die kaart
+      area_to_export: Area om te eksporteer
+      embeddable_html: HTML-kode
+      export_button: Eksporteer
+      format: Formaat
+      image_size: Prentgrootte
+      latitude: "Breedte:"
       licence: Lisensie
-      max: max
+      longitude: "Lengte:"
+      manually_select: Kies 'n ander gebied handmatig
+      options: Voorkeure
+      osm_xml_data: OpenStreetMap XML-data
+      output: Afvoer
+      scale: Skaal
     start_rjs: 
+      add_marker: Plaas 'n merker op die kaart
+      change_marker: Verander posisie van merker
       export: Eksporteer
+      manually_select: Kies 'n ander gebied handmatig
+      view_larger_map: Wys groter kaart
   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_tooltip: Help en wiki vir die projek
     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
+    log_in_tooltip: Teken aan met 'n bestaande rekening
+    logout: teken uit
     logout_tooltip: Teken uit
+    news_blog: Nuusjoernale
+    shop: Winkel
+    sign_up: registreer
+    sign_up_tooltip: Skep 'n rekening vir wysigings
+    user_diaries: Gebruikersdagboeke
+    user_diaries_tooltip: Wys gebruikersdagboeke
+    view: Wys
+    view_tooltip: Wys kaarte
+    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
+      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 +356,105 @@ 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: 
+    oauthorize: 
+      allow_read_prefs: u gebruikersvoorkeure te lees.
+      allow_write_api: die kaart te wysig.
   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
+            - weide
+          construction: Paaie onder konstruksie
+          cycleway: Fietspad
           farm: Plaas
+          footway: Voetpad
           forest: Bos
           golf: Gholfbaan
-          park: Park
+          heathland: Heide
+          lake: 
+            - Meer
+            - reservoir
+          military: Militêre gebied
+          motorway: Snelweg
+          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
+          unclassified: Ongeklassifiseerde pad
+          unsurfaced: Grondpad
           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 +464,142 @@ 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:"
+      download: laai af
       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:"
+      make edits public button: Maak al my wysigings openbaar
       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 text: wat is dit?
+      return to profile: Terug na profiel
       save changes button: Stoor wysigings
+      title: Wysig rekening
+    confirm: 
+      button: Bevestig
+      heading: Bevestig 'n gebruiker se rekening
     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:"
+      heading: Wagwoord vergeet?
+      new password button: Herstel wagwoord
+      notice email cannot find: Kon nie die e-posadres vind nie, jammer.
+      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:"
+      display name: "Vertoon naam:"
+      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
+    set_home: 
+      flash success: U tuisligging is suksesvol gebêre
     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
+      send message: stuur boodskap
       settings_link_text: voorkeure
+      traces: spore
+      user image heading: Foto van gebruiker
+      user location: Ligging van gebruiker
+      your friends: U vriende

config/locales/be-TARASK.yml

@@ -17,6 +17,7 @@ be-TARASK:
       country: Краіна
       language: Мова
       node: Вузел
+      session: Сэсыя
       way: Шлях
   browse: 
     common_details: 
@@ -51,6 +52,8 @@ be-TARASK:
         relation: Адносіны
         way: Шлях
     start_rjs: 
+      data_frame_title: Зьвесткі
+      data_layer_name: Зьвесткі
       details: Падрабязнасьці
       loading: Загрузка…
       object_list: 
@@ -102,11 +105,13 @@ be-TARASK:
       subject: Тэма
     message_summary: 
       delete_button: Выдаліць
+      reply_button: Адказаць
     new: 
       subject: Тэма
     outbox: 
       subject: Тэма
     read: 
+      reply_button: Адказаць
       subject: Тэма
     sent_message_summary: 
       delete_button: Выдаліць
@@ -116,13 +121,22 @@ be-TARASK:
   trace: 
     edit: 
       description: "Апісаньне:"
+      download: загрузіць
+      edit: рэдагаваць
       filename: "Назва файла:"
+      map: мапа
       save_button: Захаваць зьмены
+    trace: 
+      edit: рэдагаваць
+      map: мапа
     trace_form: 
       description: Апісаньне
     view: 
       description: "Апісаньне:"
+      download: загрузіць
+      edit: рэдагаваць
       filename: "Назва файла:"
+      map: мапа
   user: 
     account: 
       latitude: "Шырата:"

config/locales/be.yml

@@ -30,7 +30,6 @@ be:
         active: Актыўны
         description: Апісанне
         display_name: Бачнае імя
-        email: Email
         languages: Мовы
         pass_crypt: Пароль
     models: 
@@ -70,9 +69,7 @@ be:
   browse: 
     changeset: 
       changeset: "Набор зменаў:"
-      changesetxml: Changeset XML
       download: Сцягнуць {{changeset_xml_link}} ці {{osmchange_xml_link}}
-      osmchangexml: osmChange XML
       title: Набор зменаў
     changeset_details: 
       belongs_to: "Належыць:"
@@ -194,7 +191,6 @@ be:
     changesets: 
       area: Мясцовасць
       comment: Каментар
-      id: ID
       saved_at: Запісаны
       user: Карыстальнік
   diary_entry: 
@@ -472,18 +468,13 @@ be:
       wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=RU%3AMain_Page
   site: 
     edit: 
-      anon_edits_link_text: Find out why this is the case.
-      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
       not_public: Вы не дазволілі зрабіць усе вашыя змены публічнымі.
-      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current шлях ці point, if editing in list mode, ці click save if you have a save button.)
-      user_page_link: user page
     index: 
-      js_1: Вы карыстаецеся вандроўнікам без падтрымкі javascript.
-      js_2: OpenStreetMap выкарыстоўвае javascript для адлюстравання карты на сайце.
-      js_3: Вы можаце паспрабаваць выкарыстаць <a href="http://tah.openstreetmap.org/Browse/">статычны агляд Tiles@Home</a> калі не можаце уключыць javascript.
+      js_1: Вы карыстаецеся вандроўнікам без падтрымкі JavaScript.
+      js_2: OpenStreetMap выкарыстоўвае JavaScript для адлюстравання карты на сайце.
+      js_3: Вы можаце паспрабаваць выкарыстаць <a href="http://tah.openstreetmap.org/Browse/">статычны агляд Tiles@Home</a> калі не можаце уключыць JavaScript.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: Ліцэнзіруецца на ўмовах {{license_name}} праектам {{project_name}} і яго карыстальнікамі.
         project_name: OpenStreetMap
       permalink: Спасылка сюды
@@ -495,9 +486,6 @@ be:
       search_help: "напрыклад: 'Мінск', 'Regent Street, Cambridge', 'CB2 5AQ', ці 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>больш прыкладаў...</a>"
       submit_text: =>
       where_am_i: Дзе я?
-    sidebar: 
-      close: Close
-      search_results: Search Results
   trace: 
     create: 
       trace_uploaded: Ваш GPX-файл быў зацягнуты і чакае ўстаўкі ў базу дадзеных. Гэта звычайна робіцца не больш за паўгадзіны. Вы атрымаеце працврджанне аб заканчэнні працэсу па электроннай пошце

config/locales/br.yml

@@ -34,10 +34,12 @@ br:
         languages: Yezhoù
         pass_crypt: Ger-tremen
     models: 
+      acl: Roll kontroll moned
       changeset: Strollad kemmoù
       changeset_tag: Balizenn strollad kemmoù
       country: Bro
       diary_comment: Addispleg eus an deizlevr
+      diary_entry: Enmoned en deizlevr
       friend: Mignon
       language: Yezh
       message: Kemennadenn
@@ -46,10 +48,19 @@ br:
       notifier: Kemenn
       old_node: Skoulm kozh
       old_node_tag: balizenn ar skoulm kozh
+      old_relation: Darempred kozh
+      old_relation_member: Ezel darempred kozh
+      old_relation_tag: Balizenn darempred kozh
       old_way: Hent kozh
+      old_way_node: Skoulm an hent kozh
       old_way_tag: Balizenn an hent kozh
       relation: Darempred
+      relation_member: Ezel an 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,16 +71,27 @@ 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}}
-      osmchangexml: osmChange XML
       title: Strollad kemmoù
     changeset_details: 
       belongs_to: "Zo da :"
+      bounding_box: "Boest bevenniñ :"
       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ñ :"
+      no_bounding_box: N'eus bet stoket boest bevenniñ ebet evit ar strollad kemmoù-mañ.
       show_area_box: Diskouez boest an takad
     changeset_navigation: 
       all: 
@@ -77,6 +99,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 :"
@@ -111,6 +135,7 @@ br:
       node_history_title: "Istor ar skoulm : {{node_name}}"
       view_details: gwelet ar munudoù
     not_found: 
+      sorry: Ho tigarez, an {{type}} gant an id {{id}} n'eo ket bet kavet.
       type: 
         changeset: strollad kemmoù
         node: skoulm
@@ -135,19 +160,23 @@ 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ù
+      loaded_an_area_with_num_features: Karget hoc'h eus un takad zo ennañ [[num_features]] elfenn. Peurliesañ o devez poan ar merdeerioù o tiskwel kemend-all a roadennoù, ha labourat a reont gwelloc'h pa vez nebeutoc'h a 100 elfenn da ziskwel, a-hend-all e c'hall ho merdeer bezañ gorrek pe chom hep respont. Ma'z oc'h sur hoc'h eus c'hoant da ziskwel ar roadennoù-mañ, e c'hallit ober dre glikañ war ar bouton amañ dindan.
       loading: O kargañ...
       manually_select: Diuzañ un takad disheñvel gant an dorn
       object_list: 
@@ -168,6 +197,7 @@ br:
           way: Hent
       private_user: implijer prevez
       show_history: Diskouez an istor
+      unable_to_load_size: "Ne c'haller ket kargañ : re vras eo ment ar voest bevenniñ ([[bbox_size]]). Ret eo dezhi bezañ bihanoc'h eget {{max_bbox_size}})"
       wait: Gortozit...
       zoom_or_select: Zoumañ pe diuzañ un takad eus ar gartenn da welet
     tag_details: 
@@ -180,6 +210,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: 
@@ -194,14 +227,15 @@ br:
       big_area: (bras)
       no_comment: (hini ebet)
       no_edits: (aozadenn ebet)
+      show_area_box: diskouez takad ar voest
       still_editing: (oc'h aozañ c'hoazh)
       view_changeset_details: Gwelet munudoù ar strollad kemmoù
     changeset_paging_nav: 
       of: eus
+      showing_page: O tiskouez ar bajenn
     changesets: 
       area: Takad
       comment: Addispleg
-      id: ID
       saved_at: Enrollet da
       user: Implijer
     list: 
@@ -218,28 +252,71 @@ br:
       title_user: Strolladoù kemmoù gant {{user}}
       title_user_bbox: Strolladoù kemmoù gant {{user}} e-barzh {{bbox}}
   diary_entry: 
+    diary_comment: 
+      comment_from: Addispleg gant {{link_user}}  d'an {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 addispleg
+        other: "{{count}} addispleg"
+      comment_link: Addisplegañ an enmoned-mañ
+      edit_link: Aozañ an enmoned-mañ
+      posted_by: Postet gant {{link_user}} da {{created}} e {{language_link}}
+      reply_link: Respont d'an enmoned-mañ
     edit: 
       body: "Korf :"
       language: "Yezh :"
       latitude: Ledred
       location: "Lec'hiadur :"
       longitude: "Hedred :"
+      marker_text: Lec'hiadur an enmoned en deizlevr
       save_button: Enrollañ
       subject: "Danvez :"
+      title: Aozañ an enmoned en deizlevr
       use_map_link: implijout ar gartenn
+    feed: 
+      all: 
+        description: Enmonedoù nevez en deizlevr gant implijerien eus OpenStreetMap
+        title: Enmonedoù en deizlevr OpenStreetMap
+      language: 
+        description: Enmonedoù nevez a-walc'h e deizlevr implijerien OpenStreetMap e {{language_name}}
+        title: Enmonedoù deizlevr OpenStreetMap e {{language_name}}
+      user: 
+        description: Enmonedoù nevez e deizlevr OpenStreetMap gant {{user}}
+        title: Enmonedoù deizlevr OpenStreetMap evit {{user}}
     list: 
+      in_language_title: Enmonedoù en deizlevr e {{language}}
+      new: Enmoned nevez en deizlevr
+      new_title: Ouzhpennañ un enmoned nevez d'ho teizlevr
+      newer_entries: Enmonedoù nevesañ
+      no_entries: Enmoned ebet en ho teizlevr
+      older_entries: Enmonedoù koshañ
+      recent_entries: "Enmonedoù nevez en deizlevr :"
       title: Deizlevrioù an implijerien
       user_title: Deizlevr {{user}}
+    new: 
+      title: Enmoned nevez en deizlevr
+    no_such_entry: 
+      body: Ho tigarez, n'eus enmoned deizlevr ebet nag addsiqpleg ebet gant an id {{id}}. Gwiriit hag-eñ eo skrivet mat, pe marteze hoc'h eus kliket war ul liamm fall.
+      heading: "Enmoned ebet gant an id : {{id}}"
+      title: Enmoned ebet evel-se en deizlevr
     no_such_user: 
+      body: Ho tigarez, n'eus implijer ebet en anv {{user}}. Gwiriit hag-eñ eo skrivet mat, pe marteze hoc'h eus kliket war ul liamm fall.
+      heading: N'eus ket eus an implijer {{user}}
       title: N'eus implijer ebet evel-se
     view: 
+      leave_a_comment: Lezel un addispleg
+      login: Kevreañ
+      login_to_leave_a_comment: "{{login_link}} evit lezel un addispleg"
       save_button: Enrollañ
+      title: Deizlevrioù an implijerien | {{user}}
       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ñ
+      export_details: Roadennoù OpenStreetMap zo dindan an aotre-implijout <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
       format: Furmad
       format_to_export: Furmad da ezporzhiañ
       image_size: Ment ar skeudenn
@@ -252,16 +329,23 @@ br:
       options: Dibarzhioù
       osm_xml_data: Roadennoù XML OpenStreetMap
       osmarender_image: Skeudenn Osmarender
+      output: Er-maez
+      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
+      drag_a_box: Tresañ ur voest war ar gartenn evit diuzañ un takad
       export: Ezporzhiañ
       manually_select: Diuzañ un takad disheñvel gant an dorn
       view_larger_map: Gwelet ur gartenn vrasoc'h
   geocoder: 
     description: 
+      title: 
+        geonames: Lec'hiadur diwar <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} diwar <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
       types: 
         cities: Keodedoù
         places: Lec'hioù
@@ -286,26 +370,56 @@ 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>
+        uk_postcode: Disoc'hoù diwar <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Disoc'hoù diwar <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} eus {{parentname}})"
+      suffix_place: " {{distance}} {{direction}} diouzh {{placename}}"
   layouts: 
     alt_donation: Ober un donezon
+    donate: Skoazellit OpenStreetMap dre {{link}} d'an Hardware Upgrade Fund.
     donate_link_text: oc'h ober un donezon
     edit: Aozañ
     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
     history_tooltip: Istor ar strollad kemmoù
     home: degemer
+    home_tooltip: Mont da lec'h ar gêr
     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
+    intro_1: OpenStreetMap zo ur gartenn digoust eus ar bed a-bezh, a c'haller kemmañ. Graet eo gant tud eveldoc'h.
+    intro_2: Gant OpenStreetMap e c'hallit gwelet, aozañ hag implijout roadennoù douaroniel eus forzh pelec'h er bed.
+    intro_3: Herberc'hiet eo OpenStreetMap gant {{ucl}} et {{bytemark}}.
+    log_in: kevreañ
+    log_in_tooltip: Kevreañ gant ur gont zo anezhi dija
+    logo: 
+      alt_text: Logo OpenStreetMap
+    logout: digevreañ
+    logout_tooltip: Digevreañ
+    news_blog: Blog keleier
+    news_blog_tooltip: Blog keleier diwar-benn OpenStreetMap, roadennoù douaroniel digoust, hag all.
+    osm_offline: Ezlinenn eo diaz roadennoù OpenStreetMap evit bremañ e-pad ma pleder gant ul labour kempenn bras.
+    osm_read_only: Diaz roadennoù OpenStreetMap zo da lenn hepken evit bremañ evit bremañ abalamour da labourioù kempenn bras.
     shop: Stal
+    shop_tooltip: Stal gant produioù OpenStreetMap
+    sign_up: En em enskrivañ
     sign_up_tooltip: Krouiñ ur gont evit aozañ
+    sotm: Deuit da gendiviz 2009 OpenStreetMap, <a href="http://www.stateofthemap.org">The State of the Map</a>, 10-12 a viz Gouere en Amsterdam!
+    tag_line: Kartenn digoust eus ar bed Wiki
     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}}
@@ -315,13 +429,18 @@ br:
     edit: Aozañ
     view: Gwelet
   message: 
+    delete: 
+      deleted: Kemennadenn dilamet
     inbox: 
       date: Deiziad
       from: A-berzh
       my_inbox: Ma boest resev
+      no_messages_yet: N'hoc'h eus kemennadenn ebet c'hoazh. Ha ma'z afec'h e darempred gant darn eus an {{people_mapping_nearby_link}}?
       outbox: boest kas
+      people_mapping_nearby: tud o kartennañ en ardremez
       subject: Danvez
       title: Boest resev
+      you_have: Bez' hoc'h eus {{new_count}} kemennadenn nevez ha {{old_count}} kemennadenn gozh
     mark: 
       as_read: Kemennadenn merket evel lennet
       as_unread: Merkañ evel anlennet
@@ -335,94 +454,232 @@ 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
+    no_such_user: 
+      body: Ho tigarez, n'eus implijer ebet na kemennadenn ebet gant an anv pe an id-se
+      heading: N'eus ket un implijer pe ur gemennadenn evel-se
+      title: N'eus ket un implijer pe ur gemennadenn evel-se
     outbox: 
       date: Deiziad
       inbox: boest resev
       my_inbox: Ma {{inbox_link}}
+      no_sent_messages: N'hoc'h eus kaset kemennadenn ebet c'hoazh. Ha ma'z afec'h a darempred gant darn eus an {{people_mapping_nearby_link}}?
       outbox: boest kas
+      people_mapping_nearby: tud o kartennañ en ardremez
       subject: Danvez
       title: Boest kas
       to: Da
+      you_have_sent_messages: Kaset hoc'h eus {{sent_count}} kemennadenn
     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: 
     diary_comment_notification: 
       banner1: "*                  Na respontit ket d'ar postel-mañ, mar plij                                                 *"
       banner2: "*                Implijt lec'hienn web OpenStreetMap web site evit respont                           *"
+      footer: Gallout a rit ivez lenn an addispleg war {{readurl}}, lezel addisplegoù war {{commenturl}} pe respont war {{replyurl}}
+      header: "{{from_user}} en deus lezet un addispleg war hoc'h enmoned nevez e deizlevr OpenStreetMap gant an danvez {{subject}} :"
       hi: Demat {{to_user}},
+      subject: "[OpenStreetMap] {{user}} en deus lezet un addispleg war hoc'h enmoned en deizlevr"
     email_confirm: 
       subject: "[OpenStreetMap] Kadarnaat ho chomlec'h postel"
     email_confirm_html: 
+      click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan evit kadarnaat ar c'hemm.
       greeting: Demat,
+      hopefully_you: Unan bennak (c'hwi moarvat) a garfe cheñch e chomlec'h postel eus {{server_url}} da {{new_address}}.
     email_confirm_plain: 
+      click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan, mar plij, evit kadarnaat ar c'hemm.
       greeting: Demat,
+      hopefully_you_1: Unan bennak (c'hwi moarvat) a garfe cheñch e chomlec'h postel da
       hopefully_you_2: "{{server_url}} da {{new_address}}."
+    friend_notification: 
+      had_added_you: "{{user}} en deus hoc'h ouzhpennet evel mignon war OpenStreetMap."
+      see_their_profile: Gallout a rit gwelet o frofil war {{userurl}} hag o ouzhpennañ evel mignoned ma karit.
+      subject: "[OpenStreetMap] {{user}} en deus hoc'h ouzhpennet evel mignon"
     gpx_notification: 
       and_no_tags: ha balizenn ebet.
       and_the_tags: "hag ar balizennoù-mañ :"
+      failure: 
+        failed_to_import: "n'en deus ket gallet bezañ enporzhiet. Setu amañ ar fazi :"
+        more_info_1: Muioc'h a ditouroù diwar-benn ar c'hudennoù enporzhiañ GPX ha penaos en em virout diouto
+        more_info_2: "a c'hall bezañ kavet war :"
+        subject: "[OpenStreetMap] fazi e-pad an enporzhiadur GPX"
       greeting: Demat,
+      success: 
+        loaded_successfully: karget gant {{trace_points}} diwar {{possible_points}} poent posupl.
+        subject: "[OpenStreetMap] Graet eo an enporzhiadenn GPX"
       with_description: gant an deskrivadur
+      your_gpx_file: War a seblant, ho restr GPX
+    lost_password: 
+      subject: "[OpenStreetMap] Goulenn adderaouekaat ar ger-tremen"
     lost_password_html: 
+      click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan evit adderaouekaat ho ker-tremen.
       greeting: Demat,
+      hopefully_you: Unan bennak (c'hwi moarvat) en deus goulennet e vefe adderaouekaet ger-tremen ar gont openstreetmap.org gant ar chomlec'h postel-mañ.
     lost_password_plain: 
+      click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan, mar plij, evit adderaouekaat ho ker-tremen.
       greeting: Demat,
+      hopefully_you_1: Unan bennak (c'hwi, moarvat) en deus goulennet e vefe adderaouekaet ar ger-tremen
+      hopefully_you_2: kont openstreetmap.org gant ar chomlec'h postel-mañ.
     message_notification: 
+      banner1: "*                  Na respontit ket d'ar postel-mañ, mar plij.                                                *"
+      banner2: "*                Implijit lec'hienn web OpenStreetMap evit respont.                                      *"
+      footer1: Gallout a rit ivez lenn ar gemennadenn war {{readurl}}
+      footer2: ha gallout a rit respont da {{replyurl}}
+      header: "{{from_user}} en deus kaset deoc'h ur gemennadenn dre OpenStreetMap gant an danvez {{subject}} :"
       hi: Demat {{to_user}},
+      subject: "[OpenStreetMap] {{user}} en deus kaset ur gemennadenn deoc'h"
+    signup_confirm: 
+      subject: "[OpenStreetMap] Kadarnaat ho chomlec'h postel"
     signup_confirm_html: 
+      click_the_link: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat krouidigezh ho kont ha gouzout hiroc'h diwar-benn OpenStreetMap
+      current_user: Ur roll eus an implijerien red dre rummadoù, diazezet war al lec'h m'emaint er bed, a c'haller kaout diwar <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Muioc'h a ditouroù diwar-benn OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/FR:Beginners_Guide">war ar wiki</a> pe <a href="http://www.opengeodata.org/">war ar blog opengeodata</a> a ginnig ivez  <a href="http://www.opengeodata.org/?cat=13">podskignadennoù da selaou</a> !
       greeting: Demat !
+      hopefully_you: Unan bennak (c'hwi, moarvat) a garfe krouiñ ur gont war
+      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ñ
+      user_wiki_page: Erbediñ a reomp deoc'h krouiñ ur bajenn implijer war ar wiki, enni balizennoù rummadoù o tiskouez pelec'h emaoc'h, evel <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Brest">[[Category:Users_in_Brest]]</a>.
+      video_to_openstreetmap: video evit kregiñ gant OpenStreetMap
+      wiki_signup: Gallout a rit ivez <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">krouiñ ur gont war wiki OpenStreetMap</a>.
     signup_confirm_plain: 
+      click_the_link_1: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat ho
+      click_the_link_2: kont ha lenn muioc'h a ditouroù diwar-benn OpenStreetMap.
+      current_user_1: Ur roll eus an implijerien diazezet war al lec'h m'emaint er bed
+      current_user_2: "a c'haller kaout diwar :"
       greeting: Demat !
+      hopefully_you: Unan bennak (c'hwi moarvat) a garfe krouiñ ur gont war
+      introductory_video: "Gallout a rit sellet ouzh ur video evit kregiñ gant OpenStreetMap amañ :"
       more_videos: "Muioc'h a videoioù zo amañ :"
+      opengeodata: "OpenGeoData.org eo blog OpenStreetMap, ha kinnig a ra podskignadennoù ivez :"
+      the_wiki: "Lennit traoù diwar-benn OpenStreetMap war ar wiki :"
+      user_wiki_1: Erbediñ a reomp deoc'h krouiñ ur bajenn implijer wiki, enni
+      user_wiki_2: rummadoù hag a verk pelec'h emaoc'h, evel [[Category:Users_in_Brest]].
+      wiki_signup: "Gallout a rit ivez krouiñ ur gont war wiki OpenStreetMap war :"
   oauth: 
     oauthorize: 
+      allow_read_gpx: lenn ho roudoù GPS prevez.
+      allow_read_prefs: lenn ho penndibaboù implijer.
+      allow_to: "Lezel an arload arval da :"
       allow_write_api: kemmañ ar gartenn.
+      allow_write_diary: krouiñ enmonedoù en deizlevr, addisplegoù ha kavout mignoned.
+      allow_write_gpx: kas roudoù GPS.
       allow_write_prefs: kemmañ ho penndibaboù implijer.
+      request_access: Emañ an arload {{app_name}} o c'houlenn mont d'ho kont. Gwiriit hag-eñ hoc'h eus c'hoant e vefe ar barregezhioù-mañ gant hoc'h arloadoù. Gallout a rit dibab kement ha ma karit.
+    revoke: 
+      flash: Torret hoc'h eus ar jedouer evit {{application}}
   oauth_clients: 
+    create: 
+      flash: Marilhet eo bet an titouroù
+    destroy: 
+      flash: Distrujet eo bet marilhadur an arload arval
     edit: 
       submit: Aozañ
       title: Aozañ hoc'h arload
     form: 
+      allow_read_gpx: lenn o roudoù GPS prevez.
+      allow_read_prefs: lenn e benndibaboù implijer.
       allow_write_api: kemmañ ar gartenn.
+      allow_write_diary: krouit enmonedoù en deizlevr, addisplegoù, ha kavit mignoned.
+      allow_write_gpx: kas roudoù GPS.
+      allow_write_prefs: kemmañ e benndibaboù implijer.
+      callback_url: URL gervel en-dro
       name: Anv
+      requests: "Goulenn an aotreoù-mañ digant an implijer :"
       required: Rekis
+      support_url: URL skoazell
+      url: URL pennañ an arload
     index: 
       application: Anv an arload
       issued_at: Kaset da
+      list_tokens: "Ar jedoueroù-mañ zo bet skignet d'an arloadoù en hoc'h anv :"
+      my_apps: Ma arloadoù arvalien
+      my_tokens: Ma arloadoù aotreet
+      no_apps: Ha bez' hoc'h eus un arload ho pefe c'hoant da varilhañ evit implijout ar standard {{oauth}} ganimp ? Ret eo deoc'h marilhañ hoc'h arload web a-raok dezhi ober rekedoù d'ar servij-mañ.
+      register_new: Marilhañ hoc'h arload
+      registered_apps: "Marilhet eo an arloadoù arvalien-mañ ganeoc'h :"
       revoke: Terriñ !
+      title: Ma munudoù OAuth
+    new: 
+      submit: Marilhañ
+      title: Marilhañ un arload nevez
+    not_found: 
+      sorry: Ho tigarez, an {{type}}-mañ n'eo ket bet kavet.
     show: 
+      access_url: "URL ar jedouer moned :"
+      allow_read_gpx: lenn o roudoù GPS prevez.
+      allow_read_prefs: lenn e benndibaboù implijer.
       allow_write_api: kemmañ ar gartenn.
+      allow_write_diary: krouit enmonedoù en deizlevr, addisplegoù ha kavit mignoned.
+      allow_write_gpx: kas roudoù GPS.
+      allow_write_prefs: kemmañ o fenndibaboù implijerien.
+      authorize_url: "URL aotren :"
       edit: Aozañ ar munudoù
+      key: "Alc'hwez an implijer :"
+      requests: "O c'houlenn an aotreoù-mañ digant an implijer :"
+      secret: "Sekred an implijer :"
+      support_notice: Skorañ a reomp hmac-sha1 (erbedet) hag an destenn diaoz er mod ssl.
+      title: Munudoù OAuth evit {{app_name}}
+      url: "URL ar jedouer reked :"
+    update: 
+      flash: Hizivaet eo bet titouroù an arval
   site: 
     edit: 
+      anon_edits_link_text: Kavit perak.
+      flash_player_required: Ezhomm hoc'h eus eus ul lenner Flash evit implijout Potlatch, aozer flash OpenStreetMap. Gallout a rit <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">pellgargañ Flash Player diwar Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Meur a zibarzh</a> a c'haller kaout evit aozañ OpenStreetMap.
       not_public: N'hoc'h eus ket lakaet hoc'h aozadennoù da vezañ foran.
+      not_public_description: Ne c'hallit ket ken aozañ ar gartenn nemet e lakafec'h hoc'h aozadennoù da vezañ foran. Gallout a rit lakaat hoc'h aozadennoù da vezañ foran diwar ho {{user_page}}.
+      potlatch_unsaved_changes: Kemmoù n'int ket bet enrollet zo ganeoc'h. (Evit enrollañ e Potlatch, e tlefec'h diziuzañ an hent pe ar poent red m'emaoc'h oc'h aozañ er mod bev, pe klikañ war enrollañ ma vez ur bouton enrollañ ganeoc'h.)
       user_page_link: pajenn implijer
     index: 
+      js_1: Pe emaoc'h oc'h implijout ur merdeer ha ne skor ket JavaScript, pe hoc'h eus diweredekaet JavaScript.
+      js_2: OpenStreetMap a implij JavaScript evit e gartenn risklus.
+      js_3: Ma ne c'hallit ket gweredekaat JavaScrip e c'hallit esaeañ gant ar <a href="http://tah.openstreetmap.org/Browse/">merdeer statek Tiles@Home</a>.
       license: 
+        notice: Dindan aotre-implijout {{license_name}} gant an {{project_name}} hag e genobererien.
         project_name: raktres OpenStreetMap
-      permalink: Permalink
       shortlink: Liamm berr
     key: 
       map_key: Alc'hwez ar gartenn
+      map_key_tooltip: Alc'hwez evit ar mapnik gant al live zoum-mañ
       table: 
         entry: 
           admin: Bevenn velestradurel
           allotments: Lodennaouegoù
+          apron: 
+            - Roudenn aerborzh
+            - termenva
+          bridge: Bord du = pont
+          bridleway: Hent evit kezeg
+          brownfield: Takad greanterezh
+          building: Savadur pouezus
+          byway: Gwenodenn
+          cable: 
+            - Teleferik
+            - fungador
           cemetery: Bered
           centre: Kreizenn sport
           commercial: Takad kenwerzhel
+          common: 
+            - prad
+            - prad
+          construction: Hentoù war ar stern
           cycleway: Roudenn divrodegoù
+          destination: Moned d'ar pal
           farm: Ti-feurm
           footway: Hent evit an dud war droad
           forest: Koad
@@ -431,36 +688,60 @@ br:
           industrial: Takad greantel
           lake: 
             - Lenn
+            - mirlec'h
           military: Takad milourel
           motorway: Gourhent
-          park: Park
+          permissive: Moned aotreüs
+          pitch: Tachenn sport
+          primary: Hent bras
           private: Moned prevez
           rail: Hent-houarn
           reserve: Gwarezva natur
+          resident: Takad annez
           retail: Takad kenwerzh
+          runway: 
+            - Roudenn evit an taksioù
+            - Roudenn evit an taksioù
           school: 
             - Skol
             - skol-veur
+          secondary: Hent bihan
           station: Porzh-houarn
           subway: Linenn vetro
+          summit: 
+            - Lein
+            - pikern
+          tourist: Diduañs evit an douristed
           track: Roudenn
           tram: 
             - tramgarr
+            - tramgarr
+          trunk: Hent broadel
+          tunnel: Bord poentoùigoù = riboul
           unclassified: Hent n'eo ket rummet
+          unsurfaced: Hent n'eo ket goloet
           wood: Koad
         heading: Alc'hwez evit z{{zoom_level}}
     search: 
       search: Klask
+      search_help: "da skouer : 'Kemper', 'Ru Siam, Brest', 'CB2 5AQ', pe 'tiez-post tost da Roazhon' <a href='http://wiki.openstreetmap.org/wiki/Search'>muioc'h a skouerioù...</a>"
       submit_text: Kas
       where_am_i: Pelec'h emaon ?
     sidebar: 
       close: Serriñ
+      search_results: Disoc'hoù an enklask
   trace: 
+    create: 
+      trace_uploaded: Kaset eo bet ho restr GPX hag emañ en gortoz a vezañ ensoc'het en diaz roadennoù. C'hoarvezout a ra dindan un hanter-eurvezh peurvuiañ, ha kaset e vo ur postel deoc'h pa vo echu.
+      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,14 +749,19 @@ 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: 
+      body: Ho tigarez, n'eus implijer ebet en anv {{user}}. Gwiriit hag-eñ eo skrivet mar, pe marteze hoc'h eus kliket war ul liamm fall.
       heading: N'eus ket eus an implijer {{user}}
       title: Implijer ebet evel-se
     trace: 
@@ -490,6 +776,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 +787,11 @@ 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ù
+      traces_waiting: Bez' hoc'h eus {{count}} roud a c'hortoz bezañ kaset. Gwell e vefe gortoz a-raok kas re all, evit chom hep stankañ al lostennad evit an implijerien all.
     trace_optionals: 
       tags: Balizennoù
     trace_paging_nav: 
@@ -512,23 +804,38 @@ 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: 
+      identifiable: Anavezadus (diskouezet e roll ar roudoù hag evel anavezadus, poentoù urzhiet gant an deiziadoù)
+      private: Prevez (rannet ent dizanv hepken, poentoù hep urzh)
+      public: Foran (diskouezet e roll ar roudoù hag ent dizanv, poentoù hep urzh)
+      trackable: A c'haller treseal (rannet evel dizanv hepken, poent uzhiet gant deiziadoù)
   user: 
     account: 
+      email never displayed publicly: (n'eo ket diskwelet d'an holl morse)
+      flash update success: Hizivaet eo bet titouroù an implijer.
+      flash update success confirm needed: Hizivaet eo bet titouroù an implijer. Gwiriit ho posteloù evit kadarnaat ho chomlec'h postel nevez.
+      home location: "Lec'hiadur ar gêr :"
       latitude: "Ledred :"
       longitude: "Hedred :"
       make edits public button: Lakaat ma holl aozadennoù da vezañ foran
       my settings: Ma arventennoù
+      no home location: N'hoc'h eus ket ebarzhet lec'hiadur ho kêr.
       preferred languages: "Yezhoù gwellañ karet :"
       profile description: "Deskrivadur ar profil :"
       public editing: 
+        disabled: Diweredekaet ha ne c'hall ket aozañ roadennoù ; diznav eo an holl aozadennoù kent.
         disabled link text: Perak n'on ket evit aozañ ?
         enabled: Gweredekaet. N'eo ket dizanv ha gallout a ra aozañ roadennoù.
         enabled link text: Petra eo se ?
@@ -536,39 +843,63 @@ br:
       return to profile: Distreiñ d'ar profil
       save changes button: Enrollañ ar c'hemmoù
       title: Aozañ ar gont
+      update home location on click: Hizivaat lec'hiadur ho kêr pa glikit war ar gartenn ?
     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.
+      success: Kadarnaet eo ho chomlec'h postel, trugarez evit bezañ en em enskrivet !
     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: 
+      account not active: Ho tigarez, n'eo ket oberiant ho kont c'hoazh. <br/>Klikit war al liamm er postel kadarnaat, mar plij, evit gweredekaat ho kont.
+      auth failure: Ho tigarez, met n'eus ket bet gallet hoc'h anavezout gant an titouroù pourchaset.
       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 ?
       new password button: Adderaouekaat ar ger-tremen
+      notice email cannot find: Ho tigarez, n'eo ket bet kavet ar chomlec'h postel-se.
+      notice email on way: Kaset ez eus bet ur postel deoc'h evit adderaouekaat ho ker-tremen.
       title: Ger-tremen kollet
     make_friend: 
       already_a_friend: Mignon oc'h gant {{name}} dija.
+      failed: Ho tigarez, n'eus ket bet gallet ouzhpennañ {{name}} evel mignon.
+      success: "{{name}} zo ho mignon bremañ."
     new: 
       confirm email address: "Kadarnaat ar chomlec'h postel :"
       confirm password: "Kadarnaat ar ger-tremen :"
+      contact_webmaster: Kit e darempred gant ar <a href="mailto:webmaster@openstreetmap.org">mestr-gwiad</a>, mar plij, evit ma krouo ur gont evidoc'h - klask a raimp plediñ gant ho koulenn kerkent ha ma vo tu.
       display name: "Anv diskwelet :"
       email address: "Chomlec'h postel :"
       fill_form: Leugnit ar furmskrid hag e kasimp deoc'h ur postel evit gweredekaat ho kont.
+      flash create success message: Krouet eo bet an implijer.  Gwelit ha resevet hoc'h eus ho postel kadarnaat, ha prest e viot da gartennañ diouzhtu.:-)<br /><br />Ho pezet soñj ne c'hallot ket kevreañ keit ha n'ho po ket resevet ar postel kadarnaat ha kadarnaet ho chomlec'h postel.<br /><br />Ma implijit ur reizhiad enep-strob hag a gas goulennoù kadarnaat, lakait webmaster@openstreetmap.org en ho liestenn wenn, mar plij, rak n'omp ket evit respont d'ar posteloù-se.
       heading: Krouiñ ur gont implijer
+      license_agreement: Dre grouiñ ur gont ez asantit e vefe an holl roadennoù a gasit d'ar raktres OpenStreetMap dindan an aotre-implijout <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons license (by-sa)</a> (peurgetket).
+      no_auto_account_create: Siwazh n'omp ket evit krouiñ ur gont evidoc'h ent emgefreek.
+      not displayed publicly: N'eo ket diskwelet d'an holl (gwelet <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">hor c'harta prevezded</a>)
       password: "Ger-tremen :"
+      signup: En em enskrivañ
       title: Krouiñ ur gont
     no_such_user: 
+      body: Ho tigarez, n'eus implijer ebet en anv {{user}}. Gwiriit hag-eñ eo skrivet mat, pe marteze hoc'h eus kliket war ul liamm fall.
       heading: N'eus ket eus an implijer {{user}}
       title: N'eus ket un implijer evel-se
     remove_friend: 
@@ -577,10 +908,13 @@ 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
       title: Adderaouekaat ar ger-tremen
+    set_home: 
+      flash success: Enrollet eo bet lec'hiadur ar gêr
     view: 
       add as friend: Ouzhpennañ evel mignon
       add image: Ouzhpennañ ur skeudenn
@@ -590,17 +924,24 @@ br:
       description: Deskrivadur
       diary: deizlevr
       edits: kemmoù
+      if set location: Ma lakait ho lec'hiadur e teuio ur gartenn vrav war wel dindani. Gallout a rit lakaat ho lec'hiadur war ho pajenn {{settings_link}}.
+      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 :"
+      new diary entry: enmoned nevez en deizlevr
       no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh.
+      no home location: N'eus bet lakaet lec'hiadur ebet evit ar gêr.
+      no nearby users: N'eus implijer ebet en ardremez 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

config/locales/ca.yml

@@ -25,7 +25,6 @@ ca:
         public: Públic
         size: Mida
         user: Usuari
-        visible: Visible
       user: 
         active: Actiu
         description: Descripció
@@ -43,7 +42,6 @@ ca:
       friend: Amic
       language: Idioma
       message: Missatge
-      node: Node
       node_tag: Etiqueta del node
       notifier: Notificador
       old_node: Node antic
@@ -97,8 +95,6 @@ ca:
     node: 
       download: "{{download_xml_link}} o {{view_history_link}}"
       download_xml: Baixa l'XML
-      node: Node
-      node_title: "Node: {{node_name}}"
       view_history: visualitza l'historial
     node_details: 
       coordinates: "Coordenades:"
@@ -111,7 +107,6 @@ ca:
     not_found: 
       sorry: Ho sentim, no s'ha trobat el {{type}} amb l'id {{id}}.
       type: 
-        node: node
         relation: relació
         way: camí
     paging_nav: 
@@ -138,15 +133,10 @@ ca:
       details: Detalls
       object_list: 
         details: Detalls
-        history: 
-          type: 
-            node: Node [[id]]
         selected: 
           type: 
-            node: Node [[id]]
             way: Camí [[id]]
         type: 
-          node: Node
           way: Camí
     way: 
       way: Camí

config/locales/da.yml

@@ -0,0 +1,31 @@
+da: 
+  browse: 
+    way: 
+      edit: redigér
+      view_history: vis historik
+      way: Vej
+      way_title: "Vej: {{way_name}}"
+  layouts: 
+    edit: Redigér
+    edit_tooltip: Redigér kortet
+    help_wiki: Hjælp & Wiki
+    history: Historik
+    log_in: log på
+    log_in_tooltip: Log på med din konto
+    logout: log af
+    logout_tooltip: Log af
+    news_blog: Nyheder (blog)
+    news_blog_tooltip: Blog med nyheder om OpenStreetMap, frie geografiske data, etc
+    shop: Butik
+    sign_up: opret en konto
+    tag_line: Det frie Wiki-verdenskort
+    view: Kort
+    view_tooltip: Vis kortere
+    welcome_user: Velkommen, {{user_link}}
+  map: 
+    coordinates: "Koordinater:"
+    edit: Redigér
+    view: Kort
+  site: 
+    search: 
+      where_am_i: Hvor er jeg?

config/locales/de.yml

@@ -15,13 +15,11 @@ de:
       message: 
         body: Text
         recipient: Empfänger
-        sender: Sender
         title: Titel
       trace: 
         description: Beschreibung
         latitude: Breitengrad
         longitude: Längengrad
-        name: Name
         public: Öffentlich
         size: Größe
         user: Benutzer
@@ -35,7 +33,6 @@ de:
         pass_crypt: Passwort
     models: 
       acl: Liste für Zugangskontrolle
-      changeset: Changeset
       changeset_tag: Changeset-Tag
       country: Land
       diary_comment: Blog-Kommentar
@@ -54,7 +51,6 @@ de:
       old_way: Alter Weg
       old_way_node: Alter Weg-Knoten
       old_way_tag: Alter Weg-Tag
-      relation: Relation
       relation_member: Relation-Mitglied
       relation_tag: Relation-Tag
       session: Sitzung
@@ -69,14 +65,7 @@ de:
       way_tag: Weg-Tag
   browse: 
     changeset: 
-      changeset: "Changeset: {{id}}"
-      changesetxml: Changeset XML
-      download: "{{changeset_xml_link}} oder {{osmchange_xml_link}} herunterladen"
-      feed: 
-        title: Changeset {{id}}
-        title_comment: Changeset {{id}} - {{comment}}
-      osmchangexml: osmChange XML
-      title: Changeset
+      download: Als {{changeset_xml_link}} oder {{osmchange_xml_link}} herunterladen.
     changeset_details: 
       belongs_to: "Erstellt von:"
       bounding_box: "Bereich:"
@@ -107,14 +96,12 @@ de:
       edited_at: "Bearbeitet am:"
       edited_by: "Bearbeitet von:"
       in_changeset: "Im Changeset:"
-      version: "Version:"
     containing_relation: 
-      entry: Relation {{relation_name}}
       entry_role: Relation {{relation_name}} (als {{relation_role}})
     map: 
       deleted: Gelöscht
       larger: 
-        area: Bereich größerer Karte
+        area: Bereich auf größerer Karte
         node: Knoten auf größerer Karte
         relation: Relation auf größerer Karte
         way: Weg auf größerer Karte
@@ -148,8 +135,6 @@ de:
     relation: 
       download: "{{download_xml_link}} oder {{view_history_link}}"
       download_xml: XML herunterladen
-      relation: Relation
-      relation_title: "Relation: {{relation_name}}"
       view_history: Chronik anzeigen
     relation_details: 
       members: "Mitglieder:"
@@ -164,7 +149,6 @@ de:
       entry_role: "{{type}} {{name}} als {{role}}"
       type: 
         node: Knoten
-        relation: Relation
         way: Weg
     start: 
       manually_select: Einen anderen Kartenausschnitt manuell auswählen
@@ -172,7 +156,6 @@ de:
     start_rjs: 
       data_frame_title: Daten
       data_layer_name: Daten
-      details: Details
       drag_a_box: Einen Rahmen über die Karte aufziehen, um einen Bereich auszuwählen
       edited_by_user_at_timestamp: Bearbeitet von [[user]] am [[timestamp]]
       history_for_feature: Chronik für [[feature]]
@@ -183,7 +166,6 @@ de:
       object_list: 
         api: Diesen Bereich von der API abfragen
         back: Objektliste anzeigen
-        details: Details
         heading: Objektliste
         history: 
           type: 
@@ -201,8 +183,6 @@ de:
       unable_to_load_size: "Konnte nicht geladen werden: Bereich der Größe [[bbox_size]] ist zu groß (soll kleiner als {{max_bbox_size}} sein)"
       wait: Verarbeiten …
       zoom_or_select: Karte vergrössern oder einen Bereich auf der Karte auswählen
-    tag_details: 
-      tags: "Tags:"
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
       download_xml: Download als XML
@@ -237,7 +217,6 @@ de:
     changesets: 
       area: Bereich
       comment: Kommentar
-      id: ID
       saved_at: Gespeichert am
       user: Benutzer
     list: 
@@ -245,11 +224,6 @@ de:
       description_bbox: Letzte Änderungen in {{bbox}}
       description_user: Letzte Änderungen von {{user}}
       description_user_bbox: Letzte Änderungen von {{user}} in {{bbox}}
-      heading: Changesets
-      heading_bbox: Changesets
-      heading_user: Changesets
-      heading_user_bbox: Changesets
-      title: Changesets
       title_bbox: Changesets in {{bbox}}
       title_user: Changesets von {{user}}
       title_user_bbox: Changesets von {{user}} in {{bbox}}
@@ -276,9 +250,6 @@ de:
       title: Eintrag bearbeiten
       use_map_link: Karte anzeigen
     feed: 
-      all: 
-        description: Recent diary entries from users of OpenStreetMap
-        title: OpenStreetMap diary entries
       language: 
         description: Letze Blogeinträge von Benutzern von OpenStreetMap in {{language_name}}
         title: OpenStreetMap Blogeinträge in {{language_name}}
@@ -317,9 +288,7 @@ de:
       add_marker: Markierung zur Karte hinzufügen
       area_to_export: Bereich für den Export
       embeddable_html: HTML zum Einbinden
-      export_button: Export
       export_details: Die von OpenStreetMap zur Verfügung gestellten Daten sind unter der <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 Lizenz</a> lizenziert.
-      format: Format
       format_to_export: Format für den Export
       image_size: Bildgröße
       latitude: "Breitengrad:"
@@ -334,13 +303,11 @@ de:
       output: Ausgabe
       paste_html: HTML-Code kopieren, um ihn in eine Website einzufügen.
       scale: Maßstab
-      zoom: Zoom
     start_rjs: 
       add_marker: Markierung zur Karte hinzufügen
       change_marker: Position der Markierung ändern
       click_add_marker: Auf die Karte klicken, um eine Markierung hinzuzufügen
       drag_a_box: Einen Rahmen über der Karte aufziehen, um einen Bereich auszuwählen
-      export: Export
       manually_select: Einen anderen Kartenausschnitt manuell auswählen
       view_larger_map: Größere Karte anzeigen
   geocoder: 
@@ -386,7 +353,6 @@ de:
     donate_link_text: Spende
     edit: Bearbeiten
     edit_tooltip: Karte bearbeiten
-    export: Export
     export_tooltip: Kartendaten exportieren
     gps_traces: GPS-Tracks
     gps_traces_tooltip: GPS-Tracks anzeigen und verwalten
@@ -415,7 +381,6 @@ de:
     news_blog_tooltip: News-Blog über OpenStreetMap, freie geographische Daten, etc.
     osm_offline: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten nicht verfügbar.
     osm_read_only: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten im "Nur-Lesen-Modus".
-    shop: Shop
     shop_tooltip: Shop für Artikel mit OpenStreetMap-Logo
     sign_up: Registrieren
     sign_up_tooltip: Ein Benutzerkonto zum Daten bearbeiten erstellen
@@ -563,7 +528,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:"
@@ -585,63 +550,6 @@ de:
       allow_write_gpx: GPS-Tracks hochzuladen
       allow_write_prefs: Deine Benutzereinstellungen zu verändern
       request_access: "Die Anwendung {{app_name}} möchte auf Deinen OpenStreetMap-Account zugreifen. Bitte entscheide, ob Du der Anwendung die folgenden Rechte gewähren möchtest. Du kannst alle oder einige der folgenden Rechte gewähren:"
-    revoke: 
-      flash: You've revoked the token for {{application}}
-  oauth_clients: 
-    create: 
-      flash: Registered the information successfully
-    destroy: 
-      flash: Destroyed the client application registration
-    edit: 
-      submit: Edit
-      title: Edit your application
-    form: 
-      allow_read_gpx: read their private GPS traces.
-      allow_read_prefs: read their user preferences.
-      allow_write_api: modify the map.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_gpx: upload GPS traces.
-      allow_write_prefs: modify their user preferences.
-      callback_url: Callback URL
-      name: Name
-      requests: "Request the following permissions from the user:"
-      required: Required
-      support_url: Support URL
-      url: Main Application URL
-    index: 
-      application: Application Name
-      issued_at: Issued At
-      list_tokens: "The following tokens have been issued to applications in your name:"
-      my_apps: My Client Applications
-      my_tokens: My Authorised Applications
-      no_apps: Do you have an application you would like to register for use with us using the {{oauth}} standard? You must register your web application before it can make OAuth requests to this service.
-      register_new: Register your application
-      registered_apps: "You have the following client applications registered:"
-      revoke: Revoke!
-      title: My OAuth Details
-    new: 
-      submit: Register
-      title: Register a new application
-    not_found: 
-      sorry: Sorry, that {{type}} could not be found.
-    show: 
-      access_url: "Access Token URL:"
-      allow_read_gpx: read their private GPS traces.
-      allow_read_prefs: read their user preferences.
-      allow_write_api: modify the map.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_gpx: upload GPS traces.
-      allow_write_prefs: modify their user preferences.
-      authorize_url: "Authorise URL:"
-      edit: Edit Details
-      key: "Consumer Key:"
-      requests: "Requesting the following permissions from the user:"
-      secret: "Consumer Secret:"
-      support_notice: We support hmac-sha1 (recommended) as well as plain text in ssl mode.
-      title: OAuth details for {{app_name}}
-      url: "Request Token URL:"
-    update: 
-      flash: Updated the client information successfully
   site: 
     edit: 
       anon_edits_link_text: Hier findest du mehr Infos dazu.
@@ -655,11 +563,8 @@ de:
       js_2: OpenStreetMap nutzt Javascript für die Kartendarstellung.
       js_3: Solltest bei dir kein Javascript möglich sein, kannst du auf der <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home Website</a> eine Version ohne Javascript benutzen.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: Lizenziert unter {{license_name}} Lizenz durch das {{project_name}} und seine Mitwirkenden.
         project_name: OpenStreetMap Projekt
-      permalink: Permalink
-      shortlink: Shortlink
     key: 
       map_key: Legende
       map_key_tooltip: Legende für die Mapnik-Karte bei diesem Zoom-Level
@@ -698,7 +603,6 @@ de:
             - reservoir
           military: Militärgebiet
           motorway: Autobahn
-          park: Park
           permissive: Eingeschänkter Zugang
           pitch: Sportfeld
           primary: Bundesstraße
@@ -731,7 +635,6 @@ de:
     search: 
       search: Suchen
       search_help: "Beispiele: „München“, „Heinestraße, Würzburg“, „CB2 5AQ“, oder „post offices near Lünen“ <a href='http://wiki.openstreetmap.org/wiki/Search'>mehr Beispiele …</a>"
-      submit_text: Go
       where_am_i: Wo bin ich?
     sidebar: 
       close: Schließen
@@ -753,7 +656,6 @@ de:
       points: "Punkte:"
       save_button: Speichere Änderungen
       start_coord: "Startkoordinate:"
-      tags: "Tags:"
       tags_help: Trennung durch Komma
       title: Track {{name}} bearbeiten
       uploaded_at: "Hochgeladen am:"
@@ -776,7 +678,6 @@ de:
       count_points: "{{count}} Punkte"
       edit: bearbeiten
       edit_map: Karte bearbeiten
-      in: in
       map: Karte
       more: mehr
       pending: AUSSTEHEND
@@ -788,7 +689,6 @@ de:
       description: Beschreibung
       help: Hilfe
       help_url: http://wiki.openstreetmap.org/wiki/DE:Upload
-      tags: Tags
       tags_help: Trennung durch Komma
       upload_button: Hochladen
       upload_gpx: GPX-Datei
@@ -799,8 +699,6 @@ de:
       see_just_your_traces: Eigene GPS-Tracks anzeigen oder neue hinzufügen
       see_your_traces: Eigene GPS-Tracks
       traces_waiting: "{{count}} deiner Tracks sind momentan in der Warteschlange. Bitte warte bis diese fertig sind, um die Verarbeitung nicht für andere Nutzer zu blockieren."
-    trace_optionals: 
-      tags: Tags
     trace_paging_nav: 
       of: von
       showing: Zeige Seite
@@ -816,18 +714,14 @@ de:
       none: Keine
       owner: "Besitzer:"
       pending: WARTEND
-      points: Punkte
+      points: "Punkte:"
       start_coordinates: "Startkoordinate:"
-      tags: "Tags:"
       title: Track {{name}} betrachten
       trace_not_found: Track nicht gefunden!
       uploaded: "Hochgeladen am:"
       visibility: "Sichtbarkeit:"
     visibility: 
-      identifiable: Identifiable (shown in trace list and as identifiable, ordered points with timestamps)
-      private: Private (only shared as anonymous, unordered points)
-      public: Public (shown in trace list and as anonymous, unordered points)
-      trackable: Trackable (only shared as anonymous, ordered points with timestamps)
+      private: " Private (only shared as anonymous, unordered points)"
   user: 
     account: 
       email never displayed publicly: (nicht öffentlich sichtbar)
@@ -845,7 +739,6 @@ de:
         disabled: Deaktiviert, bearbeiten von Daten nicht möglich, alle bisherigen Bearbeitungen sind anonym.
         disabled link text: Warum kann ich nichts bearbeiten?
         enabled: Aktiviert. Nicht anonym, bearbeiten der Kartendaten möglich.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Was ist das?
         heading: "Öffentliches Bearbeiten:"
       return to profile: Zurück zum Profil
@@ -940,7 +833,6 @@ de:
       my edits: Eigene Bearbeitungen
       my settings: Eigene Einstellungen
       my traces: Eigene Tracks
-      my_oauth_details: View my OAuth details
       nearby users: "Benutzer in der Nähe:"
       new diary entry: Neuer Blogeintrag
       no friends: Du hast bis jetzt keine Freunde hinzugefügt.

config/locales/el.yml

@@ -30,9 +30,7 @@ el:
         active: Ενεργό
         description: Περιγραφή
         display_name: Όνομα
-        email: Email
         languages: Γλώσσες
-        pass_crypt: Password
     models: 
       acl: Πρόσβαση στη λίστα ελέγχου
       changeset: Αλλαγή συλλογής
@@ -187,7 +185,6 @@ el:
     changesets: 
       area: Περιοχή
       comment: Σχόλιο
-      id: ID
       saved_at: Αποθήκευση στις
       user: Χρήστης
   diary_entry: 
@@ -250,7 +247,6 @@ el:
       longitude: "Γ. Μ.:"
       manually_select: Διάλεξε καινούργια περιοχή δια χειρός
       mapnik_image: Mapnik εικόνα
-      max: max
       options: Επιλογές
       osm_xml_data: OpenStreetMap XML στοιχεία
       osmarender_image: Osmarender εικόνα

config/locales/en.yml

@@ -608,9 +608,9 @@ en:
       deleted: "Message deleted"
   site:
     index:
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+      js_1: "You are either using a browser that doesn't support JavaScript, or you have disabled JavaScript."
+      js_2: "OpenStreetMap uses JavaScript for its slippy map."
+      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable JavaScript.'
       permalink: Permalink
       shortlink: Shortlink
       license:

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

config/locales/es.yml

@@ -25,7 +25,6 @@ es:
         public: Pública
         size: Tamaño
         user: Usuario
-        visible: Visible
       user: 
         active: Activo
         description: Descripción
@@ -87,6 +86,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
@@ -234,7 +234,6 @@ es:
     changesets: 
       area: Área
       comment: Comentario
-      id: ID
       saved_at: Guardado en
       user: Usuario
     list: 
@@ -274,6 +273,7 @@ es:
       use_map_link: Usar mapa
     feed: 
       all: 
+        description: Entradas recientes en los diarios de los usuarios de OpenStreetMap
         title: Entradas en el diario de OpenStreetMap
       language: 
         title: Entradas de diario en OpenStreetMap en {{language_name}}
@@ -294,6 +294,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
@@ -315,19 +316,15 @@ es:
       format: Formato
       format_to_export: Formato de exportación
       image_size: Tamaño de la imagen
-      latitude: "Lat:"
       licence: Licencia
-      longitude: "Lon:"
       manually_select: Seleccionar a mano otra area
       mapnik_image: Imagen de Mapnik
-      max: max
       options: Opciones
       osm_xml_data: Datos formato OpenStreetMap XML
       osmarender_image: Imagen de Osmarender
       output: Resultado
       paste_html: HTML para empotrar en otro sitio web
       scale: Escala
-      zoom: Zoom
     start_rjs: 
       add_marker: Añadir un marcador al mapa
       change_marker: Cambiar posición del marcador
@@ -588,7 +585,6 @@ es:
       allow_write_diary: crear entradas en el diario, comentarios y hacer amigos.
       allow_write_gpx: subir trazas GPS.
       allow_write_prefs: modificar sus preferencias de usuario.
-      callback_url: Callback URL
       name: Nombre
       requests: "Solicita los siguientes permisos del usuario:"
       required: Requerido
@@ -612,16 +608,9 @@ es:
       sorry: Lo sentimos, ese {{type}} no puede ser encontrado.
     show: 
       access_url: "URL de Token de Acceso:"
-      allow_read_gpx: read their private GPS traces.
-      allow_read_prefs: read their user preferences.
-      allow_write_api: modify the map.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_gpx: upload GPS traces.
-      allow_write_prefs: modify their user preferences.
       authorize_url: "Autorizar URL:"
       edit: Editar Detalles
       key: "Clave de Consumidor:"
-      requests: "Requesting the following permissions from the user:"
       secret: "Secreto de Consumidor:"
       support_notice: Soportamos hmac-sha1 (recomendado) asi como texto plano en el modo ssl.
       title: Detalles OAuth para {{app_name}}
@@ -631,24 +620,35 @@ es:
   site: 
     edit: 
       not_public: No has configurado tus ediciones como públicas.
+      potlatch_unsaved_changes: Tiene cambios sin guardar. (Para guardarlos en Potlatch, debería deseleccionar la vía o punto actual si está editando en directo, o pulse sobre guardar si aparece un botón de guardar.)
       user_page_link: página de usuario
     index: 
-      js_1: Está usando un navegador que no soporta o tiene desactivado javascript
-      js_2: OpenStreetMap utiliza javascript para mostrar su mapa
+      js_1: Está usando un navegador que no soporta o tiene desactivado JavaScript
+      js_2: OpenStreetMap utiliza JavaScript para mostrar su mapa
       license: 
         license_name: Creative Commons Atribución-Licenciar Igual 2.0
+        notice: Bajo la licencia {{license_name}} a nombre de {{project_name}} y sus colaboradores.
         project_name: Proyecto OpenStreetMap
       permalink: Enlace permanente
       shortlink: Atajo
     key: 
       map_key: Leyenda del mapa
+      map_key_tooltip: Leyenda del renderizador mapnik para este nivel de zoom
       table: 
         entry: 
           admin: Límites administrativos
+          allotments: Huertos de ocio
           apron: 
             - terminal
+            - terminal
+          bridge: Borde negro = puente
           bridleway: Vía ecuestre
+          brownfield: Baldío
           building: Edificio significativo
+          byway: camino
+          cable: 
+            - Telecabina
+            - Telesilla
           cemetery: Cementerio
           centre: Centro deportivo
           commercial: Zona comercial
@@ -661,6 +661,7 @@ es:
           footway: Vía peatonal
           forest: Bosque
           golf: Pista de golf
+          heathland: Landa
           industrial: Zona industrial
           lake: 
             - Lago
@@ -669,20 +670,34 @@ es:
           motorway: Autopista
           park: Parque
           permissive: Acceso permisivo
+          pitch: Campo de juego
           primary: Vía primaria
           private: Acceso privado
           rail: Ferrocarril
           reserve: Reserva natural
           resident: Zona residencial
+          retail: Zona de comercios
+          runway: 
+            - Pista de aeropuerto
+            - Vía para taxis
           school: 
             - Escuela
             - universidad
           secondary: Vía secundaria
           station: Estación de tren
           subway: Metro
+          summit: 
+            - Cumbre
+            - pico
           tourist: Atracción turística
+          track: Pista
+          tram: 
+            - Metro ligero
+            - Tranvía
           trunk: Carretera principal
+          tunnel: Borde a rayas = tunel
           unclassified: Carretera sin clasificar
+          unsurfaced: Carretera sin asfaltar
           wood: Madera
         heading: Leyenda para z{{zoom_level}}
     search: 
@@ -723,7 +738,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: 
@@ -822,13 +837,17 @@ es:
     friend_map: 
       nearby mapper: "Mapeadores cercanos:"
       your location: "Tu lugar de origen:"
+    go_public: 
+      flash success: Ahora todas tus ediciones son públicas y ya estás autorizado para editar
     login: 
+      account not active: Lo sentimos, su cuenta aun no está activa.<br />Por favor siga el enlace que hay en el correo de confirmación de cuenta para activarla.
       create_account: crear una cuenta
       email or username: Dirección de correo o nombre de usuario
       heading: Iniciar sesión
       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:"
@@ -861,6 +880,7 @@ es:
     reset_password: 
       confirm password: "Confirmar contraseña:"
       flash changed: Tu contraseña ha sido cambiada.
+      flash token bad: No he encontrado este elemento, ¿quizá debería comprobar la URL?
       heading: Reestablecer contraseña para {{user}}
       password: "Contraseña:"
       reset: Reestablecer contraseña

config/locales/fi.yml

@@ -51,7 +51,6 @@ fi:
       relation_tag: Relaation tägi
       session: Istunto
       trace: Jälki
-      tracepoint: Trace Point
       tracetag: Jäljen tägi
       user: Käyttäjä
       way: Polku
@@ -62,7 +61,9 @@ fi:
       changeset: "Muutoskokoelma: {{id}}"
       changesetxml: muutoskokoelman XML
       download: Lataa {{changeset_xml_link}} tai {{osmchange_xml_link}}
-      osmchangexml: osmChange XML
+      feed: 
+        title: Muutoskokoelma {{id}}
+        title_comment: Muutoskokoelma {{id}} - {{comment}}
       title: Muutoskokoelma
     changeset_details: 
       belongs_to: "Käyttäjä:"
@@ -72,12 +73,19 @@ fi:
       created_at: "Avattu:"
       no_bounding_box: Tässä muutoskokoelmassa ei ole rajattua aluetta.
       show_area_box: Näytä rajattu alue
+    changeset_navigation: 
+      all: 
+        next_tooltip: Seuraava muutoskokoelma
+        prev_tooltip: Edellinen muutoskokoelma
     common_details: 
       changeset_comment: "Kommentti:"
       edited_at: "Muokattu:"
       edited_by: "Muokkaaja:"
       in_changeset: "Muutoskokoelma:"
       version: "Versio:"
+    containing_relation: 
+      entry: Relaatio {{relation_name}}
+      entry_role: Relaatio {{relation_name}} (rooli {{relation_role}})
     map: 
       deleted: Poistettu
       loading: Lataa tietoja...
@@ -98,6 +106,7 @@ fi:
     not_found: 
       sorry: Kohdetta {{type}} {{id}} ei ole olemassa.
       type: 
+        changeset: muutoskokoelma
         node: solmu
         relation: yhteys
         way: tie
@@ -121,6 +130,7 @@ fi:
     relation_member: 
       type: 
         node: Solmu
+        relation: Relaatio
         way: Tie
     start: 
       manually_select: Valitse pienempi alue
@@ -128,11 +138,19 @@ fi:
     start_rjs: 
       data_frame_title: Tiedot
       details: Tarkemmin
-      drag_a_box: Valitse alue kartalta hiirellä vetämällä
+      drag_a_box: Valitse alue kartalta hiirellä maalaamalla
       load_data: Lataa tiedot
       loading: Ladataan tietoja...
       manually_select: Rajaa pienempi alue käsin
       object_list: 
+        history: 
+          type: 
+            node: Piste [[id]]
+            way: Polku [[id]]
+        selected: 
+          type: 
+            node: Piste [[id]]
+            way: Polku [[id]]
         type: 
           node: Solmu
           way: Tie
@@ -143,7 +161,7 @@ fi:
     tag_details: 
       tags: "Tägit:"
     way: 
-      download: "{{download_xml_link}} tai {{view_history_link}}"
+      download: "{{download_xml_link}}, {{view_history_link}} tai {{edit_link}}"
       download_xml: Lataa XML
       edit: muokkaa
       view_history: näytä historia
@@ -176,11 +194,19 @@ fi:
     changesets: 
       area: Alue
       comment: Kommentti
-      id: ID
-      saved_at: "Tallennettu:"
+      saved_at: Tallennettu
       user: Käyttäjä
     list: 
       description: Tuoreet muutokset
+      description_bbox: Muutoskokoelmat alueella {{bbox}}
+      description_user: Käyttäjän {{user}} muutoskokoelmat
+      heading: Muutoskokoelmat
+      heading_bbox: Muutoskokoelmat
+      heading_user: Muutoskokoelmat
+      heading_user_bbox: Muutoskokoelmat
+      title: Muutoskokoelmat
+      title_bbox: Muutoskokoelmat alueella {{bbox}}
+      title_user: Käyttäjän {{user}} muutoskokoelmat
   diary_entry: 
     diary_comment: 
       comment_from: Kommentti käyttäjältä {{link_user}} {{comment_created_at}}
@@ -190,7 +216,7 @@ fi:
         other: "{{count}} kommenttia"
       comment_link: Kommentoi tätä kirjoitusta
       edit_link: Muokkaa päiväkirjamerkintää
-      posted_by: Käyttäjä {{link_user}} kirjoitti tämän {{created}} kielellä {{language}}
+      posted_by: Käyttäjä {{link_user}} kirjoitti tämän {{created}} kielellä {{language_link}}
       reply_link: Vastaa tähän kirjoitukseen viestillä
     edit: 
       body: "Teksti:"
@@ -239,14 +265,12 @@ fi:
       format: Tiedostomuoto
       format_to_export: Vientimuoto
       image_size: Kuvan koko
-      latitude: "Lat:"
       licence: Lisenssi
-      longitude: "Lon:"
       manually_select: Valitse pienempi alue
       mapnik_image: Mapnik-karttatason kuvatiedosto
-      max: maks.
+      max: enintään
       options: Asetukset
-      osm_xml_data: OpenStreetMap XML Data
+      osm_xml_data: OpenStreetMapin XML-muoto
       osmarender_image: Osmarender-karttatason kuvatiedosto
       output: Tulos
       paste_html: Kopioi ja liitä tämä HTML-koodi verkkosivullesi
@@ -281,18 +305,18 @@ fi:
       no_results: Mitään ei löytynyt
   layouts: 
     alt_donation: Tee lahjoitus
-    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
     donate_link_text: lahjoittaminen
     edit: Muokkaa
     edit_tooltip: Muokkaa karttoja
-    export: Vie
+    export: Vienti
     gps_traces: GPS-jäljet
-    help_wiki: Ohjeet & Wiki
+    help_wiki: Wiki ja ohjeet
     help_wiki_tooltip: Projektin ohje ja wiki
     history: Historia
+    history_tooltip: Muutoshistoria
     home: koti
     home_tooltip: Siirry kotisijaintiin
-    inbox: inbox ({{size}})
+    inbox: viestit ({{count}})
     inbox_tooltip: 
       one: Sinulla on yksi lukematon viesti.
       other: Sinulla on {{count}} lukematonta viestiä.
@@ -301,6 +325,7 @@ fi:
     intro_2: Voit selata, muokata ja käyttää yhteistyössä luotua karttatietoa kaikista maailman kolkista.
     intro_3: OpenStreetMapin verkkoliikenteen tarjoavat {{ucl}} ja {{bytemark}}.
     log_in: kirjaudu sisään
+    log_in_tooltip: Kirjaudu sisään tunnuksellasi
     logo: 
       alt_text: OpenStreetMap-logo
     logout: kirjaudu ulos
@@ -310,7 +335,7 @@ fi:
     osm_read_only: OpenStreetMapin tietokantaan ei toistaiseksi voi lähettää mitään välttämättömien ylläpitotöiden takia.
     shop: Kauppa
     sign_up: rekisteröidy
-    tag_line: The Free Wiki World Map
+    sign_up_tooltip: Muokkaaminen edellyttää käyttäjätunnusta
     user_diaries: Päiväkirjamerkinnät
     view: Kartta
     view_tooltip: Näytä kartat
@@ -318,8 +343,6 @@ fi:
     welcome_user_link_tooltip: Käyttäjäsivusi
   map: 
     coordinates: "Koordinaatit:"
-    edit: Edit
-    view: View
   message: 
     delete: 
       deleted: Viesti poistettu
@@ -342,7 +365,6 @@ fi:
       unread_button: Merkitse lukemattomaksi
     new: 
       back_to_inbox: Takaisin saapuneisiin
-      body: Body
       message_sent: Viesti lähetetty
       send_button: Lähetä
       send_message_to: Lähetä viesti käyttäjälle {{name}}
@@ -418,7 +440,10 @@ fi:
       js_1: Selaimesi ei tue JavaScriptiä tai sen suoritus on estetty.
       js_2: OpenStreetMap tarvitsee JavaScriptin liikuteltavaan karttaan.
       js_3: Jos et voi sallia JavaScriptiä, kokeile <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home karttakuvaselailinta</a>.
+      license: 
+        license_name: Creative Commons Nimeä-Tarttuva 2.0
       permalink: Ikilinkki
+      shortlink: Lyhytosoite
     key: 
       map_key: Karttamerkit
       table: 
@@ -477,14 +502,12 @@ fi:
     make_public: 
       made_public: Jäljestä tehtiin julkinen
     trace: 
-      ago: "{{time_in_words_ago}} ago"
       by: käyttäjältä
       count_points: "{{count}} pistettä"
       edit: muokkaa
       edit_map: Muokkaa karttaa
       in: tägeillä
       map: sijainti kartalla
-      more: more
       pending: JONOSSA
       private: YKSITYINEN
       public: JULKINEN
@@ -497,6 +520,7 @@ fi:
       upload_button: Tallenna
       upload_gpx: Tallenna GPX-jälki
       visibility: Näkyvyys
+      visibility_help: mitä tämä tarkoittaa?
     trace_header: 
       see_all_traces: Näytä kaikki jäljet
       see_just_your_traces: Listaa vain omat jäljet tai lähetä jälkiä
@@ -561,7 +585,7 @@ fi:
       press confirm button: Varmenna sähköpostiosoitteesi valitsemalla Vahvista.
       success: Sähköpostiosoite on vahvistettu. Kiitos liittymisestä!
     friend_map: 
-      nearby mapper: "Lähellä oleva kartoittaja:"
+      nearby mapper: "Lähellä oleva kartoittaja: [[nearby_user]]"
       your location: Oma sijaintisi
     go_public: 
       flash success: Kaikki tekemäsi muokkaukset ovat nyt julkisia.
@@ -606,7 +630,7 @@ fi:
       body: Käyttäjää {{user}} ei löytynyt. Tarkista oikeikirjoitus.
     remove_friend: 
       not_a_friend: "{{name}} ei ole enää kaverisi."
-      success: "{{name} poistettiin kaverilistastasi."
+      success: "{{name}} poistettiin kaverilistastasi."
     reset_password: 
       confirm password: "Vahvista salasana:"
       flash token bad: Tuntematon tunniste. Tarkista että URL on sama kuin postissasi.
@@ -623,7 +647,7 @@ fi:
       diary: päiväkirja
       edits: muokkaukset
       if set location: Jos määrittelet sijaintisi, alle ilmestyy nätti kartta. Voit määritellä sijaintisi {{settings_link}}.
-      km away: "{{distance}} km:n päässä"
+      km away: "{{count}} km:n päässä"
       m away: "{{count}} m päässä"
       mapper since: "Liittyi palveluun:"
       my diary: oma päiväkirja

config/locales/fr.yml

@@ -5,8 +5,6 @@ fr:
         body: Corps
       diary_entry: 
         language: Langue
-        latitude: Latitude
-        longitude: Longitude
         title: Titre
         user: Utilisateur
       friend: 
@@ -18,17 +16,11 @@ fr:
         sender: Expéditeur
         title: Titre
       trace: 
-        description: Description
-        latitude: Latitude
-        longitude: Longitude
         name: Nom
-        public: Public
         size: Taille
         user: Utilisateur
-        visible: Visible
       user: 
         active: Actif
-        description: Description
         display_name: Nom affiché
         email: Courriel
         languages: Langues
@@ -42,7 +34,6 @@ fr:
       diary_entry: Entrée du journal
       friend: Ami
       language: Langue
-      message: Message
       node: Nœud
       node_tag: Balise de nœud
       notifier: Notificateur
@@ -54,10 +45,8 @@ fr:
       old_way: Ancien chemin
       old_way_node: Nœud de l'ancien chemin
       old_way_tag: Balise de l'ancien chemin
-      relation: Relation
       relation_member: Membre de la relation
       relation_tag: Balise de relation
-      session: Session
       trace: Piste
       tracepoint: Point de la piste
       tracetag: Balise de la piste
@@ -69,44 +58,43 @@ fr:
       way_tag: Balise du chemin
   browse: 
     changeset: 
-      changeset: "Changeset : {{id}}"
-      changesetxml: Changeset XML
+      changeset: "Groupe de modifications : {{id}}"
+      changesetxml: Groupe de modifications XML
       download: Télécharger {{changeset_xml_link}} ou {{osmchange_xml_link}}
       feed: 
         title: Groupe de modifications {{id}}
         title_comment: Groupe de modifications {{id}} - {{comment}}
-      osmchangexml: osmChange XML
       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 groupe de modifications.
+      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 :"
       edited_at: "Édité le :"
       edited_by: "Édité par :"
-      in_changeset: "Dans le changeset :"
+      in_changeset: "Dans le groupe de modifications :"
       version: "Version :"
     containing_relation: 
-      entry: Relation {{relation_name}}
       entry_role: Relation {{relation_name}} (en tant que {{relation_role}})
     map: 
       deleted: Effacé
@@ -137,7 +125,6 @@ fr:
       type: 
         changeset: groupe de modifications
         node: nœud
-        relation: relation
         way: chemin
     paging_nav: 
       of: de
@@ -145,7 +132,6 @@ fr:
     relation: 
       download: "{{download_xml_link}} ou {{view_history_link}}"
       download_xml: Télécharger le XML
-      relation: Relation
       relation_title: "Relation : {{relation_name}}"
       view_history: voir l'historique
     relation_details: 
@@ -158,9 +144,9 @@ 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
         way: Chemin
     start: 
       manually_select: Sélectionner manuellement une zone différente
@@ -169,11 +155,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 +180,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: 
@@ -224,6 +210,7 @@ fr:
       big_area: (grand)
       no_comment: (aucun)
       no_edits: (aucune modification)
+      show_area_box: afficher la zone de la boîte
       still_editing: (en cours de modification)
       view_changeset_details: Afficher les détails du groupe de modifications
     changeset_paging_nav: 
@@ -232,7 +219,6 @@ fr:
     changesets: 
       area: Zone
       comment: Commentaire
-      id: ID
       saved_at: Sauvegardé à
       user: Utilisateur
     list: 
@@ -262,9 +248,7 @@ fr:
     edit: 
       body: "Message:"
       language: "Langue:"
-      latitude: "Latitude:"
       location: "Lieu:"
-      longitude: "Longitude:"
       marker_text: Emplacement de l'entrée du journal
       save_button: Sauvegarder
       subject: "Sujet:"
@@ -314,22 +298,17 @@ fr:
       embeddable_html: HTML incorporable.
       export_button: Exporter
       export_details: Les données d'OpenStreetMap sous <a href="http://creativecommons.org/licenses/by-sa/2.0/">licence Creative Commons attribution-partage à l'identique 2.0</a>.
-      format: Format
       format_to_export: Format à exporter
       image_size: Taille de l'image
       latitude: "Lat :"
-      licence: Licence
       longitude: "Lon :"
       manually_select: Sélectionner manuellement une autre zone
       mapnik_image: Image de Mapnik
-      max: max
-      options: Options
       osm_xml_data: Données XML d'OpenStreetMap
       osmarender_image: Image d'Osmarender
       output: Sortie
       paste_html: Collez le code HTML pour incorporer dans un site web.
       scale: Échelle
-      zoom: Zoom
     start_rjs: 
       add_marker: Ajouter un marqueur à la carte
       change_marker: Modifier la position du marqueur
@@ -345,7 +324,6 @@ fr:
         osm_namefinder: "{{types}} depuis <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
       types: 
         cities: Villes
-        places: Places
         towns: Villages
     description_osm_namefinder: 
       prefix: "{{distance}} {{direction}} de {{type}}"
@@ -376,7 +354,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 +369,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
@@ -429,7 +407,6 @@ fr:
     delete: 
       deleted: Message supprimé
     inbox: 
-      date: Date
       from: De
       my_inbox: Ma boîte de réception
       no_messages_yet: Vous n'avez actuellement aucun message. Pourquoi ne pas entrer en contact avec quelques {{people_mapping_nearby_link}} ?
@@ -459,7 +436,6 @@ fr:
       heading: Utilisateur ou message inexistant
       title: Utilisateur ou message inexistant
     outbox: 
-      date: Date
       inbox: boîte de réception
       my_inbox: Ma {{inbox_link}}
       no_sent_messages: Vous n'avez encore envoyé aucun message. Pourquoi ne pas entrez en contact avec quelques {{people_mapping_nearby_link}} ?
@@ -472,7 +448,6 @@ fr:
     read: 
       back_to_inbox: Revenir à la boîte de réception
       back_to_outbox: Revenir à la boîte d'envoi
-      date: Date
       from: De
       reading_your_messages: Lecture de vos messages
       reading_your_sent_messages: Lecture de vos messages envoyés
@@ -516,6 +491,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 +518,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
@@ -604,6 +581,7 @@ fr:
       list_tokens: "Les jetons suivants ont été émis aux applications en votre nom :"
       my_apps: Mes applications clientes
       my_tokens: Mes applications enregistrées
+      no_apps: Avez-vous une application qui aimerait s'enregistrer pour utiliser le standard {{oauth}} ? Vous devez enregistrer votre application web avant qu'elle ne puisse faire des requêtes OAuth sur ce service.
       register_new: Enregistrez votre application
       registered_apps: "Vous avez les applications clientes suivantes enregistrées :"
       revoke: Révoquer !
@@ -644,17 +622,17 @@ fr:
       js_2: OpenStreetMap utilise Javascript pour ses cartes glissantes.
       js_3: Si vous êtes dans l'incapacité d'utiliser Javascript, essayer d'utiliser le <a href='http://tah.openstreetmap.org/Browse/'>navigateur statique de Tiles@Home</a>.
       license: 
-        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,8 +649,10 @@ fr:
           commercial: Zone commerciale
           common: 
             - prairie
+            - Prairie
           construction: Routes en construction
           cycleway: Voie cyclable
+          destination: Accès de la destination
           farm: Ferme
           footway: Voie piétonne
           forest: Forêt
@@ -713,11 +693,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: 
@@ -760,7 +741,6 @@ fr:
     trace: 
       ago: il y a {{time_in_words_ago}}
       by: par
-      count_points: "{{count}} points"
       edit: modifier
       edit_map: Modifier la carte
       in: dans
@@ -772,7 +752,6 @@ fr:
       trace_details: Voir les détails du chemin
       view_map: Voir la carte
     trace_form: 
-      description: Description
       help: Aide
       tags: Balises
       tags_help: séparé par des virgules
@@ -818,10 +797,8 @@ 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:"
       make edits public button: Rendre toutes mes éditions publiques
       my settings: Mes options
       no home location: Vous n'avez pas indiqué l'emplacement de votre domicile.
@@ -915,7 +892,6 @@ fr:
       ago: (il y a {{time_in_words_ago}})
       change your settings: modifiez vos options
       delete image: Effacer l'image
-      description: Description
       diary: journal
       edits: éditions
       if set location: Si vous définissez un lieu, une jolie carte va apparaître en dessous. Vous pouvez définir votre lieu sur votre page {{settings_link}}.
@@ -935,7 +911,6 @@ fr:
       remove as friend: enlever en tant qu'ami
       send message: Envoyer un message
       settings_link_text: options
-      traces: traces
       upload an image: Envoyer une image
       user image heading: Image utilisateur
       user location: Emplacement de l'utilisateur

config/locales/fur.yml

@@ -0,0 +1,338 @@
+fur: 
+  activerecord: 
+    attributes: 
+      diary_entry: 
+        language: Lenghe
+        latitude: Latitudin
+        longitude: Longjitudin
+        title: Titul
+        user: Utent
+      friend: 
+        friend: Amì
+      message: 
+        title: Titul
+      trace: 
+        description: Descrizion
+        latitude: Latitudin
+        longitude: Longjitudin
+        name: Non
+        public: Public
+        size: Dimensions
+        user: Utent
+        visible: Visibil
+      user: 
+        active: Atîf
+        description: Descrizion
+        email: Pueste eletroniche
+        languages: Lenghis
+    models: 
+      changeset: Grup di cambiaments
+      country: Paîs
+      language: Lenghe
+      message: Messaç
+      relation: Relazion
+      session: Session
+      user: Utent
+  browse: 
+    changeset: 
+      changeset: "Grup di cambiaments: {{id}}"
+      changesetxml: Grup di cambiaments XML
+      download: Discjame {{changeset_xml_link}} o {{osmchange_xml_link}}
+      feed: 
+        title: Grup di cambiaments {{id}}
+        title_comment: Grup di cambiaments {{id}} - {{comment}}
+      title: Grup di cambiaments
+    changeset_details: 
+      belongs_to: "Al fâs part di:"
+      created_at: "Creât ai:"
+    changeset_navigation: 
+      all: 
+        next_tooltip: Grup di cambiaments sucessîf
+        prev_tooltip: Grup di cambiaments precedent
+      user: 
+        name_tooltip: Vîot i cambiaments di {{user}}
+        next_tooltip: Cambiament sucessîf di {{user}}
+        prev_tooltip: Cambiament precedent di {{user}}
+    common_details: 
+      changeset_comment: "Coment:"
+      edited_at: "Cambiât ai:"
+      edited_by: "Cambiât di:"
+      in_changeset: "Tal grup di cambiaments:"
+      version: "Version:"
+    map: 
+      larger: 
+        area: Viôt aree suntune mape plui grande
+        relation: Viôt la relazion suntune mape plui grande
+      loading: Daûr a cjamâ...
+    node: 
+      download_xml: Discjame XML
+      edit: cambie
+      view_history: cjale storic
+    node_details: 
+      coordinates: "Coordenadis:"
+    node_history: 
+      download: "{{download_xml_link}} o {{view_details_link}}"
+      download_xml: Discjame XML
+      view_details: cjale i detais
+    not_found: 
+      type: 
+        changeset: "Non dal file:"
+        relation: relazion
+    paging_nav: 
+      of: su
+    relation: 
+      download: "{{download_xml_link}} o {{view_history_link}}"
+      download_xml: Discjame XML
+      relation: Relazion
+      relation_title: "Relazion: {{relation_name}}"
+      view_history: cjale storic
+    relation_details: 
+      members: "Membris:"
+    relation_history: 
+      download: "{{count}} ponts"
+      download_xml: Discjame XML
+      relation_history: Storic relazion
+      view_details: cjale detais
+    relation_member: 
+      type: 
+        relation: Relazion
+    start: 
+      manually_select: Sielç a man une aree divierse
+    start_rjs: 
+      data_frame_title: Dâts
+      data_layer_name: Dâts
+      details: Detais
+      edited_by_user_at_timestamp: Cambiât di [[user]] ai [[timestamp]]
+      history_for_feature: Storic par [[feature]]
+      load_data: Cjame i dâts
+      loaded_an_area_with_num_features: "Tu âs cjamât une aree che e conten [[num_features]] carateristichis. In gjenerâl, cualchi sgarfadôr al podarès no rivâ a gjestî ben cheste cuantitât di dâts. I sgarfadôrs par solit a lavorin miôr se a mostrin mancul di 100 carataristichis ae volte: cualsisei altri numar al podarès ralentâ/no fâ plui rispuindi il sgarfadôr. Se tu sês sigûr di volê mostrâ chescj dâts, frache sul boton ca sot."
+      loading: Daûr a cjamâ...
+      manually_select: Sielç a man une aree divierse
+      object_list: 
+        back: Mostre liste dai ogjets
+        details: Detais
+        heading: di
+      show_history: Mostre storic
+      wait: Daûr a spietâ...
+      zoom_or_select: Ingrandìs o sielç la aree de mape che tu vuelis viodi
+    way: 
+      download_xml: Discjame XML
+      edit: cambie
+      view_history: cjale storic
+    way_history: 
+      download_xml: Discjame XML
+      view_details: cjale i detais
+  changeset: 
+    changeset: 
+      anonymous: Anonim
+      big_area: (grant)
+      no_comment: (nissun)
+      no_edits: (nissun cambiament)
+      view_changeset_details: Viôt detais dal grup di cambiaments
+    changeset_paging_nav: 
+      of: su
+      showing_page: Daûr a mostrâ la pagjine
+    changesets: 
+      area: Aree
+      comment: Coment
+      id: ID
+      saved_at: Salvât ai
+      user: Utent
+    list: 
+      description: Ultins cambiaments
+      description_bbox: Grups di cambiaments jentri di {{bbox}}
+      description_user: Grups di cambiaments di {{user}}
+      description_user_bbox: Grups di cambiaments di {{user}} jentri di {{bbox}}
+      heading: Grups di cambiaments
+      heading_bbox: Grups di cambiaments
+      heading_user: Grups di cambiaments
+      heading_user_bbox: Grups di cambiaments
+      title: Grups di cambiaments
+      title_bbox: Grups di cambiaments jentri di {{bbox}}
+      title_user: Grups di cambiaments di {{user}}
+      title_user_bbox: Grups di cambiaments di {{user}} jentri di {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: Coment di {{link_user}}  ai {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 coment
+        other: "{{count}} coments"
+      comment_link: Scrîf un coment
+    edit: 
+      language: "Lenghe:"
+      latitude: "Latitudin:"
+      location: "Lûc:"
+      longitude: "Longjitudin:"
+      save_button: Salve
+      subject: "Sogjet:"
+      use_map_link: dopre mape
+    feed: 
+      all: 
+        description: Lis ultimis vôs dai diaris dai utents di OpenStreetMap
+        title: Vôs dai diaris di OpenStreetMap
+    list: 
+      in_language_title: Vôs dai diaris par {{language}}
+      new: Gnove vôs dal diari
+      title: Diaris dai utents
+    view: 
+      leave_a_comment: Lasse un coment
+      login: Jentre
+      login_to_leave_a_comment: "{{login_link}} par lassâ un coment"
+      save_button: Salve
+      user_title: Diari di {{user}}
+  export: 
+    start: 
+      area_to_export: Aree di espuartâ
+      export_button: Espuarte
+      format_to_export: Formât di espuartâ
+      latitude: "Lat:"
+      licence: Licence
+      longitude: "Lon:"
+      options: Opzions
+    start_rjs: 
+      export: Espuarte
+      view_larger_map: Viôt une mape plui grande
+  geocoder: 
+    description: 
+      types: 
+        cities: Citâts
+        places: Puescj
+        towns: Citadinis
+    results: 
+      no_results: Nissun risultât
+  layouts: 
+    donate_link_text: donant
+    edit: Cambie
+    export: Espuarte
+    history: Storic
+    home: lûc iniziâl
+    log_in: jentre
+    logo: 
+      alt_text: Logo di OpenStreetMap
+    logout: jes
+    shop: Buteghe
+    tag_line: Il WikiMapeMont libar
+    user_diaries: Diaris dai utents
+    view: Viôt
+    view_tooltip: Viôt lis mapis
+    welcome_user: Benvignût/de, {{user_link}}
+  map: 
+    coordinates: "Coordenadis:"
+    edit: Cambie
+    view: Viôt
+  message: 
+    delete: 
+      deleted: Messaç eliminât
+    inbox: 
+      date: Date
+      from: Di
+      subject: Sogjet
+    message_summary: 
+      delete_button: Elimine
+      read_button: Segne come let
+      reply_button: Rispuint
+      unread_button: Segne come no let
+    new: 
+      message_sent: Messaç mandât
+      send_button: Mande
+      send_message_to: Mande un gnûf messaç a {{name}}
+      subject: Sogjet
+      title: Mande messaç
+    outbox: 
+      date: Date
+      subject: Sogjet
+      to: A
+    read: 
+      date: Date
+      from: Di
+      reply_button: Rispuint
+      subject: Sogjet
+      to: A
+    sent_message_summary: 
+      delete_button: Elimine
+  site: 
+    index: 
+      permalink: LeamPermanent
+      shortlink: LeamCurt
+    key: 
+      map_key: Leiende
+      table: 
+        entry: 
+          cemetery: Simiteri
+          centre: Centri sportîf
+          industrial: Aree industriâl
+          military: Aree militâr
+          park: Parc
+          pitch: Cjamp sportîf
+          school: 
+            - Scuele
+    search: 
+      search: Cîr
+      submit_text: Va
+      where_am_i: Dulà soio?
+    sidebar: 
+      close: Siere
+      search_results: Risultâts de ricercje
+  trace: 
+    edit: 
+      description: "Descrizion:"
+      download: discjame
+      points: "Ponts:"
+      save_button: Salve cambiaments
+      visibility: "Visibilitât:"
+    trace: 
+      by: di
+      map: mape
+      more: plui
+    trace_form: 
+      help: Jutori
+    view: 
+      delete_track: Elimine cheste trace
+      description: "Descrizion:"
+      map: mape
+      points: "Ponts:"
+      visibility: "Visibilitât:"
+  user: 
+    account: 
+      latitude: "Latitudin:"
+      longitude: "Longjitudin:"
+      preferred languages: "Lenghis preferidis:"
+      profile description: "Descrizion dal profîl:"
+      public editing: 
+        disabled link text: parcè no puedio cambiâ?
+        enabled link text: ce isal chest?
+      return to profile: Torne al profîl
+      save changes button: Salve cambiaments
+    confirm: 
+      button: Conferme
+    confirm_email: 
+      button: Conferme
+    friend_map: 
+      your location: La tô posizion
+    login: 
+      create_account: cree un profîl
+      email or username: "Direzion di pueste eletroniche o non utent:"
+      heading: Jentre
+      login_button: Jentre
+      title: Jentre
+    new: 
+      email address: "Direzion di pueste eletroniche:"
+      heading: Cree un account utent
+    view: 
+      add image: Zonte figure
+      change your settings: cambie lis tôs impostazions
+      description: Descrizion
+      diary: diari
+      edits: cambiaments
+      km away: a {{count}}km di distance
+      mapper since: "Al mape dai:"
+      my diary: il gno diari
+      my edits: miei cambiaments
+      nearby users: "Utents dongje:"
+      no friends: No tu âs ancjemò nissun amì.
+      send message: mande messaç
+      settings_link_text: impostazions
+      user image heading: Figure dal utent
+      user location: Lûc dal utent
+      your friends: I tiei amîs

config/locales/gcf.yml

@@ -150,10 +150,8 @@ gcf:
       js_2: OpenStreetMap ka sèvi èvè Javascript pou kat glisad.
       js_3: Si ou pé pa sèvi èvè Javascript, eséyé sèvi èvè<a href='http://tah.openstreetmap.org/Browse/'>navigatè fix a Tiles@Home</a>.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: Asi lisans {{license_name}} pou {{project_name}} èvè moun ay.
         project_name: projè OpenStreetMap
-      permalink: Permalink
     key: 
       map_key: Léjann a kat la
     search: 

config/locales/gsw.yml

@@ -1,7 +1,17 @@
 gsw: 
   browse: 
+    changeset: 
+      changesetxml: Changeset-XML
+      download: "{{changeset_xml_link}} oder {{osmchange_xml_link}} abelade"
     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,9 +20,19 @@ gsw:
         other: "Het die {{count}} Wäg:"
       no_bounding_box: Fir des Changeset isch kei Beryych gspycheret.
       show_area_box: Beryychsgränzen aazeige
-    containing_relation: 
-      entry: Relation {{relation_name}}
-      entry_role: Relation {{relation_name}} (as {{relation_role}})
+    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:"
     map: 
       deleted: Glescht
       larger: 
@@ -47,6 +67,10 @@ gsw:
     paging_nav: 
       of: vu
       showing_page: Syte zeige
+    relation: 
+      download: "{{download_xml_link}} oder {{view_history_link}}"
+      download_xml: XML abelade
+      view_history: Chronik aazeige
     relation_details: 
       members: "Mitglider:"
       part_of: "Mitglid vu:"
@@ -57,11 +81,12 @@ gsw:
       relation_history_title: "Relations-Chronik: {{relation_name}}"
       view_details: Einzelheite aaluege
     relation_member: 
-      entry_role: "{{type}} {{name}} as {{role}}"
       type: 
         node: Chnote
-        relation: Relation
         way: Wäg
+    start: 
+      manually_select: En andere Chartenuusschnitt vu Hand uuswehle
+      view_data: Date vum aktuälle Chartenuusschnitt aazeige
     start_rjs: 
       data_frame_title: Date
       data_layer_name: Date
@@ -113,3 +138,34 @@ gsw:
       view_details: Einzelheite aazeige
       way_history: Wäg-Gschicht
       way_history_title: "Gschicht vum Wäg: {{way_name}}"
+  trace: 
+    create: 
+      trace_uploaded: Dyy GPX-Datei isch uffeglade wore un wartet uf d Ufnahm in d Datebank. Des gschiht normalerwyys innerhalb vun ere halbe Stund, derno wird Dir e Bstetigungs-E-Mail gschickt.
+      upload_trace: E GPS-Track uffelade
+    edit: 
+      description: "Bschryybig:"
+      download: abelade
+      edit: bearbeite
+      filename: "Dateiname:"
+      heading: Track {{name}} bearbeite
+      map: Charte
+      owner: "Bsitzer:"
+      points: "Pinkt:"
+      save_button: Änderige spychere
+      start_coord: "Aafangskoordinate:"
+      tags_help: Trännig dur Komma
+      title: Am Bearbeite vum Track {{name}}
+      uploaded_at: "Uffegladen am:"
+      visibility: "Sichtbarkeit:"
+      visibility_help: Was heißt des?
+    trace: 
+      count_points: "{{count}} Pinkt"
+      edit_map: Charte bearbeite
+      pending: HÄNGIG
+      private: PRIVAT
+      view_map: Charten aazeige
+    trace_header: 
+      see_all_traces: Alli Tracks aaluege
+      see_just_your_traces: Eigeni GPS-Tracks aazeige oder neji uffelade
+      see_your_traces: Eigeni GPS-Tracks aazeige
+      traces_waiting: "{{count}} vu Dyyne Tracks sin zur Zyt in dr Warteschlang. Bitte wart, bis die fertig sin go d Verarbeitig nit fir anderi Nutzer blockiere."

config/locales/he.yml

@@ -1,8 +1,6 @@
 he: 
   activerecord: 
     attributes: 
-      diary_comment: 
-        body: Body
       diary_entry: 
         language: שפה
         latitude: קו רוחב
@@ -21,168 +19,144 @@ he:
         description: תאור
         latitude: קו רוחב
         longitude: קו אורך
-        name: Name
-        public: Public
-        size: Size
         user: משתמש
-        visible: Visible
       user: 
         active: פעיל
         description: תאור
-        display_name: Display Name
-        email: Email
         languages: שפות
         pass_crypt: סיסמה
     models: 
-      acl: Access Control List
-      changeset: Changeset
-      changeset_tag: Changeset Tag
       country: ארץ
       diary_comment: תגובה ליומן
       diary_entry: רשומה ביומן
-      friend: Friend
       language: שפה
       message: מסר
-      node: Node
-      node_tag: Node Tag
-      notifier: Notifier
-      old_node: Old Node
-      old_node_tag: Old Node Tag
-      old_relation: Old Relation
-      old_relation_member: Old Relation Member
-      old_relation_tag: Old Relation Tag
-      old_way: Old Way
-      old_way_node: Old Way Node
-      old_way_tag: Old Way Tag
-      relation: Relation
-      relation_member: Relation Member
-      relation_tag: Relation Tag
-      session: Session
-      trace: Trace
-      tracepoint: Trace Point
-      tracetag: Trace Tag
       user: משתמש
-      user_preference: User Preference
-      user_token: User Token
-      way: Way
-      way_node: Way Node
-      way_tag: Way Tag
   browse: 
     changeset: 
-      changeset: "Changeset: {{id}}"
-      changesetxml: Changeset XML
-      download: Download {{changeset_xml_link}} or {{osmchange_xml_link}}
-      osmchangexml: osmChange XML
-      title: Changeset
+      download: הורדת {{changeset_xml_link}} או {{osmchange_xml_link}}
     changeset_details: 
-      belongs_to: "Belongs to:"
-      bounding_box: "Bounding box:"
-      box: box
-      closed_at: "Closed at:"
-      created_at: "Created at:"
-      has_nodes: "Has the following {{count}} nodes:"
-      has_relations: "Has the following {{count}} relations:"
-      has_ways: "Has the following {{count}} ways:"
-      no_bounding_box: No bounding box has been stored for this changeset.
-      show_area_box: Show Area Box
+      belongs_to: "שייך ל־:"
+      bounding_box: "תיבה תוחמת:"
+      box: תיבה
+      created_at: "נוצר בתאריך:"
+      show_area_box: הצגת תיבת תחום
+    changeset_navigation: 
+      user: 
+        name_tooltip: צפייה בעריכות של {{user}}
+        next_tooltip: העריכה הבאה ע"י {{user}}
+        prev_tooltip: העריכה הקודמת ע"י {{user}}
     common_details: 
-      edited_at: "Edited at:"
-      edited_by: "Edited by:"
-      in_changeset: "In changeset:"
-      version: "Version:"
+      changeset_comment: "הערה:"
     containing_relation: 
-      entry: Relation {{relation_name}}
-      entry_role: Relation {{relation_name}} (as {{relation_role}})
+      entry: קשר {{relation_name}}
+      entry_role: קשר {{relation_name}} (בתור {{relation_role}})
     map: 
-      deleted: Deleted
-      loading: Loading...
+      deleted: נמחק
+      larger: 
+        area: צפייה בשטח במפה גדולה יותר
+        node: צפייה בצומת במפה גדולה יותר
+        relation: צפייה בקשר במפה גדולה יותר
+        way: צפייה בדרך במפה גדולה יותר
+      loading: בטעינה...
     node: 
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: Download XML
-      node: Node
-      node_title: "Node: {{node_name}}"
-      view_history: view history
+      download: "{{download_xml_link}} או {{view_history_link}}"
+      download_xml: הורדת XML
+      edit: עריכה
+      node: צומת
+      node_title: "צומת: {{node_name}}"
+      view_history: צפייה בהיסטוריה
     node_details: 
-      coordinates: "Coordinates:"
-      part_of: "Part of:"
+      coordinates: "קואורדינטות:"
+      part_of: "חלק מ־:"
     node_history: 
-      download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: Download XML
-      node_history: Node History
-      view_details: view details
+      download_xml: הורדת XML
+      node_history: היסטוריית הצומת
+      node_history_title: "היסטוריית הצומת: {{node_name}}"
+      view_details: צפייה בפרטים
     not_found: 
-      sorry: Sorry, the {{type}} with the id {{id}}, could not be found.
+      sorry: אנו מתנצלים, אך ה{{type}} בעל המזהה {{id}}, לא נמצא.
+      type: 
+        node: צומת
+        relation: קשר
+        way: דרך
     paging_nav: 
-      of: of
-      showing_page: Showing page
+      of: מתוך
+      showing_page: הצגת דף
     relation: 
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: Download XML
-      relation: Relation
-      relation_title: "Relation: {{relation_name}}"
-      view_history: view history
+      relation: קשר
     relation_details: 
-      members: "Members:"
-      part_of: "Part of:"
+      members: "חברים:"
+      part_of: "חלק מ־:"
     relation_history: 
-      relation_history: Relation History
-      relation_history_title: "Relation History: {{relation_name}}"
-    start: 
-      manually_select: Manually select a different area
-      view_data: View data for current map view
+      download: "{{download_xml_link}} או {{view_details_link}}"
+      download_xml: הורדת XML
+      relation_history: היסטוריית הקישור
+      relation_history_title: "היסטוריית הקישור: {{relation_name}}"
+      view_details: צפייה בפרטים
+    relation_member: 
+      entry_role: "{{type}} {{name}} בתור {{role}}"
+      type: 
+        node: צומת
+        relation: קשר
+        way: דרך
     start_rjs: 
-      data_frame_title: Data
-      details: Details
-      drag_a_box: Drag a box on the map to select an area
-      edited_by_user_at_timestamp: Edited by [[user]] at [[timestamp]]
-      history_for_feature: History for [[feature]]
-      load_data: Load Data
-      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quanity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
-      loading: Loading...
-      manually_select: Manually select a different area
-      private_user: private user
-      show_history: Show History
-      unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
-      wait: Wait...
-      zoom_or_select: Zoom in or select an area of the map to view
+      data_frame_title: נתונים
+      data_layer_name: נתונים
+      details: פרטים
+      edited_by_user_at_timestamp: נערך על ידי [[user]] ב־[[timestamp]]
+      history_for_feature: ההיסטוריה של [[feature]]
+      load_data: טעינת נתונים
+      loaded_an_area_with_num_features: "האזור שנטען מכיל [[num_features]] תכונות. באופן כללי, רב הדפדפנים לא יוכלו להתמודד עם הצגה של כזאת כמות של נתונים. לרב, דפדפנים עובדים באופן מיטבי בהצגת פחות מ־100 תכונות בו־זמנית: ביצוע משימות נוספות עלולות לגרום לדפדפן להיות איטי/להתקע. אם אכן יש צורך להציג כמות כזאת של נתונים, ניתן ללחוץ על הלחצן שלהלן."
+      loading: בטעינה...
+      manually_select: בחירת אזור אחר ידנית
+      object_list: 
+        api: אחזור אזור זה מה־API
+        back: הצגת רשימת הפריטים
+        details: פרטים
+        heading: רשימת פריטים
+        history: 
+          type: 
+            node: צומת [[id]]
+            way: דרך [[id]]
+        selected: 
+          type: 
+            node: צומת [[id]]
+            way: דרך [[id]]
+        type: 
+          node: צומת
+          way: דרך
+      private_user: משתמש פרטי
+      show_history: הצגת ההיסטוריה
+      unable_to_load_size: "לא ניתן לטעון: תיבה תוחמת בגודל [[bbox_size]] היא גדולה מדי (מוכרחה להיות קטנה מאשר {{max_bbox_size}})"
+      wait: נא להמתין...
+      zoom_or_select: התקרבות או בחירה אזור במפה לצפייה
     tag_details: 
-      tags: "Tags:"
+      tags: "תגיות:"
     way: 
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: Download XML
-      view_history: view history
-      way: Way
-      way_title: "Way: {{way_name}}"
+      download: "{{download_xml_link}} או {{view_history_link}}"
+      download_xml: הורדת XML
+      edit: עריכה
+      view_history: צפייה בהיסטוריה
+      way: דרך
+      way_title: "דרך: {{way_name}}"
     way_details: 
       also_part_of: 
-        one: also part of way {{related_ways}}
-        other: also part of ways {{related_ways}}
-      nodes: "Nodes:"
-      part_of: "Part of:"
+        one: גם כן חלק מהדרך {{related_ways}}
+        other: גם כן חלק מהדרכים {{related_ways}}
+      nodes: "צמתים:"
+      part_of: "חלק מ־:"
     way_history: 
-      download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: Download XML
-      view_details: view details
-      way_history: Way History
-      way_history_title: "Way History: {{way_name}}"
+      download: "{{download_xml_link}} או {{view_details_link}}"
+      download_xml: הורדת XML
+      view_details: צפייה בפרטים
+      way_history: היסטוריית הדרך
+      way_history_title: "היסטוריית הדרך: {{way_name}}"
   changeset: 
-    changeset: 
-      anonymous: Anonymous
-      big_area: (big)
-      no_comment: (none)
-      no_edits: (no edits)
-      show_area_box: show area box
-      still_editing: (still editing)
-      view_changeset_details: View changeset details
-    changeset_paging_nav: 
-      of: of
-      showing_page: Showing page
     changesets: 
-      area: Area
-      comment: Comment
-      id: ID
-      saved_at: Saved at
       user: משתמש
+    list: 
+      description: שינויים אחרונים
   diary_entry: 
     diary_comment: 
       comment_from: "{{comment_created_at}}ב  {{link_user}}תגובה מ"
@@ -190,407 +164,221 @@ he:
       comment_count: 
         one: תגובה 1
         other: "{{count}} תגובות"
-      comment_link: Comment on this entry
       edit_link: עריכת רשומה
-      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
-      reply_link: Reply to this entry
     edit: 
-      body: "Body:"
       language: :שפה
       latitude: :קו רוחב
-      location: "Location:"
       longitude: :קו אורך
-      marker_text: Diary entry location
-      save_button: Save
-      subject: "Subject:"
-      title: Edit diary entry
-      use_map_link: use map
     list: 
-      new: New Diary Entry
-      new_title: Compose a new entry in your user diary
-      newer_entries: Newer Entries
-      no_entries: No diary entries
-      older_entries: Older Entries
-      recent_entries: "Recent diary entries:"
-      title: Users' diaries
-      user_title: "{{user}}'s diary"
-    new: 
-      title: New Diary Entry
+      in_language_title: רשומות יומן ב{{language}}
     no_such_entry: 
-      body: Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: "No entry with the id: {{id}}"
+      title: אין כזו רשומה ביומן
     no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: המשתמש {{user}} אינו קיים
+      title: אין משתמש כזה
     view: 
-      leave_a_comment: Leave a comment
-      save_button: Save
-      title: Users' diaries | {{user}}
-      user_title: "{{user}}'s diary"
-  export: 
-    start: 
-      add_marker: Add a marker to the map
-      area_to_export: Area to Export
-      embeddable_html: Embeddable HTML
-      export_button: Export
-      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
-      format: Format
-      format_to_export: Format to Export
-      image_size: Image Size
-      latitude: "Lat:"
-      licence: Licence
-      longitude: "Lon:"
-      manually_select: Manually select a different area
-      mapnik_image: Mapnik Image
-      max: max
-      options: Options
-      osm_xml_data: OpenStreetMap XML Data
-      osmarender_image: Osmarender Image
-      output: Output
-      paste_html: Paste HTML to embed in website
-      scale: Scale
-      zoom: Zoom
-    start_rjs: 
-      add_marker: Add a marker to the map
-      change_marker: Change marker position
-      click_add_marker: Click on the map to add a marker
-      drag_a_box: Drag a box on the map to select an area
-      export: Export
-      manually_select: Manually select a different area
-      view_larger_map: View Larger Map
+      login: כניסה
+      login_to_leave_a_comment: בצעו {{login_link}} כדי להשאיר תגובה
   geocoder: 
-    results: 
-      no_results: No results found
+    description: 
+      types: 
+        cities: ערים
+        places: מקומות
+        towns: עיירות
+    direction: 
+      east: מזרח
+      north: צפון
+      north_east: צפון-מזרח
+      north_west: צפון-מערב
+      south: דרום
+      south_east: דרום-מזרח
+      south_west: דרום-מערב
+      west: מערב
+    distance: 
+      one: בערך קילומטר
+      other: בערך {{count}} ק"מ
+      zero: פחות מקילומטר
   layouts: 
-    alt_donation: Make a Donation
-    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
-    donate_link_text: donating
     edit: עריכה
+    edit_tooltip: עריכת מפות
     export: יצוא
-    gps_traces: GPS Traces
-    help_wiki: Help &amp; Wiki
+    export_tooltip: ייצוא נתוני המפה
+    gps_traces_tooltip: ניהול מסלולים
+    help_wiki_tooltip: עזרה ואתר ויקי עבור המיזם
     history: היסטוריה
     home: הביתה
-    inbox: inbox ({{count}})
+    home_tooltip: מעבר למיקום הבית
+    inbox_tooltip: 
+      one: תיבת הדואר הנכנס שלכם מכילה הודעה אחת שלא נקראה
+      other: תיבת הדואר הנכנס שלכם מכילה {{count}} הודעות שלא נקראו
+      zero: תיבת הדואר הנכנס שלכם אינה מכילה הודעות שלא נקראו
     intro_1: .היא מפה בחינם של כל העולם, וחופשית לעריכה. יוצרים אותה אנשים כמוך OpenStreetMap
     intro_2: .מאפשרת  לך לראות, לערוך ולהשתמש בנתונים גיאוגרפיים בצורה שיתופית מכל מקום בעולם OpenStreetMap
-    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
     log_in: כניסה לחשבון
+    log_in_tooltip: כניסה עם חשבון קיים
+    logo: 
+      alt_text: הלוגו של OpenStreetMap
     logout: יציאה מהחשבון
-    news_blog: News blog
-    osm_offline: The OpenStreetMap database is currently offline while essential database maintenance work is carried out.
-    osm_read_only: The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
-    shop: Shop
+    logout_tooltip: ניתוק
+    news_blog_tooltip: בלוג חדשות אודות OpenStreetMap, נתונים גאוגרפיים חופשיים וכו'.
     sign_up: הרשמה
-    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
+    sign_up_tooltip: יצירת חשבון לעריכה
     tag_line: ויקי חופשי של מפת העולם
     user_diaries: יומני משתמשים
+    user_diaries_tooltip: צפייה ביומני המשתמש
     view: תצוגה
+    view_tooltip: צפייה במפות
     welcome_user: "{{user_link}}ברוך הבא"
+    welcome_user_link_tooltip: דף המשתמש שלך
   map: 
-    coordinates: "Coordinates:"
     edit: עריכה
     view: תצוגה
   message: 
-    inbox: 
-      date: Date
-      from: From
-      my_inbox: My inbox
-      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
-      outbox: outbox
-      people_mapping_nearby: people mapping nearby
-      subject: Subject
-      title: Inbox
-      you_have: You have {{new_count}} new messages and {{old_count}} old messages
-    mark: 
-      as_read: Message marked as read
-      as_unread: Message marked as unread
+    delete: 
+      deleted: ההודעה נמחקה
     message_summary: 
-      read_button: Mark as read
-      reply_button: Reply
-      unread_button: Mark as unread
-    new: 
-      back_to_inbox: Back to inbox
-      body: Body
-      message_sent: Message sent
-      send_button: Send
-      send_message_to: Send a new message to {{name}}
-      subject: Subject
-      title: Send message
+      delete_button: מחיקה
     no_such_user: 
-      body: Sorry there is no user or message with that name or id
-      heading: No such user or message
-    outbox: 
-      date: Date
-      inbox: inbox
-      my_inbox: My {{inbox_link}}
-      no_sent_messages: You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
-      outbox: outbox
-      people_mapping_nearby: people mapping nearby
-      subject: Subject
-      title: Outbox
-      to: To
-      you_have_sent_messages: You have {{sent_count}} sent messages
-    read: 
-      back_to_inbox: Back to inbox
-      back_to_outbox: Back to outbox
-      date: Date
-      from: From
-      reading_your_messages: Reading your messages
-      reading_your_sent_messages: Reading your sent messages
-      reply_button: Reply
-      subject: Subject
-      title: Read message
-      to: To
-      unread_button: Mark as unread
-  notifier: 
-    diary_comment_notification: 
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
-      header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      hi: Hi {{to_user}},
-    friend_notification: 
-      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
-    signup_confirm_html: 
-      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
-      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: You can watch an {{introductory_video_link}}.
-      more_videos: There are {{more_videos_link}}.
-      more_videos_here: more videos here
-      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
-      video_to_openstreetmap: introductory video to OpenStreetMap
-      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
-    signup_confirm_plain: 
-      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
-      click_the_link_2: account and read on for more information about OpenStreetMap.
-      current_user_1: A list of current users in categories, based on where in the world
-      current_user_2: "they are, is available from:"
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      user_wiki_1: It is recommended that you create a user wiki page, which includes
-      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+      title: אין כזה משתמש או הודעה
+    sent_message_summary: 
+      delete_button: מחיקה
+  oauth: 
+    oauthorize: 
+      allow_read_prefs: קריאת העדפות המשתמש שלך.
+      allow_write_api: שינוי המפה.
+      allow_write_gpx: העלאת עקבות GPS.
   site: 
     edit: 
-      anon_edits_link_text: Find out why this is the case.
-      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
-      not_public: You haven't set your edits to be public.
-      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
-      user_page_link: user page
     index: 
-      js_1: You are either using a browser that doesn't support javascript, or you have disabled javascript.
-      js_2: OpenStreetMap uses javascript for its slippy map.
-      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
-      license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
-        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
-        project_name: OpenStreetMap project
-      permalink: Permalink
+      shortlink: קישור מקוצר
     key: 
-      map_key: Map key
+      table: 
+        entry: 
+          allotments: שטחים חקלאיים
+          bridleway: מסלול לרכיבת סוסים
+          brownfield: אזור תעשיה נטוש
+          byway: דרך צדדית
+          cable: 
+            - רכבל
+          cemetery: בית עלמין
+          centre: מרכז ספורט
+          commercial: אזור מסחרי
+          common: 
+            - מרעה
+            - מרעה
+          cycleway: דרך לאופניים
+          farm: חווה
+          footway: דרך להולכי רגל
+          forest: יער
+          golf: מסלול גולף
+          heathland: שדה פרא
+          industrial: אזור תעשיה
+          lake: 
+            - אגם
+          military: אזור צבאי
+          motorway: כביש מהיר
+          park: פארק
+          primary: כביש ראשי
+          rail: מסילת ברזל
+          reserve: שמורת טבע
+          resident: אזור מגורים
+          runway: 
+            - דרך למוניות
+            - דרך למוניות
+          school: 
+            - בית ספר
+            - אוניברסיטה
+          secondary: כביש משני
+          station: תחנת רכבת
+          subway: רכבת תחתית
+          tourist: אתר תיירותי
+          tram: 
+            - רכבת קלה
+          unclassified: דרך בלתי מוגדרת
+          wood: חורשה
     search: 
-      search: Search
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-      submit_text: Go
-      where_am_i: Where am I?
-    sidebar: 
-      close: Close
-      search_results: Search Results
   trace: 
-    create: 
-      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
-      upload_trace: Upload GPS Trace
-    delete: 
-      scheduled_for_deletion: Track scheduled for deletion
     edit: 
       description: :תאור
+      download: הורדה
       edit: עריכה
-      filename: "Filename:"
-      owner: "Owner:"
-      points: "Points:"
-      save_button: Save Changes
-      start_coord: "Start coordinate:"
-      tags: "Tags:"
-      uploaded_at: "Uploaded at:"
-    list: 
-      public_traces: Public GPS traces
-      public_traces_from: Public GPS traces from {{user}}
-      tagged_with: " tagged with {{tags}}"
-      your_traces: Your GPS traces
-    make_public: 
-      made_public: Track made public
+      heading: עריכת המסלול {{name}}
+      map: מפה
+      tags_help: מופרד בפסיקים
+      visibility_help: מה זה אומר?
     no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      title: אין משתמש כזה
     trace: 
-      ago: "{{time_in_words_ago}} ago"
-      by: by
-      count_points: "{{count}} points"
       edit: עריכה
-      edit_map: Edit Map
-      in: in
-      map: map
-      more: more
-      pending: PENDING
-      private: PRIVATE
-      public: PUBLIC
-      trace_details: View Trace Details
-      view_map: View Map
     trace_form: 
       description: תאור
-      help: Help
-      tags: Tags
-      upload_button: Upload
-      upload_gpx: Upload GPX File
-    trace_header: 
-      see_all_traces: See all traces
-      see_just_your_traces: See just your traces, or upload a trace
-      see_your_traces: See all your traces
-      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
-    trace_optionals: 
-      tags: Tags
-    trace_paging_nav: 
-      of: of
-      showing: Showing page
+      tags_help: מופרד בפסיקים
+      visibility: גלוי
+      visibility_help: מה זאת אומרת?
     view: 
-      delete_track: Delete this track
       description: :תאור
-      download: download
       edit: עריכה
-      edit_track: Edit this track
-      filename: "Filename:"
-      heading: Viewing trace {{name}}
-      map: map
-      none: None
-      owner: "Owner:"
-      pending: PENDING
-      points: "Points:"
-      start_coordinates: "Start coordinate:"
       tags: Tags
-      trace_not_found: Trace not found!
-      uploaded: "Uploaded at:"
+      visibility: "גלוי:"
   user: 
     account: 
-      email never displayed publicly: (never displayed publicly)
-      flash update success: User information updated successfully.
-      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
-      home location: "Home Location:"
+      home location: "מיקום הבית:"
       latitude: :קו רוחב
       longitude: :קו אורך
-      make edits public button: Make all my edits public
-      my settings: My settings
-      no home location: You have not entered your home location.
-      preferred languages: "Preferred Languages:"
-      profile description: "Profile Description:"
+      my settings: ההגדרות שלי
       public editing: 
-        disabled: Disabled and cannot edit data, all previous edits are anonymous.
-        disabled link text: why can't I edit?
-        enabled: Enabled. Not anonymous and can edit data.
+        disabled link text: מדוע איני יכול לערוך?
         enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        enabled link text: what's this?
-        heading: "Public editing:"
-      return to profile: Return to profile
-      save changes button: Save Changes
-      title: Edit account
-      update home location on click: Update home location when I click on the map?
+        enabled link text: מה זה?
+      save changes button: שמירת השינויים
     confirm: 
-      button: Confirm
-      failure: A user account with this token has already been confirmed.
-      heading: Confirm a user account
-      press confirm button: Press the confirm button below to activate your account.
-      success: Confirmed your account, thanks for signing up!
-    confirm_email: 
-      button: Confirm
-      failure: An email address has already been confirmed with this token.
-      heading: Confirm a change of email address
-      press confirm button: Press the confirm button below to confirm your new email address.
-      success: Confirmed your email address, thanks for signing up!
+      heading: אימות חשבון משתמש
     friend_map: 
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-      your location: Your location
-    go_public: 
-      flash success: All your edits are now public, and you are now allowed to edit.
+      your location: מיקומך
     login: 
-      account not active: Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account.
-      auth failure: Sorry, couldn't log in with those details.
-      create_account: create an account
-      email or username: "Email Address or Username:"
-      heading: Login
-      login_button: Login
-      lost password link: Lost your password?
-      password: "Password:"
-      please login: Please login or {{create_user_link}}.
-      title: Login
+      create_account: יצירת חשבון
+      login_button: כניסה
+      password: "סיסמה:"
+      title: כניסה
     lost_password: 
-      email address: "Email Address:"
-      heading: Forgotten Password?
+      email address: "כתובת דוא\"ל:"
       new password button: Send me a new password
-      notice email cannot find: Couldn't find that email address, sorry.
-      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
       title: lost password
-    make_friend: 
-      already_a_friend: You are already friends with {{name}}.
-      failed: Sorry, failed to add {{name}} as a friend.
-      success: "{{name}} is now your friend."
     new: 
-      confirm email address: "Confirm Email Address:"
-      confirm password: "Confirm Password:"
-      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
-      display name: "Display Name:"
-      email address: "Email Address:"
-      fill_form: Fill in the form and we'll send you a quick email to activate your account.
-      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
-      heading: Create a User Account
-      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
-      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
-      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
-      password: "Password:"
-      signup: Signup
-      title: Create account
+      display name: "שם התצוגה:"
+      heading: יצירת חשבון משתמש
+      password: "סיסמה:"
+      signup: הרשמה
     no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-    remove_friend: 
-      not_a_friend: "{{name}} is not one of your friends."
-      success: "{{name}} was removed from your friends."
+      heading: המשתמש {{user}} אינו קיים
+      title: אין משתמש כזה
     reset_password: 
-      flash token bad: Didn't find that token, check the URL maybe?
+      confirm password: "אימות הסיסמה:"
+      flash changed: סיסמתך השתנתה.
+      heading: איפוס הסיסמה עבור {{user}}
+      password: "סיסמה:"
+      reset: איפוס הסיסמה
       title: reset password
-    set_home: 
-      flash success: Home location saved successfully
     view: 
-      add as friend: add as friend
-      add image: Add Image
-      ago: ({{time_in_words_ago}} ago)
-      change your settings: change your settings
-      delete image: Delete Image
+      add image: הוספת תמונה
+      ago: (לפני {{time_in_words_ago}})
+      change your settings: שינוי ההגדרות שלך
+      delete image: מחיקת תמונה
       description: תאור
-      diary: diary
-      edits: edits
-      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
-      km away: "{{count}}km away"
-      mapper since: "Mapper since:"
-      my diary: my diary
-      my edits: my edits
-      my settings: my settings
-      my traces: my traces
-      nearby users: "Nearby users:"
-      new diary entry: new diary entry
-      no friends: You have not added any friends yet.
-      no home location: No home location has been set.
-      no nearby users: There are no users who admit to mapping nearby yet.
-      remove as friend: remove as friend
-      send message: send message
-      settings_link_text: settings
-      traces: traces
-      upload an image: Upload an image
-      user image heading: User image
-      user location: User location
-      your friends: Your friends
+      edits: עריכות
+      km away: במרחק {{count}} ק"מ
+      m away: במרחק {{count}} מ'
+      my diary: היומן שלי
+      my edits: העריכות שלי
+      my_oauth_details: צפייה בפרטי ה־OAuth שלי
+      new diary entry: רשומה חדשה ביומן
+      no friends: לא הוספת חברים כלל עדיין.
+      remove as friend: הסרה כחבר
+      send message: שליחת הודעה
+      settings_link_text: הגדרות
+      traces: מסלולים
+      upload an image: העלאת תמונה
+      user image heading: תמונת המשתמש
+      your friends: החברים שלך

config/locales/hi.yml

@@ -34,18 +34,12 @@ hi:
         languages: भाषाओं
         pass_crypt: पासवर्ड
     models: 
-      acl: Access Control List
-      changeset: Changeset
-      changeset_tag: Changeset Tag
       country: देश
-      diary_comment: Diary Comment
-      diary_entry: Diary Entry
       friend: दोस्त
       language: भाशा
       message: संदेश
       node: आसंधि
       node_tag: आसंधि का अंकितक
-      notifier: Notifier
       old_node: पुराने आसंधि
       old_node_tag: पुराने आसंधि का अंकितक
       old_relation: पुराना संबंध
@@ -57,10 +51,6 @@ hi:
       relation: संबंध
       relation_member: संबंध का सदस्य
       relation_tag: संबंध का अंकितक
-      session: Session
-      trace: Trace
-      tracepoint: Trace Point
-      tracetag: Trace Tag
       user: उपयोगकर्ता
       user_preference: उपयोगकर्ता के वरीयता
       user_token: उपयोगकर्ता के अंकितक
@@ -68,23 +58,12 @@ hi:
       way_node: रस्ता का आसंधि
       way_tag: रस्ता का अंकितक
   browse: 
-    changeset: 
-      changeset: "Changeset: {{id}}"
-      changesetxml: Changeset XML
-      download: Download {{changeset_xml_link}} or {{osmchange_xml_link}}
-      osmchangexml: osmChange XML
-      title: Changeset
     changeset_details: 
-      belongs_to: "Belongs to:"
-      bounding_box: "Bounding box:"
-      box: box
       closed_at: "समापन के समय:"
       created_at: "निर्माण के समय:"
       has_nodes: "निम्नलिखित {{count}}  आसंधि है:"
       has_relations: "निम्नलिखित {{count}} संबंध है:"
       has_ways: "निम्नलिखित {{count}} रस्ते है:"
-      no_bounding_box: No bounding box has been stored for this changeset.
-      show_area_box: Show Area Box
     changeset_navigation: 
       user: 
         prev_tooltip: "{{user}} द्वारा पूर्व संपादित"
@@ -99,10 +78,8 @@ hi:
       entry_role: संबंध {{relation_name}} (as {{relation_role}})
     map: 
       deleted: मिटा दिया गया है
-      loading: Loading...
     node: 
       download: "{{download_xml_link}} या {{view_history_link}}"
-      download_xml: Download XML
       edit: संपादन
       node: आसंधि
       node_title: "आसंधि: {{node_name}}"
@@ -112,7 +89,6 @@ hi:
       part_of: "इन रास्तो का हिस्सा:"
     node_history: 
       download: "{{download_xml_link}} या {{view_details_link}}"
-      download_xml: Download XML
       node_history: आसंधि का इतिहास
       node_history_title: "नोड इतिहास: {{node_name}}"
       view_details: विवरण देखें
@@ -127,7 +103,6 @@ hi:
       showing_page: "इस पृष्ठ का प्रदर्शन:"
     relation: 
       download: "{{download_xml_link}} या {{view_history_link}}"
-      download_xml: Download XML
       relation: संबंध
       relation_title: "संबंध: {{relation_name}}"
       view_history: इतिहास देखें
@@ -151,15 +126,10 @@ hi:
       details: "विवरण:"
       drag_a_box: मानचित्र पर एक बॉक्स खींचें एक क्षेत्र का चयन करने के लिए
       edited_by_user_at_timestamp: "[[user]] द्वारा [[timestamp]] पर संपादित"
-      load_data: Load Data
       loaded_an_area_with_num_features: "इस क्षेत्र में [[num_features]] विशेषताओं शामिल है| सामान्य तौर पर, कुछ ब्राउज़रों इस मात्रा के तथ्यों प्रदर्शित करने में सक्षम नहीं हो सकता है| वे सबसे अच्छा काम करते है जब एक बार में १०० से कम सुविधाओं को प्रदर्शन करते है: कुछ और करने पर आपके ब्राउजर कम तेज़ हो सकती है| यदि आप इस तथ्यों को प्रदर्शित करना चाहते हैं, तो आप नीचे दिए गए बटन पर क्लिक करे|"
-      loading: Loading...
       manually_select: कृपया, आप एक अलग क्षेत्र चुनिए
       object_list: 
-        api: Retrieve this area from the API
-        back: Display object list
         details: विवरण
-        heading: Object list
         history: 
           type: 
             node: आसंधि [[id]]
@@ -180,20 +150,15 @@ hi:
       tags: "अंकितक:"
     way: 
       download: "{{download_xml_link}} या {{view_history_link}}"
-      download_xml: Download XML
       edit: संपादन
       view_history: इतिहास देखें
       way: रस्ता
       way_title: "रास्ते का नाम: {{way_name}}"
     way_details: 
-      also_part_of: 
-        one: also part of way {{related_ways}}
-        other: also part of ways {{related_ways}}
       nodes: "आसंधि:"
       part_of: "इनका हिस्सा:"
     way_history: 
       download: "{{download_xml_link}} या {{view_details_link}}"
-      download_xml: Download XML
       view_details: विवरण देखें
       way_history: रास्ते का इतिहास
       way_history_title: "इस रास्ता का इतिहास: {{way_name}}"
@@ -203,7 +168,6 @@ hi:
       big_area: (बड़ा क्षेत्र)
       no_comment: (कोई टिप्पणी नहीं है)
       no_edits: (कोई संपादित नहीं है)
-      show_area_box: show area box
       still_editing: (संपादित किया जा रहा है)
       view_changeset_details: इस changeset के विवरण देखे
     changeset_paging_nav: 
@@ -216,16 +180,6 @@ hi:
       saved_at: समय जब सुरक्षित किया गया
       user: उप्योगिकर्ता
   diary_entry: 
-    diary_comment: 
-      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
-    diary_entry: 
-      comment_count: 
-        one: 1 comment
-        other: "{{count}} comments"
-      comment_link: Comment on this entry
-      edit_link: Edit this entry
-      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
-      reply_link: Reply to this entry
     edit: 
       body: "दैनिकी प्रविष्टि का शारीर:"
       language: "भाषा:"
@@ -240,7 +194,6 @@ hi:
     list: 
       new: नई दैनिकी प्रविष्टि
       new_title: अपने दैनिकी मैं, एक नई प्रविष्टि लिखें
-      newer_entries: Newer Entries
       no_entries: कोई दैनिकी प्रविष्टियों नहीं है
       older_entries: पुराने प्रविष्टियों
       recent_entries: "नई दैनिकी प्रविष्टियों:"
@@ -251,8 +204,6 @@ hi:
     no_such_entry: 
       body: क्षमा करें, इस आईडी {{id}} के लिया कोई प्रविष्टि या टिप्पणी नहीं है| कृपया अपनी वर्तनी की जाँच करें, or maybe the link you clicked is wrong|
       heading: इस आईडी {{id}} के लिया कोई प्रविष्टि नहीं है
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
     view: 
       leave_a_comment: टिप्पणी लिखिए
       login: सत्रारंभ
@@ -262,35 +213,11 @@ hi:
       user_title: "{{user}}'s के दैनिकीं"
   export: 
     start: 
-      add_marker: Add a marker to the map
       area_to_export: क्षेत्र निर्यात करने के लिए
-      embeddable_html: Embeddable HTML
-      export_button: Export
-      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
-      format: Format
       format_to_export: स्वरूप निर्यात करने के लिए
-      image_size: Image Size
-      latitude: "Lat:"
-      licence: Licence
-      longitude: "Lon:"
       manually_select: कृपया, आप एक अलग क्षेत्र चुनिए
       mapnik_image: Mapnik छवि
-      max: max
-      options: Options
-      osm_xml_data: OpenStreetMap XML Data
       osmarender_image: Osmarender छवि
-      output: Output
-      paste_html: Paste HTML to embed in website
-      scale: Scale
-      zoom: Zoom
-    start_rjs: 
-      add_marker: Add a marker to the map
-      change_marker: Change marker position
-      click_add_marker: Click on the map to add a marker
-      drag_a_box: Drag a box on the map to select an area
-      export: Export
-      manually_select: Manually select a different area
-      view_larger_map: View Larger Map
   geocoder: 
     description: 
       types: 
@@ -310,40 +237,14 @@ hi:
       one: करीब 1 किमी
       other: करीब {{count}} किमी
       zero: 1 किमी से कम
-    results: 
-      no_results: No results found
   layouts: 
-    alt_donation: Make a Donation
-    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
-    donate_link_text: donating
-    edit: Edit
     edit_tooltip: नक्शा संपादन
-    export: Export
-    gps_traces: GPS Traces
-    help_wiki: Help &amp; Wiki
-    history: History
     home: गृह
-    inbox: inbox ({{count}})
     inbox_tooltip: 
       other: आपके इनबॉक्स में {{count}} अपठित संदेश हैं
-    intro_1: OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-    intro_2: OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
-    log_in: log in
-    logout: logout
     logout_tooltip: निर्गम
-    news_blog: News blog
-    osm_offline: The OpenStreetMap database is currently offline while essential database maintenance work is carried out.
-    osm_read_only: The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
-    shop: Shop
-    sign_up: sign up
     sign_up_tooltip: संपादन के लिए खाता बनाएं
-    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
-    tag_line: The Free Wiki World Map
-    user_diaries: User Diaries
-    view: View
     view_tooltip: नक्शा देखें
-    welcome_user: Welcome, {{user_link}}
     welcome_user_link_tooltip: आपका प्रयोक्ता पन्ना
   map: 
     coordinates: "निर्देशांक:"
@@ -352,131 +253,15 @@ hi:
   message: 
     delete: 
       deleted: संदेश खात्मा
-    inbox: 
-      date: Date
-      from: From
-      my_inbox: My inbox
-      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
-      outbox: outbox
-      people_mapping_nearby: people mapping nearby
-      subject: Subject
-      title: Inbox
-      you_have: You have {{new_count}} new messages and {{old_count}} old messages
-    mark: 
-      as_read: Message marked as read
-      as_unread: Message marked as unread
     message_summary: 
       delete_button: खात्मा
-      read_button: Mark as read
-      reply_button: Reply
-      unread_button: Mark as unread
-    new: 
-      back_to_inbox: Back to inbox
-      body: Body
-      message_sent: Message sent
-      send_button: Send
-      send_message_to: Send a new message to {{name}}
-      subject: Subject
-      title: Send message
     no_such_user: 
       heading: इस तरह का कोई प्रयोक्ता या संदेश नहीं
-    outbox: 
-      date: Date
-      inbox: inbox
-      my_inbox: My {{inbox_link}}
-      no_sent_messages: You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
-      outbox: outbox
-      people_mapping_nearby: people mapping nearby
-      subject: Subject
-      title: Outbox
-      to: To
-      you_have_sent_messages: You have {{sent_count}} sent messages
-    read: 
-      back_to_inbox: Back to inbox
-      back_to_outbox: Back to outbox
-      date: Date
-      from: From
-      reading_your_messages: Reading your messages
-      reading_your_sent_messages: Reading your sent messages
-      reply_button: Reply
-      subject: Subject
-      title: Read message
-      to: To
-      unread_button: Mark as unread
     sent_message_summary: 
       delete_button: खात्मा
   notifier: 
-    diary_comment_notification: 
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
-      header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      hi: Hi {{to_user}},
-      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
-    email_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_html: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
-    email_confirm_plain: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
-    friend_notification: 
-      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
-      subject: "[OpenStreetMap] {{user}} added you as a friend"
     gpx_notification: 
       greeting: नमस्कार,
-    lost_password: 
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_html: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
-    lost_password_plain: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
-      hopefully_you_2: email addresses openstreetmap.org account.
-    message_notification: 
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      footer1: You can also read the message at {{readurl}}
-      footer2: and you can reply at {{replyurl}}
-      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
-      hi: Hi {{to_user}},
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
-    signup_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_html: 
-      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
-      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: You can watch an {{introductory_video_link}}.
-      more_videos: There are {{more_videos_link}}.
-      more_videos_here: more videos here
-      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
-      video_to_openstreetmap: introductory video to OpenStreetMap
-      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
-    signup_confirm_plain: 
-      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
-      click_the_link_2: account and read on for more information about OpenStreetMap.
-      current_user_1: A list of current users in categories, based on where in the world
-      current_user_2: "they are, is available from:"
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      user_wiki_1: It is recommended that you create a user wiki page, which includes
-      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
   oauth_clients: 
     edit: 
       submit: संपादन
@@ -491,22 +276,12 @@ hi:
       key: उपभोक्ता कुंजी
   site: 
     edit: 
-      anon_edits_link_text: Find out why this is the case.
-      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
-      not_public: You haven't set your edits to be public.
-      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
-      user_page_link: user page
     index: 
-      js_1: You are either using a browser that doesn't support javascript, or you have disabled javascript.
-      js_2: OpenStreetMap uses javascript for its slippy map.
-      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
       license: 
         license_name: क्रिएटिव कामन्स एट्रीब्यूशन-शेयर एलाइक 2.0
         project_name: ओपन स्ट्रीट मेप परियोजना
-      permalink: Permalink
     key: 
-      map_key: Map key
       table: 
         entry: 
           allotments: आवंटन
@@ -540,207 +315,28 @@ hi:
           unclassified: अवर्गीकृत सड़क
           wood: लकड़ी
     search: 
-      search: Search
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-      submit_text: Go
-      where_am_i: Where am I?
-    sidebar: 
-      close: Close
-      search_results: Search Results
   trace: 
-    create: 
-      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
-      upload_trace: Upload GPS Trace
-    delete: 
-      scheduled_for_deletion: Track scheduled for deletion
     edit: 
-      description: "Description:"
-      edit: edit
-      filename: "Filename:"
       map: नक्शा
-      owner: "Owner:"
-      points: "Points:"
-      save_button: Save Changes
-      start_coord: "Start coordinate:"
-      tags: "Tags:"
-      uploaded_at: "Uploaded at:"
       visibility: दृष्टता
       visibility_help: इसका क्या मतलब है?
-    list: 
-      public_traces: Public GPS traces
-      public_traces_from: Public GPS traces from {{user}}
-      tagged_with: " tagged with {{tags}}"
-      your_traces: Your GPS traces
-    make_public: 
-      made_public: Track made public
     no_such_user: 
       body: माफ करें, इस {{user}} नाम का कोई प्रयोक्ता नहीं है. कृपया अक्षरों पर गौर करें, या आपने जिस लिंक पर क्लिक किया है, वह गलत हो सकता है.
       title: इस तरह का कोई प्रयोक्ता नहीं
-    trace: 
-      ago: "{{time_in_words_ago}} ago"
-      by: by
-      count_points: "{{count}} points"
-      edit: edit
-      edit_map: Edit Map
-      in: in
-      map: map
-      more: more
-      pending: PENDING
-      private: PRIVATE
-      public: PUBLIC
-      trace_details: View Trace Details
-      view_map: View Map
     trace_form: 
-      description: Description
-      help: Help
-      tags: Tags
-      upload_button: Upload
-      upload_gpx: Upload GPX File
       visibility: दृष्टता
       visibility_help: इसका क्या मतलब है?
-    trace_header: 
-      see_all_traces: See all traces
-      see_just_your_traces: See just your traces, or upload a trace
-      see_your_traces: See all your traces
-      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
-    trace_optionals: 
-      tags: Tags
-    trace_paging_nav: 
-      of: of
-      showing: Showing page
     view: 
-      delete_track: Delete this track
-      description: "Description:"
-      download: download
-      edit: edit
-      edit_track: Edit this track
-      filename: "Filename:"
-      heading: Viewing trace {{name}}
-      map: map
-      none: None
-      owner: "Owner:"
-      pending: PENDING
-      points: "Points:"
-      start_coordinates: "Start coordinate:"
       tags: Tags
-      trace_not_found: Trace not found!
-      uploaded: "Uploaded at:"
       visibility: दृष्टता
   user: 
     account: 
-      email never displayed publicly: (never displayed publicly)
-      flash update success: User information updated successfully.
-      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
-      home location: "Home Location:"
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      make edits public button: Make all my edits public
-      my settings: My settings
-      no home location: You have not entered your home location.
-      preferred languages: "Preferred Languages:"
-      profile description: "Profile Description:"
       public editing: 
-        disabled: Disabled and cannot edit data, all previous edits are anonymous.
-        disabled link text: why can't I edit?
-        enabled: Enabled. Not anonymous and can edit data.
         enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        enabled link text: what's this?
-        heading: "Public editing:"
-      return to profile: Return to profile
-      save changes button: Save Changes
-      title: Edit account
-      update home location on click: Update home location when I click on the map?
-    confirm: 
-      button: Confirm
-      failure: A user account with this token has already been confirmed.
-      heading: Confirm a user account
-      press confirm button: Press the confirm button below to activate your account.
-      success: Confirmed your account, thanks for signing up!
-    confirm_email: 
-      button: Confirm
-      failure: An email address has already been confirmed with this token.
-      heading: Confirm a change of email address
-      press confirm button: Press the confirm button below to confirm your new email address.
-      success: Confirmed your email address, thanks for signing up!
-    friend_map: 
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-      your location: Your location
-    go_public: 
-      flash success: All your edits are now public, and you are now allowed to edit.
-    login: 
-      account not active: Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account.
-      auth failure: Sorry, couldn't log in with those details.
-      create_account: create an account
-      email or username: "Email Address or Username:"
-      heading: Login
-      login_button: Login
-      lost password link: Lost your password?
-      password: "Password:"
-      please login: Please login or {{create_user_link}}.
-      title: Login
     lost_password: 
-      email address: "Email Address:"
-      heading: Forgotten Password?
       new password button: Send me a new password
-      notice email cannot find: Couldn't find that email address, sorry.
-      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
       title: lost password
-    make_friend: 
-      already_a_friend: You are already friends with {{name}}.
-      failed: Sorry, failed to add {{name}} as a friend.
-      success: "{{name}} is now your friend."
-    new: 
-      confirm email address: "Confirm Email Address:"
-      confirm password: "Confirm Password:"
-      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
-      display name: "Display Name:"
-      email address: "Email Address:"
-      fill_form: Fill in the form and we'll send you a quick email to activate your account.
-      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
-      heading: Create a User Account
-      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
-      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
-      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
-      password: "Password:"
-      signup: Signup
-      title: Create account
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-    remove_friend: 
-      not_a_friend: "{{name}} is not one of your friends."
-      success: "{{name}} was removed from your friends."
     reset_password: 
-      flash token bad: Didn't find that token, check the URL maybe?
       password: "पासवर्ड:"
       title: reset password
-    set_home: 
-      flash success: Home location saved successfully
-    view: 
-      add as friend: add as friend
-      add image: Add Image
-      ago: ({{time_in_words_ago}} ago)
-      change your settings: change your settings
-      delete image: Delete Image
-      description: Description
-      diary: diary
-      edits: edits
-      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
-      km away: "{{count}}km away"
-      mapper since: "Mapper since:"
-      my diary: my diary
-      my edits: my edits
-      my settings: my settings
-      my traces: my traces
-      nearby users: "Nearby users:"
-      new diary entry: new diary entry
-      no friends: You have not added any friends yet.
-      no home location: No home location has been set.
-      no nearby users: There are no users who admit to mapping nearby yet.
-      remove as friend: remove as friend
-      send message: send message
-      settings_link_text: settings
-      traces: traces
-      upload an image: Upload an image
-      user image heading: User image
-      user location: User location
-      your friends: Your friends

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
@@ -75,7 +75,6 @@ hsb:
       feed: 
         title: Sadźba změnow {{id}}
         title_comment: Sadźba změnow {{id}} - {{comment}}
-      osmchangexml: osmChange XML
       title: Sadźba změnow
     changeset_details: 
       belongs_to: "Słuša k:"
@@ -99,7 +98,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 +124,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 +133,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 +149,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:"
@@ -237,7 +236,6 @@ hsb:
     changesets: 
       area: Wobłuk
       comment: Komentar
-      id: ID
       saved_at: Składowany dnja
       user: Wužiwar
     list: 
@@ -319,7 +317,6 @@ hsb:
       embeddable_html: Zasadźujomny HTML
       export_button: Eksport
       export_details: Daty OpenStreetMap su pod licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> licencowane.
-      format: Format
       format_to_export: Format za eksport
       image_size: Wobrazowa wulkosć
       latitude: "Šěrokostnik:"
@@ -386,7 +383,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,18 +393,16 @@ 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ć
-    logo: 
-      alt_text: OpenStreetMap logo
     logout: wotzjewić
     logout_tooltip: Wotzjewić
     news_blog: Blog nowinkow
@@ -419,17 +414,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 karta
+    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
@@ -652,7 +647,6 @@ hsb:
       js_2: OpenStreetMap JavaScript za slippy map wužiwa.
       js_3: Móžeš <a href="http://tah.openstreetmap.org/Browse/">wobhladowak Tiles@Home</a> wužiwać, jeli njemóžeš JavaScript znóžnić.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: Licencowany pod licencu {{license_name}} přez {{project_name}} a jeho sobuskutkowacych.
         project_name: Projekt OpenStreetMap
       permalink: Trajny wotkaz
@@ -680,7 +674,7 @@ hsb:
           commercial: Přemysłowa kónčina
           common: 
             - Powšitkowny
-            - Łuka
+            - łuka
           construction: Dróhi w twarje
           cycleway: Kolesowarska šćežka
           destination: Cilowy přistup
@@ -692,10 +686,9 @@ hsb:
           industrial: Industrijowa kónčina
           lake: 
             - Jězor
-            - Spjaty jězor
+            - spjaty jězor
           military: Wojerske pasmo
           motorway: Awtodróha
-          park: Park
           permissive: Dowoleny přistup
           pitch: Sportnišćo
           primary: Zwjazkowa dróha
@@ -781,8 +774,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 +802,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 +810,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 +821,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,8 +835,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 link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled: Zmóžnjene. Nic anonymne a daty hodźa so wobdźěłać.
         enabled link text: što to je?
         heading: "Zjawne wobdźěłowanje:"
       return to profile: Wróćo k profilej
@@ -893,9 +885,9 @@ 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ł.
+      fill_form: Wupjelń formular a budźemy ći hnydom e-mejl słać, 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ć.
       heading: Wužiwarske konto załožić
       license_agreement: Přez załoženje konta zwoliš do toho, zo wšě daty, kotrež do projekta Openstreetmap pósćeleš, so (nic ekskluziwnje) pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">tutej licencu Creative Commons (by-sa)</a> licencuja.
@@ -925,7 +917,7 @@ hsb:
       add as friend: jako přećela přidać
       add image: Wobraz přidać
       ago: (před {{time_in_words_ago}})
-      change your settings: twoje nastajenja změnić
+      change your settings: Twoje nastajenja změnić
       delete image: Wobraz zničić
       description: Wopisanje
       diary: dźenik
@@ -938,7 +930,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ł.

config/locales/hu.yml

@@ -70,12 +70,10 @@ hu:
   browse: 
     changeset: 
       changeset: "Módosításcsomag: {{id}}"
-      changesetxml: Changeset XML
       download: "{{changeset_xml_link}} vagy {{osmchange_xml_link}} letöltése"
       feed: 
         title: "Módosításcsomag: {{id}}"
         title_comment: "Módosításcsomag: {{id}} - {{comment}}"
-      osmchangexml: osmChange XML
       title: Módosításcsomag
     changeset_details: 
       belongs_to: "Tulajdonos:"
@@ -603,12 +601,9 @@ hu:
       allow_write_diary: naplóbejegyzések, hozzászólások készítése és barátok hozzáadása.
       allow_write_gpx: GPS nyomvonalak feltöltése.
       allow_write_prefs: felhasználó beállításainak módosítása.
-      callback_url: Callback URL
       name: Név
       requests: "A következő engedélyek kérése a felhasználótól:"
       required: Szükséges
-      support_url: Support URL
-      url: Main Application URL
     index: 
       application: Alkalmazás neve
       issued_at: Kibocsátva ekkor
@@ -626,21 +621,16 @@ hu:
     not_found: 
       sorry: Sajnálom, a(z) {{type}} nem található.
     show: 
-      access_url: "Access Token URL:"
       allow_read_gpx: magán GPS nyomvonalainak olvasása.
       allow_read_prefs: felhasználó beállításainak olvasása.
       allow_write_api: a térkép módosítása.
       allow_write_diary: naplóbejegyzések, hozzászólások készítése és barátok hozzáadása.
       allow_write_gpx: GPS nyomvonalak feltöltése.
       allow_write_prefs: felhasználó beállításainak módosítása.
-      authorize_url: "Authorise URL:"
       edit: Részletek szerkesztése
-      key: "Consumer Key:"
       requests: "A következő engedélyek kérése a felhasználótól:"
-      secret: "Consumer Secret:"
       support_notice: Támogatjuk a hmac-sha1 hitelesítést (ajánlott), valamint a sima szöveget ssl módban.
       title: "{{app_name}} OAuth részletei"
-      url: "Request Token URL:"
     update: 
       flash: A kliens információi sikeresen frissítve
   site: 
@@ -652,15 +642,13 @@ hu:
       potlatch_unsaved_changes: Nem mentett módosítások vannak. (Potlatchban való mentéshez szüntesd meg a jelenlegi vonal vagy pont kijelölését, ha élő módban szerkesztesz, vagy kattints a mentésre, ha van mentés gomb.)
       user_page_link: felhasználói oldal
     index: 
-      js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a javascriptet, vagy letiltottad a javascriptet.
-      js_2: Az OpenStreetMap javascriptet használ a slippy maphoz.
-      js_3: Megpróbálhatod a <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statikus csempeböngésző</a>t, ha nem tudod engedélyezni a javascriptet.
+      js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet, vagy letiltottad a JavaScriptet.
+      js_2: Az OpenStreetMap JavaScriptet használ a slippy maphoz.
+      js_3: Megpróbálhatod a <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statikus csempeböngésző</a>t, ha nem tudod engedélyezni a JavaScriptet.
       license: 
         license_name: Creative Commons Nevezd meg!-Így add tovább! 2.0
         notice: "{{license_name}} licenc alatt az {{project_name}} és hozzájárulói által."
         project_name: OpenStreetMap projekt
-      permalink: Permalink
-      shortlink: Shortlink
     key: 
       map_key: Jelmagyarázat
       map_key_tooltip: Jelmagyarázat a Mapnik rendereléshez ezen a nagyítási szinten
@@ -699,7 +687,6 @@ hu:
             - víztározó
           military: Katonai terület
           motorway: Autópálya
-          park: Park
           permissive: Behajtás engedélyezett
           pitch: Labdarúgópálya
           primary: Főút
@@ -734,7 +721,6 @@ hu:
     search: 
       search: Keresés
       search_help: "példák: 'Szeged', 'Piac utca, Debrecen', 'CB2 5AQ' vagy 'post offices near Kaposvár' <a href='http://wiki.openstreetmap.org/wiki/Search'>további példák...</a>"
-      submit_text: Go
       where_am_i: Hol vagyok?
     sidebar: 
       close: Bezár
@@ -847,7 +833,6 @@ hu:
         disabled: Tiltva, így nem szerkesztheted az adatokat, az összes eddigi szerkesztés névtelen.
         disabled link text: miért nem tudok szerkeszteni?
         enabled: Engedélyezve. Nem vagy névtelen, így szerkesztheted az adatokat.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: mi ez?
         heading: "Nyilvános szerkesztés:"
       return to profile: Vissza a profilhoz

config/locales/is.yml

@@ -612,7 +612,6 @@ is:
       js_2: OpenStreetMap notar JavaScript til að útfæra gagnvirk kort.
       js_3: Þú getur einnig notað <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home kortasýnina</a> sem krefst ekki JavaScript stuðnings.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: Gefið út undir {{license_name}} leyfinu af þáttakendum í {{project_name}}.
         project_name: OpenStreetMap verkefninu
       permalink: Varanlegur tengill

config/locales/it.yml

@@ -30,9 +30,7 @@ it:
         active: Attivo
         description: Descrizione
         display_name: Nome visualizzato
-        email: Email
         languages: Lingue
-        pass_crypt: Password
     models: 
       acl: Lista di controllo degli accessi
       changeset: Gruppo di modifiche
@@ -178,9 +176,7 @@ it:
       of: di
       showing_page: Visualizzata la pagina
     changesets: 
-      area: Area
       comment: Commento
-      id: ID
       saved_at: Salvato il
       user: Utente
   diary_entry: 
@@ -236,12 +232,9 @@ it:
       format: Formato
       format_to_export: Formato di esportazione
       image_size: Dimensione immagine
-      latitude: "Lat:"
       licence: Licenza
-      longitude: "Lon:"
       manually_select: Seleziona manualmente un'area differente
       mapnik_image: Immagine Mapnik
-      max: max
       options: Opzioni
       osm_xml_data: Dati XML OpenStreetMap
       osmarender_image: Immagine Osmarender
@@ -395,14 +388,12 @@ it:
       potlatch_unsaved_changes: Ci sono modifiche non salvate. (Per salvare in Potlatch, si dovrebbe deselezionare il percorso o nodo corrente, se si sta editando nella modalità 'list', o cliccare sul bottone salva se presente.)
       user_page_link: pagina utente
     index: 
-      js_1: Si sta utilizzando un browser che non supporta javascript, oppure è stato disabilitato javascript.
-      js_2: OpenStreetMap utilizza javascript per le sua mappa.
-      js_3: Se non si riesce ad abilitare javascript si può provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.
+      js_1: Si sta utilizzando un browser che non supporta JavaScript, oppure è stato disabilitato JavaScript.
+      js_2: OpenStreetMap utilizza JavaScript per le sua mappa.
+      js_3: Se non si riesce ad abilitare JavaScript si può provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: Rilasciato sotto la licenza {{license_name}} dal {{project_name}} ed i suoi contributori.
         project_name: progetto OpenStreetMap
-      permalink: Permalink
     key: 
       map_key: Legenda
     search: 
@@ -444,7 +435,6 @@ it:
       count_points: "{{count}} punti"
       edit: modifica
       edit_map: Modifica mappa
-      in: in
       map: mappa
       more: altri
       pending: IN ATTESA
@@ -534,7 +524,6 @@ it:
       heading: Entra
       login_button: Entra
       lost password link: Persa la password?
-      password: "Password:"
       please login: Entra o {{create_user_link}}.
       title: Entra
     lost_password: 
@@ -560,7 +549,6 @@ it:
       license_agreement: Con la creazione di un profilo si accetta che tutto il lavoro caricato nel progetto Openstreetmap è da ritenersi (in modo non-esclusivo) rilasciato sotto <a href="http://creativecommons.org/licenses/by-sa/2.0/">questa licenza Creative Commons (by-sa)</a>.
       no_auto_account_create: Sfortunatamente in questo momento non è possibile creare automaticamente per te un profilo.
       not displayed publicly: Non visualizzato pubblicamente (vedi le <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">norme sulla privacy</a>)
-      password: "Password:"
       signup: Iscrivi
       title: Crea profilo
     no_such_user: 

config/locales/ja.yml

@@ -45,7 +45,6 @@ ja:
       message: メッセージ
       node: ノード
       node_tag: ノードタグ
-      notifier: Notifier
       old_node: 古いノード
       old_node_tag: 古いノードタグ
       old_relation: 古い関連
@@ -77,7 +76,6 @@ ja:
     changeset_details: 
       belongs_to: "ユーザ:"
       bounding_box: "境界囲み:"
-      box: box
       closed_at: "完了日時:"
       created_at: "作成日時:"
       has_nodes: "以下の {{count}} ノードで構成されています:"
@@ -85,6 +83,11 @@ ja:
       has_ways: "以下の {{count}} ウェイで構成されています:"
       no_bounding_box: この変更セットに境界囲みは格納しない。
       show_area_box: 領域範囲表示
+    changeset_navigation: 
+      user: 
+        name_tooltip: "{{user}}による編集を表示"
+        next_tooltip: 次の編集（{{user}}による）
+        prev_tooltip: 前の編集（{{user}}による）
     common_details: 
       changeset_comment: "コメント:"
       edited_at: "編集日:"
@@ -106,7 +109,6 @@ ja:
       view_history: 履歴表示
     node_details: 
       coordinates: "座標:"
-      part_of: "Part of:"
     node_history: 
       download: "{{download_xml_link}}、または、{{view_details_link}}"
       download_xml: XMLダウンロード
@@ -120,7 +122,6 @@ ja:
         relation: 関連
         way: 道
     paging_nav: 
-      of: of
       showing_page: ページ表示
     relation: 
       download: "{{download_xml_link}} または {{view_history_link}}"
@@ -130,7 +131,6 @@ ja:
       view_history: 履歴表示
     relation_details: 
       members: "メンバー:"
-      part_of: "Part of:"
     relation_history: 
       download: "{{download_xml_link}}、または、{{view_details_link}}"
       download_xml: XML をダウンロード
@@ -172,7 +172,6 @@ ja:
         type: 
           node: ノード
           way: ウエイ
-      private_user: private user
       show_history: 履歴表示
       unable_to_load_size: "読み込みできません: 境界囲みのサイズ [[bbox_size]]が大きすぎます。({{max_bbox_size}}より小さい必要があります)"
       wait: お待ちください...
@@ -208,12 +207,10 @@ ja:
       still_editing: （まだ編集中です）
       view_changeset_details: 変更セットの詳細表示
     changeset_paging_nav: 
-      of: of
       showing_page: ページ表示
     changesets: 
       area: 領域
       comment: コメント
-      id: ID
       saved_at: 保存日時
       user: ユーザ
     list: 
@@ -228,7 +225,6 @@ ja:
       comment_link: このエントリへのコメント
       edit_link: この記事の編集
       posted_by: "{{link_user}} による {{created}}（{{language_link}}）の投稿。"
-      reply_link: Reply to this entry
     edit: 
       body: "本文:"
       language: "言語:"
@@ -328,7 +324,6 @@ ja:
         us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>からの結果
   layouts: 
     alt_donation: 寄付
-    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
     donate_link_text: 寄付
     edit: 編集
     edit_tooltip: 地図を編集する
@@ -366,7 +361,6 @@ ja:
     sign_up: 登録
     sign_up_tooltip: 編集できるアカウントを作成する
     sotm: 2009 OpenStreetMapカンファレンスへ行こう！ The State of the Map,アムステルダムにて７月10-12日開催!
-    tag_line: The Free Wiki World Map
     user_diaries: ユーザの日記
     user_diaries_tooltip: ユーザの日記を見る
     view: 閲覧
@@ -384,12 +378,9 @@ ja:
       date: 日付
       from: 差出人
       my_inbox: 自分の受信箱
-      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
-      outbox: outbox
       people_mapping_nearby: 近所でマッピングしている人々
       subject: タイトル
       title: 受信箱
-      you_have: You have {{new_count}} new messages and {{old_count}} old messages
     mark: 
       as_read: 既読メッセージ
       as_unread: 未読メッセージ
@@ -407,9 +398,9 @@ ja:
       subject: タイトル
       title: メッセージの送信
     no_such_user: 
-      body: Sorry there is no user or message with that name or id
-      heading: No such user or message
-      title: No such user or message
+      body: すいません、そのような名前やIDのユーザーまたはメッセージがありません。
+      heading: そのようなユーザーまたはメッセージは存在しません。
+      title: そのようなユーザーまたはメッセージは存在しません。
     outbox: 
       date: 日付
       inbox: 受信箱
@@ -436,89 +427,9 @@ ja:
     sent_message_summary: 
       delete_button: 削除
   notifier: 
-    diary_comment_notification: 
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
-      header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      hi: Hi {{to_user}},
-      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
-    email_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_html: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
-    email_confirm_plain: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
-    friend_notification: 
-      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
-      subject: "[OpenStreetMap] {{user}} added you as a friend"
     gpx_notification: 
-      and_no_tags: and no tags.
-      and_the_tags: "and the following tags:"
-      failure: 
-        failed_to_import: "failed to import. Here's the error:"
-        more_info_1: More information about GPX import failures and how to avoid
-        more_info_2: "them can be found at:"
-        subject: "[OpenStreetMap] GPX Import failure"
-      greeting: Hi,
       success: 
         loaded_successfully: "loaded successfully with {{trace_points}} out of a possible\n{{possible_points}} points."
-        subject: "[OpenStreetMap] GPX Import success"
-      with_description: with the description
-      your_gpx_file: It looks like your GPX file
-    lost_password: 
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_html: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
-    lost_password_plain: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
-      hopefully_you_2: email addresses openstreetmap.org account.
-    message_notification: 
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      footer1: You can also read the message at {{readurl}}
-      footer2: and you can reply at {{replyurl}}
-      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
-      hi: Hi {{to_user}},
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
-    signup_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_html: 
-      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
-      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: You can watch an {{introductory_video_link}}.
-      more_videos: There are {{more_videos_link}}.
-      more_videos_here: more videos here
-      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
-      video_to_openstreetmap: introductory video to OpenStreetMap
-      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
-    signup_confirm_plain: 
-      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
-      click_the_link_2: account and read on for more information about OpenStreetMap.
-      current_user_1: A list of current users in categories, based on where in the world
-      current_user_2: "they are, is available from:"
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      user_wiki_1: It is recommended that you create a user wiki page, which includes
-      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
   oauth: 
     oauthorize: 
       allow_read_gpx: あなたの非公開GPSトレースを読み込む。
@@ -532,6 +443,8 @@ ja:
     form: 
       allow_read_prefs: 利用者設定を読み込む。
       allow_write_api: 地図を修正する。
+      allow_write_gpx: GPSトレースをアップロードする。
+      name: 名前
     new: 
       submit: 登録
     show: 
@@ -542,21 +455,17 @@ ja:
       edit: 詳細の編集
   site: 
     edit: 
-      anon_edits_link_text: Find out why this is the case.
       flash_player_required: OpenStreetMap FlashエディターのPotlatchを使うには、フラッシュ・プレーヤーが必要です。<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Adobe.com</a>からFlash Playerをダウンロードできます。OpenStreetMapを編集するには、<a href="http://wiki.openstreetmap.org/wiki/Ja:Editing">他の方法</a>もあります
       not_public: あなたの編集結果を公開できません。
-      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
       user_page_link: ユーザページ
     index: 
-      js_1: javascriptをサポートしていないブラウザを使用しているか、javascriptを使用不可に設定しています。
-      js_2: OpenStreetMapは、地図表示にjavascriptを使用しています。
-      js_3: javascriptを使えない場合は<a href="http://tah.openstreetmap.org/Browse/">Tiles@Homeの静的な地図ブラウザ</a>を試してはいかがですか。
+      js_1: JavaScriptをサポートしていないブラウザを使用しているか、JavaScriptを使用不可に設定しています。
+      js_2: OpenStreetMapは、地図表示にJavaScriptを使用しています。
+      js_3: JavaScriptを使えない場合は<a href="http://tah.openstreetmap.org/Browse/">Tiles@Homeの静的な地図ブラウザ</a>を試してはいかがですか。
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: " {{project_name}}とその貢献者により、{{license_name}} ライセンスの元提供されています。"
         project_name: OpenStreetMapプロジェクト
-      permalink: Permalink
     key: 
       map_key: 凡例
       map_key_tooltip: この縮尺におけるmapnikレンダリングの凡例
@@ -646,11 +555,9 @@ ja:
       title: ユーザが存在しません
     trace: 
       ago: "{{time_in_words_ago}}前"
-      by: by
       count_points: "{{count}} ポイント"
       edit: 編集
       edit_map: 地図を編集
-      in: in
       map: 地図
       more: 詳細
       pending: 処理中
@@ -675,7 +582,6 @@ ja:
     trace_optionals: 
       tags: タグ（複数可）
     trace_paging_nav: 
-      of: of
       showing: ページ表示
     view: 
       delete_track: このトラックの削除

config/locales/ka.yml

@@ -0,0 +1,6 @@
+ka: 
+  browse: 
+    node: 
+      edit: რედაქტირება
+    way: 
+      edit: რედაქტირება

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: 
@@ -329,15 +384,21 @@ km:
       profile description: បរិយាយ​ប្រវត្តិរូប​៖
       public editing: 
         disabled link text: មូលហេតុអ្វី​ ខ្ញុំមិនអាចកែប្រែបាន​?
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
       title: កែប្រែគណនី​
     confirm: 
       button: បញ្ជាក់​
       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}} ជាមិត្ត​។

config/locales/ko.yml

@@ -51,9 +51,6 @@ ko:
       old_relation: 옛 관계
       old_relation_member: 옛 관계 멤버
       old_relation_tag: 옛 관계 태그
-      old_way: Old Way
-      old_way_node: Old Way Node
-      old_way_tag: Old Way Tag
       relation: 관계
       relation_member: 관계 멤버
       relation_tag: 관계 태그
@@ -72,12 +69,10 @@ ko:
       changeset: "변경셋: {{id}}"
       changesetxml: 변경셋 XML
       download: 내려받기 {{changeset_xml_link}} 혹은 {{osmchange_xml_link}}
-      osmchangexml: osmChange XML
       title: 변경셋
     changeset_details: 
       belongs_to: "소속:"
       bounding_box: "경계:"
-      box: box
       closed_at: "종료일:"
       created_at: "생성일:"
       has_nodes: "는(은) 다음 {{count}} 개의 노드를 가지고 있습니다:"
@@ -88,7 +83,6 @@ ko:
     common_details: 
       edited_at: "편집일:"
       edited_by: "편집자:"
-      in_changeset: "In changeset:"
       version: "버젼:"
     containing_relation: 
       entry: 관계 {{relation_name}}
@@ -104,9 +98,7 @@ ko:
       view_history: 이력 보기
     node_details: 
       coordinates: "좌표:"
-      part_of: "Part of:"
     node_history: 
-      download: "{{download_xml_link}} or {{view_details_link}}"
       download_xml: XML 내려받기
       node_history: 노드 이력
       view_details: 세부 사항 표시
@@ -116,18 +108,11 @@ ko:
         node: 노드
         relation: 관계
         way: 길
-    paging_nav: 
-      of: of
-      showing_page: Showing page
     relation: 
-      download: "{{download_xml_link}} or {{view_history_link}}"
       download_xml: XML 내려받기
       relation: 관계
       relation_title: "관계: {{relation_name}}"
       view_history: 이력 보기
-    relation_details: 
-      members: "Members:"
-      part_of: "Part of:"
     relation_history: 
       relation_history: 관계 이력
       relation_history_title: "관계 이력: {{relation_name}}"
@@ -135,8 +120,6 @@ ko:
       manually_select: 다른 지역 수동 선택
       view_data: 현재 지도 표기로 정보 보기
     start_rjs: 
-      data_frame_title: Data
-      data_layer_name: Data
       details: 세부 사항
       drag_a_box: 지역을 보기 위해 지도로 끌어 놓으세요.
       edited_by_user_at_timestamp: "[[timestamp]]에 [[user]]가 수정"
@@ -181,7 +164,6 @@ ko:
       nodes: "노드:"
       part_of: "포함되는 길:"
     way_history: 
-      download: "{{download_xml_link}} or {{view_details_link}}"
       download_xml: XML 내려받기
       view_details: 세부 사항 표시
       way_history: 길 이력
@@ -195,25 +177,18 @@ ko:
       show_area_box: 지역 박스 보기
       still_editing: (현재 수정 중)
       view_changeset_details: 변경셋 세부 사항 보기
-    changeset_paging_nav: 
-      of: of
-      showing_page: Showing page
     changesets: 
       area: 지역
       comment: 설명
-      id: ID
       saved_at: 저장 시간
       user: 사용자
   diary_entry: 
-    diary_comment: 
-      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
     diary_entry: 
       comment_count: 
         one: 댓글 한 개
         other: 댓글 {{count}} 개
       comment_link: 이 항목에 댓글 남기기
       edit_link: 이 항목 수정
-      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
       reply_link: 이 항목에 답변하기
     edit: 
       body: "내용:"
@@ -229,22 +204,12 @@ ko:
     list: 
       in_language_title: "{{language}} 일지 항목"
       new: 새 일지 항목
-      new_title: Compose a new entry in your user diary
       newer_entries: 다음 항목들
-      no_entries: No diary entries
       older_entries: 이전 항목들
-      recent_entries: "Recent diary entries:"
       title: 사용자 일지
       user_title: "{{user}} 일지"
     new: 
       title: 새 일지 항목
-    no_such_entry: 
-      body: Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: "No entry with the id: {{id}}"
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: The user {{user}} does not exist
-      title: No such user
     view: 
       leave_a_comment: 댓들 남기기
       login: 로그인
@@ -254,9 +219,7 @@ ko:
       user_title: "{{user}} 일지"
   export: 
     start: 
-      add_marker: Add a marker to the map
       area_to_export: 지역 추출
-      embeddable_html: Embeddable HTML
       export_button: 추출
       export_details: OpenStreetMap의 정보는 <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license 에 의거합니다.</a>.
       format: 포맷
@@ -266,29 +229,17 @@ ko:
       licence: 라이센스
       longitude: "경도:"
       manually_select: 다른 지역 선택
-      mapnik_image: Mapnik Image
       max: 최대
       options: 선택사항
-      osm_xml_data: OpenStreetMap XML Data
-      osmarender_image: Osmarender Image
       output: 출력
-      paste_html: Paste HTML to embed in website
       scale: 축척
       zoom: 줌
     start_rjs: 
-      add_marker: Add a marker to the map
-      change_marker: Change marker position
-      click_add_marker: Click on the map to add a marker
-      drag_a_box: Drag a box on the map to select an area
       export: 추출
       manually_select: 다른 지역 선택
       view_larger_map: 큰 지도 보기
-  geocoder: 
-    results: 
-      no_results: No results found
   layouts: 
     alt_donation: 기부하기
-    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
     donate_link_text: 기부
     edit: 편집
     edit_tooltip: 지도 편집
@@ -300,38 +251,26 @@ ko:
     help_wiki_tooltip: 프로젝트 도움말 &amp; 위키
     history: 이력
     history_tooltip: 변경셋 이력
-    home: home
-    home_tooltip: Go to home location
     inbox: 받은 쪽지함 ({{count}})
     inbox_tooltip: 
       one: 한 개의 읽지 않은 쪽지가 있습니다.
       other: "{{count}} 개의 읽지 않은 쪽지가 있습니다."
       zero: 읽지 않은 쪽지가 없습니다
-    intro_1: OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-    intro_2: OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
     log_in: 로그인
     log_in_tooltip: 기존 계정으로 로그인
-    logo: 
-      alt_text: OpenStreetMap logo
     logout: 로그 아웃
     logout_tooltip: 로그 아웃
     news_blog: 새소실 블로그
-    news_blog_tooltip: News blog about OpenStreetMap, free geographical data, etc.
     osm_offline: 데이터베이스 점검을 위해 OpenStreetMap 의 데이터가 현재 오프라인입니다.
     osm_read_only: 데이터베이스 점검을 위해 OpenStreetMap 의 데이터가 현재 읽기 전용입니다.
-    shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap
     sign_up: 가입하기
     sign_up_tooltip: 수정가능한 계좌 신규 등록
-    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
-    tag_line: The Free Wiki World Map
     user_diaries: 사용자 일지
     user_diaries_tooltip: 사용자 일지 보기
     view: 보기
     view_tooltip: 지도 보기
     welcome_user: "{{user_link}}님 환영합니다."
-    welcome_user_link_tooltip: Your user page
   map: 
     coordinates: "좌표:"
     edit: 편집
@@ -339,7 +278,6 @@ ko:
   message: 
     inbox: 
       date: 날짜
-      from: From
       my_inbox: 내 쪽지함
       no_messages_yet: 받은 쪽지가 없습니다. {{people_mapping_nearby_link}}에서 친구를 찾아보세요.
       outbox: 보낸 쪽지함
@@ -347,9 +285,6 @@ ko:
       subject: 제목
       title: 받은 쪽지함
       you_have: "{{new_count}} 개의 새 쪽지와 {{old_count}} 개의 읽은 쪽지가 있습니다."
-    mark: 
-      as_read: Message marked as read
-      as_unread: Message marked as unread
     message_summary: 
       read_button: 읽음으로 표시
       reply_button: 답장
@@ -369,26 +304,12 @@ ko:
     outbox: 
       date: 날짜
       inbox: 받은 편지함
-      my_inbox: My {{inbox_link}}
       no_sent_messages: 받은 쪽지가 없습니다. {{people_mapping_nearby_link}}에서 친구를 찾아보세요.
       outbox: 보낸 편지함
       people_mapping_nearby: 근처를 지도 입력한 사람들
       subject: 제목
       title: 보낸 쪽지함
-      to: To
       you_have_sent_messages: "{{sent_count}} 개의 쪽지를 보냈습니다."
-    read: 
-      back_to_inbox: Back to inbox
-      back_to_outbox: Back to outbox
-      date: Date
-      from: From
-      reading_your_messages: Reading your messages
-      reading_your_sent_messages: Reading your sent messages
-      reply_button: Reply
-      subject: Subject
-      title: Read message
-      to: To
-      unread_button: Mark as unread
   notifier: 
     diary_comment_notification: 
       banner1: "*                         이 email에 답장하지 마세요.                          *"
@@ -397,46 +318,13 @@ ko:
       header: "{{from_user}} 님이 {{subject}} 제목의 OpenStreetMap 일지 항목에 댓글을 남겼습니다.:"
       hi: "{{to_user}}님 안녕하세요."
       subject: "[OpenStreetMap] {{user}} 님이 당신의 일지 항목에 댓글을 남겼습니다."
-    email_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_html: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
-    email_confirm_plain: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
     friend_notification: 
       had_added_you: "{{user}} 님이 당신을 OpenStreetMap 친구로 추가하였습니다."
       see_their_profile: "{{userurl}} 에서 프로필을 확인하고 원하면 친구로 등록할 수 있습니다."
       subject: "[OpenStreetMap] {{user}} 님이 당신을 친구로 추가하였습니다."
     gpx_notification: 
-      and_no_tags: and no tags.
-      and_the_tags: "and the following tags:"
-      failure: 
-        failed_to_import: "failed to import. Here's the error:"
-        more_info_1: More information about GPX import failures and how to avoid
-        more_info_2: "them can be found at:"
-        subject: "[OpenStreetMap] GPX Import failure"
-      greeting: Hi,
       success: 
         loaded_successfully: "loaded successfully with {{trace_points}} out of a possible\n{{possible_points}} points."
-        subject: "[OpenStreetMap] GPX Import success"
-      with_description: with the description
-      your_gpx_file: It looks like your GPX file
-    lost_password: 
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_html: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
-    lost_password_plain: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
-      hopefully_you_2: email addresses openstreetmap.org account.
     message_notification: 
       banner1: "*                         이 email에 답장하지 마세요.                          *"
       banner2: "*            답장을 위해서는 OpenStreetMap 웹사이트를 이용해 주세요.             *"
@@ -445,252 +333,22 @@ ko:
       header: "{{from_user}} 님이 OpenStreetMap을 통해 {{subject}} 쪽지를 보냈습니다."
       hi: "{{to_user}}님 안녕하세요."
       subject: "[OpenStreetMap] {{user}}이 새 쪽지를 보냈습니다."
-    signup_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_html: 
-      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
-      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: You can watch an {{introductory_video_link}}.
-      more_videos: There are {{more_videos_link}}.
-      more_videos_here: more videos here
-      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
-      video_to_openstreetmap: introductory video to OpenStreetMap
-      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
-    signup_confirm_plain: 
-      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
-      click_the_link_2: account and read on for more information about OpenStreetMap.
-      current_user_1: A list of current users in categories, based on where in the world
-      current_user_2: "they are, is available from:"
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      user_wiki_1: It is recommended that you create a user wiki page, which includes
-      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
   site: 
     edit: 
-      anon_edits_link_text: Find out why this is the case.
-      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
-      not_public: You haven't set your edits to be public.
-      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
-      user_page_link: user page
     index: 
       js_1: 자바스크립트를 지원하지 않는 브라우저이거나, 자바스크립트가 활성화 되어 있지 않습니다.
-      js_2: OpenStreetMap uses javascript for its slippy map.
-      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
-      license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
-        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
-        project_name: OpenStreetMap project
-      permalink: Permalink
-    key: 
-      map_key: Map key
-      map_key_tooltip: Map key for the mapnik rendering at this zoom level
     search: 
-      search: Search
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near L체nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-      submit_text: Go
-      where_am_i: Where am I?
-    sidebar: 
-      close: Close
-      search_results: Search Results
   trace: 
-    create: 
-      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
-      upload_trace: Upload GPS Trace
-    delete: 
-      scheduled_for_deletion: Track scheduled for deletion
-    edit: 
-      description: "Description:"
-      edit: edit
-      filename: "Filename:"
-      owner: "Owner:"
-      points: "Points:"
-      save_button: Save Changes
-      start_coord: "Start coordinate:"
-      tags: "Tags:"
-      uploaded_at: "Uploaded at:"
-    list: 
-      public_traces: Public GPS traces
-      public_traces_from: Public GPS traces from {{user}}
-      tagged_with: " tagged with {{tags}}"
-      your_traces: Your GPS traces
-    make_public: 
-      made_public: Track made public
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: The user {{user}} does not exist
-      title: No such user
-    trace: 
-      ago: "{{time_in_words_ago}} ago"
-      by: by
-      count_points: "{{count}} points"
-      edit: edit
-      edit_map: Edit Map
-      in: in
-      map: map
-      more: more
-      pending: PENDING
-      private: PRIVATE
-      public: PUBLIC
-      trace_details: View Trace Details
-      view_map: View Map
-    trace_form: 
-      description: Description
-      help: Help
-      tags: Tags
-      upload_button: Upload
-      upload_gpx: Upload GPX File
-    trace_header: 
-      see_all_traces: See all traces
-      see_just_your_traces: See just your traces, or upload a trace
-      see_your_traces: See all your traces
-      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
-    trace_optionals: 
-      tags: Tags
-    trace_paging_nav: 
-      of: of
-      showing: Showing page
     view: 
-      delete_track: Delete this track
-      description: "Description:"
-      download: download
-      edit: edit
-      edit_track: Edit this track
-      filename: "Filename:"
-      heading: Viewing trace {{name}}
-      map: map
-      none: None
-      owner: "Owner:"
-      pending: PENDING
-      points: "Points:"
-      start_coordinates: "Start coordinate:"
       tags: Tags
-      trace_not_found: Trace not found!
-      uploaded: "Uploaded at:"
   user: 
     account: 
-      email never displayed publicly: (never displayed publicly)
-      flash update success: User information updated successfully.
-      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
-      home location: "Home Location:"
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      make edits public button: Make all my edits public
-      my settings: My settings
-      no home location: You have not entered your home location.
-      preferred languages: "Preferred Languages:"
-      profile description: "Profile Description:"
       public editing: 
-        disabled: Disabled and cannot edit data, all previous edits are anonymous.
-        disabled link text: why can't I edit?
-        enabled: Enabled. Not anonymous and can edit data.
         enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        enabled link text: what's this?
-        heading: "Public editing:"
-      return to profile: Return to profile
-      save changes button: Save Changes
-      title: Edit account
-      update home location on click: Update home location when I click on the map?
-    confirm: 
-      button: Confirm
-      failure: A user account with this token has already been confirmed.
-      heading: Confirm a user account
-      press confirm button: Press the confirm button below to activate your account.
-      success: Confirmed your account, thanks for signing up!
-    confirm_email: 
-      button: Confirm
-      failure: An email address has already been confirmed with this token.
-      heading: Confirm a change of email address
-      press confirm button: Press the confirm button below to confirm your new email address.
-      success: Confirmed your email address, thanks for signing up!
-    friend_map: 
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-      your location: Your location
-    go_public: 
-      flash success: All your edits are now public, and you are now allowed to edit.
-    login: 
-      account not active: Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account.
-      auth failure: Sorry, couldn't log in with those details.
-      create_account: create an account
-      email or username: "Email Address or Username:"
-      heading: Login
-      login_button: Login
-      lost password link: Lost your password?
-      password: "Password:"
-      please login: Please login or {{create_user_link}}.
-      title: Login
     lost_password: 
-      email address: "Email Address:"
-      heading: Forgotten Password?
       new password button: Send me a new password
-      notice email cannot find: Couldn't find that email address, sorry.
-      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
       title: lost password
-    make_friend: 
-      already_a_friend: You are already friends with {{name}}.
-      failed: Sorry, failed to add {{name}} as a friend.
-      success: "{{name}} is now your friend."
-    new: 
-      confirm email address: "Confirm Email Address:"
-      confirm password: "Confirm Password:"
-      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
-      display name: "Display Name:"
-      email address: "Email Address:"
-      fill_form: Fill in the form and we'll send you a quick email to activate your account.
-      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
-      heading: Create a User Account
-      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
-      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
-      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
-      password: "Password:"
-      signup: Signup
-      title: Create account
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: The user {{user}} does not exist
-      title: No such user
-    remove_friend: 
-      not_a_friend: "{{name}} is not one of your friends."
-      success: "{{name}} was removed from your friends."
     reset_password: 
-      flash token bad: Didn't find that token, check the URL maybe?
       title: reset password
-    set_home: 
-      flash success: Home location saved successfully
-    view: 
-      add as friend: add as friend
-      add image: Add Image
-      ago: ({{time_in_words_ago}} ago)
-      change your settings: change your settings
-      delete image: Delete Image
-      description: Description
-      diary: diary
-      edits: edits
-      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
-      km away: "{{count}}km away"
-      mapper since: "Mapper since:"
-      my diary: my diary
-      my edits: my edits
-      my settings: my settings
-      my traces: my traces
-      nearby users: "Nearby users:"
-      new diary entry: new diary entry
-      no friends: You have not added any friends yet.
-      no home location: No home location has been set.
-      no nearby users: There are no users who admit to mapping nearby yet.
-      remove as friend: remove as friend
-      send message: send message
-      settings_link_text: settings
-      traces: traces
-      upload an image: Upload an image
-      user image heading: User image
-      user location: User location
-      your friends: Your friends

config/locales/ksh.yml

@@ -8,7 +8,6 @@ ksh:
         friend: Fründ
         user: Metmaacher
       trace: 
-        name: Name
         user: Metmaacher
       user: 
         display_name: Name för zem Aanzeije
@@ -124,8 +123,6 @@ ksh:
     oauthorize: 
       allow_write_api: donn de Landkaat ändere
   oauth_clients: 
-    form: 
-      name: Name
     show: 
       edit: Einzelheite ändere
   trace: 

config/locales/nds.yml

@@ -40,16 +40,25 @@ 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:"
       edited_by: "Ännert von:"
-      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 +68,7 @@ nds:
       view_details: Details wiesen
     not_found: 
       type: 
+        node: Knütt
         way: Weg
     paging_nav: 
       of: von
@@ -74,28 +84,45 @@ nds:
       view_details: Details wiesen
     relation_member: 
       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,6 +131,7 @@ nds:
       of: von
       showing_page: an’t Sied weddergeven
     changesets: 
+      area: Rebeed
       comment: Kommentar
       saved_at: Spiekert an’n
       user: Bruker
@@ -112,12 +140,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,24 +163,29 @@ 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: 
-      export_button: Export
-      format: Format
+      add_marker: Sett en Markteken op de Koort
       image_size: Bildgrött
       latitude: "Breed:"
+      licence: Lizenz
       longitude: "Läng:"
       mapnik_image: Mapnik-Bild
       max: max.
+      osmarender_image: Osmarender-Bild
       output: Utgaav
-      zoom: Zoom
+      scale: Skaal
     start_rjs: 
-      export: Export
       view_larger_map: Grötter Koort wiesen
   geocoder: 
     description: 
@@ -173,10 +208,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
-    export: Export
+    edit: Ännern
     export_tooltip: Koortendaten exporteren
     help_wiki: Hülp & Wiki
     history: Geschicht
@@ -192,6 +232,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 +264,7 @@ nds:
       my_inbox: Mien {{inbox_link}}
       subject: Thema
       title: Postfack Utgang
+      to: An
     read: 
       date: Datum
       reply_button: Antern
@@ -261,15 +304,16 @@ nds:
     index: 
       license: 
         project_name: OpenStreetMap-Projekt
-      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 +327,7 @@ nds:
           commercial: Hannelsrebeed
           common: 
             - Wisch
+            - Wisch
           construction: Straat, an de noch boot warrt
           cycleway: Fohrradpadd
           farm: Buurnhoff
@@ -296,7 +341,6 @@ nds:
             - Stausee
           military: Militärrebeed
           motorway: Autobahn
-          park: Park
           pitch: Sportfeld
           primary: wichtige Landstraat
           private: Privat Togang
@@ -335,41 +379,52 @@ 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: 
       by: von
       edit: ännern
       edit_map: Koort ännern
-      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 +437,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 +459,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 +488,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

config/locales/nl.yml

@@ -43,7 +43,6 @@ nl:
       friend: Vriend
       language: Taal
       message: Bericht
-      node: Node
       node_tag: Nodelabel
       notifier: Melding
       old_node: Oude node
@@ -87,6 +86,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.
@@ -120,8 +120,6 @@ nl:
       download: "{{download_xml_link}} of {{view_history_link}}"
       download_xml: XML downloaden
       edit: bewerken
-      node: Node
-      node_title: "Node: {{node_name}}"
       view_history: geschiedenis bekijken
     node_details: 
       coordinates: "Coördinaten:"
@@ -136,7 +134,6 @@ nl:
       sorry: Sorry, de {{type}} met id {{id}} kan niet worden gevonden.
       type: 
         changeset: set wijzigingen
-        node: node
         relation: relatie
         way: weg
     paging_nav: 
@@ -160,7 +157,6 @@ nl:
     relation_member: 
       entry_role: "{{type}} {{name}} als {{role}}"
       type: 
-        node: Node
         relation: Relatie
         way: Weg
     start: 
@@ -169,7 +165,6 @@ nl:
     start_rjs: 
       data_frame_title: Gegevens
       data_layer_name: Gegevens
-      details: Details
       drag_a_box: Sleep een rechthoek op de kaart om een gebied te selecteren
       edited_by_user_at_timestamp: Bewerkt door [[user]] op [[timestamp]]
       history_for_feature: Geschiedenis voor [[feature]]
@@ -180,18 +175,14 @@ nl:
       object_list: 
         api: Dit gebied via de API ophalen
         back: Objectenlijst weergeven
-        details: Details
         heading: Objectenlijst
         history: 
           type: 
-            node: Node [[id]]
             way: Weg [[id]]
         selected: 
           type: 
-            node: Node [[id]]
             way: Weg [[id]]
         type: 
-          node: Node
           way: Weg
       private_user: private gebruiker
       show_history: Geschiedenis weergeven
@@ -211,7 +202,6 @@ nl:
       also_part_of: 
         one: ook onderdeel van weg {{related_ways}}
         other: ook deel van ways {{related_ways}}
-      nodes: "Nodes:"
       part_of: "Onderdeel van:"
     way_history: 
       download: "{{download_xml_link}} of {{view_details_link}}"
@@ -234,7 +224,6 @@ nl:
     changesets: 
       area: Gebied
       comment: Opmerking
-      id: ID
       saved_at: Opgeslagen op
       user: Gebruiker
     list: 
@@ -324,14 +313,12 @@ nl:
       longitude: "Lengte:"
       manually_select: Handmatig een ander gebied selecteren
       mapnik_image: Mapnik-afbeelding
-      max: max
       options: Instellingen
       osm_xml_data: OpenStreetMap XML-gegevens
       osmarender_image: Osmarender-afbeelding
       output: Uitvoer
       paste_html: Kopieer de HTML-code en voeg deze toe aan uw website
       scale: Schaal
-      zoom: Zoom
     start_rjs: 
       add_marker: Marker op de kaart zetten
       change_marker: Positie van de marker veranderen
@@ -359,7 +346,6 @@ nl:
       south: zuid
       south_east: zuidoost
       south_west: zuidwest
-      west: west
     distance: 
       one: ongeveer 1 km.
       other: ongeveer {{count}} km.
@@ -387,11 +373,9 @@ nl:
     export_tooltip: Kaartgegevens exporteren
     gps_traces: GPS-tracks
     gps_traces_tooltip: Tracks beheren
-    help_wiki: Help & Wiki
     help_wiki_tooltip: Help en wikisite voor het project
     history: Geschiedenis
     history_tooltip: Wijzigingensetgeschiedenis
-    home: home
     home_tooltip: Naar thuislocatie gaan
     inbox: Postvak IN ({{count}})
     inbox_tooltip: 
@@ -543,6 +527,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
@@ -663,7 +648,6 @@ nl:
             - reservoir
           military: Militair gebied
           motorway: Snelweg
-          park: Park
           permissive: Beperkte toegang
           pitch: Sportvelden
           primary: Primaire weg
@@ -743,7 +727,6 @@ nl:
       count_points: "{{count}} punten"
       edit: bewerken
       edit_map: Kaart bewerken
-      in: in
       map: kaart
       more: meer
       pending: BEZIG
@@ -752,13 +735,12 @@ nl:
       trace_details: Trackdetails bekijken
       view_map: Kaart bekijken
     trace_form: 
-      description: Beschrijving
-      help: Help
-      tags: Labels
+      description: "Beschrijving:"
+      tags: "Labels:"
       tags_help: kommagescheiden
       upload_button: Uploaden
-      upload_gpx: Upload GPX-bestand
-      visibility: Zichtbaarheid
+      upload_gpx: "GPX-bestand uploaden:"
+      visibility: "Zichtbaarheid:"
       visibility_help: wat betekent dit?
     trace_header: 
       see_all_traces: Alle tracks zien
@@ -789,6 +771,11 @@ nl:
       trace_not_found: De track is niet gevonden!
       uploaded: "Geüpload op:"
       visibility: "Zichtbaarheid:"
+    visibility: 
+      identifiable: Identificeerbaar (weergegeven in tracklijst en als identificeerbare, geordende punten met tijdstempels)
+      private: Privé (alleen gedeeld als anoniem; ongeordende punten)
+      public: Publiek (weergegeven in tracklijst en als anonieme, ongeordende punten)
+      trackable: Traceerbaar (alleen gedeeld als anoniem; geordende punten met tijdstempels)
   user: 
     account: 
       email never displayed publicly: (nooit openbaar gemaakt)
@@ -888,7 +875,7 @@ nl:
       add as friend: vriend toevoegen
       add image: Afbeelding toevoegen
       ago: ({{time_in_words_ago}} geleden)
-      change your settings: instellingen aanpassen
+      change your settings: Instellingen aanpassen
       delete image: Afbeelding verwijderen
       description: Beschrijving
       diary: dagboek

config/locales/no.yml

@@ -1,61 +1,125 @@
 "no": 
   activerecord: 
     attributes: 
+      diary_comment: 
+        body: Kropp
       diary_entry: 
+        language: Språk
+        latitude: Breddegrad
+        longitude: "Lengdegrad:"
+        title: Tittel
         user: Bruker
       friend: 
+        friend: Venn
         user: Bruker
+      message: 
+        body: Kropp
+        recipient: Mottaker
+        sender: Avsender
+        title: Tittel
+      trace: 
+        description: Beskrivelse
+        latitude: Breddegrad
+        longitude: "Lengdegrad:"
+        name: Navn
+        public: Offentlig
+        size: Størrelse
+        user: Bruker
+        visible: Synlig
       user: 
+        active: Aktive
+        description: Beskrivelse
         display_name: Visningsnavn
+        email: E-post
+        languages: Språk
+        pass_crypt: "Passord:"
     models: 
+      acl: Tilgangskontrolliste
+      changeset: Endringssett
+      changeset_tag: Endringssettmerkelapp
       country: Land
+      diary_comment: Dagbokskommentar
+      diary_entry: Dagboksoppføring
       friend: Venn
       language: Språk
+      message: Melding
+      node_tag: Nodemerkelapp
+      notifier: Varsling
+      old_node: Gammel node
+      old_node_tag: Gammel nodemerkelapp
+      old_relation: Gammel relasjon
+      old_relation_member: Gammelt relasjonsmedlem
+      old_relation_tag: Gammel relasjonsmerkelapp
+      old_way: Gammelvei
+      old_way_node: Gammel veinode
+      old_way_tag: Gammel veimerkelapp
+      relation: Relasjon
+      relation_member: Relasjonsmedlem
+      relation_tag: Relasjonsmerkelapp
+      session: Økt
+      trace: Spor
+      tracepoint: Punkt i spor
+      tracetag: Spormerkelapp
       user: Bruker
+      user_preference: Brukerinnstillinger
+      user_token: Brukernøkkel
+      way: Vei
+      way_node: Veinode
+      way_tag: Veimerkelapp
   browse: 
     changeset: 
       changeset: "Endringssett: {{id}}"
-      changesetxml: Endringssett-XML
+      changesetxml: XML for endringssett
       download: Last ned {{changeset_xml_link}} eller {{osmchange_xml_link}}
       feed: 
         title: Endringssett {{id}}
-        title_comment: Endringssett {{id}} – {{comment}}
-      osmchangexml: osmChange XML
+        title_comment: "Endringssett: {{id}} - {{comment}}"
       title: Endringssett
     changeset_details: 
-      belongs_to: "Hører til:"
-      bounding_box: "Ytre grense:"
+      belongs_to: "Tilhører:"
       box: boks
-      closed_at: "Stengt:"
+      closed_at: "Lukket:"
       created_at: "Opprettet:"
       has_nodes: 
         one: "Har følgende {{count}} node:"
         other: "Har følgende {{count}} noder:"
       has_relations: 
-        one: "Har følgende {{count}} forhold:"
-        other: "Har følgende {{count}} forhold:"
+        one: "Har følgende {{count}} relasjon:"
+        other: "Har følgende {{count}} relasjoner:"
       has_ways: 
         one: "Har følgende {{count}} vei:"
         other: "Har følgende {{count}} veier:"
-      no_bounding_box: Ingen ytre grenser har blitt lagret for dette endringssettet.
-      show_area_box: Vis områdeboks
+      no_bounding_box: Ingen bounding box er lagret for dette endringssettet.
+      show_area_box: Vis boks for område
+    changeset_navigation: 
+      all: 
+        next_tooltip: Neste endringssett
+        prev_tooltip: Forrige endringssett
+      user: 
+        name_tooltip: Vis redigeringer av {{user}}
+        next_tooltip: Neste redigering av {{user}}
+        prev_tooltip: Forrige redigering av {{user}}
+    common_details: 
+      changeset_comment: "Kommentar:"
+      edited_at: "Redigert:"
+      edited_by: "Redigert av:"
+      in_changeset: "I endringssett:"
+      version: "Versjon:"
     containing_relation: 
-      entry: Forhold {{relation_name}}
-      entry_role: Forhold {{relation_name}} (som {{relation_role}})
+      entry: Relasjon {{relation_name}}
+      entry_role: Relasjon {{relation_name}} (som {{relation_role}})
     map: 
       deleted: Slettet
       larger: 
         area: Vis område på større kart
         node: Vis node på større kart
-        relation: Vis forhold på større kart
+        relation: Vis relasjon på større kart
         way: Vis vei på større kart
-      loading: Laster...
+      loading: Laster ...
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
       download_xml: Last ned XML
       edit: rediger
-      node: Node
-      node_title: "Node: {{node_name}}"
       view_history: vis historikk
     node_details: 
       coordinates: "Koordinater:"
@@ -63,23 +127,23 @@
     node_history: 
       download: "{{download_xml_link}} eller {{view_details_link}}"
       download_xml: Last ned XML
-      node_history: Nodehistorikk
+      node_history: Nodehistorik
       node_history_title: "Nodehistorikk: {{node_name}}"
       view_details: vis detaljer
     not_found: 
-      sorry: "{{type}}n med ID-en {{id}} kunne ikke finnes."
+      sorry: Klarte ikke finne {{type}}-en med ID {{id}}.
       type: 
         changeset: endringssett
-        node: node
-        relation: forhold
+        relation: relasjon
         way: vei
     paging_nav: 
       of: av
       showing_page: Viser side
     relation: 
+      download: "{{download_xml_link}} eller {{view_history_link}}"
       download_xml: Last ned XML
-      relation: Forhold
-      relation_title: "Forhold: {{relation_name}}"
+      relation: Relasjon
+      relation_title: "Relasjon: {{relation_name}}"
       view_history: vis historikk
     relation_details: 
       members: "Medlemmer:"
@@ -87,49 +151,46 @@
     relation_history: 
       download: "{{download_xml_link}} eller {{view_details_link}}"
       download_xml: Last ned XML
-      relation_history: Forholdshistorikk
-      relation_history_title: "Forholdshistorikk: {{relation_name}}"
+      relation_history: Relasjonshistorikk
+      relation_history_title: "Relasjonshistorikk: {{relation_name}}"
       view_details: vis detaljer
     relation_member: 
       entry_role: "{{type}} {{name}} som {{role}}"
       type: 
-        node: Node
-        relation: Forhold
+        relation: Relasjon
         way: Vei
+    start: 
+      manually_select: Velg et annet område manuelt
+      view_data: Vis data for gjeldende kartvisning
     start_rjs: 
-      data_frame_title: Data
-      data_layer_name: Data
       details: Detaljer
-      drag_a_box: Marker et område på kartet
-      edited_by_user_at_timestamp: Redigert av [[user]] [[timestamp]]
+      drag_a_box: Dra en boks på kartet for å velge et område
+      edited_by_user_at_timestamp: Redigert av [[user]],  [[timestamp]]
       history_for_feature: Historikk for [[feature]]
-      load_data: Last data
+      load_data: Last inn data
       loaded_an_area_with_num_features: "Du har lastet et område som inneholder [[num_features]] objekter. Noen nettlesere fungerer ikke ved håndtering av så mye data. Nettlesere fungerer generelt best med mindre enn 100 objekter av gangen: noe mer kan gjøre at nettleseren fryser. Om du er sikker på at du vil se denne informasjonen kan du gjøre det ved å klikke på knappen nedenfor."
-      loading: Laster...
+      loading: Laster ...
       manually_select: Velg et annet område manuelt
       object_list: 
-        api: Dent dette området fra API-en
+        api: Hent dette området fra API-et
         back: Vis objektliste
         details: Detaljer
         heading: Objektliste
         history: 
           type: 
-            node: Node [[id]]
             way: Vei [[id]]
         selected: 
           type: 
-            node: Node [[id]]
-            way: Vei [[id]]
+            way: Vei [[id]]
         type: 
-          node: Node
           way: Vei
       private_user: privat bruker
       show_history: Vis historikk
-      unable_to_load_size: "Kan ikke last: Boksstørrelsen [[bbox_size]] er for stor (må være mindre enn {{max_bbox_size}})"
-      wait: Vent...
-      zoom_or_select: Zoom inn eller velg området di vil se
+      unable_to_load_size: "Klarte ikke laste inn: Bounding box med størrelse [[bbox_size]] er for stor (må være mindre enn {{max_bbox_size}})"
+      wait: Vent ...
+      zoom_or_select: Zoom inn eller velg et område av kartet for visning
     tag_details: 
-      tags: "Tagger:"
+      tags: "Markelapper:"
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
       download_xml: Last ned XML
@@ -139,8 +200,8 @@
       way_title: "Vei: {{way_name}}"
     way_details: 
       also_part_of: 
-        one: også del av veien {{related_ways}}
-        other: også del av veiene {{related_ways}}
+        one: også del av vei {{related_ways}}
+        other: også del av veier {{related_ways}}
       nodes: "Noder:"
       part_of: "Del av:"
     way_history: 
@@ -149,5 +210,575 @@
       view_details: vis detaljer
       way_history: Veihistorikk
       way_history_title: "Veihistorikk: {{way_name}}"
-  map: 
+  changeset: 
+    changeset: 
+      anonymous: Anonym
+      big_area: (stor)
+      no_comment: (ingen)
+      no_edits: (ingen redigeringer)
+      show_area_box: vis boks for område
+      still_editing: (redigerer forsatt)
+      view_changeset_details: Vis detaljer for endringssett
+    changeset_paging_nav: 
+      of: av
+      showing_page: Viser side
+    changesets: 
+      area: Område
+      comment: Kommentar
+      saved_at: Lagret
+      user: Bruker
+    list: 
+      description: Siste endringer
+      description_bbox: Endringssett innenfor {{bbox}}
+      description_user: Endringssett av {{user}}
+      description_user_bbox: Endringssett av {{user}} innen {{bbox}}
+      heading: Endringssett
+      heading_bbox: Endringssett
+      heading_user: Endringssett
+      heading_user_bbox: Endringssett
+      title: Endringssett
+      title_bbox: Endringssett innenfor {{bbox}}
+      title_user: Endringssett av {{user}}
+      title_user_bbox: Endringssett av {{user}} innen {{bbox}}
+  diary_entry: 
+    diary_entry: 
+      comment_count: 
+        one: 1 kommentar
+        other: "{{count}} kommentarer"
+      comment_link: "Maler i bruk på denne siden:"
+      edit_link: Rediger denne oppføringen
+      reply_link: Send en e-post til denne brukeren
+    edit: 
+      body: "Kropp:"
+      language: "Språk:"
+      latitude: "Breddegrad:"
+      location: "Posisjon:"
+      longitude: "Lengdegrad:"
+      marker_text: ny dagboksoppføring
+      save_button: Lagre
+      subject: "Emne:"
+      title: Rediger dagbokoppføring
+      use_map_link: bruk kart
+    feed: 
+      all: 
+        title: OpenStreetMap dagbokoppføringer
+    list: 
+      in_language_title: Dagbokoppføringer på {{language}}
+      new: Ny dagbokoppføring
+      newer_entries: Nyere oppføringer
+      no_entries: Ingen dagbokoppføringer
+      older_entries: Eldre oppføringer
+      recent_entries: Ingen dagbokoppføringer
+      title: Brukernes dagbøker
+      user_title: Dagboken for {{user}}
+    new: 
+      title: ny dagboksoppføring
+    no_such_entry: 
+      heading: "  %s har ingen overstyringsoppføring"
+      title: "  %s har ingen overstyringsoppføring"
+    no_such_user: 
+      heading: Brukeren {{user}} finnes ikke
+      title: Ingen bruker funnet
+    view: 
+      leave_a_comment: Legg igjen en kommentar
+      login: Logg inn
+      save_button: Lagre
+      title: Brukernes dagbok | {{user}}
+      user_title: Dagboken for {{user}}
+  export: 
+    start: 
+      add_marker: Legg til en markør på kartet
+      area_to_export: Område som skal eksporteres
+      embeddable_html: HTML-fil (*.html)|*.html
+      export_button: Eksporter
+      format_to_export: Format for eksport
+      image_size: Bildestørrelse
+      licence: Lisens
+      manually_select: Velg et annet område manuelt
+      mapnik_image: Mapnik-bilde
+      max: maks
+      options: Valg
+      osm_xml_data: OpenStreetMap XML-data
+      osmarender_image: Osmarender-bilde
+      output: Utdata
+      scale: Skala
+    start_rjs: 
+      add_marker: Legg til en markør på kartet
+      change_marker: Endre markørposisjon
+      click_add_marker: Klikk på kartet for å legge til en markør
+      drag_a_box: Dra en boks på kartet for å velge et område
+      export: Eksporter
+      manually_select: Velg et annet område manuelt
+      view_larger_map: Vis større kart
+  geocoder: 
+    description: 
+      title: 
+        geonames: Posisjon fra <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} fra <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
+        cities: Byer
+        places: Steder
+        towns: Småbyer
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} av {{type}}"
+    direction: 
+      east: øst
+      north: nord
+      north_east: nordøst
+      north_west: nordvest
+      south: sør
+      south_east: sørøst
+      south_west: sørvest
+      west: vest
+    distance: 
+      one: omtrent 1 km
+      other: omtrent {{count}}km
+      zero: mindre enn 1 km
+    results: 
+      no_results: Ingen resultat funnet
+    search: 
+      title: 
+        ca_postcode: Resultat fra <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Resultat fra <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Resultat fra <a href="http://openstreetmap.org/">Internt</a>
+        osm_namefinder: Resultat fra <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Resultat fra <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Resultat fra <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} av {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} av {{placename}}"
+  layouts: 
+    alt_donation: Doner
+    donate_link_text: donering
     edit: Rediger
+    edit_tooltip: Rediger kart
+    export: Eksporter
+    export_tooltip: Eksporter kartdata
+    gps_traces: GPS-spor
+    gps_traces_tooltip: Behandle spor
+    help_wiki: Hjelp &amp; Wiki
+    help_wiki_tooltip: Hjelp- &amp; Wiki-side for prosjektet
+    history: Historikk
+    history_tooltip: Historikk for endringssett
+    home: hjem
+    home_tooltip: Gå til hjemmeposisjon
+    inbox: innboks ({{count}})
+    inbox_tooltip: 
+      one: Din innboks inneholder 1 ulest melding
+      other: Din innboks inneholder {{count}} uleste meldinger
+      zero: Din innboks inneholder ingen uleste meldinger
+    intro_1: OpenStreetMap er et fritt redigerbart kart over hele jorda. Det er lagd av folk som deg.
+    intro_2: OpenStreetMap gjør det mulig å vise, redigere og bruke geografiske data på en samarbeidende måte fra hvor som helst på jorda.
+    intro_3: OpenStreetMaps hosting er støttet av {{ucl}} og {{bytemark}}.
+    log_in: logg inn
+    log_in_tooltip: Logg inn med en eksisterende konto
+    logo: 
+      alt_text: OpenStreetMap-logo
+    logout: logg ut
+    logout_tooltip: Logg ut
+    news_blog: Nyhetsblogg
+    news_blog_tooltip: Nyhetsblogg om OpenStreetMap, frie geografiske data, osv.
+    osm_offline: OpenStreetMap databasen er for øyeblikket utilgjengelig mens essensielt vedlikeholdsarbeid utføres.
+    osm_read_only: OpenStreetMap databasen er for øyeblikket i kun-lese-modus mens essensielt vedlikeholdsarbeid utføres.
+    shop: Butikk
+    sign_up: registrer
+    sign_up_tooltip: Opprett en konto for redigering
+    sotm: Kom til 2009 OpenStreetMap konferansen, The State of the Map, juli 10-12 i Amsterdam!
+    tag_line: Fritt Wiki-verdenskart
+    user_diaries: Brukerdagbok
+    user_diaries_tooltip: Vis brukerens dagbok
+    view: Vis
+    view_tooltip: Vis kart
+    welcome_user: Velkommen, {{user_link}}
+    welcome_user_link_tooltip: Din brukerside
+  map: 
+    coordinates: "Koordinater:"
+    edit: Rediger
+    view: Vis
+  message: 
+    delete: 
+      deleted: Melding slettet
+    inbox: 
+      date: Dato
+      from: Fra
+      my_inbox: Min innboks
+      outbox: utboks
+      people_mapping_nearby: folk i nærheten som lager kart
+      subject: Emne
+      title: Innboks
+    mark: 
+      as_read: Melding markert som lest
+      as_unread: Melding markert som ulest
+    message_summary: 
+      delete_button: Slett
+      read_button: Marker som lest
+      reply_button: Svar
+      unread_button: Marker som ulest
+    new: 
+      back_to_inbox: Tilbake til innboks
+      body: Kropp
+      message_sent: Melding sendt
+      send_message_to: Send en ny melding til {{navn}}
+      subject: Emne
+      title: Send melding
+    no_such_user: 
+      heading: Ingen bruker eller melding funnet
+      title: Ingen bruker eller melding funnet
+    outbox: 
+      date: Dato
+      inbox: innboks
+      my_inbox: Min {{inbox_link}}
+      no_sent_messages: folk i nærheten som lager kart
+      outbox: utboks
+      subject: Emne
+      title: Utboks
+      to: Til
+      you_have_sent_messages: Du har sendt {{sent_count}} meldinger
+    read: 
+      back_to_inbox: Tilbake til innboks
+      back_to_outbox: Tilbake til utboks
+      date: Dato
+      from: Fra
+      reading_your_messages: Leser dine meldinger
+      reading_your_sent_messages: Les dine sendte meldinger
+      reply_button: Svar
+      subject: Emne
+      title: Les melding
+      to: Til
+      unread_button: Marker som ulest
+    sent_message_summary: 
+      delete_button: Slett
+  notifier: 
+    diary_comment_notification: 
+      hi: Hei {{to_user}},
+    email_confirm: 
+      subject: Du må $1 for å bekrefte e-postadressen din.
+    email_confirm_html: 
+      greeting: Hei,
+    email_confirm_plain: 
+      greeting: Hei,
+    gpx_notification: 
+      and_no_tags: og ingen merkelapper.
+      and_the_tags: "og følgende merkelapper:"
+      failure: 
+        failed_to_import: Intern feil, klarte ikke å opprette %s
+        subject: Tolkningsfeil ved XML-import
+      greeting: Hei,
+      with_description: med beskrivelse
+    lost_password: 
+      subject: "[OpenStreetMap] Forespørsel om ullstilling av passord"
+    lost_password_html: 
+      greeting: Hei,
+    lost_password_plain: 
+      greeting: Hei,
+    message_notification: 
+      hi: Hei {{to_user}},
+    signup_confirm: 
+      subject: Du må $1 for å bekrefte e-postadressen din.
+    signup_confirm_html: 
+      greeting: Hei der!
+      more_videos_here: flere videoer her
+    signup_confirm_plain: 
+      greeting: Hei der!
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: les dine private GPS-spor.
+      allow_read_prefs: Innstillingene ble lagret.
+      allow_to: "Tillat klientprogrammet å gjøre:"
+      allow_write_api: endre kartet.
+      allow_write_diary: opprett dagbokoppføringer, kommentarer og finn venner.
+      allow_write_gpx: last opp GPS-spor.
+      allow_write_prefs: Innstillingene ble lagret.
+    revoke: 
+      flash: Du slettet nøkkelen for {{application}}
+  oauth_clients: 
+    create: 
+      flash: "Vellykket oppdatering av regel #"
+    edit: 
+      submit: Rediger
+      title: Rediger ditt programvare
+    form: 
+      allow_write_api: endre kartet.
+      allow_write_gpx: last opp GPS-spor.
+      callback_url: "URL til sårbarhetsinformasjon:"
+      name: Navn
+      required: Påkrevet
+      support_url: "URL til sårbarhetsinformasjon:"
+      url: "URL til sårbarhetsinformasjon:"
+    index: 
+      application: Applikasjonsnavn
+      issued_at: Utstedt
+      my_apps: Min {{inbox_link}}
+      my_tokens: Min {{inbox_link}}
+      register_new: Registrer din applikasjon
+      revoke: Tilbakekall!
+      title: Mine OAuth-detaljer
+    new: 
+      submit: Registrer
+      title: Registrer en ny applikasjon
+    not_found: 
+      sorry: Klarte ikke finne den {{type}}-en.
+    show: 
+      access_url: "URL til sårbarhetsinformasjon:"
+      allow_write_api: endre kartet.
+      allow_write_gpx: last opp GPS-spor.
+      authorize_url: "URL til sårbarhetsinformasjon:"
+      edit: Rediger detaljer
+      key: Kartnøkkel
+      url: "URL til sårbarhetsinformasjon:"
+    update: 
+      flash: Informasjon om %d pakke/pakker ble oppdatert.
+  site: 
+    edit: 
+      user_page_link: brukerside
+    index: 
+      license: 
+        project_name: OpenStreetMap-prosjekt
+    key: 
+      map_key: Kartnøkkel
+      table: 
+        entry: 
+          admin: Administrativ grense
+          apron: 
+            - terminal
+          bridleway: Ridevei
+          building: Skaper oversikt over avhengighetsforhold
+          byway: Stikkvei
+          cable: 
+            - Kabelvogn
+            - stolheis
+          centre: Sportssenter
+          commercial: Kommersielt område
+          common: 
+            - Vanlig
+            - eng
+          construction: Innholdet er tilgjengelig under $1.
+          cycleway: Sykkelvei
+          destination: Destinasjonstilgang
+          farm: Gård
+          footway: Gangvei
+          forest: Skog
+          golf: Golfbane
+          industrial: Industriområde
+          lake: 
+            - Innsjø
+            - reservoar
+          military: Militært område
+          motorway: Motorvei
+          permissive: Destinasjonstilgang
+          primary: Primær vei
+          private: Privat tilgang
+          rail: Jernbane
+          reserve: Naturreservat
+          resident: Boligområde
+          retail: Militært område
+          school: 
+            - Skole
+            - universitet
+          secondary: Sekundær vei
+          station: Jernbanestasjon
+          subway: Undergrunnsbane
+          summit: 
+            - Topp
+            - fjelltopp
+          tourist: Turistattraksjon
+          track: Spor
+          tram: 
+            - Lyskilde
+            - trikk
+          trunk: Hovedvei
+          unclassified: Uklassifisert vei
+          wood: Ved
+        heading: endret beskyttelsesnivå for «[[$1]]»
+    search: 
+      search: Søk
+      submit_text: Gå
+      where_am_i: Hvor er jeg?
+    sidebar: 
+      close: Lukk
+      search_results: Søkeresultater
+  trace: 
+    create: 
+      trace_uploaded: Din GPX-fil er last opp og venter på å bli satt inn i databasen. Dette skjer vanligvis innen en halvtime og en e-post blir sendt til deg når det er gjort.
+      upload_trace: Last opp GPS-spor
+    delete: 
+      scheduled_for_deletion: Spor planlagt slettet
+    edit: 
+      description: "Beskrivelse:"
+      download: last ned
+      edit: rediger
+      filename: "Filnavn:"
+      heading: Redigerer spor {{name}}
+      map: kart
+      owner: "Eier:"
+      points: "Punkter:"
+      save_button: Lagre endringer
+      start_coord: "Startkoordinat:"
+      tags: "Markelapper:"
+      tags_help: kommaseparert
+      title: Redigerer spor {{name}}
+      uploaded_at: "Lastet opp:"
+      visibility: "Synlighet:"
+      visibility_help: hva betyr dette?
+    list: 
+      public_traces: Offentlig GPS-spor
+      public_traces_from: Offentlige GPS-spor fra {{user}}
+      tagged_with: merket med {{tags}}
+      your_traces: Dine GPS-spor
+    make_public: 
+      made_public: Spor gjort offentlig
+    no_such_user: 
+      heading: Brukeren {{user}} finnes ikke
+      title: Ingen bruker funnet
+    trace: 
+      ago: "{{time_in_words_ago}} siden"
+      by: av
+      count_points: "{{count}} punkter"
+      edit: rediger
+      edit_map: Rediger kart
+      in: i
+      map: kart
+      more: mer
+      pending: VENTENDE
+      private: PRIVAT
+      public: OFFENTLIG
+      trace_details: Vis detaljer for spor
+      view_map: Vis kart
+    trace_form: 
+      description: Beskrivelse
+      help: Hjelp
+      tags: Markelapper
+      tags_help: kommaseparert
+      upload_button: Last opp
+      upload_gpx: Last opp GPX-fil
+      visibility: Synlighet
+      visibility_help: hva betyr dette?
+    trace_header: 
+      see_all_traces: Se alle spor
+      see_just_your_traces: Se dine spor eller last opp et spor
+      see_your_traces: Se alle dine spor
+      traces_waiting: Du har {{count}} spor som venter på opplasting. Du bør vurdere å la disse bli ferdig før du laster opp flere spor slik at du ikke blokkerer køa for andre brukere.
+    trace_optionals: 
+      tags: Markelapper
+    trace_paging_nav: 
+      of: av
+      showing: Viser side
+    view: 
+      delete_track: Slett dette sporet
+      description: "Beskrivelse:"
+      download: last ned
+      edit: rediger
+      edit_track: Rediger dette sporet
+      filename: "Filnavn:"
+      heading: Viser spor {{name}}
+      map: kart
+      none: Ingen
+      owner: "Eier:"
+      pending: VENTENDE
+      points: "Punkter:"
+      start_coordinates: "Startkoordinat:"
+      tags: "Markelapper:"
+      title: Viser spor {{name}}
+      trace_not_found: Spor ikke funnet!
+      uploaded: "Lastet opp:"
+      visibility: "Synlighet:"
+    visibility: 
+      identifiable: Identifiserbar (vist i sporlista og som identifiserbare, sorterte punkter med tidsstempel)
+      private: Privat (bare delt som anononyme, usorterte punkter)
+      public: Offentlig (vist i sporlista og som anononyme, usorterte punkter)
+      trackable: Sporbar (bare delt som anonyme, sorterte punkter med tidsstempel)
+  user: 
+    account: 
+      email never displayed publicly: " (vis aldri offentlig)"
+      flash update success: Brukerinformasjon oppdatert.
+      home location: "Hjemmeposisjon:"
+      latitude: "Breddegrad:"
+      longitude: "Lengdegrad:"
+      my settings: Mine innstillinger
+      preferred languages: "Foretrukne språk:"
+      profile description: "Profilbeskrivelse:"
+      public editing: 
+        disabled link text: hvorfor can jeg ikke redigere?
+        enabled link text: hva er dette?
+        heading: "Offentlig redigering:"
+      return to profile: Returner til profil
+      save changes button: Lagre endringer
+      title: Rediger konto
+    confirm: 
+      button: Bekreft
+      failure: En brukerkonto med denne nøkkelen er allerede bekreftet.
+      heading: Bekreft en brukerkonto
+      press confirm button: Klikk bekreftknappen nedenfor for å aktivere kontoen din.
+      success: Kontoen din er bekreftet - takk for at du registrerte deg.
+    confirm_email: 
+      button: Bekreft
+      failure: En e-postadresse er allerede bekreftet med denne nøkkelen.
+      heading: Bekreft endring av e-postadresse
+      press confirm button: Klikk bekreftknappen nedenfor for å bekrefte din nye e-postadressse.
+      success: E-postadressen din er bekreftet - takk for at du registrerte deg.
+    friend_map: 
+      nearby mapper: "Bruker i nærheten: [[nearby_user]]"
+      your location: Din posisjon
+    login: 
+      create_account: opprett en konto
+      email or username: "E-postadresse eller brukernavn:"
+      heading: Logg inn
+      login_button: Logg inn
+      lost password link: Mistet passordet ditt?
+      password: "Passord:"
+      title: Logg inn
+    lost_password: 
+      email address: "E-postadresse:"
+      heading: Glemt passord?
+      new password button: Nullstill passord
+      title: Glemt passord
+    make_friend: 
+      already_a_friend: Du er allerede venner med {{name}}.
+      failed: Klarte ikke legge til {{name}} som venn.
+      success: "{{name}} er nå din venn."
+    new: 
+      confirm email address: "Bekreft e-postadresse:"
+      confirm password: "Bekreft passord:"
+      display name: "Visningsnavn:"
+      email address: "E-postadresse:"
+      heading: Opprett en brukerkonto
+      password: "Passord:"
+      signup: Registrering
+      title: Opprett konto
+    no_such_user: 
+      heading: Brukeren {{user}} finnes ikke
+      title: Ingen bruker funnet
+    reset_password: 
+      confirm password: "Bekreft passord:"
+      flash changed: Ditt passord er endret.
+      heading: Nullstill passord for {{user}}
+      password: "Passord:"
+      reset: Nullstill passord
+      title: Nullstill passord
+    view: 
+      add as friend: legg til som en venn
+      add image: Legg til bilde
+      ago: ({{time_in_words_ago}} siden)
+      change your settings: endre dine innstillinger
+      delete image: Slett bilde
+      description: Beskrivelse
+      diary: dagbok
+      edits: redigeringer
+      km away: "{{count}}km unna"
+      m away: "{{count}}m unna"
+      mapper since: "Bruker siden:"
+      my diary: min dagbok
+      my edits: mine redigeringer
+      my settings: mine innstillinger
+      my traces: mine spor
+      my_oauth_details: Vis mine OAuth-detaljer
+      nearby users: "Næreliggende brukere:"
+      new diary entry: ny dagbokoppføring
+      remove as friend: fjern som venn
+      send message: send melding
+      settings_link_text: innstillinger
+      traces: spor
+      upload an image: Last opp et bilde
+      user image heading: Brukerbilde
+      user location: Brukerens posisjon
+      your friends: Dine venner

config/locales/pl.yml

@@ -30,12 +30,10 @@ pl:
         active: Aktywny
         description: Opis
         display_name: Przyjazna nazwa
-        email: Email
         languages: Języki
         pass_crypt: Hasło
     models: 
       acl: Lista ACL
-      changeset: Changeset
       changeset_tag: Tag changesetu
       country: Państwo
       diary_comment: Komentarz dziennika
@@ -45,7 +43,6 @@ pl:
       message: Wiadomość
       node: Węzeł
       node_tag: Tag węzła
-      notifier: Notifier
       old_node: Wcześniejszy węzeł
       old_node_tag: Tag wcześniejszego węzła
       old_relation: Stara relacja
@@ -69,11 +66,9 @@ pl:
       way_tag: Tag drogi
   browse: 
     changeset: 
-      changeset: "Changeset: {{id}}"
       changesetxml: XML w formacie Changesetu
       download: Ściągnij {{changeset_xml_link}} lub {{osmchange_xml_link}}
       osmchangexml: XML w formacie osmChange
-      title: Changeset
     changeset_details: 
       belongs_to: "Należy do:"
       bounding_box: "Prostokąt min/max:"
@@ -179,7 +174,6 @@ pl:
     changesets: 
       area: Obszar
       comment: Komentarz
-      id: ID
       saved_at: Zapisano
       user: Użytkownik
   diary_entry: 
@@ -233,7 +227,6 @@ pl:
       embeddable_html: HTML do wklejenia
       export_button: Eksportuj
       export_details: Dane OpenStreetMap są na licencji <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
-      format: Format
       format_to_export: Format eksportu
       image_size: "Rozmiar obrazka:"
       latitude: "Szer:"
@@ -241,14 +234,12 @@ pl:
       longitude: "Dł:"
       manually_select: Ręcznie zaznacz inny obszar
       mapnik_image: Obrazek z Mapnika
-      max: max
       options: Opcje
       osm_xml_data: Dane XML OpenStreetMap
       osmarender_image: Obrazek z Osmarender
       output: Wynik
       paste_html: Użyj podanego kodu HTML, aby umieścić na stronie
       scale: Skala
-      zoom: Zoom
     start_rjs: 
       add_marker: Dodaj pinezkę na mapie
       change_marker: Zmień pozycję pinezki
@@ -400,17 +391,15 @@ pl:
       flash_player_required: Będziesz potrzebował wtyczki Flash żeby korzystać z Potlatcha, edytora OpenStreetMap we Flashu.  Ściągnij <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">odtwarzacz Flasha z Adobe.com</a>.  Możesz również skorzystać z <a href="http://wiki.openstreetmap.org/wiki/Editing">paru innych dostępnych edytorów</a> żeby kontrybuować w OpenStreetMap.
       not_public: Nie wybrałeś(aś) by twoje edycje były publiczne.
       not_public_description: W tym trybie nie można już zmieniać mapy.  Możesz ustawić je na publiczne na Twojej {{user_page}}.
-      potlatch_unsaved_changes: Masz niezapisane zmiany. (Żeby zapisać zmiany w Potlatchu, należy odznaczyć aktualnie zaznaczony obiekt jeśli edytujesz w trybie "na żywo" lub kliknąć Save (Zapisz) jeśli widoczny jest przycisk Save.)
+      potlatch_unsaved_changes: Nie zapisałeś zmian. (Żeby zapisać zmiany w Potlatchu, należy odznaczyć aktualnie zaznaczony obiekt jeśli edytujesz w trybie "na żywo" lub kliknąć Save (Zapisz) jeśli widoczny jest przycisk Save.)
       user_page_link: stronie użytkownika
     index: 
       js_1: Prawdopodobnie masz wyłączone javaskrypty lub przeglądarka której używasz ich nie obsługuje.
       js_2: OpenStreetMap używa javaskryptów do wyświetlania mapki slippy map.
       js_3: Spróbuj <a href="http://tah.openstreetmap.org/Browse/">statycznej przeglądarki Tiles@Home</a> jeśli nie masz możliwości włączyć javaskryptu.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: Dostęp na zasadach licencji {{license_name}}, prawa autorskie {{project_name}} i jego uczestników.
         project_name: projektu OpenStreetMap
-      permalink: Permalink
     key: 
       map_key: Legenda
     search: 
@@ -539,7 +528,6 @@ pl:
       auth failure: Niestety podane dane nie pozwoliły na zalogowanie Cię.
       create_account: dodaj konto
       email or username: "Adres email lub nazwa użytkownika:"
-      heading: Login
       login_button: Zaloguj mnie
       lost password link: Zapomniane hasło?
       password: "Hasło:"

config/locales/pt-BR.yml

@@ -5,8 +5,6 @@ pt-BR:
         body: Corpo
       diary_entry: 
         language: Língua
-        latitude: Latitude
-        longitude: Longitude
         title: Título
         user: Usuário
       friend: 
@@ -19,8 +17,6 @@ pt-BR:
         title: Título
       trace: 
         description: Descrição
-        latitude: Latitude
-        longitude: Longitude
         name: Nome
         public: Público
         size: Tamanho
@@ -30,7 +26,6 @@ pt-BR:
         active: Ativo
         description: Descrição
         display_name: Nome para Exibição
-        email: Email
         languages: Línguas
         pass_crypt: Senha
     models: 
@@ -75,7 +70,6 @@ pt-BR:
       feed: 
         title: Conjunto de mudanças {{id}}
         title_comment: Conjunto de mudanças {{id}} - {{comment}}
-      osmchangexml: osmChange XML
       title: Alterações
     changeset_details: 
       belongs_to: "Pertence a:"
@@ -237,7 +231,6 @@ pt-BR:
     changesets: 
       area: Área
       comment: Comentário
-      id: ID
       saved_at: Salvo em
       user: Usuário
     list: 
@@ -267,9 +260,7 @@ pt-BR:
     edit: 
       body: "Texto:"
       language: "Idioma:"
-      latitude: "Latitude:"
       location: "Localização:"
-      longitude: "Longitude:"
       marker_text: Localização da entrada no diário
       save_button: Salvar
       subject: "Assunto:"
@@ -322,19 +313,15 @@ pt-BR:
       format: Formato
       format_to_export: Formato a Exportar
       image_size: Tamanho da Imagem
-      latitude: "Lat:"
       licence: Licença
-      longitude: "Lon:"
       manually_select: Selecior área diferente manualmente
       mapnik_image: Imagem Mapnik
-      max: max
       options: Opções
       osm_xml_data: Dados XML OpenStreetMap
       osmarender_image: Imagem Osmarender
       output: Saída
       paste_html: Cole o HTML para publicar no site
       scale: Escala
-      zoom: Zoom
     start_rjs: 
       add_marker: Adicionar um marcador ao mapa
       change_marker: Mudar posição do marcador
@@ -406,8 +393,6 @@ pt-BR:
     intro_3: A hospedagem dos dados do OpenStreetMap é cedida gentilmente por {{ucl}} e {{bytemark}}.
     log_in: entrar
     log_in_tooltip: Entrar com uma conta existente
-    logo: 
-      alt_text: OpenStreetMap logo
     logout: sair
     logout_tooltip: Sair
     news_blog: Blog de notícias
@@ -648,9 +633,9 @@ pt-BR:
       potlatch_unsaved_changes: Você tem alterações não salvas. (Para salvar no Potlatch, você deve deselecionar a linha ou ponto atual, se editando no modo de edição ao vivo, ou clicar em salvar se estiver editando offline.
       user_page_link: página de usuário
     index: 
-      js_1: Você está usando um navegador sem suporte a javascript, ou está com o javascript desativado.
-      js_2: O OpenStreetMap usa javascript para a navegação dos mapas.
-      js_3: Você pode tentar o <a href="http://tah.openstreetmap.org/Browse/">navegador estático Tiles@Home</a> se não for possível ativar o javascript.
+      js_1: Você está usando um navegador sem suporte a JavaScript, ou está com o JavaScript desativado.
+      js_2: O OpenStreetMap usa JavaScript para a navegação dos mapas.
+      js_3: Você pode tentar o <a href="http://tah.openstreetmap.org/Browse/">navegador estático Tiles@Home</a> se não for possível ativar o JavaScript.
       license: 
         license_name: Creative Commons de Atribuição-Compartilhamento pela Mesma Licença 2.0
         notice: Licenciado sob a {{license_name}} para o {{project_name}} e seus contribuidores.
@@ -750,7 +735,6 @@ pt-BR:
       points: "Pontos:"
       save_button: Salvar Mudanças
       start_coord: "Coordenada de início:"
-      tags: "Tags:"
       tags_help: separados por vírgulas
       title: Editando trilha {{name}}
       uploaded_at: "Enviado em:"
@@ -830,8 +814,6 @@ pt-BR:
       flash update success: Informação de usuário atualizada com sucesso.
       flash update success confirm needed: Informação de usuário atualizada com sucesso. Verifique sua caixa de entrada do email para confirmar seu novo endereço.
       home location: "Localização:"
-      latitude: "Latitude:"
-      longitude: "Longitude:"
       make edits public button: Tornar todas as minhas edições públicas
       my settings: Minhas configurações
       no home location: Você ainda não entrou a sua localização.

config/locales/ro.yml

@@ -22,7 +22,6 @@ ro:
         latitude: Latitudine
         longitude: Longitudine
         name: Nume
-        public: Public
         size: Dimensiune
         user: Utilizator
         visible: Vizibilă
@@ -30,11 +29,9 @@ ro:
         active: Activ
         description: Descriere
         display_name: Afișare nume
-        email: Email
         languages: Limbi
         pass_crypt: Parolă
     models: 
-      acl: Access Control List
       changeset: Set de modificări
       changeset_tag: Etichetă set de modificări
       country: Țară
@@ -63,7 +60,6 @@ ro:
       tracetag: Etichetă înregistrare GPS
       user: Utilizator
       user_preference: Preferințe utilizator
-      user_token: User Token
       way: Cale
       way_node: Nod cale
       way_tag: Etichetă cale
@@ -72,7 +68,6 @@ ro:
       changeset: "Set de modificări:"
       changesetxml: Set de modificări XML
       download: Descarcă {{changeset_xml_link}} sau {{osmchange_xml_link}}
-      osmchangexml: osmChange XML
       title: Set de modificări
     changeset_details: 
       belongs_to: "Aparține lui:"
@@ -125,10 +120,6 @@ ro:
       view_details: vizualizare detalii
     not_found: 
       sorry: Ne pare rău, dar {{type}} cu identificatorul {{id}}, nu a putut fi .
-      type: 
-        node: node
-        relation: relation
-        way: way
     paging_nav: 
       of: din
       showing_page: Se afișează pagina
@@ -221,174 +212,10 @@ ro:
     changesets: 
       area: Zonă
       comment: Comentariu
-      id: ID
       saved_at: Salvat la
       user: Utilizator
     list: 
       description: Schimbări recente
-  diary_entry: 
-    diary_comment: 
-      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
-    diary_entry: 
-      comment_count: 
-        one: 1 comment
-        other: "{{count}} comments"
-      comment_link: Comment on this entry
-      edit_link: Edit this entry
-      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
-      reply_link: Reply to this entry
-    edit: 
-      body: "Body:"
-      language: "Language:"
-      latitude: "Latitude:"
-      location: "Location:"
-      longitude: "Longitude:"
-      marker_text: Diary entry location
-      save_button: Save
-      subject: "Subject:"
-      title: Edit diary entry
-      use_map_link: use map
-    list: 
-      in_language_title: Diary Entries in {{language}}
-      new: New Diary Entry
-      new_title: Compose a new entry in your user diary
-      newer_entries: Newer Entries
-      no_entries: No diary entries
-      older_entries: Older Entries
-      recent_entries: "Recent diary entries:"
-      title: Users' diaries
-      user_title: "{{user}}'s diary"
-    new: 
-      title: New Diary Entry
-    no_such_entry: 
-      body: Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: "No entry with the id: {{id}}"
-      title: No such diary entry
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: The user {{user}} does not exist
-      title: No such user
-    view: 
-      leave_a_comment: Leave a comment
-      login: Login
-      login_to_leave_a_comment: "{{login_link}} to leave a comment"
-      save_button: Save
-      title: Users' diaries | {{user}}
-      user_title: "{{user}}'s diary"
-  export: 
-    start: 
-      add_marker: Add a marker to the map
-      area_to_export: Area to Export
-      embeddable_html: Embeddable HTML
-      export_button: Export
-      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
-      format: Format
-      format_to_export: Format to Export
-      image_size: Image Size
-      latitude: "Lat:"
-      licence: Licence
-      longitude: "Lon:"
-      manually_select: Manually select a different area
-      mapnik_image: Mapnik Image
-      max: max
-      options: Options
-      osm_xml_data: OpenStreetMap XML Data
-      osmarender_image: Osmarender Image
-      output: Output
-      paste_html: Paste HTML to embed in website
-      scale: Scale
-      zoom: Zoom
-    start_rjs: 
-      add_marker: Add a marker to the map
-      change_marker: Change marker position
-      click_add_marker: Click on the map to add a marker
-      drag_a_box: Drag a box on the map to select an area
-      export: Export
-      manually_select: Manually select a different area
-      view_larger_map: View Larger Map
-  geocoder: 
-    description: 
-      title: 
-        geonames: Location from <a href="http://www.geonames.org/">GeoNames</a>
-        osm_namefinder: "{{types}} from <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
-      types: 
-        cities: Cities
-        places: Places
-        towns: Towns
-    description_osm_namefinder: 
-      prefix: "{{distance}} {{direction}} of {{type}}"
-    direction: 
-      east: east
-      north: north
-      north_east: north-east
-      north_west: north-west
-      south: south
-      south_east: south-east
-      south_west: south-west
-      west: west
-    distance: 
-      one: about 1km
-      other: about {{count}}km
-      zero: less than 1km
-    results: 
-      no_results: No results found
-    search: 
-      title: 
-        ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>
-        geonames: Results from <a href="http://www.geonames.org/">GeoNames</a>
-        latlon: Results from <a href="http://openstreetmap.org/">Internal</a>
-        osm_namefinder: Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        uk_postcode: Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
-        us_postcode: Results from <a href="http://geocoder.us/">Geocoder.us</a>
-    search_osm_namefinder: 
-      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
-      suffix_place: ", {{distance}} {{direction}} of {{placename}}"
-  layouts: 
-    alt_donation: Make a Donation
-    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
-    donate_link_text: donating
-    edit: Edit
-    edit_tooltip: Edit maps
-    export: Export
-    export_tooltip: Export map data
-    gps_traces: GPS Traces
-    gps_traces_tooltip: Manage traces
-    help_wiki: Help &amp; Wiki
-    help_wiki_tooltip: Help &amp; Wiki site for the project
-    history: History
-    history_tooltip: Changeset history
-    home: home
-    home_tooltip: Go to home location
-    inbox: inbox ({{count}})
-    inbox_tooltip: 
-      one: Your inbox contians 1 unread message
-      other: Your inbox contains {{count}} unread messages
-      zero: Your inbox contains no unread messages
-    intro_1: OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-    intro_2: OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
-    log_in: log in
-    log_in_tooltip: Log in with an existing account
-    logo: 
-      alt_text: OpenStreetMap logo
-    logout: logout
-    logout_tooltip: Log out
-    news_blog: News blog
-    news_blog_tooltip: News blog about OpenStreetMap, free geographical data, etc.
-    osm_offline: The OpenStreetMap database is currently offline while essential database maintenance work is carried out.
-    osm_read_only: The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
-    shop: Shop
-    shop_tooltip: Shop with branded OpenStreetMap merchandise
-    sign_up: sign up
-    sign_up_tooltip: Create an account for editing
-    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
-    tag_line: The Free Wiki World Map
-    user_diaries: User Diaries
-    user_diaries_tooltip: View user diaries
-    view: View
-    view_tooltip: View maps
-    welcome_user: Welcome, {{user_link}}
-    welcome_user_link_tooltip: Your user page
   map: 
     coordinates: "Coordonate:"
     edit: Editare
@@ -396,145 +223,14 @@ ro:
   message: 
     delete: 
       deleted: Mesaj şters
-    inbox: 
-      date: Date
-      from: From
-      my_inbox: My inbox
-      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
-      outbox: outbox
-      people_mapping_nearby: people mapping nearby
-      subject: Subject
-      title: Inbox
-      you_have: You have {{new_count}} new messages and {{old_count}} old messages
-    mark: 
-      as_read: Message marked as read
-      as_unread: Message marked as unread
     message_summary: 
       delete_button: Şterge
-      read_button: Mark as read
-      reply_button: Reply
-      unread_button: Mark as unread
-    new: 
-      back_to_inbox: Back to inbox
-      body: Body
-      message_sent: Message sent
-      send_button: Send
-      send_message_to: Send a new message to {{name}}
-      subject: Subject
-      title: Send message
-    no_such_user: 
-      body: Sorry there is no user or message with that name or id
-      heading: No such user or message
-      title: No such user or message
-    outbox: 
-      date: Date
-      inbox: inbox
-      my_inbox: My {{inbox_link}}
-      no_sent_messages: You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
-      outbox: outbox
-      people_mapping_nearby: people mapping nearby
-      subject: Subject
-      title: Outbox
-      to: To
-      you_have_sent_messages: You have {{sent_count}} sent messages
-    read: 
-      back_to_inbox: Back to inbox
-      back_to_outbox: Back to outbox
-      date: Date
-      from: From
-      reading_your_messages: Reading your messages
-      reading_your_sent_messages: Reading your sent messages
-      reply_button: Reply
-      subject: Subject
-      title: Read message
-      to: To
-      unread_button: Mark as unread
     sent_message_summary: 
       delete_button: Şterge
   notifier: 
-    diary_comment_notification: 
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
-      header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      hi: Hi {{to_user}},
-      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
-    email_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_html: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
-    email_confirm_plain: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
-    friend_notification: 
-      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
-      subject: "[OpenStreetMap] {{user}} added you as a friend"
     gpx_notification: 
-      and_no_tags: and no tags.
-      and_the_tags: "and the following tags:"
-      failure: 
-        failed_to_import: "failed to import. Here's the error:"
-        more_info_1: More information about GPX import failures and how to avoid
-        more_info_2: "them can be found at:"
-        subject: "[OpenStreetMap] GPX Import failure"
-      greeting: Hi,
       success: 
         loaded_successfully: "loaded successfully with {{trace_points}} out of a possible\n{{possible_points}} points."
-        subject: "[OpenStreetMap] GPX Import success"
-      with_description: with the description
-      your_gpx_file: It looks like your GPX file
-    lost_password: 
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_html: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
-    lost_password_plain: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
-      hopefully_you_2: email addresses openstreetmap.org account.
-    message_notification: 
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      footer1: You can also read the message at {{readurl}}
-      footer2: and you can reply at {{replyurl}}
-      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
-      hi: Hi {{to_user}},
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
-    signup_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_html: 
-      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
-      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: You can watch an {{introductory_video_link}}.
-      more_videos: There are {{more_videos_link}}.
-      more_videos_here: more videos here
-      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
-      video_to_openstreetmap: introductory video to OpenStreetMap
-      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
-    signup_confirm_plain: 
-      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
-      click_the_link_2: account and read on for more information about OpenStreetMap.
-      current_user_1: A list of current users in categories, based on where in the world
-      current_user_2: "they are, is available from:"
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      user_wiki_1: It is recommended that you create a user wiki page, which includes
-      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
   oauth: 
     oauthorize: 
       request_access: Aplicaţia {{app_name}} cere acces la contul dvs. Vă rugăm să alegeţi care din următoarele capabilităţi le poate avea aplicaţia. Puteţi alege cât de multe sau de puţine doriţi.
@@ -552,306 +248,48 @@ ro:
     show: 
       allow_write_api: modifică harta.
   site: 
-    edit: 
-      anon_edits_link_text: Find out why this is the case.
-      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
-      not_public: You haven't set your edits to be public.
-      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
-      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)
-      user_page_link: user page
-    index: 
-      js_1: You are either using a browser that doesn't support javascript, or you have disabled javascript.
-      js_2: OpenStreetMap uses javascript for its slippy map.
-      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
-      license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
-        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
-        project_name: OpenStreetMap project
-      permalink: Permalink
-      shortlink: Shortlink
     key: 
-      map_key: Map key
-      map_key_tooltip: Map key for the mapnik rendering at this zoom level
       table: 
         entry: 
-          admin: Administrative boundary
-          allotments: Allotments
           apron: 
             - Airport apron
             - terminal
-          bridge: Black casing = bridge
-          bridleway: Bridleway
-          brownfield: Brownfield site
-          building: Significant building
-          byway: Byway
           cable: 
             - Cable car
             - chair lift
-          cemetery: Cemetery
-          centre: Sports centre
-          commercial: Commercial area
           common: 
             - Common
             - meadow
-          construction: Roads under construction
-          cycleway: Cycleway
-          destination: Destination access
-          farm: Farm
-          footway: Footway
-          forest: Forest
-          golf: Golf course
-          heathland: Heathland
-          industrial: Industrial area
           lake: 
             - Lake
             - reservoir
-          military: Military area
-          motorway: Motorway
-          park: Park
-          permissive: Permissive access
-          pitch: Sports pitch
-          primary: Primary road
-          private: Private access
-          rail: Railway
-          reserve: Nature reserve
-          resident: Residential area
-          retail: Retail area
           runway: 
             - Airport Runway
             - taxiway
           school: School; university
-          secondary: Secondary road
-          station: Railway station
-          subway: Subway
           summit: 
             - Summit
             - peak
-          tourist: Tourist attraction
-          track: Track
           tram: 
             - Light rail
             - tram
-          trunk: Trunk road
-          tunnel: Dashed casing = tunnel
-          unclassified: Unclassified road
-          unsurfaced: Unsurfaced road
-          wood: Wood
-        heading: Legend for z{{zoom_level}}
-    search: 
-      search: Search
-      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-      submit_text: Go
-      where_am_i: Where am I?
-    sidebar: 
-      close: Close
-      search_results: Search Results
   trace: 
-    create: 
-      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
-      upload_trace: Upload GPS Trace
-    delete: 
-      scheduled_for_deletion: Track scheduled for deletion
     edit: 
-      description: "Description:"
-      download: download
-      edit: edit
-      filename: "Filename:"
-      heading: Editing trace {{name}}
-      map: map
-      owner: "Owner:"
-      points: "Points:"
-      save_button: Save Changes
-      start_coord: "Start coordinate:"
-      tags: "Tags:"
-      tags_help: comma delimited
-      title: Editing trace {{name}}
-      uploaded_at: "Uploaded at:"
       visibility: "Vizibilitate:"
       visibility_help: ce înseamnă asta?
-    list: 
-      public_traces: Public GPS traces
-      public_traces_from: Public GPS traces from {{user}}
-      tagged_with: " tagged with {{tags}}"
-      your_traces: Your GPS traces
-    make_public: 
-      made_public: Track made public
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: The user {{user}} does not exist
-      title: No such user
-    trace: 
-      ago: "{{time_in_words_ago}} ago"
-      by: by
-      count_points: "{{count}} points"
-      edit: edit
-      edit_map: Edit Map
-      in: in
-      map: map
-      more: more
-      pending: PENDING
-      private: PRIVATE
-      public: PUBLIC
-      trace_details: View Trace Details
-      view_map: View Map
     trace_form: 
-      description: Description
-      help: Help
-      tags: Tags
       tags_help: use commas
-      upload_button: Upload
-      upload_gpx: Upload GPX File
       visibility: Vizibilitate
       visibility_help: ce înseamnă asta?
-    trace_header: 
-      see_all_traces: See all traces
-      see_just_your_traces: See just your traces, or upload a trace
-      see_your_traces: See all your traces
-      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
-    trace_optionals: 
-      tags: Tags
-    trace_paging_nav: 
-      of: of
-      showing: Showing page
     view: 
-      delete_track: Delete this track
-      description: "Description:"
-      download: download
-      edit: edit
-      edit_track: Edit this track
-      filename: "Filename:"
-      heading: Viewing trace {{name}}
-      map: map
-      none: None
-      owner: "Owner:"
-      pending: PENDING
-      points: "Points:"
-      start_coordinates: "Start coordinate:"
-      tags: "Tags:"
-      title: Viewing trace {{name}}
-      trace_not_found: Trace not found!
-      uploaded: "Uploaded at:"
       visibility: "Vizibilitate:"
   user: 
-    account: 
-      email never displayed publicly: (never displayed publicly)
-      flash update success: User information updated successfully.
-      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
-      home location: "Home Location:"
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      make edits public button: Make all my edits public
-      my settings: My settings
-      no home location: You have not entered your home location.
-      preferred languages: "Preferred Languages:"
-      profile description: "Profile Description:"
-      public editing: 
-        disabled: Disabled and cannot edit data, all previous edits are anonymous.
-        disabled link text: why can't I edit?
-        enabled: Enabled. Not anonymous and can edit data.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: what's this?
-        heading: "Public editing:"
-      return to profile: Return to profile
-      save changes button: Save Changes
-      title: Edit account
-      update home location on click: Update home location when I click on the map?
-    confirm: 
-      button: Confirm
-      failure: A user account with this token has already been confirmed.
-      heading: Confirm a user account
-      press confirm button: Press the confirm button below to activate your account.
-      success: Confirmed your account, thanks for signing up!
-    confirm_email: 
-      button: Confirm
-      failure: An email address has already been confirmed with this token.
-      heading: Confirm a change of email address
-      press confirm button: Press the confirm button below to confirm your new email address.
-      success: Confirmed your email address, thanks for signing up!
-    friend_map: 
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-      your location: Your location
-    go_public: 
-      flash success: All your edits are now public, and you are now allowed to edit.
-    login: 
-      account not active: Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account.
-      auth failure: Sorry, couldn't log in with those details.
-      create_account: create an account
-      email or username: "Email Address or Username:"
-      heading: Login
-      login_button: Login
-      lost password link: Lost your password?
-      password: "Password:"
-      please login: Please login or {{create_user_link}}.
-      title: Login
     lost_password: 
-      email address: "Email Address:"
-      heading: Forgotten Password?
       new password button: Send me a new password
-      notice email cannot find: Couldn't find that email address, sorry.
-      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
       title: lost password
-    make_friend: 
-      already_a_friend: You are already friends with {{name}}.
-      failed: Sorry, failed to add {{name}} as a friend.
-      success: "{{name}} is now your friend."
-    new: 
-      confirm email address: "Confirm Email Address:"
-      confirm password: "Confirm Password:"
-      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
-      display name: "Display Name:"
-      email address: "Email Address:"
-      fill_form: Fill in the form and we'll send you a quick email to activate your account.
-      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
-      heading: Create a User Account
-      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
-      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
-      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
-      password: "Password:"
-      signup: Signup
-      title: Create account
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: The user {{user}} does not exist
-      title: No such user
-    remove_friend: 
-      not_a_friend: "{{name}} is not one of your friends."
-      success: "{{name}} was removed from your friends."
     reset_password: 
       confirm password: "Confirmaţi parola:"
       flash changed: Parola dumneavoastră a fost schimbată.
-      flash token bad: Didn't find that token, check the URL maybe?
       password: "Parola:"
       reset: Resetează parola
       title: reset password
-    set_home: 
-      flash success: Home location saved successfully
-    view: 
-      add as friend: add as friend
-      add image: Add Image
-      ago: ({{time_in_words_ago}} ago)
-      change your settings: change your settings
-      delete image: Delete Image
-      description: Description
-      diary: diary
-      edits: edits
-      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
-      km away: "{{count}}km away"
-      m away: "{{count}}m away"
-      mapper since: "Mapper since:"
-      my diary: my diary
-      my edits: my edits
-      my settings: my settings
-      my traces: my traces
-      nearby users: "Nearby users:"
-      new diary entry: new diary entry
-      no friends: You have not added any friends yet.
-      no home location: No home location has been set.
-      no nearby users: There are no users who admit to mapping nearby yet.
-      remove as friend: remove as friend
-      send message: send message
-      settings_link_text: settings
-      traces: traces
-      upload an image: Upload an image
-      user image heading: User image
-      user location: User location
-      your friends: Your friends

config/locales/ru.yml

@@ -75,7 +75,6 @@ ru:
       feed: 
         title: Набор изменений {{id}}
         title_comment: Набор изменений {{id}} — {{comment}}
-      osmchangexml: osmChange XML
       title: Набор изменений
     changeset_details: 
       belongs_to: "Пользователь:"
@@ -87,6 +86,7 @@ ru:
         one: "Имеет следующий {{count}} узел:"
         other: "Имеет следующие {{count}} узлов:"
       has_relations: 
+        one: "Имеет следующие {{count}} отношение:"
         other: "Имеет следующие {{count}} отношений:"
       has_ways: "Содержит {{count}} линий:"
       no_bounding_box: Для этого набора изменений границы не установлены.
@@ -234,14 +234,13 @@ ru:
     changesets: 
       area: Область
       comment: Комментарий
-      id: ID
       saved_at: Завершено
       user: Пользователь
     list: 
       description: Последние изменения
       description_bbox: Наборы изменений в рамках {{bbox}}
-      description_user: Наборы изменений авторства ((USER))
-      description_user_bbox: Наборы изменений авторства {{user}} в рамках {{bbox}}
+      description_user: Наборы изменений {{user}}
+      description_user_bbox: Наборы изменений {{user}} в рамках {{bbox}}
       heading: Наборы изменений
       heading_bbox: Наборы изменений
       heading_user: Наборы изменений
@@ -259,7 +258,7 @@ ru:
         other: "{{count}} комментариев"
       comment_link: Комментировать
       edit_link: Изменить запись
-      posted_by: "Отправил {{link_user}} в {{created}}, язык: {{language_link}}"
+      posted_by: "Отправил {{link_user}} {{created}}, язык: {{language_link}}"
       reply_link: Ответить
     edit: 
       body: "Текст:"
@@ -547,16 +546,16 @@ ru:
       subject: "[OpenStreetMap] Подтвердите ваш адрес электронной почты"
     signup_confirm_html: 
       click_the_link: Если это действительно вы — добро пожаловать! Пожалуйста, перейдите по ссылке ниже, чтобы подтвердить регистрацию и просмотреть дополнительную информацию об OpenStreetMap
-      current_user: "Список пользователей, основанный на их местоположении, доступен здесь: <a href=\"http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region\">Category:Users_by_geographical_region</a>."
-      get_reading: Узнайте больше об OpenStreetMap в <a href="http://wiki.openstreetmap.org/wiki/Ru:Beginners_Guide">вики</p> или <a href="http://www.opengeodata.org/">блоге OpenGeoData</a>, в котором ещё можно послушать <a href="http://www.opengeodata.org/?cat=13">подкасты</a>!
+      current_user: "Список пользователей, основанный на их местоположении, доступен здесь: <a href=\"http://wiki.openstreetmap.org/index.php?title=Category:Users_by_geographical_region&uselang=ru\">Category:Users_by_geographical_region</a>."
+      get_reading: Узнайте больше об OpenStreetMap в <a href="http://wiki.openstreetmap.org/index.php?title=RU:Beginners_Guide&uselang=ru">вики</p> или <a href="http://www.opengeodata.org/">блоге OpenGeoData</a>, в котором ещё можно послушать <a href="http://www.opengeodata.org/?cat=13">подкасты</a>!
       greeting: Здравствуйте!
       hopefully_you: Кто-то (надеемся, что вы) хотел создать учетную запись на
       introductory_video: Вы можете просмотреть {{introductory_video_link}}.
       more_videos: Посмотрите {{more_videos_link}}.
       more_videos_here: больше видео здесь
-      user_wiki_page: Рекомендуется создать свою пользовательскую вики-страницу, включив в неё метки категорий, описывающих ваше местонахождение, например, <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Moscow">[[Category:Users_in_Moscow]]</a>.
+      user_wiki_page: Рекомендуется создать свою пользовательскую вики-страницу, включив в неё метки категорий, описывающих ваше местонахождение, например, <a href="http://wiki.openstreetmap.org/index.php?title=Category:Users_in_Moscow&uselang=ru">[[Category:Users_in_Moscow]]</a>.
       video_to_openstreetmap: ознакомительное видео об OpenStreetMap
-      wiki_signup: Вы можете <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Ru:Main_Page">зарегистрироваться в вики OpenStreetMap</a>.
+      wiki_signup: Вы можете <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Ru:Main_Page&uselang=ru">зарегистрироваться в вики OpenStreetMap</a>.
     signup_confirm_plain: 
       click_the_link_1: Если это действительно вы — добро пожаловать! Пожалуйста, перейдите по ссылке ниже, чтобы подтвердить
       click_the_link_2: регистрацию и прочитать больше об OpenStreetMap.
@@ -643,7 +642,7 @@ ru:
   site: 
     edit: 
       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/Editing">другие способы</a> редактирования OpenStreetMap.
+      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/index.php?title=RU:Editing&uselang=ru">другие способы</a> редактирования OpenStreetMap.
       not_public: Вы не сделали свои правки общедоступными.
       not_public_description: "Вы не можете больше анонимно редактировать карту. Вы можете сделать ваши правки общедоступными здесь: {{user_page}}."
       potlatch_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в Potlatch снимите выделение с пути или точки, если редактируете в «живом» режиме, либо нажмите кнопку «сохранить», если вы в режиме отложенного сохранения.)
@@ -653,7 +652,6 @@ ru:
       js_2: OpenStreetMap использует JavaScript для отображения карт.
       js_3: Вы можете попробовать <a href="http://tah.openstreetmap.org/Browse/">статичную карту от Tiles@Home</a>, если вы не можете включить JavaScript.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: Лицензировано на условиях {{license_name}} проектом {{project_name}} и его пользователями.
         project_name: OpenStreetMap
       permalink: Постоянная ссылка
@@ -730,7 +728,7 @@ ru:
         heading: Легенда для м{{zoom_level}}
     search: 
       search: Поиск
-      search_help: "примеры: 'Вязьма', 'Regent Street, Cambridge', 'CB2 5AQ', или 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>больше примеров…</a>"
+      search_help: "примеры: 'Вязьма', 'Regent Street, Cambridge', 'CB2 5AQ', или 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/index.php?title=Search&uselang=ru'>больше примеров…</a>"
       submit_text: ->
       where_am_i: Где я?
     sidebar: 
@@ -845,7 +843,6 @@ ru:
         disabled: Отключён и не может вносить правки, все предыдущие изменения анонимны.
         disabled link text: почему я не могу вносить изменения?
         enabled: Включено. Можно редактировать. Правки не анонимны.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: что это значит?
         heading: "Публичное изменение:"
       return to profile: Возврат к профилю
@@ -902,7 +899,7 @@ ru:
       heading: Создание учётной записи
       license_agreement: Создавая учётную запись в проекте, вы подтверждаете, что все данные, отправляемые в Openstreetmap лицензируются на условиях <a href="http://creativecommons.org/licenses/by-sa/2.0/">этой лицензии Creative Commons (BY-SA)</a>.
       no_auto_account_create: К сожалению, сейчас мы не можем автоматически создать для вас учётную запись.
-      not displayed publicly: Не отображается публично (см. <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="вики политика конфиденциальности включая часть про адрес эл. почты">политику конфиденциальности</a>)
+      not displayed publicly: Не отображается публично (см. <a href="http://wiki.openstreetmap.org/index.php?title=Privacy_Policy&uselang=ru" title="вики политика конфиденциальности включая часть про адрес эл. почты">политику конфиденциальности</a>)
       password: "Пароль:"
       signup: Регистрация
       title: Регистрация

config/locales/sk.yml

@@ -188,7 +188,6 @@ sk:
           forest: Les
           lake: 
             - Jazero
-          park: Park
     search: 
       search: Vyhľadať
       where_am_i: Kde sa nachádzam?

config/locales/sl.yml

@@ -27,16 +27,13 @@ sl:
         user: Uporabnik
         visible: Vidnost sledi
       user: 
-        active: Active
         description: Opis
         display_name: Prikazno ime
         email: Naslov e-pošte
         languages: Jeziki
         pass_crypt: Geslo
     models: 
-      acl: Access Control List
       changeset: Paket sprememb
-      changeset_tag: Changeset Tag
       country: Država
       diary_comment: Komentar v dnevniku
       diary_entry: Vpis v dnevnik
@@ -46,18 +43,9 @@ sl:
       node: Vozlišče
       node_tag: Oznaka vozlišča
       notifier: Obveščevalec
-      old_node: Old Node
-      old_node_tag: Old Node Tag
-      old_relation: Old Relation
-      old_relation_member: Old Relation Member
-      old_relation_tag: Old Relation Tag
-      old_way: Old Way
-      old_way_node: Old Way Node
-      old_way_tag: Old Way Tag
       relation: Relacija
       relation_member: Član relacije
       relation_tag: Oznaka relacije
-      session: Session
       trace: Sled
       tracepoint: Točka sledi
       tracetag: Oznaka sledi
@@ -70,9 +58,7 @@ sl:
   browse: 
     changeset: 
       changeset: "Paket sprememb: {{id}}"
-      changesetxml: Changeset XML
       download: Prenesi {{changeset_xml_link}} ali {{osmchange_xml_link}}
-      osmchangexml: osmChange XML
       title: Paket sprememb
     changeset_details: 
       belongs_to: "Pripada:"
@@ -229,7 +215,6 @@ sl:
     changesets: 
       area: Področje
       comment: Komentar
-      id: ID
       saved_at: Shranjen
       user: Uporabnik
     list: 
@@ -595,13 +580,9 @@ sl:
           allotments: Vrtički
           apron: Letališka ploščad; terminal
           bridge: Krepka obroba = most
-          bridleway: Bridleway
-          brownfield: Brownfield site
           building: Pomembna zgradba
-          byway: Byway
           cable: Kabinska žičnica; sedežnica
           cemetery: Pokopališče
-          centre: Sports centre
           commercial: Poslovno območje
           common: Common; meadow
           construction: Ceste v gradnji
@@ -609,18 +590,13 @@ sl:
           destination: Dovoljeno za dostavo
           farm: Kmetija
           footway: Pešpot
-          forest: Forest
           golf: Igrišče za Golf
           heathland: Grmičevje
           industrial: Industrijsko območje
           lake: Jezero; vodni zbiralnik
           military: Vojaško področje
           motorway: Avtocesta
-          park: Park
-          permissive: Permissive access
-          pitch: Sports pitch
           primary: Glavna cesta
-          private: Private access
           rail: Železnica
           reserve: Naravni rezervat
           resident: Naselje
@@ -638,7 +614,6 @@ sl:
           tunnel: Črtkana obroba = predor
           unclassified: Ostale ceste izven naselij
           unsurfaced: Neasfaltirana cesta
-          wood: Wood
         heading: Legenda povečave {{zoom_level}}
     search: 
       search: Iskanje
@@ -744,7 +719,6 @@ sl:
         disabled: Onemogočeno in ne morete urejati podatkov. Vsi vaši prejšnji prispevki so anonimni.
         disabled link text: Zakaj ne morem urejati?
         enabled: Omogočeno. Niste anonimni in lahko urejate podatke.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Kaj je to?
         heading: "Javno urejanje:"
       return to profile: Nazaj na profil

config/locales/sv.yml

@@ -45,9 +45,7 @@ sv:
       old_relation: Gammal relation
       old_way: Gammal sträcka
       old_way_node: Gammal sträcknod
-      relation: Relation
       relation_member: Medlem i relation
-      session: Session
       trace: Spår
       tracepoint: Spårpunkt
       user: Användare
@@ -56,13 +54,7 @@ sv:
       way_node: Sträcknod
   browse: 
     changeset: 
-      changeset: "Changeset: {{id}}"
-      changesetxml: Changeset XML
       download: Ladda ner {{changeset_xml_link}} eller {{osmchange_xml_link}}
-      feed: 
-        title: Changeset {{id}}
-        title_comment: Changeset {{id}} - {{comment}}
-      title: Changeset
     changeset_details: 
       bounding_box: "Omslutande område:"
       closed_at: "Avlutad:"
@@ -89,9 +81,7 @@ sv:
       edited_at: "Redigerad:"
       edited_by: "Redigerad av:"
       in_changeset: "I changeset:"
-      version: "Version:"
     containing_relation: 
-      entry: Relation {{relation_name}}
       entry_role: Relation {{relation_name}} (som {{relation_role}})
     map: 
       deleted: Borttaget
@@ -112,31 +102,33 @@ 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
     not_found: 
       sorry: "{{type}}en med id {{id}} kunde inte hittas"
       type: 
-        changeset: changeset
         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}}"
     relation_details: 
       part_of: "Del av:"
     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
       drag_a_box: Markera ett område på kartan.
       edited_by_user_at_timestamp: Redigerad av [[user]] [[timestamp]]
@@ -153,10 +145,8 @@ sv:
         selected: 
           type: 
             node: Nod [[id]]
-            way: Way [[id]]
         type: 
           node: Nod
-          way: Way
       private_user: privat användare
       show_history: Visa historik
       unable_to_load_size: "Kan inte ladda: det omslutande område [[bbox_size]] är för stort (den måste vara mindre än {{max_bbox_size}})"
@@ -167,8 +157,6 @@ sv:
       download_xml: Ladda hem XML
       edit: redigera
       view_history: se historik
-      way: Way
-      way_title: "Way: {{way_name}}"
     way_details: 
       also_part_of: 
         one: också del av väg {{related_ways}}
@@ -214,3 +202,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:"

config/locales/te.yml

@@ -34,10 +34,14 @@ te:
       details: వివరాలు
       object_list: 
         details: వివరాలు
+    way: 
+      view_history: చరిత్రని చూడండి
   changeset: 
     changesets: 
       comment: వ్యాఖ్య
       user: వాడుకరి
+    list: 
+      description: ఇటీవలి మార్పులు
   diary_entry: 
     diary_entry: 
       comment_count: 
@@ -46,6 +50,8 @@ te:
     edit: 
       language: "భాష:"
       subject: "విషయం:"
+    view: 
+      save_button: భద్రపరచు
   export: 
     start: 
       options: ఎంపికలు
@@ -59,8 +65,17 @@ te:
       north: ఉత్తరం
       south: దక్షిణం
       west: పడమర
+    distance: 
+      one: దాదాపు 1కిమీ
+      other: దాదాపు {{count}}కిమీ
+    results: 
+      no_results: ఫలితాలేమీ దొరకలేదు
   layouts: 
+    edit: మార్చు
     history: చరిత్ర
+    news_blog: వార్తల బ్లాగు
+    welcome_user: స్వాగతం, {{user_link}}
+    welcome_user_link_tooltip: మీ వాడుకరి పేజీ
   message: 
     inbox: 
       date: తేదీ
@@ -80,7 +95,12 @@ te:
   oauth_clients: 
     form: 
       name: పేరు
+      required: తప్పనిసరి
   site: 
+    edit: 
+      user_page_link: వాడుకరి పేజీ
+    index: 
+      permalink: స్థిరలింకు
     key: 
       table: 
         entry: 
@@ -92,15 +112,22 @@ te:
             - సరస్సు
           military: మిలిటరీ ప్రదేశం
           park: పార్కు
+          primary: ప్రధాన రహదారి
           school: 
             - పాఠశాల
             - విశ్వవిద్యాలయం
+          station: రైల్వే స్టేషన్
+          wood: కలప
     search: 
       submit_text: వెళ్ళు
       where_am_i: నేను ఎక్కడ ఉన్నాను?
+    sidebar: 
+      search_results: అన్వేషణ ఫలితాలు
   trace: 
     edit: 
       description: "వివరణ:"
+      filename: "ఫైలుపేరు:"
+      save_button: మార్పులను భద్రపరచు
     trace_form: 
       description: వివరణ
       help: సహాయం
@@ -110,8 +137,18 @@ te:
       preferred languages: "ప్రాధాన్యతా భాషలు:"
       public editing: 
         enabled link text: ఇది ఏమిటి?
+    friend_map: 
+      your location: మీ ప్రాంతం
     login: 
+      email or username: "ఈమెయిల్ చిరునామా లేదా వాడుకరిపేరు:"
+      heading: ప్రవేశం
+      lost password link: మీ సంకేతపదం పోయిందా?
       password: "సంకేతపదం:"
+    lost_password: 
+      email address: "ఈమెయిల్ చిరునామా:"
+      heading: సంకేతపదం మర్చిపోయారా?
+    make_friend: 
+      success: "{{name}} ఇప్పుడు మీ మిత్రులు."
     new: 
       display name: "చూపించే పేరు:"
       email address: "ఈమెయిలు చిరునామా:"

config/locales/vi.yml

@@ -75,7 +75,6 @@ vi:
       feed: 
         title: Bộ thay đổi {{id}}
         title_comment: Bộ thay đổi {{id}} - {{comment}}
-      osmchangexml: osmChange XML
       title: Bộ thay đổi
     changeset_details: 
       belongs_to: "Người Sửa đổi:"
@@ -237,7 +236,6 @@ vi:
     changesets: 
       area: Vùng
       comment: Miêu tả
-      id: ID
       saved_at: Lúc Lưu
       user: Người dùng
     list: 
@@ -536,7 +534,6 @@ vi:
       hopefully_you: Ai (chắc bạn) đã xin đặt lại mật khẩu của tài khoản openstreetmap.org có địa chỉ thư điện tử này.
     lost_password_plain: 
       click_the_link: Nếu bạn là người đó, xin hãy nhấn chuột vào liên kết ở dưới để đặt lại mật khẩu.
-      greeting: Hi,
       hopefully_you_1: Ai (chắc bạn) đã xin đặt lại mật khẩu của tài khoản openstreetmap.org
       hopefully_you_2: có địa chỉ thư điện tử này.
     message_notification: 
@@ -565,6 +562,7 @@ vi:
       click_the_link_1: Nếu bạn là người đó, hoan nghênh! Xin hãy nhấn chuột vào liên kết ở dưới để
       click_the_link_2: xác nhận tài khoản của bạn và đọc tiếp để tìm hiểu thêm về OpenStreetMap.
       current_user_1: Có danh sách các người dùng, xếp thể loại theo nơi ở,
+      current_user_2: "tại:"
       greeting: Chào bạn!
       hopefully_you: Ai (chắc bạn) muốn mở tài khoản bên
       introductory_video: "Bạn có thể coi video giới thiệu OpenStreetMap tại đây:"
@@ -656,7 +654,6 @@ vi:
       js_2: OpenStreetMap sử dụng JavaScript cho chức năng bản đồ trơn.
       js_3: Bạn vẫn có thể sử dụng <a href="http://tah.openstreetmap.org/Browse/">bản đồ tĩnh Tiles@Home</a> nếu không bật lên JavaScript được.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: "{{project_name}} và những người đóng góp cho phép sử dụng theo giấy phép {{license_name}}."
         project_name: Dự án OpenStreetMap
       permalink: Liên kết Thường trực

config/locales/yo.yml

@@ -5,692 +5,99 @@ yo:
         body: Ara
       diary_entry: 
         language: Ede
-        latitude: Latitude
-        longitude: Longitude
         title: oyéorúkôàmì ìdá nkan sötõoríkì
-        user: User
       friend: 
         friend: Ore
-        user: User
       message: 
         body: Ara
-        recipient: Recipient
-        sender: Sender
-        title: Title
-      trace: 
-        description: Description
-        latitude: Latitude
-        longitude: Longitude
-        name: Name
-        public: Public
-        size: Size
-        user: User
-        visible: Visible
       user: 
-        active: Active
-        description: Description
-        display_name: Display Name
-        email: Email
         languages: Ede
-        pass_crypt: Password
     models: 
-      acl: Access Control List
-      changeset: Changeset
-      changeset_tag: Changeset Tag
       country: Orile Ede
-      diary_comment: Diary Comment
-      diary_entry: Diary Entry
       friend: Ore
       language: Ede
       message: ihinoroiye riran
-      node: Node
-      node_tag: Node Tag
-      notifier: Notifier
-      old_node: Old Node
-      old_node_tag: Old Node Tag
       old_relation: ìsötàn agba
       old_relation_member: aráìbátançbíiyèkan agba
-      old_relation_tag: Old Relation Tag
       old_way: Ona Atijo
-      old_way_node: Old Way Node
-      old_way_tag: Old Way Tag
       relation: ìsötàn
       relation_member: aráìbátançbíiyèkan
-      relation_tag: Relation Tag
       session: ìjokòó àwñn onídàájô
-      trace: Trace
-      tracepoint: Trace Point
-      tracetag: Trace Tag
       user: Oniti nlo nykan
-      user_preference: User Preference
-      user_token: User Token
-      way: Way
-      way_node: Way Node
-      way_tag: Way Tag
   browse: 
-    changeset: 
-      changeset: "Changeset: {{id}}"
-      changesetxml: Changeset XML
-      download: Download {{changeset_xml_link}} or {{osmchange_xml_link}}
-      osmchangexml: osmChange XML
-      title: Changeset
     changeset_details: 
-      belongs_to: "Belongs to:"
-      bounding_box: "Bounding box:"
-      box: box
-      closed_at: "Closed at:"
-      created_at: "Created at:"
       has_nodes: "Has the following {{count}} nodes:"
       has_relations: "Has the following {{count}} relations:"
       has_ways: "Has the following {{count}} ways:"
-      no_bounding_box: No bounding box has been stored for this changeset.
-      show_area_box: Show Area Box
-    common_details: 
-      edited_at: "Edited at:"
-      edited_by: "Edited by:"
-      in_changeset: "In changeset:"
-      version: "Version:"
-    containing_relation: 
-      entry: Relation {{relation_name}}
-      entry_role: Relation {{relation_name}} (as {{relation_role}})
-    map: 
-      deleted: Deleted
-      loading: Loading...
     node: 
       download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: Download XML
-      node: Node
-      node_title: "Node: {{node_name}}"
-      view_history: view history
-    node_details: 
-      coordinates: "Coordinates:"
-      part_of: "Part of:"
-    node_history: 
-      download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: Download XML
-      node_history: Node History
-      view_details: view details
-    not_found: 
-      sorry: Sorry, the {{type}} with the id {{id}}, could not be found.
-      type: 
-        node: node
-        relation: relation
-        way: way
-    paging_nav: 
-      of: of
-      showing_page: Showing page
-    relation: 
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: Download XML
-      relation: Relation
-      relation_title: "Relation: {{relation_name}}"
-      view_history: view history
-    relation_details: 
-      members: "Members:"
-      part_of: "Part of:"
-    relation_history: 
-      relation_history: Relation History
-      relation_history_title: "Relation History: {{relation_name}}"
-    start: 
-      manually_select: Manually select a different area
-      view_data: View data for current map view
     start_rjs: 
-      data_frame_title: Data
-      data_layer_name: Data
-      details: Details
-      drag_a_box: Drag a box on the map to select an area
-      edited_by_user_at_timestamp: Edited by [[user]] at [[timestamp]]
-      history_for_feature: History for [[feature]]
-      load_data: Load Data
-      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
-      loading: Loading...
-      manually_select: Manually select a different area
       object_list: 
-        api: Retrieve this area from the API
-        back: Display object list
-        details: Details
-        heading: Object list
-        history: 
-          type: 
-            node: Node [[id]]
-            way: Way [[id]]
         selected: 
           type: 
-            node: Node [[id]]
             way: Ona [[id]]
         type: 
-          node: Node
           way: Ona
-      private_user: private user
-      show_history: Show History
-      unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
       wait: Duro...
-      zoom_or_select: Zoom in or select an area of the map to view
-    tag_details: 
-      tags: "Tags:"
     way: 
       download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: Download XML
-      view_history: view history
-      way: Way
-      way_title: "Way: {{way_name}}"
-    way_details: 
-      also_part_of: 
-        one: also part of way {{related_ways}}
-        other: also part of ways {{related_ways}}
-      nodes: "Nodes:"
-      part_of: "Part of:"
-    way_history: 
-      download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: Download XML
-      view_details: view details
-      way_history: Way History
-      way_history_title: "Way History: {{way_name}}"
-  changeset: 
-    changeset: 
-      anonymous: Anonymous
-      big_area: (big)
-      no_comment: (none)
-      no_edits: (no edits)
-      show_area_box: show area box
-      still_editing: (still editing)
-      view_changeset_details: View changeset details
-    changeset_paging_nav: 
-      of: of
-      showing_page: Showing page
-    changesets: 
-      area: Area
-      comment: Comment
-      id: ID
-      saved_at: Saved at
-      user: User
   diary_entry: 
-    diary_comment: 
-      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
-    diary_entry: 
-      comment_count: 
-        one: 1 comment
-        other: "{{count}} comments"
-      comment_link: Comment on this entry
-      edit_link: Edit this entry
-      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
-      reply_link: Reply to this entry
     edit: 
       body: "Ara:"
       language: "ede:"
-      latitude: "Latitude:"
-      location: "Location:"
-      longitude: "Longitude:"
-      marker_text: Diary entry location
-      save_button: Save
-      subject: "Subject:"
-      title: Edit diary entry
       use_map_link: Lo map
-    list: 
-      in_language_title: Diary Entries in {{language}}
-      new: New Diary Entry
-      new_title: Compose a new entry in your user diary
-      newer_entries: Newer Entries
-      no_entries: No diary entries
-      older_entries: Older Entries
-      recent_entries: "Recent diary entries:"
-      title: Users' diaries
-      user_title: "{{user}}'s diary"
-    new: 
-      title: New Diary Entry
-    no_such_entry: 
-      body: Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: "No entry with the id: {{id}}"
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: The user {{user}} does not exist
-      title: No such user
     view: 
-      leave_a_comment: Leave a comment
       login: wole
-      login_to_leave_a_comment: "{{login_link}} to leave a comment"
-      save_button: Save
-      title: Users' diaries | {{user}}
-      user_title: "{{user}}'s diary"
-  export: 
-    start: 
-      add_marker: Add a marker to the map
-      area_to_export: Area to Export
-      embeddable_html: Embeddable HTML
-      export_button: Export
-      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
-      format: Format
-      format_to_export: Format to Export
-      image_size: Image Size
-      latitude: "Lat:"
-      licence: Licence
-      longitude: "Lon:"
-      manually_select: Manually select a different area
-      mapnik_image: Mapnik Image
-      max: max
-      options: Options
-      osm_xml_data: OpenStreetMap XML Data
-      osmarender_image: Osmarender Image
-      output: Output
-      paste_html: Paste HTML to embed in website
-      scale: Scale
-      zoom: Zoom
-    start_rjs: 
-      add_marker: Add a marker to the map
-      change_marker: Change marker position
-      click_add_marker: Click on the map to add a marker
-      drag_a_box: Drag a box on the map to select an area
-      export: Export
-      manually_select: Manually select a different area
-      view_larger_map: View Larger Map
-  geocoder: 
-    results: 
-      no_results: No results found
   layouts: 
     alt_donation: Da wo si openstreetmap.org
-    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
     donate_link_text: idawo
-    edit: Edit
-    edit_tooltip: Edit maps
-    export: Export
-    export_tooltip: Export map data
-    gps_traces: GPS Traces
-    gps_traces_tooltip: Manage traces
-    help_wiki: Help &amp; Wiki
-    help_wiki_tooltip: Help &amp; Wiki site for the project
-    history: History
-    history_tooltip: Changeset history
     home: ile
     home_tooltip: Lo si ile
-    inbox: inbox ({{count}})
-    inbox_tooltip: 
-      one: Your inbox contians 1 unread message
-      other: Your inbox contains {{count}} unread messages
-      zero: Your inbox contains no unread messages
-    intro_1: OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-    intro_2: OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
     log_in: Wole
     log_in_tooltip: wole pelu with an existing account
-    logo: 
-      alt_text: OpenStreetMap logo
     logout: jade
     logout_tooltip: Jade
-    news_blog: News blog
-    news_blog_tooltip: News blog about OpenStreetMap, free geographical data, etc.
-    osm_offline: The OpenStreetMap database is currently offline while essential database maintenance work is carried out.
-    osm_read_only: The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
     shop: Oja
     shop_tooltip: Oja oni OpenStreetMap
-    sign_up: sign up
-    sign_up_tooltip: Create an account for editing
     sotm: Wa si 2009 Ipade OpenStreetMap, The State of the Map, July 10-12 ni ilu  Amsterdam!
-    tag_line: The Free Wiki World Map
-    user_diaries: User Diaries
-    user_diaries_tooltip: View user diaries
     view: wo
     view_tooltip: wo maps
     welcome_user: Kabo, {{user_link}}
-    welcome_user_link_tooltip: Your user page
-  map: 
-    coordinates: "Coordinates:"
-    edit: Edit
-    view: View
   message: 
-    inbox: 
-      date: Date
-      from: From
-      my_inbox: My inbox
-      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
-      outbox: outbox
-      people_mapping_nearby: people mapping nearby
-      subject: Subject
-      title: Inbox
-      you_have: You have {{new_count}} new messages and {{old_count}} old messages
-    mark: 
-      as_read: Message marked as read
-      as_unread: Message marked as unread
-    message_summary: 
-      read_button: Mark as read
-      reply_button: Reply
-      unread_button: Mark as unread
-    new: 
-      back_to_inbox: Back to inbox
-      body: Body
-      message_sent: Message sent
-      send_button: Send
-      send_message_to: Send a new message to {{name}}
-      subject: Subject
-      title: Send message
-    no_such_user: 
-      body: Sorry there is no user or message with that name or id
-      heading: No such user or message
-      title: No such user or message
     outbox: 
-      date: Date
-      inbox: inbox
-      my_inbox: My {{inbox_link}}
-      no_sent_messages: You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
-      outbox: outbox
-      people_mapping_nearby: people mapping nearby
-      subject: Subject
-      title: Outbox
-      to: To
       you_have_sent_messages: O ni {{sent_count}} sent messages
     read: 
       back_to_inbox: Pada si inbox
       back_to_outbox: Pad si outbox
-      date: Date
-      from: From
       reading_your_messages: Ka messages eh
       reading_your_sent_messages: Ka sent messages
-      reply_button: Reply
-      subject: Subject
       title: Ka message
-      to: To
-      unread_button: Mark as unread
   notifier: 
-    diary_comment_notification: 
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
-      header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      hi: Hi {{to_user}},
-      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
-    email_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_html: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
-    email_confirm_plain: 
-      click_the_link: If this is you, please click the link below to confirm the change.
-      greeting: Hi,
-      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
-    friend_notification: 
-      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
-      subject: "[OpenStreetMap] {{user}} added you as a friend"
     gpx_notification: 
-      and_no_tags: and no tags.
-      and_the_tags: "and the following tags:"
-      failure: 
-        failed_to_import: "failed to import. Here's the error:"
-        more_info_1: More information about GPX import failures and how to avoid
-        more_info_2: "them can be found at:"
-        subject: "[OpenStreetMap] GPX Import failure"
-      greeting: Hi,
       success: 
         loaded_successfully: "loaded successfully with {{trace_points}} out of a possible\n{{possible_points}} points."
-        subject: "[OpenStreetMap] GPX Import success"
-      with_description: with the description
-      your_gpx_file: It looks like your GPX file
-    lost_password: 
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_html: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
-    lost_password_plain: 
-      click_the_link: If this is you, please click the link below to reset your password.
-      greeting: Hi,
-      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
-      hopefully_you_2: email addresses openstreetmap.org account.
-    message_notification: 
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      footer1: You can also read the message at {{readurl}}
-      footer2: and you can reply at {{replyurl}}
-      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
-      hi: Hi {{to_user}},
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
-    signup_confirm: 
-      subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_html: 
-      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
-      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: You can watch an {{introductory_video_link}}.
-      more_videos: There are {{more_videos_link}}.
-      more_videos_here: more videos here
-      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
-      video_to_openstreetmap: introductory video to OpenStreetMap
-      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
-    signup_confirm_plain: 
-      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
-      click_the_link_2: account and read on for more information about OpenStreetMap.
-      current_user_1: A list of current users in categories, based on where in the world
-      current_user_2: "they are, is available from:"
-      greeting: Hi there!
-      hopefully_you: Someone (hopefully you) would like to create an account over at
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      user_wiki_1: It is recommended that you create a user wiki page, which includes
-      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
   site: 
     edit: 
-      anon_edits_link_text: Find out why this is the case.
-      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
-      not_public: You haven't set your edits to be public.
-      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
-      user_page_link: user page
-    index: 
-      js_1: You are either using a browser that doesn't support javascript, or you have disabled javascript.
-      js_2: OpenStreetMap uses javascript for its slippy map.
-      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
-      license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
-        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
-        project_name: OpenStreetMap project
-      permalink: Permalink
-    key: 
-      map_key: Map key
-      map_key_tooltip: Map key for the mapnik rendering at this zoom level
     search: 
-      search: Search
-      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
       submit_text: Lo
       where_am_i: Ni bo ni mo wa?
-    sidebar: 
-      close: Close
-      search_results: Search Results
   trace: 
-    create: 
-      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
-      upload_trace: Upload GPS Trace
-    delete: 
-      scheduled_for_deletion: Track scheduled for deletion
-    edit: 
-      description: "Description:"
-      edit: edit
-      filename: "Filename:"
-      owner: "Owner:"
-      points: "Points:"
-      save_button: Save Changes
-      start_coord: "Start coordinate:"
-      tags: "Tags:"
-      uploaded_at: "Uploaded at:"
-    list: 
-      public_traces: Public GPS traces
-      public_traces_from: Public GPS traces from {{user}}
-      tagged_with: " tagged with {{tags}}"
-      your_traces: Your GPS traces
-    make_public: 
-      made_public: Track made public
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: The user {{user}} does not exist
-      title: No such user
-    trace: 
-      ago: "{{time_in_words_ago}} ago"
-      by: by
-      count_points: "{{count}} points"
-      edit: edit
-      edit_map: Edit Map
-      in: in
-      map: map
-      more: more
-      pending: PENDING
-      private: PRIVATE
-      public: PUBLIC
-      trace_details: View Trace Details
-      view_map: View Map
-    trace_form: 
-      description: Description
-      help: Help
-      tags: Tags
-      upload_button: Upload
-      upload_gpx: Upload GPX File
-    trace_header: 
-      see_all_traces: See all traces
-      see_just_your_traces: See just your traces, or upload a trace
-      see_your_traces: See all your traces
-      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
-    trace_optionals: 
-      tags: Tags
-    trace_paging_nav: 
-      of: of
-      showing: Showing page
     view: 
-      delete_track: Delete this track
-      description: "Description:"
-      download: download
-      edit: edit
-      edit_track: Edit this track
-      filename: "Filename:"
-      heading: Viewing trace {{name}}
-      map: map
-      none: None
-      owner: "Owner:"
-      pending: PENDING
-      points: "Points:"
-      start_coordinates: "Start coordinate:"
       tags: Tags
-      trace_not_found: Trace not found!
-      uploaded: "Uploaded at:"
   user: 
     account: 
-      email never displayed publicly: (never displayed publicly)
-      flash update success: User information updated successfully.
-      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
-      home location: "Home Location:"
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      make edits public button: Make all my edits public
-      my settings: My settings
-      no home location: You have not entered your home location.
-      preferred languages: "Preferred Languages:"
-      profile description: "Profile Description:"
       public editing: 
-        disabled: Disabled and cannot edit data, all previous edits are anonymous.
-        disabled link text: why can't I edit?
-        enabled: Enabled. Not anonymous and can edit data.
         enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        enabled link text: what's this?
-        heading: "Public editing:"
-      return to profile: Return to profile
-      save changes button: Save Changes
-      title: Edit account
-      update home location on click: Update home location when I click on the map?
-    confirm: 
-      button: Confirm
-      failure: A user account with this token has already been confirmed.
-      heading: Confirm a user account
-      press confirm button: Press the confirm button below to activate your account.
-      success: Confirmed your account, thanks for signing up!
-    confirm_email: 
-      button: Confirm
-      failure: An email address has already been confirmed with this token.
-      heading: Confirm a change of email address
-      press confirm button: Press the confirm button below to confirm your new email address.
-      success: Confirmed your email address, thanks for signing up!
-    friend_map: 
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-      your location: Your location
-    go_public: 
-      flash success: All your edits are now public, and you are now allowed to edit.
     login: 
       account not active: Pele, account yin ko wa active .<br />Jo eh te link ni nu account confirmation email lati tan account eh.
       auth failure: Pele, e le wole pelu details yi.
-      create_account: create an account
-      email or username: "Email Address or Username:"
       heading: Wole
-      login_button: Login
       lost password link: Se eh ti san password nu?
-      password: "Password:"
       please login: Ejo e Wolw abi {{create_user_link}}.
       title: Wole
     lost_password: 
-      email address: "Email Address:"
-      heading: Forgotten Password?
       new password button: Send me a new password
-      notice email cannot find: Couldn't find that email address, sorry.
-      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
       title: lost password
-    make_friend: 
-      already_a_friend: You are already friends with {{name}}.
-      failed: Sorry, failed to add {{name}} as a friend.
-      success: "{{name}} is now your friend."
-    new: 
-      confirm email address: "Confirm Email Address:"
-      confirm password: "Confirm Password:"
-      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
-      display name: "Display Name:"
-      email address: "Email Address:"
-      fill_form: Fill in the form and we'll send you a quick email to activate your account.
-      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
-      heading: Create a User Account
-      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
-      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
-      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
-      password: "Password:"
-      signup: Signup
-      title: Create account
-    no_such_user: 
-      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
-      heading: The user {{user}} does not exist
-      title: No such user
-    remove_friend: 
-      not_a_friend: "{{name}} is not one of your friends."
-      success: "{{name}} was removed from your friends."
     reset_password: 
-      flash token bad: Didn't find that token, check the URL maybe?
       title: reset password
-    set_home: 
-      flash success: Home location saved successfully
-    view: 
-      add as friend: add as friend
-      add image: Add Image
-      ago: ({{time_in_words_ago}} ago)
-      change your settings: change your settings
-      delete image: Delete Image
-      description: Description
-      diary: diary
-      edits: edits
-      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
-      km away: "{{count}}km away"
-      mapper since: "Mapper since:"
-      my diary: my diary
-      my edits: my edits
-      my settings: my settings
-      my traces: my traces
-      nearby users: "Nearby users:"
-      new diary entry: new diary entry
-      no friends: You have not added any friends yet.
-      no home location: No home location has been set.
-      no nearby users: There are no users who admit to mapping nearby yet.
-      remove as friend: remove as friend
-      send message: send message
-      settings_link_text: settings
-      traces: traces
-      upload an image: Upload an image
-      user image heading: User image
-      user location: User location
-      your friends: Your friends

config/locales/zh-CN.yml

@@ -45,7 +45,6 @@ zh-CN:
       message: 信息
       node: 结点
       node_tag: 结点标签
-      notifier: Notifier
       old_node: 旧结点
       old_node_tag: 旧结点标签
       old_relation: 旧关系
@@ -57,22 +56,18 @@ zh-CN:
       relation: 关系
       relation_member: 关系对象
       relation_tag: 关系标签
-      session: Session
       trace: 跟踪
       tracepoint: 跟踪点
       tracetag: 跟踪标签
       user: 用户
       user_preference: 用户选择
-      user_token: User Token
       way: 路经
       way_node: 路经结点
       way_tag: 路经标签
   browse: 
     changeset: 
       changeset: "修改集合: {{id}}"
-      changesetxml: Changeset XML
       download: 下载 {{changeset_xml_link}} 或 {{osmchange_xml_link}}
-      osmchangexml: osmChange XML
       title: 修改集合
     changeset_details: 
       belongs_to: "属于:"
@@ -86,8 +81,6 @@ zh-CN:
       no_bounding_box: 没有为该修改集合所储存的限定窗口。
       show_area_box: 显示区域窗口
     common_details: 
-      edited_at: "Edited at:"
-      edited_by: "Edited by:"
       in_changeset: "在修改集合中:"
       version: "版本:"
     containing_relation: 
@@ -117,7 +110,6 @@ zh-CN:
         relation: 关系
         way: 路径
     paging_nav: 
-      of: of
       showing_page: 显示网页
     relation: 
       download: "{{download_xml_link}} 或者 {{view_history_link}}"
@@ -138,7 +130,6 @@ zh-CN:
       data_frame_title: 数据
       details: 细节
       drag_a_box: 通过拖曳窗口来选择区域
-      edited_by_user_at_timestamp: Edited by [[user]] at [[timestamp]]
       history_for_feature: 历史 [[feature]]
       load_data: 读取数据
       loaded_an_area_with_num_features: 你已经选择了一个区域包括了[[num_features]] features. 通常，一些浏览器不能很好显示高精度的数据。一般来讲，当像素点在100一下浏览器的显示效果最好。如果再做别的任务，可能会导致您的浏览器变慢/不响应如果您确定您想要显示这些数据，您可能要点击下面的按钮。
@@ -177,24 +168,19 @@ zh-CN:
       still_editing: (仍在编辑中)
       view_changeset_details: 查看详细变更
     changeset_paging_nav: 
-      of: of
       showing_page: 显示网页
     changesets: 
       area: 区域
       comment: 评论
-      id: ID
       saved_at: 保存在
       user: 用户
   diary_entry: 
-    diary_comment: 
-      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
     diary_entry: 
       comment_count: 
         one: 1回复
         other: "{{count}} 回复"
       comment_link: 关于此篇评论
       edit_link: 编辑此篇
-      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
       reply_link: 对此篇进行回复
     edit: 
       body: "主体:"
@@ -229,14 +215,12 @@ zh-CN:
       leave_a_comment: 留下评论
       save_button: 保存
       title: 用户日志| {{user}}
-      user_title: "{{user}}'s diary"
   export: 
     start: 
       add_marker: 对地图添加一个标记
       area_to_export: 输出区域
       embeddable_html: 嵌入 HTML
       export_button: 输出
-      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
       format: 格式
       format_to_export: 输出格式
       image_size: 图像尺寸
@@ -303,10 +287,8 @@ zh-CN:
     news_blog_tooltip: 关于OpenStreetMap的新闻博客，免费地理数据等等。
     osm_offline: OpenStreetMap的数据库目前没有连线，数据库的维护工作正在进行。
     osm_read_only: OpenStreetMap数据库目前处于只读模式中，数据库的维护工作正在进行中。
-    shop: Shop
     sign_up: 注册
     sign_up_tooltip: 创建一个可编辑账户
-    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
     tag_line: 免费维基世界地图
     user_diaries: 用户日志
     user_diaries_tooltip: 查看用户日志
@@ -411,21 +393,14 @@ zh-CN:
       wiki_signup: "你可能想要登录到OpenStreetMap wiki:"
   site: 
     edit: 
-      anon_edits_link_text: Find out why this is the case.
       flash_player_required: 您需要一个Flash Player来使用OpenStreetMap的Flash编辑器Potlatch。您可以通过<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">从Adobe.com下载 Flash Player </a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">一些其他选择</a> 也可以用来编辑OpenStreetMap.
       not_public: 您尚未公开您的编辑。
       not_public_description: 您将无法再编辑此地图，直到您做到如上所述。您可以公开您的编辑，通过您的{{user_page}}。
       potlatch_unsaved_changes: 您有尚未保存的改动. (为保存到Potlatch, 如果在列表模式下编辑，您需要取消当前所选择的路径或结点，或者点击保存，如果您看到保存按钮。)
       user_page_link: 用户页
     index: 
-      js_1: 或许您正在使用的浏览器不支持javascript, 或许您禁用了javascript.
-      js_2: OpenStreetMap uses javascript for its slippy map.
-      js_3: 您或许可以尝试 <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> 如果您无法启用javascript.
-      license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
-        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
-        project_name: OpenStreetMap project
-      permalink: Permalink
+      js_1: 或许您正在使用的浏览器不支持JavaScript, 或许您禁用了JavaScript.
+      js_3: 您或许可以尝试 <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> 如果您无法启用JavaScript.
     key: 
       map_key: 地图符号
     search: 
@@ -446,12 +421,10 @@ zh-CN:
       description: "描述:"
       edit: 编辑
       filename: "文件名:"
-      owner: "Owner:"
       points: "坐标点:"
       save_button: 保存修改
       start_coord: "开始坐标:"
       tags: "标签:"
-      uploaded_at: "Uploaded at:"
     list: 
       public_traces: 公共GPS追踪路径
       public_traces_from: 公共 GPS 追踪路径来自 {{user}}
@@ -463,14 +436,11 @@ zh-CN:
       body: 对不起，没有此名{{user}}所对应的用户。请查看您的拼写，或者可能您点击有误。
     trace: 
       ago: "{{time_in_words_ago}} 之前"
-      by: by
       count_points: "{{count}} 个点"
       edit: 编辑
       edit_map: 编辑地图
-      in: in
       map: 地图
       more: 更多
-      pending: PENDING
       private: 私有
       public: 公开
       trace_details: 查看路径详情
@@ -489,7 +459,6 @@ zh-CN:
     trace_optionals: 
       tags: 标签
     trace_paging_nav: 
-      of: of
       showing: 显示页
     view: 
       delete_track: 删除这条路径
@@ -502,12 +471,10 @@ zh-CN:
       map: 地图
       none: 空
       owner: "所有者:"
-      pending: PENDING
       points: "结点:"
       start_coordinates: "开始坐标:"
       tags: 标签
       trace_not_found: 路径为找到!
-      uploaded: "Uploaded at:"
   user: 
     account: 
       email never displayed publicly: (从不公开显示)
@@ -601,7 +568,6 @@ zh-CN:
       edits: 编辑
       if set location: 如果您设定您的位置，一张精美的地图及其他相关信息将出现在下方。您可以通过您的{{settings_link}}页面来设置您的位置。
       km away: "{{count}}公里之外"
-      mapper since: "Mapper since:"
       my diary: 我的日志
       my edits: 我的编辑
       my settings: 我的设置
@@ -614,7 +580,6 @@ zh-CN:
       remove as friend: 删除好友
       send message: 发送信息
       settings_link_text: 设定
-      traces: traces
       upload an image: 上传图片
       user image heading: 用户头像
       user location: 用户位置

config/locales/zh-TW.yml

@@ -30,7 +30,6 @@ zh-TW:
         active: 啟用
         description: 描述
         display_name: 顯示名稱
-        email: Email
         languages: 語言
         pass_crypt: 密碼
     models: 
@@ -45,7 +44,6 @@ zh-TW:
       message: 訊息
       node: 節點
       node_tag: 節點標籤
-      notifier: Notifier
       old_node: 舊的節點
       old_node_tag: 舊的節點標籤
       old_relation: 舊的關係
@@ -70,12 +68,10 @@ zh-TW:
   browse: 
     changeset: 
       changeset: 變更組合：
-      changesetxml: Changeset XML
       download: 下載 {{changeset_xml_link}} 或 {{osmchange_xml_link}}
       feed: 
         title: 變更組合 {{id}}
         title_comment: 變更組合 {{id}} - {{comment}}
-      osmchangexml: osmChange XML
       title: 變更組合
     changeset_details: 
       belongs_to: 屬於：
@@ -198,7 +194,6 @@ zh-TW:
       private_user: 個人使用者
       show_history: 顯示歷史
       unable_to_load_size: 無法載入：綁定方塊的大小 [[bbox_size]] 太過巨大 (必須小於 {{max_bbox_size}})
-      wait: Wait...
       zoom_or_select: 放大或選擇要檢視的地圖區域
     tag_details: 
       tags: 標籤：
@@ -224,7 +219,6 @@ zh-TW:
   changeset: 
     changeset: 
       anonymous: 匿名
-      big_area: (big)
       no_comment: (沒有)
       no_edits: (沒有編輯)
       show_area_box: 顯示區域方塊
@@ -236,7 +230,6 @@ zh-TW:
     changesets: 
       area: 區域
       comment: 註解
-      id: ID
       saved_at: 儲存於
       user: 使用者
     list: 
@@ -317,7 +310,6 @@ zh-TW:
       area_to_export: 要匯出的區域
       embeddable_html: 內嵌式 HTML
       export_button: 匯出
-      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
       format: 格式
       format_to_export: 要匯出的格式
       image_size: 圖片大小
@@ -325,11 +317,9 @@ zh-TW:
       licence: 授權
       longitude: 經度：
       manually_select: 手動選擇不同的區域
-      mapnik_image: Mapnik Image
       max: 最大
       options: 選項
       osm_xml_data: OpenStreetMap XML 資料
-      osmarender_image: Osmarender Image
       output: 輸出
       paste_html: 貼上 HTML 內嵌於網站
       scale: 比例
@@ -405,8 +395,6 @@ zh-TW:
     intro_3: OpenStreetMap 的主機是由 {{ucl}} 和 {{bytemark}} 很大方的提供的。
     log_in: 登入
     log_in_tooltip: 以設定好的帳號登入
-    logo: 
-      alt_text: OpenStreetMap logo
     logout: 登出
     logout_tooltip: 登出
     news_blog: 新聞部落格
@@ -417,7 +405,6 @@ zh-TW:
     shop_tooltip: 購買 OpenStreetMap 相關廠商的產品
     sign_up: 註冊
     sign_up_tooltip: 建立一個帳號以便能編輯
-    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
     tag_line: 自由的 Wiki 世界地圖
     user_diaries: 日記
     user_diaries_tooltip: 檢視日記
@@ -647,13 +634,11 @@ zh-TW:
       potlatch_unsaved_changes: 您還有未儲存的變更。 (要在 Potlatch 中儲存，您應該取消選擇目前的路徑或節點(如果是在清單模式編輯)，或是點選儲存(如果有儲存按鈕)。)
       user_page_link: 使用者頁面
     index: 
-      js_1: 您使用不支援 javascript 的瀏覽器，或者停用了 javascript。
-      js_2: OpenStreetMap 使用 javascript 讓地圖更平順。
-      js_3: 如果您無法啟用 javascript，可以試試 <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home 靜態拼貼瀏覽器</a>。
+      js_1: 您使用不支援 JavaScript 的瀏覽器，或者停用了 JavaScript。
+      js_2: OpenStreetMap 使用 JavaScript 讓地圖更平順。
+      js_3: 如果您無法啟用 JavaScript，可以試試 <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home 靜態拼貼瀏覽器</a>。
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: 由 {{project_name}} 和它的貢獻者依 {{license_name}} 條款授權。
-        project_name: OpenStreetMap project
       permalink: 靜態連結
       shortlink: 簡短連結
     key: 
@@ -662,19 +647,15 @@ zh-TW:
       table: 
         entry: 
           admin: 行政區邊界
-          allotments: Allotments
           apron: 
             - Airport apron
             - terminal
-          bridge: Black casing = bridge
           bridleway: 馬道
-          brownfield: Brownfield site
           building: 特殊建築
           byway: 鄉間小路
           cable: 
             - 纜車
             - chair lift
-          cemetery: Cemetery
           centre: 運動中心
           commercial: 商業區
           common: 
@@ -682,12 +663,10 @@ zh-TW:
             - meadow
           construction: 建築中路段
           cycleway: 自行車道
-          destination: Destination access
           farm: 農田
           footway: 步道
           forest: 森林
           golf: 高爾夫球道
-          heathland: Heathland
           industrial: 工業區
           lake: 
             - 湖泊
@@ -695,14 +674,10 @@ zh-TW:
           military: 軍事區
           motorway: 高速公路
           park: 公園
-          permissive: Permissive access
-          pitch: Sports pitch
           primary: 主要道路
-          private: Private access
           rail: 鐵路
           reserve: 自然保留區
           resident: 住宅區
-          retail: Retail area
           runway: 
             - 機場跑道
             - 飛機滑行道
@@ -713,13 +688,11 @@ zh-TW:
           summit: 
             - Summit
             - peak
-          tourist: Tourist attraction
           track: 產業道路
           tram: 
             - 輕軌電車
             - tram
           trunk: 快速道路
-          tunnel: Dashed casing = tunnel
           unclassified: 未分類道路
           unsurfaced: 無鋪面道路
           wood: 樹木

config/potlatch/colours.txt

@@ -34,3 +34,4 @@ landuse			-			-	0x444444
 military		-			-	0xD6D6D6
 natural			-			-	0xADD6A5
 sport			-			-	0x8CD6B5
+building		-			-	0xFF6EC7

config/potlatch/locales/br.yml

@@ -1,8 +1,14 @@
+# Messages for Breton (Brezhoneg)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Fohanno
 br: 
   a_poi: $1 ul LED
   a_way: $1 un hent
   action_addpoint: Ouzhpennañ ur poent e dibenn un hent
   action_cancelchanges: o nullañ ar c'hemmoù da
+  action_changeway: kemmoù d'un hent
+  action_createparallel: o krouiñ hentoù kenstur
   action_createpoi: Krouiñ ur LED (lec'h dedennus)
   action_deletepoint: o tiverkañ ur poent
   action_insertnode: Ouzhpennañ ur poent war an hent
@@ -13,43 +19,100 @@ br:
   action_pointtags: Arventennañ ur poent
   action_poitags: Arventennañ ul LED
   action_reverseway: Eilpennañ tu an hent
+  action_revertway: oc'h eilpennañ un hent
   action_splitway: Gaoliñ un hent
   action_waytags: Arventennañ un hent
+  advanced: Araokaet
+  advanced_close: Serriñ ar strollad kemmoù
+  advanced_history: Istor an hent
+  advanced_inspector: Enseller
+  advanced_maximise: Brasaat ar prenestr
+  advanced_minimise: Bihanaat ar prenestr
+  advanced_parallel: Hent kenstur
+  advanced_tooltip: Oberoù aozañ araokaet
+  advanced_undelete: Dizilemel
+  advice_bendy: Re gromm evit bezañ eeunaet (Pennlizh. evit rediañ)
+  advice_deletingpoi: O tilemel POI (Z evit dizober)
+  advice_deletingway: O tilemel an hent (Z evit dizober)
   advice_nocommonpoint: N'eus poent boutin ebet etre an hentoù
+  advice_revertingpoi: Distreiñ d'ar POI enrollet da ziwezhañ (Z evit dizober)
+  advice_revertingway: Distreiñ d'an hent enrollet da ziwezhañ (Z evit dizober)
   advice_tagconflict: Ne glot ket ar menegoù - Gwiriit mar plij (Z evit dizober)
   advice_toolong: Re hir evit disac'hañ an enkadenn - Rannit an hent e hentoù berroc'h
+  advice_uploadempty: Netra da gas
+  advice_uploadfail: Kasadenn ehanet
+  advice_uploadsuccess: Kaset eo bet an holl roadennoù
   advice_waydragged: Hent dilec'hiet (Z evit dizober)
   cancel: Nullañ
+  closechangeset: O serriñ ar strollad kemmoù
+  conflict_download: Pellgargañ o stumm
+  conflict_overwrite: Skrivañ war-c'horre o stumm
+  conflict_poichanged: Abaoe m'emaoc'h oc'h aozañ eo bet cheñchet ar poent $1$2 gant unan bennak all.
+  conflict_relchanged: Abaoe m'emaoc'h oc'h aozañ eo bet cheñchet an darempred $1$2 gant unan bennak all.
+  conflict_visitpoi: Klikit war "Mat eo" evit diskouez ar poent.
+  conflict_visitway: Klikit war "Mat eo" evit diskouez an hent.
+  conflict_waychanged: Abaoe m'emaoc'h oc'h aozañ eo bet cheñchet an hent $1$2 gant unan bennak all.
   createrelation: Krouiñ un darempred nevez
+  custom: "Personelaet :"
   delete: Diverkañ
   deleting: o tiverkañ
   drag_pois: Riklañ ha merkañ Lec'hioù dedennus
   editinglive: Aozañ war-eeun
   editingoffline: Labourat ezlinenn
-  emailauthor: "\n\nTrugarez da gas keloù da richard\\@systemeD.net evit menegiñ an draen, ha displegañ dezhañ ar pezh e oac'h oc'h ober p'eo c'hoarvezet."
+  emailauthor: "\n\nTrugarez da gas keloù da richard\@systemeD.net evit menegiñ an draen, ha displegañ dezhañ ar pezh e oac'h oc'h ober p'eo c'hoarvezet."
+  error_anonymous: Ne c'hallit ket mont e darempred gant ur c'hartennour dizanv.
   error_connectionfailed: "Ho tigarez, c'hwitet eo kevreañ ouzh servijer OpenStreetMap. N'eo ket bet enrollet ho kemmoù diwezhañ.\n\nEsaeañ en-dro ?"
   error_nopoi: N'eo ket bet kavet al Lec'h Dedennus (LED), war ur bajenn all marteze ?, n'hall ket bezañ assavet.
   error_nosharedpoint: "N'eus mui poent boutin ebet etre an hentoù $1 ha $2, setu n'haller ket o adpegañ : n'haller ket dizober an dispartiadenn zo bet graet a-raok."
   error_noway: N'eo ket bet kavet an hent $1, n'hall ket bezañ assavet d'e stad kent.
+  error_readfailed: Ho tigarez - servijer OpenStreetMap n'en deus ket respontet pa oa bet goulennet roadennoù digantañ.\n\nC'hoant hoc'h eus da esaeañ en-dro ?
   existingrelation: Ouzhpennañ d'un darempred zo anezhañ c'hoazh
   findrelation: Kavout un darempred ennañ
   gpxpleasewait: Gortozit e-keit ha ma pleder gant ar roud GPX.
+  heading_drawing: Tresadenn
+  heading_introduction: Digoradur
+  heading_pois: Kregiñ ganti
+  heading_quickref: Dave prim
+  heading_surveying: Oc'h evezhiañ
+  heading_tagging: O valizennañ
+  heading_troubleshooting: Kudennoù
   help: Skoazell
   hint_drawmode: Klikañ evit ouzhpennañ ur poent\nDaouglikañ\nevit Distreiñ da dibenn al linenn
   hint_loading: O kargañ an hentoù
   hint_overendpoint: War poent diwezhañ an tres\nKlikañ evit juntañ\nShift-klik evit kendeuziñ
   hint_overpoint: "Poent war-c'horre\nKlikañ evit juntañ"
   hint_pointselected: "Lec'h diuzet\n(Shift-klik war al lec'h evit\nsevel ul linenn nevez)"
+  hint_saving: oc'h enrollañ ar roadennoù
+  hint_saving_loading: o kargañ / oc'h enrollañ roadennoù
+  login_pwd: "Ger-tremen :"
+  login_retry: Anavezerioù ho lec'hienn n'int ket bet anavezet. Esaeit en-dro, mar plij.
+  login_title: N'eus ket bet gallet kevreañ
+  login_uid: "Anv implijer :"
+  more: Titouroù
+  newchangeset: "\nEsaeit adarre, mar plij : Potlatch a lañso ur strollad kemmoù nevez."
+  nobackground: Drekleur ebet
   norelations: Darempred ebet en takad diskouezet
+  offset_broadcanal: Hent-kanol ledan
+  offset_choose: Dibab an offset (m)
+  offset_dual: Hent peder forzh (D2)
+  offset_motorway: Gourhent (D3)
+  offset_narrowcanal: Hent-kanol strizh
   ok: Mat eo
   openchangeset: Digeriñ ur c'hemmset
   option_custompointers: Erlec'hiañ al logodenn gant ar C'hreion hag an Dorn
+  option_external: "Lañsadenn diavaez :"
   option_fadebackground: Drekleur sklaeraet
+  option_noname: Dreistlinennañ an hentoù dizanv
+  option_photo: "Luc'hskeudenn KML :"
+  option_thinareas: Implijout linennoù moanoc'h evit an takadoù
   option_thinlines: Ober gant un tres moan evit an holl skeulioù
+  option_tiger: Dresitlinennañ TIGER n'eo ket bet kemmet
   option_warnings: Diskouez ar c'hemennoù-diwall war-neuñv
   point: Poent
   prompt_addtorelation: Ouzhpennañ $1 d'un darempred
   prompt_changesetcomment: "Merkit un tamm deskrivadenn eus ar c'hemmoù bet degaset ganeoc'h :"
+  prompt_closechangeset: Serriñ ar strollad kemmoù $1
+  prompt_createparallel: Krouiñ un hent kenstur
   prompt_editlive: Aozañ war-eeun
   prompt_editsave: Aozañ hag enrollañ goude
   prompt_helpavailable: Implijer nevez ? Sellit en traoñ a-gleiz da gaout skoazell.
@@ -59,6 +122,7 @@ br:
   prompt_taggedpoints: Tikedennet eo poentoù zo eus an hent-mañ. Lemel kuit an tikedennoù ?
   prompt_track: Amdreiñ ur roud GPS d'un hent (prennet) da aozañ.
   prompt_welcome: Degemer mat war OpenStreetMap !
+  retry: Esaeañ en-dro
   save: Enrollañ
   tip_addrelation: Ouzhpennañ d'un darempred
   tip_addtag: Ouzhpennañ ur meneg nevez
@@ -69,10 +133,13 @@ br:
   tip_gps: Diskwel ar roudoù GPS (G)
   tip_noundo: Netra da zizober
   tip_options: Dibarzhioù (dibab ar gartenn drekleur)
+  tip_photo: Kargañ luc'hskeudennoù
   tip_presettype: Dibab ar seurt arventennoù kinniget el lañser diuzañ.
   tip_repeattag: Eilañ titouroù an hent bet diuzet a-raok (R)
   tip_revertversion: Dibab ar stumm da zistreiñ davetañ
   tip_selectrelation: Ouzhpennañ d'an hent dibabet
   tip_splitway: Gaoliñ an hent d'ar poent diuzet (X)
+  tip_tidy: Poentoù urzhiet en hent (T)
   tip_undo: Dizober an oberiadenn $1 (Z)
+  uploading: O kas...
   way: Hent

config/potlatch/locales/cs.yml

@@ -1,3 +1,6 @@
+# Messages for Czech (Česky)
+# Exported from translatewiki.net
+# Export driver: syck
 cs: 
   a_poi: $1 bod zájmu
   a_way: $1 cestu

config/potlatch/locales/cz.yml

@@ -1,75 +0,0 @@
-cz: 
-  a_poi: $1 bod zájmu
-  a_way: $1 cestu
-  action_addpoint: přidávání uzlu na konec cesty
-  action_createpoi: vytváření bodu zájmu (POI)
-  action_deletepoint: odstraňuji bod
-  action_insertnode: přidávání uzle do cesty
-  action_mergeways: sloučení dvou cest
-  action_movepoi: posunutí bodu záju (POI)
-  action_movepoint: posouvám bod
-  action_moveway: přesunout cestu
-  action_pointtags: nastavit tagy uzlu
-  action_poitags: nastavit tagy bodu zájmu
-  action_splitway: rozděluji cestu
-  action_waytags: úprava tagů cesty
-  advice_nocommonpoint: Cesty nesdílí společný bod
-  advice_tagconflict: Tagy nepasují - prosím zkontrolujte
-  advice_toolong: Příliš dlouhé pro odemčení - prosím rozdělte do kratších cest
-  advice_waydragged: Cesta posunuta (Z pro odvolání změny)
-  cancel: Zrušit
-  createrelation: Vytvořit novou relaci
-  delete: Smazat
-  drag_pois: Klikněte a přetáhněte body zájmu (POI)
-  editinglive: "Režim editace: okamžité ukládání"
-  editingoffline: "Režim editace: uložení najednou"
-  emailauthor: \n\nProsím pošlete e-mail na richard\@systemeD.net s bug-reportem a popisem toho, co jste právě dělali. Pokud nemluvíte anglicky, napište na talk-cz\@openstreetmap.org
-  error_connectionfailed: "Spojení s OpenStreetMap serverem selhalo. Vaše nedávné změny nemohly být uloženy.\n\nZkusit uložit změny znovu?"
-  error_nopoi: Bod zájmu nebyl nalezen, takže nelze vrátit zpět (možná jste posunuli mapu?).
-  error_nosharedpoint: Cesty $1 a $2 v současnosti nemaí společný bod, takže nemůžu vrátit zpět.
-  error_noway: Cesta $1 nebyla nalezena, takže nelze vrátit zpět (možná jste posunuli mapu?).
-  existingrelation: Přidat k existující relaci
-  findrelation: Najít relaci obsahující
-  gpxpleasewait: "Počkejte prosím: Zpracovávám GPX cestu"
-  help: Nápověda
-  hint_drawmode: přidej bod kliknutím\ndvojklik/Enter\nukončí cestu
-  hint_loading: načítám cesty
-  hint_overendpoint: "koncový bod:\nkliknutí pro napojení,\nshift-klik cesty sloučí"
-  hint_overpoint: bod cesty:\nkliknutím cestu napojíte"
-  hint_pointselected: vybrán bod\n(shift-klik na bod\nzačne novou cestu)
-  norelations: V aktuální datech není žádná relace
-  ok: Budiž
-  openchangeset: Otevírám changeset
-  option_custompointers: Použít ukazatele kreslítka (pen) a ruky (hand)
-  option_fadebackground: Zesvětlit pozadí
-  option_thinlines: Používat tenké linky ve všech měřítkách mapy
-  option_warnings: Zobrazovat plovoucí varování
-  point: Bod
-  prompt_addtorelation: Přidat $1 k relace
-  prompt_changesetcomment: "Napište shrnutí provedených změn:"
-  prompt_editlive: Ukládat okamžitě
-  prompt_editsave: Ukládat najednou
-  prompt_helpavailable: Nový uživatel editoru? Nápovědu najdete vpravo dole.
-  prompt_launch: Otevřít externí webovou adresu?
-  prompt_revertversion: "Vrátit se ke dříve uložené verzi:"
-  prompt_savechanges: Uložit změny
-  prompt_taggedpoints: Některé uzle této cesty mají tagy, opravdu smazat?
-  prompt_track: Převede vaši GPS stopu na (uzamčené) cesty, které následně můžete upravit.
-  prompt_welcome: Vítejte na OpenStreetMap
-  save: Uložit změny
-  tip_addrelation: Přidat do relace
-  tip_addtag: Přidat tag
-  tip_alert: Vyskyla se chyba - pro více informací klikněte
-  tip_anticlockwise: Proti směru hodinových ručiček (kliknutím otočíte směr kruhové cesty)
-  tip_clockwise: Po směru hodinových ručiček (kliknutím otočíte směr kruhové cesty)
-  tip_direction: Směr cesty (kliknutím otočíte)
-  tip_gps: Zobrazit GPX stopy (GPS logy) (G)
-  tip_noundo: Není, co vzít zpět
-  tip_options: Možnosti (vyberte si mapu na pozadí)
-  tip_presettype: Zvolit skupinu předvoleb v menu.
-  tip_repeattag: Nastavit tagy předtím vybrané cesty(R)
-  tip_revertversion: "Vyberte verzi, ke které se chcete vrátit:"
-  tip_selectrelation: Přidat k vybrané cestě
-  tip_splitway: Rozdělit cestu ve vybraném bodě (X)
-  tip_undo: "Zpět: $1 (Z)"
-  way: Cesta

config/potlatch/locales/da.yml

@@ -1,3 +1,6 @@
+# Messages for Danish (Dansk)
+# Exported from translatewiki.net
+# Export driver: syck
 da: 
   a_poi: $1 et POI
   a_way: $1 en vej

config/potlatch/locales/de.yml

@@ -1,3 +1,6 @@
+# Messages for German (Deutsch)
+# Exported from translatewiki.net
+# Export driver: syck
 de: 
   a_poi: $1 einen Ort von Interesse (POI)
   a_way: $1 einen Weg

config/potlatch/locales/en.yml

@@ -49,7 +49,7 @@ en:
   conflict_visitway: Click 'Ok' to show the way.
   conflict_waychanged: Since you started editing, someone else has changed way $1$2.
   createrelation: Create a new relation
-  custom: "Custom: "
+  custom: "Custom:"
   delete: Delete
   deleting: deleting
   drag_pois: Drag and drop points of interest
@@ -85,7 +85,8 @@ en:
   login_retry: Your site login was not recognised. Please try again.
   login_title: Couldn't log in
   login_uid: "Username:"
-  newchangeset: "\\nPlease try again: Potlatch will start a new changeset."
+  more: More
+  newchangeset: "\nPlease try again: Potlatch will start a new changeset."
   nobackground: No background
   norelations: No relations in current area
   offset_broadcanal: Broad canal towpath
@@ -107,7 +108,7 @@ en:
   point: Point
   prompt_addtorelation: Add $1 to a relation
   prompt_changesetcomment: "Enter a description of your changes:"
-  prompt_closechangeset',_root.changeset),completeClose,': Close changeset $1
+  prompt_closechangeset: Close changeset $1
   prompt_createparallel: Create parallel way
   prompt_editlive: Edit live
   prompt_editsave: Edit with save

config/potlatch/locales/es.yml

@@ -1,8 +1,14 @@
+# Messages for Spanish (Español)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: PerroVerd
 es: 
   a_poi: $1 un punto de interés (POI)
   a_way: $1 una vía
   action_addpoint: Añadir un punto al final de una vía
   action_cancelchanges: Cancelar cambios
+  action_changeway: cambios en la vía
+  action_createparallel: creando vías paralelas
   action_createpoi: Crear un punto de interés (POI)
   action_deletepoint: Borrar un punto
   action_insertnode: Añadir un punto a una vía
@@ -15,9 +21,16 @@ es:
   action_reverseway: Invertir dirección de una vía
   action_splitway: Dividir una vía
   action_waytags: Parámetros (tags) en una vía
+  advanced: Avanzado
+  advanced_close: Cerrar conjunto de cambios
+  advanced_history: Histórico de la vía
+  advanced_maximise: Maximizar ventana
+  advanced_minimise: Minimizar ventana
+  advanced_parallel: Vía paralela
   advice_nocommonpoint: Las vías no comparten un punto en común
   advice_tagconflict: Los parámetros no coinciden - Por favor revíselos (Z para deshacer)
   advice_toolong: Demasiado largo para desbloquear - Por favor divídalo en vías más cortas
+  advice_uploadempty: Nada que subir
   advice_waydragged: Vía desplazada (Z para deshacer)
   cancel: Cancelar
   createrelation: Crear una nueva relación
@@ -31,25 +44,42 @@ es:
   existingrelation: Añadir a relación existente
   findrelation: Buscar una relación que contenga
   gpxpleasewait: Por favor espere un poco mientras el track GPX se procesa.
+  heading_introduction: Introducción
+  heading_pois: Primeros pasos
+  heading_quickref: Referencia rápida
+  heading_tagging: Etiquetando
+  heading_troubleshooting: Problemas
   help: Ayuda
   hint_drawmode: Clic para añadir un punto\ndoble-clic/Return\npara terminar la línea
   hint_loading: Cargando vías
   hint_overendpoint: Sobre punto final\nclic para unir\nshift-clic para combinar
   hint_overpoint: Sobre punto\nclick para unir"
   hint_pointselected: Punto seleccionado\n(shift-clic en el punto para\nempezar nueva línea)
+  hint_saving: guardando los datos
+  login_pwd: "Contraseña:"
+  login_uid: "Nombre de usuario:"
+  more: Más
+  nobackground: Sin fondo
   norelations: No hay relaciones en el área actual
   ok: OK
+  openchangeset: Abriendo conjunto de cambios
   option_custompointers: Usar punteros de pluma y mano
   option_fadebackground: Atenuar fondo
+  option_photo: "Foto KML:"
   option_thinlines: Usar líneas finas en todas las escalas
   option_warnings: Mostrar alertas flotantes
   point: Punto
   prompt_addtorelation: Añadir $1 a una relación
+  prompt_changesetcomment: "Introduzca una descripción de sus cambios:"
+  prompt_createparallel: Crear vía paralela
   prompt_helpavailable: Tiene cambios sin guardar. (Para guardar en Potlach, debería deseleccionar la vía o el punto actual.)
   prompt_revertversion: "Volver a una versión previamente guardada:"
+  prompt_savechanges: Guardar cambios
   prompt_taggedpoints: Algunos puntos de esta vía tienen parámetros (tags). Seguro que quiere borrar?
   prompt_track: Convierta su track de GPS a vías (bloqueadas) para editar.
   prompt_welcome: Bienvenido a OpenStreetMap!
+  retry: Reintentar
+  save: Guardar
   tip_addrelation: Añadir a una relación
   tip_addtag: Añadir un nuevo parámetro (tag)
   tip_alert: Ha ocurrido un error - clic para detalles
@@ -59,10 +89,12 @@ es:
   tip_gps: Mostrar los tracks de GPS (G)
   tip_noundo: Nada que deshacer
   tip_options: Opciones (elegir el fondo del mapa)
+  tip_photo: Cargar fotos
   tip_presettype: Seleccionar que tipo de parámetros (tags) preestablecidos se ofrecen en el menú.
   tip_repeattag: Repetir los parámetros (tags) de la vía seleccionada previamente (R)
   tip_revertversion: Elige la versión a la que volver.
   tip_selectrelation: Añadir a la ruta seleccionada
   tip_splitway: Dividir la vía en el punto seleccionado (X)
   tip_undo: Deshacer $1 (Z)
+  uploading: Subiendo...
   way: Vía

config/potlatch/locales/fi.yml

@@ -1,3 +1,6 @@
+# Messages for Finnish (Suomi)
+# Exported from translatewiki.net
+# Export driver: syck
 fi: 
   a_poi: $1 POI
   a_way: $1 tie

config/potlatch/locales/fr.yml

@@ -1,3 +1,7 @@
+# Messages for French (Français)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Damouns
 fr: 
   a_poi: $1 un POI
   a_way: $1 un chemin
@@ -13,41 +17,75 @@ fr:
   action_pointtags: Paramétrer un point
   action_poitags: Paramétrer un POI
   action_reverseway: Inverser le sens du chemin
+  action_revertway: rétablir un chemin
   action_splitway: Scinder un chemin
   action_waytags: Paramétrer un chemin
+  advanced_close: Fermer le groupe de modifications
+  advanced_maximise: Maximiser la fenêtre
+  advanced_minimise: Réduire la fenêtre
+  advanced_parallel: Chemin parallèle
+  advanced_undelete: Rétablir
+  advice_deletingpoi: Suppression du POI (Z pour annuler)
+  advice_deletingway: Suppression du chemin (Z pour annuler)
   advice_nocommonpoint: Les chemins ne partagent pas de point commun
+  advice_revertingway: Retour au dernier chemin sauvegardé (Z pour annuler)
   advice_tagconflict: Les tags ne correspondent pas - Veuillez vérifier
   advice_toolong: Trop long pour débloquer la situation - Scindez le chemin en chemins plus courts
+  advice_uploadsuccess: Toutes les données ont été correctement chargées
   advice_waydragged: Chemin déplacé (Z pour annuler)
   cancel: Annuler
+  closechangeset: Fermeture du groupe de modifications
+  conflict_poichanged: Après le début de votre modification, quelqu'un a modifié le point $1$2.
+  conflict_relchanged: Après le début de votre modification, quelqu'un a modifié la relation $1$2.
+  conflict_visitway: Cliquer sur 'OK' pour voir le chemin.
   createrelation: Créer une nouvelle relation
+  custom: "Personnalisé :"
   delete: Supprimer
   deleting: Supprimer
   drag_pois: Déplacer des points d'intérêt
   editinglive: Édition en direct
   editingoffline: Édition hors-ligne
-  emailauthor: "\n\nMerci d'envoyer un e-mail a richard\\@systemeD.net pour signaler ce bogue, en expliquant ce que vous faisiez quand il est survenu."
+  emailauthor: "\n\nMerci d'envoyer un e-mail a richard\@systemeD.net pour signaler ce bogue, en expliquant ce que vous faisiez quand il est survenu."
   error_connectionfailed: Désolé, la connexion au serveur OpenStreetMap a échoué. Vos changements récents ne sont pas enregistrés.\n\nVoulez-vous réessayer ?
   error_nopoi: Le point d'intérêt (POI) n'est pas trouvé (éventuellement sur une autre page?), il ne peut être restauré.
   error_nosharedpoint: "Les chemins $1 et $2 n'ont plus de point en commun et ne peuvent donc pas être recollés : l'opération précédente de scindage ne peut être annulée."
   error_noway: Le chemin $1 n'a pas été trouvé, il ne peut être restauré à son état précédent.
+  error_readfailed: Désolés, le serveur d'OpenStreetMap n'a pas répondu à la demande de données.\n\nVoulez-vous réessayer ?
   existingrelation: Ajouter à une relation existante
   findrelation: Trouver une relation contenant
   gpxpleasewait: Veuillez patientez pendant le traitement de la trace GPX
+  heading_surveying: Relever
+  heading_troubleshooting: Dépannage
   help: Aide
   hint_drawmode: Clic pour ajouter un point\nDouble-clic/Entrée pour terminer le chemin
   hint_loading: Chargement des chemins en cours
   hint_overendpoint: Sur le dernier point du tracé\nClick pour joindre\nShift-click pour fusionner
   hint_overpoint: Point du dessus\nClick pour joindre
   hint_pointselected: Point sélectionné\n(Shift-clic sur le point pour\ncommencer une nouvelle ligne)
+  hint_saving: sauvegarde des données
+  login_pwd: "Mot de passe :"
+  login_retry: Votre nom d'utilisateur du site n'a pas été reconnu. Merci de réessayer.
+  login_title: Connexion impossible
+  login_uid: "Nom d'utilisateur :"
+  newchangeset: "\nMerci de réessayer : Potlatch commencera un nouveau groupe de modifications."
+  nobackground: Pas d'arrière-plan
   norelations: Aucune relation dans l'espace courant
+  offset_broadcanal: Chemin de halage de canal large
+  offset_choose: Entrer le décalage (m)
+  offset_narrowcanal: Chemin de halage de canal étroit
+  ok: OK
   openchangeset: Ouverture d'un changeset
   option_custompointers: Remplacer la souris par le Crayon et la Main
+  option_external: "Lancement externe :"
   option_fadebackground: Arrière-plan éclairci
+  option_photo: "Photo KML :"
+  option_thinareas: Utiliser des lignes plus fines pour les surfaces
   option_thinlines: Utiliser un trait fin à toutes les échelles
+  option_tiger: Voir les données TIGER non modifiées
   option_warnings: Montrer les avertissements flottants
   prompt_addtorelation: Ajouter $1 à la relation
   prompt_changesetcomment: "Entrez une description de vos modifications :"
+  prompt_createparallel: Créer un chemin parallèle
   prompt_editlive: Éditer en direct
   prompt_editsave: Éditer avec sauvegarde
   prompt_helpavailable: Nouvel utilisateur ? Regardez en bas à gauche pour de l'aide
@@ -57,6 +95,7 @@ fr:
   prompt_taggedpoints: Certains points de ce chemin sont tagués. Souhaitez-vous les supprimer?
   prompt_track: Conversion d'une trace GPS en chemin (verrouillé) pour l'édition
   prompt_welcome: Bienvenue sur OpenStreetMap !
+  retry: Réessayer
   save: Sauvegarder
   tip_addrelation: Ajouter à une relation
   tip_addtag: Ajouter un nouveau tag
@@ -67,10 +106,13 @@ fr:
   tip_gps: Afficher les traces GPS (G)
   tip_noundo: Rien à annuler
   tip_options: Options (choix de la carte d'arrière plan)
+  tip_photo: Charger des photos
   tip_presettype: Sélectionner le type de paramètres proposés dans le menu de sélection.
   tip_repeattag: Recopier les informations du chemin sélectionné précédemment (R)
   tip_revertversion: Choisissez la version vers laquelle revenir
   tip_selectrelation: Ajouter à la route choisie
   tip_splitway: Scinder le chemin au point sélectionné (X)
+  tip_tidy: Lisser les points du chemin (T)
   tip_undo: Annuler l'opération $1 (Z)
+  uploading: Envoi...
   way: Chemin

config/potlatch/locales/hsb.yml

@@ -0,0 +1,90 @@
+# Messages for Upper Sorbian (Hornjoserbsce)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Michawiki
+hsb: 
+  a_poi: Městno zajima $1
+  a_way: Puć $1
+  action_movepoi: Městno zajima přesunyć
+  action_waytags: staja atributy na puć
+  advanced: Rozšěrjeny
+  advanced_close: Sadźbu změnow začinić
+  advanced_history: Pućna historija
+  advanced_inspector: Inspektor
+  advanced_maximise: Wokno maksiměrować
+  advanced_minimise: Wokno miniměrować
+  advanced_parallel: Paralelny puć
+  advanced_tooltip: Rozšěrjene wobdźěłanske akcije
+  advanced_undelete: Wobnowić
+  advice_nocommonpoint: Puće nimaja zhromadny dypk
+  advice_uploadempty: Za nahraće ničo njeje
+  advice_uploadfail: Nahraće zastajene
+  advice_uploadsuccess: Wšě daty wuspěšnje nahrate
+  cancel: Přetorhnyć
+  conflict_download: Wersiju sćahnyć
+  conflict_overwrite: Wersiju přepisać
+  conflict_poichanged: Wot toho, zo sy wobdźěłanje započał, je něchtó druhi dypk $1$2 změnił.
+  conflict_relchanged: Něchtó druhi je relaciju $1$2 změnił, wot toho, zo sy wobdźěłanje započał.
+  conflict_visitpoi: Klikń na 'W porjadku', zo by dypk pokazał.
+  conflict_visitway: Klikń na 'W porjadku', zo by puć pokazał.
+  createrelation: Nowu relaciju wutworić
+  custom: "Swójski:"
+  delete: Zničić
+  editinglive: Live wobdźěłać
+  error_anonymous: Njemóžeš anonymneho kartěrowarja kontaktować.
+  error_nopoi: Městno zajima njebu namakane (snano sy kartowy wurězk přesunył?), tohodla njehodźi so cofnyć.
+  error_nosharedpoint: Pućej $1 a $2 hižo nimatej zhromadny dypk, tohodla njemóžu rozdźělenje cofnyć.
+  error_readfailed: Bohužel serwer OpenStreetMap njeje wotmołwił, hdyž sy daty požadał.\n\nChceš hišće raz spytać?
+  existingrelation: Eksistowacej relaciji přidać
+  findrelation: Relaciju namakać, kotraž wobsahuje
+  gpxpleasewait: Prošu čakaj, mjeztym zo so GPX-čara předźěłuje.
+  heading_introduction: Zawjedźenje
+  heading_pois: Prěnje kroki
+  heading_quickref: Spěšna referenca
+  help: Pomoc
+  login_pwd: "Hesło:"
+  login_retry: Twoje wužiwarske mjeno njebu spoźnane. Prošu spytaj hišće raz.
+  login_title: Přizjewjenje njemóžno
+  login_uid: "Wužiwarske mjeno:"
+  newchangeset: "\nProšu spytaj hišće raz: Potlatch započnje nowu sadźbu změnow."
+  nobackground: Žadyn pozadk
+  norelations: W aktualnym wobłuku relacije njejsu
+  offset_choose: Wurunanje wubrać (m)
+  offset_motorway: Awtodróha (D3)
+  ok: W porjadku
+  openchangeset: Sadźbu změnow wočinić
+  option_external: "Eksterny start:"
+  option_noname: Dróhi bjez mjena wuzběhnyć
+  option_photo: "Fotowy KML:"
+  option_thinareas: Ćeńše linije za wobłuki wužiwać
+  option_thinlines: Ćeńke linija na wšěch skalach wužiwać
+  option_warnings: Běžace warnowanja pokazać
+  point: Dypk
+  prompt_addtorelation: $1 relaciji přidać
+  prompt_changesetcomment: "Zapodaj wopisanje swojich změnow:"
+  prompt_createparallel: Paralelny puć wutworić
+  prompt_editlive: Live wobdźěłać
+  prompt_editsave: Wobdźěłać a składować
+  prompt_helpavailable: Nowy wužiwar? Hlej deleka nalěwo za pomoc.
+  prompt_launch: Eksterny URL startować
+  prompt_revertversion: K staršej składowanej wersiji so wróćić
+  prompt_savechanges: Změny składować
+  prompt_taggedpoints: Někotre dypki na tutym puću maja atributy. Woprawdźe zničić?
+  prompt_track: GPS-čaru do pućow konwertować
+  prompt_welcome: Witaj do OpenStreetMap!
+  retry: Znowa spytać
+  save: Składować
+  tip_addrelation: Relaciji přidać
+  tip_addtag: Nowy atribut přidać
+  tip_alert: Zmylk je wustupił - klikń, zo by sej podrobnosće wobhladał
+  tip_direction: Pućny směr - klikń, zo by so wobroćił
+  tip_noundo: Njeje ničo, kotrež hodźi so cofnyć
+  tip_options: Opcije nastajić (kartowy pozadk wubrać)
+  tip_photo: Fota začitać
+  tip_repeattag: Atributy z prjedy wubraneho puća přewzać (R)
+  tip_revertversion: Wubjer datum, kotryž ma so přetworić
+  tip_selectrelation: Wubranej ruće přidać
+  tip_tidy: Kachličkowe dypki na puću (T)
+  tip_undo: $1 cofnyć (Z)
+  uploading: Nahrawa so...
+  way: Puć

config/potlatch/locales/hu.yml

@@ -1,3 +1,6 @@
+# Messages for Hungarian (Magyar)
+# Exported from translatewiki.net
+# Export driver: syck
 hu: 
   a_poi: POI $1
   a_way: vonal $1

config/potlatch/locales/is.yml

@@ -1,9 +1,19 @@
+# Messages for Icelandic (Íslenska)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Ævar Arnfjörð Bjarmason
 is: 
+  a_way: $1 veg
+  advanced_maximise: Fylla skjá
   cancel: Hætta við
+  delete: Eyða
   editinglive: Breyti beint
   editingoffline: Breyti með vistun
   help: Hjálp
   hint_drawmode: smelltu til að bæta við punkt\ntvísmelltu/ýttu á Enter\ntil að klára línu
+  option_thinareas: Nota litlar línur fyrir svæði
+  option_thinlines: Nota litlar línur fyrir allt
+  option_tiger: Sýna óbreytt TIGER gögn
   point: Hnútur
   prompt_changesetcomment: "Sláðu inn lýsingu breytingunum:"
   prompt_editlive: Breyta beint
@@ -16,5 +26,7 @@ is:
   tip_clockwise: Réttsælis vegur - smelltu til að breyta átt hans
   tip_direction: Átt vegar - smelltu til að breyta henni
   tip_gps: Sýna GPS fer (G)
+  tip_options: Breyta stillingum, t.d. breyta bakgrunni kortsins
+  tip_photo: Hlaða inn myndum
   tip_splitway: Skipta veg á völdum hnút (X)
   way: Vegur

config/potlatch/locales/it.yml

@@ -1,3 +1,6 @@
+# Messages for Italian (Italiano)
+# Exported from translatewiki.net
+# Export driver: syck
 it: 
   a_poi: $1 un PDI
   a_way: $1 un percorso
@@ -23,7 +26,7 @@ it:
   createrelation: Crea una nuova relazione
   delete: Cancella
   deleting: cancellazione...
-  emailauthor: "\n\nInviare un'e-mail a richard\\@systemeD.net con la segnalazione dell'errore, descrivendo cosa si stava facendo nel momento in cui si è verificato."
+  emailauthor: "\n\nInviare un'e-mail a richard\@systemeD.net con la segnalazione dell'errore, descrivendo cosa si stava facendo nel momento in cui si è verificato."
   error_connectionfailed: "La connessione con il server di OpenStreetMap si è interrotta. Qualsiasi modifica recente non è stata salvata.\n\nRiprovare?"
   error_nopoi: "Impossibile trovare il PDI (forse è fuori dallo schermo?): impossibile annullare."
   error_nosharedpoint: "I percorsi $1 e $2 non hanno più un punto comune: impossibile annullare la separazione."

config/potlatch/locales/ja.yml

@@ -1,3 +1,6 @@
+# Messages for Japanese (日本語)
+# Exported from translatewiki.net
+# Export driver: syck
 ja: 
   a_poi: POIを $1
   a_way: wayを $1

config/potlatch/locales/ko.yml

@@ -1,3 +1,6 @@
+# Messages for Korean (한국어)
+# Exported from translatewiki.net
+# Export driver: syck
 ko: 
   action_addpoint: 길의 마지막에 새로운 node 추가
   action_cancelchanges: "변경 내용 취소:"

config/potlatch/locales/nl.yml

@@ -1,76 +1,134 @@
+# Messages for Dutch (Nederlands)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Siebrand
 nl: 
   a_poi: $1 een POI
-  a_way: $1 een 'way'
-  action_addpoint: "'Node' toevoegen aan eind van de 'way'"
+  a_way: $1 een weg
+  action_addpoint: Node toevoegen aan eind van de weg
   action_cancelchanges: veranderingen ongedaan maken naar
+  action_changeway: wijzigingen aan een weg
   action_createpoi: Maak een POI (nuttige plaats)
   action_deletepoint: Verwijder een punt
-  action_insertnode: Punt toevoegen aan 'way'
+  action_insertnode: Punt aan weg toevoegen
   action_mergeways: twee wegen samenvoegen
   action_movepoi: Verplaats de POI (nuttige plaats)
-  action_movepoint: Verplaats een punt
-  action_moveway: "'Way' verplaatsen"
-  action_pointtags: tags instellen op een 'point'
-  action_poitags: tags instellen op een POI
-  action_reverseway: "'Way' omdraaien"
-  action_splitway: "'Way' splitsen"
-  action_waytags: tags instellen op een 'way'
-  advice_nocommonpoint: De 'ways' hebben geen gemeenschappelijk punt
-  advice_tagconflict: Tags komen niet overeen - a.u.b. nakijken (Z om ongedaan te maken)
-  advice_toolong: Te lang om te unlocken - splits de 'way' in kortere stukken
-  advice_waydragged: "'Way' verplaatst (Z om ongedaan te maken)"
+  action_movepoint: Punt verplaatsen
+  action_moveway: Weg verplaatsen
+  action_pointtags: Labels op een punt instellen
+  action_poitags: Labels op een POI instellen
+  action_reverseway: Wegrichting omdraaien
+  action_revertway: Wijzigingen aan een weg ongedaan maken
+  action_splitway: Weg splitsen
+  action_waytags: Label op een weg instellen
+  advanced: Uitgebreid
+  advanced_close: Wijzigingenset sluiten
+  advanced_history: Weggeschiedenis
+  advanced_maximise: Venster maximaliseren
+  advanced_minimise: Venster minimaliseren
+  advanced_parallel: Parallelle weg
+  advanced_tooltip: Gevorderde bewerkingen
+  advanced_undelete: Verwijdering ongedaan maken
+  advice_bendy: Er zijn te veel bochten om recht te maken (SHIFT om toch uit te voeren)
+  advice_deletingway: Weg verwijderen (Z om ongedaan te maken)
+  advice_nocommonpoint: De wegen hebben geen gemeenschappelijk punt
+  advice_revertingway: Teruggaan naar de laatst opgeslagen weg (Z om ongedaan te maken)
+  advice_tagconflict: De labels komen niet overeen. Controleer uw invoer (Z om ongedaan te maken)
+  advice_toolong: Te lang om te unlocken - splits de weg in kortere stukken
+  advice_uploadempty: Er is niets te uploaden
+  advice_uploadfail: De upload is afgebroken
+  advice_uploadsuccess: Alle gegevens zijn geüpload
+  advice_waydragged: Weg verplaatst (Z om ongedaan te maken)
   cancel: Annuleren
+  closechangeset: Wijzigingenset aan het sluiten
+  conflict_download: Bestaande versie downloaden
+  conflict_overwrite: Bestaande versie overschrijven
+  conflict_poichanged: Sinds u begonnen bent met bewerken, heeft iemand anders het punt $1$2 gewijzigd.
+  conflict_relchanged: Sinds u begonnen bent met bewerken, heeft iemand anders de relatie $1$2 gewijzigd.
+  conflict_visitpoi: Klik 'OK' om het punt weer te geven.
+  conflict_visitway: Klik 'OK' om de weg weer te geven.
+  conflict_waychanged: Sinds u begonnen bent met bewerken, heeft iemand anders de weg $1$2 gewijzigd.
   createrelation: Nieuwe relatie maken
+  custom: "Aangepast:"
   delete: Verwijderen
   deleting: verwijder
   drag_pois: Sleep POI's naar de kaart en zet ze neer
   editinglive: Live bewerken
   editingoffline: Offline bewerken
-  emailauthor: \n\nStuur een mail naar richard\@systemeD.net met een bug report, schrijf wat je aan het doen was.
-  error_connectionfailed: "Sorry - de verbinding met de server is verbroken. Recente veranderingen zijn misschien niet opgeslagen.\n\nOpnieuw proberen?"
+  emailauthor: \n\nStuur altublieft een e-mail naar richard\@systemeD.net met een probleemrapport waarin u beschrijft wat u aan het doen was.
+  error_anonymous: U kunt geen contact opnemen met een anonieme mapper.
+  error_connectionfailed: Sorry. De verbinding met de server is verbroken. Recente veranderingen zijn misschien niet opgeslagen.\n\nOpnieuw proberen?
   error_nopoi: POI niet gevonden (hebt u de kaart weggeschoven?), kan dus niet ongedaan maken.
-  error_nosharedpoint: De 'ways' $1 en $2 hebben geen gemeenschappelijk punt meer, dus ik kan het splitsen niet ongedaan maken.
-  error_noway: "'Way' $1 niet gevonden (hebt u de kaart weggeschoven?), kan dus niet ongedaan maken."
+  error_nosharedpoint: De wegen $1 en $2 hebben geen gemeenschappelijk punt meer. De splitsing kan niet ongedaan gemaakt worden.
+  error_noway: De weg $1 kan niet gevonden worden (hebt u de kaart weggeschoven?). Ongedaan maken is niet mogelijk.
+  error_readfailed: De server van OpenStreetMap gaf geen antwoord op het verzoek gegevens te leveren.\n\nWilt u het nog een keer proberen?
   existingrelation: Toevoegen aan bestaande relatie
   findrelation: Relatie zoeken met
-  gpxpleasewait: Even geduld alstublieft, terwijl de GPX trace wordt verwerkt
+  gpxpleasewait: Even geduld alstublieft. De GPX-trace wordt verwerkt.
+  heading_drawing: Tekenen
+  heading_introduction: Inleiding
+  heading_quickref: Snelle hints
+  heading_tagging: Labelen
+  heading_troubleshooting: Problemen oplossen
+  help: Help
   hint_drawmode: Klik om een nieuw punt toe te voegen\ndubbelklik/enter\n om de lijn te stoppen
-  hint_loading: Bezig de 'ways' te laden
-  hint_overendpoint: "Eindpunt van een way:\nKlik om dit punt toe te voegen\nShift-klik om beide ways samen te voegen"
-  hint_overpoint: "Punt:\nKlik om dit punt toe te voegen"
-  hint_pointselected: Punt geselecteerd\n(shift-klik op het punt om een nieuwe lijn te\nbeginnen)
+  hint_loading: Wegen laden
+  hint_overendpoint: Eindpunt van een weg ($1)\nKlik om dit punt toe te voegen\nSHIFT+klik om beide wegen samen te voegen
+  hint_overpoint: Over punt ($1)\nKlik om dit punt toe te voegen
+  hint_pointselected: Het punt is geselecteerd\n(SHIFT+klik op het punt om een nieuwe lijn te\nbeginnen)
+  hint_saving: gegevens opslaan
+  hint_saving_loading: gegevens laden en opslaan
+  login_pwd: "Wachtwoord:"
+  login_retry: Het aanmelden is mislukt. Probeer het nog een keer.
+  login_title: Het was niet mogelijk om aan te melden
+  login_uid: "Gebruiker:"
+  more: Meer
+  newchangeset: \nProbeer het opnieuw. Potlatch begint dan met een nieuwe wijzigingenset.
+  nobackground: Geen achtergrond
   norelations: Geen relaties in huidig gebied
+  offset_broadcanal: Breed kanaalsleeppad
+  offset_dual: Dubbelbaans weg (D2)
+  offset_motorway: Autosnelweg (D3)
   ok: OK
   openchangeset: Changeset wordt geopend...
   option_custompointers: Pen- en handcursors gebruiken
   option_fadebackground: Achtergrond lichter maken
+  option_noname: Onbenoemde wegen uitlichten
+  option_photo: "KML bij foto:"
+  option_thinareas: Dunnere lijnen gebruiken voor gebieden
   option_thinlines: Altijd dunne lijnen gebruiken
   option_warnings: Floating warnings weergeven
   point: Punt
   prompt_addtorelation: Voeg $1 toe aan een relatie
   prompt_changesetcomment: "Typ hier een beschrijving van je wijzigingen:"
+  prompt_closechangeset: Wijzigingenset $1 sluiten
+  prompt_createparallel: Parallelle weg aanmaken
   prompt_editlive: Direct bewerken
   prompt_editsave: Bewerken en opslaan
   prompt_helpavailable: Nieuwe gebruiker? Kijk linksonder voor hulp.
   prompt_revertversion: "Teruggaan naar een oudere versie:"
   prompt_savechanges: Wijzigingen opslaan
-  prompt_taggedpoints: Enkele punten op deze 'way' hebben tags. Wil je hem zeker verwijderen?
-  prompt_track: Converteer uw gps-tracks in 'ways' om deze te gebruiken
+  prompt_taggedpoints: Sommige punten op deze weg hebben labels. Echt verwijderen?
+  prompt_track: GPS-tracks naar wegen converteren
   prompt_welcome: Welkom bij OpenStreetMap!
+  retry: Opnieuw proberen
   save: Opslaan
   tip_addrelation: Voeg toe aan een relatie
-  tip_addtag: Voeg een nieuwe tag toe
+  tip_addtag: Nieuw label toevoegen
   tip_alert: Foutmelding - Klik voor meer details
-  tip_anticlockwise: Gesloten 'way' die tegen de klok ingaat - Klik om om te draaien
-  tip_clockwise: Gesloten 'way' die met de klok meegaat - Klik om om te draaien
-  tip_direction: Richting van de 'way' - Klik om de richting om te draaien
-  tip_gps: Laat de gps-tracks zien (G)
+  tip_anticlockwise: Tegen de klok in draaiende weg. Klik om om te draaien
+  tip_clockwise: Met de klok mee draaiende weg. Klik om om te draaien
+  tip_direction: Richting van de weg. Klik om de richting om te draaien
+  tip_gps: GPS-tracks weergeven (G)
   tip_noundo: Niets ongedaan te maken
   tip_options: Opties (kies de achtergrondkaart)
-  tip_presettype: Kies welk type presets in het menu getoond moet worden.
-  tip_repeattag: Herhaal de tags van de vorige geselecteerde 'way' (R)
+  tip_photo: Afbeeldingen laden
+  tip_presettype: Kies welke typen voorkeuren in het menu worden weergegeven.
+  tip_repeattag: Labels van de vorige geselecteerde weg herhalen (R)
   tip_revertversion: Kies naar welke versie moet worden teruggegaan
   tip_selectrelation: Toevoegen aan gekozen route
-  tip_splitway: Splits de 'way' op het geselecteerde punt (X)
+  tip_splitway: Weg op het geselecteerde punt splitsen (X)
+  tip_tidy: Punten in weg opschonen (T)
   tip_undo: $1 ongedaan maken (Z)
-  way: "'Way'"
+  uploading: Bezig met uploaden...
+  way: Weg

config/potlatch/locales/no.yml

@@ -1,3 +1,6 @@
+# Messages for Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Exported from translatewiki.net
+# Export driver: syck
 "no": 
   a_poi: $1 et POI
   a_way: $1 en linje

config/potlatch/locales/pt-BR.yml

@@ -1,3 +1,6 @@
+# Messages for Brazilian Portuguese (Português do Brasil)
+# Exported from translatewiki.net
+# Export driver: syck
 pt-BR: 
   a_poi: $1 um ponto de interesse (POI)
   a_way: $1 um caminho

config/potlatch/locales/ro.yml

@@ -1,3 +1,6 @@
+# Messages for Romanian (Română)
+# Exported from translatewiki.net
+# Export driver: syck
 ro: 
   action_createpoi: creare punct de interes (POI)
   action_movepoi: Miscă POI

config/potlatch/locales/ru.yml

@@ -1,8 +1,14 @@
+# Messages for Russian (Русский)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Александр Сигачёв
 ru: 
-  a_poi: $1 точка интереса (POI)
-  a_way: $1 линия
+  a_poi: $1 точки интереса (POI)
+  a_way: $1 линию
   action_addpoint: добавление точки в конец линии
   action_cancelchanges: отмена изменений к
+  action_changeway: изменения в линии
+  action_createparallel: создание параллельных линий
   action_createpoi: создание точки интереса (POI)
   action_deletepoint: удаление точки
   action_insertnode: добавление точки в линию
@@ -10,68 +16,130 @@ ru:
   action_movepoi: перемещение точки интереса (POI)
   action_movepoint: перемещение точки
   action_moveway: перемещение линии
-  action_pointtags: установку тегов для точки
-  action_poitags: установку тегов для точки интереса (POI)
+  action_pointtags: установка меток для точки
+  action_poitags: установка меток для точки интереса
   action_reverseway: изменение направления линии
-  action_splitway: разбиение линии
-  action_waytags: установку тегов для линии
+  action_revertway: отмена линии
+  action_splitway: разделение линии
+  action_waytags: установка меток на линию
+  advanced: Дополнительно
+  advanced_close: Закрыть набор изменений
+  advanced_history: История линии
+  advanced_inspector: Инспектор
+  advanced_maximise: Развернуть окно
+  advanced_minimise: Свернуть окно
+  advanced_parallel: Параллельная линия
+  advanced_tooltip: Расширенные действия по редактированию
+  advanced_undelete: Восстановить
+  advice_bendy: Слишком большой изгиб для спрямления (SHIFT для выполнения)
+  advice_deletingpoi: Удаление точки интереса (Z для отмены)
+  advice_deletingway: Удаление линии (Z для отмены)
   advice_nocommonpoint: Линии не имеют общей точки
-  advice_tagconflict: Теги не совпадают, пожалуйста проверьте (Z для отмены)
+  advice_revertingpoi: Возвращение к последней сохранённой точке интереса (Z для отмены)
+  advice_revertingway: Возвращение к последней сохранённой линии (Z для отмены)
+  advice_tagconflict: Метки не совпадают, пожалуйста проверьте (Z для отмены)
   advice_toolong: Длина слишком велика. Пожалуйста, разделите на более короткие линии
+  advice_uploadempty: Нет данных для загрузки
+  advice_uploadfail: Загрузка остановлена
+  advice_uploadsuccess: Все данные успешно загружены
   advice_waydragged: Линия передвинута (Z для отмены)
   cancel: Отмена
+  closechangeset: Закрытие набора изменений
+  conflict_download: Загрузить чужую версию
+  conflict_overwrite: Записать поверх чужой версии
+  conflict_poichanged: После того, как вы начали редактирование, кто-то изменил точку $1$2.
+  conflict_relchanged: После того, как вы начали редактирование, кто-то изменил отношение $1$2.
+  conflict_visitpoi: Нажмите «OK», чтобы увидеть точку.
+  conflict_visitway: Нажмите «OK», чтобы показать линию.
+  conflict_waychanged: После того, как вы начали редактирование, кто-то изменил линию $1$2.
   createrelation: Создать новое отношение
+  custom: "Особая:"
   delete: Удалить
   deleting: удаление
   drag_pois: Перетащите объекты на карту
-  editinglive: Ред. вживую
-  editingoffline: Ред. оффлайн
-  emailauthor: "\n\nПожалуйста, отправьте сообщение об ошибке (на английском языке) на электронную почту: richard\\@systemeD.net, с указанием того, какие действия вы совершали."
-  error_connectionfailed: "Извините, соединение с сервером OpenStreetMap разорвано. Все текущие изменения не были сохранены.\n\nПопробовать ещё раз?"
-  error_nopoi: Точка интереса(POI) не найдена (возможно вы отошли в сторону?), поэтому невозможно отменить.
+  editinglive: Править вживую
+  editingoffline: Правка оффлайн
+  emailauthor: "\n\nПожалуйста, отправьте сообщение об ошибке на электронную почту: richard\@systemeD.net, с указанием того, какие действия вы совершали."
+  error_anonymous: Вы не можете связаться с анонимным картографом.
+  error_connectionfailed: Извините, соединение с сервером OpenStreetMap разорвано. Все текущие изменения не были сохранены.\n\nПопробовать ещё раз?
+  error_nopoi: Точка интереса (POI) не найдена (возможно вы отошли в сторону?), поэтому не может быть отменена.
   error_nosharedpoint: Линии $1 и $2 больше не содержат общих точек, поэтому невозможно отменить разделение.
   error_noway: Линия $1 не найдена (возможно вы отошли в сторону?), поэтому невозможно отменить.
+  error_readfailed: Извините, сервер OpenStreetMap не ответил на запрос данных.\n\nЖелаете ли попробовать ещё раз?
   existingrelation: Добавить в существующее отношение
-  findrelation: Найти отношения
+  findrelation: Найти отношения, содержащие
   gpxpleasewait: Пожалуйста, подождите — GPX-треки обрабатываются.
+  heading_drawing: Рисование
+  heading_introduction: Введение
+  heading_pois: Начало работы
+  heading_quickref: Краткий справочник
+  heading_surveying: Геодезия
+  heading_tagging: Пометка
+  heading_troubleshooting: Устранение проблем
   help: Справка
-  hint_drawmode: кликните для добавления точки,\nдвойной клик или Enter\nчтобы закончить линию
-  hint_loading: загрузка линий
+  hint_drawmode: нажмите для добавления точки,\nдвойной щелчок или Enter\nчтобы закончить линию
+  hint_loading: загрузка данных
   hint_overendpoint: над конечной точкой\nclick для соединения\nshift-click для слияния
-  hint_overpoint: над точкой\nclick для соединения"
-  hint_pointselected: точка выбрана\n(кликните с нажатым Shift на точку\nчтобы начать новую линию)
+  hint_overpoint: над точкой ($1)\nнажмите для соединения
+  hint_pointselected: точка выбрана\n(нажмите с Shift на точку\nчтобы начать новую линию)
+  hint_saving: сохранение данных
+  hint_saving_loading: загрузка / сохранение данных
+  login_pwd: "Пароль:"
+  login_retry: Ваш логин с сайта не был распознан. Пожалуйста, попробуйте ещё раз.
+  login_title: Не удаётся войти
+  login_uid: "Имя пользователя:"
+  more: Ещё
+  newchangeset: \nПожалуйста, повторите попытку. Potlatch начнёт новый набор изменений.
+  nobackground: Без подложки
   norelations: Нет отношений в текущей области
-  openchangeset: Откр. изменений
+  offset_broadcanal: Широкая набережная канала
+  offset_choose: Выбор смещения (m)
+  offset_dual: Шоссе с разделительной полосой (D2)
+  offset_motorway: Автомагистраль (D3)
+  offset_narrowcanal: Набережная узкого канала
+  ok: OK
+  openchangeset: Открытие набора изменений
   option_custompointers: Использовать курсоры пера и руки
+  option_external: "Внешний запуск:"
   option_fadebackground: Светлый фон
+  option_noname: Подсвечивать дороги без названий
+  option_photo: "Фото KML:"
+  option_thinareas: Использовать тонкие линии для зон
   option_thinlines: Использовать тонкие линии на всех масштабах
+  option_tiger: Подсвечивать неизменённые TIGER
   option_warnings: Показывать всплывающие предупреждения
   point: Точка
   prompt_addtorelation: Добавить $1 в отношение
   prompt_changesetcomment: "Опишите ваши изменения:"
-  prompt_editlive: Ред. вживую
-  prompt_editsave: Ред. и сохр.
-  prompt_helpavailable: Вы новичок? Воспользуйтесь кнопкой 'Справка'.
+  prompt_closechangeset: Закрытие набора изменений $1
+  prompt_createparallel: Создание параллельной линии
+  prompt_editlive: Правка вживую
+  prompt_editsave: Правка с сохранением
+  prompt_helpavailable: Вы новичок? Воспользуйтесь кнопкой «Справка».
   prompt_launch: Перейти по внешней ссылке
-  prompt_revertversion: "Восстановить ранее сохраненную версию:"
-  prompt_savechanges: Сохр. измен.
-  prompt_taggedpoints: Некоторые точки данной линии содержат теги. Действительно удалить?
-  prompt_track: Конвертировать GPS-трек в линию(заблокированную), для редактирования.
+  prompt_revertversion: "Вернуться к ранее сохранённой версии:"
+  prompt_savechanges: Сохранение изменений
+  prompt_taggedpoints: Некоторые точки данной линии содержат метки. Действительно удалить?
+  prompt_track: Преобразовать GPS-трек в линии
   prompt_welcome: Добро пожаловать в OpenStreetMap!
-  save: Сохр.
-  tip_addrelation: Добавить новое отношение (relation)
-  tip_addtag: Добавить новый тег
+  retry: Повторить
+  save: Сохранить
+  tip_addrelation: Добавить отношение
+  tip_addtag: Добавить новую метку
   tip_alert: Произошла ошибка — нажмите для получения подробностей
-  tip_anticlockwise: Замкнутая линия против часовой стрелки - изменить на противоположное
-  tip_clockwise: Замкнутая линия по часовой стрелке - изменить на противоположное
+  tip_anticlockwise: Замкнутая линия против часовой стрелки — изменить на противоположное
+  tip_clockwise: Замкнутая линия по часовой стрелке — изменить на противоположное
   tip_direction: Направление линии — изменить на противоположное
-  tip_gps: Показать GPS треки (G)
+  tip_gps: Показать GPS-треки (G)
   tip_noundo: Нечего отменять
-  tip_options: Задать настройки (выбрать карту-подложку)
-  tip_presettype: Выберите, какой набор тегов отображать в меню.
-  tip_repeattag: Повторить теги с предыдущей выбранной линии (R)
+  tip_options: Задание настроек (выбор карты-подложки)
+  tip_photo: Загрузка фотографий
+  tip_presettype: Выберите, какой набор меток отображать в меню.
+  tip_repeattag: Повторить метки с предыдущей выбранной линии (R)
   tip_revertversion: Выберите версию для восстановления
-  tip_selectrelation: Добавить в выбранное отношение
+  tip_selectrelation: Добавить в выбранный маршрут
   tip_splitway: Разделить линию в текущей точке (X)
+  tip_tidy: Убрать точки в линии (T)
   tip_undo: Отменить $1 (Z)
+  uploading: Загрузка…
   way: Линия

config/potlatch/locales/sv.yml

@@ -1,3 +1,6 @@
+# Messages for Swedish (Svenska)
+# Exported from translatewiki.net
+# Export driver: syck
 sv: 
   a_poi: $1 en POI
   a_way: $1 en väg

config/potlatch/locales/tr.yml

@@ -1,3 +1,6 @@
+# Messages for Turkish (Türkçe)
+# Exported from translatewiki.net
+# Export driver: syck
 tr: 
   a_poi: "POI: $1"
   a_way: "yol: $1"
@@ -26,7 +29,7 @@ tr:
   drag_pois: POI'leri sürükle-bırak
   editinglive: Canlı düzenleniyor
   editingoffline: Çevrimdışı düzenleniyor
-  emailauthor: "\n\nLütfen bu hata konusunda richard\\@systemeD.net'e bir e.posta at"
+  emailauthor: "\n\nLütfen bu hata konusunda richard\@systemeD.net'e bir e.posta at"
   error_connectionfailed: Maalesef OpenStreetMap sunucusuyla bağlantı koptu. Son değişiklikler kaydedilmedi.\n\nBir daha denemek ister misin?
   error_nopoi: POI bulunamadı (belki başka bir yere taşıdınız), bundan dolayı geri alamıyorum.
   error_nosharedpoint: $1 ve $2 yollarının paylaştıkları ortak bir nokta artık yok, bu yüzden bölmeyi geri alamıyorum.

config/potlatch/locales/vi.yml

@@ -1,3 +1,6 @@
+# Messages for Vietnamese (Tiếng Việt)
+# Exported from translatewiki.net
+# Export driver: syck
 vi: 
   a_poi: $1 địa điểm
   a_way: $1 lối

config/potlatch/locales/zh-HANT.yml

@@ -1,3 +1,6 @@
+# Messages for Traditional Chinese (‪中文(繁體)‬)
+# Exported from translatewiki.net
+# Export driver: syck
 zh-HANT: 
   a_poi: $1 POI
   a_way: $1 路徑

public/api/crossdomain.xml

@@ -3,8 +3,5 @@
 
 <cross-domain-policy>
 	<allow-access-from domain="*"/>
-	<allow-http-request-headers-from domain="*" headers="Authorization"/>
-	<allow-http-request-headers-from domain="*.openstreetmap.org" headers="*"/>
-	<allow-http-request-headers-from domain="*.openstreetmap.net" headers="*"/>
-	<allow-http-request-headers-from domain="*.openstreetmap.com" headers="*"/>
+	<allow-http-request-headers-from domain="*" headers="*"/>
 </cross-domain-policy>

public/oauth/crossdomain.xml

@@ -3,8 +3,5 @@
 
 <cross-domain-policy>
 	<allow-access-from domain="*"/>
-	<allow-http-request-headers-from domain="*" headers="Authorization"/>
-	<allow-http-request-headers-from domain="*.openstreetmap.org" headers="*"/>
-	<allow-http-request-headers-from domain="*.openstreetmap.net" headers="*"/>
-	<allow-http-request-headers-from domain="*.openstreetmap.com" headers="*"/>
+	<allow-http-request-headers-from domain="*" headers="*"/>
 </cross-domain-policy>

script/locale/diff

@@ -6,7 +6,6 @@ use YAML::Syck qw(Dump LoadFile);
 use Test::Differences;
 use Pod::Usage ();
 use Getopt::Long ();
-use File::Basename qw(fileparse);
 
 =head1 NAME
 
@@ -92,6 +91,7 @@ Getopt::Long::Parser->new(
     'untranslated-values' => \my $untranslated_values,
     'untranslated-values-all' => \my $untranslated_values_all,
     'validate-variables' => \my $validate_variables,
+    'reconstruct' => \my $reconstruct,
 ) or help();
 
 # --keys is the default
@@ -101,25 +101,37 @@ $keys = 1 if not $untranslated_values_all and not $untranslated_values and not $
 help() if $help;
 
 # If we're not given two .yml files
-help() if (@ARGV != 2 or (!-f $ARGV[0] or !-f $ARGV[1])) and not $dump_flat;
+help() if (@ARGV != 2 or (!-f $ARGV[0] or !-f $ARGV[1])) and not $dump_flat || $reconstruct;
 
 my ($from, $to) = @ARGV;
 
 my $from_data = LoadFile($from);
-my $from_parsed = { iterate($from_data->{fileparse($from, qr/\.[^.]*/)}) };
+my $from_parsed = { iterate($from_data->{basename($from)}) };
 
 if ($dump_flat)
 {
-    # Mark as UTF-8
-    map { if (ref $_ eq 'ARRAY') { map { utf8::decode($_) } @$_ } else {  utf8::decode($_) } } values %$from_parsed;
+    mark_utf8($from_parsed);
 
     print Dump $from_parsed;
 
     exit 0;
 }
 
+if ($reconstruct) {
+    mark_utf8($from_parsed);
+
+    my %out;
+    while (my ($k, $v) = each %$from_parsed) {
+        insert_string_deep(\%out, $k, $v);
+    }
+
+    print Dump { basename($from) => \%out };
+
+    exit 0;
+}
+
 my $to_data   = LoadFile($to);
-my $to_parsed = { iterate($to_data->{fileparse($to, qr/\.[^.]*/)}) };
+my $to_parsed = { iterate($to_data->{basename($to)}) };
 
 if ($keys)
 {
@@ -131,7 +143,7 @@ elsif ($untranslated_values or $untranslated_values_all)
 
     # Prune according to blacklist
     if ($untranslated_values) {
-        @untranslated = prune_untranslated_with_blacklist(scalar(fileparse($to, qr/\.[^.]*/)), @untranslated);
+        @untranslated = prune_untranslated_with_blacklist(basename($to), @untranslated);
     }
 
     say for @untranslated;
@@ -234,6 +246,52 @@ sub iterate
     return @ret;
 }
 
+# $s = 'foo.bar.baz.spam.eggs.ham'; $h = \%h; $h = $h->{$_} = {} for split /\./, $s; \%h
+# ==> {foo => {bar => {baz => {spam => {eggs => {ham => {}}}}}}}
+sub insert_string_deep {
+    my ($h, $ks, $v) = @_;
+    my $p = \$h; $p = \$$p->{$_} for split /\./, $ks;
+    $$p = $v;
+}
+
+# sub insert_string_deep
+# {
+#     my ($hash, $key, $value) = @_;
+#
+#     my @key = split /\./, $key;
+#     my $h = $hash;
+#
+#     my $i = 0;
+#     for my $k (@key) {
+#         $i ++;
+#         if ($i == @key) {
+#             $h->{$k} = $value;
+#         } else {
+#             if (ref $h->{$k}) {
+#                 $h = $h->{$k};
+#             } else {
+#                 $h = $h->{$k} = {};
+#             }
+#         }
+#     }
+# }
+
+sub basename
+{
+    my $name = shift;
+    $name =~ s[\..*?$][];
+    $name =~ s[.*/][];
+    $name;
+}
+
+sub mark_utf8
+{
+    my ($hash) = @_;
+
+    # Mark as UTF-8
+    map { if (ref $_ eq 'ARRAY') { map { utf8::decode($_) } @$_ } else {  utf8::decode($_) } } values %$hash;
+}
+
 sub help
 {
     my %arg = @_;

script/locale/merge-from-translatewiki

@@ -60,6 +60,11 @@ The locales dir we'll merge stuff into. F<config/locales> by default.
 
 Only import translations that don't exists for us yet.
 
+=item --cache
+
+Write a L<Storable> cache for things downloaded from Translatewiki and
+use it if it exists.
+
 =back
 
 =head1 AUTHOR
@@ -75,6 +80,7 @@ Getopt::Long::Parser->new(
     'h|help' => \my $help,
     'locales-dir=s' => \(my $locales_dir = 'config/locales'),
     'only-new' => \my $only_new,
+    'cache' => \my $cache,
 ) or help();
 
 # On --help
@@ -196,6 +202,16 @@ for my $translatewiki_lang (sort @translatewiki_languages_codes) {
             }
         }
 
+        # There are a bunch of keys on Translatewiki that are
+        # equivalent to English for some reason. Probably because they
+        # were there at import time. Nuke them.
+        while (my ($new_k, $new_v) = each %new) {
+            if (exists $en{ $new_k } and $en{ $new_k } eq $new_v) {
+                #say "Purging dupe in $rails_lang: $new_k=$new_v";
+                delete $new{ $new_k };
+            }
+        }
+
         my $expanded = expand_hash( \%new );
         my $out = +{ $rails_lang => $expanded };
         spit_out($out_file, $out);
@@ -302,9 +318,11 @@ sub get_translatewiki_translations
     my @languages = @_;
 
     my $cache_file = "/tmp/merge-from-translatewiki.storable";
-    if (-f $cache_file) {
-        my $cache = retrieve($cache_file);
-        return %$cache;
+    if ($cache) {
+        if (-f $cache_file) {
+            my $c = retrieve($cache_file);
+            return %$c;
+        }
     }
 
     my %translatewiki_languages;
@@ -321,7 +339,9 @@ sub get_translatewiki_translations
         $translatewiki_languages{$lang} = $flat_data;
     }
 
-    store \%translatewiki_languages, $cache_file;
+    if ($cache) {
+        store \%translatewiki_languages, $cache_file;
+    }
 
     return %translatewiki_languages;
 }
@@ -331,7 +351,7 @@ sub get_language_from_translatewiki
     my ($lang) = @_;
     my $mech = WWW::Mechanize->new;
 
-    $mech->get("http://translatewiki.net/w/i.php?title=Special%3ATranslate&task=export-to-file&group=out-osm&language=$lang");
+    $mech->get("http://translatewiki.net/w/i.php?title=Special%3ATranslate&task=export-to-file&group=out-osm-site&language=$lang");
 
     die "Couldn't get lang $lang lang from Translatewiki" unless $mech->success;
 
@@ -346,7 +366,7 @@ sub translatewiki_languages
 {
     my $mech = WWW::Mechanize->new;
 
-    $mech->get('http://translatewiki.net/wiki/Translating:OpenStreetMap/stats/trunk');
+    $mech->get('http://translatewiki.net/wiki/Translating:OpenStreetMap/stats/trunk/site');
 
     die "Couldn't get translatewiki table" unless $mech->success;
 

script/locale/update-languages

@@ -0,0 +1,52 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Encode;
+use HTML::TreeBuilder;
+use LWP::UserAgent;
+use YAML::Syck;
+
+$YAML::Syck::Headless = 1;
+$YAML::Syck::ImplicitUnicode = 1;
+$YAML::Syck::SortKeys = 1;
+
+my $languages = LoadFile("config/languages.yml");
+
+my $ua = LWP::UserAgent->new(env_proxy => 1);
+my $response = $ua->get("http://translatewiki.net/wiki/User:Siebrand/langs?uselang=en");
+
+die $response->message unless $response->is_success;
+
+my $root = HTML::TreeBuilder->new_from_content($response->decoded_content);
+my $content = $root->look_down("_tag" => "div", "id" => "mw_contentholder");
+my $list = $content->look_down("_tag" => "ul");
+
+for my $item ($list->look_down("_tag" => "li"))
+{
+    my $language = $item->as_trimmed_text;
+
+    if ($language =~ /^([a-z]+(?:-[a-z]+)*) +- +(.*) +- +(.*)$/i)
+    {
+        my $code = $1;
+        my $english_name = decode_utf8($2);
+        my $native_name = decode_utf8($3);
+
+        next if $english_name =~ /\(deprecated:[a-z]+(?:-[a-z]+)*\)$/;
+
+        if (length($code) == 2 || -f "config/locales/${code}.yml")
+        {
+            $languages->{$code}->{english} = $english_name;
+            $languages->{$code}->{native} = $native_name;
+        }
+    }
+    else
+    {
+        die "Can't parse: $language";
+    }
+}
+
+DumpFile("config/languages.yml", $languages);
+
+exit 0;

vendor/plugins/rails-i18n/locale/bg.yml

@@ -0,0 +1,190 @@
+# Bulgarian localization for Ruby on Rails 2.2+
+# by Samson Behar <master.webmaster.master@gmail.com>
+#
+# Минимална локализация на приложения за поддръжка на български език.
+ 
+bg:
+  date:
+    formats:
+      default: "%d.%m.%Y"
+      short: "%d %b"
+      long: "%d %B %Y"
+ 
+    day_names: [неделя, понеделник, вторник, сряда, четвъртък, петък, събота]
+    standalone_day_names: [Неделя, Понеделник, Вторник, Сряда, Четвъртък, Петък, Събота]
+    abbr_day_names: [Нд, Пн, Вт, Ср, Чт, Пт, Сб]
+ 
+    month_names: [Януари, Февруари, Март, Април, Май, Юни, Юли, Август, Септември, Октомври, Ноември, Декември]
+    abbr_month_names: [яну., фев., март, апр., май, юни, юли, авг., сеп., окт., ноем., дек.]
+ 
+    order: [ :day, :month, :year ]
+ 
+  time:
+    formats:
+      default: "%a, %d %b %Y, %H:%M:%S %z"
+      short: "%d %b, %H:%M"
+      long: "%d %B %Y, %H:%M"
+ 
+    am: "преди обяд"
+    pm: "следобед"
+ 
+  number:
+    format:
+      separator: "."
+      delimiter: " "
+      precision: 3
+      
+    currency:
+      format:
+        format: "%n %u"
+        unit: "лв."
+        separator: "."
+        delimiter: " "
+        precision: 2
+        
+    percentage:
+      format:
+        delimiter: ""
+        
+    precision:
+      format:
+        delimiter: ""
+        
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      # Rails 2.2
+      # storage_units: [байт, КБ, МБ, ГБ, ТБ]
+ 
+      # Rails 2.3
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one: "байт"
+            few: "байта"
+            many: "байт"
+            other: "байта"
+          kb: "КБ"
+          mb: "МБ"
+          gb: "ГБ"
+          tb: "ТБ"
+ 
+  datetime:
+    distance_in_words:
+      half_a_minute: "по-малко от минута"
+      less_than_x_seconds:
+        one: "по-малко от {{count}} секунди"
+        few: "по-малко от {{count}} секунди"
+        many: "по-малко от {{count}} секунди"
+        other: "по-малко от {{count}} секунди"
+      x_seconds:
+        one: "{{count}} секунда"
+        few: "{{count}} секунди"
+        many: "{{count}} секунди"
+        other: "{{count}} секунди"
+      less_than_x_minutes:
+        one: "по-малко от {{count}} минута"
+        few: "по-малко от {{count}} минути"
+        many: "по-малко от {{count}} минути"
+        other: "по-малко от {{count}} минути"
+      x_minutes:
+        one: "{{count}} минута"
+        few: "{{count}} минути"
+        many: "{{count}} минути"
+        other: "{{count}} минути"
+      about_x_hours:
+        one: "около {{count}} час"
+        few: "около {{count}} часа"
+        many: "около {{count}} часа"
+        other: "около {{count}} часа"
+      x_days:
+        one: "{{count}} ден"
+        few: "{{count}} дни"
+        many: "{{count}} дни"
+        other: "{{count}} дена"
+      about_x_months:
+        one: "около {{count}} месеца"
+        few: "около {{count}} месеца"
+        many: "около {{count}} месеца"
+        other: "около {{count}} месеца"
+      x_months:
+        one: "{{count}} месец"
+        few: "{{count}} месеца"
+        many: "{{count}} месеци"
+        other: "{{count}} месеца"
+      about_x_years:
+        one: "около {{count}} година"
+        few: "около {{count}} години"
+        many: "около {{count}} години"
+        other: "около {{count}} години"
+      over_x_years:
+        one: "над {{count}} година"
+        few: "над {{count}} години"
+        many: "над {{count}} години"
+        other: "над {{count}} години"
+    prompts:
+      year: "Година"
+      month: "Месец"
+      day: "Ден"
+      hour: "Часа"
+      minute: "Минути"
+      second: "Секунди"
+ 
+  activerecord:
+    errors:
+      template:
+        header:
+          one: "{{model}}: записа неуспешен заради {{count}} грешка"
+          few: "{{model}}: записа неуспешен заради {{count}} грешки"
+          many: "{{model}}: записа неуспешен заради {{count}} грешки"
+          other: "{{model}}: записа неуспешен заради {{count}} грешки"
+ 
+        body: "Възникнаха проблеми при следните полета:"
+ 
+      messages:
+        inclusion: "съдържа непредвидена стойност"
+        exclusion: "съдържа предварително зададена стойност"
+        invalid: "съдържа невярна стойност"
+        confirmation: "не съответства на потвърждението"
+        accepted: "трябва да се потвърди"
+        empty: "не може да е празно"
+        blank: "не може да е без стойност"
+        too_long:
+          one: "е с прекалена дължина (не може да е повече от {{count}} символ)"
+          few: "е с прекалена дължина (не може да е повече от {{count}} символа)"
+          many: "е с прекалена дължина (не може да е повече от {{count}} символи)"
+          other: "е с прекалена дължина (не може да е повече от {{count}} символа)"
+        too_short:
+          one: "е с недостатъчна дължина (не может быть меньше {{count}} символ)"
+          few: "е с недостатъчна дължина (не может быть меньше {{count}} символа)"
+          many: "е с недостатъчна дължина (не может быть меньше {{count}} символи)"
+          other: "е с недостатъчна дължина (не может быть меньше {{count}} символа)"
+        wrong_length:
+          one: "е с грешна дължина (трябва да е с дължина, равна на {{count}} символ)"
+          few: "е с грешна дължина (трябва да е с дължина, равна на {{count}} символа)"
+          many: "е с грешна дължина (трябва да е с дължина, равна на {{count}} символа)"
+          other: "е с грешна дължина (трябва да е с дължина,  равна на {{count}} символа)"
+        taken: "вече съществува"
+        not_a_number: "не е число"
+        greater_than: "може да е със стойност, по-голяма от {{count}}"
+        greater_than_or_equal_to: "може да е със стойност, по-голяма или равна на {{count}}"
+        equal_to: "може да е единствено със стойност, равна на {{count}}"
+        less_than: "може да е със стойност, по-малка от {{count}}"
+        less_than_or_equal_to: "може да е със стойност, по-голяма или равна на {{count}}"
+        odd: "може да е единствено четно"
+        even: "може да е единствено нечетно"
+ 
+  support:
+    array:
+      # Rails 2.2
+      sentence_connector: "и"
+      skip_last_comma: true
+      
+      # Rails 2.3
+      words_connector: ", "
+      two_words_connector: " и "
+      last_word_connector: " и "

vendor/plugins/rails-i18n/locale/bn-IN.yml

@@ -0,0 +1,180 @@
+# Benagli (India) translations for Rails
+# by Arindam Ghosh (makghosh@gmail.com)
+
+bn-IN:
+  number:
+    # Used in number_with_delimiter()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: "." 
+      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: "," 
+      # Number of decimals, behind the separator (1 with a precision of 2 gives: 1.00)
+      precision: 2
+
+    # Used in number_to_currency()
+    currency:
+      format:
+        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+        format: "%u %n" 
+        unit: "Rs." 
+        # These three are to override number.format and are optional
+        separator: "." 
+        delimiter: "," 
+        precision: 2
+
+    # Used in number_to_percentage()
+    percentage:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: "" 
+        # precision: 
+
+    # Used in number_to_precision()
+    precision:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: "" 
+        # precision:
+
+    # Used in number_to_human_size()
+    human:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: "" 
+        precision: 1
+      # Rails <= v2.2.2
+      # storage_units: [Bytes, KB, MB, GB, TB]
+      # Rails >= v2.3
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+  datetime:
+    distance_in_words:
+      half_a_minute: "অার্ধেক মিনিট" 
+      less_than_x_seconds:
+        one:  "১ সেকেন্ডর কম " 
+        other: "{{count}} সেকেন্ডের কম"
+      x_seconds:
+        one:  "১ সেকেন্ড" 
+        other: "{{count}} সেকেন্ড" 
+      less_than_x_minutes:
+        one:  "১ মিনিটের কম" 
+        other: "{{count}} মিনিটের কম" 
+      x_minutes:
+        one:  "১ মিনিট" 
+        other: "{{count}} মিনিট" 
+      about_x_hours:
+        one:  "প্রায় ১ ঘন্টা" 
+        other: "প্রায় {{count}} ঘন্টা" 
+      x_days:
+        one:  "১ দিন" 
+        other: "{{count}} দিন" 
+      about_x_months:
+        one:  "প্রায় ১ মাস" 
+        other: "প্রায় {{count}} মাস" 
+      x_months:
+        one:  "১ মাস" 
+        other: "{{count}} মাস" 
+      about_x_years:
+        one:  "প্রায় ১ বছর" 
+        other: "প্রায় {{count}} বছর" 
+      over_x_years:
+        one:  "১ বছরের বেশি" 
+        other: "{{count}} বছরের বেশি"
+    prompts:
+      year:   "বছর"
+      month:  "মাস"
+      day:    "দিন"
+      hour:   "ঘন্টা"
+      minute: "মিনিট"
+      second: "সেকেন্ড" 
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:   "১ টি ত্রুটির কারনে {{model}} সংরক্ষন করা সম্ভব হয়নি" 
+          other:  "{{count}} টি ত্রুটির কারনে {{model}} সংরক্ষন করা সম্ভব হয়নি" 
+        # The variable :count is also available
+        body: "এই ফিল্ডগুলোতে কিছু সমস্যা দেখা দিয়েছে:" 
+
+      # The values :model, :attribute and :value are always available for interpolation
+      # The value :count is available when applicable. Can be used for pluralization.
+      messages:
+        inclusion: "লিস্টে অন্তর্ভুক্ত নয়" 
+        exclusion: "রিসার্ভ করা অাছে" 
+        invalid: "সঠিক নয়" 
+        confirmation: "অনুমোদনের সঙ্গে মিলছে না"
+        accepted: "গ্রাহ্য করতে হবে"
+        empty: "খালি রাখা যাবে না"
+        blank: "ফাঁকা রাখা যাবে না"
+        too_long: "খুব বড়ো (সর্বোচ্চ {{count}} অক্ষর)"
+        too_short: "খুব ছোটো (সর্বনিম্ন {{count}} অক্ষর)"
+        wrong_length: "দৈর্ঘ্যটি সঠিক নয় ({{count}} অক্ষর হতে হবে)"
+        taken: "অাগেই নিয়ে নেওয়া হয়েছে"
+        not_a_number: "নম্বর নয়"
+        greater_than: "{{count}} থেকে বড়ো হতে হবে"
+        greater_than_or_equal_to: "{{count}} থেকে বড়ো অথবা তার সমান হতে হবে"
+        equal_to: "{{count}} এর সঙ্গে সমান হতে হবে"
+        less_than: "{{count}} থেকে ছোটো হতে হবে"
+        less_than_or_equal_to: "{{count}} থেকে ছোটো অথবা তার সমান হতে হবে"
+        odd: "বেজোড় হতে হবে"
+        even: "জোড় হতে হবে"
+
+        # Append your own errors here or at the model/attributes scope.
+
+      # models:
+        # Overrides default messages
+
+      # attributes:
+        # Overrides model and default messages.
+
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%e/%m/%Y"
+      short: "%e de %b" 
+      long: "%e de %B de %Y" 
+
+    day_names: [রবিবার, সোমবার, মঙ্গলবার, বুধবার, বৃহস্পতিবার, শুক্রবার, শনিবার]
+    abbr_day_names: [রবিবার, সোমবার, মঙ্গলবার, বুধবার, বৃহস্পতিবার, শুক্রবার, শনিবার]
+
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, জানুয়ারি, ফেব্রুয়ারি, মার্চ, এপ্রিল, মে, জুন, জুলাই, অগাস্ট, সেপ্টেমবার, অক্টোবার, নভেম্বার, ডিসেম্বার]
+    abbr_month_names: [~, জানুয়ারি, ফেব্রুয়ারি, মার্চ, এপ্রিল, মে, জুন, জুলাই, অগাস্ট, সেপ্টেমবার, অক্টোবার, নভেম্বার, ডিসেম্বার]
+    # Used in date_select and datime_select.
+    order: [ :year, :month, :day ]
+
+  time:
+    formats:
+      default: "%A, %e de %B de %Y %H:%M:%S %z"
+      short: "%e de %b %H:%M" 
+      long: "%e de %B de %Y %H:%M" 
+    am: "am" 
+    pm: "pm" 
+
+# Used in array.to_sentence.
+  support:
+    array:
+      # Rails <= v.2.2.2
+      # sentence_connector: "y"
+      # Rails >= v.2.3
+      words_connector: ", "
+      two_words_connector: " এবং "
+      last_word_connector: ", এবং "

vendor/plugins/rails-i18n/locale/ca-ES.yml

@@ -0,0 +1,155 @@
+# Catalan translations for Rails
+# by Emili Parreño (emili@eparreno.com - www.eparreno.com)
+ 
+ca:
+  number:
+    # Used in number_with_delimiter()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: "," 
+      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: "." 
+      # Number of decimals, behind the separator (1 with a precision of 2 gives: 1.00)
+      precision: 3
+ 
+    # Used in number_to_currency()
+    currency:
+      format:
+        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+        format: "%n %u" 
+        unit: "€" 
+        # These three are to override number.format and are optional
+        separator: "," 
+        delimiter: "." 
+        precision: 2
+ 
+    # Used in number_to_percentage()
+    percentage:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: "" 
+        # precision: 
+ 
+    # Used in number_to_precision()
+    precision:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: "" 
+        # precision:
+ 
+    # Used in number_to_human_size()
+    human:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: "" 
+        precision: 1
+ 
+  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+  datetime:
+    distance_in_words:
+      half_a_minute: "mig minut" 
+      less_than_x_seconds:
+        one:  "menys d'1 segon" 
+        other: "menys de {{count}} segons"
+      x_seconds:
+        one:  "1 segon" 
+        other: "{{count}} segons" 
+      less_than_x_minutes:
+        one:  "menys d'1 minut" 
+        other: "menys de {{count}} minuts" 
+      x_minutes:
+        one:  "1 minut" 
+        other: "{{count}} minuts" 
+      about_x_hours:
+        one:  "aproximadament 1 hora" 
+        other: "aproximadament {{count}} hores" 
+      x_days:
+        one:  "1 dia" 
+        other: "{{count}} dies" 
+      about_x_months:
+        one:  "aproximadament 1 mes" 
+        other: "aproximadament {{count}} mesos" 
+      x_months:
+        one:  "1 mes" 
+        other: "{{count}} mesos" 
+      about_x_years:
+        one:  "aproximadament 1 any" 
+        other: "aproximadament {{count}} anys" 
+      over_x_years:
+        one:  "més d'1 any" 
+        other: "més de {{count}} anys" 
+ 
+  activerecord:
+    errors:
+      template:
+        header:
+          one:   "No s'ha pogut desar aquest/a {{model}} perquè hi ha 1 error" 
+          other:  "No s'ha pogut desar aquest/a {{model}} perquè hi ha hagut {{count}} errors" 
+        # The variable :count is also available
+        body: "Hi ha hagut problemes amb els següents camps:" 
+ 
+      # The values :model, :attribute and :value are always available for interpolation
+      # The value :count is available when applicable. Can be used for pluralization.
+      messages:
+        inclusion: "no està incluós a la llista" 
+        exclusion: "està reservat" 
+        invalid: "no és vàlid" 
+        confirmation: "no coincideix"
+        accepted: "ha de ser acceptat"
+        empty: "no pot estar buit"
+        blank: "no pot estar en blanc"
+        too_long: "és massa llarg ({{count}} caràcters màxim)"
+        too_short: "és massa curt ({{count}} caràcters mínim)"
+        wrong_length: "no té la longitud correcte ({{count}} caràcters exactament)"
+        taken: "no està disponible"
+        not_a_number: "no és un número"
+        greater_than: "ha de ser més gran que {{count}}"
+        greater_than_or_equal_to: "ha de ser més gran o igual a {{count}}"
+        equal_to: "ha de ser igual a {{count}}"
+        less_than: "ha de ser menor que {{count}}"
+        less_than_or_equal_to: "ha de ser menor o igual a {{count}}"
+        odd: "ha de ser imparell"
+        even: "ha de ser parell"
+ 
+        # Append your own errors here or at the model/attributes scope.
+ 
+      models:
+        # Overrides default messages
+ 
+      attributes:
+        # Overrides model and default messages.
+ 
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%Y-%m-%d" 
+      short: "%d de %b" 
+      long: "%d de %B de %Y" 
+ 
+    day_names: [diumenge, dilluns, dimarts, dimecres, dijous, divendres, dissabte]
+    abbr_day_names: [dg, dl, dm, dc, dj, dv, ds]
+ 
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, gener, febrer, març, abril, maig, juny, juliol, agost, setembre, octubre, novembre, desembre]
+    abbr_month_names: [~, Gen, Feb, Mar, Abr, Mai, Jun, Jul, Ago, Set, Oct, Nov, Des]
+    # Used in date_select and datime_select.
+    order: [ :day, :month, :year ]
+ 
+  time:
+    formats:
+      default: "%A, %d de %B de %Y %H:%M:%S %z"
+      short: "%d de %b %H:%M" 
+      long: "%d de %B de %Y %H:%M" 
+    am: "am" 
+    pm: "pm" 
+ 
+# Used in array.to_sentence.
+  support:
+    array:
+      sentence_connector: "i"

vendor/plugins/rails-i18n/locale/de-AT.yml

@@ -0,0 +1,140 @@
+# German translations for Ruby on Rails 
+# by Clemens Kofler (clemens@railway.at)
+
+de-AT:
+  date:
+    formats:
+      default: "%d.%m.%Y"
+      short: "%e. %b"
+      long: "%e. %B %Y"
+      only_day: "%e"
+
+    day_names: [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag]
+    abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa]
+    month_names: [~, Jänner, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
+    abbr_month_names: [~, Jän, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
+    order: [ :day, :month, :year ]
+  
+  time:
+    formats:
+      default: "%A, %d. %B %Y, %H:%M Uhr"
+      short: "%d. %B, %H:%M Uhr"
+      long: "%A, %d. %B %Y, %H:%M Uhr"
+      time: "%H:%M"
+
+    am: "vormittags"
+    pm: "nachmittags"
+      
+  datetime:
+    distance_in_words:
+      half_a_minute: 'eine halbe Minute'
+      less_than_x_seconds:
+        zero: 'weniger als 1 Sekunde'
+        one: 'weniger als 1 Sekunde'
+        other: 'weniger als {{count}} Sekunden'
+      x_seconds:
+        one: '1 Sekunde'
+        other: '{{count}} Sekunden'
+      less_than_x_minutes:
+        zero: 'weniger als 1 Minute'
+        one: 'weniger als eine Minute'
+        other: 'weniger als {{count}} Minuten'
+      x_minutes:
+        one: '1 Minute'
+        other: '{{count}} Minuten'
+      about_x_hours:
+        one: 'etwa 1 Stunde'
+        other: 'etwa {{count}} Stunden'
+      x_days:
+        one: '1 Tag'
+        other: '{{count}} Tage'
+      about_x_months:
+        one: 'etwa 1 Monat'
+        other: 'etwa {{count}} Monate'
+      x_months:
+        one: '1 Monat'
+        other: '{{count}} Monate'
+      about_x_years:
+        one: 'etwa 1 Jahr'
+        other: 'etwa {{count}} Jahre'
+      over_x_years:
+        one: 'mehr als 1 Jahr'
+        other: 'mehr als {{count}} Jahre'
+    prompts:
+      second: "Sekunden"
+      minute: "Minuten"
+      hour: "Stunden"
+      day: "Tag"
+      month: "Monat"
+      year: "Jahr"
+
+  number:
+    format:
+      precision: 2
+      separator: ','
+      delimiter: '.'
+    currency:
+      format:
+        unit: '€'
+        format: '%n%u'
+        separator: 
+        delimiter: 
+        precision: 
+    percentage:
+      format:
+        delimiter: ""
+    precision:
+      format:
+        delimiter: ""
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " und "
+      last_word_connector: " und "
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "Konnte dieses {{model}} Objekt nicht speichern: 1 Fehler."
+          other:  "Konnte dieses {{model}} Objekt nicht speichern: {{count}} Fehler."
+        body: "Bitte überprüfen Sie die folgenden Felder:"
+
+      messages:
+        inclusion: "ist kein gültiger Wert"
+        exclusion: "ist nicht verfügbar"
+        invalid: "ist nicht gültig"
+        confirmation: "stimmt nicht mit der Bestätigung überein"
+        accepted: "muss akzeptiert werden"
+        empty: "muss ausgefüllt werden"
+        blank: "muss ausgefüllt werden"
+        too_long: "ist zu lang (nicht mehr als {{count}} Zeichen)"
+        too_short: "ist zu kurz (nicht weniger als {{count}} Zeichen)"
+        wrong_length: "hat die falsche Länge (muss genau {{count}} Zeichen haben)"
+        taken: "ist bereits vergeben"
+        not_a_number: "ist keine Zahl"
+        greater_than: "muss größer als {{count}} sein"
+        greater_than_or_equal_to: "muss größer oder gleich {{count}} sein"
+        equal_to: "muss genau {{count}} sein"
+        less_than: "muss kleiner als {{count}} sein"
+        less_than_or_equal_to: "muss kleiner oder gleich {{count}} sein"
+        odd: "muss ungerade sein"
+        even: "muss gerade sein"
+      models:

vendor/plugins/rails-i18n/locale/de.yml

@@ -2,15 +2,6 @@
 # by Clemens Kofler (clemens@railway.at)
 
 de:
-  # Support for word connectors, added for OpenStreetMap, needs upstream merge
-  support:
-    array:
-      sentence_connector: "und"
-      skip_last_comma: true
-      words_connector: ", "
-      two_words_connector: " und "
-      last_word_connector: " und "
-
   date:
     formats:
       default: "%d.%m.%Y"
@@ -26,9 +17,9 @@ de:
   
   time:
     formats:
-      default: "%A, %e. %B %Y, %H:%M Uhr"
-      short: "%e. %B, %H:%M Uhr"
-      long: "%A, %e. %B %Y, %H:%M Uhr"
+      default: "%A, %d. %B %Y, %H:%M Uhr"
+      short: "%d. %B, %H:%M Uhr"
+      long: "%A, %d. %B %Y, %H:%M Uhr"
       time: "%H:%M"
 
     am: "vormittags"
@@ -69,7 +60,14 @@ de:
       over_x_years:
         one: 'mehr als 1 Jahr'
         other: 'mehr als {{count}} Jahre'
-      
+    prompts:
+      second: "Sekunden"
+      minute: "Minuten"
+      hour: "Stunden"
+      day: "Tag"
+      month: "Monat"
+      year: "Jahr"
+
   number:
     format:
       precision: 2
@@ -92,12 +90,25 @@ de:
       format:
         delimiter: ""
         precision: 1
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   support:
     array:
-      sentence_connector: "und"
-      skip_last_comma: true
-        
+      words_connector: ", "
+      two_words_connector: " und "
+      last_word_connector: " und "
+
   activerecord:
     errors:
       template:

vendor/plugins/rails-i18n/locale/es-AR.rb

@@ -1,107 +0,0 @@
-{
-  :'es-AR' => {
-
-    :date => {
-      :formats => {
-        :default      => "%e/%m/%Y",
-        :short        => "%e %b",
-        :long         => "%e de %B de %Y",
-        :only_day     => "%e"
-      },
-      :day_names      => %w(Domingo Lunes Martes Miércoles Jueves Viernes Sábado),
-      :abbr_day_names => %w(Dom Lun Mar Mie Jue Vie Sab),
-      :month_names    => [nil] + %w(Enero Febrero Marzo Abril Mayo Junio Julio Agosto Setiembre Octubre Noviembre Diciembre),
-      :abbr_month_names => [nil] + %w(Ene Feb Mar Abr May Jun Jul Ago Set Oct Nov Dic),
-      :order          => [:day, :month, :year]
-    },
-    :time => {
-      :formats => {
-        :default      => "%A, %e de %B de %Y, %H:%M hs",
-        :time         => "%H:%M hs",
-        :short        => "%e/%m, %H:%M hs",
-        :long         => "%A, %e de %B de %Y, %H:%M hs",
-        :only_second  => "%S"
-      },
-      :datetime => {
-        :formats => {
-          :default => "%d/%m/%Y-%dT%H:%M:%S%Z"
-        }
-      },
-      :time_with_zone => {
-        :formats => {
-          :default => lambda { |time| "%Y-%m-%d %H:%M:%S #{time.formatted_offset(false, 'UTC')}" }
-        }
-      },
-      :am => 'am',
-      :pm => 'pm'
-    },
-    # date helper distancia en palabras
-    #NOTE: Pluralization rules have changed! Rather than simply submitting an array, i18n now allows for a hash with the keys:
-    # :zero, :one & :other   - FUNKY (but a pain to find...)!
-    :datetime => {
-      :distance_in_words => {
-        :half_a_minute       => 'medio minuto',
-        :less_than_x_seconds => {:zero => 'menos de 1 segundo', :one => 'menos de 1 segundo', :other => 'menos de {{count}} segundos'},
-        :x_seconds           => {:one => '1 second', :other => '{{count}} seconds'},
-        :less_than_x_minutes => {:zero => 'menos de 1 minuto', :one => 'menos de 1 minuto', :other => 'menos de {{count}} minutos'},
-        :x_minutes           => {:one => "1 minuto", :other => "{{count}} minutos"},
-        :about_x_hours       => {:one => 'aproximadamente 1 hora', :other => 'aproximadamente {{count}} horas'},
-        :x_days              => {:one => '1 día', :other => '{{count}} días'},
-        :about_x_months      => {:one => 'aproximandamente 1 mes', :other => 'aproximadamente {{count}} mes'},
-        :x_months            => {:one => '1 month', :other => '{{count}} mes'},
-        :about_x_years       => {:one => 'aproximadamente 1 año', :other => 'aproximadamente {{count}} años'},
-        :over_x_years        => {:one => 'más de 1 año', :other => 'más de {{count}} años'}
-      }
-    },
-
-    # numbers
-    :number => {
-      :format => {
-        :precision => 3,
-        :separator => ',',
-        :delimiter => '.'
-      },
-      :currency => {
-        :format => {
-          :unit => '$',
-          :precision => 2,
-          :format => '%u %n'
-        }
-      }
-    },
-
-    # Active Record
-    :activerecord => {
-      :errors => {
-        :template => {
-          :header => {
-            :one => "{{model}} no pudo guardarse: 1 error", 
-            :other => "{{model}}: {{count}} errores."
-          },
-          :body => "Por favor revise los campos siguientes:"
-        },
-        :messages => {
-          :inclusion => "no está incluido en la lista",
-          :exclusion => "no está disponible",
-          :invalid => "no es válido",
-          :confirmation => "no coincide con la confirmación",
-          :accepted  => "debe ser aceptado",
-          :empty => "no puede estar vacío",
-          :blank => "no puede estar en blanco",
-          :too_long => "es demasiado largo (no más de {{count}} caracteres)",
-          :too_short => "es demasiado corto (no menos de {{count}} caracteres)",
-          :wrong_length => "no tiene la longitud correcta (debe ser de {{count}} caracteres)",
-          :taken => "no está disponible",
-          :not_a_number => "no es un número",
-          :greater_than => "debe ser mayor a {{count}}",
-          :greater_than_or_equal_to => "debe ser mayor o igual a {{count}}",
-          :equal_to => "debe ser igual a {{count}}",
-          :less_than => "debe ser menor que {{count}}",
-          :less_than_or_equal_to => "debe ser menor o igual que {{count}}",
-          :odd => "debe ser par",
-          :even => "debe ser impar"
-        }
-      }
-    }
-  }
-}

vendor/plugins/rails-i18n/locale/es-AR.yml

@@ -0,0 +1,168 @@
+"es-AR":
+  date:
+    formats:
+      default: "%e/%m/%Y"
+      short: "%e %b"
+      long: "%e de %B de %Y"
+    day_names:
+    - domingo
+    - lunes
+    - martes
+    - "miércoles"
+    - jueves
+    - viernes
+    - "sábado"
+    abbr_day_names:
+    - dom
+    - lun
+    - mar
+    - mie
+    - jue
+    - vie
+    - sab
+    month_names:
+    -
+    - enero
+    - febrero
+    - marzo
+    - abril
+    - mayo
+    - junio
+    - julio
+    - agosto
+    - septiembre
+    - octubre
+    - noviembre
+    - diciembre
+    abbr_month_names:
+    -
+    - ene
+    - feb
+    - mar
+    - abr
+    - may
+    - jun
+    - jul
+    - ago
+    - set
+    - oct
+    - nov
+    - dic
+    order:
+    - :day
+    - :month
+    - :year
+  time:
+    formats:
+      default: "%A, %e de %B de %Y, %H:%M hs"
+      short: "%e/%m, %H:%M hs"
+      long: "%A, %e de %B de %Y, %H:%M hs"
+    am: am
+    pm: pm
+  datetime:
+    distance_in_words:
+      half_a_minute: medio minuto
+      less_than_x_seconds:
+        zero: menos de 1 segundo
+        one: menos de 1 segundo
+        other: menos de {{count}} segundos
+      x_seconds:
+        one: 1 second
+        other: "{{count}} seconds"
+      less_than_x_minutes:
+        zero: menos de 1 minuto
+        one: menos de 1 minuto
+        other: menos de {{count}} minutos
+      x_minutes:
+        one: 1 minuto
+        other: "{{count}} minutos"
+      about_x_hours:
+        one: aproximadamente 1 hora
+        other: aproximadamente {{count}} horas
+      x_days:
+        one: "1 día"
+        other: "{{count}} días"
+      about_x_months:
+        one: aproximandamente 1 mes
+        other: aproximadamente {{count}} mes
+      x_months:
+        one: 1 month
+        other: "{{count}} mes"
+      about_x_years:
+        one: "aproximadamente 1 año"
+        other: "aproximadamente {{count}} años"
+      over_x_years:
+        one: "más de 1 año"
+        other: "más de {{count}} años"
+    prompts:
+      year:   "Año"
+      month:  "Mes"
+      day:    "Día"
+      hour:   "Hora"
+      minute: "Minuto"
+      second: "Segundos"
+        
+  number:
+    percentage:
+      format:
+        delimiter: "."
+    precision:
+      format:
+        delimiter: "."
+    human:
+      format:
+        delimiter: "."
+        precision: "2"
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "byte"
+            other: "bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+    format:
+      precision: 3
+      separator: ","
+      delimiter: .
+    currency:
+      format:
+        unit: $
+        precision: 2
+        format: "%u %n"
+        separator: ","
+        delimiter: "."
+  activerecord:
+    errors:
+      template:
+        header:
+          one: "Un error ocurrió al guardar tus datos."
+          other: "{{count}} errores ocurrieron al guardar tus datos."
+        body: "Los siguientes campos presentan problemas:"
+      messages:
+        inclusion: "no está incluido en la lista"
+        exclusion: "no está disponible"
+        invalid: "no es válido"
+        confirmation: "no coincide con la confirmación"
+        accepted: debe ser aceptado
+        empty: "no puede estar vacío"
+        blank: no puede estar en blanco
+        too_long: "es demasiado largo (el máximo es de {{count}} caracteres)"
+        too_short: "es demasiado corto (el mínimo es de {{count}} caracteres)"
+        wrong_length: "no posee el largo correcto (debería ser de {{count}} caracteres)"
+        taken: "no está disponible"
+        not_a_number: "no es un número"
+        greater_than: debe ser mayor a {{count}}
+        greater_than_or_equal_to: debe ser mayor o igual a {{count}}
+        equal_to: debe ser igual a {{count}}
+        less_than: debe ser menor que {{count}}
+        less_than_or_equal_to: debe ser menor o igual que {{count}}
+        odd: debe ser par
+        even: debe ser impar
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " y "
+      last_word_connector: " y "

vendor/plugins/rails-i18n/locale/es-MX.yml

@@ -1,29 +1,28 @@
 # Spanish as spoken in Mexico (es-MX) translations for Rails
 # by Edgar J. Suárez (edgar.js@gmail.com)
+# Fixed currency format (Can't convert string to symbol)
+# by Ivan Torres (mexpolk@gmail.com)
 
 es-MX:
   number:
     percentage:
       format:
-        delimiter: ""
+        delimiter: ","
     currency:
-      format: "%u%n"
-      delimiter: ","
-      unit: "$"
-      precision: 2
-      separator: "."
+      format:
+        format: "%u%n"
+        unit: "$"
     format:
       delimiter: ","
-      precision: 3
+      precision: 2
       separator: "."
     human:
       format:
-        delimiter: ""
-        precision: 1
+        delimiter: ","
       storage_units: [Bytes, KB, MB, GB, TB]
     precision:
       format:
-        delimiter: ""
+        delimiter: ","
 
   date:
     order: [:day, :month, :year]

vendor/plugins/rails-i18n/locale/es.yml

@@ -142,8 +142,8 @@ es:
       # When no format has been given, it uses default.
       # You can provide other formats here if you like!
       default: "%e/%m/%Y"
-      short: "%d de %b" 
-      long: "%d de %B de %Y" 
+      short: "%e de %b" 
+      long: "%e de %B de %Y" 
 
     day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
     abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
@@ -152,13 +152,13 @@ es:
     month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Setiembre, Octubre, Noviembre, Diciembre]
     abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Set, Oct, Nov, Dic]
     # Used in date_select and datime_select.
-    order: [ :year, :month, :day ]
+    order: [ :day, :month, :year ]
 
   time:
     formats:
-      default: "%A, %d de %B de %Y %H:%M:%S %z"
-      short: "%d de %b %H:%M" 
-      long: "%d de %B de %Y %H:%M" 
+      default: "%A, %e de %B de %Y %H:%M:%S %z"
+      short: "%e de %b %H:%M" 
+      long: "%e de %B de %Y %H:%M" 
     am: "am" 
     pm: "pm" 
 
@@ -170,4 +170,4 @@ es:
       # Rails >= v.2.3
       words_connector: ", "
       two_words_connector: " y "
-      last_word_connector: " y "
+      last_word_connector: " y "

vendor/plugins/rails-i18n/locale/et.yml

@@ -0,0 +1,109 @@
+# Estonian localization for Ruby on Rails 2.2+
+# by Zahhar Kirillov <zahhar@gmail.com>
+
+et:
+  date:
+    formats:
+      default: "%d.%m.%Y"
+      short: "%d.%m.%y"
+      long: "%d. %B %Y"
+
+    day_names: [pühapäev, esmaspäev, teisipäev, kolmapäev, neljapäev, reede, laupäev]
+    standalone_day_names: [Pühapäev, Esmaspäev, Teisipäev, Kolmapäev, Neljapäev, Reede, Laupäev]
+    abbr_day_names: [P, E, T, K, N, R, L]
+
+    month_names: [~, jaanuar, veebruar, märts, aprill, mai, juuni, juuli, august, september, oktoober, november, detsember]
+    standalone_month_names: [~, Jaanuar, Veebruar, Märts, Aprill, Mai, Juuni, Juuli, August, September, Oktoober, November, Detsember]
+    abbr_month_names: [~, jaan., veebr., märts, apr., mai, juuni, juuli, aug., sept., okt., nov., dets.]
+    standalone_abbr_month_names: [~, jaan., veebr., märts, apr., mai, juuni, juuli, aug., sept., okt., nov., dets.]
+
+    order: [ :day, :month, :year ]
+
+  time:
+    formats:
+      default: "%d. %B %Y, %H:%M"
+      short: "%d.%m.%y, %H:%M"
+      long: "%a, %d. %b %Y, %H:%M:%S %z"
+
+    am: "enne lõunat"
+    pm: "pärast lõunat"
+
+  number:
+    format:
+      separator: ","
+      delimiter: " "
+      precision: 2
+      
+    currency:
+      format:
+        format: "%n %u"
+        unit: "kr"
+        separator: ","
+        delimiter: " "
+        precision: 2
+        
+    percentage:
+      format:
+        delimiter: ""
+        
+    precision:
+      format:
+        delimiter: ""
+        
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      storage_units: [bait, KB, MB, GB, TB]
+
+  datetime:
+    distance_in_words:
+      half_a_minute: "pool minutit"
+      less_than_x_seconds:
+        one:   "vähem kui {{count}} sekund"
+        other: "vähem kui {{count}} sekundit"
+      x_seconds:
+        one:   "{{count}} sekund"
+        other: "{{count}} sekundit"
+      less_than_x_minutes:
+        one:   "vähem kui {{count}} minut"
+        other: "vähem kui {{count}} minutit"
+      x_minutes:
+        one:   "{{count}} minut"
+        other: "{{count}} minutit"
+      about_x_hours:
+        one:   "umbes {{count}} tund"
+        other: "umbes {{count}} tundi"
+      x_days:
+        one:   "{{count}} päev"
+        other: "{{count}} päeva"
+      about_x_months:
+        one:   "umbes {{count}} kuu"
+        other: "umbes {{count}} kuud"
+      x_months:
+        one:   "{{count}} kuu"
+        other: "{{count}} kuud"
+      about_x_years:
+        one:   "umbes {{count}} aasta"
+        other: "umbes {{count}} aastat"
+      over_x_years:
+        one:   "üle {{count}} aasta"
+        other: "üle {{count}} aastat"
+    prompts:
+      year: "Aasta"
+      month: "Kuu"
+      day: "Päev"
+      hour: "Tunde"
+      minute: "Minutit"
+      second: "Sekundit"
+
+  support:
+    array:
+      # Rails 2.2
+      sentence_connector: "ja"
+      skip_last_comma: true
+      
+      # Rails 2.3
+      words_connector: ", "
+      two_words_connector: " ja "
+      last_word_connector: " ja "

vendor/plugins/rails-i18n/locale/fi.yml

@@ -1,5 +1,7 @@
 # Finnish translations for Ruby on Rails 
 # by Marko Seppä (marko.seppa@gmail.com)
+#
+# corrected by Petri Kivikangas (pkivik@gmail.com)
 
 fi:
   date:
@@ -8,10 +10,10 @@ fi:
       long: "%A%e. %Bta %Y"
       short: "%e.%m.%Y"
  
-    day_names: [Sunnuntai, Maanantai, Tiistai, Keskiviikko, Torstai, Perjantai, Lauantai]
-    abbr_day_names: [Su, Ma, Ti, Ke, To, Pe, La]
-    month_names: [~, Tammikuu, Helmikuu, Maaliskuu, Huhtikuu, Toukokuu, Kesäkuu, Heinäkuu, Elokuu, Syyskuu, Lokakuu, Marraskuu, Joulukuu]
-    abbr_month_names: [~, Tammi, Helmi, Maalis, Huhti, Touko, Kesä, Heinä, Elo, Syys, Loka, Marras, Joulu]
+    day_names: [sunnuntai, maanantai, tiistai, keskiviikko, torstai, perjantai, lauantai]
+    abbr_day_names: [su, ma, ti, ke, to, pe, la]
+    month_names: [~, tammikuu, helmikuu, maaliskuu, huhtikuu, toukokuu, kesäkuu, heinäkuu, elokuu, syyskuu, lokakuu, marraskuu, joulukuu]
+    abbr_month_names: [~, tammi, helmi, maalis, huhti, touko, kesä, heinä, elo, syys, loka, marras, joulu]
     order: [:day, :month, :year]
 
   time:
@@ -60,20 +62,29 @@ fi:
       format:
         delimiter: ""
         precision: 1
-      storage_units: [Tavua, KB, MB, GB, TB]
- 
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "tavu"
+            other: "tavua"
+          kb: "kB" 
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
   datetime:
     distance_in_words:
       half_a_minute: "puoli minuuttia"
       less_than_x_seconds:
-        one:   "aiemmin kuin sekunti"
-        other: "aiemmin kuin {{count}} sekuntia"
+        one:   "alle sekunti"
+        other: "alle {{count}} sekuntia"
       x_seconds:
         one:   "sekunti"
         other: "{{count}} sekuntia"
       less_than_x_minutes:
-        one:   "aiemmin kuin minuutti"
-        other: "aiemmin kuin {{count}} minuuttia"
+        one:   "alle minuutti"
+        other: "alle {{count}} minuuttia"
       x_minutes:
         one:   "minuutti"
         other: "{{count}} minuuttia"
@@ -107,19 +118,19 @@ fi:
     errors:
       template:
         header:
-          one:    "1 virhe esti tämän {{model}} mallinteen tallentamisen"
-          other:  "{{count}} virhettä esti tämän {{model}} mallinteen tallentamisen"
+          one:    "1 virhe esti tämän {{model}} mallin tallentamisen"
+          other:  "{{count}} virhettä esti tämän {{model}} mallin tallentamisen"
         body: "Seuraavat kentät aiheuttivat ongelmia:"
       messages:
-        inclusion: "ei löydy listauksesta"
-        exclusion: "on jo varattu"
+        inclusion: "ei löydy listasta"
+        exclusion: "on varattu"
         invalid: "on kelvoton"
         confirmation: "ei vastaa varmennusta"
         accepted: "täytyy olla hyväksytty"
         empty: "ei voi olla tyhjä"
         blank: "ei voi olla sisällötön"
-        too_long: "on liian pitkä (maksimi on {{count}} merkkiä)"
-        too_short: "on liian lyhyt (minimi on {{count}} merkkiä)"
+        too_long: "on liian pitkä (enintään {{count}} merkkiä)"
+        too_short: "on liian lyhyt (vähintään {{count}} merkkiä)"
         wrong_length: "on väärän pituinen (täytyy olla täsmälleen {{count}} merkkiä)"
         taken: "on jo käytössä"
         not_a_number: "ei ole numero"
@@ -129,4 +140,4 @@ fi:
         less_than: "täytyy olla pienempi kuin {{count}}"
         less_than_or_equal_to: "täytyy olla pienempi tai yhtä suuri kuin {{count}}"
         odd: "täytyy olla pariton"
-        even: "täytyy olla parillinen"
+        even: "täytyy olla parillinen"

vendor/plugins/rails-i18n/locale/fr-CH.yml

@@ -13,8 +13,8 @@ fr-CH:
       long_ordinal: "%e %B %Y"
       only_day: "%e"
 
-    day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
-    abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
+    day_names: [lundi, mardi, mercredi, jeudi, vendredi, samedi, dimanche]
+    abbr_day_names: [lun, mar, mer, jeu, ven, sam, dim]
     month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
     abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
     order: [ :day, :month, :year ]
@@ -32,7 +32,7 @@ fr-CH:
 
   datetime:
     distance_in_words:
-      half_a_minute: "une demi-minute"
+      half_a_minute: "30 secondes"
       less_than_x_seconds:
         one:   "moins d'une seconde"
         other: "moins de {{count}} secondes"

vendor/plugins/rails-i18n/locale/fr.yml

@@ -83,14 +83,29 @@ fr:
         format: '%n %u'
     human:
       format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: "" 
         precision: 2
-      storage_units: [ Octet, ko, Mo, Go, To ]
-  
+      # Rails <= v2.2.2
+      # storage_units: [octet, kb, Mb, Gb, Tb]
+      # Rails >= v2.3
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "octet"
+            other: "octets"
+          kb: "ko"
+          mb: "Mo"
+          gb: "Go"
+          tb: "To"
+
   support:
     array:
       sentence_connector: 'et'
       skip_last_comma: true
-      word_connector: ", "
+      words_connector: ", "
       two_words_connector: " et "
       last_word_connector: " et "
   

vendor/plugins/rails-i18n/locale/it.yml

@@ -1,6 +1,10 @@
 # Italian translations for Ruby on Rails 
 # by Claudio Poli (masterkain@gmail.com)
-# updated by Simone Carletti (weppos@weppos.net)
+# maintained by Simone Carletti (weppos@weppos.net)
+#
+# This localization file targets Rails 2.3.2.
+# If you need a previous version go to http://github.com/weppos/rails-i18n/
+# and choose between available tags.
 
 it:
   number:
@@ -33,15 +37,22 @@ it:
         # separator: 
         delimiter: ""
         precision: 1
-      storage_units: [Byte, Kb, Mb, Gb, Tb]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Byte"
+          kb: "Kb"
+          mb: "Mb"
+          gb: "Gb"
+          tb: "Tb"
 
   date:
     formats:
       default: "%d-%m-%Y"
       short: "%d %b"
       long: "%d %B %Y"
-      # Bogus?
-      only_day: "%e"
 
     day_names: [Domenica, Lunedì, Martedì, Mercoledì, Giovedì, Venerdì, Sabato]
     abbr_day_names: [Dom, Lun, Mar, Mer, Gio, Ven, Sab]
@@ -55,14 +66,6 @@ it:
       default: "%a %d %b %Y, %H:%M:%S %z"
       short: "%d %b %H:%M"
       long: "%d %B %Y %H:%M"
-      # Bogus?
-      time: "%H:%M"
-      only_second: "%S"
-      
-      # Bogus?
-      datetime:
-        formats:
-          default: "%d-%m-%YT%H:%M:%S%Z"
           
     am: 'am'
     pm: 'pm'

vendor/plugins/rails-i18n/locale/ja.yml

@@ -72,14 +72,14 @@ ja:
     distance_in_words:
       half_a_minute: "30秒前後"
       less_than_x_seconds:
-        one:   "1秒以下"
-        other: "{{count}}秒以下"
+        one:   "1秒以内"
+        other: "{{count}}秒以内"
       x_seconds:
         one:   "1秒"
         other: "{{count}}秒"
       less_than_x_minutes:
-        one:   "1分以下"
-        other: "{{count}}分以下"
+        one:   "1分以内"
+        other: "{{count}}分以内"
       x_minutes:
         one:   "1分"
         other: "{{count}}分"
@@ -96,8 +96,8 @@ ja:
         one:   "1ヶ月"
         other: "{{count}}ヶ月"
       about_x_years:
-        one:   "約{{count}}年以上"
-        other: "約{{count}}年以上"
+        one:   "約{{count}}年"
+        other: "約{{count}}年"
       over_x_years:
         one:   "{{count}}年以上"
         other: "{{count}}年以上"

vendor/plugins/rails-i18n/locale/ko.yml

@@ -125,28 +125,28 @@ ko:
     errors:
       template:
         header:
-          one:    "한개의 오류가 발생해 {{model}}를 저장 안았했습니다"
-          other:  "{{count}}개의 오류가 발생해 {{model}}를 저장 안았했습니다"
+          one:    "한개의 오류가 발생해 {{model}}를 저장 할 수 없습니다"
+          other:  "{{count}}개의 오류가 발생해 {{model}}를 저장 할 수 없습니다"
         # The variable :count is also available
-        body: "다음 항목에 문제가 발견했습니다:"
+        body: "다음 항목에 문제가 발견되었습니다:"
 
       messages:
-        inclusion: "은 목록에 포함되어 있지 않습니다"
-        exclusion: "은 예약되어 있습니다"
+        inclusion: "은 목록에 포함되어 있습니다"
+        exclusion: "은 목록에 포함되어 있지 않습니다"
         invalid: "은 무효입니다"
-        confirmation: "은 확인이 되지 않았습니다"
-        accepted: "은 인정되어야 합니다"
+        confirmation: "은 확인되었습니다"
+        accepted: "은 확인되었습니다"
         empty: "은 비어두면 안 됩니다"
         blank: "은 비어두면 안 됩니다"
         too_long: "은 너무 깁니다 (최대 {{count}}자 까지)"
         too_short: "은 너무 짧습니다 (최소 {{count}}자 까지)"
         wrong_length: "은 길이가 틀렸습니다 ({{count}}자를 필요합니다)"
-        taken: "은 이미 선택된 겁니다"
+        taken: "은 이미 선택되었습니다"
         not_a_number: "은 숫자가 아닙니다"
         greater_than: "은 {{count}}이상을 요구합니다"
         greater_than_or_equal_to: "은 {{count}}과 같거나 이상을 요구합니다"
         equal_to: "은 {{count}}과 같아야 합니다"
-        less_than: "은 {{count}}과 같아야 합니다"
+        less_than: "은 {{count}}이하를 요구합니다"
         less_than_or_equal_to: "은 {{count}}과 같거나 이하을 요구합니다"
         odd: "은 홀수을 요구합니다"
         even: "은 짝수을 요구합니다"

vendor/plugins/rails-i18n/locale/lv.yml

@@ -0,0 +1,132 @@
+# Latvian translations for Ruby on Rails
+# by Kaspars Bankovskis (kaspars@kei.lv)
+
+lv:
+  date:
+    formats:
+      default: "%d.%m.%Y."
+      short: "%e. %B"
+      long: "%Y. gada %e. %B"
+
+    day_names: [svētdiena, pirmdiena, otrdiena, trešdiena, ceturtdiena, piektdiena, sestdiena]
+    abbr_day_names: [Sv., P., O., T., C., Pk., S.]
+    month_names: [~, janvārī, februārī, martā, aprīlī, maijā, jūnijā, jūlijā, augustā, septembrī, oktobrī, novembrī, decembrī]
+    abbr_month_names: [~, Janv, Febr, Marts, Apr, Maijs, Jūn, Jūl, Aug, Sept, Okt, Nov, Dec]
+    order: [ :year, :month, :day ]
+
+  time:
+    formats:
+      default: "%Y. gada %e. %B, %H:%M"
+      short: "%d.%m.%Y., %H:%M"
+      long: "%Y. gada %e. %B, %H:%M:%S"
+
+    am: "priekšpusdiena"
+    pm: "pēcpusdiena"
+
+  datetime:
+    distance_in_words:
+      half_a_minute: "pusminūte"
+      less_than_x_seconds:
+        one: "mazāk par vienu sekundi"
+        other: "mazāk par {{count}} sekundēm"
+      x_seconds:
+        one: "1 sekunde"
+        other: "{{count}} sekundes"
+      less_than_x_minutes:
+        one: "mazāk par vienu minūti"
+        other: "mazāk par {{count}} minūtēm"
+      x_minutes:
+        one: "1 minūte"
+        other: "{{count}} minūtes"
+      about_x_hours:
+        one: "apmēram 1 stunda"
+        other: "apmēram {{count}} stundas"
+      x_days:
+        one: "1 diena"
+        other: "{{count}} dienas"
+      about_x_months:
+        one: "apmēram 1 mēnesis"
+        other: "apmēram {{count}} mēneši"
+      x_months:
+        one: "1 mēnesis"
+        other: "{{count}} mēneši"
+      about_x_years:
+        one: "apmēram 1 gads"
+        other: "apmēram {{count}} gadi"
+      over_x_years:
+        one: "vairāk kā gads"
+        other: "vairāk kā {{count}} gadi"
+    prompts:
+      second: "sekunde"
+      minute: "minūte"
+      hour: "stunda"
+      day: "diena"
+      month: "mēnesis"
+      year: "gads"
+
+  number:
+    format:
+      precision: 2
+      separator: ','
+      delimiter: '.'
+    currency:
+      format:
+        unit: 'LVL'
+        format: '%u %n'
+        separator: ","
+        delimiter: "."
+        precision: 2
+    percentage:
+      format:
+        delimiter: ""
+    precision:
+      format:
+        delimiter: ""
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Baits"
+            other: "Baiti"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " un "
+      last_word_connector: " un "
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "Dēļ 1 kļūdas šis {{model}} netika saglabāts"
+          other:  "Dēļ {{count}} kļūdām šis {{model}} netika saglabāts"
+        body: "Problēmas ir šajos ievades laukos:"
+      messages:
+        inclusion: "nav iekļauts sarakstā"
+        exclusion: "nav pieejams"
+        invalid: "nav derīgs"
+        confirmation: "nesakrīt ar apstiprinājumu"
+        accepted: "ir jāpiekrīt"
+        empty: "ir jābūt aizpildītam"
+        blank: "ir jābūt aizpildītam"
+        too_long: "ir par garu (maksimums ir {{count}} zīmes)"
+        too_short: "ir par īsu (minimums ir {{count}} zīmes)"
+        wrong_length: "ir nepareizs garums (jābūt {{count}} zīmēm)"
+        taken: "ir jau aizņemts"
+        not_a_number: "nav skaitlis"
+        greater_than: "ir jābūt lielākam par {{count}}"
+        greater_than_or_equal_to: "ir jābūt lielākam vai vienādam ar {{count}}"
+        equal_to: "ir jābūt vienādam ar {{count}}"
+        less_than: "ir jābūt mazākam par {{count}}"
+        less_than_or_equal_to: "ir jābūt mazākam vai vienādam ar {{count}}"
+        odd: "ir jābūt nepāra skaitlim"
+        even: "ir jābūt pāra skaitlim"

vendor/plugins/rails-i18n/locale/nl.yml

@@ -0,0 +1,172 @@
+# Dutch translation in YML by Ariejan de Vroom <ariejan@ariejan.net>
+#  - Sponsored by Kabisa ICT - http://kabisa.nl
+#
+# Fully compatible with Translate (the Rails translation plugin) 
+#  - http://developer.newsdesk.se/2009/01/21/translate-new-rails-i18n-plugin-with-a-nice-web-ui/
+--- 
+nl: 
+  number: 
+    format: 
+      separator: ","
+      precision: 2
+      delimiter: .
+    human: 
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: MB
+    currency: 
+      format: 
+        format: "%u %n"
+        unit: !binary |
+          4oKs
+
+        separator: .
+        precision: 2
+        delimiter: .
+  activerecord: 
+    errors: 
+      messages: 
+        greater_than_or_equal_to: moet groter of gelijk zijn aan {{count}}
+        less_than_or_equal_to: moet minder of gelijk zijn aan {{count}}
+        confirmation: komt niet met de bevestiging overeen
+        blank: moet opgegeven zijn
+        exclusion: is niet beschikbaar
+        invalid: is ongeldig
+        odd: moet oneven zijn
+        too_short: is te kort (niet minder dan {{count}} tekens)
+        wrong_length: heeft niet de juiste lengte (moet {{count}} tekens lang zijn)
+        empty: moet opgegeven zijn
+        even: moet even zijn
+        less_than: moet minder zijn dan {{count}}
+        equal_to: moet gelijk zijn aan {{count}}
+        greater_than: moet groter zijn dan {{count}}
+        accepted: moet worden geaccepteerd
+        too_long: is te lang (niet meer dan {{count}} tekens)
+        taken: is niet beschikbaar
+        inclusion: is niet in de lijst opgenomen
+        not_a_number: is geen getal
+      template: 
+        body: "Controleer alstublieft de volgende velden:"
+        header: 
+          one: "Kon dit {{model}} object niet opslaan: 1 fout."
+          other: "Kon dit {{model}} niet opslaan: {{count}} fouten."
+  time: 
+    am: "'s ochtends"
+    formats: 
+      default: "%a %d %b %Y %H:%M:%S %Z"
+      time: "%H:%M"
+      short: "%d %b %H:%M"
+      only_second: "%S"
+      datetime: 
+        formats: 
+          default: "%d-%m-%YT%H:%M:%S%Z"
+      long: "%d %B %Y %H:%M"
+    pm: "'s middages"
+  date: 
+    month_names: 
+    - 
+    - Januari
+    - Februari
+    - Maart
+    - April
+    - Mei
+    - Juni
+    - Juli
+    - Augustus
+    - September
+    - Oktober
+    - November
+    - December
+    abbr_day_names: 
+    - Zon
+    - Maa
+    - Din
+    - Woe
+    - Don
+    - Vri
+    - Zat
+    order: 
+    - :day
+    - :month
+    - :year
+    formats: 
+      only_day: "%e"
+      default: "%d/%m/%Y"
+      short: "%e %b"
+      long: "%e %B %Y"
+    day_names: 
+    - Zondag
+    - Maandag
+    - Dinsdag
+    - Woensdag
+    - Donderdag
+    - Vrijdag
+    - Zaterdag
+    abbr_month_names: 
+    - 
+    - Jan
+    - Feb
+    - Mar
+    - Apr
+    - Mei
+    - Jun
+    - Jul
+    - Aug
+    - Sep
+    - Okt
+    - Nov
+    - Dec
+  support: 
+    array: 
+      words_connector: ","
+      last_word_connector: ", en"
+      two_words_connector: en
+  datetime: 
+    format: 
+      default: "%Y-%m-%dT%H:%M:%S%Z"
+    prompts: 
+      minute: Minuut
+      second: Seconden
+      month: Maand
+      hour: Uur
+      day: Dag
+      year: Jaar
+    distance_in_words: 
+      less_than_x_minutes: 
+        one: "minder dan \xC3\xA9\xC3\xA9n minuut"
+        other: minder dan {{count}} minuten
+      x_days: 
+        one: 1 dag
+        other: "{{count}} dagen"
+      x_seconds: 
+        one: 1 seconde
+        other: "{{count}} seconden"
+      about_x_hours: 
+        one: "ongeveer \xC3\xA9\xC3\xA9n uur"
+        other: ongeveer {{count}} uur
+      less_than_x_seconds: 
+        one: "minder dan \xC3\xA9\xC3\xA9n seconde"
+        other: minder dan {{count}} seconden
+      x_months: 
+        one: 1 maand
+        other: "{{count}} maanden"
+      x_minutes: 
+        one: 1 minuut
+        other: "{{count}} minuten"
+      about_x_years: 
+        one: "ongeveer \xC3\xA9\xC3\xA9n jaar"
+        other: ongeveer {{count}} jaren
+      about_x_months: 
+        one: "ongeveer \xC3\xA9\xC3\xA9n maand"
+        other: ongeveer {{count}} maanden
+      over_x_years: 
+        one: "langer dan \xC3\xA9\xC3\xA9n jaar"
+        other: langer {{count}} jaar
+      half_a_minute: halve minuut

vendor/plugins/rails-i18n/locale/pl.yml

@@ -21,7 +21,16 @@ pl:
       format:
         delimiter: ""
         precision: 1
-      storage_units: [B, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "bajt"
+            other: "bajty"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   date:
     formats:

vendor/plugins/rails-i18n/locale/pt-BR.yml

@@ -5,24 +5,18 @@ pt-BR:
       default: "%d/%m/%Y"
       short: "%d de %B"
       long: "%d de %B de %Y"
-      only_day: "%d"
     
     day_names: [Domingo, Segunda, Terça, Quarta, Quinta, Sexta, Sábado]
     abbr_day_names: [Dom, Seg, Ter, Qua, Qui, Sex, Sáb]
     month_names: [~, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
     abbr_month_names: [~, Jan, Fev, Mar, Abr, Mai, Jun, Jul, Ago, Set, Out, Nov, Dez]
-    order: [:day,:month,:year]
+    order: [ :day, :month, :year ]
   
   time:
     formats:
-      default: "%A, %d de %B de %Y, %H:%M hs"
-      time: "%H:%M hs"
-      short: "%d/%m, %H:%M hs"
-      long: "%A, %d de %B de %Y, %H:%M hs"
-      only_second: "%S"
-      datetime:
-        formats:
-          default: "%Y-%m-%dT%H:%M:%S%Z"
+      default: "%A, %d de %B de %Y, %H:%M h"
+      short: "%d/%m, %H:%M h"
+      long: "%A, %d de %B de %Y, %H:%M h"
     am: ''
     pm: ''
   
@@ -69,7 +63,14 @@ pt-BR:
       over_x_years:
         one: 'mais de 1 ano'
         other: 'mais de {{count}} anos'
-  
+    prompts:
+      year:   "Ano"
+      month:  "Mês"
+      day:    "Dia"
+      hour:   "Hora"
+      minute: "Minuto"
+      second: "Segundos"
+
   # numeros
   number:
     format:
@@ -93,36 +94,49 @@ pt-BR:
       format:
         precision: 1
         delimiter: '.'
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+# Used in array.to_sentence.
   support:
     array:
-      sentence_connector: "e"
-      skip_last_comma: true
+      words_connector: ", "
+      two_words_connector: " e "
+      last_word_connector: " e "
     
   # Active Record
   activerecord:
     errors:
       template:
         header:
-          one: "{{model}} não pôde ser salvo: 1 erro"
-          other: "{{model}} não pôde ser salvo: {{count}} erros."
-        body: "Por favor, cheque os seguintes campos:"
+          one: "Não foi possível gravar {{model}}: 1 erro"
+          other: "Não foi possível gravar {{model}}: {{count}} erros."
+        body: "Por favor, verifique o(s) seguinte(s) campo(s):"
       messages:
-        inclusion: "não está incluso na lista"
+        inclusion: "não está incluído na lista"
         exclusion: "não está disponível"
         invalid: "não é válido"
-        confirmation: "não bate com a confirmação"
-        accepted: "precisa ser aceito"
-        empty: "não pode ser vazio"
-        blank: "não pode ser vazio"
-        too_long: "é muito longo (não mais do que {{count}} caracteres)"
-        too_short: "é muito curto (não menos do que {{count}} caracteres)"
-        wrong_length: "não é do tamanho correto (precisa ter {{count}} caracteres)"
-        taken: "não está disponível"
+        confirmation: "não está de acordo com a confirmação"
+        accepted: "deve ser aceito"
+        empty: "não pode ficar vazio"
+        blank: "não pode ficar em branco"
+        too_long: "é muito longo (máximo: {{count}} caracteres)"
+        too_short: "é muito curto (mínimo: {{count}} caracteres)"
+        wrong_length: "não possui o tamanho esperado ({{count}} caracteres)"
+        taken: "já está em uso"
         not_a_number: "não é um número"
-        greater_than: "precisa ser maior do que {{count}}"
-        greater_than_or_equal_to: "precisa ser maior ou igual a {{count}}"
-        equal_to: "precisa ser igual a {{count}}"
-        less_than: "precisa ser menor do que {{count}}"
-        less_than_or_equal_to: "precisa ser menor ou igual a {{count}}"
-        odd: "precisa ser ímpar"
-        even: "precisa ser par"
+        greater_than: "deve ser maior do que {{count}}"
+        greater_than_or_equal_to: "deve ser maior ou igual a {{count}}"
+        equal_to: "deve ser igual a {{count}}"
+        less_than: "deve ser menor do que {{count}}"
+        less_than_or_equal_to: "deve ser menor ou igual a {{count}}"
+        odd: "deve ser ímpar"
+        even: "deve ser par"

vendor/plugins/rails-i18n/locale/pt-PT.yml

@@ -1,17 +1,21 @@
 # Portuguese localization for Ruby on Rails
 # by Ricardo Otero <oterosantos@gmail.com>
+#
+# This localization file targets Rails 2.3.2.
+# If you need a previous version go to http://github.com/weppos/rails-i18n/
+# and choose between available tags.
 pt-PT:
   support:
     array:
-      sentence_connector: "e"
-      skip_last_comma: true
+      words_connector: ","
+      two_words_connector: "e"
+      last_word_connector: ", e"
     
   date:
     formats:
       default: "%d/%m/%Y"
       short: "%d de %B"
       long: "%d de %B de %Y"
-      only_day: "%d"
     day_names: [Domingo, Segunda, Terça, Quarta, Quinta, Sexta, Sábado]
     abbr_day_names: [Dom, Seg, Ter, Qua, Qui, Sex, Sáb]
     month_names: [~, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
@@ -59,6 +63,13 @@ pt-PT:
       over_x_years:
         one: "mais de 1 ano"
         other: "mais de {{count}} anos"
+    prompts:
+      year: "Ano"
+      month: "Mês"
+      day: "Dia"
+      hour: "Hora"
+      minute: "Minuto"
+      second: "Segundo"
         
   number:
     format:
@@ -69,7 +80,7 @@ pt-PT:
       format:
         unit: '€'
         precision: 2
-        format: "%u %n"
+        format: "%u%n"
         separator: ','
         delimiter: '.'
     percentage:
@@ -82,6 +93,16 @@ pt-PT:
       format:
         precision: 1
         delimiter: ''
+      storage_units:
+        format:
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   activerecord:
     errors:

vendor/plugins/rails-i18n/locale/rm.yml

@@ -0,0 +1,134 @@
+# Romansh translations for Ruby on Rails 
+# by Flurina Andriuet and Sebastian de Castelberg (rails-i18n@kpricorn.org)
+
+rm:
+  date:
+    formats:
+      default: "%d.%m.%Y"
+      short: "%e. %b"
+      long: "%e. %B %Y"
+
+    day_names: [dumengia, glindesdi, mardi, mesemna, gievgia, venderdi, sonda]
+    abbr_day_names: [du, gli, ma, me, gie, ve, so]
+    month_names: [~, schaner, favrer, mars, avrigl, matg, zercladur, fanadur, avust, settember, october, november, december]
+    abbr_month_names: [~, schan, favr, mars, avr, matg, zercl, fan, avust, sett, oct, nov, dec]
+    order: [ :day, :month, :year ]
+  
+  time:
+    formats:
+      default: "%A, %d. %B %Y, %H:%M Uhr"
+      short: "%d. %B, %H:%M Uhr"
+      long: "%A, %d. %B %Y, %H:%M Uhr"
+    am: "avantmezdi"
+    pm: "suentermezdi"
+      
+  datetime:
+    distance_in_words:
+      half_a_minute: "ina mesa minuta"
+      less_than_x_seconds:
+        one: "main ch’ina secunda"
+        other: "main che {{count}} secundas"
+      x_seconds:
+        one: "ina secunda"
+        other: "{{count}} secundas"
+      less_than_x_minutes:
+        one: "main ch’ina minuta"
+        other: "main che {{count}} minutas"
+      x_minutes:
+        one: "1 minuta"
+        other: "{{count}} minutas"
+      about_x_hours:
+        one: "circa in'ura"
+        other: "circa {{count}} uras"
+      x_days:
+        one: "in di"
+        other: "{{count}} dis"
+      about_x_months:
+        one: "circa in mais"
+        other: "circa {{count}} mais"
+      x_months:
+        one: "in mais"
+        other: "{{count}} mais"
+      about_x_years:
+        one: "circa in onn"
+        other: "circa {{count}} onns"
+      over_x_years:
+        one: "dapli ch'in onn"
+        other: "dapli che {{count}} onns"
+    prompts:
+      second: "secundas"
+      minute: "minutas"
+      hour: "uras"
+      day: "dis"
+      month: "mais"
+      year: "onns"
+
+  number:
+    format:
+      precision: 2
+      separator: "."
+      delimiter: "'"
+    currency:
+      format:
+        precision: 2
+        separator: "."
+        delimiter: "'"
+        unit: "CHF"
+        format: "%n %u"
+    percentage:
+      format:
+        delimiter: ""
+    precision:
+      format:
+        delimiter: ""
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "byte"
+            other: "bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " e "
+      last_word_connector: " e "
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "Betg pussaivel da memorisar quest {{model}}: 1 errur."
+          other:  "Betg pussaivel da memorisar quest {{model}}: {{count}} errurs."
+        body: "Faschai uschè bain e controllai ils suandants champs:"
+
+      messages:
+        inclusion: "n'è betg sin la glista"
+        exclusion: "na stat betg a disposiziun"
+        invalid: "n'è betg valid"
+        confirmation: "na correspunda betg al champ da conferma"
+        accepted: "sto vegnir acceptà"
+        empty: "sto vegnir emplenì ora"
+        blank: "sto vegnir emplenì ora"
+        too_long: "è memia lung (betg dapli che {{count}} caracters)"
+        too_short: "è memia curt (betg pli pauc che {{count}} caracters)"
+        wrong_length: "ha la fallida lunghezza (sto avair {{count}} caracters)"
+        taken: "è gia occupà"
+        not_a_number: "è betg in dumber"
+        greater_than: "sto esser pli grond che {{count}}"
+        greater_than_or_equal_to: "sto esser pli grond u medem sco {{count}}"
+        equal_to: "sto esser exact {{count}}"
+        less_than: "sto esser pli pitschen che {{count}}"
+        less_than_or_equal_to: "sto esser pli pitschen u medem sco {{count}}"
+        odd: "sto esser spèr"
+        even: "sto esser pèr"

vendor/plugins/rails-i18n/locale/ru.yml

@@ -144,6 +144,11 @@ ru:
       minute: "Минут"
       second: "Секунд"
 
+  support:
+    select:
+      # default value for :prompt => true in FormOptionsHelper
+      prompt: "Выберите: "
+
   activerecord:
     errors:
       template:
@@ -187,6 +192,11 @@ ru:
         less_than_or_equal_to: "может иметь значение меньшее или равное {{count}}"
         odd: "может иметь лишь четное значение"
         even: "может иметь лишь нечетное значение"
+        record_invalid: "Возникли ошибки: {{errors}}"
+        
+      full_messages:
+        format: "{{attribute}} {{message}}"
+        
 
   support:
     array:

vendor/plugins/rails-i18n/locale/sk.yml

@@ -0,0 +1,139 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+# Slovak translations for Ruby on Rails (inspired by the Czech localization - thanx to Karel Minařík)
+# by Jozef Fulop (jofi-rails@silake.com)
+ 
+sk:
+    # ActiveSupport
+    support:
+        array:
+            words_connector: ', '
+            two_words_connector: ' a '
+            last_word_connector: ' a '
+                
+    # Date
+    date:
+        formats:
+            default: "%d. %m. %Y"
+            short: "%d %b"
+            long: "%d. %B %Y"
+        day_names: [Nedeľa, Pondelok, Utorok, Streda, Štvrtok, Piatok, Sobota]
+        abbr_day_names: [Ne, Po, Ut, St, Št, Pi, So]
+        month_names: [~, Január, Február, Marec, Apríl, Máj, Jún, Júl, August, September, Október, November, December]
+        abbr_month_names: [~, Jan, Feb, Mar, Apr, Máj, Jún, Júl, Aug, Sep, Okt, Nov, Dec]
+        order: [:day, :month, :year]
+
+    # Time
+    time:
+        formats:
+            default: "%a %d. %B %Y %H:%M %z"
+            short: "%d. %m. %H:%M"
+            long: "%A %d. %B %Y %H:%M"
+        am: 'dopoludnia'
+        pm: 'popoludní'
+
+    # Numbers
+    number:
+        format:
+            precision: 3
+            separator: '.'
+            delimiter: ','
+        currency:
+            format:
+                unit: '€'
+                precision: 2
+                format: '%n %u'
+                separator: ","
+                delimiter: " "
+        human:
+            format:
+                precision: 1
+                delimiter: ''
+            storage_units:
+                format: "%n %u"
+                units:
+                    byte:
+                        other: "B"
+                        one: "B"
+                    kb: "KB"
+                    mb: "MB"
+                    gb: "GB"
+                    tb: "TB"
+        percentage:
+            format:
+                delimiter: ''
+        precision:
+            format:
+                delimiter: ''
+    
+    # Distance of time ... helper
+    datetime:
+        prompts:
+            second: "Sekunda"
+            minute: "Minúta"
+            hour: "Hodina"
+            day: "Deň"
+            month: "Mesiac"
+            year: "Rok"
+        distance_in_words:    
+            half_a_minute: 'pol minutou'
+            less_than_x_seconds:
+                one: 'asi pred sekundou'
+                other: 'asi pred {{count}} sekundami'
+            x_seconds:
+                one: 'sekundou'
+                other: '{{count}} sekundami'
+            less_than_x_minutes:
+                one: 'pred necelou minútou'
+                other: 'pred ani nie {{count}} minútami'
+            x_minutes:
+                one: 'minútou'
+                other: '{{count}} minútami'
+            about_x_hours:
+                one: 'asi hodinou'
+                other: 'asi {{count}} hodinami'
+            x_days:
+                one: '24 hodinami'
+                other: '{{count}} dňami'
+            about_x_months:
+                one: 'asi mesiacom'
+                other: 'asi {{count}} mesiacmi'
+            x_months:
+                one: 'mesiacom'
+                other: '{{count}} mesiacmi'
+            about_x_years:
+                one: 'asi rokom'
+                other: 'asi {{count}} rokmi'
+            over_x_years:
+                one: 'pred viac ako rokom'
+                other: 'viac ako {{count}} rokmi'
+
+    # ActiveRecord validation messages
+    activerecord:                  
+        errors:
+            messages:
+                inclusion: "nie je v zozname povolených hodnôt"
+                exclusion: "je vyhradené pre iný účel"
+                invalid: "nie je platná hodnota"
+                confirmation: "nebolo potvrdené"
+                accepted: "musí byť potvrdené"
+                empty: "nesmie byť prázdný/é"
+                blank: "je povinná položka"
+                too_long: "je príliš dlhá/ý (max. {{count}} znakov)"
+                too_short: "je príliš krátký/á (min. {{count}} znakov)"
+                wrong_length: "nemá správnu dĺžku (očakáva sa {{count}} znakov)"
+                taken: "sa už nachádza v databáze"
+                not_a_number: "nie je číslo"
+                greater_than: "musí byť väčšíe ako {{count}}"
+                greater_than_or_equal_to: "musí byť väčšie alebo rovnaké ako {{count}}"
+                equal_to: "sa musí rovnať {{count}}"
+                less_than: "musí byť menšie ako {{count}}"
+                less_than_or_equal_to: "musí byť menšie ako {{count}}"
+                odd: "musí byť nepárne číslo"
+                even: "musí byť párne číslo"
+            template:
+                header:
+                    one: "Pri ukladaní objektu {{model}} došlo k chybám a nebolo možné objekt uložiť"
+                    other: "Pri ukladaní objektu {{model}} došlo ku {{count}} chybe/ám a nebolo možné objekt uložiť"
+                body: "Nasledujúce polia obsahujú chybne vyplnené údaje:"

vendor/plugins/rails-i18n/locale/sw.yml

@@ -2,65 +2,65 @@
 # by Joachim Mangilima (joachimm3@gmail.com) and Matthew Todd (http://matthewtodd.org)
 
 sw:
-  # date:
-  #   formats:
-  #     default: "%d.%m.%Y"
-  #     short: "%e. %b"
-  #     long: "%e. %B %Y"
-  #     only_day: "%e"
-  # 
-  #   day_names: [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag]
-  #   abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa]
-  #   month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
-  #   abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
-  #   order: [ :day, :month, :year ]
-  # 
+  date:
+    formats:
+      default: "%Y-%m-%d"
+      # the short and long date formats are temporary until I can talk with someone...
+      short: "%e ya %b"
+      long: "%e ya %B, %Y"
+
+    day_names: [Jumpili, Jumatatu, Jumanne, Jumatano, Alhamisi, Ijumaa, Jumamosi]
+    abbr_day_names: [J2, J3, J4, J5, Al, Ij, J1]
+    month_names: [~, Januari, Februari, Machi, Aprili, Mei, Juni, Julai, Agosti, Septemba, Oktoba, Novemba, Desemba]
+    # these abbreviated month names are temporary until I can talk with someone...
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+    order: [ :year, :month, :day ]
+
   # time:
   #   formats:
   #     default: "%A, %e. %B %Y, %H:%M Uhr"
   #     short: "%e. %B, %H:%M Uhr"
   #     long: "%A, %e. %B %Y, %H:%M Uhr"
-  #     time: "%H:%M"
-  # 
+  #
   #   am: "vormittags"
   #   pm: "nachmittags"
-  #     
-  # datetime:
-  #   distance_in_words:
-  #     half_a_minute: 'eine halbe Minute'
-  #     less_than_x_seconds:
-  #       zero: 'weniger als 1 Sekunde'
-  #       one: 'weniger als 1 Sekunde'
-  #       other: 'weniger als {{count}} Sekunden'
-  #     x_seconds:
-  #       one: '1 Sekunde'
-  #       other: '{{count}} Sekunden'
-  #     less_than_x_minutes:
-  #       zero: 'weniger als 1 Minute'
-  #       one: 'weniger als eine Minute'
-  #       other: 'weniger als {{count}} Minuten'
-  #     x_minutes:
-  #       one: '1 Minute'
-  #       other: '{{count}} Minuten'
-  #     about_x_hours:
-  #       one: 'etwa 1 Stunde'
-  #       other: 'etwa {{count}} Stunden'
-  #     x_days:
-  #       one: '1 Tag'
-  #       other: '{{count}} Tage'
-  #     about_x_months:
-  #       one: 'etwa 1 Monat'
-  #       other: 'etwa {{count}} Monate'
-  #     x_months:
-  #       one: '1 Monat'
-  #       other: '{{count}} Monate'
-  #     about_x_years:
-  #       one: 'etwa 1 Jahr'
-  #       other: 'etwa {{count}} Jahre'
-  #     over_x_years:
-  #       one: 'mehr als 1 Jahr'
-  #       other: 'mehr als {{count}} Jahre'
-  #     
+
+  datetime:
+    distance_in_words:
+      half_a_minute: 'nusu dakika'
+      less_than_x_seconds:
+        zero: 'chini ya sekunde 1'
+        one: 'chini ya sekunde 1'
+        other: 'chini ya sekunde {{count}}'
+      x_seconds:
+        one: 'sekunde 1'
+        other: 'sekunde {{count}}'
+      less_than_x_minutes:
+        zero: 'chini ya dakika 1'
+        one: 'chini ya dakika 1'
+        other: 'chini ya dakika {{count}}'
+      x_minutes:
+        one: 'dakika 1'
+        other: 'dakika {{count}}'
+      about_x_hours:
+        one: 'kama saa 1'
+        other: 'kama masaa {{count}}'
+      x_days:
+        one: 'siku 1'
+        other: 'siku {{count}}'
+      about_x_months:
+        one: 'kama mwezi 1'
+        other: 'kama miezi {{count}}'
+      x_months:
+        one: 'mwezi 1'
+        other: 'miezi {{count}}'
+      about_x_years:
+        one: 'kama mwaka 1'
+        other: 'kama miaka {{count}}'
+      over_x_years:
+        one: 'zaidi ya mwaka 1'
+        other: 'zaidi ya miaka {{count}}'
+  #
   # number:
   #   format:
   #     precision: 2
@@ -70,9 +70,9 @@ sw:
   #     format:
   #       unit: '€'
   #       format: '%n%u'
-  #       separator: 
-  #       delimiter: 
-  #       precision: 
+  #       separator:
+  #       delimiter:
+  #       precision:
   #   percentage:
   #     format:
   #       delimiter: ""
@@ -83,13 +83,13 @@ sw:
   #     format:
   #       delimiter: ""
   #       precision: 1
-  # 
+  #
   support:
     array:
       words_connector: ", "
       two_words_connector: " na "
       last_word_connector: ", na "
-        
+
   activerecord:
     errors:
       # template:
@@ -97,7 +97,7 @@ sw:
       #     one:    "Konnte dieses {{model}} Objekt nicht speichern: 1 Fehler."
       #     other:  "Konnte dieses {{model}} Objekt nicht speichern: {{count}} Fehler."
       #   body: "Bitte überprüfen Sie die folgenden Felder:"
-  
+
       # The values :model, :attribute and :value are always available for interpolation
       # The value :count is available when applicable. Can be used for pluralization.
       messages: