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

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 8d1cc9923..18b2477fa 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -53,6 +53,7 @@ my:
         longitude: áá±á¬ááºáá»á®áá»á¯
         public: á¡áá»á¬á¸áá¼áá·áº
         description: áá±á¬áºáá¼áá»ááº
+        visibility: 'áá¼ááºáá­á¯ááºáá¾á¯:'
       message:
         sender: áá±á¸áá­á¯á·áá°
         title: á¡áá¼á±á¬ááºá¸á¡áá¬
@@ -65,6 +66,39 @@ my:
         description: áá±á¬áºáá¼áá»ááº
         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: á¡áá±á¸ áá­ááºá¸áá»á¯ááº
@@ -136,12 +170,7 @@ my:
       commented_at_by_html: '%{user} á %{when} á¡áá¼á¬á áá½ááºá¸áá¶áá²á·áááº'
   diary_entries:
     form:
-      subject: á¡áá¼á±á¬ááºá¸á¡áá¬ -
-      body: áá¬áá­á¯ááº
-      language: 'áá¬áá¬ááá¬á¸:'
       location: 'áááºáá±áá¬:'
-      latitude: ááá¹áá®áá»á¯
-      longitude: áá±á¬ááºáá»á®áá»á¯
       use_map_link: áá¼á±áá¯á¶áá­á¯ á¡áá¯á¶á¸áá»
     index:
       title: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸á áá±á·áááºáá¾ááºáááºá¸áá»á¬á¸
@@ -152,7 +181,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 +196,20 @@ 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
+        latlon_html: <a href="https://openstreetmap.org/">á¡áá½ááºá¸áááº</a> áá¾ ááááºáá»á¬á¸
+        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> áá¾ ááááºáá»á¬á¸
+        osm_nominatim_html: <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
+        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> áá¾ ááááºáá»á¬á¸
+        osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> áá¾ ááááºáá»á¬á¸
-        geonames_reverse: <a href="http://www.geonames.org/">GeoNames</a> áá¾ ááááºáá»á¬á¸
+        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a> áá¾
+          ááááºáá»á¬á¸
     search_osm_nominatim:
       prefix:
         aeroway:
@@ -197,6 +226,7 @@ my:
           bank: áááº
           bar: áá¬á¸
           bench: áá¯á¶áááºá¸áá»á¬á¸
+          bus_station: áááºááºáá¬á¸ááááºá¸
           cafe: áááºáááºáááºáá­á¯ááº
           car_rental: áá¬á¸áá¾á¬á¸áá¯á¶
           car_wash: áá¬á¸áá±áá±á¸
@@ -207,6 +237,7 @@ my:
           clock: áá¬áá®
           college: áá±á¬áá­ááº
           courthouse: ááá¬á¸áá¯á¶á¸
+          crematorium: áá®á¸áááºá¹áá¼á­á¯ááºáááºáá¯á¶
           dentist: áá½á¬á¸ááá¬áááº
           doctors: ááá¬áááºáá»á¬á¸
           drinking_water: áá±á¬ááºáá±
@@ -226,17 +257,15 @@ my:
           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,10 +280,12 @@ my:
           aqueduct: áá±áá½ááºáá¶áá¬á¸
           boardwalk: áááºáááºáááºá¸áááº áá»ááºáááºá¸áááºá¸
           suspension: áá¼á­á¯á¸áá¶áá¬á¸
+          viaduct: áá±á¬ááºáá¼á¬á¸áááºá¸
           "yes": áá¶áá¬á¸
         building:
           "yes": á¡áá±á¬ááºá¦á¸
         craft:
+          brewery: áá®áá¬áá»ááºáááºáá¯á¶
           electrician: áá»á¾ááºáááºááá¬áá¾ááº
           photographer: áá«ááºáá¯á¶ááá¬
         emergency:
@@ -262,9 +293,11 @@ my:
           phone: á¡áá±á¸áá±á«áºáá¯ááºá¸
           "yes": á¡áá±á¸áá±á«áº
         highway:
+          bridleway: áá¼ááºá¸áá®á¸áááºá¸
           bus_stop: áááºááºáá¬á¸ áá¾ááºáá­á¯ááº
           corridor: áá±á¬ááºáá°á¸áááºá¹áá¼áááºá¸
           elevator: áá«ááºáá¾á±áá¬á¸
+          milestone: áá¾ááºáá­á¯ááº
           platform: ááááºáá±á¬ááºá¸
           primary: áááºááááºá¸
           primary_link: áááºááááºá¸
@@ -281,25 +314,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:
@@ -368,12 +406,14 @@ my:
           house: á¡á­ááº
           houses: á¡á­ááºáá»á¬á¸
           island: áá»á½ááºá¸
+          region: áááºáá¼á±áá±á
           sea: áááºáááº
           state: áá¼ááºáááº
           town: áá¼á­á¯á·
           village: áá½á¬
           "yes": áá±áá¬
         railway:
+          construction: áá±á¬ááºáá¯ááºáá² ááá¬á¸áááºá¸
           station: ááá¬á¸áá°áá¬
         shop:
           beauty: á¡áá¾áá¼ááºáá­á¯ááº
@@ -381,13 +421,13 @@ my:
           copyshop: áá­áá¹áá°áá­á¯ááº
           cosmetics: á¡áá¾áá¯ááºááá¹áááºá¸áá­á¯ááº
           fashion: áááºáá¾ááºáá­á¯ááº
+          interior_decoration: á¡áá½ááºá¸áá­á¯ááºá¸ á¡áá¾áááºáá¯ááºáááºá¸
+          laundry: áá­á¯áá®áá­á¯ááº
           lottery: áá®
-          market: áá»á±á¸áááºá¸
           massage: áá¬áááº
           mobile_phone: áá­á¯ááºáá­á¯ááºá¸áá¯ááºá¸áá­á¯ááº
           motorcycle: áá­á¯ááºáááºáá­á¯ááº
           organic: á¡á±á¬áºáá²áááº á¡áá¬á¸á¡áá¬áá­á¯ááº
-          pharmacy: áá±á¸áá­á¯ááº
           photo: áá«ááºáá¯á¶áá­á¯ááº
           seafood: áááºáááºáá¬
           second_hand: áááºáá«áá¯á¶á¸áá¼á®á¸áá­á¯ááº
@@ -412,13 +452,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: áááºááá·áºááááºáá»á¾ áááá«
@@ -460,6 +496,7 @@ my:
         note:
           other_label: á¡áá¼á¬á¸
   layouts:
+    home: á¡á­ááºáááºáá±áá¬áá­á¯á· áá½á¬á¸áááº
     logout: áá½ááºáááº
     log_in: á¡áá±á¬áá·áºáááºáááº
     log_in_tooltip: áá¾á­áá¾áá·áºáá¼á®á¸áá¬á¸ á¡áá±á¬áá·áºáááºáá¯áá¾áá·áºáááºáááº
@@ -486,22 +523,16 @@ my:
       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:
-      greeting: áá­á¯ááºá¸á
-    lost_password_plain:
+    email_confirm:
       greeting: áá­á¯ááºá¸á
-    lost_password_html:
+    lost_password:
       greeting: áá­á¯ááºá¸á
     note_comment_notification:
       anonymous: á¡áááºááá­ á¡áá¯á¶á¸áá¼á¯áá°áááºáá±á¬ááº
@@ -526,6 +557,9 @@ my:
       body: áá¬áá­á¯ááº
     create:
       message_sent: áááºáá±á· áá­á¯á·áá­á¯ááºáá¼á®
+    no_such_message:
+      title: áááºá¸áá²á·áá­á¯á·áááºáá±á·ááá¾á­áá«
+      heading: áááºá¸áá²á·áá­á¯á·áááºáá±á·ááá¾á­áá«
     outbox:
       title: á¡áá½ááºáá¬
       inbox: á¡áááºáá¬
@@ -584,9 +618,11 @@ my:
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
       help:
         url: https://help.openstreetmap.org/
+        title: á¡áá°áá®áá­á¯áááº
       forums:
         title: áá­á¯áááºáá»á¬á¸
       welcomemat:
+        url: https://welcome.openstreetmap.org/
         title: á¡áá½á²á·á¡áááºá¸áá»á¬á¸á¡áá½ááº
       wiki:
         url: https://wiki.openstreetmap.org/
@@ -604,6 +640,7 @@ my:
       table:
         entry:
           primary: áááºááááºá¸
+          bridleway: áá¼ááºá¸áá®á¸áááºá¸
           cycleway: áááºáá®á¸áá½á¬á¸áááºá¸
           rail: ááá¬á¸áááºá¸
           runway:
@@ -612,6 +649,7 @@ my:
           park: áááºá¸áá¼á¶
           lake:
           - áá±áááº
+          cemetery: áá¯á¿ááº
           school:
           - áá»á±á¬ááºá¸
           - ááá¹ááá­á¯ááº
@@ -634,20 +672,11 @@ my:
       start_mapping: áá¼á±áá¯á¶ ááááºáá±á¸áá½á²áááº
   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: áá¼á±áá¯á¶
@@ -657,7 +686,6 @@ my:
     trace_paging_nav:
       showing_page: áá¬áá»ááºáá¾á¬ %{page}
     trace:
-      ago: '%{time_in_words_ago} á¡áá¼á¬á'
       more: áá­á¯á
       view_map: áá¼á±áá¯á¶áá­á¯ áá¼áá·áºáááº
       edit: áá¼ááºáááºáááº
@@ -666,16 +694,13 @@ my:
   oauth_clients:
     show:
       confirm: áá±áá»á¬áá«ááá¬á¸
-    form:
-      name: á¡áááº
-      required: áá­á¯á¡ááºáááº
   users:
     login:
       title: á¡áá±á¬áá·áºáá²áááºáááº
       heading: á¡áá±á¬áá·áºáá²áááºáááº
       email or username: á¡á®á¸áá±á¸ááºáá­ááºáá¬ áá­á¯á·ááá¯ááº á¡áá¯á¶á¸áá¼á¯áá°á¡áááº
       password: ááá¬á¸áá¾ááº
-      openid: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID:'
       remember: áá­áá­áá­á¯ áá¾ááºáá­áá«
       lost password link: ááá¬á¸áá¾ááº áá±á·áá±ááá¬á¸á
       login_button: á¡áá±á¬áá·áºáá²áááºáááº
@@ -703,8 +728,6 @@ my:
     reset_password:
       title: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
       heading: '%{user} á¡áá½ááº ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº'
-      password: 'ááá¬á¸áá¾ááº:'
-      confirm password: 'ááá¬á¸áá¾ááºáá­á¯ á¡áááºáá¼á¯áá«:'
       reset: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
       flash changed: ááá·áºááá¬á¸áá¾ááºáá­á¯ áá¼á±á¬ááºá¸áá²áá¼á®á¸áá«áá¼á®
     new:
@@ -728,7 +751,6 @@ my:
       diary: áá±á·áááºáá¾ááºáááºá¸
       edits: áááºá¸áá¼ááºáá¾á¯áá»á¬á¸
       notes: áá¼á±áá¯á¶ áá¾ááºáá¯áá»á¬á¸
-      ct accepted: '%{ago} á¡áá¼á¬á áááºá¸áá¼ááºáá²á·áááº'
       email address: 'á¡á®á¸áá±á¸ááº áá­ááºáá¬:'
       status: 'á¡áá¼á±á¡áá±:'
       description: áá±á¬áºáá¼áá»ááº
@@ -781,7 +803,6 @@ my:
           one: 1 áá¾ááº
           other: '%{count} áá¾ááº'
     show:
-      ago: '%{time} á¡áá¼á¬á'
       status: á¡áá¼á±á¡áá±
       show: áá¼
       edit: áá¼ááºáááº
@@ -796,10 +817,9 @@ my:
       next: áá¾á±á· Â»
       previous: Â« ááááºá
   notes:
-    mine:
+    index:
       creator: áááºáá®á¸áá°
       description: áá±á¬áºáá¼áá»ááº
-      ago_html: '%{when} á¡áá¼á¬á'
   javascripts:
     close: áá­ááºáááº
     share:
@@ -808,6 +828,8 @@ my:
       image: áá¯ááºáá¯á¶
       long_link: ááá·áº
       download: áá±á«ááºá¸áá¯ááº
+    map:
+      copyright: Â© <a href='%{copyright_url}'>OpenStreetMap áá¶á·áá­á¯á¸áá°áá»á¬á¸</a>
     changesets:
       show:
         hide_comment: áá¾ááº