X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cd649ad6dd488cbaf9e2d097f3edbe2eacad801d..b470e01f840d1b954326f8f863e185ebe7f9b9f2:/config/locales/diq.yml

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index b6a4b4677..2179df797 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: 1917 Ekim Devrimi
+# Author: Abijeet Patro
 # Author: Asmen
 # Author: Erdemaslancan
 # Author: Gorizon
@@ -9,12 +10,42 @@
 # 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: Qeyd ke
+      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ê
+      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:
+        invalid_email_address: Ravêrde ze yew adresê eposta nêaseno
+        email_address_not_routable: Tadeyaye niyo
     models:
       acl: Qontrol Listeyê Resayışi
       changeset: Qeydê Vurnayışan
@@ -23,6 +54,7 @@ diq:
       diary_comment: Vatışê Rocan
       diary_entry: Deqewtışê Rocan
       friend: Embaz
+      issue: Mesel
       language: Zıwan
       message: Mesac
       node: Qedyin
@@ -36,10 +68,11 @@ 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
@@ -50,8 +83,15 @@ 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
       diary_comment:
-        body: Vêrey mesaci
+        body: Metın
       diary_entry:
         user: Karber
         title: Mewzu
@@ -64,19 +104,21 @@ diq:
       trace:
         user: Karber
         visible: Aseno
-        name: Name
+        name: Namedosya
         size: Gırdiye
         latitude: Verıniye
         longitude: Derganiye
-        public: Şar
+        public: Pêroyi
         description: Şınasnayış
+        visibility: Asayış
+        tagstring: Etiketi
       message:
         sender: Rıster
         title: Mewzu
-        body: Mesac
+        body: Metın
         recipient: Grotker
       user:
-        email: E-posta
+        email: E-poste
         active: Aktiv
         display_name: Nameyo ke Aseno
         description: Şınasnayış
@@ -96,18 +138,41 @@ diq:
     remote:
       name: Duri da qontrol
       description: Duri ra Qonrtol (JOSM yana  Merkaartor)
+  auth:
+    providers:
+      none: Çıniyo
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      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
   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
+    created: Vıraziya
+    closed: Kerd kip
+    created_html: <abbr title='%{title}'>%{time}</abbr> de vıraziyayo
+    closed_html: <abbr title='%{title}'>%{time}</abbr> de kılid biyo
+    created_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra vıraziyayo
+    deleted_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra esteriyayo
+    edited_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra vurniyayo
+    closed_by_html: <abbr title='%{title}'>%{time}</abbr> de terefê %{user} ra kılid
+      biyo
     version: Versiyon
     in_changeset: Qeydê Vurnayışan
     anonymous: anonim
     no_comment: (be vatış)
     part_of: Letey
     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:
@@ -117,8 +182,8 @@ diq:
       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}
+      relation: Elaqeyi %{count}
+      relation_paginated: Elaqeyi %{x}-%{y} pêro piya %{count}
       comment: Mışewreyi (%{count})
       changesetxml: Vurnayışê peyênê XML
       osmchangexml: OsmVurnayışê XML
@@ -127,41 +192,42 @@ diq:
       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_html: Elaqe %{relation_name}
+      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,7 +235,7 @@ diq:
       type:
         node: qedyin
         way: ray
-        relation: eleqe
+        relation: elaqe
     start_rjs:
       load_data: Malumat Barke
       loading: Bar beno...
@@ -185,10 +251,10 @@ diq:
       introduction: Xısusiyetanê nezdiyan vinayışi rê xeriter sero bıploğnê
       nearby: Nezdıra xısusiyeti
       enclosing: Muhtewa xısusiyeti
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: Pele %{page}
-      next: Peyên »
+      next: Bahdoyên »
       previous: « Verên
     changeset:
       anonymous: Anonim
@@ -196,101 +262,88 @@ diq:
       view_changeset_details: Teferuatê vurnayışê seti bıvin
     changesets:
       id: ID
-      saved_at: Demê qeydi
+      saved_at: Cayê qeydi
       user: Karber
       comment: Mışewre
-      area: Erz
-    list:
-      title: Seta vurnayışan
-      title_user: Vurriyayışê setê %{user}
+      area: Erd
+    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: Dehana vêşi barkerê
+  diary_entries:
     new:
-      publish_button: Vıla ke
-    list:
-      user_title: '%{user} (Rocek)'
-    edit:
+      title: Roceko newe definayış
+    form:
       subject: 'Mewzu:'
-      body: 'Vêrey mesaci:'
+      body: 'Metın:'
       language: 'Zıwan:'
-      location: Lokasyon
+      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'
+      my_diary: Rocekê mı
+    edit:
+      marker_text: Lokasyonê rocekê cıkewtışi
+    show:
+      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
+      location: 'Lokasyon:'
+      view: Bıvêne
       edit: Bıvurne
     comments:
-      post: Bırışe
+      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
+      newer_comments: Mışewreyê Newey
+      older_comments: Mışewreyê Kehani
+  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
-        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>
+        latlon_html: <a href="http://openstreetmap.org/">OSM</a> ra neticey
+        ca_postcode_html: <a href="http://geocoder.ca/">Geocoder.CA</a> ra neticey
+        osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a>
           ra neticey
-        geonames: <a href="http://www.geonames.org/">GeoNames.org</a> ra neticey
+        geonames_html: <a href="http://www.geonames.org/">GeoNames.org</a> ra neticey
     search_osm_nominatim:
       prefix:
         aerialway:
           cable_car: Kabloy ereber
           gondola: Telesiyej
+          pylon: Pylon
           station: Ä°stasyona teleferiki
         aeroway:
           aerodrome: Hewaherun
           apron: Apron
           gate: Keyber
+          hangar: Hangar
           helipad: Hruna Helikopteri
           runway: Pista teyera
+          taxilane: Taxilane
           taxiway: Raya Texsiyan
           terminal: Terminal
         amenity:
@@ -324,57 +377,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
@@ -386,22 +428,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
@@ -435,7 +487,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
@@ -456,16 +508,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
@@ -475,7 +525,6 @@ diq:
           fort: Qula
           heritage: Cayo Miras
           house: Keye
-          icon: Ikon
           manor: Kosk
           memorial: Qub
           mine: Mahden
@@ -516,14 +565,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
@@ -550,6 +597,7 @@ diq:
           water_park: Aquapark
           "yes": Xoser zeman
         man_made:
+          bridge: Pırd
           lighthouse: Parka awer
           pipeline: Xeta boriyer
           tower: Kule
@@ -559,6 +607,7 @@ diq:
           airfield: Hewaraya Aspariye
           barracks: Kışla
           bunker: Stare
+          "yes": Eskeri
         mountain_pass:
           "yes": Ravêreka Koy
         natural:
@@ -616,9 +665,7 @@ diq:
           "yes": Ofis
         place:
           allotments: Bostan
-          block: Blok
-          airport: Meydanê hewayi
-          city: Suk
+          city: Sûke
           country: Dewlete
           county: Welat
           farm: Erdo Bec
@@ -628,7 +675,6 @@ diq:
           island: Ada
           islet: Adeqeq
           locality: Wereyin
-          moor: Lıncane
           municipality: Belediya
           neighbourhood: Mehla
           postcode: Kodê posteyi
@@ -638,8 +684,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
@@ -672,85 +717,136 @@ 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:
+          river: Ro
       types:
-        cities: Suki
+        cities: Sûki
         towns: Bacari
         places: Cayi
+  issues:
+    index:
+      status: Weziyet
+      reports: Rapori
+      last_updated: Rocanekerdışo Peyên
+      states:
+        open: Ake
   layouts:
-    logout: veciyayış
-    log_in: cı kewe
-    sign_up: qeyd be
-    edit: Bıvırne
+    logout: Bıveciye
+    log_in: Cı kewe
+    sign_up: Qeyd be
+    edit: Bıvurne
     history: Tarix
-    export: Tebergroten
+    export: Teberdayış
+    data: Melumati
+    tou: Şertê gurenayışi
     help: Peşti
+    copyright: Heqa telifi
     community: Cemaet
     community_blogs: Blogê Cemaeti
-  notifier:
+    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:
+    lost_password:
       greeting: Merheba,
-    lost_password_plain:
+    note_comment_notification:
       greeting: Merheba,
-    lost_password_html:
+    changeset_comment_notification:
       greeting: Merheba,
-  message:
+  messages:
     inbox:
       title: Ameyan
       my_inbox: Amayenê mı
       outbox: Rışteyan
-      from: Kêra
+      from: Rıştoğ
       subject: Mewzu
-      date: Dem
+      date: Tarix
     message_summary:
       reply_button: Cewab bıde
-      delete_button: Bestere
+      destroy_button: Bestere
     new:
+      title: Mesac bırışê
       subject: Mewzu
       body: Vêrey mesaci
-      send_button: Bırışe
     outbox:
       title: Şıyenan
       inbox: Ameyan
       outbox: Rışteyan
-      to: Kêrê
+      to: Gırewtoğ
       subject: Mewzu
-      date: Dem
-    read:
+      date: Tarix
+    show:
+      title: Mesaci bıwane
       subject: Mewzu
-      date: Dem
+      date: Tarix
       reply_button: Cewab bıde
-      to: Kêrê
+      destroy_button: Bestere
+      back: Peyser
+      to: Gırewtoğ
     sent_message_summary:
-      delete_button: Bestere
+      destroy_button: Bestere
   site:
+    copyright:
+      native:
+        title: Heqa na pele de
+    index:
+      permalink: Gıreyo daimi
+    edit:
+      user_page_link: pela karberi
+    export:
+      title: Teberdayış
+      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: Teberdayış
     sidebar:
-      search_results: Neticeyê geyrayışi
-      close: Racnê
+      search_results: Peyniya cıgeyrayışi
+      close: Kip ke
     search:
       search: Cı geyre
-      where_am_i: Edo kotideya?
+      from: Rıştoğ
+      where_am_i: Kani no?
       submit_text: Şo
     key:
       table:
@@ -788,27 +884,15 @@ diq:
       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
+      url: URL
+    welcome:
+      title: Xeyr amey!
+  traces:
+    new:
       help: Peşti
     trace_optionals:
-      tags: Etiketan
-    view:
+      tags: Etiketi
+    show:
       title: Rêça %{name} mocnêyêna
       heading: Rêça %{name} mocnêyêna
       pending: PAWEDEYO
@@ -820,15 +904,16 @@ diq:
       map: xerite
       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'
+      count_points:
+        one: 1 puwan
+        other: '%{count} puwani'
       more: dehana vêşi
       trace_details: Teferruatanê rêça bıvin
       view_map: Xeriti Bımocnê
@@ -841,31 +926,24 @@ diq:
       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:
-    new:
-      submit: Qeyd Be
-    edit:
-      submit: Bıvurne
     show:
       edit: Detaya Timar ke
-      confirm: Vac welay?
+      confirm: Şıma bêgumanê?
     index:
       issued_at: Mersela
       revoke: Terkne!
-    form:
-      name: Name
-      required: Mecburiyo
-  user:
+  users:
     login:
       title: Cıkewtış
       heading: Cıkewtış
       email or username: 'Adresa e-posteyi ya zi nameyê karberi:'
       password: 'Parola:'
-      openid: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID:'
       remember: Mı biya xo viri
       lost password link: Şıma parolay xo ke xo vira?
       login_button: Cıkewtış
@@ -884,8 +962,6 @@ diq:
     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:'
@@ -895,8 +971,10 @@ diq:
       confirm password: 'Parolay tesdiq ke:'
       continue: Qeyd be
     terms:
+      title: Terimi
+      heading: Terimi
       consider_pd_why: no çıko?
-      agree: Qebul kena
+      continue: Dewam ke
       decline: Red kerê
       legale_names:
         france: Fransa
@@ -904,7 +982,7 @@ diq:
     no_such_user:
       title: Karbero do wuna çıniyo
       heading: '%{user} name dı karber çıniyo'
-    view:
+    show:
       my diary: Rocekê mı
       new diary entry: Roceko newe defi
       my edits: Iştirakê mı
@@ -921,10 +999,8 @@ diq:
       remove as friend: Embazan ra vec
       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:'
@@ -932,7 +1008,6 @@ diq:
       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:
@@ -984,7 +1059,7 @@ diq:
       preferred editor: 'Editorê ke tercih kerê:'
       image: 'Resım:'
       new image: Yew resım cı ke
-      home location: 'Herun:'
+      home location: 'Herune:'
       latitude: 'Verıniye:'
       longitude: 'Derganiye:'
       save changes button: Vurnayışan qeyd ke
@@ -993,18 +1068,14 @@ diq:
       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'
       confirm: Karberê ke weçineyayê ena tesdiq ke
       hide: Karbera weçinayışi bınımnê
     suspended:
@@ -1016,16 +1087,14 @@ diq:
       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ê
+      heading_html: '%{name}i ro blok vırazeno.'
       back: Bloqan pêron bıvin
     edit:
       title: '%{name} bloqe vurna'
-      heading: '%{name} bloqe vurna'
-      submit: Bloqi noroc resn
+      heading_html: '%{name} bloqe vurna'
       show: Nê bloqi bıvin
       back: Bloqan pêron bıvin
     update:
@@ -1034,47 +1103,58 @@ diq:
       title: Bloqeyê karberi
     revoke:
       revoke: Terkne!
-    period:
-      one: 1 seate
-      other: '%{count} seati'
-    partial:
-      show: Bımotne
-      edit: Bıvırne
-      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
+      show: Bımocne
       edit: Bıvurne
       revoke: Terkne!
-      confirm: Vac welay?
+      confirm: Şıma bêgumanê?
       revoker: 'Terkner:'
-  note:
-    entry:
-      comment: Mışewre
+    block:
+      not_revoked: (nê terkiyayo)
+      show: Bımocne
+      edit: Bıvurne
+      revoke: Terkne!
+    blocks:
+      display_name: Karberê kılitbiyayey
+      creator_name: Vıraştoğ
+      status: Weziyet
+      revoker_name: Terknoğ
+      showing_page: Pele %{page}
+      next: Peyên »
+      previous: « Verên
+  notes:
+    index:
+      description: Şınasnayış
   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
@@ -1085,16 +1165,26 @@ diq:
       show:
         comment: Mışewre
         hide_comment: bınımne
+        unhide_comment: menımne
     notes:
       show:
+        hide: Bınımne
         comment: Mışewre
-  redaction:
+    directions:
+      engines:
+        fossgis_osrm_bike: Bisiklet (OSRM)
+        fossgis_osrm_foot: Lınge (OSRM)
+      time: Zeman
+    query:
+      way: Raye
+      relation: Elaqe
+  redactions:
     edit:
       description: Şınasnayış
     new:
       description: Şınasnayış
     show:
-      description: 'Şınasiyen:'
+      description: 'Şınasnayış:'
       user: Vıraştoğ
-      confirm: Vac welay?
+      confirm: Şıma bêgumanê?
 ...