X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/81d6d6a6a353e1ba8cc448f40fba17a03cf2620f..3c5c3761583cbb8c98af1e9342bf127adbc327d3:/config/locales/my.yml

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 8d1cc9923..4e978e7c9 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1,13 +1,15 @@
 # Messages for Burmese (áá¼ááºáá¬áá¬áá¬)
 # Exported from translatewiki.net
 # Export driver: phpyaml
-# Author: Abijeet Patro
 # Author: Dr Lotus Black
 # Author: Ninjastrikers
+# Author: áá½ááºááá¬á(áá±á¬ááºááá®ê©»)
 # Author: áá°áá½ááºá¸
 ---
 my:
   helpers:
+    file:
+      prompt: áá­á¯ááºáá½á±á¸áá«
     submit:
       diary_comment:
         create: áá­ááºá¸áááº
@@ -20,7 +22,10 @@ my:
         create: áá­á¯á·
       client_application:
         create: áá¾ááºáá¯á¶áááºáááº
-        update: áá¼ááºáááºáááº
+        update: áá½ááºá¸áá¶
+      oauth2_application:
+        create: áá¾ááºáá¯á¶áááºáááº
+        update: áá½ááºá¸áá¶
       trace:
         create: áááºáááº
         update: áá¼á±á¬ááºá¸áá²áá¾á¯áá»á¬á¸áá­á¯ áá­ááºá¸áááº
@@ -30,7 +35,6 @@ my:
       friend: áá°áááºáá»ááºá¸
       language: áá¬áá¬ááá¬á¸
       message: áá¬áá¬á¸
-      notifier: á¡áá­áá±á¸áá°
       trace: áá²áá½ááºá
       user: á¡áá¯á¶á¸áá¼á¯áá°
       user_preference: á¡áá¯á¶á¸áá¼á¯áá° á¡áá¼ááºá¡áááº
@@ -40,51 +44,100 @@ my:
         title: á¡áá¼á±á¬ááºá¸á¡áá¬
         latitude: ááá¹áá®áá»á¯
         longitude: áá±á¬ááºáá»á®áá»á¯
-        language: áá¬áá¬ááá¬á¸
+        language_code: áá¬áá¬ááá¬á¸
       friend:
         user: á¡áá¯á¶á¸áá¼á¯áá°
         friend: áá°áááºáá»ááºá¸
       trace:
         user: á¡áá¯á¶á¸áá¼á¯áá°
         visible: áá¼ááº
-        name: á¡áááº
+        name: áá­á¯ááºá¡áááº
         size: á¡áá½ááºá¡áá¬á¸
         latitude: ááá¹áá®áá»á¯
         longitude: áá±á¬ááºáá»á®áá»á¯
         public: á¡áá»á¬á¸áá¼áá·áº
         description: áá±á¬áºáá¼áá»ááº
+        visibility: áá¼ááºáá­á¯ááºáá¾á¯
       message:
         sender: áá±á¸áá­á¯á·áá°
         title: á¡áá¼á±á¬ááºá¸á¡áá¬
         body: áá¬áá­á¯ááº
         recipient: áááºáá¶áá°
+      redaction:
+        description: áá±á¬áºáá¼áá»ááº
       user:
         email: á¡á®á¸áá±á¸ááº
+        new_email: á¡á®á¸áá±á¸ááºáá­ááºáá¬ á¡áááº
         active: áááºáá¾á­á¡áá¯á¶á¸áá¼á¯áá±áááº
         display_name: áá±á¬áºáá¼ááá·áºá¡áááº
-        description: áá±á¬áºáá¼áá»ááº
-        languages: áá¬áá¬ááá¬á¸áá»á¬á¸
+        description: ááá­á¯áá­á¯ááº áá±á¬áºáá¼áá»ááº
+        home_lat: ááá¹áá®áá»á¯
+        home_lon: áá±á¬ááºáá»á®áá»á¯
+        languages: áá¾ááºáááºáá±á¬ áá¬áá¬ááá¬á¸áá»á¬á¸
         pass_crypt: ááá¬á¸áá¾ááº
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: á áá¬áá®ááá·áºá¡áá¼á¬á
+        other: about %{count} áá¬áá®ááá·áºá¡áá¼á¬á
+      about_x_months:
+        one: á áááá·áºá¡áá¼á¬á
+        other: '%{count} áááá·áºá¡áá¼á¬á'
+      about_x_years:
+        one: á áá¾ááºááá·áºá¡áá¼á¬á
+        other: '%{count} áá¾ááºááá·áºá¡áá¼á¬á'
+      almost_x_years:
+        one: á áá¾ááºáá®á¸áá«á¸á¡áá¼á¬á
+        other: '%{count} áá¾ááºáá®á¸áá«á¸á¡áá¼á¬á'
+      half_a_minute: áááºáá­áááºáá½á²á¡áá¼á¬á
+      over_x_years:
+        one: á áá¾ááºáá»á±á¬áºá¡áá¼á¬á
+        other: '%{count} áá¾ááºáá»á±á¬áºá¡áá¼á¬á'
+      x_seconds:
+        one: á ááá¹ááá·áºá¡áá¼á¬á
+        other: '%{count} ááá¹ááá·áºá¡áá¼á¬á'
+      x_minutes:
+        one: á áá­áááºá¡áá¼á¬á
+        other: '%{count} áá­áááºá¡áá¼á¬á'
+      x_days:
+        one: á áááºá¡áá¼á¬á
+        other: '%{count} áááºá¡áá¼á¬á'
+      x_months:
+        one: á áá¡áá¼á¬á
+        other: '%{count} áá¡áá¼á¬á'
+      x_years:
+        one: á áá¾ááºá¡áá¼á¬á
+        other: '%{count} áá¾ááºá¡áá¼á¬á'
   editor:
     remote:
       name: á¡áá±á¸ áá­ááºá¸áá»á¯ááº
+  auth:
+    providers:
+      none: áááºáá¯áá¾ááá¯ááº
+      google: áá°áá²ááº
+      facebook: áá±á·áá¯ááº
+      wikipedia: áá®áá®áá®á¸áá®á¸áá¬á¸
   api:
     notes:
       comment:
         opened_at_html: '%{when} á¡áá¼á¬á áááºáá®á¸áá²á·áááº'
-        commented_at_html: '%{when} á¡áá¼á¬á áá½ááºá¸áá¶áá²á·áááº'
+        commented_at_html: '%{when} á¡áááºáá¼ááºáááºáá¬á¸áá²á·'
       entry:
         comment: áá¾ááºáá»ááº
         full: áá¾ááºáá¯ á¡áá¼áá·áºá¡áá¯á¶
+  account:
+    deletions:
+      show:
+        confirm_delete: áá±áá»á¬áá«ááá¬á¸
+        cancel: ááá¯ááºáá±á¬á·áá«
+  accounts:
+    edit:
+      title: á¡áá±á¬áá·áºáá­á¯ áá¼ááºáááºáááº
+      current email address: áááºáá¾á­ á¡á®á¸áá±á¸ááºáá­ááºáá¬
+      save changes button: áá¼á±á¬ááºá¸áá²áá¾á¯áá»á¬á¸áá­á¯ áá­ááºá¸áááº
   browse:
     created: áááºáá®á¸áá­á¯ááºáááº
     closed: áá­ááºáá­á¯ááºáááº
-    created_html: <abbr title='%{title}'>%{time} á¡áá¼á¬á</abbr> áááºáá®á¸áá²á·áááº
-    closed_html: <abbr title='%{title}'>%{time} á¡áá¼á¬á</abbr> áá­ááºáá­ááºá¸áá²á·áááº
-    created_by_html: '%{user} áá¾ <abbr title=''%{title}''>%{time} á¡áá¼á¬á</abbr> áááºáá®á¸áá²á·áááº'
-    deleted_by_html: '%{user} áá¾ <abbr title=''%{title}''>%{time} á¡áá¼á¬á</abbr> áá»ááºáááºáá²á·áááº'
-    edited_by_html: '%{user} áá¾ <abbr title=''%{title}''>%{time} á¡áá¼á¬á</abbr> áá¼ááºáááºáá²á·áááº'
-    closed_by_html: '%{user} áá¾ <abbr title=''%{title}''>%{time} á¡áá¼á¬á</abbr> áá­ááºáá­ááºá¸áá²á·áááº'
     version: áá¬á¸áá¾ááºá¸
     anonymous: á¡áááºááá­
     no_comment: (áá¾ááºáá»ááº ááá¾á­)
@@ -111,11 +164,6 @@ my:
       tags: á¡áááºáá½á²áá»á¬á¸
       wikidata_link: áá®áá®áá±áá¬áá±á«áºáá¾á­ %{page} item
       wikipedia_link: áá®áá®áá®á¸áá®á¸áá¬á¸áá±á«áºáá¾á­ %{page} áá±á¬ááºá¸áá«á¸
-    note:
-      title: 'áá¾ááºáá¯: %{id}'
-      new_note: áá¾ááºáá¯ á¡áááº
-      description: áá±á¬áºáá¼áá»ááº
-      hidden_title: 'áá¾ááºáá¬á¸áá±á¬ áá¾ááºáá¯ #%{note_name}'
   changesets:
     changeset_paging_nav:
       showing_page: áá¬áá»ááºáá¾á¬ %{page}
@@ -134,15 +182,17 @@ my:
   changeset_comments:
     comment:
       commented_at_by_html: '%{user} á %{when} á¡áá¼á¬á áá½ááºá¸áá¶áá²á·áááº'
+  dashboards:
+    contact:
+      km away: '%{count}áá®áá­á¯áá®áá¬ á¡áá½á¬'
+      m away: '%{count}áá­á¯ááº á¡áá½á¬'
+    popup:
+      your location: áááºá áááºáá±áá¬
+      friend: áá°áááºáá»ááºá¸
   diary_entries:
     form:
-      subject: á¡áá¼á±á¬ááºá¸á¡áá¬ -
-      body: áá¬áá­á¯ááº
-      language: 'áá¬áá¬ááá¬á¸:'
-      location: 'áááºáá±áá¬:'
-      latitude: ááá¹áá®áá»á¯
-      longitude: áá±á¬ááºáá»á®áá»á¯
-      use_map_link: áá¼á±áá¯á¶áá­á¯ á¡áá¯á¶á¸áá»
+      location: áááºáá±áá¬
+      use_map_link: áá¼á±áá¯á¶áá­á¯ á¡áá¯á¶á¸áá»áááº
     index:
       title: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸á áá±á·áááºáá¾ááºáááºá¸áá»á¬á¸
       title_friends: áá­ááºáá½á±áá»á¬á¸á áá±á·áááºáá¾ááºáááºá¸áá»á¬á¸
@@ -152,7 +202,7 @@ my:
       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: á¡áá±á¬áá·áºáá²áááºáááº
     diary_entry:
       confirm: á¡áááºáá¼á¯
@@ -167,20 +217,9 @@ my:
       edit: áá¼ááºáááºáááº
     comments:
       comment: áá¾ááºáá»ááº
-      ago: '%{ago} á¡áá¼á¬á'
       newer_comments: áá­á¯áááºáá±á¬ áá¾ááºáá»ááºáá»á¬á¸
       older_comments: áá­á¯áá±á¬ááºá¸áá±á¬ áá¾ááºáá»ááºáá»á¬á¸
   geocoder:
-    search:
-      title:
-        latlon: <a href="https://openstreetmap.org/">á¡áá½ááºá¸áááº</a> áá¾ ááááºáá»á¬á¸
-        ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a> áá¾ ááááºáá»á¬á¸
-        osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a> áá¾ ááááºáá»á¬á¸
-        geonames: <a href="http://www.geonames.org/">GeoNames</a> áá¾ ááááºáá»á¬á¸
-        osm_nominatim_reverse: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a> áá¾ ááááºáá»á¬á¸
-        geonames_reverse: <a href="http://www.geonames.org/">GeoNames</a> áá¾ ááááºáá»á¬á¸
     search_osm_nominatim:
       prefix:
         aeroway:
@@ -197,6 +236,7 @@ my:
           bank: áááº
           bar: áá¬á¸
           bench: áá¯á¶áááºá¸áá»á¬á¸
+          bus_station: áááºááºáá¬á¸ááááºá¸
           cafe: áááºáááºáááºáá­á¯ááº
           car_rental: áá¬á¸áá¾á¬á¸áá¯á¶
           car_wash: áá¬á¸áá±áá±á¸
@@ -207,6 +247,7 @@ my:
           clock: áá¬áá®
           college: áá±á¬áá­ááº
           courthouse: ááá¬á¸áá¯á¶á¸
+          crematorium: áá®á¸áááºá¹áá¼á­á¯ááºáááºáá¯á¶
           dentist: áá½á¬á¸ááá¬áááº
           doctors: ááá¬áááºáá»á¬á¸
           drinking_water: áá±á¬ááºáá±
@@ -221,22 +262,22 @@ my:
           grave_yard: áá¯á¿ááº
           hospital: áá±á¸áá¯á¶
           ice_cream: áá±áá²áá¯áá·áº
+          internet_cafe: á¡ááºáá¬áááºááá±á¸
           kindergarten: áá°ááááºá¸áá»á±á¬ááºá¸
+          language_school: áá¬áá¬ááá¬á¸áá»á±á¬ááºá¸
           library: áá¬áá¼áá·áºáá­á¯ááº
           marketplace: áá»á±á¸áááºá¸
           monastery: áá¯ááºá¸áá¼á®á¸áá»á±á¬ááºá¸
           nightclub: áá­á¯ááºááááº
-          office: áá¯á¶á¸
           parking: áá¬ááºáááºáá¬á¸áá¬áá±áá¬
           pharmacy: áá±á¸áá­á¯ááº
           police: áá²
-          preschool: áá°áá¼á­á¯áá»á±á¬ááºá¸
+          post_box: áá¬áá­á¯ááºáá±áá¹áá¬
+          post_office: áá¬áá­á¯ááº
           prison: á¡áá»ááºá¸áá±á¬ááº
           public_building: á¡áá»á¬á¸áá­á¯ááº á¡áá±á¬ááºá¡á¡á¯á¶
           restaurant: áá¬á¸áá±á¬ááºáá­á¯ááº
           school: áá»á±á¬ááºá¸
-          shop: áá­á¯ááº
-          social_club: áá°áá¾á¯áá±á¸ááááº
           studio: ááá°áá®áá­á¯
           swimming_pool: áá±áá°á¸áááº
           taxi: ááá¹ááá®
@@ -251,20 +292,25 @@ my:
           aqueduct: áá±áá½ááºáá¶áá¬á¸
           boardwalk: áááºáááºáááºá¸áááº áá»ááºáááºá¸áááºá¸
           suspension: áá¼á­á¯á¸áá¶áá¬á¸
+          viaduct: áá±á¬ááºáá¼á¬á¸áááºá¸
           "yes": áá¶áá¬á¸
         building:
+          house: á¡á­ááº
+          roof: áá±á«ááºáá­á¯á¸
           "yes": á¡áá±á¬ááºá¦á¸
         craft:
+          brewery: áá®áá¬áá»ááºáááºáá¯á¶
           electrician: áá»á¾ááºáááºááá¬áá¾ááº
           photographer: áá«ááºáá¯á¶ááá¬
         emergency:
           landing_site: á¡áá±á¸áá±á«áºáá±áá¬ááºáááºá¸áá½ááºá¸
           phone: á¡áá±á¸áá±á«áºáá¯ááºá¸
-          "yes": á¡áá±á¸áá±á«áº
         highway:
+          bridleway: áá¼ááºá¸áá®á¸áááºá¸
           bus_stop: áááºááºáá¬á¸ áá¾ááºáá­á¯ááº
           corridor: áá±á¬ááºáá°á¸áááºá¹áá¼áááºá¸
           elevator: áá«ááºáá¾á±áá¬á¸
+          milestone: áá¾ááºáá­á¯ááº
           platform: ááááºáá±á¬ááºá¸
           primary: áááºááááºá¸
           primary_link: áááºááááºá¸
@@ -281,25 +327,30 @@ my:
           church: áá»ááºááºá»áá»á±á¬ááºá¸
           city_gate: áá¼á­á¯á·áá­ááº
           fort: áá¶áááº
+          heritage: á¡áá½á±á¡áá¾ááºáá±áá¬
           house: á¡á­ááº
           manor: á¡á­ááºáá¼á®á¸ááá­á¯ááº
+          stone: áá»á±á¬ááºáá¯á¶á¸
           tomb: áááºá¹áá»á­á¯ááºá¸
           tower: áá»á¾á±á¬áºáááº
           wreck: áá¬ááºáá»ááº
         landuse:
+          basin: áá¼ááºáá¾ááºá¸
           cemetery: áá¯á¿ááº
           construction: áá±á¬ááºáá¯ááºáá±á¸
           forest: áááºáá±á¬
           grass: áá¼ááº
           military: áááºáááºá§áá­áá¬
           railway: ááá¬á¸áááºá¸
-          road: áááºá¸á§áá­áá¬
+          reservoir: áá±áá¾á±á¬ááºáá¶áá¶
           vineyard: ááá»ááºáá¼á¶
         leisure:
           fishing: áá«á¸áá»á¾á¬á¸á§áá­áá¬
           garden: á¥áá»á¬ááº
+          golf_course: áá±á«ááºáá­á¯ááºáá±á·áá»ááºá¸áá½ááºá¸
           park: áááºá¸áá¼á¶
           resort: á¡áááºá¸áá¼á±áá¬áá±áá¬
+          sports_centre: á¡á¬á¸ááá¬á¸áááºá¸á
           stadium: á¡á¬á¸ááá¬á¸áá½ááºá¸
           swimming_pool: áá±áá°á¸áááº
         man_made:
@@ -312,6 +363,7 @@ my:
           embankment: áá¬áá­á¯á¸
           lighthouse: áá®á¸áá¼áá­á¯ááº
           pipeline: áá­á¯ááºáá­á¯ááºá¸
+          telescope: á¡áá±á¸áá¼áá·áºáá¾ááºáá¼á±á¬ááºá¸
           tower: áá»á¾á±á¬áºáááº
           watermill: áá±ááááºáááº
           water_well: áá±áá½ááºá¸
@@ -368,12 +420,14 @@ my:
           house: á¡á­ááº
           houses: á¡á­ááºáá»á¬á¸
           island: áá»á½ááºá¸
+          region: áááºáá¼á±áá±á
           sea: áááºáááº
           state: áá¼ááºáááº
           town: áá¼á­á¯á·
           village: áá½á¬
           "yes": áá±áá¬
         railway:
+          construction: áá±á¬ááºáá¯ááºáá² ááá¬á¸áááºá¸
           station: ááá¬á¸áá°áá¬
         shop:
           beauty: á¡áá¾áá¼ááºáá­á¯ááº
@@ -381,13 +435,13 @@ my:
           copyshop: áá­áá¹áá°áá­á¯ááº
           cosmetics: á¡áá¾áá¯ááºááá¹áááºá¸áá­á¯ááº
           fashion: áááºáá¾ááºáá­á¯ááº
+          interior_decoration: á¡áá½ááºá¸áá­á¯ááºá¸ á¡áá¾áááºáá¯ááºáááºá¸
+          laundry: áá­á¯áá®áá­á¯ááº
           lottery: áá®
-          market: áá»á±á¸áááºá¸
           massage: áá¬áááº
           mobile_phone: áá­á¯ááºáá­á¯ááºá¸áá¯ááºá¸áá­á¯ááº
           motorcycle: áá­á¯ááºáááºáá­á¯ááº
           organic: á¡á±á¬áºáá²áááº á¡áá¬á¸á¡áá¬áá­á¯ááº
-          pharmacy: áá±á¸áá­á¯ááº
           photo: áá«ááºáá¯á¶áá­á¯ááº
           seafood: áááºáááºáá¬
           second_hand: áááºáá«áá¯á¶á¸áá¼á®á¸áá­á¯ááº
@@ -412,13 +466,9 @@ my:
           dam: ááá¶
           river: áá¼ááº
           waterfall: áá±áá¶áá½ááº
-    description:
-      title:
-        osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a> áá¾ áááºáá±áá¬
-        geonames: <a href="http://www.geonames.org/">GeoNames</a> áá¾ áááºáá±áá¬
       types:
         cities: áá¼á­á¯á·áá»á¬á¸
+        towns: áá¼á­á¯á·áá»á¬á¸
         places: áá±áá¬áá»á¬á¸
     results:
       no_results: áááºááá·áºááááºáá»á¾ áááá«
@@ -430,7 +480,6 @@ my:
       status: á¡áá¼á±á¡áá±
       reports: á¡áá®áááºáá¶áá¬áá»á¬á¸
       last_updated: áá±á¬ááºáá¯á¶á¸ áá½ááºá¸áá¶áá²á·áááº
-      last_updated_time_html: <abbr title='%{title}'>%{time} á¡áá¼á¬á</abbr>
       link_to_reports: á¡áá®áááºáá¶áá¬áá»á¬á¸áá­á¯ áá¼áá·áºáááº
       reports_count:
         one: 1 á¡áá®áááºáá¶áá¬
@@ -460,12 +509,11 @@ my:
         note:
           other_label: á¡áá¼á¬á¸
   layouts:
+    home: á¡á­ááºáááºáá±áá¬áá­á¯á· áá½á¬á¸áááº
     logout: áá½ááºáááº
     log_in: á¡áá±á¬áá·áºáááºáááº
-    log_in_tooltip: áá¾á­áá¾áá·áºáá¼á®á¸áá¬á¸ á¡áá±á¬áá·áºáááºáá¯áá¾áá·áºáááºáááº
     sign_up: áá¾ááºáá¯á¶áááºáááº
     start_mapping: áá¼á±áá¯á¶ ááááºáá±á¸áá½á²áááº
-    sign_up_tooltip: áááºá¸áá¼ááºáááº á¡áá±á¬áá·áºáááºáá¯ áááºáá®á¸áá«
     edit: áá¼ááºáááº
     history: áá¬ááááº
     export: áááºáá­á¯á·áááº
@@ -475,33 +523,27 @@ my:
     user_diaries_tooltip: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸á áá±á·áááºáá¾ááºáááºá¸áá»á¬á¸áá­á¯ áá¼áá·áºáááº
     edit_with: '%{editor} áá¼áá·áº áá¼ááºáááºáááº'
     intro_header: OpenStreetMap áá¾ áá¼á­á¯áá­á¯áá«á
+    partners_fastly: áá¼ááºáá¼ááºáááºáááº
     tou: á¡áá¯á¶á¸áá¼á¯áá¼ááºá¸áá­á¯ááºáá¬ áááºáá¾ááºáá»ááºáá»á¬á¸
     help: á¡âáá°âá¡âáá®â
     about: á¡áá¼á±á¬ááºá¸
     copyright: áá°áá­á¯ááºáá½áá·áº
     community: á¡áá­á¯ááºá¡áá­á¯ááºá¸
     community_blogs: á¡áá­á¯ááºá¡áá­á¯ááºá¸ ááá±á¬á·áá»á¬á¸
-    foundation: áá±á¬ááºáá±á¸áá¾ááºá¸
     make_a_donation:
       text: á¡áá¾á°áááºáá¯ áá¼á¯áá¯ááºáááº
     learn_more: áá­á¯áá­á¯ áá±á·áá¬áááº
     more: áá­á¯á
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: áá­á¯ááºá¸ %{to_user}á
     message_notification:
       hi: áá­á¯ááºá¸ %{to_user}á
-    friend_notification:
+    friendship_notification:
       hi: áá­á¯ááºá¸ %{to_user}á
-    gpx_notification:
-      greeting: áá­á¯ááºá¸
-    email_confirm_plain:
-      greeting: áá­á¯ááºá¸á
-    email_confirm_html:
+    email_confirm:
       greeting: áá­á¯ááºá¸á
-    lost_password_plain:
-      greeting: áá­á¯ááºá¸á
-    lost_password_html:
+    lost_password:
       greeting: áá­á¯ááºá¸á
     note_comment_notification:
       anonymous: á¡áááºááá­ á¡áá¯á¶á¸áá¼á¯áá°áááºáá±á¬ááº
@@ -509,10 +551,17 @@ my:
     changeset_comment_notification:
       hi: áá­á¯ááºá¸ %{to_user}á
       greeting: áá­á¯ááºá¸á
+  confirmations:
+    confirm:
+      heading: áááºáá¡á®á¸áá±á¸ááºáá­á¯ áááºáá±á¸áááº
+      button: á¡áááºáá¼á¯
+    confirm_resend:
+      failure: á¡áá¯á¶á¸áá¼á¯áá° %{name} ááá½á±á·áá¾á­áá«á
+    confirm_email:
+      button: á¡áááºáá¼á¯
   messages:
     inbox:
       title: á¡áááºáá¬
-      outbox: á¡áá½ááºáá¬
       from: áá¾
       subject: á¡áá¼á±á¬ááºá¸á¡áá¬
       date: áá±á·áá½á²
@@ -522,32 +571,68 @@ my:
       destroy_button: áá»ááºâáá«â
     new:
       title: áááºáá±á· áá­á¯á·áááº
-      subject: á¡áá¼á±á¬ááºá¸á¡áá¬
-      body: áá¬áá­á¯ááº
     create:
       message_sent: áááºáá±á· áá­á¯á·áá­á¯ááºáá¼á®
+    no_such_message:
+      title: áááºá¸áá²á·áá­á¯á·áááºáá±á·ááá¾á­áá«
+      heading: áááºá¸áá²á·áá­á¯á·áááºáá±á·ááá¾á­áá«
     outbox:
       title: á¡áá½ááºáá¬
-      inbox: á¡áááºáá¬
-      outbox: á¡áá½ááºáá¬
       to: áá­á¯á·
       subject: á¡áá¼á±á¬ááºá¸á¡áá¬
       date: áá±á·áá½á²
     show:
       title: áááºáá±á· áááºáááº
-      from: áá¾
-      subject: á¡áá¼á±á¬ááºá¸á¡áá¬
-      date: áá±á·áá½á²
       reply_button: á¡áá¼á±á¬ááºá¸áá¼ááºáááº
       destroy_button: áá»ááºâáá«â
       back: áá±á¬ááºáá­á¯á·
-      to: áá­á¯á·
     sent_message_summary:
       destroy_button: áá»ááºâáá«â
+  passwords:
+    lost_password:
+      title: ááá¬á¸áá¾ááº áá»á±á¬ááºáá¯á¶á¸áá½á¬á¸
+      heading: ááá¬á¸áá¾ááº áá±á·áá±áá«ááá¬á¸
+      email address: 'á¡á®á¸áá±á¸ áá­ááºáá¬ :'
+      new password button: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
+    reset_password:
+      title: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
+      heading: '%{user} á¡áá½ááº ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº'
+      reset: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
+      flash changed: ááá·áºááá¬á¸áá¾ááºáá­á¯ áá¼á±á¬ááºá¸áá²áá¼á®á¸áá«áá¼á®
+  sessions:
+    new:
+      title: á¡áá±á¬áá·áºáá²áááºáááº
+      heading: á¡áá±á¬áá·áºáá²áááºáááº
+      email or username: á¡á®á¸áá±á¸ááºáá­ááºáá¬ áá­á¯á·ááá¯ááº á¡áá¯á¶á¸áá¼á¯áá°á¡áááº
+      password: ááá¬á¸áá¾ááº
+      openid_html: '%{logo} OpenID:'
+      remember: áá­áá­áá­á¯ áá¾ááºáá­áá«
+      lost password link: ááá¬á¸áá¾ááº áá±á·áá±ááá¬á¸á
+      login_button: á¡áá±á¬áá·áºáá²áááºáááº
+      register now: á¡áá¯áá² áá¾ááºáá¯á¶áááºáááº
+      no account: á¡áá±á¬áá·áº ááá¾á­áá°á¸áá¬á¸á
+      auth_providers:
+        google:
+          title: áá°áá²ááºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
+        facebook:
+          title: áá±á·áá¯ááºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
+          alt: áá±á·áá¯ááºá¡áá±á¬áá·áºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
+        wikipedia:
+          title: áá®áá®áá®á¸áá®á¸áá¬á¸áá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
+          alt: áá®áá®áá®á¸áá®á¸áá¬á¸á¡áá±á¬áá·áºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
+    destroy:
+      title: á¡áá±á¬áá·áºáá¾áá¼ááºáá½ááº
+      logout_button: á¡áá±á¬áá·áºáá¾áá¼ááºáá½ááº
+  shared:
+    markdown_help:
+      text: áá¬áá¬á¸
+      image: áá¯ááºáá¯á¶
+    richtext_field:
+      edit: áá¼ááºáááºáááº
+      preview: áá¼á­á¯áááºá¡áááºá¸áá¼áá·áºáá¾á¯áááº
   site:
     about:
       next: áá¾á±á·
-      copyright_html: <span>&copy;</span>OpenStreetMap<br> áá¶á·áá­á¯á¸áá°áá»á¬á¸
       local_knowledge_title: áá±ááá¹áá ááá¯áá¯á
       legal_title: ááá¬á¸áááº
       partners_title: áá¯ááºáá±á¬áºáá­á¯ááºáááºáá»á¬á¸
@@ -580,17 +665,14 @@ my:
       how_to_help:
         title: áááºáá²á·áá­á¯á· áá°áá®áááº
     help:
-      beginners_guide:
-        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
       help:
-        url: https://help.openstreetmap.org/
-      forums:
-        title: áá­á¯áááºáá»á¬á¸
+        title: á¡áá°áá®áá­á¯áááº
       welcomemat:
         title: á¡áá½á²á·á¡áááºá¸áá»á¬á¸á¡áá½ááº
       wiki:
-        url: https://wiki.openstreetmap.org/
         title: wiki.openstreetmap.org
+    any_questions:
+      title: áá±á¸ááá¬ áá¾á­áá±á¸áá¬á¸
     sidebar:
       search_results: áá¾á¬áá½á±áá¾á¯ ááá¬ááºáá»á¬á¸
       close: áá­ááºáááº
@@ -604,6 +686,7 @@ my:
       table:
         entry:
           primary: áááºááááºá¸
+          bridleway: áá¼ááºá¸áá®á¸áááºá¸
           cycleway: áááºáá®á¸áá½á¬á¸áááºá¸
           rail: ááá¬á¸áááºá¸
           runway:
@@ -612,108 +695,43 @@ my:
           park: áááºá¸áá¼á¶
           lake:
           - áá±áááº
+          cemetery: áá¯á¿ááº
           school:
           - áá»á±á¬ááºá¸
           - ááá¹ááá­á¯ááº
           station: ááá¬á¸áá°áá¬
           construction: áá±á¬ááºáá±áá² áááºá¸áá»á¬á¸
           toilets: á¡á­ááºáá¬áá»á¬á¸
-    richtext_area:
-      edit: áá¼ááºáááºáááº
-      preview: áá¼á­á¯áááºá¡áááºá¸áá¼áá·áºáá¾á¯áááº
-    markdown_help:
-      link: ááá·áº
-      text: áá¬áá¬á¸
-      image: áá¯ááºáá¯á¶
     welcome:
       title: áá¼á­á¯áá­á¯áá«áááº!
       rules:
         title: áááºá¸áááºá¸áá»ááºáá»á¬á¸
-      questions:
-        title: áá±á¸ááá¬ áá¾á­áá±á¸áá¬á¸
       start_mapping: áá¼á±áá¯á¶ ááááºáá±á¸áá½á²áááº
+    communities:
+      other_groups:
+        title: á¡áá¼á¬á¸á¡á¯ááºáá¯áá»á¬á¸
   traces:
     new:
-      description: 'áá±á¬áºáá¼áá»ááº:'
-      visibility: 'áá¼ááºáá­á¯ááºáá¾á¯:'
       visibility_help: áá«á áá¬áá­á¯áá­á¯áá­á¯áá¬áá«áá­áá·áº
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: á¡âáá°âá¡âáá®â
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     edit:
-      filename: 'áá­á¯ááºá¡áááº:'
-      download: áá±á«ááºá¸áá¯ááº
-      map: áá¼á±áá¯á¶
-      edit: áá¼ááºáááº
-      owner: 'áá­á¯ááºáá­á¯ááºáá°:'
-      description: 'áá±á¬áºáá¼áá»ááº:'
-      visibility: 'áá¼ááºáá­á¯ááºáá¾á¯:'
       visibility_help: áá«á áá¬áá­á¯áá­á¯áá­á¯áá¬áá«áá­áá·áº
     show:
       map: áá¼á±áá¯á¶
       edit: áá¼ááºáááº
       owner: 'áá­á¯ááºáá­á¯ááºáá°:'
       description: 'áá±á¬áºáá¼áá»ááº:'
-    trace_paging_nav:
-      showing_page: áá¬áá»ááºáá¾á¬ %{page}
     trace:
-      ago: '%{time_in_words_ago} á¡áá¼á¬á'
       more: áá­á¯á
       view_map: áá¼á±áá¯á¶áá­á¯ áá¼áá·áºáááº
-      edit: áá¼ááºáááºáááº
       edit_map: áá¼á±áá¯á¶áá­á¯ áááºá¸áá¼ááºáááº
-      map: áá¼á±áá¯á¶
   oauth_clients:
     show:
       confirm: áá±áá»á¬áá«ááá¬á¸
-    form:
-      name: á¡áááº
-      required: áá­á¯á¡ááºáááº
   users:
-    login:
-      title: á¡áá±á¬áá·áºáá²áááºáááº
-      heading: á¡áá±á¬áá·áºáá²áááºáááº
-      email or username: á¡á®á¸áá±á¸ááºáá­ááºáá¬ áá­á¯á·ááá¯ááº á¡áá¯á¶á¸áá¼á¯áá°á¡áááº
-      password: ááá¬á¸áá¾ááº
-      openid: '%{logo} OpenID:'
-      remember: áá­áá­áá­á¯ áá¾ááºáá­áá«
-      lost password link: ááá¬á¸áá¾ááº áá±á·áá±ááá¬á¸á
-      login_button: á¡áá±á¬áá·áºáá²áááºáááº
-      register now: á¡áá¯áá² áá¾ááºáá¯á¶áááºáááº
-      no account: á¡áá±á¬áá·áº ááá¾á­áá°á¸áá¬á¸á
-      auth_providers:
-        google:
-          title: áá°áá²ááºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
-        facebook:
-          title: áá±á·áá¯ááºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
-          alt: áá±á·áá¯ááºá¡áá±á¬áá·áºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
-        wikipedia:
-          title: áá®áá®áá®á¸áá®á¸áá¬á¸áá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
-          alt: áá®áá®áá®á¸áá®á¸áá¬á¸á¡áá±á¬áá·áºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
-        yahoo:
-          title: áá¬áá°á¸áá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
-    logout:
-      title: á¡áá±á¬áá·áºáá¾áá¼ááºáá½ááº
-      logout_button: á¡áá±á¬áá·áºáá¾áá¼ááºáá½ááº
-    lost_password:
-      title: ááá¬á¸áá¾ááº áá»á±á¬ááºáá¯á¶á¸áá½á¬á¸
-      heading: ááá¬á¸áá¾ááº áá±á·áá±áá«ááá¬á¸
-      email address: 'á¡á®á¸áá±á¸ áá­ááºáá¬ :'
-      new password button: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
-    reset_password:
-      title: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
-      heading: '%{user} á¡áá½ááº ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº'
-      password: 'ááá¬á¸áá¾ááº:'
-      confirm password: 'ááá¬á¸áá¾ááºáá­á¯ á¡áááºáá¼á¯áá«:'
-      reset: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
-      flash changed: ááá·áºááá¬á¸áá¾ááºáá­á¯ áá¼á±á¬ááºá¸áá²áá¼á®á¸áá«áá¼á®
     new:
       title: áá¾ááºáá¯á¶áááºáááº
-      email address: 'á¡á®á¸áá±á¸ áá­ááºáá¬ :'
-      confirm email address: 'á¡á®á¸áá±á¸ááºáá­á¯ á¡áááºáá¼á¯áá«:'
-      display name: áá±á¬áºáá¼ááá·áºá¡áááº
-      password: 'ááá¬á¸áá¾ááº:'
-      confirm password: 'ááá¬á¸áá¾ááºáá­á¯ á¡áááºáá¼á¯áá«:'
       continue: áá¾ááºáá¯á¶áááºáááº
     terms:
       title: áááºáá¾ááºáá»ááºáá»á¬á¸
@@ -728,35 +746,13 @@ my:
       diary: áá±á·áááºáá¾ááºáááºá¸
       edits: áááºá¸áá¼ááºáá¾á¯áá»á¬á¸
       notes: áá¼á±áá¯á¶ áá¾ááºáá¯áá»á¬á¸
-      ct accepted: '%{ago} á¡áá¼á¬á áááºá¸áá¼ááºáá²á·áááº'
       email address: 'á¡á®á¸áá±á¸ááº áá­ááºáá¬:'
       status: 'á¡áá¼á±á¡áá±:'
-      description: áá±á¬áºáá¼áá»ááº
-      user location: á¡áá¯á¶á¸áá¼á¯áá° áááºáá±áá¬
-      km away: '%{count}áá®áá­á¯áá®áá¬ á¡áá½á¬'
-      m away: '%{count}áá­á¯ááº á¡áá½á¬'
       role:
         administrator: á¤á¡áá¯á¶á¸áá¼á¯áá°áááº á¡ááºááá­ááºáááºá¦á¸áá¼ááºáááº
       comments: áá¾ááºáá»ááºáá»á¬á¸
       create_block: á¤á¡áá¯á¶á¸áá¼á¯áá°áá­á¯ áá­ááºáááºáááº
       confirm: á¡áááºáá¼á¯
-    popup:
-      your location: áááºá áááºáá±áá¬
-      friend: áá°áááºáá»ááºá¸
-    account:
-      current email address: 'áááºáá¾á­ á¡á®á¸áá±á¸ááºáá­ááºáá¬:'
-      new email address: 'á¡á®á¸áá±á¸ááºáá­ááºáá¬ á¡áááº:'
-      latitude: 'ááá¹áá®áá»á¯:'
-      longitude: 'áá±á¬ááºáá»á®áá»á¯:'
-      save changes button: áá¼á±á¬ááºá¸áá²áá¾á¯áá»á¬á¸áá­á¯ áá­ááºá¸áááº
-      return to profile: ááá­á¯áá­á¯ááºáá­á¯á· áá¼ááºáá½á¬á¸áááº
-    confirm:
-      heading: áááºáá¡á®á¸áá±á¸ááºáá­á¯ áááºáá±á¸áááº
-      button: á¡áááºáá¼á¯
-    confirm_resend:
-      failure: á¡áá¯á¶á¸áá¼á¯áá° %{name} ááá½á±á·áá¾á­áá«á
-    confirm_email:
-      button: á¡áááºáá¼á¯
     index:
       title: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
       heading: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
@@ -781,7 +777,6 @@ my:
           one: 1 áá¾ááº
           other: '%{count} áá¾ááº'
     show:
-      ago: '%{time} á¡áá¼á¬á'
       status: á¡áá¼á±á¡áá±
       show: áá¼
       edit: áá¼ááºáááº
@@ -796,10 +791,16 @@ my:
       next: áá¾á±á· Â»
       previous: Â« ááááºá
   notes:
-    mine:
+    index:
       creator: áááºáá®á¸áá°
       description: áá±á¬áºáá¼áá»ááº
-      ago_html: '%{when} á¡áá¼á¬á'
+    show:
+      title: 'áá¾ááºáá¯: %{id}'
+      description: áá±á¬áºáá¼áá»ááº
+      hidden_title: 'áá¾ááºáá¬á¸áá±á¬ áá¾ááºáá¯ #%{note_name}'
+      hide: áá¾ááºáááº
+    new:
+      title: áá¾ááºáá¯ á¡áááº
   javascripts:
     close: áá­ááºáááº
     share:
@@ -812,17 +813,10 @@ my:
       show:
         hide_comment: áá¾ááº
         unhide_comment: ááá¾ááºáá±á¬á·áááº
-    notes:
-      show:
-        hide: áá¾ááºáááº
     directions:
       distance: á¡áá½á¬á¡áá±á¸
       time: á¡áá»á­ááº
   redactions:
-    edit:
-      description: áá±á¬áºáá¼áá»ááº
-    new:
-      description: áá±á¬áºáá¼áá»ááº
     show:
       description: 'áá±á¬áºáá¼áá»ááº:'
       user: 'áááºáá®á¸áá°:'