X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa1fb6dbb8c2e71b8ce8c231ae1272a2dfebd75a..eaf7694e90f169b09b9ba9b594ee03ccc05a6523:/config/locales/ka.yml

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index c9d5e07d5..d5fb370a9 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -4,11 +4,29 @@
 # Author: David1010
 # Author: MIKHEIL
 # Author: Temuri rajavi
+# Author: á²áá áá¥á á
 ---
 ka:
   time:
     formats:
       friendly: '%á %á %á¬ at %á¡:%á¬'
+  helpers:
+    submit:
+      diary_comment:
+        create: á¨áááá®áá
+      diary_entry:
+        create: ááááá¥ááá§áááá
+      message:
+        create: áááááááá
+      client_application:
+        create: á áááá¡á¢á ááªáá
+        update: á áááá¥á¢áá ááá
+      trace:
+        create: áá¢ááá ááá
+        update: áªáááááááááá¡ á¨áááá®áá
+      user_block:
+        create: áááááá áááá¡ á¨áá¥ááá
+        update: áááááá®ááá áááááá ááá
   activerecord:
     models:
       acl: á®ááááá¡áá¬áááááááá¡ á¨ááá¦á£áááá¡ á¡áá
@@ -65,32 +83,44 @@ ka:
         longitude: áá á«ááá
         public: á¡áá¯áá á
         description: áá¦á¬áá á
+        visibility: 'á®áááááááá:'
       message:
         sender: ááááááááá
         title: áááá
         body: á¢áá¥á¡á¢á
         recipient: áááá¦ááá
+      redaction:
+        description: áá¦á¬áá á
       user:
         email: áá. á¤áá¡á¢á
+        new_email: 'áá®ááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
         active: áá¥á¢áá£á á
         display_name: á¡áá®ááá ááá áááá
         description: áá¦á¬áá á
+        home_lat: 'áááááá:'
+        home_lon: 'áá á«ááá:'
         languages: ááááá
         pass_crypt: ááá ááá
+    help:
+      trace:
+        tagstring: áá«áááá¡ á¨ááááá
   editor:
     default: á£ááá áááá (ááááááá %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (áá áá£ááá áá¡ á áááá¥á¢áá á)
     id:
       name: iD
       description: iD (áá áá£ááá áá¡ á áááá¥á¢áá á)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (áá áá£ááá áá¡ á áááá¥á¢áá á)
     remote:
       name: ááá¡á¢áááªáá£á á ááá ááá
       description: ááá¡á¢áááªáá£á á ááááá (JOSM, áá Merkaartor)
+  api:
+    notes:
+      comment:
+        opened_at_html: á¨ááá¥ááá %{when} á¬áá
+        opened_at_by_html: á¨áá¥ááá %{when} á¬áá áááá®ááá áááááá %{user}
+        commented_at_html: ááááá®ááá %{when} á¬áá
+        commented_at_by_html: áááááá®áá %{when} á¬áá áááá®ááá áááááá %{user}
+      entry:
+        comment: áááááá¢áá á
   browse:
     created: á¨ááá¥ááá
     closed: ááá®á£á á£ááá
@@ -119,9 +149,10 @@ ka:
       relation: á£á áááá áááááá (%{count})
       relation_paginated: á£á áááá áááááá (%{x}-%{y} %{count}-ááá)
       comment: áááááá¢áá ááá (%{count})
-      hidden_commented_by: áááááá£áá áááááá¢áá ááá %{user}-á¡ááá <abbr title='%{exact_time}'>%{when}
+      hidden_commented_by_html: áááááá£áá áááááá¢áá ááá %{user}-á¡ááá <abbr title='%{exact_time}'>%{when}
+        á¬áá</abbr>
+      commented_by_html: ááááááá¢áá á %{user}-á¡ááá <abbr title='%{exact_time}'>%{when}
         á¬áá</abbr>
-      commented_by: ááááááá¢áá á %{user}-á¡ááá <abbr title='%{exact_time}'>%{when} á¬áá</abbr>
       changesetxml: áªáááááááááá¡ ááááá¢áá¡ XML
       osmchangexml: osmChange XML
       feed:
@@ -129,25 +160,25 @@ ka:
         title_comment: áªáááááááááá¡ ááááá¢á %{id} - %{comment}
       discussion: áááá®áááá
     node:
-      title: 'á¬áá á¢ááá: %{name}'
-      history_title: 'á¬áá á¢áááá¡ áá¡á¢áá áá: %{name}'
+      title_html: 'á¬áá á¢ááá: %{name}'
+      history_title_html: 'á¬áá á¢áááá¡ áá¡á¢áá áá: %{name}'
     way:
-      title: 'á®ááá: %{name}'
-      history_title: 'á®áááá¡ áá¡á¢áá áá: %{name}'
+      title_html: 'á®ááá: %{name}'
+      history_title_html: 'á®áááá¡ áá¡á¢áá áá: %{name}'
       nodes: á¬áá á¢ááááá
     relation:
-      title: 'á£á áááá áááá: %{name}'
-      history_title: 'á£á áááá ááááá¡ áá¡á¢áá áá: %{name}'
+      title_html: 'á£á áááá áááá: %{name}'
+      history_title_html: 'á£á áááá ááááá¡ áá¡á¢áá áá: %{name}'
       members: á¬ááá ááá
     relation_member:
-      entry_role: '%{type} %{name} á áááá áª %{role}'
+      entry_role_html: '%{type} %{name} á áááá áª %{role}'
       type:
         node: ááááá«á
         way: ááá
         relation: á£á áááá áááá
     containing_relation:
-      entry: á£á áááá áááá %{relation_name}
-      entry_role: á£á áááá áááá %{relation_name} (á áááá áª %{relation_role})
+      entry_html: á£á áááá áááá %{relation_name}
+      entry_role_html: á£á áááá áááá %{relation_name} (á áááá áª %{relation_role})
     not_found:
       sorry: 'á¡ááá¬á£á®áá áá, %{type} #%{id} ááá  áááá«áááá.'
       type:
@@ -184,7 +215,7 @@ ka:
       open_title: 'ááá£áá£á¨ááááááá á¨áááá¨ááá #%{note_name}'
       closed_title: 'áááá£á¨ááááá£áá á¨áááá¨ááá #%{note_name}'
       hidden_title: 'áááááá£áá á¨áááá¨ááá #%{note_name}'
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: áááá áá %{page}
       next: á¨áááááá â
@@ -198,18 +229,19 @@ ka:
       user: áááá®ááá ááááá
       comment: áááááá¢áá á
       area: á¢áá áá¢áá áá
-    list:
+    index:
       title: áªáááááááááá¡ ááááá¢á
       load_more: ááá¢áá¡ á©áá¢ááá ááá
-    rss:
-      commented_at_html: ááááá®ááá %{when} á¬áá
+  changeset_comments:
+    comment:
       commented_at_by_html: áááááá®áá %{when} á¬áá áááá®ááá áááááá %{user}
-      full: á¡á á£áá áááá®áááá
-  diary_entry:
+  diary_entries:
     new:
       title: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
-      publish_button: ááááá¥ááá§áááá
-    list:
+    form:
+      location: 'áááááá áááá:'
+      use_map_link: á á£áááá á©áááááá
+    index:
       title: áááá®ááá ááááááá¡ áá¦áá£á ááá
       title_friends: áááááá áááá¡ áá¦áá£á ááá
       title_nearby: áááááááá áááá®ááá ááááááá¡ áá¦áá£á ááá
@@ -221,21 +253,12 @@ ka:
       newer_entries: á£áá®ááá¡á á©áááá¬áá ááá
     edit:
       title: áá¦áá£á áá¡ á©áááá¬áá áá¡ á áááá¥á¢áá ááá
-      subject: 'áááá:'
-      body: 'á¢áá¥á¡á¢á:'
-      language: 'ááá:'
-      location: 'áááááá áááá:'
-      latitude: 'áááááá:'
-      longitude: 'áá á«ááá:'
-      use_map_link: á á£áááá á©áááááá
-      save_button: á¨áááá®áá
-    view:
+    show:
       title: '%{user}-áá¡ áá¦áá£á á | %{title}'
       user_title: '%{user}-áá¡ áá¦áá£á á'
       leave_a_comment: ááá¢áááá áááááá¢áá á
-      login_to_leave_a_comment: '%{login_link}, á ááá ááá¢áááá áááááá¢áá á'
+      login_to_leave_a_comment_html: '%{login_link}, á ááá ááá¢áááá áááááá¢áá á'
       login: á¨áá¡ááá
-      save_button: á¨áááá®áá
     no_such_entry:
       title: áá¦áá£á á¨á áá¡ááá á©áááá¬áá á áá  áá áá¡
       heading: 'id: %{id}-ááá á©áááá¬áá á áá  áá áá¡'
@@ -259,42 +282,24 @@ ka:
       post: ááá¡á¢á
       when: á áááá¡
       comment: áááááá¢áá á
-      ago: '%{ago} á¬áá'
       newer_comments: áá®ááá áááááá¢áá ááá
       older_comments: á«áááá áááááá¢áá ááá
-  export:
-    title: áá¥á¡ááá á¢á
-    start:
-      area_to_export: á¢áá áá¢áá áá áá¥á¡ááá á¢áá¡ááááá¡
-      manually_select: á¡á®áá á ááááááá¡ ááááá§áá¤á á®áááá
-      format_to_export: áá¥á¡ááá á¢áá¡ á¤áá ááá¢á
-      osm_xml_data: OpenStreetMap XMLâáá¡ áááááªááááá
-      map_image: á á£ááá¡ á¡á£á ááá (á¡á¢ááááá á¢á£áá á¤áááá¡ á©áááááá)
-      licence: áááªááááá
-      too_large:
-        planet:
-          title: áááááá¢á OSM
-      options: ááá áááá¢á ááá
-      format: á¤áá ááá¢á
-      scale: ááá¡á¨á¢ááá
-      max: ááá¥á¡.
-      image_size: ááááá¡áá®á£ááááá¡ áááá
-      zoom: áááááááá
-      add_marker: á á£áááá ááá¨áá£ááá¡ ááá¡áá
-      latitude: 'áááááá:'
-      longitude: 'áá á«ááá:'
-      output: á¨ááááá
-      export_button: áá¥á¡ááá á¢á
+  friendships:
+    make_friend:
+      heading: ááááááá¢á %{user} áááááá ááá¨á?
+      button: áááááá ááá¨á ááááá¢ááá
+      success: '%{name} áá®áá á£ááá áá¥áááá ááááááá áá!'
+    remove_friend:
+      heading: á¬ááá¨ááá áááááá áááááá %{user}?
+      button: áááááá áááááá á¬áá¨áá
   geocoder:
     search:
       title:
-        latlon: <a href="http://openstreetmap.org/">á¨ááá á¨ááááááá</a>
-        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>âáá¡
-          á¨ááááááá
-        ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a>âá¡ á¨ááááááá
-        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        latlon_html: <a href="http://openstreetmap.org/">á¨ááá á¨ááááááá</a>
+        ca_postcode_html: <a href="http://geocoder.ca/">Geocoder.CA</a>âá¡ á¨ááááááá
+        osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>âáá¡ á¨ááááááá
-        geonames: <a href="http://www.geonames.org/">GeoNames</a>âáá¡ á¨ááááááá
+        geonames_html: <a href="http://www.geonames.org/">GeoNames</a>âáá¡ á¨ááááááá
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -336,32 +341,24 @@ ka:
           crematorium: áá áááá¢áá áá£áá
           dentist: áááá¢áá¡á¢á
           doctors: áá¥ááá
-          dormitory: á¡ááá áá á¡ááªá®ááá ááááá
           drinking_water: á¡áá¡áááá á¬á§ááá
           driving_school: ááá¢áá¡áááá
           embassy: á¡áááá©á
-          emergency_phone: á¡áááááááá á¡áá¢á£ááªááááá¡ á¡ááá¡áá®á£á áá¡ á¢áááá¤ááá
           fast_food: á¡á¬á áá¤á ááááá
           ferry_terminal: ááá áááá¡ á¡áááá£á á
-          fire_hydrant: á¡áá®ááá«á á á°ááá ááá¢á
           fire_station: á¡áá®ááá«á á áááá§áá¤ááááá
           fountain: á¨ááá ááááá
           fuel: á¡áá¬áááá
           grave_yard: á¡áá¤áááá
-          gym: á¤áá¢ááá¡ áªááá¢á á / á¡áááá á¯áá¨á ááá áááá
-          health_centre: á¯áááá ááááááá¡ áªááá¢á á
           hospital: á¡ááááááá§áá¤á
           hunting_stand: á¡áááááá á ááá¨áá£á á
           ice_cream: ááá§ááá
           kindergarten: á¡ááááá¨áá ááá¦á
           library: áááááááááá
-          market: ááá¦áááá
           marketplace: ááááá á
           monastery: ááááá¡á¢áá á
           nightclub: á¦áááá¡ ááá£áá
-          nursery: áááá¡ááááá¢á
           nursing_home: ááá®á£áªááá£ááá áááá¨áá¡áá¤áá á
-          office: áá¤áá¡á
           parking: ááá¢áá¡áááááá
           parking_entrance: á¡ááááááá¡ á¨áá¡áá¡ááááá
           pharmacy: áá¤áááá¥á
@@ -369,21 +366,15 @@ ka:
           police: áááááªáá
           post_box: á¡áá¤áá¡á¢á á§á£áá
           post_office: á¤áá¡á¢á
-          preschool: á¡ááááááááá ááá¬áá¡ááá£áááá
           prison: áªáá®á
           pub: áááá
           public_building: á¡áá¯áá á á¨ááááá
-          reception_area: áááá¦ááá
           recycling: áááááá¡áá§á ááá
           restaurant: á áá¡á¢áá ááá
-          retirement_home: ááá®á£áªááá£ááá áááá¨áá¡áá¤áá á
-          sauna: á¡áá£áá
           school: á¡áááá
           shelter: áááá¨áá¡áá¤áá á
-          shop: ááá¦áááá
           shower: á¨á®ááá
           social_centre: á¡áááááááááá ááá áªááá¢á á
-          social_club: á¡áááááááááá ááá áááá¨áá§á áá¡ áááááá
           studio: á¡á¢á£ááá
           swimming_pool: á¡ááªá£á áá áá£áá
           taxi: á¢áá¥á¡á
@@ -395,7 +386,6 @@ ka:
           vending_machine: á¡áááá­á á ááá¢áááá¢á
           veterinary: ááá¢áá áááá á£áá ááááááá
           waste_basket: áááááá¡ á£á áá
-          youth_centre: áá®áááááá áá£áá áªááá¢á á
         boundary:
           administrative: ááááááá¡á¢á ááªáá£áá á¡ááá¦ááá á
           census: áá¦á¬áá áá¡ á áááááá¡ á¡ááá¦ááá á
@@ -408,6 +398,25 @@ ka:
           viaduct: ááááá£áá
           "yes": á®ááá
         building:
+          apartments: áá ááááááááááá ááá áá£á¡á
+          chapel: á¡áááááªáááá
+          church: ááááá¡áá
+          commercial: ááááá áªáá£áá á¨ááááá
+          dormitory: á¡ááá áá á¡ááªá®ááá ááááá
+          farm: á¤áá áá
+          garage: ááá¢áá¤áá áá®á
+          hospital: á¡ááááááá§áá¤áá¡ á¨ááááá
+          hotel: á¡áá¡á¢á£áá á
+          house: á¡áá®áá
+          industrial: á¡ááá áá¬áááá áááááááá
+          office: á¡ááá¤áá¡á áááááááá
+          public: á¡áááááááááá ááá á¨ááááá
+          residential: á¡ááªá®ááá ááááá á¡áá®áá
+          retail: ááá¡áá§ááá áááááááá
+          school: á¡áááá
+          terrace: á¢áá áá¡á
+          train_station: á áááááááá¡ á¡áááá£á á
+          university: á£ááááá á¡áá¢áá¢á
           "yes": á¨ááááá
         craft:
           brewery: áá£áá¡áá®áá á¨á
@@ -456,9 +465,7 @@ ka:
           tertiary_link: ááá¡ááá áááá¡áá¡ ááá
           track: áááááá
           traffic_signals: á¨á£á¥ááá¨ááá
-          trail: áááááá
           unclassified: áááááááá ááá ááá
-          unsurfaced: á£ááááááá á ááá
           "yes": ááá
         historic:
           archaeological_site: áá á¥ááááááá£á á áááá®á ááá
@@ -473,7 +480,6 @@ ka:
           fort: á¤áá á¢á
           heritage: áá£áá¢á£á á£áá áááááááá ááááá¡ ááááá¥á¢á
           house: á¡áá®áá
-          icon: á®áá¢á£áá
           manor: áááá£áá
           memorial: ááááá áááá
           mine: ááá¦áá á
@@ -514,7 +520,6 @@ ka:
           vineyard: ááááá®á
           "yes": ááá¬ááá¡áá ááááááá
         leisure:
-          club: ááá£áá
           dog_park: á«áá¦ááááá¡ ááá áá
           fishing: á¡ááááááá á¢áá áá¢áá áá
           fitness_centre: á¤áá¢ááá¡-áªááá¢á á
@@ -601,8 +606,6 @@ ka:
           travel_agent: á¢á£á áá¡á¢á£áá á¡áááááá¢á
           "yes": áá¤áá¡á
         place:
-          block: áááá á¢ááá
-          airport: ááá áááá á¢á
           city: á¥áááá¥á
           country: á¥ááá§ááá
           county: ááá¥á
@@ -612,7 +615,6 @@ ka:
           houses: á¡áá®áááá
           island: áá£áá«á£áá
           islet: ááá¢áá á áá£áá«á£áá
-          moor: á¢áá á¤ááá á
           municipality: áá£áááªáááááá¢áá¢á
           neighbourhood: á¡áááááááá
           postcode: á¡áá¤áá¡á¢á ááááá¥á¡á
@@ -622,16 +624,13 @@ ka:
           subdivision: á¥ááááááá§áá¤á
           suburb: ááá áá£áááá
           town: áááá
-          unincorporated_area: ááááá¡á£á¤ááá áááá
           village: á¡áá¤ááá
         railway:
           abandoned: ááá¢ááááá£áá á ááááááá
           construction: á áááááááá¡ á ááááá¢á
           disused: ááá¢ááááá£áá á ááááááá
-          disused_station: ááá¢ááááá£áá á áááááááá¡ á¡áááá£á á
           funicular: á¤á£áááá£áááá á
           halt: ááá¢áá ááááá¡ ááá©áá ááá
-          historic_station: áá¡á¢áá áá£áá á áááááááá¡ á¡áááá£á á
           level_crossing: á¡áá ááááááá ááááá¡áá¡ááááá
           light_rail: áá¡á£áá£á¥á á ááááááá
           monorail: ááááá ááá¡á
@@ -645,6 +644,7 @@ ka:
           switch: á¡áá ááááááá áá¡áá á
           tram: á¢á ááááá
           tram_stop: á¢á áááááá¡ ááá©áá ááá
+          yard: á áááááááá¡ áááá
         shop:
           antiques: ááá¢ááááá ááá¢á
           art: á¡ááá®áá¢áá á á¡ááááá
@@ -669,21 +669,17 @@ ka:
           electronics: áááá¥á¢á áá¢áá¥ááááá¡ ááá¦áááá
           estate_agent: á£á«á ááá á¥áááááá¡ ááááá¢á
           fashion: áááá£á á á¢ááá¡ááªáááá¡ ááá¦áááá
-          fish: áááááááá¡ ááá¦áááá
           florist: á§ááááááááá¡ ááá¦áááá
           food: á¡ááááááá¡ ááá¦áááá
           funeral_directors: ááááá á«ááááá ááá£á á
           furniture: áááá¯á
-          gallery: ááááá áá
           gift: á¡áá©á£á¥á áááá¡ ááá¦áááá
           greengrocer: á®áá-ááá¡á¢ááá£ááá¡ ááá¦áááá
           hairdresser: á¡áááá ááááá®áá á
-          insurance: á¡ááááá¦áááá
           jewelry: á¡ááá£ááááá á ááá¦áááá
           kiosk: á¯áá®á£á á
           laundry: á¡ááá ááªá®áá
           mall: áááá
-          market: ááááá á
           mobile_phone: áááááá£á á á¢áááá¤áááááá¡ ááá¦áááá
           motorcycle: ááá¢ááªááááá¢áááá¡ ááá¦áááá
           music: áá£á¡ááááá£á á ááá¦áááá
@@ -691,12 +687,9 @@ ka:
           optician: ááá¢ááá
           organic: áá áááá£áá á¡ááááááá¡ ááá¦áááá
           pet: áááááá¦áááá
-          pharmacy: áá¤áááá¥á
           photo: á¤áá¢áááá¦áááá
-          salon: á¡ááááá
           second_hand: áááá áááááá¡ ááá¦áááá
           shoes: á¤áá®á¡ááªáááá¡ ááá¦áááá
-          shopping_centre: á¡áááá­á á áªááá¢á á
           sports: á¡ááá á¢á£áá ááá¦áááá
           stationery: á¡áááááªáááá áá ááá¦áááá
           supermarket: á¡á£ááá ááá ááá¢á
@@ -742,11 +735,6 @@ ka:
         level8: á¥áááá¥áá¡ á¡ááá¦ááá á
         level9: á¡áá¤ááá¡ á¡ááá¦ááá á
         level10: ááá áá£áááá¡ á¡ááá¦ááá á
-    description:
-      title:
-        osm_nominatim: áááááá áááá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>-ááá
-        geonames: áááááá áááá <a href="http://www.geonames.org/">GeoNames</a>-ááá
       types:
         cities: á¥áááá¥ááá
         towns: áááááá
@@ -779,42 +767,27 @@ ka:
     foundation_title: á¤áááá OpenStreetMap
     make_a_donation:
       text: áá ááá¥á¢áá¡ ááá®ááá ááá
-  license_page:
-    foreign:
-      english_link: áááááá¡á£á á áá ááááááá
-    native:
-      title: áá áááá ááá¡ á¨áá¡áá®áá
-      native_link: á¥áá áá£áá ááá á¡áá
-      mapping_link: ááá á¢ááá áá¤áá áááá¡ ááá¬á§ááá
-    legal_babble:
-      title_html: á¡áááá¢áá á á£á¤áááááá áá áááªááááá
-  notifier:
+    more: ááá¢á
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap]-áá¡ áááá®ááá áááááá %{user} áá¥áááá¡ áá¦áá£á á¨á ááá¢ááá áááááá¢áá á'
       hi: ááááá á¯ááá %{to_user},
     message_notification:
       hi: ááááá á¯ááá %{to_user},
-    friend_notification:
+    friendship_notification:
       subject: '[OpenStreetMap]-áá¡ áááá®ááá áááááá %{user} ááááááá¢áá áááááá ááá¨á'
-    gpx_notification:
-      greeting: ááááá á¯ááá,
     signup_confirm:
       subject: '[OpenStreetMap] ááááá¡ááááááá OpenStreetMap-á¨á'
       greeting: ááááá á¯ááá!
     email_confirm:
       subject: '[OpenStreetMap] áááááá¡á¢á£á áá áá¥áááá áá.á¤áá¡á¢áá¡ ááá¡áááá áá'
-    email_confirm_plain:
-      greeting: ááááá á¯ááá,
-    email_confirm_html:
-      greeting: ááááá á¯ááá,
-    lost_password_plain:
       greeting: ááááá á¯ááá,
-    lost_password_html:
+    lost_password:
       greeting: ááááá á¯ááá,
     note_comment_notification:
       anonymous: ááááááá£á á áááá®ááá ááááá
       greeting: ááááá á¯ááá,
-  message:
+  messages:
     inbox:
       title: ááá¦ááá£áá
       my_inbox: á©ááá ááá¦ááá£áá
@@ -829,21 +802,21 @@ ka:
       from: ááááááááááá
       subject: áááá
       date: ááá áá¦á
-      no_messages_yet: áá¥ááá á¯áá  áá  ááá¥áá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá ááááá¡áá£áá á
+      no_messages_yet_html: áá¥ááá á¯áá  áá  ááá¥áá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá ááááá¡áá£áá á
         áááááá¡ %{people_mapping_nearby_link}?
       people_mapping_nearby: áá®ááá¡ áá§áá¤á á®ááá®á
     message_summary:
       unread_button: ááááá¨ááá á áááá áª á¬áá£áááá®ááá
       read_button: ááááá¨ááá á áááá áª á¬ááááá®á£áá
       reply_button: ááá¡á£á®á
-      delete_button: á¬áá¨áá
+      destroy_button: á¬áá¨áá
     new:
       title: á¨áá¢á§áááááááá¡ áááááááá
-      send_message_to: ááá£ááááááá áá®ááá á¨áá¢á§ááááááá %{name}
+      send_message_to_html: ááá£ááááááá áá®ááá á¨áá¢á§ááááááá %{name}
       subject: áááá
       body: á¢áá¥á¡á¢á
-      send_button: áááááááá
       back_to_inbox: ááá¦ááá£áááá¨á áááá á£áááá
+    create:
       message_sent: á¨áá¢á§ááááááá ááááááááá
       limit_exceeded: áá¥ááá áªáá¢á á®ááá¡ á¬áá ááááááááá áááá á á¨áá¢á§ááááááá. á¡áááá ááááá
         ááááááááááá, ááááªáááá áªáá¢á á®ááá.
@@ -853,7 +826,7 @@ ka:
       body: ááááá¨áá, áááá áá á¨áá¢á§ááááááá áá ID-áá áá  áá á¡ááááá¡.
     outbox:
       title: áááááááááá
-      my_inbox: á©ááá %{inbox_link}
+      my_inbox_html: á©ááá %{inbox_link}
       inbox: ááá¦ááá£áá
       outbox: áááááááááá
       messages:
@@ -862,14 +835,14 @@ ka:
       to: ááá¡
       subject: áááá
       date: ááá áá¦á
-      no_sent_messages: áá¥ááá á¯áá  áá  ááá¥áá áááááááááá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá
-        ááááá¡áá£áá á áááááá¡ %{people_mapping_nearby_link}?
+      no_sent_messages_html: áá¥ááá á¯áá  áá  ááá¥áá áááááááááá á¨áá¢á§ááááááááá. á áá¢áá áá 
+        á£ááá ááááá¡áá£áá á áááááá¡ %{people_mapping_nearby_link}?
       people_mapping_nearby: áá®ááá¡ áá§áá¤á á®ááá®á
     reply:
       wrong_user: áá¥ááá á¨áá®ááááá á áááá áª `%{user}' áááá áá ááá¡á£á®á áá¥ááá áááá®áááá áá 
         ááááááááá áá áááá®ááá ááááááá. ááá®ááá, á¨áá®ááááá, á áááá áª á¨áá¡áááááá¡á áááá®ááááá¡
         ááááááááááá áááá®ááá ááááá, á ááá áá®áááá ááá¡á£á®á.
-    read:
+    show:
       title: á¨áá¢á§áááááááá¡ á¬ááááá®áá
       from: ááááááááááá
       subject: áááá
@@ -881,19 +854,50 @@ ka:
         áá¡á£á á, áá  áá áá¡ áááááááááá áá áááá®ááá ááááááá, áá ááá¡ áááá . ááá®ááá, á¨áá®ááááá,
         á áááá áª á¨áá¡áááááá¡á áááá®ááá ááááá, á ááá á¬áááááá®áá áá¡.
     sent_message_summary:
-      delete_button: á¬áá¨áá
+      destroy_button: á¬áá¨áá
     mark:
       as_read: á¨áá¢á§ááááááá ááááá¨áá£ááá á áááá áª á¬ááááá®á£áá
       as_unread: á¨áá¢á§ááááááá ááááá¨áá£ááá á áááá áª á¬áá£áááá®ááá
-    delete:
-      deleted: á¨áá¢á§ááááááá á¬áá¨ááááá
+    destroy:
+      destroyed: á¨áá¢á§ááááááá á¬áá¨ááááá
   site:
+    copyright:
+      foreign:
+        english_link: áááááá¡á£á á áá ááááááá
+      native:
+        title: áá áááá ááá¡ á¨áá¡áá®áá
+        native_link: á¥áá áá£áá ááá á¡áá
+        mapping_link: ááá á¢ááá áá¤áá áááá¡ ááá¬á§ááá
+      legal_babble:
+        title_html: á¡áááá¢áá á á£á¤áááááá áá áááªááááá
     index:
       permalink: áá£ááááá ááá£áá
       shortlink: ááááá ááá£áá
       createnote: á¨áááá¨áááá¡ ááááá¢ááá
     edit:
       user_page_link: áááá®ááá ááááá¡ áááá áá
+    export:
+      title: áá¥á¡ááá á¢á
+      area_to_export: á¢áá áá¢áá áá áá¥á¡ááá á¢áá¡ááááá¡
+      manually_select: á¡á®áá á ááááááá¡ ááááá§áá¤á á®áááá
+      format_to_export: áá¥á¡ááá á¢áá¡ á¤áá ááá¢á
+      osm_xml_data: OpenStreetMap XMLâáá¡ áááááªááááá
+      map_image: á á£ááá¡ á¡á£á ááá (á¡á¢ááááá á¢á£áá á¤áááá¡ á©áááááá)
+      licence: áááªááááá
+      too_large:
+        planet:
+          title: áááááá¢á OSM
+      options: ááá áááá¢á ááá
+      format: á¤áá ááá¢á
+      scale: ááá¡á¨á¢ááá
+      max: ááá¥á¡.
+      image_size: ááááá¡áá®á£ááááá¡ áááá
+      zoom: áááááááá
+      add_marker: á á£áááá ááá¨áá£ááá¡ ááá¡áá
+      latitude: 'áááááá:'
+      longitude: 'áá á«ááá:'
+      output: á¨ááááá
+      export_button: áá¥á¡ááá á¢á
     sidebar:
       search_results: á«ááááá¡ á¨ááááááá
       close: ááá®á£á áá
@@ -956,29 +960,13 @@ ka:
       image: á¡á£á ááá
       alt: ááá¢áá ááá¢áá£áá á¢áá¥á¡á¢á
       url: URL
-  trace:
-    edit:
-      filename: 'á¤ááááá¡ á¡áá®ááá:'
-      download: áááááá¬áá á
-      uploaded_at: 'áá¢ááá áá£ááá:'
-      points: 'á¬áá á¢ááá:'
-      start_coord: 'á¡áá¬á§áá¡á áááá ááááá¢á:'
-      map: á á£áá
-      edit: á áááá¥á¢áá ááá
-      owner: 'áá¤áááááá:'
-      description: 'áá¦á¬áá á:'
-      tags_help: áá«áááá¡ á¨ááááá
-      save_button: áªáááááááááá¡ á¨áááá®áá
-      visibility: 'á®áááááááá:'
-      visibility_help: áá¡ á áá¡ ááá¨áááá¡?
-    trace_form:
-      description: 'áá¦á¬áá á:'
-      tags_help: áá«áááá¡ á¨ááááá
-      visibility: 'á®áááááááá:'
+  traces:
+    new:
       visibility_help: áá¡ á áá¡ ááá¨áááá¡?
-      upload_button: áá¢ááá ááá
       help: ááá®ááá ááá
-    view:
+    edit:
+      visibility_help: áá¡ á áá¡ ááá¨áááá¡?
+    show:
       pending: áááá£á¨ááááá
       filename: 'á¤ááááá¡ á¡áá®ááá:'
       download: áááááá¬áá á
@@ -996,7 +984,6 @@ ka:
     trace:
       pending: áááá£á¨ááááá
       count_points: '%{count} á¬áá á¢ááá'
-      ago: '%{time_in_words_ago} á¬áá'
       more: ááá¢á
       view_map: á á£ááá¡ ááá®áá
       edit: á áááá¥á¢áá ááá
@@ -1008,31 +995,22 @@ ka:
       by: 'ááá¢áá á:'
       map: á á£áá
   oauth:
-    oauthorize:
+    authorize:
       allow_write_api: á á£ááá¡ á¨ááªááá.
   oauth_clients:
-    new:
-      submit: á áááá¡á¢á ááªáá
-    edit:
-      submit: á áááá¥á¢áá ááá
     show:
       edit: ááá¢áááááá¡ á áááá¥á¢áá ááá
       confirm: ááá á¬áá£áááá£áá á®áá á?
-      allow_write_api: á á£ááá¡ á¨ááªááá.
     index:
       application: áááááááªááá¡ á¡áá®ááá
       revoke: ááááááááá!
-    form:
-      name: á¡áá®ááá
-      required: á¡áááááááá£ááá
-      allow_write_api: á á£ááá¡ á áááá¥á¢áá ááá.
-  user:
+  users:
     login:
       title: á¨áá¡ááá
       heading: á¨áá¡ááá
       email or username: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá, áá áááá®ááá ááááá¡ á¡áá®ááá:'
       password: 'ááá ááá:'
-      openid: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID:'
       remember: 'ááááááá®á¡ááá á:'
       lost password link: ááááááá¬á§ááá ááá ááá?
       login_button: á¨áá¡ááá
@@ -1050,20 +1028,15 @@ ka:
       heading: ááááááá¬á§ááá ááá ááá?
       email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
     reset_password:
-      password: 'ááá ááá:'
-      confirm password: 'ááá áááá¡ ááááá¡á¢á£á ááá:'
       flash changed: áá¥áááá ááá ááá á¨áááªáááá.
     new:
       title: á áááá¡á¢á ááªáá
       email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
       confirm email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ ááááá¡á¢á£á ááá:'
       display name: 'á¡áá®ááá ááá áááá:'
-      password: 'ááá ááá:'
-      confirm password: 'ááá áááá¡ ááááá¡á¢á£á ááá:'
       continue: á áááá¡á¢á ááªáá
     terms:
       consider_pd_why: á á áá áá¡ áá¡?
-      agree: ááá¦ááá
       decline: á£áá á§áá¤á
       legale_select: 'ááá®ááá, ááá á©ááá áá¥áááá á¥ááá§ááá:'
       legale_names:
@@ -1072,7 +1045,7 @@ ka:
         rest_of_world: ááááá á©ááá áá¡áá¤ááá
     no_such_user:
       heading: áááá®ááá ááááá %{user} áá  áá á¡ááááá¡
-    view:
+    show:
       my diary: á©ááá áá¦áá£á á
       new diary entry: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
       my edits: á©ááá á áááá¥á¢áá ááá
@@ -1083,7 +1056,6 @@ ka:
       edits: á áááá¥á¢áá ááááá
       remove as friend: áááááá áááááá á¬áá¨áá
       add as friend: áááááá ááá¨á ááááá¢ááá
-      ct accepted: ááá¦ááá£ááá %{ago} á¬áá
       latest edit: 'áááá á áááá¥á¢áá ááá %{ago}:'
       email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
       created from: 'á¨áá¥áááááá:'
@@ -1092,7 +1064,6 @@ ka:
       description: áá¦á¬áá á
       user location: áááá®ááá ááááá¡ ááááááááááá áááá
       settings_link_text: ááá áááá¢á ááá
-      your friends: áá¥áááá áááááá ááá
       km away: '%{count}áá áá¥áááááá'
       m away: '%{count}á áá¥áááááá'
       role:
@@ -1113,7 +1084,6 @@ ka:
       title: ááááá áá¨áá¡ á áááá¥á¢áá ááá
       my settings: á©ááá ááá áááá¢á ááá
       current email address: 'áá-á¤áá¡á¢áá¡ ááááááááááá ááá¡áááá áá:'
-      new email address: 'áá®ááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
       openid:
         link: http://wiki.openstreetmap.org/wiki/KA:OpenID
         link text: á á áá áá¡ áá¡?
@@ -1123,12 +1093,8 @@ ka:
       contributor terms:
         link text: á á áá áá¡ áá¡?
       image: 'á¡á£á ááá:'
-      gravatar:
-        link text: áá¡ á á áá áá¡?
       new image: á¡á£á áááá¡ ááááá¢ááá
       home location: 'á©ááá áááááá¡ááá§áá¤ááá:'
-      latitude: 'áááááá:'
-      longitude: 'áá á«ááá:'
       save changes button: áªáááááááááá¡ á¨áááá®áá
       return to profile: áá áá¤ááá¨á áááá á£áááá
     confirm:
@@ -1139,14 +1105,7 @@ ka:
     confirm_email:
       heading: áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ áªáááááááá¡ ááááá¡á¢á£á ááá
       button: ááááá¡á¢á£á ááá
-    make_friend:
-      heading: ááááááá¢á %{user} áááááá ááá¨á?
-      button: áááááá ááá¨á ááááá¢ááá
-      success: '%{name} áá®áá á£ááá áá¥áááá ááááááá áá!'
-    remove_friend:
-      heading: á¬ááá¨ááá áááááá áááááá %{user}?
-      button: áááááá áááááá á¬áá¨áá
-    list:
+    index:
       title: áááá®ááá áááááá
       heading: áááá®ááá áááááá
     suspended:
@@ -1156,16 +1115,14 @@ ka:
       confirm: ááááá¡á¢á£á ááá
     revoke:
       confirm: ááááá¡á¢á£á ááá
-  user_block:
+  user_blocks:
     new:
       title: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
-      heading: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
-      submit: áááááá áááá¡ á¨áá¥ááá
+      heading_html: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
       back: á§áááá áááááá áááá¡ á©áááááá
     edit:
       title: áááá®ááá áááá %{name} áááááá áááá¡ á áááá¥á¢áá ááá
-      heading: áááá®ááá áááá %{name} áááááá áááá¡ á áááá¥á¢áá ááá
-      submit: áááááá®ááá áááááá ááá
+      heading_html: áááá®ááá áááá %{name} áááááá áááá¡ á áááá¥á¢áá ááá
       show: áá áááááá áááá¡ á©áááááá
       back: á§áááá áááááá áááá¡ á©áááááá
     update:
@@ -1179,40 +1136,25 @@ ka:
       confirm: ááá á¬áá£áááá£áá á®áá á, á áá áá áááááá áááá¡ ááá®á¡áá áá¡á£á á?
       revoke: ááááááááá!
       flash: áá¡ áááááá ááá áááá®á¡áá.
-    period:
-      one: 1 á¡áááá
-      other: '%{count} á¡áááá'
-    partial:
-      show: á©áááááá
-      edit: á áááá¥á¢áá ááá
-      revoke: ááááááááá!
-      confirm: ááá á¬áá£áááá£áá á®áá á?
-      display_name: ááááááááá áááá®ááá ááááá
-      creator_name: á¨ááá¥ááááá
-      reason: ááááááááá¡ áááááá
-      status: á¡á¢áá¢á£á¡á
-      revoker_name: ááááááááááá
-      not_revoked: (áá  áá áá¡ áááááááááá)
-      showing_page: áááá áá %{page}
-      next: á¨áááááá Â»
-      previous: Â« á¬ááá
     helper:
-      time_future: ááááá áááá %{time}âá¨á.
+      time_future_html: ááááá áááá %{time}âá¨á.
       until_login: áá¥á¢áá£á áá ááááááá, á¡áááá áááá®ááá ááááá áá  á¨ááá á¡áá¡á¢áááá¨á.
-      time_past: ááá¡á á£ááá %{time} á¬áá.
+      time_past_html: ááá¡á á£ááá %{time} á¬áá.
+      block_duration:
+        hours:
+          one: 1 á¡áááá
+          other: '%{count} á¡áááá'
     blocks_on:
       title: '%{name}-áá¡ áááá  áááááááá£áá áááááá ááááá'
-      heading: '%{name}-áá¡ áááá  áááááááá£áá áááááá áááááá¡ á¡áá'
+      heading_html: '%{name}-áá¡ áááá  áááááááá£áá áááááá áááááá¡ á¡áá'
       empty: '%{name} á¯áá  áá áá¡áá áá¡ áá  á§áá¤ááá ááááááááá.'
     blocks_by:
       title: '%{name}-áá¡ áááá  áááááááá£áá áááááá ááááá'
-      heading: '%{name}-áá¡ áááá  áááááááá£áá áááááá áááááá¡ á¡áá'
+      heading_html: '%{name}-áá¡ áááá  áááááááá£áá áááááá áááááá¡ á¡áá'
       empty: '%{name} á¯áá  áá ááááá á áááááá ááá áá  ááá£ááááááá.'
     show:
       title: '%{block_on}, ááááá ááááá: %{block_by}'
-      heading: '%{block_on}, ááááá ááááá: %{block_by}'
-      time_future: ááááá áááá %{time}âá¨á
-      time_past: ááá¡á á£ááá %{time} á¬áá
+      heading_html: '%{block_on}, ááááá ááááá: %{block_by}'
       status: á¡á¢áá¢á£á¡á
       show: á©áááááá
       edit: á áááá¥á¢áá ááá
@@ -1222,18 +1164,24 @@ ka:
       back: á§áááá áááááá áááá¡ á©áááááá
       revoker: 'áááááááááááá:'
       needs_view: á¡áááá ááá®áááá áááááá¡ ááá®á¡áá, ááááááá á¡áá­áá áá áááá®ááá ááááá¡ ááá áááá¡á¢á áá ááá
-  note:
-    description:
-      opened_at_html: á¨ááá¥ááá %{when} á¬áá
-      opened_at_by_html: á¨áá¥ááá %{when} á¬áá áááá®ááá áááááá %{user}
-      commented_at_html: ááááá®ááá %{when} á¬áá
-      commented_at_by_html: áááááá®áá %{when} á¬áá áááá®ááá áááááá %{user}
-    entry:
-      comment: áááááá¢áá á
-    mine:
+    block:
+      not_revoked: (áá  áá áá¡ áááááááááá)
+      show: á©áááááá
+      edit: á áááá¥á¢áá ááá
+      revoke: ááááááááá!
+    blocks:
+      display_name: ááááááááá áááá®ááá ááááá
+      creator_name: á¨ááá¥ááááá
+      reason: ááááááááá¡ áááááá
+      status: á¡á¢áá¢á£á¡á
+      revoker_name: ááááááááááá
+      showing_page: áááá áá %{page}
+      next: á¨áááááá Â»
+      previous: Â« á¬ááá
+  notes:
+    index:
       creator: á¨ááá¥ááááá
       description: áá¦á¬áá á
-      ago_html: '%{when} á¬áá'
   javascripts:
     map:
       base:
@@ -1252,11 +1200,7 @@ ka:
         comment: áááááá¢áá á
     context:
       show_address: ááá¡áááá ááá¡ á©áááááá
-  redaction:
-    edit:
-      description: áá¦á¬áá á
-    new:
-      description: áá¦á¬áá á
+  redactions:
     show:
       description: 'áá¦á¬áá á:'
       user: 'á¨ááá¥ááááá:'