X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9018d1af07c53b03bf8caf0480b931dc25f57147..ce342fede0fc465993e588487056d76458f97169:/config/locales/my.yml?ds=inline

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 05044ea93..d214bd5ce 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -3,10 +3,19 @@
 # Export driver: phpyaml
 # Author: Dr Lotus Black
 # Author: Ninjastrikers
+# Author: Zyh333222
+# Author: áá½ááºááá¬á(áá±á¬ááºááá®ê©»)
 # Author: áá°áá½ááºá¸
 ---
 my:
+  time:
+    formats:
+      friendly: |-
+        %e %B %Y
+         at %H:%M
   helpers:
+    file:
+      prompt: áá­á¯ááºáá½á±á¸áá«
     submit:
       diary_comment:
         create: áá­ááºá¸áááº
@@ -19,7 +28,10 @@ my:
         create: áá­á¯á·
       client_application:
         create: áá¾ááºáá¯á¶áááºáááº
-        update: áá¼ááºáááºáááº
+        update: áá½ááºá¸áá¶
+      oauth2_application:
+        create: áá¾ááºáá¯á¶áááºáááº
+        update: áá½ááºá¸áá¶
       trace:
         create: áááºáááº
         update: áá¼á±á¬ááºá¸áá²áá¾á¯áá»á¬á¸áá­á¯ áá­ááºá¸áááº
@@ -29,7 +41,6 @@ my:
       friend: áá°áááºáá»ááºá¸
       language: áá¬áá¬ááá¬á¸
       message: áá¬áá¬á¸
-      notifier: á¡áá­áá±á¸áá°
       trace: áá²áá½ááºá
       user: á¡áá¯á¶á¸áá¼á¯áá°
       user_preference: á¡áá¯á¶á¸áá¼á¯áá° á¡áá¼ááºá¡áááº
@@ -39,20 +50,20 @@ my:
         title: á¡áá¼á±á¬ááºá¸á¡áá¬
         latitude: ááá¹áá®áá»á¯
         longitude: áá±á¬ááºáá»á®áá»á¯
-        language: áá¬áá¬ááá¬á¸
+        language_code: áá¬áá¬ááá¬á¸
       friend:
         user: á¡áá¯á¶á¸áá¼á¯áá°
         friend: áá°áááºáá»ááºá¸
       trace:
         user: á¡áá¯á¶á¸áá¼á¯áá°
         visible: áá¼ááº
-        name: á¡áááº
+        name: áá­á¯ááºá¡áááº
         size: á¡áá½ááºá¡áá¬á¸
         latitude: ááá¹áá®áá»á¯
         longitude: áá±á¬ááºáá»á®áá»á¯
         public: á¡áá»á¬á¸áá¼áá·áº
         description: áá±á¬áºáá¼áá»ááº
-        visibility: 'áá¼ááºáá­á¯ááºáá¾á¯:'
+        visibility: áá¼ááºáá­á¯ááºáá¾á¯
       message:
         sender: áá±á¸áá­á¯á·áá°
         title: á¡áá¼á±á¬ááºá¸á¡áá¬
@@ -62,13 +73,13 @@ my:
         description: áá±á¬áºáá¼áá»ááº
       user:
         email: á¡á®á¸áá±á¸ááº
-        new_email: 'á¡á®á¸áá±á¸ááºáá­ááºáá¬ á¡áááº:'
+        new_email: á¡á®á¸áá±á¸ááºáá­ááºáá¬ á¡áááº
         active: áááºáá¾á­á¡áá¯á¶á¸áá¼á¯áá±áááº
         display_name: áá±á¬áºáá¼ááá·áºá¡áááº
-        description: áá±á¬áºáá¼áá»ááº
-        home_lat: 'ááá¹áá®áá»á¯:'
-        home_lon: 'áá±á¬ááºáá»á®áá»á¯:'
-        languages: áá¬áá¬ááá¬á¸áá»á¬á¸
+        description: ááá­á¯áá­á¯ááº áá±á¬áºáá¼áá»ááº
+        home_lat: ááá¹áá®áá»á¯
+        home_lon: áá±á¬ááºáá»á®áá»á¯
+        languages: áá¾ááºáááºáá±á¬ áá¬áá¬ááá¬á¸áá»á¬á¸
         pass_crypt: ááá¬á¸áá¾ááº
   datetime:
     distance_in_words_ago:
@@ -106,34 +117,37 @@ my:
   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: (áá¾ááºáá»ááº ááá¾á­)
     view_history: áá¬ááááºáá¼áá·áºáááº
     view_details: á¡áá±á¸áá­ááº áá¼áá·áºáááº
     location: 'áááºáá±áá¬:'
-    changeset:
-      belongs_to: áá¬áá±á¸áá°
-      comment: áá¾ááºáá»ááºáá»á¬á¸ (%{count})
-      join_discussion: áá½á±á¸áá½á±á¸áááº áá±á¬á·á¡ááºáááºáá«
-      discussion: áá½á±á¸áá½á±á¸áá»ááº
     relation:
       members: á¡áá½á²á·áááºáá»á¬á¸
     not_found:
@@ -149,29 +163,31 @@ my:
       tags: á¡áááºáá½á²áá»á¬á¸
       wikidata_link: áá®áá®áá±áá¬áá±á«áºáá¾á­ %{page} item
       wikipedia_link: áá®áá®áá®á¸áá®á¸áá¬á¸áá±á«áºáá¾á­ %{page} áá±á¬ááºá¸áá«á¸
-    note:
-      title: 'áá¾ááºáá¯: %{id}'
-      new_note: áá¾ááºáá¯ á¡áááº
-      description: áá±á¬áºáá¼áá»ááº
-      hidden_title: 'áá¾ááºáá¬á¸áá±á¬ áá¾ááºáá¯ #%{note_name}'
+  changeset_comments:
+    feeds:
+      comment:
+        commented_at_by_html: '%{user} á %{when} á¡áá¼á¬á áá½ááºá¸áá¶áá²á·áááº'
   changesets:
-    changeset_paging_nav:
-      showing_page: áá¬áá»ááºáá¾á¬ %{page}
-      next: áá¾á±á· Â»
-      previous: Â« ááááºá
     changeset:
-      anonymous: á¡áááºááá­
       no_edits: (áááºá¸áá¼ááºáá¾á¯ ááá¾á­)
-    changesets:
-      id: á¡á­á¯ááºáá®
-      user: á¡áá¯á¶á¸áá¼á¯áá°
-      comment: áá¾ááºáá»ááº
-      area: á§áá­áá¬
     index:
       load_more: áá­á¯áá­á¯áá±á«áºáá°áááº
-  changeset_comments:
-    comment:
-      commented_at_by_html: '%{user} á %{when} á¡áá¼á¬á áá½ááºá¸áá¶áá²á·áááº'
+      feed:
+        created: áááºáá®á¸áá­á¯ááºáááº
+        closed: áá­ááºáá­á¯ááºáááº
+        belongs_to: áá¬áá±á¸áá°
+    show:
+      discussion: áá½á±á¸áá½á±á¸áá»ááº
+      join_discussion: áá½á±á¸áá½á±á¸áááº áá±á¬á·á¡ááºáááºáá«
+      hide_comment: áá¾ááº
+      unhide_comment: ááá¾ááºáá±á¬á·áááº
+  dashboards:
+    contact:
+      km away: '%{count}áá®áá­á¯áá®áá¬ á¡áá½á¬'
+      m away: '%{count}áá­á¯ááº á¡áá½á¬'
+    popup:
+      your location: áááºá áááºáá±áá¬
+      friend: áá°áááºáá»ááºá¸
   diary_entries:
     form:
       location: áááºáá±áá¬
@@ -196,24 +212,10 @@ my:
       report: á¤áá¾ááºáá»ááºáá­á¯ á¡áá®áááºáá¶áááºáá¼áááº
     location:
       location: 'áááºáá±áá¬:'
-      view: áá¼áá·áºáááº
-      edit: áá¼ááºáááºáááº
-    comments:
+  diary_comments:
+    page:
       comment: áá¾ááºáá»ááº
-      newer_comments: áá­á¯áááºáá±á¬ áá¾ááºáá»ááºáá»á¬á¸
-      older_comments: áá­á¯áá±á¬ááºá¸áá±á¬ áá¾ááºáá»ááºáá»á¬á¸
   geocoder:
-    search:
-      title:
-        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_html: <a href="http://www.geonames.org/">GeoNames</a> áá¾ ááááºáá»á¬á¸
-        osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a> áá¾ ááááºáá»á¬á¸
-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a> áá¾
-          ááááºáá»á¬á¸
     search_osm_nominatim:
       prefix:
         aeroway:
@@ -256,7 +258,9 @@ my:
           grave_yard: áá¯á¿ááº
           hospital: áá±á¸áá¯á¶
           ice_cream: áá±áá²áá¯áá·áº
+          internet_cafe: á¡ááºáá¬áááºááá±á¸
           kindergarten: áá°ááááºá¸áá»á±á¬ááºá¸
+          language_school: áá¬áá¬ááá¬á¸áá»á±á¬ááºá¸
           library: áá¬áá¼áá·áºáá­á¯ááº
           marketplace: áá»á±á¸áááºá¸
           monastery: áá¯ááºá¸áá¼á®á¸áá»á±á¬ááºá¸
@@ -287,6 +291,8 @@ my:
           viaduct: áá±á¬ááºáá¼á¬á¸áááºá¸
           "yes": áá¶áá¬á¸
         building:
+          house: á¡á­ááº
+          roof: áá±á«ááºáá­á¯á¸
           "yes": á¡áá±á¬ááºá¦á¸
         craft:
           brewery: áá®áá¬áá»ááºáááºáá¯á¶
@@ -295,7 +301,6 @@ my:
         emergency:
           landing_site: á¡áá±á¸áá±á«áºáá±áá¬ááºáááºá¸áá½ááºá¸
           phone: á¡áá±á¸áá±á«áºáá¯ááºá¸
-          "yes": á¡áá±á¸áá±á«áº
         highway:
           bridleway: áá¼ááºá¸áá®á¸áááºá¸
           bus_stop: áááºááºáá¬á¸ áá¾ááºáá­á¯ááº
@@ -354,6 +359,7 @@ my:
           embankment: áá¬áá­á¯á¸
           lighthouse: áá®á¸áá¼áá­á¯ááº
           pipeline: áá­á¯ááºáá­á¯ááºá¸
+          telescope: á¡áá±á¸áá¼áá·áºáá¾ááºáá¼á±á¬ááºá¸
           tower: áá»á¾á±á¬áºáááº
           watermill: áá±ááááºáááº
           water_well: áá±áá½ááºá¸
@@ -456,28 +462,23 @@ my:
           dam: ááá¶
           river: áá¼ááº
           waterfall: áá±áá¶áá½ááº
-      types:
-        cities: áá¼á­á¯á·áá»á¬á¸
-        towns: áá¼á­á¯á·áá»á¬á¸
-        places: áá±áá¬áá»á¬á¸
     results:
       no_results: áááºááá·áºááááºáá»á¾ áááá«
       more_results: ááááºáá»á¬á¸ áá­á¯á
   issues:
     index:
       search: áá¾á¬áá½á±áááº
+      states:
+        ignored: áá»ááºáá»á°áá¾á¯
+        open: áá½áá·áºáá«
+    page:
       user_not_found: á¡áá¯á¶á¸áá¼á¯áá° ááááºáá¾á­áá«
       status: á¡áá¼á±á¡áá±
       reports: á¡áá®áááºáá¶áá¬áá»á¬á¸
       last_updated: áá±á¬ááºáá¯á¶á¸ áá½ááºá¸áá¶áá²á·áááº
-      last_updated_time_html: <abbr title='%{title}'>%{time} á¡áá¼á¬á</abbr>
-      link_to_reports: á¡áá®áááºáá¶áá¬áá»á¬á¸áá­á¯ áá¼áá·áºáááº
       reports_count:
         one: 1 á¡áá®áááºáá¶áá¬
         other: '%{count} á¡áá®áááºáá¶áá¬áá»á¬á¸'
-      states:
-        ignored: áá»ááºáá»á°áá¾á¯
-        open: áá½áá·áºáá«
     show:
       ignore: áá»ááºáá»á°áá¾á¯
       read_reports: á¡áá®áááºáá¶áá¬áá»á¬á¸ áááºáá¾á¯áááº
@@ -503,28 +504,20 @@ my:
     home: á¡á­ááºáááºáá±áá¬áá­á¯á· áá½á¬á¸áááº
     logout: áá½ááºáááº
     log_in: á¡áá±á¬áá·áºáááºáááº
-    log_in_tooltip: áá¾á­áá¾áá·áºáá¼á®á¸áá¬á¸ á¡áá±á¬áá·áºáááºáá¯áá¾áá·áºáááºáááº
     sign_up: áá¾ááºáá¯á¶áááºáááº
     start_mapping: áá¼á±áá¯á¶ ááááºáá±á¸áá½á²áááº
-    sign_up_tooltip: áááºá¸áá¼ááºáááº á¡áá±á¬áá·áºáááºáá¯ áááºáá®á¸áá«
     edit: áá¼ááºáááº
     history: áá¬ááááº
     export: áááºáá­á¯á·áááº
-    data: áá±áá¬
     gps_traces: áá»á®áá®á¡ááºááºáá¼á±áá¬áá»á¬á¸
     user_diaries: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸á áá±á·áááºáá¾ááºáááºá¸áá»á¬á¸
-    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: áá­á¯á
   user_mailer:
@@ -543,7 +536,6 @@ my:
       greeting: áá­á¯ááºá¸á
     changeset_comment_notification:
       hi: áá­á¯ááºá¸ %{to_user}á
-      greeting: áá­á¯ááºá¸á
   confirmations:
     confirm:
       heading: áááºáá¡á®á¸áá±á¸ááºáá­á¯ áááºáá±á¸áááº
@@ -555,17 +547,16 @@ my:
   messages:
     inbox:
       title: á¡áááºáá¬
+    messages_table:
       from: áá¾
+      to: áá­á¯á·
       subject: á¡áá¼á±á¬ááºá¸á¡áá¬
       date: áá±á·áá½á²
     message_summary:
       read_button: áááºáá¼á®á¸áá¼á±á¬ááºá¸ áá¾ááºáá¬á¸áááº
-      reply_button: á¡áá¼á±á¬ááºá¸áá¼ááºáááº
       destroy_button: áá»ááºâáá«â
     new:
       title: áááºáá±á· áá­á¯á·áááº
-      subject: á¡áá¼á±á¬ááºá¸á¡áá¬
-      body: áá¬áá­á¯ááº
     create:
       message_sent: áááºáá±á· áá­á¯á·áá­á¯ááºáá¼á®
     no_such_message:
@@ -573,52 +564,33 @@ my:
       heading: áááºá¸áá²á·áá­á¯á·áááºáá±á·ááá¾á­áá«
     outbox:
       title: á¡áá½ááºáá¬
-      to: áá­á¯á·
-      subject: á¡áá¼á±á¬ááºá¸á¡áá¬
-      date: áá±á·áá½á²
     show:
       title: áááºáá±á· áááºáááº
-      from: áá¾
-      subject: á¡áá¼á±á¬ááºá¸á¡áá¬
-      date: áá±á·áá½á²
       reply_button: á¡áá¼á±á¬ááºá¸áá¼ááºáááº
       destroy_button: áá»ááºâáá«â
       back: áá±á¬ááºáá­á¯á·
-      to: áá­á¯á·
     sent_message_summary:
       destroy_button: áá»ááºâáá«â
   passwords:
-    lost_password:
+    new:
       title: ááá¬á¸áá¾ááº áá»á±á¬ááºáá¯á¶á¸áá½á¬á¸
       heading: ááá¬á¸áá¾ááº áá±á·áá±áá«ááá¬á¸
       email address: 'á¡á®á¸áá±á¸ áá­ááºáá¬ :'
       new password button: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
-    reset_password:
+    edit:
       title: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
       heading: '%{user} á¡áá½ááº ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº'
       reset: ááá¬á¸áá¾ááºáá­á¯ áá¼ááºáá»á­ááºáááº
+    update:
       flash changed: ááá·áºááá¬á¸áá¾ááºáá­á¯ áá¼á±á¬ááºá¸áá²áá¼á®á¸áá«áá¼á®
   sessions:
     new:
-      title: á¡áá±á¬áá·áºáá²áááºáááº
-      heading: á¡áá±á¬áá·áºáá²áááºáááº
+      tab_title: á¡áá±á¬áá·áºáá²áááºáááº
       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: á¡áá±á¬áá·áºáá¾áá¼ááºáá½ááº
@@ -629,24 +601,24 @@ my:
     richtext_field:
       edit: áá¼ááºáááºáááº
       preview: áá¼á­á¯áááºá¡áááºá¸áá¼áá·áºáá¾á¯áááº
+    pagination:
+      diary_comments:
+        older: áá­á¯áá±á¬ááºá¸áá±á¬ áá¾ááºáá»ááºáá»á¬á¸
+        newer: áá­á¯áááºáá±á¬ áá¾ááºáá»ááºáá»á¬á¸
   site:
     about:
-      next: áá¾á±á·
-      copyright_html: <span>&copy;</span>OpenStreetMap<br> áá¶á·áá­á¯á¸áá°áá»á¬á¸
       local_knowledge_title: áá±ááá¹áá ááá¯áá¯á
       legal_title: ááá¬á¸áááº
       partners_title: áá¯ááºáá±á¬áºáá­á¯ááºáááºáá»á¬á¸
     copyright:
+      title: áá°áá­á¯ááºáá½áá·áºáá¾áá·áº áá­á¯ááºáááº
       foreign:
         title: á¤áá¬áá¬áá¼ááºá¡áá¼á±á¬ááºá¸
       native:
         title: á¤áá¬áá»ááºáá¾á¬á¡áá¼á±á¬ááºá¸
         mapping_link: áá¼á±áá¯á¶ ááááºáá±á¸áá½á²áááº
       legal_babble:
-        title_html: áá°áá­á¯ááºáá½áá·áºáá¾áá·áº áá­á¯ááºáááº
         contributors_title_html: áá­áá­áá­á¯á·á áá¶á·áá­á¯á·áá±á¸áá°áá»á¬á¸
-    index:
-      permalink: áá¯á¶áá±áá­ááºáá¬
     edit:
       user_page_link: á¡áá¯á¶á¸áá¼á¯áá° áá¬áá»ááºáá¾á¬
     export:
@@ -655,35 +627,21 @@ my:
       too_large:
         other:
           title: á¡áá¼á¬á¸áááºá¸áá¼ááºáá»á¬á¸
-      options: áá½á±á¸áá­á¯ááºáá½áá·áº
-      image_size: áá¯ááºáá¯á¶ á¡áá½ááºá¡áá¬á¸
-      zoom: áá»á¯á¶á·/áá»á²á·áá¼áá·áºáááº
-      latitude: 'ááá¹áá®:'
-      longitude: 'áá±á¬ááºáá»á®:'
       export_button: áááºáá­á¯á·áááº
     fixthemap:
       how_to_help:
         title: áááºáá²á·áá­á¯á· áá°áá®áááº
     help:
-      beginners_guide:
-        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/
         title: wiki.openstreetmap.org
+    any_questions:
+      title: áá±á¸ááá¬ áá¾á­áá±á¸áá¬á¸
     sidebar:
       search_results: áá¾á¬áá½á±áá¾á¯ ááá¬ááºáá»á¬á¸
-      close: áá­ááºáááº
     search:
       search: áá¾á¬áá½á±áááº
-      get_directions: áááºá¸áá¼á±á¬ááºá¸áá»á¬á¸ ááá°áááº
       from: áá¾
       to: áá­á¯á·
       submit_text: áá½á¬á¸áá«
@@ -694,16 +652,13 @@ my:
           bridleway: áá¼ááºá¸áá®á¸áááºá¸
           cycleway: áááºáá®á¸áá½á¬á¸áááºá¸
           rail: ááá¬á¸áááºá¸
-          runway:
-          - áá±áá¬ááºáá½ááºá¸áá¼á±á¸áááºá¸
+          runway: áá±áá¬ááºáá½ááºá¸áá¼á±á¸áááºá¸
           forest: áááºáá±á¬
           park: áááºá¸áá¼á¶
-          lake:
-          - áá±áááº
+          lake: áá±áááº
           cemetery: áá¯á¿ááº
-          school:
-          - áá»á±á¬ááºá¸
-          - ááá¹ááá­á¯ááº
+          school: áá»á±á¬ááºá¸
+          university: ááá¹ááá­á¯ááº
           station: ááá¬á¸áá°áá¬
           construction: áá±á¬ááºáá±áá² áááºá¸áá»á¬á¸
           toilets: á¡á­ááºáá¬áá»á¬á¸
@@ -711,13 +666,13 @@ my:
       title: áá¼á­á¯áá­á¯áá«áááº!
       rules:
         title: áááºá¸áááºá¸áá»ááºáá»á¬á¸
-      questions:
-        title: áá±á¸ááá¬ áá¾á­áá±á¸áá¬á¸
       start_mapping: áá¼á±áá¯á¶ ááááºáá±á¸áá½á²áááº
+    communities:
+      other_groups:
+        title: á¡áá¼á¬á¸á¡á¯ááºáá¯áá»á¬á¸
   traces:
     new:
       visibility_help: áá«á áá¬áá­á¯áá­á¯áá­á¯áá¬áá«áá­áá·áº
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: á¡âáá°âá¡âáá®â
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     edit:
@@ -727,27 +682,28 @@ my:
       edit: áá¼ááºáááº
       owner: 'áá­á¯ááºáá­á¯ááºáá°:'
       description: 'áá±á¬áºáá¼áá»ááº:'
-    trace_paging_nav:
-      showing_page: áá¬áá»ááºáá¾á¬ %{page}
     trace:
       more: áá­á¯á
       view_map: áá¼á±áá¯á¶áá­á¯ áá¼áá·áºáááº
       edit_map: áá¼á±áá¯á¶áá­á¯ áááºá¸áá¼ááºáááº
-  oauth_clients:
-    show:
-      confirm: áá±áá»á¬áá«ááá¬á¸
+  application:
+    auth_providers:
+      google:
+        title: áá°áá²ááºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
+      facebook:
+        title: áá±á·áá¯ááºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
+        alt: áá±á·áá¯ááºá¡áá±á¬áá·áºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
+      wikipedia:
+        title: áá®áá®áá®á¸áá®á¸áá¬á¸áá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
+        alt: áá®áá®áá®á¸áá®á¸áá¬á¸á¡áá±á¬áá·áºáá¼áá·áº á¡áá±á¬áá·áºáá²áááºáááº
   users:
     new:
       title: áá¾ááºáá¯á¶áááºáááº
-      email address: 'á¡á®á¸áá±á¸ áá­ááºáá¬ :'
-      confirm email address: 'á¡á®á¸áá±á¸ááºáá­á¯ á¡áááºáá¼á¯áá«:'
-      display name: áá±á¬áºáá¼ááá·áºá¡áááº
       continue: áá¾ááºáá¯á¶áááºáááº
     terms:
       title: áááºáá¾ááºáá»ááºáá»á¬á¸
       heading: áááºáá¾ááºáá»ááºáá»á¬á¸
       continue: áááºáááº
-      decline: áá¼ááºá¸áááºáááº
       legale_select: 'áá±áá­á¯ááºáá¬ áá­á¯ááºáá¶:'
       legale_names:
         france: áá¼ááºáááº
@@ -758,30 +714,14 @@ my:
       notes: áá¼á±áá¯á¶ áá¾ááºáá¯áá»á¬á¸
       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: 'áááºáá¾á­ á¡á®á¸áá±á¸ááºáá­ááºáá¬:'
-      save changes button: áá¼á±á¬ááºá¸áá²áá¾á¯áá»á¬á¸áá­á¯ áá­ááºá¸áááº
-      return to profile: ááá­á¯áá­á¯ááºáá­á¯á· áá¼ááºáá½á¬á¸áááº
     index:
       title: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
       heading: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
-  user_role:
-    grant:
-      confirm: á¡áááºáá¼á¯
-    revoke:
-      confirm: á¡áááºáá¼á¯
   user_blocks:
     helper:
       block_duration:
@@ -799,22 +739,26 @@ my:
           other: '%{count} áá¾ááº'
     show:
       status: á¡áá¼á±á¡áá±
-      show: áá¼
       edit: áá¼ááºáááº
-      confirm: áá±áá»á¬áá«ááá¬á¸
     block:
       show: áá¼ááááº
       edit: áá¼ááºáááºáááº
-    blocks:
+    page:
       creator_name: áááºáá®á¸áá°
       status: á¡áá¼á±á¡áá±
-      showing_page: áá¬áá»ááºáá¾á¬ %{page}
-      next: áá¾á±á· Â»
-      previous: Â« ááááºá
   notes:
     index:
       creator: áááºáá®á¸áá°
       description: áá±á¬áºáá¼áá»ááº
+    show:
+      title: 'áá¾ááºáá¯: %{id}'
+      description: áá±á¬áºáá¼áá»ááº
+      hidden_title: 'áá¾ááºáá¬á¸áá±á¬ áá¾ááºáá¯ #%{note_name}'
+      hide: áá¾ááºáááº
+    new:
+      title: áá¾ááºáá¯ á¡áááº
+    notes_paging_nav:
+      showing_page: áá¬áá»ááºáá¾á¬ %{page}
   javascripts:
     close: áá­ááºáááº
     share:
@@ -823,15 +767,6 @@ my:
       image: áá¯ááºáá¯á¶
       long_link: ááá·áº
       download: áá±á«ááºá¸áá¯ááº
-    map:
-      copyright: Â© <a href='%{copyright_url}'>OpenStreetMap áá¶á·áá­á¯á¸áá°áá»á¬á¸</a>
-    changesets:
-      show:
-        hide_comment: áá¾ááº
-        unhide_comment: ááá¾ááºáá±á¬á·áááº
-    notes:
-      show:
-        hide: áá¾ááºáááº
     directions:
       distance: á¡áá½á¬á¡áá±á¸
       time: á¡áá»á­ááº