X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d792a3bab59cd2f171c49d8d63937db3cbc9b0bc..5368f9f9b45f47a57bd9caa3debaa834e087b61a:/config/locales/ka.yml

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 42b1d8304..a28480d7d 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -1,14 +1,33 @@
 # Messages for Georgian (á¥áá áá£áá)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Abijeet Patro
 # 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,6 +84,7 @@ ka:
         longitude: áá á«ááá
         public: á¡áá¯áá á
         description: áá¦á¬áá á
+        visibility: 'á®áááááááá:'
       message:
         sender: ááááááááá
         title: áááá
@@ -77,6 +97,9 @@ ka:
         description: áá¦á¬áá á
         languages: ááááá
         pass_crypt: ááá ááá
+    help:
+      trace:
+        tagstring: áá«áááá¡ á¨ááááá
   editor:
     default: á£ááá áááá (ááááááá %{name})
     potlatch:
@@ -91,6 +114,15 @@ ka:
     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 +151,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 +162,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 +217,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 +231,24 @@ 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:
+      subject: 'áááá:'
+      body: 'á¢áá¥á¡á¢á:'
+      language: 'ááá:'
+      location: 'áááááá áááá:'
+      latitude: 'áááááá:'
+      longitude: 'áá á«ááá:'
+      use_map_link: á á£áááá á©áááááá
+    index:
       title: áááá®ááá ááááááá¡ áá¦áá£á ááá
       title_friends: áááááá áááá¡ áá¦áá£á ááá
       title_nearby: áááááááá áááá®ááá ááááááá¡ áá¦áá£á ááá
@@ -221,21 +260,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,17 +289,24 @@ ka:
       post: ááá¡á¢á
       when: á áááá¡
       comment: áááááá¢áá á
-      ago: '%{ago} á¬áá'
       newer_comments: áá®ááá áááááá¢áá ááá
       older_comments: á«áááá áááááá¢áá ááá
+  friendships:
+    make_friend:
+      heading: ááááááá¢á %{user} áááááá ááá¨á?
+      button: áááááá ááá¨á ááááá¢ááá
+      success: '%{name} áá®áá á£ááá áá¥áááá ááááááá áá!'
+    remove_friend:
+      heading: á¬ááá¨ááá áááááá áááááá %{user}?
+      button: áááááá áááááá á¬áá¨áá
   geocoder:
     search:
       title:
-        latlon: <a href="http://openstreetmap.org/">á¨ááá á¨ááááááá</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:
@@ -329,7 +366,6 @@ ka:
           monastery: ááááá¡á¢áá á
           nightclub: á¦áááá¡ ááá£áá
           nursing_home: ááá®á£áªááá£ááá áááá¨áá¡áá¤áá á
-          office: áá¤áá¡á
           parking: ááá¢áá¡áááááá
           parking_entrance: á¡ááááááá¡ á¨áá¡áá¡ááááá
           pharmacy: áá¤áááá¥á
@@ -337,20 +373,15 @@ ka:
           police: áááááªáá
           post_box: á¡áá¤áá¡á¢á á§á£áá
           post_office: á¤áá¡á¢á
-          preschool: á¡ááááááááá ááá¬áá¡ááá£áááá
           prison: áªáá®á
           pub: áááá
           public_building: á¡áá¯áá á á¨ááááá
           recycling: áááááá¡áá§á ááá
           restaurant: á áá¡á¢áá ááá
-          retirement_home: ááá®á£áªááá£ááá áááá¨áá¡áá¤áá á
-          sauna: á¡áá£áá
           school: á¡áááá
           shelter: áááá¨áá¡áá¤áá á
-          shop: ááá¦áááá
           shower: á¨á®ááá
           social_centre: á¡áááááááááá ááá áªááá¢á á
-          social_club: á¡áááááááááá ááá áááá¨áá§á áá¡ áááááá
           studio: á¡á¢á£ááá
           swimming_pool: á¡ááªá£á áá áá£áá
           taxi: á¢áá¥á¡á
@@ -362,7 +393,6 @@ ka:
           vending_machine: á¡áááá­á á ááá¢áááá¢á
           veterinary: ááá¢áá áááá á£áá ááááááá
           waste_basket: áááááá¡ á£á áá
-          youth_centre: áá®áááááá áá£áá áªááá¢á á
         boundary:
           administrative: ááááááá¡á¢á ááªáá£áá á¡ááá¦ááá á
           census: áá¦á¬áá áá¡ á áááááá¡ á¡ááá¦ááá á
@@ -375,6 +405,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: áá£áá¡áá®áá á¨á
@@ -423,7 +472,6 @@ ka:
           tertiary_link: ááá¡ááá áááá¡áá¡ ááá
           track: áááááá
           traffic_signals: á¨á£á¥ááá¨ááá
-          trail: áááááá
           unclassified: áááááááá ááá ááá
           "yes": ááá
         historic:
@@ -439,7 +487,6 @@ ka:
           fort: á¤áá á¢á
           heritage: áá£áá¢á£á á£áá áááááááá ááááá¡ ááááá¥á¢á
           house: á¡áá®áá
-          icon: á®áá¢á£áá
           manor: áááá£áá
           memorial: ááááá áááá
           mine: ááá¦áá á
@@ -584,7 +631,6 @@ ka:
           subdivision: á¥ááááááá§áá¤á
           suburb: ááá áá£áááá
           town: áááá
-          unincorporated_area: ááááá¡á£á¤ááá áááá
           village: á¡áá¤ááá
         railway:
           abandoned: ááá¢ááááá£áá á ááááááá
@@ -605,6 +651,7 @@ ka:
           switch: á¡áá ááááááá áá¡áá á
           tram: á¢á ááááá
           tram_stop: á¢á áááááá¡ ááá©áá ááá
+          yard: á áááááááá¡ áááá
         shop:
           antiques: ááá¢ááááá ááá¢á
           art: á¡ááá®áá¢áá á á¡ááááá
@@ -629,12 +676,10 @@ ka:
           electronics: áááá¥á¢á áá¢áá¥ááááá¡ ááá¦áááá
           estate_agent: á£á«á ááá á¥áááááá¡ ááááá¢á
           fashion: áááá£á á á¢ááá¡ááªáááá¡ ááá¦áááá
-          fish: áááááááá¡ ááá¦áááá
           florist: á§ááááááááá¡ ááá¦áááá
           food: á¡ááááááá¡ ááá¦áááá
           funeral_directors: ááááá á«ááááá ááá£á á
           furniture: áááá¯á
-          gallery: ááááá áá
           gift: á¡áá©á£á¥á áááá¡ ááá¦áááá
           greengrocer: á®áá-ááá¡á¢ááá£ááá¡ ááá¦áááá
           hairdresser: á¡áááá ááááá®áá á
@@ -642,7 +687,6 @@ ka:
           kiosk: á¯áá®á£á á
           laundry: á¡ááá ááªá®áá
           mall: áááá
-          market: ááááá á
           mobile_phone: áááááá£á á á¢áááá¤áááááá¡ ááá¦áááá
           motorcycle: ááá¢ááªááááá¢áááá¡ ááá¦áááá
           music: áá£á¡ááááá£á á ááá¦áááá
@@ -650,7 +694,6 @@ ka:
           optician: ááá¢ááá
           organic: áá áááá£áá á¡ááááááá¡ ááá¦áááá
           pet: áááááá¦áááá
-          pharmacy: áá¤áááá¥á
           photo: á¤áá¢áááá¦áááá
           second_hand: áááá áááááá¡ ááá¦áááá
           shoes: á¤áá®á¡ááªáááá¡ ááá¦áááá
@@ -699,11 +742,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: áááááá
@@ -736,13 +774,14 @@ ka:
     foundation_title: á¤áááá OpenStreetMap
     make_a_donation:
       text: áá ááá¥á¢áá¡ ááá®ááá ááá
-  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: ááááá á¯ááá,
@@ -777,7 +816,7 @@ ka:
       from: ááááááááááá
       subject: áááá
       date: ááá áá¦á
-      no_messages_yet: áá¥ááá á¯áá  áá  ááá¥áá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá ááááá¡áá£áá á
+      no_messages_yet_html: áá¥ááá á¯áá  áá  ááá¥áá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá ááááá¡áá£áá á
         áááááá¡ %{people_mapping_nearby_link}?
       people_mapping_nearby: áá®ááá¡ áá§áá¤á á®ááá®á
     message_summary:
@@ -787,10 +826,9 @@ ka:
       destroy_button: á¬áá¨áá
     new:
       title: á¨áá¢á§áááááááá¡ áááááááá
-      send_message_to: ááá£ááááááá áá®ááá á¨áá¢á§ááááááá %{name}
+      send_message_to_html: ááá£ááááááá áá®ááá á¨áá¢á§ááááááá %{name}
       subject: áááá
       body: á¢áá¥á¡á¢á
-      send_button: áááááááá
       back_to_inbox: ááá¦ááá£áááá¨á áááá á£áááá
     create:
       message_sent: á¨áá¢á§ááááááá ááááááááá
@@ -802,7 +840,7 @@ ka:
       body: ááááá¨áá, áááá áá á¨áá¢á§ááááááá áá ID-áá áá  áá á¡ááááá¡.
     outbox:
       title: áááááááááá
-      my_inbox: á©ááá %{inbox_link}
+      my_inbox_html: á©ááá %{inbox_link}
       inbox: ááá¦ááá£áá
       outbox: áááááááááá
       messages:
@@ -811,8 +849,8 @@ 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}' áááá áá ááá¡á£á®á áá¥ááá áááá®áááá áá 
@@ -938,25 +976,9 @@ ka:
       url: URL
   traces:
     new:
-      description: 'áá¦á¬áá á:'
-      tags_help: áá«áááá¡ á¨ááááá
-      visibility: 'á®áááááááá:'
       visibility_help: áá¡ á áá¡ ááá¨áááá¡?
-      upload_button: áá¢ááá ááá
       help: ááá®ááá ááá
     edit:
-      filename: 'á¤ááááá¡ á¡áá®ááá:'
-      download: áááááá¬áá á
-      uploaded_at: 'áá¢ááá áá£ááá:'
-      points: 'á¬áá á¢ááá:'
-      start_coord: 'á¡áá¬á§áá¡á áááá ááááá¢á:'
-      map: á á£áá
-      edit: á áááá¥á¢áá ááá
-      owner: 'áá¤áááááá:'
-      description: 'áá¦á¬áá á:'
-      tags_help: áá«áááá¡ á¨ááááá
-      save_button: áªáááááááááá¡ á¨áááá®áá
-      visibility: 'á®áááááááá:'
       visibility_help: áá¡ á áá¡ ááá¨áááá¡?
     show:
       pending: áááá£á¨ááááá
@@ -976,7 +998,6 @@ ka:
     trace:
       pending: áááá£á¨ááááá
       count_points: '%{count} á¬áá á¢ááá'
-      ago: '%{time_in_words_ago} á¬áá'
       more: ááá¢á
       view_map: á á£ááá¡ ááá®áá
       edit: á áááá¥á¢áá ááá
@@ -991,28 +1012,19 @@ ka:
     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: á¨áá¡ááá
@@ -1030,8 +1042,6 @@ ka:
       heading: ááááááá¬á§ááá ááá ááá?
       email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
     reset_password:
-      password: 'ááá ááá:'
-      confirm password: 'ááá áááá¡ ááááá¡á¢á£á ááá:'
       flash changed: áá¥áááá ááá ááá á¨áááªáááá.
     new:
       title: á áááá¡á¢á ááªáá
@@ -1043,7 +1053,6 @@ ka:
       continue: á áááá¡á¢á ááªáá
     terms:
       consider_pd_why: á á áá áá¡ áá¡?
-      agree: ááá¦ááá
       decline: á£áá á§áá¤á
       legale_select: 'ááá®ááá, ááá á©ááá áá¥áááá á¥ááá§ááá:'
       legale_names:
@@ -1052,7 +1061,7 @@ ka:
         rest_of_world: ááááá á©ááá áá¡áá¤ááá
     no_such_user:
       heading: áááá®ááá ááááá %{user} áá  áá á¡ááááá¡
-    view:
+    show:
       my diary: á©ááá áá¦áá£á á
       new diary entry: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
       my edits: á©ááá á áááá¥á¢áá ááá
@@ -1063,7 +1072,6 @@ ka:
       edits: á áááá¥á¢áá ááááá
       remove as friend: áááááá áááááá á¬áá¨áá
       add as friend: áááááá ááá¨á ááááá¢ááá
-      ct accepted: ááá¦ááá£ááá %{ago} á¬áá
       latest edit: 'áááá á áááá¥á¢áá ááá %{ago}:'
       email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
       created from: 'á¨áá¥áááááá:'
@@ -1118,14 +1126,7 @@ ka:
     confirm_email:
       heading: áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ áªáááááááá¡ ááááá¡á¢á£á ááá
       button: ááááá¡á¢á£á ááá
-    make_friend:
-      heading: ááááááá¢á %{user} áááááá ááá¨á?
-      button: áááááá ááá¨á ááááá¢ááá
-      success: '%{name} áá®áá á£ááá áá¥áááá ááááááá áá!'
-    remove_friend:
-      heading: á¬ááá¨ááá áááááá áááááá %{user}?
-      button: áááááá áááááá á¬áá¨áá
-    list:
+    index:
       title: áááá®ááá áááááá
       heading: áááá®ááá áááááá
     suspended:
@@ -1138,13 +1139,11 @@ ka:
   user_blocks:
     new:
       title: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
-      heading: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
-      submit: áááááá áááá¡ á¨áá¥ááá
+      heading_html: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
       back: á§áááá áááááá áááá¡ á©áááááá
     edit:
       title: áááá®ááá áááá %{name} áááááá áááá¡ á áááá¥á¢áá ááá
-      heading: áááá®ááá áááá %{name} áááááá áááá¡ á áááá¥á¢áá ááá
-      submit: áááááá®ááá áááááá ááá
+      heading_html: áááá®ááá áááá %{name} áááááá áááá¡ á áááá¥á¢áá ááá
       show: áá áááááá áááá¡ á©áááááá
       back: á§áááá áááááá áááá¡ á©áááááá
     update:
@@ -1158,26 +1157,25 @@ ka:
       confirm: ááá á¬áá£áááá£áá á®áá á, á áá áá áááááá áááá¡ ááá®á¡áá áá¡á£á á?
       revoke: ááááááááá!
       flash: áá¡ áááááá ááá áááá®á¡áá.
-    period:
-      one: 1 á¡áááá
-      other: '%{count} á¡áááá'
     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: á áááá¥á¢áá ááá
@@ -1202,17 +1200,9 @@ ka:
       next: á¨áááááá Â»
       previous: Â« á¬ááá
   notes:
-    comment:
-      opened_at_html: á¨ááá¥ááá %{when} á¬áá
-      opened_at_by_html: á¨áá¥ááá %{when} á¬áá áááá®ááá áááááá %{user}
-      commented_at_html: ááááá®ááá %{when} á¬áá
-      commented_at_by_html: áááááá®áá %{when} á¬áá áááá®ááá áááááá %{user}
-    entry:
-      comment: áááááá¢áá á
-    mine:
+    index:
       creator: á¨ááá¥ááááá
       description: áá¦á¬áá á
-      ago_html: '%{when} á¬áá'
   javascripts:
     map:
       base: