Updated from Translatewiki with ''perl script/locale/merge-from-translatewiki''

2009-09-30 10:58:00 +00:00 · 2009-09-30 10:58:00 +00:00 · 5a76cbe760
commit 5a76cbe760
parent cd599a2998
26 changed files with 1473 additions and 83 deletions
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@ -49,6 +49,9 @@ af:
      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
@ -187,13 +190,16 @@ af:
      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
@ -210,6 +216,7 @@ af:
      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
@ -217,12 +224,28 @@ af:
      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
+      longitude: "Lengte:"
+      manually_select: Kies 'n ander gebied handmatig
      max: max
      options: Voorkeure
+      osm_xml_data: OpenStreetMap XML-data
+      output: Afvoer
      scale: Skaal
+      zoom: Zoom
    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: 
@ -266,6 +289,7 @@ af:
    edit_tooltip: Wysig kaarte
    export: Eksporteer
    help_wiki: Help &amp; Wiki
+    help_wiki_tooltip: Help en wiki vir die projek
    history: Geskiedenis
    home: tuis
    home_tooltip: Gaan na tuisligging
@ -275,14 +299,17 @@ af:
      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: 
@ -365,6 +392,10 @@ af:
      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
@ -397,6 +428,8 @@ af:
          commercial: Kommersiële gebied
          common: 
            - weide
+            - weide
+          construction: Paaie onder konstruksie
          cycleway: Fietspad
          farm: Plaas
          footway: Voetpad
@ -426,6 +459,8 @@ af:
            - piek
          tourist: Toerisme-trekpleister
          track: Spoor
+          unclassified: Ongeklassifiseerde pad
+          unsurfaced: Grondpad
          wood: Bos
    search: 
      search: Soek
@ -499,6 +534,7 @@ af:
      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:"
@ -511,6 +547,7 @@ af:
      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!
@ -527,7 +564,9 @@ af:
      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.
@ -536,6 +575,7 @@ af:
    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:"
@ -554,6 +594,8 @@ af:
      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
@ -573,7 +615,9 @@ af:
      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
--- a/config/locales/be-TARASK.yml
+++ b/config/locales/be-TARASK.yml
@ -17,6 +17,7 @@ be-TARASK:
      country: Краіна
      language: Мова
      node: Вузел
+      session: Сэсыя
      way: Шлях
  browse: 
    common_details: 
@ -102,11 +103,13 @@ be-TARASK:
      subject: Тэма
    message_summary: 
      delete_button: Выдаліць
+      reply_button: Адказаць
    new: 
      subject: Тэма
    outbox: 
      subject: Тэма
    read: 
+      reply_button: Адказаць
      subject: Тэма
    sent_message_summary: 
      delete_button: Выдаліць
@ -116,12 +119,16 @@ be-TARASK:
  trace: 
    edit: 
      description: "Апісаньне:"
+      edit: рэдагаваць
      filename: "Назва файла:"
      save_button: Захаваць зьмены
+    trace: 
+      edit: рэдагаваць
    trace_form: 
      description: Апісаньне
    view: 
      description: "Апісаньне:"
+      edit: рэдагаваць
      filename: "Назва файла:"
  user: 
    account: 
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@ -479,9 +479,9 @@ be:
      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}} і яго карыстальнікамі.
--- a/config/locales/br.yml
+++ b/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,14 @@ 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
@ -73,6 +79,7 @@ br:
      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 :"
@ -217,6 +224,7 @@ 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: 
@ -242,28 +250,51 @@ 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: 
+        title: Enmonedoù en deizlevr OpenStreetMap
    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ñ
+      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: 
+      heading: "Enmoned ebet gant an id : {{id}}"
+      title: Enmoned ebet evel-se en deizlevr
    no_such_user: 
+      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ñ
      user_title: Deizlevr {{user}}
  export: 
@ -284,6 +315,7 @@ 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
@ -291,6 +323,7 @@ br:
      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
@ -323,9 +356,11 @@ br:
        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_link_text: oc'h ober un donezon
@ -340,17 +375,20 @@ br:
    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
    log_in: kevreañ
+    log_in_tooltip: Kevreañ gant ur gont zo anezhi dija
    logo: 
      alt_text: Logo OpenStreetMap
    logout: digevreañ
    logout_tooltip: Digevreañ
    shop: Stal
+    shop_tooltip: Stal gant produioù OpenStreetMap
    sign_up: En em enskrivañ
    sign_up_tooltip: Krouiñ ur gont evit aozañ
    user_diaries: Deizlevrioù an implijer
@ -364,13 +402,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
@ -387,14 +430,19 @@ br:
      send_message_to: Kas ur gemennadenn nevez da {{name}}
      subject: Danvez
      title: Kas ur gemennadenn
+    no_such_user: 
+      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}}
      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
@ -414,40 +462,58 @@ br:
      banner1: "*                  Na respontit ket d'ar postel-mañ, mar plij                                                 *"
      banner2: "*                Implijt lec'hienn web OpenStreetMap web site evit respont                           *"
      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,
    email_confirm_plain: 
      greeting: Demat,
      hopefully_you_2: "{{server_url}} da {{new_address}}."
+    friend_notification: 
+      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: 
        more_info_2: "a c'hall bezañ kavet war :"
      greeting: Demat,
+      success: 
+        subject: "[OpenStreetMap] Graet eo an enporzhiadenn GPX"
      with_description: gant an deskrivadur
+    lost_password: 
+      subject: "[OpenStreetMap] Goulenn adderaouekaat ar ger-tremen"
    lost_password_html: 
      greeting: Demat,
    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_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}}
      hi: Demat {{to_user}},
+    signup_confirm: 
+      subject: "[OpenStreetMap] Kadarnaat ho chomlec'h postel"
    signup_confirm_html: 
      greeting: Demat !
      introductory_video: Gallout a rit sellet ouzh un {{introductory_video_link}}.
      more_videos: Bez' ez eus {{more_videos_link}}.
      more_videos_here: muioc'h a videoioù amañ
+      video_to_openstreetmap: video evit kregiñ gant OpenStreetMap
    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
      current_user_2: "a c'haller kaout diwar :"
      greeting: Demat !
      more_videos: "Muioc'h a videoioù zo amañ :"
+      the_wiki: "Lennit traoù diwar-benn OpenStreetMap war ar wiki :"
  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_gpx: kas roudoù GPS.
@ -457,24 +523,39 @@ br:
      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_gpx: kas roudoù GPS.
+      allow_write_prefs: kemmañ e benndibaboù implijer.
      name: Anv
      required: Rekis
+      support_url: URL skoazell
      url: URL pennañ an arload
    index: 
      application: Anv an arload
      issued_at: Kaset da
+      my_apps: Ma arloadoù arvalien
      my_tokens: Ma arloadoù aotreet
+      register_new: Marilhañ hoc'h arload
      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: 
      allow_read_gpx: lenn o roudoù GPS prevez.
+      allow_read_prefs: lenn e benndibaboù implijer.
      allow_write_api: kemmañ ar gartenn.
      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 :"
+      secret: "Sekred an implijer :"
+      title: Munudoù OAuth evit {{app_name}}
      url: "URL ar jedouer reked :"
    update: 
      flash: Hizivaet eo bet titouroù an arval
@ -485,6 +566,7 @@ br:
      user_page_link: pajenn implijer
    index: 
      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
        project_name: raktres OpenStreetMap
      permalink: Permalink
      shortlink: Liamm berr
@ -496,6 +578,8 @@ br:
          allotments: Lodennaouegoù
          apron: 
            - Roudenn aerborzh
+            - termenva
+          bridge: Bord du = pont
          bridleway: Hent evit kezeg
          brownfield: Takad greanterezh
          building: Savadur pouezus
@ -507,6 +591,7 @@ br:
          commercial: Takad kenwerzhel
          common: 
            - prad
+            - prad
          construction: Hentoù war ar stern
          cycleway: Roudenn divrodegoù
          farm: Ti-feurm
@ -521,7 +606,9 @@ br:
          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
@ -529,9 +616,11 @@ br:
          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: 
@ -542,6 +631,7 @@ br:
            - tramgarr
            - tramgarr
          trunk: Hent broadel
+          tunnel: Bord poentoùigoù = riboul
          unclassified: Hent n'eo ket rummet
          unsurfaced: Hent n'eo ket goloet
          wood: Koad
@ -583,6 +673,7 @@ br:
    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: 
@ -641,13 +732,17 @@ br:
  user: 
    account: 
      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 ?
@ -655,6 +750,7 @@ 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.
@ -666,12 +762,15 @@ br:
      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ñ
@ -684,21 +783,26 @@ br:
      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.
      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.
      heading: Krouiñ ur gont implijer
+      no_auto_account_create: Siwazh n'omp ket evit krouiñ ur gont evidoc'h ent emgefreek.
      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: 
@ -712,6 +816,8 @@ br:
      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
@ -730,7 +836,10 @@ br:
      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ù
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -825,7 +825,7 @@ de:
      visibility: "Sichtbarkeit:"
    visibility: 
      identifiable: Identifiable (shown in trace list and as identifiable, ordered points with timestamps)
-      private: Private (only shared as anonymous, unordered points)
+      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)
  user: 
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -635,8 +635,8 @@ es:
      not_public: No has configurado tus ediciones como públicas.
      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
        project_name: Proyecto OpenStreetMap
@ -644,14 +644,21 @@ es:
      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
+          cable: 
+            - Telecabina
+            - Telesilla
          cemetery: Cementerio
          centre: Centro deportivo
          commercial: Zona comercial
@ -664,6 +671,7 @@ es:
          footway: Vía peatonal
          forest: Bosque
          golf: Pista de golf
+          heathland: Landa
          industrial: Zona industrial
          lake: 
            - Lago
@ -672,22 +680,31 @@ 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
          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
@ -829,6 +846,8 @@ 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: 
      create_account: crear una cuenta
      email or username: Dirección de correo o nombre de usuario
@ -869,6 +888,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
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -226,6 +226,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: 
@ -608,6 +609,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 !
@ -679,6 +681,7 @@ fr:
            - Prairie
          construction: Routes en construction
          cycleway: Voie cyclable
+          destination: Accès de la destination
          farm: Ferme
          footway: Voie piétonne
          forest: Forêt
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@ -99,6 +99,7 @@ gsw:
        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
@ -153,3 +154,35 @@ 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: "Tags:"
+      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."
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@ -1,6 +1,8 @@
 he: 
  activerecord: 
    attributes: 
+      diary_comment: 
+        body: Body
      diary_entry: 
        language: שפה
        latitude: קו רוחב
@ -23,37 +25,207 @@ he:
        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
+    changeset_details: 
+      belongs_to: "שייך ל־:"
+      bounding_box: "תיבה תוחמת:"
+      box: תיבה
+      closed_at: "Closed at:"
+      created_at: "נוצר בתאריך:"
+      no_bounding_box: No bounding box has been stored for this changeset.
+      show_area_box: Show Area Box
+    changeset_navigation: 
+      user: 
+        name_tooltip: צפייה בעריכות של {{user}}
+        next_tooltip: העריכה הבאה ע"י {{user}}
+        prev_tooltip: העריכה הקודמת ע"י {{user}}
+    common_details: 
+      changeset_comment: "הערה:"
+      edited_at: "Edited at:"
+      edited_by: "Edited by:"
+      in_changeset: "In changeset:"
+      version: "Version:"
+    containing_relation: 
+      entry: קשר {{relation_name}}
+      entry_role: קשר {{relation_name}} (בתור {{relation_role}})
+    map: 
+      deleted: נמחק
+      larger: 
+        area: צפייה בשטח במפה גדולה יותר
+        node: צפייה בצומת במפה גדולה יותר
+        relation: צפייה בקשר במפה גדולה יותר
+        way: צפייה בדרך במפה גדולה יותר
+      loading: בטעינה...
    node: 
+      download: "{{download_xml_link}} או {{view_history_link}}"
+      download_xml: הורדת XML
      edit: עריכה
+      node: צומת
+      node_title: "צומת: {{node_name}}"
+      view_history: צפייה בהיסטוריה
+    node_details: 
+      coordinates: "קואורדינטות:"
+      part_of: "חלק מ־:"
+    node_history: 
+      download: "{{download_xml_link}} or {{view_details_link}}"
+      download_xml: הורדת XML
+      node_history: היסטוריית הצומת
      node_history_title: "היסטוריית הצומת: {{node_name}}"
+      view_details: צפייה בפרטים
    not_found: 
+      sorry: אנו מתנצלים, אך ה{{type}} בעל המזהה {{id}}, לא נמצא.
      type: 
        node: צומת
        relation: קשר
        way: דרך
+    paging_nav: 
+      of: מתוך
+      showing_page: הצגת דף
+    relation: 
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: Download XML
+      relation: קשר
+      relation_title: "Relation: {{relation_name}}"
+      view_history: view history
+    relation_details: 
+      members: "חברים:"
+      part_of: "חלק מ־:"
+    relation_history: 
+      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: 
+      manually_select: Manually select a different area
+      view_data: View data for current map view
+    start_rjs: 
+      data_frame_title: נתונים
+      data_layer_name: נתונים
+      details: פרטים
+      drag_a_box: Drag a box on the map to select an area
+      edited_by_user_at_timestamp: נערך על ידי [[user]] ב־[[timestamp]]
+      history_for_feature: ההיסטוריה של [[feature]]
+      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: בטעינה...
+      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: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
+      wait: נא להמתין...
+      zoom_or_select: התקרבות או בחירה אזור במפה לצפייה
+    tag_details: 
+      tags: "תגיות:"
    way: 
+      download: "{{download_xml_link}} או {{view_history_link}}"
+      download_xml: הורדת XML
      edit: עריכה
+      view_history: צפייה בהיסטוריה
+      way: דרך
+      way_title: "דרך: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: גם כן חלק מהדרך {{related_ways}}
+        other: גם כן חלק מהדרכים {{related_ways}}
+      nodes: "צמתים:"
+      part_of: "חלק מ־:"
+    way_history: 
+      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}}תגובה מ"
@ -61,40 +233,521 @@ 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: 
+      in_language_title: רשומות יומן ב{{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_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
+      login: כניסה
+      login_to_leave_a_comment: בצעו {{login_link}} כדי להשאיר תגובה
+      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: 
+      types: 
+        cities: ערים
+        places: מקומות
+        towns: עיירות
+    direction: 
+      east: מזרח
+      north: צפון
+      north_east: צפון-מזרח
+      north_west: צפון-מערב
+      south: דרום
+      south_east: דרום-מזרח
+      south_west: דרום-מערב
+      west: מערב
+    distance: 
+      one: בערך קילומטר
+      other: בערך {{count}} ק"מ
+      zero: פחות מקילומטר
+    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_tooltip: עריכת מפות
    export: יצוא
+    export_tooltip: ייצוא נתוני המפה
+    gps_traces: GPS Traces
+    gps_traces_tooltip: ניהול מסלולים
+    help_wiki: Help &amp; Wiki
+    help_wiki_tooltip: עזרה ואתר ויקי עבור המיזם
    history: היסטוריה
    home: הביתה
+    home_tooltip: מעבר למיקום הבית
+    inbox: inbox ({{count}})
+    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: יציאה מהחשבון
+    logout_tooltip: ניתוק
+    news_blog: News blog
+    news_blog_tooltip: בלוג חדשות אודות OpenStreetMap, נתונים גאוגרפיים חופשיים וכו'.
+    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_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: צפייה ביומני המשתמש
    view: תצוגה
+    view_tooltip: צפייה במפות
    welcome_user: "{{user_link}}ברוך הבא"
+    welcome_user_link_tooltip: דף המשתמש שלך
  map: 
+    coordinates: "Coordinates:"
    edit: עריכה
    view: תצוגה
+  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: 
+      body: Sorry there is no user or message with that name or id
+      heading: No such user or message
+      title: אין כזה משתמש או הודעה
+    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}},
+    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:"
+  oauth: 
+    oauthorize: 
+      allow_read_prefs: קריאת העדפות המשתמש שלך.
+      allow_write_api: שינוי המפה.
+      allow_write_gpx: העלאת עקבות GPS.
+  site: 
+    edit: 
+      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:"
+      heading: עריכת המסלול {{name}}
+      map: מפה
+      owner: "Owner:"
+      points: "Points:"
+      save_button: Save Changes
+      start_coord: "Start coordinate:"
+      tags: "Tags:"
+      tags_help: מופרד בפסיקים
+      uploaded_at: "Uploaded at:"
+      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: 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
+      tags_help: מופרד בפסיקים
+      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: :תאור
+      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: "מיקום הבית:"
      latitude: :קו רוחב
      longitude: :קו אורך
+      make edits public button: Make all my edits public
+      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: מדוע איני יכול לערוך?
+        enabled: Enabled. Not anonymous and can edit data.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: מה זה?
+        heading: "Public editing:"
+      return to profile: Return to profile
+      save changes button: שמירת השינויים
+      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: אימות חשבון משתמש
+      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: מיקומך
+    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: יצירת חשבון
+      email or username: "Email Address or Username:"
+      heading: Login
+      login_button: כניסה
+      lost password link: Lost your password?
+      password: "סיסמה:"
+      please login: Please login or {{create_user_link}}.
+      title: כניסה
+    lost_password: 
+      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: "שם התצוגה:"
+      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: יצירת חשבון משתמש
+      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: "סיסמה:"
+      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: המשתמש {{user}} אינו קיים
+      title: אין משתמש כזה
+    remove_friend: 
+      not_a_friend: "{{name}} is not one of your friends."
+      success: "{{name}} was removed from your friends."
+    reset_password: 
+      confirm password: "אימות הסיסמה:"
+      flash changed: סיסמתך השתנתה.
+      flash token bad: Didn't find that token, check the URL maybe?
+      heading: איפוס הסיסמה עבור {{user}}
+      password: "סיסמה:"
+      reset: איפוס הסיסמה
+      title: reset password
+    set_home: 
+      flash success: Home location saved successfully
+    view: 
+      add as friend: add as friend
+      add image: הוספת תמונה
+      ago: (לפני {{time_in_words_ago}})
+      change your settings: שינוי ההגדרות שלך
+      delete image: מחיקת תמונה
+      description: תאור
+      diary: diary
+      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}} ק"מ
+      m away: במרחק {{count}} מ'
+      mapper since: "Mapper since:"
+      my diary: היומן שלי
+      my edits: העריכות שלי
+      my settings: my settings
+      my traces: my traces
+      my_oauth_details: צפייה בפרטי ה־OAuth שלי
+      nearby users: "Nearby users:"
+      new diary entry: רשומה חדשה ביומן
+      no friends: לא הוספת חברים כלל עדיין.
+      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: הסרה כחבר
+      send message: שליחת הודעה
+      settings_link_text: הגדרות
+      traces: מסלולים
+      upload an image: העלאת תמונה
+      user image heading: תמונת המשתמש
+      user location: User location
+      your friends: החברים שלך
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@ -498,9 +498,9 @@ hi:
      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.
+      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: ओपन स्ट्रीट मेप परियोजना
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@ -419,7 +419,7 @@ 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 wikikarta
+    tag_line: Swobodna swětowa karta
    user_diaries: Dźeniki
    user_diaries_tooltip: Wužiwarske dźeniki čitać
    view: Karta
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@ -652,9 +652,9 @@ 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."
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@ -395,9 +395,9 @@ 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.
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -549,9 +549,9 @@ ja:
      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}} ライセンスの元提供されています。"
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@ -483,8 +483,8 @@ ko:
      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.
+      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.
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@ -754,13 +754,13 @@ nl:
      trace_details: Trackdetails bekijken
      view_map: Kaart bekijken
    trace_form: 
-      description: Beschrijving
+      description: "Beschrijving:"
      help: Help
-      tags: Labels
+      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
@ -791,6 +791,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)
@ -890,7 +895,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
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@ -1,55 +1,115 @@
 "no": 
  activerecord: 
    attributes: 
+      diary_comment: 
+        body: Kropp
      diary_entry: 
+        language: Språk
+        latitude: Breddegrad
+        longitude: "Lengdegrad:"
        user: Bruker
      friend: 
+        friend: Venn
+        user: Bruker
+      message: 
+        body: Kropp
+      trace: 
+        description: Beskrivelse
+        latitude: Breddegrad
+        longitude: "Lengdegrad:"
+        name: Navn
+        public: Offentlig
+        size: Størrelse
        user: Bruker
      user: 
+        description: Beskrivelse
        display_name: Visningsnavn
+        email: E-post
+        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: Node
+      node_tag: Nodemerkelapp
+      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
+      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}}
+        title_comment: "Endringssett: {{id}} - {{comment}}"
      osmchangexml: osmChange XML
      title: Endringssett
    changeset_details: 
-      belongs_to: "Hører til:"
-      bounding_box: "Ytre grense:"
+      belongs_to: "Tilhører:"
+      bounding_box: "Bounding box:"
      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
@ -63,23 +123,24 @@
    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,28 +148,31 @@
    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
@ -119,17 +183,17 @@
        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 +203,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 +213,419 @@
      view_details: vis detaljer
      way_history: Veihistorikk
      way_history_title: "Veihistorikk: {{way_name}}"
-  map: 
+  changeset: 
+    changeset: 
+      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
+      id: ID
+      saved_at: Lagret
+      user: Bruker
+    list: 
+      description: Siste endringer
+      description_bbox: Endringssett innenfor {{bbox}}
+      description_user: Endringssett av {{user}}
+      heading: Endringssett
+      heading_bbox: Endringssett
+      heading_user: Endringssett
+      heading_user_bbox: Endringssett
+      title: Endringssett
+      title_bbox: Endringssett innenfor {{bbox}}
+      title_user: Endringssett av {{user}}
+  diary_entry: 
+    diary_entry: 
+      comment_count: 
+        one: 1 kommentar
+        other: "{{count}} kommentarer"
+      edit_link: Rediger denne oppføringen
+    edit: 
+      body: "Kropp:"
+      language: "Språk:"
+      latitude: "Breddegrad:"
+      location: "Posisjon:"
+      longitude: "Lengdegrad:"
+      marker_text: Rediger dagboksoppføring
+      save_button: Lagre
+      subject: "Emne:"
+      title: Rediger dagboksoppføring
+      use_map_link: bruk kart
+    feed: 
+      all: 
+        title: Ingen dagbokoppføringer
+    list: 
+      new: Rediger dagboksoppføring
+      newer_entries: Ingen dagbokoppføringer
+      no_entries: Ingen dagbokoppføringer
+      older_entries: Ingen dagbokoppføringer
+      recent_entries: Ingen dagbokoppføringer
+      title: Brukernes dagbøker
+      user_title: Dagboken for {{user}}
+    new: 
+      title: Rediger dagboksoppføring
+    no_such_user: 
+      heading: Brukeren {{user}} finnes ikke
+      title: Ingen bruker funnet
+    view: 
+      leave_a_comment: Legg igjen en kommentar
+      save_button: Lagre
+      title: Brukernes dagbok | {{user}}
+      user_title: Dagboken for {{user}}
+  export: 
+    start: 
+      area_to_export: Område som skal eksporteres
+      export_button: Eksporter
+      format: Format
+      format_to_export: Format for eksport
+      image_size: Bildestørrelse
+      manually_select: Velg et annet område manuelt
+      mapnik_image: Mapnik-bilde
+      osm_xml_data: OpenStreetMap XML-data
+      osmarender_image: Osmarender-bilde
+    start_rjs: 
+      change_marker: Endre markørposisjon
+      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_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} av {{type}}"
+    distance: 
+      one: omtrent 1 km
+      other: omtrent {{count}}km
+    results: 
+      no_results: Ingen resultat funnet
+    search_osm_namefinder: 
+      suffix_place: ", {{distance}} {{direction}} av {{placename}}"
+  layouts: 
    edit: Rediger
+    edit_tooltip: Rediger kart
+    export: Eksporter
+    export_tooltip: Eksporter kartdata
+    gps_traces: GPS-spor
+    gps_traces_tooltip: Behandle spor
+    history: Historikk
+    history_tooltip: Historikk for endringssett
+    home: hjem
+    inbox: innboks ({{count}})
+    log_in: logg inn
+    logo: 
+      alt_text: OpenStreetMap-logo
+    logout_tooltip: Logg ut
+    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
+      subject: Emne
+      title: Innboks
+    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_button: Send
+      send_message_to: Send en ny melding til {{navn}}
+      subject: Emne
+      title: Send melding
+    outbox: 
+      date: Dato
+      inbox: innboks
+      my_inbox: Min {{inbox_link}}
+      outbox: utboks
+      subject: Emne
+      title: Utboks
+      to: Til
+    read: 
+      back_to_inbox: Tilbake til innboks
+      back_to_outbox: Tilbake til utboks
+      date: Dato
+      from: Fra
+      reading_your_messages: Leser dine 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_html: 
+      greeting: Hei,
+    email_confirm_plain: 
+      greeting: Hei,
+    gpx_notification: 
+      and_no_tags: og ingen merkelapper.
+      and_the_tags: "og følgende merkelapper:"
+      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_html: 
+      greeting: Hei der!
+    signup_confirm_plain: 
+      greeting: Hei der!
+  oauth: 
+    oauthorize: 
+      allow_write_api: endre kartet.
+      allow_write_gpx: last opp GPS-spor.
+  oauth_clients: 
+    edit: 
+      submit: Rediger
+      title: Rediger ditt programvare
+    form: 
+      allow_write_api: endre kartet.
+      allow_write_gpx: last opp GPS-spor.
+      name: Navn
+      url: Rediger ditt programvare
+    index: 
+      application: Applikasjonsnavn
+      issued_at: Utstedt
+      my_apps: Min {{inbox_link}}
+      my_tokens: Min {{inbox_link}}
+      register_new: Registrer din applikasjon
+      title: Mine OAuth-detaljer
+    new: 
+      submit: Registrer
+      title: Registrer en ny applikasjon
+    not_found: 
+      sorry: Klarte ikke finne den {{type}}-en.
+    show: 
+      access_url: Tilgangskontrolliste
+      allow_write_api: endre kartet.
+      allow_write_gpx: last opp GPS-spor.
+      edit: Rediger detaljer
+      key: Kartnøkkel
+      url: "[OpenStreetMap] Forespørsel om ullstilling av passord"
+  site: 
+    edit: 
+      user_page_link: brukerside
+    index: 
+      license: 
+        project_name: OpenStreetMap XML-data
+    key: 
+      map_key: Kartnøkkel
+      table: 
+        entry: 
+          commercial: Kommersielt område
+          destination: Destinasjonstilgang
+          industrial: Industriområde
+          military: Militært område
+          permissive: Destinasjonstilgang
+          private: Privat tilgang
+          resident: Boligområde
+          retail: Militært område
+          track: Spor
+    sidebar: 
+      search_results: Ingen resultat funnet
+  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: 
+      home location: "Hjemmeposisjon:"
+      latitude: "Breddegrad:"
+      longitude: "Lengdegrad:"
+      my settings: Mine innstillinger
+      profile description: "Profilbeskrivelse:"
+      public editing: 
+        disabled link text: hvorfor can jeg ikke redigere?
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        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: Ingen bruker funnet
+      your location: Din posisjon
+    login: 
+      create_account: opprett en konto
+      email or username: "E-postadresse eller brukernavn:"
+      lost password link: Mistet passordet ditt?
+      password: "Passord:"
+    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:"
+      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"
+      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 dagboksoppfø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
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@ -400,7 +400,7 @@ 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.
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -648,9 +648,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.
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@ -560,9 +560,9 @@ ro:
      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.
+      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.
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@ -241,8 +241,8 @@ ru:
    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: Наборы изменений
@ -548,16 +548,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.
@ -644,7 +644,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 снимите выделение с пути или точки, если редактируете в «живом» режиме, либо нажмите кнопку «сохранить», если вы в режиме отложенного сохранения.)
--- a/config/locales/te.yml
+++ b/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: "ఈమెయిలు చిరునామా:"
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@ -565,6 +565,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:"
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@ -482,9 +482,9 @@ yo:
      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.
+      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.
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@ -418,9 +418,9 @@ zh-CN:
      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.
+      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.
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@ -647,9 +647,9 @@ 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}} 條款授權。