X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..aaaeb211dea4711fd6bff4d79c1339e82a43ebcd:/config/locales/ka.yml?ds=sidebyside

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index dab202715..c1f7c916c 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -12,6 +12,8 @@ ka:
   activerecord:
     models:
       acl: á®ááááá¡áá¬áááááááá¡ á¨ááá¦á£áááá¡ á¡áá
+      changeset: áªáááááááááá¡ ááááá¢á
+      changeset_tag: áªáááááááááá¡ ááááá¢áá¡ á¢ááá
       country: á¥ááá§ááá
       diary_comment: áá¦áá£á áá¡ áááááá¢áá á
       diary_entry: áá¦áá£á áá¡ á©áááá¬áá á
@@ -19,24 +21,35 @@ ka:
       language: ááá
       message: á¨áá¢á§ááááááá
       node: ááááá«á
+      node_tag: á¬áá á¢áááá¡ á¢ááá
       notifier: ááááá¤á áá®ááááááá
       old_node: á«áááá ááááá«á
+      old_node_tag: á¬áá á¢áááá¡ á«áááá á¢ááá
+      old_relation: á«áááá á£á áááá áááá
+      old_relation_member: á£á áááá ááááá¡ á«áááá á¬ááá á
+      old_relation_tag: á£á áááá ááááá¡ á«áááá á¢ááá
       old_way: á«áááá ááá
       old_way_node: á«áááá áááá¡ ááááá«á
+      old_way_tag: á®áááá¡ á«áááá á¢ááá
       relation: á£á áááá áááá
+      relation_member: á£á áááá ááááá¡ á¬ááá á
+      relation_tag: á£á áááá ááááá¡ á¢ááá
       session: á¡áá¡áá
       trace: áááááá
       tracepoint: ááááááá¡ á¬áá á¢ááá
+      tracetag: ááá á¨á á£á¢áá¡ á¢ááá
       user: áááá®ááá ááááá
       user_preference: áááá®ááá ááááá¡ áááá¤ááá£á ááªáá
+      user_token: áááá®ááá ááááá¡ á¡áááá¨áá
       way: ááá
       way_node: áááá¡ ááááá«á
+      way_tag: á®áááá¡ á¢ááá
     attributes:
       diary_comment:
         body: á¢áá¥á¡á¢á
       diary_entry:
         user: áááá®ááá ááááá
-        title: á¡áááá£á á
+        title: áááá
         latitude: áááááá
         longitude: áá á«ááá
         language: ááá
@@ -54,7 +67,7 @@ ka:
         description: áá¦á¬áá á
       message:
         sender: ááááááááá
-        title: á¡áááá£á á
+        title: áááá
         body: á¢áá¥á¡á¢á
         recipient: áááá¦ááá
       user:
@@ -69,6 +82,9 @@ ka:
     potlatch:
       name: Potlatch 1
       description: Potlatch 1 (áá áá£ááá áá¡ á áááá¥á¢áá á)
+    id:
+      name: iD
+      description: iD (áá áá£ááá áá¡ á áááá¥á¢áá á)
     potlatch2:
       name: Potlatch 2
       description: Potlatch 2 (áá áá£ááá áá¡ á áááá¥á¢áá á)
@@ -76,12 +92,53 @@ ka:
       name: ááá¡á¢áááªáá£á á ááá ááá
       description: ááá¡á¢áááªáá£á á ááááá (JOSM, áá Merkaartor)
   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: ááááááá
+    no_comment: (á£áááááá¢áá á)
+    download_xml: XML-áá¡ á©áááá¢ááá ááá
+    view_history: áá¡á¢áá ááá¡ ááá®áá
+    view_details: ááá¢áááááá¡ ááá®áá
+    location: 'áááááá áááá:'
     changeset:
-      title: áªáááááááááá¡ ááááá¢á
+      title: 'áªáááááááááá¡ ááááá¢á: %{id}'
+      belongs_to: ááá¢áá á
+      node: á¬áá á¢ááááá (%{count})
+      node_paginated: á¬áá á¢ááááá (%{x}-%{y} %{count}-ááá)
+      way: á®ááááá (%{count})
+      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: 'á¬áá á¢ááá: %{name}'
+      history_title: 'á¬áá á¢áááá¡ áá¡á¢áá áá: %{name}'
+    way:
+      title: 'á®ááá: %{name}'
+      history_title: 'á®áááá¡ áá¡á¢áá áá: %{name}'
+      nodes: á¬áá á¢ááááá
+    relation:
+      title: 'á£á áááá áááá: %{name}'
+      history_title: 'á£á áááá ááááá¡ áá¡á¢áá áá: %{name}'
+      members: á¬ááá ááá
     relation_member:
       entry_role: '%{type} %{name} á áááá áª %{role}'
       type:
@@ -92,12 +149,13 @@ ka:
       entry: á£á áááá áááá %{relation_name}
       entry_role: á£á áááá áááá %{relation_name} (á áááá áª %{relation_role})
     not_found:
-      sorry: á£áááªá áááá, %{type} ááááá¢áá¤áááá¢áá áá %{id}, ááá  áááá«áááá.
+      sorry: 'á¡ááá¬á£á®áá áá, %{type} #%{id} ááá  áááá«áááá.'
       type:
         node: ááááá«á
         way: ááá
         relation: á£á áááá áááá
         changeset: áªáááááááááá¡ ááááá¢á
+        note: á¨áááá¨ááá
     timeout:
       sorry: á£áááªá áááá, áááááªááááá %{type}-áááá¡ ááááá¢áá¤áááá¢áá áá %{id}, á¡áááááá áá á«áááá
         á¡ááááááááá.
@@ -106,7 +164,9 @@ ka:
         way: ááá
         relation: á£á áááá áááá
         changeset: áªáááááááááá¡ ááááá¢á
+        note: á¨áááá¨ááá
     redacted:
+      redaction: á áááá¥áªáá %{id}
       type:
         node: ááááá«á
         way: ááá
@@ -116,9 +176,14 @@ ka:
       loading: áá¢ááá áááá...
     tag_details:
       wikipedia_link: á¡á¢áá¢áá %{page} áááááááááá¨á
+      telephone_link: ááá áááá %{phone_number}
     note:
-      title: á¨áááá¨ááá
-      description: 'áá¦á¬áá á:'
+      title: 'á¨áááá¨ááá: %{id}'
+      new_note: áá®ááá á¨áááá¨ááá
+      description: áá¦á¬áá á
+      open_title: 'ááá£áá£á¨ááááááá á¨áááá¨ááá #%{note_name}'
+      closed_title: 'áááá£á¨ááááá£áá á¨áááá¨ááá #%{note_name}'
+      hidden_title: 'áááááá£áá á¨áááá¨ááá #%{note_name}'
   changeset:
     changeset_paging_nav:
       showing_page: áááá áá %{page}
@@ -135,9 +200,15 @@ ka:
       area: á¢áá áá¢áá áá
     list:
       title: áªáááááááááá¡ ááááá¢á
+      load_more: ááá¢áá¡ á©áá¢ááá ááá
+    rss:
+      commented_at_html: ááááá®ááá %{when} á¬áá
+      commented_at_by_html: áááááá®áá %{when} á¬áá áááá®ááá áááááá %{user}
+      full: á¡á á£áá áááá®áááá
   diary_entry:
     new:
       title: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
+      publish_button: ááááá¥ááá§áááá
     list:
       title: áááá®ááá ááááááá¡ áá¦áá£á ááá
       title_friends: áááááá áááá¡ áá¦áá£á ááá
@@ -192,6 +263,7 @@ ka:
       newer_comments: áá®ááá áááááá¢áá ááá
       older_comments: á«áááá áááááá¢áá ááá
   export:
+    title: áá¥á¡ááá á¢á
     start:
       area_to_export: á¢áá áá¢áá áá áá¥á¡ááá á¢áá¡ááááá¡
       manually_select: á¡á®áá á ááááááá¡ ááááá§áá¤á á®áááá
@@ -199,6 +271,9 @@ ka:
       osm_xml_data: OpenStreetMap XMLâáá¡ áááááªááááá
       map_image: á á£ááá¡ á¡á£á ááá (á¡á¢ááááá á¢á£áá á¤áááá¡ á©áááááá)
       licence: áááªááááá
+      too_large:
+        planet:
+          title: áááááá¢á OSM
       options: ááá áááá¢á ááá
       format: á¤áá ááá¢á
       scale: ááá¡á¨á¢ááá
@@ -214,7 +289,6 @@ ka:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">á¨ááá á¨ááááááá</a>
-        us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>âáá¡ á¨ááááááá
         uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>âáá¡
           á¨ááááááá
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a>âá¡ á¨ááááááá
@@ -223,12 +297,17 @@ ka:
         geonames: <a href="http://www.geonames.org/">GeoNames</a>âáá¡ á¨ááááááá
     search_osm_nominatim:
       prefix:
+        aerialway:
+          cable_car: á¡áááááá á ááá
+          station: á¡áááááá á áááá¡ á¡áááá£á á
         aeroway:
           aerodrome: ááá ááá ááá
           gate: ááá¡áá¡ááááá
+          helipad: ááá á¢áá¤á áááá¡ ááá¡áá¯áááá
           runway: áá¡áá¤á áá-ááá¡áá¤á ááá áááááá
           terminal: á¢áá áááááá
         amenity:
+          animal_shelter: áªá®áááááá áááá¨áá¡áá¤áá á
           arts_centre: á®ááááááááá¡ áªááá¢á á
           atm: áááááááá¢á
           bank: ááááá
@@ -238,47 +317,46 @@ ka:
           bicycle_parking: ááááá¡áááááááá¡ á¡áááááá
           bicycle_rental: ááááá¡áááááááá¡ ááá¥áá ááááá
           biergarten: áá£ááá¡ ááá¦á
+          boat_rental: ááááááá¡ ááá¥áá ááááá
           brothel: á¡áá áá¡áááá
           bureau_de_change: áááá£á¢áá¡ áááááªááá
           bus_station: ááá¢ááá£á¡áá¡ ááá©áá ááá
           cafe: ááá¤á
           car_rental: áááá¥áááá¡ ááá¥áá ááááá
+          car_sharing: áááá¥áááááá¡ ááá¥áá ááááá
           car_wash: ááá¢áá¡ááá ááªá®áá
           casino: á¡áááá ááá
+          charging_station: ááá¡ááá£á®á¢á á¡áááá£á á
           cinema: áááááááá¢á á
           clinic: ááááááááááá
+          clock: á¡áááá
           college: ááááá¯á
           community_centre: á¡áááááááááá ááá áªááá¢á á
           courthouse: á¡áá¡áááá ááá
           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: áá¤áááá¥á
           place_of_worship: á áááááá£á á áááááá
           police: áááááªáá
@@ -288,7 +366,6 @@ ka:
           prison: áªáá®á
           pub: áááá
           public_building: á¡áá¯áá á á¨ááááá
-          reception_area: áááá¦ááá
           recycling: áááááá¡áá§á ááá
           restaurant: á áá¡á¢áá ááá
           retirement_home: ááá®á£áªááá£ááá áááá¨áá¡áá¤áá á
@@ -297,6 +374,7 @@ ka:
           shelter: áááá¨áá¡áá¤áá á
           shop: ááá¦áááá
           shower: á¨á®ááá
+          social_centre: á¡áááááááááá ááá áªááá¢á á
           social_club: á¡áááááááááá ááá áááá¨áá§á áá¡ áááááá
           studio: á¡á¢á£ááá
           swimming_pool: á¡ááªá£á áá áá£áá
@@ -312,20 +390,40 @@ ka:
           youth_centre: áá®áááááá áá£áá áªááá¢á á
         boundary:
           administrative: ááááááá¡á¢á ááªáá£áá á¡ááá¦ááá á
+          census: áá¦á¬áá áá¡ á áááááá¡ á¡ááá¦ááá á
           national_park: áá áááá£áá ááá áá
           protected_area: áááªá£áá á¢áá áá¢áá áá
         bridge:
           aqueduct: áááááá£áá
           suspension: áááááááá£áá á®ááá
           swing: á ááá£ááá ááááá á®ááá
+          viaduct: ááááá£áá
           "yes": á®ááá
         building:
           "yes": á¨ááááá
+        craft:
+          brewery: áá£áá¡áá®áá á¨á
+          carpenter: áá£á áááá
+          electrician: áááá¥á¢á áááá¡á
+          gardener: ááááá¦á
+          painter: áá®áá¢ááá á
+          photographer: á¤áá¢ááá áá¤á
+          plumber: á¡ááá¢áá¥ááááá¡á
+          shoemaker: ááá¬áá¦á
+          tailor: ááááá¥á
+          "yes": á¡áá®áááá¡áá
+        emergency:
+          ambulance_station: á¡áá¡á¬á áá¤á ááá®ááá áááá¡ á¡áááá£á á
+          defibrillator: ááá¤ááá áááá¢áá á
+          landing_site: áááá áá£áá ááá¨ááááá¡ áááááá
+          phone: á¡áááááááá áááá¨áá áá¡ á¢áááá¤ááá
         highway:
+          abandoned: ááá¢ááááá£áá ááá
           bridleway: á¡ááªá®áááá¡áá ááá
           bus_stop: ááá¢ááá£á¡áá¡ ááá©áá ááá
           construction: áááá¡ á¡áá ááááá¢á á¡ááá£á¨ááááá
           cycleway: ááááá¡áááááá¡ ááá
+          elevator: ááá¤á¢á
           emergency_access_point: á¡áá¡á¬á áá¤á ááá®ááá áááá¡ áá£áá¥á¢á
           footway: á¢á áá¢á£áá á
           living_street: á¡ááªá®ááá ááááá á¥á£á©á
@@ -336,6 +434,8 @@ ka:
           platform: ááá¥ááá
           primary: áááááá á ááá
           primary_link: áááááá á ááá
+          proposed: áá ááá¥á¢áá ááááá ááá
+          raceway: á¡áá áááá á¢á áá¡á
           residential: á¡ááªá®ááá ááááá á¥á£á©á
           rest_area: ááá¡áá¡áááááááá á¢áá áá¢áá áá
           road: ááá
@@ -343,27 +443,39 @@ ka:
           secondary_link: áááá ááá ááá
           speed_camera: á¡áá©á¥áá áá¡ áááááá¢á ááááááá ááááá á
           steps: á¡áá¤áá®á£á ááá
+          street_lamp: á¥á£á©áá¡ á¡ááááá
           tertiary: ááá¡ááá áááá¡áá¡ ááá
+          tertiary_link: ááá¡ááá áááá¡áá¡ ááá
           track: áááááá
+          traffic_signals: á¨á£á¥ááá¨ááá
           trail: áááááá
           unclassified: áááááááá ááá ááá
-          unsurfaced: á£ááááááá á ááá
+          "yes": ááá
         historic:
           archaeological_site: áá á¥ááááááá£á á áááá®á ááá
           battlefield: áá á«áááá¡ áááá
           boundary_stone: á¡áá¡ááá¦áá á á¥áá
-          building: á¨ááááá
+          building: áá¡á¢áá áá£áá á¨ááááá
+          bunker: áá£áááá á
           castle: áªáá®á-á¡ááááá á
           church: ááááá¡áá
+          city_gate: á¥áááá¥áá¡ ááá ááá­á
+          citywalls: á¥áááá¥áá¡ ááááááá
           fort: á¤áá á¢á
+          heritage: áá£áá¢á£á á£áá áááááááá ááááá¡ ááááá¥á¢á
           house: á¡áá®áá
           icon: á®áá¢á£áá
           manor: áááá£áá
           memorial: ááááá áááá
           mine: ááá¦áá á
           monument: áááá£áááá¢á
+          roman_road: á áááá£áá ááá
           ruins: ááááá ááááá
+          stone: á¥áá
+          tomb: ááááááá
           tower: ááá¨áá
+        junction:
+          "yes": áááá¯ááá ááááá
         landuse:
           basin: áá£áá
           brownfield: ááá¢ááááá£áá áááááá
@@ -391,8 +503,12 @@ ka:
           retail: á¡áááá­á á á¢áá áá¢áá áá
           village_green: áá¬áááá á¡áá¤ááá
           vineyard: ááááá®á
+          "yes": ááá¬ááá¡áá ááááááá
         leisure:
+          dog_park: á«áá¦ááááá¡ ááá áá
           fishing: á¡ááááááá á¢áá áá¢áá áá
+          fitness_centre: á¤áá¢ááá¡-áªááá¢á á
+          fitness_station: á¤áá¢ááá¡-á¡áááá£á á
           garden: ááá¦á
           golf_course: áááá¤áá¡ ááááááá
           ice_rink: á§ááá£ááá¡ ááááááá
@@ -403,16 +519,25 @@ ka:
           pitch: á¡ááá á¢á£áá áááááá
           playground: á¡áááááá¨á ááááááá
           recreation_ground: á ááá áááªáá£áá áááá
+          resort: áá£á áá á¢á
           sauna: á¡áá£áá
           sports_centre: á¡ááá á¢á£áá áªááá¢á á
           stadium: á¡á¢áááááá
           swimming_pool: á¡ááªá£á áá áá£áá
           track: á¡áá áááá áááááá
           water_park: ááááááá áá
+        man_made:
+          lighthouse: á¨á£á¥á£á á
+          pipeline: áááá¡ááááá
+          tower: ááá¨áá
+          works: á¤ááá ááá
+          "yes": á®áááááá£á á
         military:
           airfield: á¡ááá®ááá á ááá ááá ááá
           barracks: á§áááá áááá
           bunker: áá£áááá á
+        mountain_pass:
+          "yes": á£á¦ááá¢áá®ááá
         natural:
           bay: á§á£á á
           beach: ááááá
@@ -426,6 +551,7 @@ ka:
           forest: á¢á§á
           geyser: áááááá á
           glacier: áá§ááááá á
+          grassland: ááááá
           hill: ááá áªáá
           island: áá£áá«á£áá
           land: á®áááááá
@@ -437,6 +563,8 @@ ka:
           reef: á áá¤á
           ridge: á¥ááá
           rock: áááá
+          saddle: á£á¦ááá¢áá®ááá
+          sand: á¥ááá¨á
           scree: ááááááááá
           scrub: áá£á©á¥ááá á
           spring: á¬á§áá á
@@ -449,16 +577,20 @@ ka:
           wetland: á­áá áá¢áááááá á¢áá áá¢áá áá
           wood: á¢á§á
         office:
+          accountant: áá£á¦ááá¢áá á
+          administrative: ááááááá¡á¢á ááªáá
           architect: áá á¥áá¢áá¥á¢áá á
           company: áááááááá
+          employment_agency: ááá¡áá¥ááááá¡ á¡áááááá¢á
           estate_agent: á£á«á ááá á¥áááááá¡ ááááá¢á
           government: á¡áááááá ááá áá¤áá¡á
+          insurance: á¡ááááá¦áááá áá¤áá¡á
+          lawyer: áá£á áá¡á¢á
           ngo: áá áá¡áááááá ááá áá áááááááªááá¡ áá¤áá¡á
           telecommunication: á¡áá¢ááááááá£áááááªáá áá¤áá¡á
           travel_agent: á¢á£á áá¡á¢á£áá á¡áááááá¢á
           "yes": áá¤áá¡á
         place:
-          airport: ááá áááá á¢á
           city: á¥áááá¥á
           country: á¥ááá§ááá
           county: ááá¥á
@@ -468,8 +600,8 @@ ka:
           houses: á¡áá®áááá
           island: áá£áá«á£áá
           islet: ááá¢áá á áá£áá«á£áá
-          moor: á¢áá á¤ááá á
           municipality: áá£áááªáááááá¢áá¢á
+          neighbourhood: á¡áááááááá
           postcode: á¡áá¤áá¡á¢á ááááá¥á¡á
           region: á áááááá
           sea: áá¦áá
@@ -483,14 +615,17 @@ ka:
           abandoned: ááá¢ááááá£áá á ááááááá
           construction: á áááááááá¡ á ááááá¢á
           disused: ááá¢ááááá£áá á ááááááá
-          disused_station: ááá¢ááááá£áá á áááááááá¡ á¡áááá£á á
           funicular: á¤á£áááá£áááá á
           halt: ááá¢áá ááááá¡ ááá©áá ááá
-          historic_station: áá¡á¢áá áá£áá á áááááááá¡ á¡áááá£á á
+          level_crossing: á¡áá ááááááá ááááá¡áá¡ááááá
+          light_rail: áá¡á£áá£á¥á á ááááááá
           monorail: ááááá ááá¡á
           platform: á áááááááá¡ ááá¥ááá
+          preserved: áá¡á¢áá áá£áá á ááááááá
+          proposed: áá ááá¥á¢áá ááááá á ááááááá
           station: á áááááááá¡ á¡áááá£á á
-          subway: ááá¢á áá¡áááá£á á
+          stop: á¡áá ááááááá ááá©áá ááá
+          subway: ááá¢á á
           subway_entrance: ááá¢á áá¨á á¨áá¡áá¡ááááá
           switch: á¡áá ááááááá áá¡áá á
           tram: á¢á ááááá
@@ -503,6 +638,7 @@ ka:
           beverages: á¡áá¡ááááááá¡ ááá¦áááá
           bicycle: ááááá¡áááááááá¡ ááá¦áááá
           books: á¬ááááá¡ ááá¦áááá
+          boutique: áá£á¢ááá
           butcher: á¡áá§áá¡áá
           car: ááá¢áá¡ááááá
           car_parts: ááá¢áááá¬ááááá
@@ -512,16 +648,21 @@ ka:
           clothes: á¢ááá¡ááªáááá¡ ááá¦áááá
           computer: áááááá£á¢áá áááá¡ ááá¦áááá
           confectionery: á¡ááááááá¢á á
+          convenience: á¡áá¡á£á á¡ááá ááá¦áááá
           cosmetics: ááá¡ááá¢áááá¡ ááá¦áááá
+          dry_cleaning: á¥ááá¬ááááá
           electronics: áááá¥á¢á áá¢áá¥ááááá¡ ááá¦áááá
           estate_agent: á£á«á ááá á¥áááááá¡ ááááá¢á
           fashion: áááá£á á á¢ááá¡ááªáááá¡ ááá¦áááá
           fish: áááááááá¡ ááá¦áááá
           florist: á§ááááááááá¡ ááá¦áááá
           food: á¡ááááááá¡ ááá¦áááá
+          funeral_directors: ááááá á«ááááá ááá£á á
           furniture: áááá¯á
           gallery: ááááá áá
           gift: á¡áá©á£á¥á áááá¡ ááá¦áááá
+          greengrocer: á®áá-ááá¡á¢ááá£ááá¡ ááá¦áááá
+          hairdresser: á¡áááá ááááá®áá á
           jewelry: á¡ááá£ááááá á ááá¦áááá
           kiosk: á¯áá®á£á á
           laundry: á¡ááá ááªá®áá
@@ -534,19 +675,26 @@ ka:
           optician: ááá¢ááá
           organic: áá áááá£áá á¡ááááááá¡ ááá¦áááá
           pet: áááááá¦áááá
+          pharmacy: áá¤áááá¥á
           photo: á¤áá¢áááá¦áááá
-          salon: á¡ááááá
+          second_hand: áááá áááááá¡ ááá¦áááá
           shoes: á¤áá®á¡ááªáááá¡ ááá¦áááá
-          shopping_centre: á¡áááá­á á áªááá¢á á
           sports: á¡ááá á¢á£áá ááá¦áááá
           stationery: á¡áááááªáááá áá ááá¦áááá
           supermarket: á¡á£ááá ááá ááá¢á
+          tailor: ááááá¥á
           toys: á¡áááááá¨ááááá¡ ááá¦áááá
           travel_agency: á¢á£á áá¡á¢á£áá á¡áááááá¢á
           video: ááááá ááá¦áááá
+          wine: á¦ááááá¡ ááá¦áááá
+          "yes": ááá¦áááá
         tourism:
+          alpine_hut: áááá£á á á¡áá®áá
+          apartment: áááá
+          artwork: á®ááááááááá¡ áááá£á¨á
           attraction: áá¢á áá¥áªáááá
           camp_site: ááááááá¡ áááááá
+          gallery: ááááá áá
           guest_house: á¡áá¡á¢á£áá á á¡áá®áá
           hostel: á°áá¡á¢ááá
           hotel: á¡áá¡á¢á£áá á
@@ -559,12 +707,23 @@ ka:
         tunnel:
           "yes": áááá ááá
         waterway:
+          artificial: á®áááááá£á á á¬á§ááá¡ááááá
           canal: áá á®á
           dam: ááá¨á®ááá
+          derelict_canal: áááá¨á ááá áá á®á
           dock: áááá¡áááá£á á
           river: áááááá á
           stream: áááááá£áá
+          wadi: áááá¨á ááá ááááááá¢á
           waterfall: á©ááá©á¥áá á
+      admin_levels:
+        level2: á¥ááá§ááá¡ á¡ááá¦ááá á
+        level4: á¨á¢áá¢áá¡ á¡ááá¦ááá á
+        level5: á ááááááá¡ á¡ááá¦ááá á
+        level6: ááá¥áá¡ á¡ááá¦ááá á
+        level8: á¥áááá¥áá¡ á¡ááá¦ááá á
+        level9: á¡áá¤ááá¡ á¡ááá¦ááá á
+        level10: ááá áá£áááá¡ á¡ááá¦ááá á
     description:
       title:
         osm_nominatim: áááááá áááá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
@@ -580,7 +739,7 @@ ka:
   layouts:
     logo:
       alt_text: OpenStreetMap-áá¡ áááá
-    home: á¡áá®áá
+    home: á¡áá¬á§áá¡ ááááááá áááá á£áááá
     logout: ááá¡ááá
     log_in: á¨áá¡ááá
     sign_up: á áááá¡á¢á ááªáá
@@ -594,9 +753,8 @@ ka:
     tag_line: ááááá¡á£á¤ááá áááá-á á£áá
     intro_2_create_account: áááá®ááá ááááá¡ ááááá áá¨áá¡ á¨áá¥ááá
     partners_partners: ááá á¢áááá ááá
-    partners_url: http://wiki.openstreetmap.org/wiki/Partners
     help: ááá®ááá ááá
-    copyright: á¡áááá¢áá á á£á¤áááá áá áááªááááá
+    copyright: á¡áááá¢áá á á£á¤áááá
     community: ááááá¡áááááááááá
     community_blogs: ááááá¡ááááááááááá¡ ááááááá
     foundation: á¤áááá
@@ -732,9 +890,7 @@ ka:
           primary: ááááá¡á¢á ááá£á á á¡ááá ááá¨áá áá¡á áááá¨áááááááá¡ ááá
           secondary: á¡áá®áááá¬áá¤á áááá¨áááááááá¡ ááá
           unclassified: áááááááá ááá áááá¨áááááááá¡ ááá
-          unsurfaced: á§áááá á ááá
           track: á¡áá¤ááá¡ ááá
-          byway: áááááá
           bridleway: á¡ááªá®áááá¡áá ááá
           cycleway: ááááá¡áááááá¡ ááá
           footway: á¡áá¤áá®ááááá ááá
@@ -754,7 +910,6 @@ ka:
           golf: áááá¤áá¡ ááááááá
           park: ááá áá
           resident: á¡ááªá®ááá ááááá á¢áá áá¢áá áá
-          tourist: á¦áá á¡á¨áá¡áááá¨ááááá
           commercial: ááááá áªáá£áá á¢áá áá¢áá áá
           lake:
           - á¢áá
@@ -881,13 +1036,13 @@ ka:
       confirm password: 'ááá áááá¡ ááááá¡á¢á£á ááá:'
       flash changed: áá¥áááá ááá ááá á¨áááªáááá.
     new:
-      title: ááááá áá¨áá¡ á¨áá¥ááá
+      title: á áááá¡á¢á ááªáá
       email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
       confirm email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ ááááá¡á¢á£á ááá:'
       display name: 'á¡áá®ááá ááá áááá:'
       password: 'ááá ááá:'
       confirm password: 'ááá áááá¡ ááááá¡á¢á£á ááá:'
-      continue: áááá á«ááááá
+      continue: á áááá¡á¢á ááªáá
     terms:
       consider_pd_why: á á áá áá¡ áá¡?
       agree: ááá¦ááá
@@ -902,7 +1057,7 @@ ka:
     view:
       my diary: á©ááá áá¦áá£á á
       new diary entry: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
-      my edits: á©ááá á áááá¥á¢áá ááááá
+      my edits: á©ááá á áááá¥á¢áá ááá
       my settings: á©ááá ááá áááá¢á ááá
       my comments: á©ááá áááááá¢áá ááá
       send message: á¨áá¢á§áááááááá¡ áááááááá
@@ -959,7 +1114,7 @@ ka:
       save changes button: áªáááááááááá¡ á¨áááá®áá
       return to profile: áá áá¤ááá¨á áááá á£áááá
     confirm:
-      heading: áááá®ááá ááááá¡ ááááá áá¨áá¡ ááááá¡á¢á£á ááá
+      heading: á¨ááááá¬ááá áá¥áááá áá.á¤áá¡á¢á!
       button: ááááá¡á¢á£á ááá
     confirm_resend:
       failure: áááá®ááá ááááá %{name} ááá  áááá«áááá.
@@ -1077,6 +1232,8 @@ ka:
       show:
         hide: ááááááá
         comment: áááááá¢áá á
+    context:
+      show_address: ááá¡áááá ááá¡ á©áááááá
   redaction:
     edit:
       description: áá¦á¬áá á