X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3993415cd99c77ce941e999153a167ea5060971c..7e7ede890e8e948236d3dbc48e24aca00cd01f62:/config/locales/diq.yml?ds=inline

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 69b7a28b4..49369bc9f 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -4,30 +4,67 @@
 # Author: 1917 Ekim Devrimi
 # Author: Asmen
 # Author: Erdemaslancan
+# Author: GolyatGeri
 # Author: Gorizon
+# Author: Gravitystorm
 # Author: Gırd
 # Author: Kumkumuk
 # Author: Marmase
 # Author: Mirzali
+# Author: Orbot707
 ---
 diq:
   time:
     formats:
       friendly: '%e %B %Y seate %H:%M'
+  helpers:
+    file:
+      prompt: Dosya weçinê
+    submit:
+      diary_comment:
+        create: Mışewre
+      diary_entry:
+        create: Vıla ke
+        update: Rocane ke
+      issue_comment:
+        create: Mışewre cı ke
+      message:
+        create: Bırışe
+      client_application:
+        create: Qeyd Be
+        update: Rocane kerê
+      oauth2_application:
+        create: Qeyd bıbe
+        update: Rocane kerên
+      redaction:
+        create: Redaksiyon vırazê
+        update: Redaksiyoni qeyd kerê
+      trace:
+        create: Bar ke
+        update: Vurnayışan qeyd ke
+      user_block:
+        create: Bloqe vırazê
+        update: Bloqi noroc resn
   activerecord:
+    errors:
+      messages:
+        display_name_is_user_n: n, hendık kamiya karkeriya şoma nêbo  user_n nêbeno.
+      models:
+        user_mute:
+          is_already_muted: Hora gêriyao bêveng
     models:
       acl: Qontrol Listeyê Resayışi
       changeset: Qeydê Vurnayışan
-      changeset_tag: Vurnayışê Etiketan
+      changeset_tag: Etiketê vırnayışi
       country: Dewlet
       diary_comment: Vatışê Rocan
       diary_entry: Deqewtışê Rocan
       friend: Embaz
+      issue: Mesel
       language: Zıwan
       message: Mesac
       node: Qedyin
       node_tag: Etiket Qedyin
-      notifier: Xeber ke
       old_node: Verên Qedya
       old_node_tag: Etiletê Qedyina Verên
       old_relation: Eleqeyo Verên
@@ -36,13 +73,14 @@ diq:
       old_way: Raya Verên
       old_way_node: Raya Verên Qedyin
       old_way_tag: Etiketê Rayda Verên
-      relation: Eleqe
-      relation_member: Ezay ronışey
-      relation_tag: Etikete ronışey
-      session: Ronışey
+      relation: Elaqe
+      relation_member: Ezayê Têkıliye
+      relation_tag: Etiketê Têkıliye
+      report: Rapor kerê
+      session: Ronıştış
       trace: Şop
-      tracepoint: Dawtey şopi
-      tracetag: Etikete şopi
+      tracepoint: Nuqtaya rêçe
+      tracetag: Etiketê rêçe
       user: Karber
       user_preference: Tercihê Karberi
       user_token: Moriya Karberi
@@ -50,118 +88,172 @@ diq:
       way_node: Ray Qedyin
       way_tag: Etikete ray
     attributes:
+      client_application:
+        name: Name (ganiyo)
+        url: Gıray Esas Aplikasyoni (ganiyo)
+        callback_url: Gırey Peyd Cıgeyrayışi
+        support_url: Gırey Destegi
+        allow_read_prefs: Tercihanê karberi bıwanê
+        allow_write_prefs: Tercihanê karberanê inan bıvurne
+        allow_write_diary: Embaz bıkerên, mışorê u rocek çiyeki vırazên
+        allow_write_api: Xeritay bıvurne
+        allow_read_gpx: Rêça GPSanê xısusiyan bıwane
+        allow_write_gpx: Şopanê GPSi bar kerê
+        allow_write_notes: Notan bıvurne
       diary_comment:
-        body: Vêrey mesaci
+        body: Metın
       diary_entry:
         user: Karber
         title: Mewzu
+        body: Metın
         latitude: Verıniye
         longitude: Derganiye
-        language: Zıwan
+        language_code: Zıwan
+      doorkeeper/application:
+        name: Name
+        redirect_uri: Sersıkıtışên URI
+        confidential: Na aplikasyona itimadına?
+        scopes: Desturi
       friend:
         user: Karber
         friend: Embaz
       trace:
         user: Karber
         visible: Aseno
-        name: Name
+        name: Namedosya
         size: Gırdiye
         latitude: Verıniye
         longitude: Derganiye
-        public: Şar
+        public: Pêroyi
         description: Şınasnayış
+        gpx_file: Dosyay GPXi bar kerê
+        visibility: Asayış
+        tagstring: Etiketi
       message:
         sender: Rıster
         title: Mewzu
-        body: Mesac
+        body: Metın
         recipient: Grotker
+      redaction:
+        title: Serek
+        description: Şınasnayış
+      report:
+        category: Qandê rapor jew sebeb weçinê
+        details: Serva mowzuy ziyedêr zanışge bıdêrên (zaruriyo)
       user:
-        email: E-posta
+        auth_provider: Taderikerê rastkerdeni
+        auth_uid: Raştkerdışê UID
+        email: E-poste
+        new_email: E-postay adresiyo neweh
         active: Aktiv
         display_name: Nameyo ke Aseno
-        description: Şınasnayış
-        languages: Zıwani
+        description: Şınasiya Profili
+        home_lat: 'Verıniye:'
+        home_lon: Derganiye
+        languages: Zıwanê tercihi
+        preferred_editor: Vurnayoğê tercihi
         pass_crypt: Parola
+        pass_crypt_confirmation: Parola tesdiq ke
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: nezdi %{count} saati veri
+        other: nezdi %{count} saatan veror
+      half_a_minute: Verê nim deqa
   editor:
     default: Hesabiyaye (%{name}yo nıkayên)
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (browser vurnayoğ)
     id:
       name: iD
       description: iD (browser vurnayoğ)
-    potlatch2:
-      name: Potlatch 1
-      description: Potlatch 2 (browser vurnayoğ)
     remote:
       name: Duri da qontrol
       description: Duri ra Qonrtol (JOSM yana  Merkaartor)
+  auth:
+    providers:
+      none: Çıniyo
+      google: Google
+      facebook: Facebook
+      github: GitHub
+      wikipedia: Wikipedia
+  api:
+    notes:
+      comment:
+        opened_at_html: '%{when} de vıraziyayo'
+        opened_at_by_html: Terefê %{user} ra %{when} de vıraziyayo
+        commented_at_html: '%{when} de rocaneyayo'
+        commented_at_by_html: Terefê %{user} ra %{when} de rocaneyayo
+      entry:
+        comment: Mışewre
+        full: Note pêro
+  accounts:
+    edit:
+      title: Hesabi bıvurne
+      my settings: Eyarê mı
+      current email address: 'E-postay şımaya newki:'
+      openid:
+        link text: no çıko?
+      public editing:
+        heading: 'Pêron rê akerde vurnayış:'
+        enabled link text: no çıko?
+        disabled link text: Ezo çı nêşena bıvurna?
+      contributor terms:
+        link text: no çıko?
+      save changes button: Vurnayışan qeyd ke
+    go_public:
+      heading: 'Pêron rê akerde vırnayış:'
   browse:
-    created: Vıraziye
-    closed: Racneya
-    created_html: <abbr title='%{title}'>%{time} veror</abbr> vıraziye
-    closed_html: <abbr title='%{title}'>%{time} veror</abbr> racneye
     version: Versiyon
+    redacted_version: Timariyın ramıtek
     in_changeset: Qeydê Vurnayışan
     anonymous: anonim
     no_comment: (be vatış)
     part_of: Letey
+    part_of_relations:
+      one: '%{count} eleqe '
+      other: '%{count} eleqey'
+    part_of_ways:
+      one: 1 ray
+      other: '%{count} rayi'
     download_xml: XML ron
-    view_history: Tarixi Bıvêne
+    view_history: Verêni bıvêne
     view_details: Teferuatan Bıvêne
     location: 'Lokasyon:'
-    changeset:
-      title: 'Koma vurnayışi: %{id}'
-      belongs_to: Nuştekar
-      node: '%{count} noqtey'
-      node_paginated: pero piya (%{x}-%{y} - %{count}) noqtey
-      way: '%{count} ray'
-      way_paginated: Ray (%{x}-%{y} - pêro piya  %{count})
-      relation: Eleqey %{count}
-      relation_paginated: Eleqey %{x}-%{y} pêro piya %{count}
-      comment: Mışewreyi (%{count})
-      changesetxml: Vurnayışê peyênê XML
-      osmchangexml: OsmVurnayışê XML
-      feed:
-        title: 'Koma vurnayışi: %{id}'
-      join_discussion: Dekewtena vatenayışi rê qeyd bê
-      discussion: Werênayış
     node:
-      title: Noqta:%{name}
-      history_title: 'Verora nokta: %{name}'
+      title_html: Noqta:%{name}
+      history_title_html: 'Verora nokta: %{name}'
     way:
-      title: Ray:%{name}
-      history_title: Verora rayer:%{name}
+      title_html: Ray:%{name}
+      history_title_html: Verora rayer:%{name}
       nodes: Noqtey
-      also_part_of:
+      also_part_of_html:
         one: letey ray %{related_ways}
         other: letey rayer %{related_ways}
     relation:
-      title: Eleqe:%{name}
-      history_title: 'Verorê eleqey: %{name}'
+      title_html: 'Elaqe: %{name}'
+      history_title_html: 'Verorê eleqey: %{name}'
       members: Ezay
     relation_member:
-      entry_role: '%{type} %{name}, de %{role}'
+      entry_role_html: '%{type} %{name}, de %{role}'
       type:
         node: Qedyin
         way: Ray
-        relation: Eleqe
+        relation: Elaqe
     containing_relation:
-      entry: Eleqe %{relation_name}
-      entry_role: Eleqe %{relation_name} (%{relation_role} deye)
+      entry_role_html: Eleqe %{relation_name} (%{relation_role} deye)
     not_found:
+      title: Nêvineya
       sorry: 'Qısur mewni,  #%{id} numreya %{type} nêvine yê.'
       type:
         node: qedyin
         way: ray
-        relation: eleqe
+        relation: elaqe
         changeset: Qeydê Vurnayışan
         note: Not
     timeout:
       type:
         node: qedyin
         way: ray
-        relation: eleqe
+        relation: elaqe
         changeset: Qeydê Vurnayışan
         note: Not
     redacted:
@@ -169,132 +261,161 @@ diq:
       type:
         node: qedyin
         way: ray
-        relation: eleqe
+        relation: elaqe
     start_rjs:
       load_data: Malumat Barke
       loading: Bar beno...
     tag_details:
       tags: 'Etiketi:'
       telephone_link: Veynd %{phone_number}
-    note:
-      title: 'Not: %{id}'
-      new_note: Nota Newi
-      description: Şınasnayış
     query:
       title: Xısusiyetan bıasne
       introduction: Xısusiyetanê nezdiyan vinayışi rê xeriter sero bıploğnê
       nearby: Nezdıra xısusiyeti
       enclosing: Muhtewa xısusiyeti
-  changeset:
-    changeset_paging_nav:
-      showing_page: Pele %{page}
-      next: Peyên »
-      previous: « Verên
+  changesets:
     changeset:
-      anonymous: Anonim
       no_edits: (vırnayış çıniyo)
       view_changeset_details: Teferuatê vurnayışê seti bıvin
-    changesets:
-      id: ID
-      saved_at: Demê qeydi
-      user: Karber
-      comment: Mışewre
-      area: Erz
-    list:
-      title: Seta vurnayışan
-      title_user: Vurriyayışê setê %{user}
+    index:
+      title: Qeydê vurnayışan
+      title_user: Vurriyayışê qeydi %{user}
       title_friend: Qeydê vurnayışê embazan
       title_nearby: Nezdıra vurriyayışê setê karberi
-      load_more: Dehana vêşi
-    rss:
-      full: Vaten pêro
-  diary_entry:
+      load_more: Tayêna bar ke
+      feed:
+        title: 'Koma vurnayışi: %{id}'
+        title_comment: '%{id} - %{comment} vurniyayışi'
+        created: Vıraziya
+        closed: Kerd kip
+        belongs_to: Nuştekar
+    show:
+      title: 'Koma vurnayışi: %{id}'
+      created: Vırazia:%{when}
+      closed: 'Kefılia: %{when}'
+      created_ago_html: Vırazia %{time_ago}
+      closed_ago_html: Kefılia  %{time_ago}
+      created_ago_by_html: Be hetên %{user} ra %{time_ago} vırazia
+      closed_ago_by_html: Be hetên %{user} ra %{time_ago} kefılia
+      discussion: Werênayış
+      join_discussion: Dekewtena vatenayışi rê qeyd bê
+      subscribe: Abone be
+      unsubscribe: Aboneyiye ra veciye
+      hide_comment: bınımne
+      unhide_comment: menımne
+      comment: Mışewre
+      changesetxml: Vurnayışê peyênê XML
+      osmchangexml: OsmVurnayışê XML
+    paging_nav:
+      nodes: '%{count} noqtey'
+      nodes_paginated: pero piya (%{x}-%{y} - %{count}) noqtey
+      ways: '%{count} ray'
+      ways_paginated: Ray (%{x}-%{y} - pêro piya  %{count})
+      relations: Elaqeyi %{count}
+      relations_paginated: Elaqeyi %{x}-%{y} pêro piya %{count}
+  dashboards:
+    contact:
+      km away: '%{count} km duriyo'
+      m away: '%{count} metre nezdiyo'
+      latest_edit_html: 'vurnayışê peyênê %{ago}:'
+    popup:
+      your location: Heruna mı
+      nearby mapper: Xeritoğo emıryan
+      friend: Embaz
+    show:
+      title: Panel Asengeni
+      edit_your_profile: Wecê ho bıvurnên
+      my friends: Alwazê mı
+      no friends: Hona şoma qet alwazê neweyi nêkerdê cı
+      nearby users: Nezdık ran yobina karkeri
+      no nearby users: Nezdık ran qet alwazê neweyi nıka çıniyê
+      friends_changesets: Qeydê vurnayışê alwazan
+      friends_diaries: Qeydê rocek anê alwazan
+  diary_entries:
     new:
-      publish_button: Vıla ke
-    list:
-      user_title: '%{user} (Rocek)'
-    edit:
-      subject: 'Mewzu:'
-      body: 'Vêrey mesaci:'
-      language: 'Zıwan:'
+      title: Roceko newe definayış
+    form:
       location: Lokasyon
-      latitude: 'Verıniye:'
-      longitude: 'Derganiye:'
-      save_button: Qeyd ke
-    view:
+      use_map_link: Xerita bıgurene
+    index:
+      title: Rocekê Karberi
+      title_friends: Rocekê embazan
+      title_nearby: Nezdı ra rocekê karberan
+      user_title: '%{user} rocek'
+      in_language_title: '%{language} dekewtekê roci'
+      new: Roceko newe definayış
+      my_diary: Rocekê mı
+    edit:
+      marker_text: Lokasyonê rocekê cıkewtışi
+    show:
+      title: Rocekê %{user}'i | %{title}
+      user_title: Rocekê %{user}'i
+      discussion: Diskusiyon
+      leave_a_comment: Yew mışewre bınuse
+      login_to_leave_a_comment_html: Seba mışewreyi rê %{login_link}
       login: Cıkewtış
-      save_button: Qeyd ke
+    no_such_entry:
+      title: Rocekê cıkewtışanê wınasiyan çıniyo
     diary_entry:
-      edit_link: Nê dekewti bıvurne
-      hide_link: Nê dekewti bınımne
+      edit_link: Nê cıkewtışi bıvurne
+      hide_link: Nê cıkewtışi bınımne
       confirm: Tesdiq ke
+      report: Nê cıkewtışi rapor ke
     diary_comment:
+      hide_link: Nê mışewreyi bınımne
       confirm: Tesdiq ke
+      report: Nê mışewreyi rapor ke
     location:
-      location: 'Herun:'
-      view: Bımotne
-      edit: Bıvurne
-    comments:
-      post: Bırışe
+      location: 'Lokasyon:'
+  diary_comments:
+    page:
+      post: Rışte
       when: Key
       comment: Mışewre
-      ago: Verdê %{ago}
-      newer_comments: Tewr Vatışê Newey
-      older_comments: Vatışo Tewr Kehan
-  export:
-    title: Teber de
-    start:
-      area_to_export: Cayo ke cıra bıvciyo
-      manually_select: Be desti ra yew cayo bin weçıne
-      format_to_export: Formatê teberi ra eştışi
-      osm_xml_data: OpenStreetMap XML Data
-      licence: Lisans
-      too_large:
-        planet:
-          title: Geyrenıka OSM
-        overpass:
-          title: Overpass API
-        metro:
-          title: Çap kerdenê Metroy
-          description: Çap kerdenê metroyan u banliyo
-        other:
-          title: Çemê bini
-      options: Weçinegi
-      format: Format
-      scale: Sence
-      max: maks
-      image_size: Gırdiya Resimi
-      zoom: Nezdı fi
-      add_marker: Xeriter rê yew nışan berz
-      latitude: 'Verıniye:'
-      longitude: 'Derganiye:'
-      output: Vıcyaen
-      export_button: Teber de
+  errors:
+    contact:
+      contact: irtibat
+    forbidden:
+      title: Qedexe
+  friendships:
+    make_friend:
+      button: Xo rê embaz ke
+    remove_friend:
+      button: Embazan ra vec
   geocoder:
     search:
       title:
-        latlon: <a href="http://openstreetmap.org/">OSM</a> ra neticey
-        us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> ra neticey
-        uk_postcode: <a href="http://www.npemap.org.uk/">FreeThe Postcode</a> ra neticey
-        ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> ra neticey
-        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a>
-          ra neticey
-        geonames: <a href="http://www.geonames.org/">GeoNames.org</a> ra neticey
+        latlon: Daxili
     search_osm_nominatim:
       prefix:
         aerialway:
           cable_car: Kabloy ereber
+          chair_lift: Liftê  ronışten
+          drag_lift: Liftê Xuzi
           gondola: Telesiyej
+          magic_carpet: Liftê  Xaliya Sihirın
+          platter: Liftê malzemeyi
+          pylon: Pylon
           station: Ä°stasyona teleferiki
+          t-bar: Liftê T-Bari
+          "yes": Hewaray
         aeroway:
           aerodrome: Hewaherun
-          apron: Apron
-          gate: Keyber
+          airstrip: Pistê perayışi
+          apron: Aprona Asmênrahi
+          gate: Keyberê Asmênrahi
+          hangar: Hangar
           helipad: Hruna Helikopteri
+          holding_position: Pozisyonê tesbiti
+          navigationaid: Phestigerê Geyrayışê Hewateyi
+          parking_position: Pozisyonê parki
           runway: Pista teyera
+          taxilane: Taxilane
           taxiway: Raya Texsiyan
-          terminal: Terminal
+          terminal: Terminalê Asmênrahi
+          windsock: Loğavay
         amenity:
+          animal_boarding: Cınıştısên Hewyonon
           animal_shelter: Kozıkê heywanan
           arts_centre: Merkeze Zagoni
           atm: ATM
@@ -325,57 +446,46 @@ diq:
           crematorium: Krematoryum
           dentist: Dındandar
           doctors: Dıxtori
-          dormitory: Ware
           drinking_water: Awa Şımıtışi
           driving_school: Kursa Ramenan
           embassy: Sefirey
-          emergency_phone: Vistren Telefon
           fast_food: Fast Food
           ferry_terminal: Terminala Feriboter
-          fire_hydrant: Mıslıxa Şewati
           fire_station: Itfaiye
           food_court: Kerwanseray
           fountain: Fıskiye
           fuel: Petrol
           gambling: Kumarxane
           grave_yard: Mezla ser
-          gym: Merkeza Fitnessi / Salona Spori
-          health_centre: Merkeza Weşiney
           hospital: Nêweşxane
           hunting_stand: Standê Seydwanan
           ice_cream: Dondırme
           kindergarten: Kreş
           library: Kıtıbxane
-          market: Market
           marketplace: Heruna bazari
           monastery: Manastır
           motorcycle_parking: Motorpiskilet park kerdış
           nightclub: Kluba Şewer
-          nursery: Kreş
           nursing_home: Rehatxane
-          office: Ofis
           parking: Otopark
           parking_entrance: Keyberê par kerdışi
+          parking_space: Cay parki
+          payment_terminal: Terminalê Dayışi
           pharmacy: Eczaxane
           place_of_worship: Bawerxane
           police: Pulis
           post_box: Dora Postay
           post_office: Postexane
-          preschool: Ver-Wendxane
           prison: Hepısxane
           pub: Biraxane
+          public_bath: Hemam
           public_building: Binaya Şaran
-          reception_area: Heruna Resepsiyoni
           recycling: Heruna peyd amayışi
           restaurant: Restaurant
-          retirement_home: Weynexane
-          sauna: Hemam
           school: Wendxane
           shelter: Starek
-          shop: Dukan
           shower: Çımecek
           social_centre: Merkezo Sosyal
-          social_club: Kluba Sosyal
           social_facility: Tesiso sosyal
           studio: Studyo
           swimming_pool: Dola Asnawkerdışi
@@ -387,22 +497,32 @@ diq:
           university: Uniwersita
           vending_machine: Makineya Roten
           veterinary: Veteriner
-          village_hall: Wedey Dewer
+          village_hall: Wedaya Dewe
           waste_basket: Tenkey Sıloy
           waste_disposal: Cay sıloy
-          youth_centre: Merkezê Gencan
+          "yes": Rehatey
         boundary:
           administrative: Sinorê İdari
           census: Sinora amora nıfusi
           national_park: Perka Milli
           protected_area: Star biyaye erd
+          "yes": Sinor
         bridge:
           aqueduct: Kemerê awer
+          boardwalk: Ä°skela
           suspension: Pırdo layın
           swing: Pırde Asnawi
           viaduct: Viyaduk
           "yes": Pırd
         building:
+          apartment: Apartman
+          apartments: Apartmani
+          barn: Axur
+          bungalow: Bungalow
+          cabin: Kabin
+          chapel: Şapel
+          church: Kılise
+          civic: Ä°maret
           "yes": Bina
         craft:
           brewery: Fabriqay bira
@@ -436,7 +556,7 @@ diq:
           motorway: Otoray
           motorway_junction: Kewşaxa Otorayer
           motorway_link: Raya Otoray
-          path: Petiqe
+          path: Raye
           pedestrian: Raya ke wesayıti rê racnayiya
           platform: Platform
           primary: Raya Dewlet
@@ -457,16 +577,14 @@ diq:
           tertiary_link: Raya Dewan
           track: Raya Herın
           traffic_signals: Signalê trafiki
-          trail: Şop
           trunk: Letebıyayi ser ray
           trunk_link: Lwtebıyayi ser ray
           unclassified: Nêrêzbıyayi ray
-          unsurfaced: Raya xam
           "yes": Ray
         historic:
           archaeological_site: Arkeolojik Ca
           battlefield: Cay herbi
-          boundary_stone: Siya sinori
+          boundary_stone: Kemera Sinori
           building: Binaya verên
           bunker: Stare
           castle: Qela
@@ -476,7 +594,6 @@ diq:
           fort: Qula
           heritage: Cayo Miras
           house: Keye
-          icon: Ikon
           manor: Kosk
           memorial: Qub
           mine: Mahden
@@ -497,7 +614,6 @@ diq:
           commercial: Cayê Ticareti u Xızmeti
           conservation: Qısekerdış
           construction: İnşaat
-          farm: Cıtinin
           farmland: Erdê Ziraati
           farmyard: İsiga çıfligi
           forest: Mêşe
@@ -517,14 +633,12 @@ diq:
           reservoir_watershed: Merga awer
           residential: Heruna Cıwiyayışi
           retail: Esnaf
-          road: Cay ray
           village_green: Cayo kıho
           vineyard: Rez
           "yes": Karıyayışa erdi
         leisure:
           beach_resort: Dewa plajın
           bird_hide: Cay mıriçık weynayışi
-          club: Klüb
           common: Umumi erd
           dog_park: Parka kutıkan
           fishing: Heruna masan
@@ -551,6 +665,7 @@ diq:
           water_park: Aquapark
           "yes": Xoser zeman
         man_made:
+          bridge: Pırd
           lighthouse: Parka awer
           pipeline: Xeta boriyer
           tower: Kule
@@ -560,6 +675,7 @@ diq:
           airfield: Hewaraya Aspariye
           barracks: Kışla
           bunker: Stare
+          "yes": Eskeri
         mountain_pass:
           "yes": Ravêreka Koy
         natural:
@@ -585,7 +701,7 @@ diq:
           mud: Dawte
           peak: Gıl /sersıq
           point: Pırn
-          reef: Resif
+          reef: Kemer
           ridge: Sud
           rock: Qere
           saddle: Cıl
@@ -617,9 +733,7 @@ diq:
           "yes": Ofis
         place:
           allotments: Bostan
-          block: Blok
-          airport: Meydanê hewayi
-          city: Suk
+          city: Sûke
           country: Dewlete
           county: Welat
           farm: Erdo Bec
@@ -629,7 +743,6 @@ diq:
           island: Ada
           islet: Adeqeq
           locality: Wereyin
-          moor: Lıncane
           municipality: Belediya
           neighbourhood: Mehla
           postcode: Kodê posteyi
@@ -639,8 +752,7 @@ diq:
           subdivision: Qısımo bınên
           suburb: Mahle / Banliyö
           town: bacar
-          unincorporated_area: Wareyo Yewnêbiyaye
-          village: Dew
+          village: Dewe
           "yes": Ca
         railway:
           abandoned: Asınraya Terkkerdiye
@@ -673,85 +785,144 @@ diq:
           department_store: Meğaza
           florist: Çiçekdar
           furniture: Mobilya
-          gallery: Galeri
           garden_centre: Merkeza Hêgay
           gift: Çiyo Hediye
-          salon: Kuafor
+          "yes": Dukan
         tourism:
+          gallery: Galeriye
           hostel: Hostel
           hotel: Hotel
+          information: Melumat
+          motel: Motel
         tunnel:
           "yes": Tûnêl
         waterway:
           canal: Kenal
           dam: Berac
           lock: Ä°skele
-    description:
-      types:
-        cities: Suki
-        towns: Bacari
-        places: Cayi
+          river: Ro
+  issues:
+    index:
+      states:
+        open: Ake
+    page:
+      status: Weziyet
+      reports: Rapori
+      last_updated: Rocanekerdışo Peyên
   layouts:
-    logout: veciyayış
-    log_in: cı kewe
-    sign_up: qeyd be
+    logout: Bıveciye
+    log_in: Cı kewe
+    sign_up: Qeyd be
     edit: Bıvurne
     history: Tarix
-    export: Tebergroten
+    export: Teberdayış
+    tou: Şertê gurenayışi
     help: Peşti
-    community: Cemaet
-    community_blogs: Blogê Cemaeti
-  notifier:
+    about: Heqa
+    copyright: Heqa telifi
+    learn_more: Tayêna bımuse
+    more: Zêde
+  user_mailer:
     diary_comment_notification:
       hi: Merheba %{to_user},
     message_notification:
       hi: Merheba %{to_user},
-    gpx_notification:
-      greeting: Merheba,
-    email_confirm_plain:
+    email_confirm:
       greeting: Merheba,
-    email_confirm_html:
-      greeting: Merheba,
-    lost_password_plain:
+    lost_password:
       greeting: Merheba,
-    lost_password_html:
+    note_comment_notification:
+      anonymous: Yew karbero bêname
       greeting: Merheba,
-  message:
+  confirmations:
+    confirm:
+      button: Tesdiq ke
+    confirm_email:
+      button: Tesdiq ke
+  messages:
     inbox:
       title: Ameyan
-      my_inbox: Amayenê mı
-      outbox: Rışteyan
-      from: Kêra
+    messages_table:
+      from: Rıştoğ
+      to: Gırewtoğ
       subject: Mewzu
-      date: Dem
+      date: Tarix
     message_summary:
-      reply_button: Cewab bıde
-      delete_button: Bestere
+      destroy_button: Bestere
     new:
-      subject: Mewzu
-      body: Vêrey mesaci
-      send_button: Bırışe
+      title: Mesac bırışê
     outbox:
       title: Şıyenan
-      inbox: Ameyan
-      outbox: Rışteyan
-      to: Kêrê
-      subject: Mewzu
-      date: Dem
-    read:
-      subject: Mewzu
-      date: Dem
+    show:
+      title: Mesaci bıwane
       reply_button: Cewab bıde
-      to: Kêrê
+      destroy_button: Bestere
+      back: Peyser
     sent_message_summary:
-      delete_button: Bestere
+      destroy_button: Bestere
+    heading:
+      my_inbox: Amayenê mı
+  passwords:
+    new:
+      title: Parolaya vınibyayi
+      heading: To parola ke xo vira?
+      email address: 'Adresa e-postey:'
+      new password button: Parola reset ke
+    edit:
+      title: Parola reset ke
+      heading: Parolay %{user} reset ke
+      reset: Parola reset ke
+  preferences:
+    edit:
+      cancel: Bıtexelne
+  profiles:
+    edit:
+      image: 'Resım:'
+      new image: Yew resım cı ke
+      home location: 'Herune:'
+  sessions:
+    new:
+      tab_title: Cıkewtış
+      email or username: 'Adresa e-posteyi ya zi nameyê karberi:'
+      password: 'Parola:'
+      remember: Mı biya xo viri
+      lost password link: Şıma parolay xo ke xo vira?
+      login_button: Cıkewtış
+    destroy:
+      title: Veciyayış
+      heading: OpenStreetMap ra vıcyayış
+      logout_button: Veciyayış
+    suspended_flash:
+      support: peşti
+  shared:
+    pagination:
+      diary_comments:
+        older: Mışewreyê Kehani
+        newer: Mışewreyê Newey
   site:
+    copyright:
+      native:
+        title: Heqa na pele de
+    edit:
+      user_page_link: pela karberi
+    export:
+      title: Teberdayış
+      manually_select: Be desti ra yew cayo bin weçıne
+      licence: Lisans
+      too_large:
+        planet:
+          title: Geyrenıka OSM
+        overpass:
+          title: Overpass API
+        other:
+          title: Çemê bini
+      export_button: Teberdayış
     sidebar:
-      search_results: Neticeyê geyrayışi
-      close: Racnê
+      search_results: Peyniya cıgeyrayışi
     search:
       search: Cı geyre
-      where_am_i: Edo kotideya?
+      from: Rıştoğ
+      where_am_i: Kani no?
       submit_text: Şo
     key:
       table:
@@ -759,57 +930,25 @@ diq:
           track: Raya Herın
           bridleway: Raya Ancınıştan
           cycleway: Raya Bisiklet
-          apron:
-            1: terminal
           forest: Mêşe
           wood: Meşe
           golf: Saxay Golfi
           park: Perk
-          common:
-          - Çimen
-          lake:
-          - Dol
+          common: Çimen
+          lake: Gol
           farm: Cıtinin
           cemetery: Mezlaser
           allotments: Bostan
-          school:
-          - Wendxane
-          - Uniwersita
-          summit:
-          - Sersıq
-          - Ko
-    richtext_area:
-      edit: Bıvurne
-      preview: Verqayt
-    markdown_help:
-      headings: Sernamey
-      heading: Sername
-      first: Çiyo sıfteyên
-      second: Çiyo Bahdoyên
-      link: Gıre
-      text: Metın
-      image: Resım
-      url: GRE
-  trace:
-    edit:
-      filename: 'Namey dosya:'
-      download: ron
-      uploaded_at: 'Bar biyo:'
-      points: 'Dawte:'
-      map: xerite
-      edit: bıvurne
-      owner: 'Wayir:'
-      description: 'Şınasiyen:'
-      tags: 'Etiketi:'
-      visibility: Vinayîşî
-    trace_form:
-      tags: 'Etiketi:'
-      visibility: Vinayîşî
-      upload_button: Bar ke
+          school: Wendxane
+          university: Uniwersita
+          summit: Sersıq
+          peak: Ko
+    welcome:
+      title: Xeyr amey!
+  traces:
+    new:
       help: Peşti
-    trace_optionals:
-      tags: Etiketan
-    view:
+    show:
       title: Rêça %{name} mocnêyêna
       heading: Rêça %{name} mocnêyêna
       pending: PAWEDEYO
@@ -818,101 +957,50 @@ diq:
       uploaded: 'Bar biyo:'
       points: 'Dawte:'
       start_coordinates: 'Pêkerden koordinat:'
-      map: xerite
-      edit: bıvurne
+      map: xerita
+      edit: bıvırne
       owner: 'Wayir:'
-      description: 'Şınasiyen:'
+      description: 'Şınasnayış:'
       tags: 'Etiketi:'
       none: Çıniyo
-    trace_paging_nav:
-      showing_page: Pele %{page}
     trace:
       pending: PAWEDEYO
-      count_points: '%{count} puan'
-      ago: '%{time_in_words_ago} veror'
-      more: dehana vêşi
+      count_points:
+        one: 1 puwan
+        other: '%{count} puwani'
+      more: zêde
       trace_details: Teferruatanê rêça bıvin
       view_map: Xeriti Bımocnê
-      edit: bıvurne
       edit_map: Xeriti Timar ke
-      public: ŞARE
+      public: PÊROYİ
       identifiable: ŞINASKERDENEN
       private: XAS
       trackable: SEYRKERDENEN
-      by: kerden
-      in: te de
-      map: xerite
-    list:
+    index:
       public_traces: Pêron rê akerde rêçê GPS
       public_traces_from: '%{user} ra pêron rê akerde rêçê GPS'
       tagged_with: '%{tags} ya etiketyayo'
-  oauth_clients:
+  users:
     new:
-      submit: Qeyd Be
-    edit:
-      submit: Bıvurne
-    show:
-      edit: Detaya Timar ke
-      confirm: Vac welay?
-    index:
-      issued_at: Mersela
-      revoke: Terkne!
-    form:
-      name: Name
-      required: Mecburiyo
-  user:
-    login:
-      title: Cıkewtış
-      heading: Cıkewtış
-      email or username: 'Adresa e-posteyi ya zi nameyê karberi:'
-      password: 'Parola:'
-      openid: '%{logo} OpenID:'
-      remember: Mı biya xo viri
-      lost password link: Şıma parolay xo ke xo vira?
-      login_button: Cıkewtış
-      register now: Enewkê qeyd bê
-      no account: Hesabê şıma çıniyo?
-      openid_logo_alt: OpenID ya dekewê de
-    logout:
-      title: Veciyayış
-      heading: OpenStreetMap ra vıcyayış
-      logout_button: Veciyayış
-    lost_password:
-      title: Parolaya vınibyayi
-      heading: To parola ke xo vira?
-      email address: 'Adresa e-postey:'
-      new password button: Parola reset ke
-    reset_password:
-      title: Parola reset ke
-      heading: Parolay %{user} reset ke
-      password: 'Parola:'
-      confirm password: 'Parola tesdiq ke:'
-      reset: Parola reset ke
-    new:
-      email address: 'Adresa e-postey:'
-      confirm email address: 'Adresê E-posta tesdiq ke:'
-      display name: 'Nameyo ke Aseno:'
-      password: 'Parola:'
-      confirm password: 'Parolay tesdiq ke:'
       continue: Qeyd be
     terms:
+      title: Terimi
+      heading: Terimi
       consider_pd_why: no çıko?
-      agree: Qebul kena
-      decline: Red kerê
+      continue: Dewam ke
       legale_names:
         france: Fransa
         italy: Ä°talya
     no_such_user:
       title: Karbero do wuna çıniyo
       heading: '%{user} name dı karber çıniyo'
-    view:
+      deleted: esteriya
+    show:
       my diary: Rocekê mı
-      new diary entry: Roceko newe defi
-      my edits: Iştirakê mı
+      my edits: İştırakê mı
       my traces: GPS rêçê mı
       my settings: Eyarê Mı
       my comments: Mışewrey mı
-      oauth settings: sazê OAuthi
       blocks on me: Bloqeyê mı
       blocks by me: Bloqe kerdışê mı
       send message: mesac bırışê
@@ -920,29 +1008,16 @@ diq:
       edits: Vurnayışi
       traces: Rêçi
       remove as friend: Embazan ra vec
-      add as friend: Embaz bı
+      add as friend: Embazi cı ke
       mapper since: 'Demê herdnigarwaniye:'
-      ago: (%{time_in_words_ago} veror)
       ct undecided: Darıdeyo
       ct declined: Red kerd
-      ct accepted: Verdê %{ago} qebul ke
-      latest edit: 'vurnayışê peyênê %{ago}:'
       email address: 'Adresa e-postey:'
       created from: 'Vıraşten ra:'
       status: 'Weziyet:'
-      description: Şınasnayış
-      user location: Heruna karberi
-      settings_link_text: eyari
-      your friends: Embazê to
-      km away: '%{count} km duriyo'
-      m away: '%{count} metre nezdiyo'
       role:
-        administrator: |-
-          Na karber administratora<br>
-          No karber administratoro
-        moderator: |-
-          Na karber Moderatora<br>
-          No karber Moderatoro
+        administrator: No karber idarekaro
+        moderator: No karber yew moderatoro
         grant:
           administrator: Hesabê adminisrator de gırdi
           moderator: Hesabê moderator de gırdi
@@ -954,148 +1029,103 @@ diq:
       comments: Mışewreyi
       create_block: nê karberi kılit ke
       activate_user: Nê karberi aktiv ke
-      deactivate_user: Nê karberi aktiv meke
       confirm_user: nê karberi tesdiq ke
       hide_user: nê karberi  bınımnê
       unhide_user: nê karberi menımnê
       delete_user: nê karberi esternê
       confirm: Tesdiq ke
-    popup:
-      your location: Heruna mı
-      nearby mapper: Xeritoğo emıryan
-      friend: Embaz
-    account:
-      title: Hesabi bıvurne
-      my settings: Eyarê mı
-      current email address: 'E-postay şımaya newki:'
-      new email address: 'E-postay adresiyo newe:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: no çıko?
-      public editing:
-        heading: 'Pêron rê akerde vurnayış:'
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: no çıko?
-        disabled link text: Ezo çı nêşena bıvurna?
-      public editing note:
-        heading: 'Pêron rê akerde vurnayış:'
-      contributor terms:
-        link text: no çıko?
-      preferred languages: 'Zıwanê ke tercih kerê:'
-      preferred editor: 'Editorê ke tercih kerê:'
-      image: 'Resım:'
-      new image: Yew resım cı ke
-      home location: 'Herun:'
-      latitude: 'Verıniye:'
-      longitude: 'Derganiye:'
-      save changes button: Vurnayışan qeyd ke
-      return to profile: Peyser şo profil
-    confirm:
-      button: Tesdiq ke
-    confirm_email:
-      button: Tesdiq ke
-    make_friend:
-      button: Xo rê embaz ke
-    remove_friend:
-      button: Embazan ra vec
-    list:
+    index:
       title: Karberi
       heading: Karberi
-      showing:
-        one: Pela %{page} (%{first_item} - toplam %{items})
-        other: Pela %{page} (%{first_item}-%{last_item} - pêro %{items})
-      summary: '%{name} %{ip_address} ra %{date} dı vıraşt'
-      summary_no_ip: '%{name} %{date} dı vıraşt'
+      summary_html: '%{name} %{ip_address} ra %{date} dı vıraşt'
+      summary_no_ip_html: '%{name} %{date} dı vıraşt'
+    page:
       confirm: Karberê ke weçineyayê ena tesdiq ke
       hide: Karbera weçinayışi bınımnê
     suspended:
       title: Hesab Darideyo
       heading: Hesab Darideyo
-      webmaster: idaroğê sita
-  user_role:
-    grant:
-      confirm: Tesdiq ke
-    revoke:
-      confirm: Tesdiq ke
-  user_block:
+  user_blocks:
     new:
       title: '%{name}i rê blok vırazeno.'
-      heading: '%{name}i ro blok vırazeno.'
-      submit: Bloqe vırazê
-      back: Bloqan pêron bıvin
+      heading_html: '%{name}i ro blok vırazeno.'
     edit:
       title: '%{name} bloqe vurna'
-      heading: '%{name} bloqe vurna'
-      submit: Bloqi noroc resn
-      show: Nê bloqi bıvin
-      back: Bloqan pêron bıvin
+      heading_html: '%{name} bloqe vurna'
     update:
       success: Bloqe noroc resneya.
     index:
       title: Bloqeyê karberi
-    revoke:
-      revoke: Terkne!
-    period:
-      one: 1 seate
-      other: '%{count} seati'
-    partial:
-      show: Bımotne
-      edit: Bıvurne
-      revoke: Terkne!
-      confirm: Vac welay?
-      display_name: Karberê kılitbiyayey
-      creator_name: Vıraştoğ
-      status: Weziyet
-      revoker_name: Terknoğ
-      not_revoked: (nê terkiyayo)
-      showing_page: Pele %{page}
-      next: Peyên »
-      previous: « Verên
     helper:
-      time_future: '%{time} dı bıqediyo'
-      time_past: Verdê %{time} qedya
+      time_future_html: '%{time} dı bıqediyo'
+      time_past_html: '%{time} qedya'
+      block_duration:
+        hours:
+          one: 1 seate
+          other: '%{count} seati'
     blocks_on:
       title: Blokeyê ke %{name} kerdê
-      heading: Blokeyê ke %{name} kerdê listey ênan
+      heading_html: Blokeyê ke %{name} kerdê listey ênan
     blocks_by:
       title: Blokeyê ke %{name} kerdê
-      heading: '%{name} ra lista blokan'
+      heading_html: '%{name} ra lista blokan'
     show:
       title: Karber %{block_by} karber %{block_on} ke bloqe
-      heading: Karber %{block_by} karber %{block_on} ke bloqe
-      time_future: '%{time} dı bıqediyo'
-      time_past: Verdê %{time} qedya
+      heading_html: Karber %{block_by} karber %{block_on} ke bloqe
       status: Weziyet
-      show: Bımotne
       edit: Bıvurne
-      revoke: Terkne!
-      confirm: Vac welay?
       revoker: 'Terkner:'
-  note:
-    entry:
+    block:
+      show: Bımocne
+      edit: Bıvurne
+    page:
+      display_name: Karberê kılitbiyayey
+      creator_name: Vıraştoğ
+      status: Weziyet
+  notes:
+    index:
+      description: Şınasnayış
+    show:
+      title: 'Not: %{id}'
+      description: Şınasnayış
+      report: Nê noti rapor ke
+      hide: Bınımne
       comment: Mışewre
+    new:
+      title: Nota Newi
+    notes_paging_nav:
+      showing_page: Pele %{page}
   javascripts:
+    close: Kip ke
+    share:
+      title: Vıla ke
+      cancel: Bıtexelne
+      image: Resım
+      link: Gıre ya zi HTML
+      long_link: Gıre
+      format: 'Format:'
+      download: Biya war
     map:
+      zoom:
+        in: Nêzdi ke
+        out: Dûri fiye
       base:
         standard: Standard
         cycle_map: Xeritay Topoğrafiki
         transport_map: Xeritay Resnayışi
     site:
       edit_tooltip: Xeriti timar ke
-    changesets:
-      show:
-        comment: Mışewre
-        hide_comment: bınımne
-    notes:
-      show:
-        comment: Mışewre
-  redaction:
-    edit:
-      description: Şınasnayış
-    new:
-      description: Şınasnayış
+    directions:
+      engines:
+        fossgis_osrm_bike: Bisiklet (OSRM)
+        fossgis_osrm_foot: Lınge (OSRM)
+      time: Zeman
+    query:
+      way: Raye
+      relation: Elaqe
+  redactions:
     show:
-      description: 'Şınasiyen:'
+      description: 'Şınasnayış:'
       user: Vıraştoğ
-      confirm: Vac welay?
+      confirm: Şıma bêgumanê?
 ...