X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c560b3ac69f92c15219fb7a16d89b97eddee7a09..6f5ae957cd51841ecf821126963c104b62958c8d:/config/locales/ka.yml

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index d2ed2362b..baf9f28ed 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -1,10 +1,12 @@
 # Messages for Georgian (á¥áá áá£áá)
 # Exported from translatewiki.net
 # Export driver: phpyaml
-# Author: Abijeet Patro
 # Author: David1010
 # Author: MIKHEIL
+# Author: McDutchie
 # Author: Temuri rajavi
+# Author: á²áá áá¥á á
+# Author: á²á áá¥á á
 ---
 ka:
   time:
@@ -40,7 +42,6 @@ ka:
       message: á¨áá¢á§ááááááá
       node: ááááá«á
       node_tag: á¬áá á¢áááá¡ á¢ááá
-      notifier: ááááá¤á áá®ááááááá
       old_node: á«áááá ááááá«á
       old_node_tag: á¬áá á¢áááá¡ á«áááá á¢ááá
       old_relation: á«áááá á£á áááá áááá
@@ -70,7 +71,7 @@ ka:
         title: áááá
         latitude: áááááá
         longitude: áá á«ááá
-        language: ááá
+        language_code: ááá
       friend:
         user: áááá®ááá ááááá
         friend: ááááááá á
@@ -89,11 +90,16 @@ ka:
         title: áááá
         body: á¢áá¥á¡á¢á
         recipient: áááá¦ááá
+      redaction:
+        description: áá¦á¬áá á
       user:
         email: áá. á¤áá¡á¢á
+        new_email: 'áá®ááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
         active: áá¥á¢áá£á á
         display_name: á¡áá®ááá ááá áááá
         description: áá¦á¬áá á
+        home_lat: 'áááááá:'
+        home_lon: 'áá á«ááá:'
         languages: ááááá
         pass_crypt: ááá ááá
     help:
@@ -101,15 +107,9 @@ ka:
         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)
@@ -122,16 +122,23 @@ ka:
         commented_at_by_html: áááááá®áá %{when} á¬áá áááá®ááá áááááá %{user}
       entry:
         comment: áááááá¢áá á
+  accounts:
+    edit:
+      title: ááááá áá¨áá¡ á áááá¥á¢áá ááá
+      my settings: á©ááá ááá áááá¢á ááá
+      current email address: 'áá-á¤áá¡á¢áá¡ ááááááááááá ááá¡áááá áá:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/KA:OpenID
+        link text: á á áá áá¡ áá¡?
+      public editing:
+        enabled link text: á á áá áá¡ áá¡?
+        disabled link text: á áá¢áá áá  á¨áááá«ááá á áááá¥á¢áá ááá?
+      contributor terms:
+        link text: á á áá áá¡ áá¡?
+      save changes button: áªáááááááááá¡ á¨áááá®áá
   browse:
     created: á¨ááá¥ááá
     closed: ááá®á£á á£ááá
-    created_html: á¨ááá¥ááá <abbr title='%{title}'>%{time} á¬áá</abbr>
-    closed_html: áááá®á£á á <abbr title='%{title}'>%{time} á¬áá</abbr>
-    created_by_html: á¨ááá¥ááá <abbr title='%{title}'>%{time} á¬áá</abbr> ááá¢áá á %{user}
-    deleted_by_html: á¬ááá¨ááá <abbr title='%{title}'>%{time} á¬áá</abbr> ááá¢áá á %{user}
-    edited_by_html: ááá áááá¥á¢áá áá <abbr title='%{title}'>%{time} á¬áá</abbr> ááá¢áá á
-      %{user}
-    closed_by_html: áááá®á£á á <abbr title='%{title}'>%{time} á¬áá</abbr> ááá¢áá á %{user}
     version: ááá á¡áá
     in_changeset: áªáááááááááá¡ ááááá¢á
     anonymous: ááááááá
@@ -149,15 +156,8 @@ ka:
       way_paginated: á®ááááá (%{x}-%{y} %{count}-ááá)
       relation: á£á áááá áááááá (%{count})
       relation_paginated: á£á áááá áááááá (%{x}-%{y} %{count}-ááá)
-      comment: áááááá¢áá ááá (%{count})
-      hidden_commented_by: áááááá£áá áááááá¢áá ááá %{user}-á¡ááá <abbr title='%{exact_time}'>%{when}
-        á¬áá</abbr>
-      commented_by: ááááááá¢áá á %{user}-á¡ááá <abbr title='%{exact_time}'>%{when} á¬áá</abbr>
       changesetxml: áªáááááááááá¡ ááááá¢áá¡ XML
       osmchangexml: osmChange XML
-      feed:
-        title: áªáááááááááá¡ ááááá¢á %{id}
-        title_comment: áªáááááááááá¡ ááááá¢á %{id} - %{comment}
       discussion: áááá®áááá
     node:
       title_html: 'á¬áá á¢ááá: %{name}'
@@ -208,13 +208,6 @@ ka:
     tag_details:
       wikipedia_link: á¡á¢áá¢áá %{page} áááááááááá¨á
       telephone_link: ááá áááá %{phone_number}
-    note:
-      title: 'á¨áááá¨ááá: %{id}'
-      new_note: áá®ááá á¨áááá¨ááá
-      description: áá¦á¬áá á
-      open_title: 'ááá£áá£á¨ááááááá á¨áááá¨ááá #%{note_name}'
-      closed_title: 'áááá£á¨ááááá£áá á¨áááá¨ááá #%{note_name}'
-      hidden_title: 'áááááá£áá á¨áááá¨ááá #%{note_name}'
   changesets:
     changeset_paging_nav:
       showing_page: áááá áá %{page}
@@ -232,19 +225,25 @@ ka:
     index:
       title: áªáááááááááá¡ ááááá¢á
       load_more: ááá¢áá¡ á©áá¢ááá ááá
+      feed:
+        title: áªáááááááááá¡ ááááá¢á %{id}
+        title_comment: áªáááááááááá¡ ááááá¢á %{id} - %{comment}
   changeset_comments:
     comment:
       commented_at_by_html: áááááá®áá %{when} á¬áá áááá®ááá áááááá %{user}
+  dashboards:
+    contact:
+      km away: '%{count}áá áá¥áááááá'
+      m away: '%{count}á áá¥áááááá'
+      latest_edit_html: 'áááá á áááá¥á¢áá ááá %{ago}:'
+    popup:
+      your location: áá¥áááá ááááááááááá áááá
+      friend: ááááááá á
   diary_entries:
     new:
       title: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
     form:
-      subject: 'áááá:'
-      body: 'á¢áá¥á¡á¢á:'
-      language: 'ááá:'
       location: 'áááááá áááá:'
-      latitude: 'áááááá:'
-      longitude: 'áá á«ááá:'
       use_map_link: á á£áááá á©áááááá
     index:
       title: áááá®ááá ááááááá¡ áá¦áá£á ááá
@@ -298,13 +297,6 @@ ka:
       heading: á¬ááá¨ááá áááááá áááááá %{user}?
       button: áááááá áááááá á¬áá¨áá
   geocoder:
-    search:
-      title:
-        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_html: <a href="http://www.geonames.org/">GeoNames</a>âáá¡ á¨ááááááá
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -364,7 +356,6 @@ ka:
           monastery: ááááá¡á¢áá á
           nightclub: á¦áááá¡ ááá£áá
           nursing_home: ááá®á£áªááá£ááá áááá¨áá¡áá¤áá á
-          office: áá¤áá¡á
           parking: ááá¢áá¡áááááá
           parking_entrance: á¡ááááááá¡ á¨áá¡áá¡ááááá
           pharmacy: áá¤áááá¥á
@@ -372,20 +363,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: á¢áá¥á¡á
@@ -397,7 +383,6 @@ ka:
           vending_machine: á¡áááá­á á ááá¢áááá¢á
           veterinary: ááá¢áá áááá á£áá ááááááá
           waste_basket: áááááá¡ á£á áá
-          youth_centre: áá®áááááá áá£áá áªááá¢á á
         boundary:
           administrative: ááááááá¡á¢á ááªáá£áá á¡ááá¦ááá á
           census: áá¦á¬áá áá¡ á áááááá¡ á¡ááá¦ááá á
@@ -410,6 +395,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: áá£áá¡áá®áá á¨á
@@ -458,7 +462,6 @@ ka:
           tertiary_link: ááá¡ááá áááá¡áá¡ ááá
           track: áááááá
           traffic_signals: á¨á£á¥ááá¨ááá
-          trail: áááááá
           unclassified: áááááááá ááá ááá
           "yes": ááá
         historic:
@@ -474,7 +477,6 @@ ka:
           fort: á¤áá á¢á
           heritage: áá£áá¢á£á á£áá áááááááá ááááá¡ ááááá¥á¢á
           house: á¡áá®áá
-          icon: á®áá¢á£áá
           manor: áááá£áá
           memorial: ááááá áááá
           mine: ááá¦áá á
@@ -491,9 +493,8 @@ ka:
           brownfield: ááá¢ááááá£áá áááááá
           cemetery: á¡áá¡áá¤ááá
           commercial: ááááá áªáá£áá á¢áá áá¢áá áá
-          conservation: áááá¡áá áááªáá
+          conservation: áááá á«ááá
           construction: áá¨áááááááá
-          farm: á¤áá áá
           farmland: á¡áááá áá£áá
           forest: á¢á§á
           garages: ááá¢áá¤áá áá®ááá
@@ -554,6 +555,7 @@ ka:
           cape: ááááªá®á
           cave_entrance: ááááá¥áááá£áá¨á á¨áá¡áá¡ááááá
           cliff: á®á ááá
+          coastline: á¡áááááá á áááá
           crater: áá áá¢áá á
           dune: ááá£áá
           fell: ááá áªáá
@@ -619,7 +621,6 @@ ka:
           subdivision: á¥ááááááá§áá¤á
           suburb: ááá áá£áááá
           town: áááá
-          unincorporated_area: ááááá¡á£á¤ááá áááá
           village: á¡áá¤ááá
         railway:
           abandoned: ááá¢ááááá£áá á ááááááá
@@ -640,6 +641,7 @@ ka:
           switch: á¡áá ááááááá áá¡áá á
           tram: á¢á ááááá
           tram_stop: á¢á áááááá¡ ááá©áá ááá
+          yard: á áááááááá¡ áááá
         shop:
           antiques: ááá¢ááááá ááá¢á
           art: á¡ááá®áá¢áá á á¡ááááá
@@ -664,12 +666,10 @@ ka:
           electronics: áááá¥á¢á áá¢áá¥ááááá¡ ááá¦áááá
           estate_agent: á£á«á ááá á¥áááááá¡ ááááá¢á
           fashion: áááá£á á á¢ááá¡ááªáááá¡ ááá¦áááá
-          fish: áááááááá¡ ááá¦áááá
           florist: á§ááááááááá¡ ááá¦áááá
           food: á¡ááááááá¡ ááá¦áááá
           funeral_directors: ááááá á«ááááá ááá£á á
           furniture: áááá¯á
-          gallery: ááááá áá
           gift: á¡áá©á£á¥á áááá¡ ááá¦áááá
           greengrocer: á®áá-ááá¡á¢ááá£ááá¡ ááá¦áááá
           hairdresser: á¡áááá ááááá®áá á
@@ -677,7 +677,6 @@ ka:
           kiosk: á¯áá®á£á á
           laundry: á¡ááá ááªá®áá
           mall: áááá
-          market: ááááá á
           mobile_phone: áááááá£á á á¢áááá¤áááááá¡ ááá¦áááá
           motorcycle: ááá¢ááªááááá¢áááá¡ ááá¦áááá
           music: áá£á¡ááááá£á á ááá¦áááá
@@ -685,7 +684,6 @@ ka:
           optician: ááá¢ááá
           organic: áá áááá£áá á¡ááááááá¡ ááá¦áááá
           pet: áááááá¦áááá
-          pharmacy: áá¤áááá¥á
           photo: á¤áá¢áááá¦áááá
           second_hand: áááá áááááá¡ ááá¦áááá
           shoes: á¤áá®á¡ááªáááá¡ ááá¦áááá
@@ -734,11 +732,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: áááááá
@@ -767,11 +760,10 @@ ka:
     copyright: á¡áááá¢áá á á£á¤áááá
     community: ááááá¡áááááááááá
     community_blogs: ááááá¡ááááááááááá¡ ááááááá
-    foundation: á¤áááá
-    foundation_title: á¤áááá OpenStreetMap
     make_a_donation:
       text: áá ááá¥á¢áá¡ ááá®ááá ááá
-  notifier:
+    more: ááá¢á
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap]-áá¡ áááá®ááá áááááá %{user} áá¥áááá¡ áá¦áá£á á¨á ááá¢ááá áááááá¢áá á'
       hi: ááááá á¯ááá %{to_user},
@@ -779,29 +771,29 @@ ka:
       hi: ááááá á¯ááá %{to_user},
     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: ááááá á¯ááá,
+  confirmations:
+    confirm:
+      heading: á¨ááááá¬ááá áá¥áááá áá.á¤áá¡á¢á!
+      button: ááááá¡á¢á£á ááá
+    confirm_resend:
+      failure: áááá®ááá ááááá %{name} ááá  áááá«áááá.
+    confirm_email:
+      heading: áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ áªáááááááá¡ ááááá¡á¢á£á ááá
+      button: ááááá¡á¢á£á ááá
   messages:
     inbox:
       title: ááá¦ááá£áá
-      my_inbox: á©ááá ááá¦ááá£áá
-      outbox: áááááááááá
       messages: áá¥ááá ááá¥áá %{new_messages} áá %{old_messages}
       new_messages:
         one: '%{count} áá®ááá á¨áá¢á§ááááááá'
@@ -809,12 +801,14 @@ ka:
       old_messages:
         one: '%{count} á«áááá á¨áá¢á§ááááááá'
         other: '%{count} á«áááá á¨áá¢á§ááááááá'
-      from: ááááááááááá
-      subject: áááá
-      date: ááá áá¦á
       no_messages_yet_html: áá¥ááá á¯áá  áá  ááá¥áá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá ááááá¡áá£áá á
         áááááá¡ %{people_mapping_nearby_link}?
       people_mapping_nearby: áá®ááá¡ áá§áá¤á á®ááá®á
+    messages_table:
+      from: ááááááááááá
+      to: ááá¡
+      subject: áááá
+      date: ááá áá¦á
     message_summary:
       unread_button: ááááá¨ááá á áááá áª á¬áá£áááá®ááá
       read_button: ááááá¨ááá á áááá áª á¬ááááá®á£áá
@@ -823,8 +817,6 @@ ka:
     new:
       title: á¨áá¢á§áááááááá¡ áááááááá
       send_message_to_html: ááá£ááááááá áá®ááá á¨áá¢á§ááááááá %{name}
-      subject: áááá
-      body: á¢áá¥á¡á¢á
       back_to_inbox: ááá¦ááá£áááá¨á áááá á£áááá
     create:
       message_sent: á¨áá¢á§ááááááá ááááááááá
@@ -836,15 +828,9 @@ ka:
       body: ááááá¨áá, áááá áá á¨áá¢á§ááááááá áá ID-áá áá  áá á¡ááááá¡.
     outbox:
       title: áááááááááá
-      my_inbox_html: á©ááá %{inbox_link}
-      inbox: ááá¦ááá£áá
-      outbox: áááááááááá
       messages:
         one: áá¥ááá ááá¥áá %{count} áááááááááá á¨áá¢á§ááááááá
         other: áá¥ááá ááá¥áá %{count} áááááááááá á¨áá¢á§ááááááá
-      to: ááá¡
-      subject: áááá
-      date: ááá áá¦á
       no_sent_messages_html: áá¥ááá á¯áá  áá  ááá¥áá áááááááááá á¨áá¢á§ááááááááá. á áá¢áá áá 
         á£ááá ááááá¡áá£áá á áááááá¡ %{people_mapping_nearby_link}?
       people_mapping_nearby: áá®ááá¡ áá§áá¤á á®ááá®á
@@ -854,22 +840,48 @@ ka:
         ááááááááááá áááá®ááá ááááá, á ááá áá®áááá ááá¡á£á®á.
     show:
       title: á¨áá¢á§áááááááá¡ á¬ááááá®áá
-      from: ááááááááááá
-      subject: áááá
-      date: ááá áá¦á
       reply_button: ááá¡á£á®á
       unread_button: ááááá¨ááá á áááá áª á¬áá£áááá®ááá
-      to: ááá¡
       wrong_user: áá¥ááá á¨áá®ááááá á áááá áª `%{user}' áááá áá á¨áá¢á§ááááááá á ááááá¡ á¬ááááá®áááª
         áá¡á£á á, áá  áá áá¡ áááááááááá áá áááá®ááá ááááááá, áá ááá¡ áááá . ááá®ááá, á¨áá®ááááá,
         á áááá áª á¨áá¡áááááá¡á áááá®ááá ááááá, á ááá á¬áááááá®áá áá¡.
     sent_message_summary:
       destroy_button: á¬áá¨áá
+    heading:
+      my_inbox: á©ááá ááá¦ááá£áá
     mark:
       as_read: á¨áá¢á§ááááááá ááááá¨áá£ááá á áááá áª á¬ááááá®á£áá
       as_unread: á¨áá¢á§ááááááá ááááá¨áá£ááá á áááá áª á¬áá£áááá®ááá
     destroy:
       destroyed: á¨áá¢á§ááááááá á¬áá¨ááááá
+  passwords:
+    new:
+      title: ááá áááá¡ áá¦ááááá
+      heading: ááááááá¬á§ááá ááá ááá?
+      email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
+    update:
+      flash changed: áá¥áááá ááá ááá á¨áááªáááá.
+  profiles:
+    edit:
+      image: 'á¡á£á ááá:'
+      new image: á¡á£á áááá¡ ááááá¢ááá
+      home location: 'á©ááá áááááá¡ááá§áá¤ááá:'
+  sessions:
+    new:
+      title: á¨áá¡ááá
+      heading: á¨áá¡ááá
+      email or username: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá, áá áááá®ááá ááááá¡ á¡áá®ááá:'
+      password: 'ááá ááá:'
+      remember: ááááááá®á¡ááá á
+      lost password link: ááááááá¬á§ááá ááá ááá?
+      login_button: á¨áá¡ááá
+      register now: ááá áááá¡á¢á áá ááá áá®áááá
+      no account: áá  ááá¥áá ááááá áá¨á?
+      openid_logo_alt: á¨áá¡ááá OpenID-áá¡ á¡áá¨á£áááááá
+    destroy:
+      title: ááá¡ááá
+      heading: OpenStreetMap-ááá ááá¡ááá
+      logout_button: ááá¡ááá
   site:
     copyright:
       foreign:
@@ -888,25 +900,11 @@ ka:
       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: á«ááááá¡ á¨ááááááá
@@ -928,14 +926,8 @@ ka:
           footway: á¡áá¤áá®ááááá ááá
           rail: á ááááááá
           subway: ááá¢á á
-          tram:
-            1: á¢á ááááá
-          cable:
-          - á¡áááááá á ááá
-          runway:
-          - ááá áááá á¢áá¡ áá¡áá¤á áá-ááá¡áá¤á ááá áááááá
-          apron:
-            1: á¢áá áááááá
+          cable_car: á¡áááááá á ááá
+          runway: ááá áááá á¢áá¡ áá¡áá¤á áá-ááá¡áá¤á ááá áááááá
           admin: ááááááá¡á¢á ááªáá£áá á¡ááá¦ááá á
           forest: á¢á§á
           wood: á¢á§á
@@ -943,33 +935,19 @@ ka:
           park: ááá áá
           resident: á¡ááªá®ááá ááááá á¢áá áá¢áá áá
           commercial: ááááá áªáá£áá á¢áá áá¢áá áá
-          lake:
-          - á¢áá
-          - á¬á§ááá¡ááªááá
+          lake: á¢áá
+          reservoir: á¬á§ááá¡ááªááá
           farm: á¤áá áá
           cemetery: á¡áá¡áá¤ááá
           pitch: á¡ááá á¢á£áá ááááááá
           centre: á¡ááá á¢á£áá áªááá¢á á
           reserve: áááá á«ááá
           military: á¡ááá®ááá á á¢áá áá¢áá áá
-          school:
-          - á¡áááá
-          - á£ááááá á¡áá¢áá¢á
+          school: á¡áááá
+          university: á£ááááá á¡áá¢áá¢á
           station: á áááááááá¡ á¡áááá£á á
-          summit:
-          - áá¬ááá áááá
-          - áááá
-    richtext_area:
-      edit: á áááá¥á¢áá ááá
-      preview: á¬áááá¡á¬áá á ááááá®áááá
-    markdown_help:
-      first: ááá áááá ááááááá¢á
-      second: áááá á ááááááá¢á
-      link: ááá£áá
-      text: á¢áá¥á¡á¢á
-      image: á¡á£á ááá
-      alt: ááá¢áá ááá¢áá£áá á¢áá¥á¡á¢á
-      url: URL
+          summit: áá¬ááá áááá
+          peak: áááá
   traces:
     new:
       visibility_help: áá¡ á áá¡ ááá¨áááá¡?
@@ -989,21 +967,17 @@ ka:
       description: 'áá¦á¬áá á:'
       none: áá á
       visibility: 'á®áááááááá:'
-    trace_paging_nav:
-      showing_page: áááá áá %{page}
     trace:
       pending: áááá£á¨ááááá
       count_points: '%{count} á¬áá á¢ááá'
       more: ááá¢á
       view_map: á á£ááá¡ ááá®áá
-      edit: á áááá¥á¢áá ááá
       edit_map: á á£ááá¡ á áááá¥á¢áá ááá
       public: á¡áá¯áá á
       identifiable: ááááá¢áá¤ááªáá ááááá
       private: ááá ááá
       trackable: áááá¢á áááá ááááá
       by: 'ááá¢áá á:'
-      map: á á£áá
   oauth:
     authorize:
       allow_write_api: á á£ááá¡ á¨ááªááá.
@@ -1011,48 +985,12 @@ ka:
     show:
       edit: ááá¢áááááá¡ á áááá¥á¢áá ááá
       confirm: ááá á¬áá£áááá£áá á®áá á?
-      allow_write_api: á á£ááá¡ á¨ááªááá.
     index:
       application: áááááááªááá¡ á¡áá®ááá
       revoke: ááááááááá!
-    form:
-      name: á¡áá®ááá
-      required: á¡áááááááá£ááá
-      allow_write_api: á á£ááá¡ á áááá¥á¢áá ááá.
   users:
-    login:
-      title: á¨áá¡ááá
-      heading: á¨áá¡ááá
-      email or username: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá, áá áááá®ááá ááááá¡ á¡áá®ááá:'
-      password: 'ááá ááá:'
-      openid_html: '%{logo} OpenID:'
-      remember: 'ááááááá®á¡ááá á:'
-      lost password link: ááááááá¬á§ááá ááá ááá?
-      login_button: á¨áá¡ááá
-      register now: ááá áááá¡á¢á áá ááá áá®áááá
-      new to osm: áá®ááá á®áá á OpenStreetMap-áá?
-      create account minute: á¨áá¥ááááá ááááá áá¨á. áááá¡ááááá¡ áá®áááá áá áá á¬á£ááá á¡áá­áá á.
-      no account: áá  ááá¥áá ááááá áá¨á?
-      openid_logo_alt: á¨áá¡ááá OpenID-áá¡ á¡áá¨á£áááááá
-    logout:
-      title: ááá¡ááá
-      heading: OpenStreetMap-ááá ááá¡ááá
-      logout_button: ááá¡ááá
-    lost_password:
-      title: ááá áááá¡ áá¦ááááá
-      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: á á áá áá¡ áá¡?
@@ -1066,7 +1004,6 @@ ka:
       heading: áááá®ááá ááááá %{user} áá  áá á¡ááááá¡
     show:
       my diary: á©ááá áá¦áá£á á
-      new diary entry: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
       my edits: á©ááá á áááá¥á¢áá ááá
       my settings: á©ááá ááá áááá¢á ááá
       my comments: á©ááá áááááá¢áá ááá
@@ -1075,65 +1012,23 @@ ka:
       edits: á áááá¥á¢áá ááááá
       remove as friend: áááááá áááááá á¬áá¨áá
       add as friend: áááááá ááá¨á ááááá¢ááá
-      latest edit: 'áááá á áááá¥á¢áá ááá %{ago}:'
       email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
       created from: 'á¨áá¥áááááá:'
       status: 'á¡á¢áá¢á£á¡á:'
       spam score: 'á¡ááááá¡ á¨áá¤áá¡ááá:'
-      description: áá¦á¬áá á
-      user location: áááá®ááá ááááá¡ ááááááááááá áááá
-      settings_link_text: ááá áááá¢á ááá
-      km away: '%{count}áá áá¥áááááá'
-      m away: '%{count}á áá¥áááááá'
       role:
         administrator: áá¡ áááá®ááá ááááá ááááááá¡á¢á áá¢áá áá
       comments: áááááá¢áá ááá
       create_block: áá áááá®ááá ááááá¡ áááááááá
       activate_user: áá áááá®ááá ááááá¡ áá¥á¢ááááªáá
-      deactivate_user: áá áááá®ááá ááááá¡ áááá¥á¢ááááªáá
       confirm_user: áá áááá®ááá ááááá¡ ááááá¡á¢á£á ááá
       hide_user: áá áááá®ááá ááááá¡ ááááááá
       unhide_user: áá áááá®ááá ááááá¡ ááááá©ááá
       delete_user: áá áááá®ááá ááááá¡ á¬áá¨áá
       confirm: ááááá¡á¢á£á ááá
-    popup:
-      your location: áá¥áááá ááááááááááá áááá
-      friend: ááááááá á
-    account:
-      title: ááááá áá¨áá¡ á áááá¥á¢áá ááá
-      my settings: á©ááá ááá áááá¢á ááá
-      current email address: 'áá-á¤áá¡á¢áá¡ ááááááááááá ááá¡áááá áá:'
-      new email address: 'áá®ááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/KA:OpenID
-        link text: á á áá áá¡ áá¡?
-      public editing:
-        enabled link text: á á áá áá¡ áá¡?
-        disabled link text: á áá¢áá áá  á¨áááá«ááá á áááá¥á¢áá ááá?
-      contributor terms:
-        link text: á á áá áá¡ áá¡?
-      image: 'á¡á£á ááá:'
-      gravatar:
-        link text: áá¡ á á áá áá¡?
-      new image: á¡á£á áááá¡ ááááá¢ááá
-      home location: 'á©ááá áááááá¡ááá§áá¤ááá:'
-      latitude: 'áááááá:'
-      longitude: 'áá á«ááá:'
-      save changes button: áªáááááááááá¡ á¨áááá®áá
-      return to profile: áá áá¤ááá¨á áááá á£áááá
-    confirm:
-      heading: á¨ááááá¬ááá áá¥áááá áá.á¤áá¡á¢á!
-      button: ááááá¡á¢á£á ááá
-    confirm_resend:
-      failure: áááá®ááá ááááá %{name} ááá  áááá«áááá.
-    confirm_email:
-      heading: áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ áªáááááááá¡ ááááá¡á¢á£á ááá
-      button: ááááá¡á¢á£á ááá
     index:
       title: áááá®ááá áááááá
       heading: áááá®ááá áááááá
-    suspended:
-      webmaster: ááá-ááá¡á¢áá á
   user_role:
     grant:
       confirm: ááááá¡á¢á£á ááá
@@ -1155,15 +1050,15 @@ ka:
       title: áááá®ááá ááááá¡ áááááá ááááá
       heading: áááá®ááá ááááá¡ áááááá áááááá¡ á¡áá
     revoke:
-      time_future: áá¡ áááááá ááá ááá¡á á£ááá %{time}.
-      past: áá¡ áááááá ááá ááá¡á á£ááá %{time} á¬áá áá ááá¡á ááá£á¥áááá á£ááá á¨áá£á«ááááááá.
+      time_future_html: áá¡ áááááá ááá ááá¡á á£ááá %{time}.
+      past_html: áá¡ áááááá ááá ááá¡á á£ááá %{time} á¬áá áá ááá¡á ááá£á¥áááá á£ááá á¨áá£á«ááááááá.
       confirm: ááá á¬áá£áááá£áá á®áá á, á áá áá áááááá áááá¡ ááá®á¡áá áá¡á£á á?
       revoke: ááááááááá!
       flash: áá¡ áááááá ááá áááá®á¡áá.
     helper:
-      time_future: ááááá áááá %{time}âá¨á.
+      time_future_html: ááááá áááá %{time}âá¨á.
       until_login: áá¥á¢áá£á áá ááááááá, á¡áááá áááá®ááá ááááá áá  á¨ááá á¡áá¡á¢áááá¨á.
-      time_past: ááá¡á á£ááá %{time} á¬áá.
+      time_past_html: ááá¡á á£ááá %{time} á¬áá.
       block_duration:
         hours:
           one: 1 á¡áááá
@@ -1206,6 +1101,17 @@ ka:
     index:
       creator: á¨ááá¥ááááá
       description: áá¦á¬áá á
+    show:
+      title: 'á¨áááá¨ááá: %{id}'
+      description: áá¦á¬áá á
+      open_title: 'ááá£áá£á¨ááááááá á¨áááá¨ááá #%{note_name}'
+      closed_title: 'áááá£á¨ááááá£áá á¨áááá¨ááá #%{note_name}'
+      hidden_title: 'áááááá£áá á¨áááá¨ááá #%{note_name}'
+      hide: ááááááá
+      comment: áááááá¢áá á
+    new:
+      title: áá®ááá á¨áááá¨ááá
+      add: á¨áááá¨áááá¡ ááááá¢ááá
   javascripts:
     map:
       base:
@@ -1216,19 +1122,9 @@ ka:
       edit_tooltip: á á£ááá¡ á áááá¥á¢áá ááá
       edit_disabled_tooltip: á áááá¥á¢áá áááá¡ááááá¡ ááááá ááá á á£ááá¡ ááá¡á¨á¢ááá
       createnote_tooltip: á á£áááá á¨áááá¨áááá¡ ááááá¢ááá
-    notes:
-      new:
-        add: á¨áááá¨áááá¡ ááááá¢ááá
-      show:
-        hide: ááááááá
-        comment: áááááá¢áá á
     context:
       show_address: ááá¡áááá ááá¡ á©áááááá
   redactions:
-    edit:
-      description: áá¦á¬áá á
-    new:
-      description: áá¦á¬áá á
     show:
       description: 'áá¦á¬áá á:'
       user: 'á¨ááá¥ááááá:'