Merge remote-tracking branch 'upstream/pull/5250'

[rails.git] / config / locales / nqo.yml
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml

index c7995cbcf274dbf294452a7154e684d6f5e80459..2b0d6f182ebf3cd9742569f4a9aa9b5fc86def65 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -18,7 +18,7 @@ nqo:
        prompt: ߞߐߕߐ߮ ߛߎߥߊ߲ߘߟߌ
      submit:
        diary_comment:
        prompt: ߞߐߕߐ߮ ߛߎߥߊ߲ߘߟߌ
      submit:
        diary_comment:
-        create: ß\8aß¬ ß\9fß\8aß\9eß\8eß²ß¬ß\98ß\8eß¬
+        create: ß¡ß\99ß\8cß£ß\8aß²
        diary_entry:
          create: ߟߊ߬ߥߊ߲߬ߞߊ߬ߟߌ
          update: ߟߏ߲ߘߐߦߊߟߌ
        diary_entry:
          create: ߟߊ߬ߥߊ߲߬ߞߊ߬ߟߌ
          update: ߟߏ߲ߘߐߦߊߟߌ
@@ -29,7 +29,7 @@ nqo:
        client_application:
          create: ߕߐ߯ߛߓߍߟߌ
          update: ߟߏ߲ߘߐߦߊߟߌ
        client_application:
          create: ߕߐ߯ߛߓߍߟߌ
          update: ߟߏ߲ߘߐߦߊߟߌ
-      doorkeeper_application:
+      oauth2_application:
          create: ߕߐ߯ߛߓߍߟߌ
          update: ߟߏ߲ߘߐߦߊߟߌ
        redaction:
          create: ߕߐ߯ߛߓߍߟߌ
          update: ߟߏ߲ߘߐߦߊߟߌ
        redaction:
@@ -42,10 +42,6 @@ nqo:
          create: ߘߏߙߊ ߘߏ߫ ߛߌ߲ߘߌ߫
          update: ߘߏߙߊ ߘߏ߫ ߟߊߦߟߍ߬
    activerecord:
          create: ߘߏߙߊ ߘߏ߫ ߛߌ߲ߘߌ߫
          update: ߘߏߙߊ ߘߏ߫ ߟߊߦߟߍ߬
    activerecord:
-    errors:
-      messages:
-        invalid_email_address: ߊ߬ ߡߊ߫ ߓߐ߫ ߦߏ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߓߍ߲߬ߣߍ߲ ߠߋ߬
-        email_address_not_routable: ߊ߬ ߕߍ߫ ߛߙߊ߬ߕߊ߫ ߘߌ߫
      models:
        acl: ߞߣߐ߬ߜߍ߲߬ ߛߙߍߘߍ ߟߊߛߐ߬ߘߐ߲߫
        changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
      models:
        acl: ߞߣߐ߬ߜߍ߲߬ ߛߙߍߘߍ ߟߊߛߐ߬ߘߐ߲߫
        changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
@@ -59,7 +55,6 @@ nqo:
        message: ߗߋߛߓߍ
        node: ߘߐ߬ߞߌߛߍ
        node_tag: ߖߌߝߟߐ ߞߘߎ߬ߜߋ߲
        message: ߗߋߛߓߍ
        node: ߘߐ߬ߞߌߛߍ
        node_tag: ߖߌߝߟߐ ߞߘߎ߬ߜߋ߲
-      notifier: ߦߟߌߣߐߕߊ
        old_node: ߘߐ߬ߞߌ߬ߛߍ߬ ߞߘߐ
        old_node_tag: ߖߌߝߟߐ ߞߘߎ߬ߜߋ߲߬ ߞߘߐ
        old_relation: ߕߍߓߊ߯ߦߊ߫ ߞߘߐ
        old_node: ߘߐ߬ߞߌ߬ߛߍ߬ ߞߘߐ
        old_node_tag: ߖߌߝߟߐ ߞߘߎ߬ߜߋ߲߬ ߞߘߐ
        old_relation: ߕߍߓߊ߯ߦߊ߫ ߞߘߐ
@@ -100,9 +95,10 @@ nqo:
        diary_entry:
          user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
          title: ߝߐߡߊ
        diary_entry:
          user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
          title: ߝߐߡߊ
+        body: ߝߊ߬ߘߌ
          latitude: ߦߙߐ ߘߟߊߕߍ߯ߦߊ߫
          longitude: ߘߎ߰ߕߍ߬ߟߍ߲߬ߦߊ
          latitude: ߦߙߐ ߘߟߊߕߍ߯ߦߊ߫
          longitude: ߘߎ߰ߕߍ߬ߟߍ߲߬ߦߊ
-        language: ߞߊ߲
+        language_code: ߞߊ߲
        doorkeeper/application:
          name: ߕߐ߮
          redirect_uri: URLs ߟߊߞߎ߲߬ߛߌ߲߬ߠߌ߲
        doorkeeper/application:
          name: ߕߐ߮
          redirect_uri: URLs ߟߊߞߎ߲߬ߛߌ߲߬ߠߌ߲
@@ -138,7 +134,6 @@ nqo:
          auth_provider: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߡߊߛߐߟߊ߲
          auth_uid: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ UID
          email: ߢ:ߞߏ߲ߘߏ
          auth_provider: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߡߊߛߐߟߊ߲
          auth_uid: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ UID
          email: ߢ:ߞߏ߲ߘߏ
-        email_confirmation: ߢ:ߞߏ߲ߘߏ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ
          new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
          active: ߞߎ߲߬ߞߊߟߌ߲
          display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
          new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
          active: ߞߎ߲߬ߞߊߟߌ߲
          display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
@@ -151,7 +146,15 @@ nqo:
          pass_crypt_confirmation: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊߛߙߋߦߊ߫
      help:
        doorkeeper/application:
          pass_crypt_confirmation: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊߛߙߋߦߊ߫
      help:
        doorkeeper/application:
+        confidential: ߟߥߊ߬ߟߌ߬ߟߊ߲ ߓߍߣߊ߬ ߓߊ߯ߙߊ߫ ߢߊ߫ ߡߊ߬ ߡߍ߲ ߘߐ߫ ߣߌ߫ ߛߊ߲߬ߠߌ߲߬ߢߐ߲߮ ߠߎ߬
+          ߜߎ߲߬ߘߎ ߟߎ߬ ߘߌ߫ ߡߊ߬ߙߊ߫ ߜߎ߲߬ߘߎ ߘߐ߫ (ߜߋߟߋ߲ߜߋߟߋ߲ ߟߥߊ߬ߟߌ߬ߟߊ߲ ߓߐߖߎ ߟߎ߬ ߣߌ߫ ߞߐߜߍ߫
+          ߜߋ߲߬ߞߋߟߋ߲ ߟߥߊ߬ߟߌ߬ߟߊ߲ ߠߎ߬ ߕߍ߫ ߜߎ߲߬ߘߎ߬ߕߊ߫ ߘߌ߫)
          redirect_uri: ߛߌ߬ߕߊ߬ߙߌ߬ ߞߋߟߋ߲߫ ߠߊߓߊ߯ߙߊ߫ URL ߡߊ߬
          redirect_uri: ߛߌ߬ߕߊ߬ߙߌ߬ ߞߋߟߋ߲߫ ߠߊߓߊ߯ߙߊ߫ URL ߡߊ߬
+      trace:
+        tagstring: ߓߟߏߡߟߊ ߡߍ߲ ߠߎ߬ ߕߍߝߘߊߣߍ߲߫ ߦߋ߫ ߦߟߌߘߟߐ ߟߊ߫
+      user_block:
+        needs_view: ߊ߬ ߝߐ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߡߊ߬ߞߏ ߦߋ߫ ߜߊ߲߬ߞߎ߲߬ߠߌ߲ ߠߊ߫ ߓߊ߬ߟߌ߬ߟߌ ߣߌ߲߬ ߞߏ
+          ߟߛߊߣߌ߲ߧߊ ߕߍ߫ ߓߊ߬؟
        user:
          new_email: (ߊ߬ ߞߊ߫ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫ ߡߎ߰ߡߍ߫)
    datetime:
        user:
          new_email: (ߊ߬ ߞߊ߫ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫ ߡߎ߰ߡߍ߫)
    datetime:
@@ -170,7 +173,7 @@ nqo:
        openid: ߏߔߌ߲ ID
        google: ߜ߭ߎߜ߭ߏߟ
        facebook: ߝߋߛߑߓߎߞ
        openid: ߏߔߌ߲ ID
        google: ߜ߭ߎߜ߭ߏߟ
        facebook: ߝߋߛߑߓߎߞ
-      windowslive: ߥߌ߲ߘߏߛ ߟߊ߯ߌߝ߭
+      microsoft: ߡߌߞߙߏߛߐߝߕ
        github: GitHub
        wikipedia: ߥߞߌߔߋߘߌߦߊ
    api:
        github: GitHub
        wikipedia: ߥߞߌߔߋߘߌߦߊ
    api:
@@ -183,6 +186,7 @@ nqo:
          closed_at_html: ߓߘߊ߫ ߢߊߓߐ߫ %{when}
          closed_at_by_html: ߢߊߓߐߣߍ߲߫ ߦߋ߫ %{when} ߟߊ߫ %{user} ߓߟߏ߫
          reopened_at_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߦߋ߫ %{when} ߟߊ߫
          closed_at_html: ߓߘߊ߫ ߢߊߓߐ߫ %{when}
          closed_at_by_html: ߢߊߓߐߣߍ߲߫ ߦߋ߫ %{when} ߟߊ߫ %{user} ߓߟߏ߫
          reopened_at_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߦߋ߫ %{when} ߟߊ߫
+        reopened_at_by_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߦߋ߫ %{when} ߣߌ߫ %{user} ߟߋ߬ ߓߟߏ߫
        rss:
          title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߦߟߌߣߐ ߟߎ߬
          description_item: RSS ߓߊߟߏ ߦߟߌߣߐ %{id} ߦߋ߫
        rss:
          title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߦߟߌߣߐ ߟߎ߬
          description_item: RSS ߓߊߟߏ ߦߟߌߣߐ %{id} ߦߋ߫
@@ -193,35 +197,84 @@ nqo:
        entry:
          comment: ߡߙߌߣߊ߲
          full: ߦߟߌߣߐ ߘߝߊߣߍ߲
        entry:
          comment: ߡߙߌߣߊ߲
          full: ߦߟߌߣߐ ߘߝߊߣߍ߲
+  account:
+    deletions:
+      show:
+        title: ߒ ߠߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߫
+        warning: ߖߊ߲߬ߓߌ߬ߟߊ߬ߟߌ߹ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߬ߟߌ ߦߋ߫ ߟߊ߬ߞߎ߬ߙߊ߲߬ߠߌ߲ ߠߋ߬ ߘߌ߫߸ ߊ߬ ߘߏ߲߬
+          ߕߍ߫ ߣߊ߬ ߛߐ߲߬ ߠߊ߫ ߘߐߛߊ߬ ߟߊ߫.
+        delete_account: ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߫
+        delete_introduction: 'ߌ ߘߌ߫ ߛߴߌ ߟߊ߫ ߏߔߌ߲ߛߑߙߌߕߑߡߊߔ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߫ ߟߊ߫ ߘߎ߰ߟߊ߬ߘߐ߬
+          ߞߘߎ ߟߊߓߊ߯ߙߊ ߟߊ߫. ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߢߌ߲߬ ߠߎ߫ ߕߴߌ ߦߟߌ߫ ߟߊ߫ ߖߊ߰ߣߌ߲߫:'
+        delete_profile: ߌ ߟߊ߫ ߢߊߞߙߍ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ߸ ߞߊߕߘߍ߬ߕߍ߫ ߌ ߟߊ߫ ߊߝ߭ߊߙߑߕߊ߫ ߡߊ߬߸ ߌ
+          ߕߐ߯ߛߓߍߟߌ ߣߴߌ ߘߌ߲߬ߞߌߙߊ ߟߎ߬ ߓߍ߯ ߘߌ߫ ߛߋ߲߬ߓߐ߫.
+        delete_display_name: ߌ ߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮ ߘߌ߫ ߛߋ߲߬ߓߐ߫߸ ߊ߬ ߝߊ߲߭ ߘߌ߫ ߛߋ߫ ߟߊߓߊ߯ߙߊ߫
+          ߟߊ߫ ߞߎߘߊ߫ ߘߌ߫ ߖߊ߬ߕߋ߬ߘߊ߫ ߜߘߍ ߟߎ߬ ߓߟߏ߫.
+        retain_caveats: ߏ߬ ߓߟߏߡߊ߬߸ ߌ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߘߏ߫ ߟߎ߫ ߘߌ߫ ߣߊ߬ ߟߊߡߊ߲߲߬ߘߌ߫ ߏߔߌ߲ߛߑߙߌߕߑߡߊߔ
+          ߟߊ߫߸ ߤߊߟߴߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ ߞߐ ߘߐ߫.
+        retain_edits: ߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߔߊ߬ߔߘߊ ߟߐ߲ߕߊ ߝߊ߲ ߠߊ߫߸ ߣߴߏ߬ ߞߍ߫ ߘߊ߫
+          ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߣߊ߬ ߟߊߡߊ߲߲߬ߘߌ߫.
+        retain_traces: ߌ ߟߊ߫ ߜߙߋ߬ ߟߊߦߟߍ߬ߣߍ߲ ߠߎ߬߸ ߣߴߏ߬ ߞߍ߫ ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫.
+        retain_diary_entries: ߌ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߣߌ߫ ߡߙߌߣߊ߲ ߠߎ߬߸ ߣߴߏ߬ ߞߍ߫
+          ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫ ߒ߬ߞߵߊ߬ߟߎ߬ ߢߡߊߘߏ߲߰ ߕߐ߫ ߦߋ߫ ߟߋ߬ ߞߊ߬ ߓߐ߫ ߦߋߟߌ
+          ߡߊ߬.
+        retain_notes: ߌ ߟߊ߫ ߔߊ߬ߔߘߊ ߦߟߌߣߐ ߟߎ߬ ߣߌ߫ ߦߟߌߣߐ ߟߎ߬ ߡߙߌߣߊ߲ ߠߎ߬߸ ߣߴߏ߬ ߟߎ߬ ߞߍ߫
+          ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫ ߒ߬ߞߵߊ߬ߟߎ߬ ߢߡߊߘߏ߲߰ ߕߐ߫ ߦߋ߫ ߟߋ߬ ߞߊ߬ ߓߐ߫ ߦߋߟߌ
+          ߡߊ߬.
+        retain_changeset_discussions: ߌ ߟߊ߫ ߘߊߘߐߖߊߥߏ ߟߎ߬ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ ߟߎ߬ ߞߊ߲߬߸
+          ߣߴߏ߬ ߟߎ߬ ߞߍ߫ ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫.
+        retain_email: ߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫.
+        confirm_delete: ߌ ߘߍ߲߬ߞߣߍ߬ߦߊ߬ߣߍ߲߫؟
+        cancel: ߊ߬ ߘߐߛߊ߬
    accounts:
      edit:
        title: ߖߊ߬ߕߋ߬ߘߊ ߡߊߦߟߍ߬ߡߊ߲߬
        my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
        current email address: ߕߋ߲߭ߕߋ߲߭ ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ
    accounts:
      edit:
        title: ߖߊ߬ߕߋ߬ߘߊ ߡߊߦߟߍ߬ߡߊ߲߬
        my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
        current email address: ߕߋ߲߭ߕߋ߲߭ ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ
+      external auth: ߞߐߞߊ߲ߠߊ ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ߬ߟߌ
        openid:
        openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
          link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
        public editing:
          heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
          link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
        public editing:
          heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
+        enabled: ߓߘߊ߫ ߓߌ߬ߟߴߊ߬ ߟߊ߫. ߊ߬ ߕߍ߫ ߘߋ߬ ߞߏ߫ ߕߐ߯ߒߕߊ߲ ߛߋ߫ ߕߐ߫ ߓߍ߫ ߟߐ߲ߕߊ ߡߊߦߟߍ߬ߡߊ߲߫
+          ߠߊ߫.
          enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
          enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
+        disabled: ߊ߬ ߓߘߊ߫ ߓߴߊ߬ ߟߊ߫ ߊ߬ ߘߏ߲߬ ߕߍ߫ ߛߋ߫ ߟߐ߲ߕߊ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
+          ߛߎ߯-ߎ-ߛߎ߫ ߞߐ߲߬ߣߍ߲߫ ߦߋ߫ ߢߍ ߘߐ߫߸ ߏ߬ ߓߍ߯ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߘߌ߫.
          disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
          disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
-      public editing note:
-        heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
        contributor terms:
        contributor terms:
+        heading: ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬
+        agreed: ߌ ߓߘߊ߫ ߘߌ߬ߢߍ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬.
+        not yet agreed: ߌ ߡߊ߫ ߘߌ߬ߢߍ߬ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬ ߡߎߣߎ߲߬.
+        review link text: ߛߘߌ߬ߜߋ߲ ߣߌ߲߬ ߠߊߓߊ߬ߕߏ߫ ߌ ߟߊ߫ ߓߍ߲߬ߢߐ߲߰ߡߊ ߘߌ߫ ߖߊ߰ߣߌ߲߫߸، ߞߊ߬
+          ߓߟߏߡߊߜߍ߲߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߖߊ߬ߕߋߡߌ߬ߘߊ߬߸ ߊ߬ ߣߌ߫ ߞߵߊ߬ߟߎ߬ ߟߊߡߌ߬ߣߊ߬.
+        agreed_with_pd: ߌ ߓߘߊ߫ ߓߊ߲߫ ߊ߬ ߦߌ߬ߘߊ߬ ߟߊ߫ ߞߴߌ ߦߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߖߊ߬ߕߋ߬
+          ߟߊ߫ ߞߵߊ߬ ߦߋ߫ ߞߍ߫ ߝߘߏ߬ߓߊ߬ ߘߊߞߎ߲ ߘߐ߫.
          link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
        save changes button: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߠߊߞߎ߲߬ߘߎ߬
          link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
        save changes button: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߠߊߞߎ߲߬ߘߎ߬
+      delete_account: ߖߊ߬ߕߋ߬ߘߊ ߖߏ߰ߛߌ߬ߟߌ...
+    go_public:
+      heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
+      currently_not_public: ߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߦߋ߫ ߕߐ߯ߒߕߊ߲ߧߊ ߟߋ߬ ߘߐ߫ ߥߊ߯ߕߌ ߣߌ߲߬
+        ߠߊ߫، ߏ߬ ߘߐ߫߸ ߡߐ߱ ߟߎ߬ ߕߍߣߊ߬ ߛߋ߫ ߟߊ߫ ߗߋߛߓߍ߫ ߗߋ߫ ߟߴߌ ߡߊ߬ ߞߎߡߊ߫ ߕߴߌ ߘߌ߲߬ߞߌߙߊ ߟߐ߲߫
+        ߞߏ ߡߊ߬. ߖߐ߲߬ߛߊ߫ ߞߵߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߣߍ߲ ߠߎ߬ ߦߌ߬ߘߊ߬ ߥߟߊ߫ ߞߊ߬ ߡߐ߱ ߟߎ߬ ߟߊߘߌ߬ߢߍ߬
+        ߌ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫ ߓߟߐߛߐ߫ ߞߍߦߙߐ ߟߊ߫، ߘߎ߰ߟߊ߬ߘߐ߬ ߞߘߎ ߛߐ߲߬ߞߌ߲߫.
+      only_public_can_edit: ߞߊ߬ߦߌ߯ API ߀.߆ ߟߊߓߊ߯ߙߊ ߘߊߡߌ߬ߣߊ߬ ߘߊ߫، ߜߍߘߐ߫ (ߖߊ߬ߡߊ ߢߊߞߘߐ߫)
+        ߓߟߏߡߊߜߍ߲ߠߊ ߟߎ߬ ߘߐߙߐ߲߫ ߠߋ߬ ߦߋ߫ ߛߋ߫ ߟߊ߫ ߔߊ߬ߔߘߊ ߞߣߐߘߐ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߬ ߠߊ߫.
+      find_out_why: ߊ߬ ߢߊߢߌߣߌ߲߫ ߓߊ߫ ߡߎ߲߬ߠߊ߫
+      email_not_revealed: ߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߕߍߣߊ߬ ߝߊߙߊ߲ߛߊ߫ ߖߊ߬ߡߊ߫ ߣߊ߬ߕߐ ߟߎ߬ ߓߟߏ߫.
+      not_reversible: ߒ߬ߓߊ߬ ߞߍߟߌ ߏ߬ ߘߏ߲߬ ߕߍߣߊ߬ ߣߊ߬ ߟߊ߫ ߓߐ߫ ߟߴߊ߬ ߡߊ߬، ߊ߬ ߘߏ߲߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫
+        ߞߎߘߊ ߟߎ߬ ߓߍ߯ ߦߋ߫ ߜߍߘߐߡߐ߮ ߟߋ߬ ߘߌ߫ ߘߊ߲ߛߎ߲ ߓߟߏ߫ ߡߎ߬ߕߎ߲߬.
+      make_edits_public_button: ߊ߬ ߓߍ߯ ߞߍ߫ ߒ ߠߊ߫ ߖߡߊ߬ߘߐ߬ ߡߊߦߟߍߡߊ߲ߠߌ߲ ߘߌ߫
+    update:
+      success_confirm_needed: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫. ߌ ߟߊ߫
+        ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߡߊߝߟߍ߫ ߦߟߌߣߐ߫ ߞߏ ߘߐ߫ ߞߵߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫.
+      success: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫.
+    destroy:
+      success: ߖߊ߬ߕߋ߬ߘߊ ߓߘߊ߫ ߖߏ߰ߛߌ߫.
    browse:
    browse:
-    created: ߛߌ߲ߘߌߣߍ߲
-    closed: ߘߊߕߎ߲߯ߣߍ߲
-    created_html: ߛߌ߲ߘߌߣߍ߲ <abbr title='%{title}'></abbr>%{time}
-    closed_html: ߘߊߕߎ߲߯ߣߍ߲ <abbr title='%{title}'></abbr>%{time}
-    created_by_html: ߛߌ߲ߘߌߣߍ߲ <abbr title='%{title}'></abbr>%{time}%{user}
-    deleted_by_html: ߊ߬ ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ <abbr title='%{title}'>%{title}%{time}</abbr>
-      %{user} ߓߟߏ߫
-    edited_by_html: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߬ߣߍ߲߫ ߦߋ߫ <abbr title='%{title}'>%{title}%{time}</abbr>
-      %{user} ߓߟߏ߫
-    closed_by_html: ߊ߬ ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ <abbr title='%{title}'>%{title}%{time}</abbr>
-      %{user} ߓߟߏ߫
+    deleted_ago_by_html: ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
+    edited_ago_by_html: ߡߊߙߟߍ߬ߡߊ߲߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
      version: ߦߌߟߡߊ
      in_changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
      anonymous: ߕߐ߯ߒߕߊ߲
      version: ߦߌߟߡߊ
      in_changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
      anonymous: ߕߐ߯ߒߕߊ߲
@@ -231,27 +284,19 @@ nqo:
      view_history: ߘߐ߬ߝߐ ߘߐߜߍ߫
      view_details: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
      location: ߘߌ߲߬ߞߌߙߊ
      view_history: ߘߐ߬ߝߐ ߘߐߜߍ߫
      view_details: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
      location: ߘߌ߲߬ߞߌߙߊ
-    changeset:
-      title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}'
-      belongs_to: ߛߓߍߦߟߊ
-      way: ߛߌߟߊ (%{count})
-      relation: ߕߍߓߊ߯ߦߊ (%{count})
-      relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
-      comment: ߡߙߌߣߊ߲ (%{count})
-      hidden_commented_by_html: ߡߙߌߣߊ߲ ߢߢߊߘߏ߲߯ߠߌ߲ %{user} ߡߊ߬ <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: ߦߟߌߣߐ ߡߍ߲ ߝߘߊߣߍ߲߫ ߦߋ߫ %{user} ߟߊ߫ <abbr title='%{exact_time}'>%{when}</abbr>
-      changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
-      osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
-      join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
-      discussion: ߘߊߘߐߖߊߥߏ
+    node:
+      title_html: 'ߥߎߙߋ߲ߛߋ߲: %{name}'
+      history_title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}'
      way:
        title_html: 'ߛߌߟߊ: %{name}'
        history_title_html: 'ߛߌߟߊ ߘߐ߬ߝߐ: %{name}'
      way:
        title_html: 'ߛߌߟߊ: %{name}'
        history_title_html: 'ߛߌߟߊ ߘߐ߬ߝߐ: %{name}'
+      nodes: ߥߎߙߋ߲ߛߋ߲ ߠߎ߬
      relation:
        title_html: 'ߕߍߓߊ߯ߦߊ: %{name}'
        history_title_html: 'ߕߍߓߊ߯ߦߊ ߟߊ߫ ߘߐ߬ߝߐ: %{name}'
        members: ߛߌ߲߬ߝߏ߲ ߠߎ߬
      relation_member:
      relation:
        title_html: 'ߕߍߓߊ߯ߦߊ: %{name}'
        history_title_html: 'ߕߍߓߊ߯ߦߊ ߟߊ߫ ߘߐ߬ߝߐ: %{name}'
        members: ߛߌ߲߬ߝߏ߲ ߠߎ߬
      relation_member:
+      entry_role_html: '%{type} %{name} %{role} ߘߌ߫'
        type:
          node: ߘߐ߬ߞߌߛߍ
          way: ߛߌߟߊ
        type:
          node: ߘߐ߬ߞߌߛߍ
          way: ߛߌߟߊ
@@ -279,7 +324,11 @@ nqo:
          changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲
          note: ߘߐ߬ߞߌߛߍ
      redacted:
          changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲
          note: ߘߐ߬ߞߌߛߍ
      redacted:
+      redaction: ߥߣߊ߬ߙߌ߬ߣߍ߲ %{id}
+      message_html: ߦߌߟߡߊ %{version} ߣߌ߲߬ %{type} ߕߍ߫ ߛߐ߲߬ ߦߌ߬ߘߊ߬ ߟߊ߫ ߓߊߏ߬ ߊ߬ ߥߣߊ߬ߙߌ߬ߣߍ߲߫
+        ߠߋ߬. %{redaction_link} ߦߋ߫ ߖߊ߰ߣߌ߲߫ ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߞߏ ߘߐ߫.
        type:
        type:
+        node: ߥߎߙߋ߲ߛߋ߲
          way: ߛߌߟߊ
          relation: ߕߍߓߊ߯ߦߊ
      start_rjs:
          way: ߛߌߟߊ
          relation: ߕߍߓߊ߯ߦߊ
      start_rjs:
@@ -295,50 +344,33 @@ nqo:
        wikimedia_commons_link: '%{page} ߞߣߐߘߐ ߥߞߌߡߋߘߌߦߊ߫ ߞߐߡߐ߲ ߞߊ߲߬'
        telephone_link: ߞߟߌߟߌ %{phone_number}
        colour_preview: ߞߐ߬ߟߐ %{colour_value} ߢߍߕߊ
        wikimedia_commons_link: '%{page} ߞߣߐߘߐ ߥߞߌߡߋߘߌߦߊ߫ ߞߐߡߐ߲ ߞߊ߲߬'
        telephone_link: ߞߟߌߟߌ %{phone_number}
        colour_preview: ߞߐ߬ߟߐ %{colour_value} ߢߍߕߊ
-    note:
-      title: 'ߦߟߌߣߐ: %{id}'
-      new_note: ߦߟߌߣߐ߫ ߞߎߘߊ߫
-      description: ߕߐ߯ߛߓߍߟߌ
-      open_title: ߦߟߌߣߐ߫ ߢߊߓߐߓߊߟߌ %{note_name}
-      closed_title: ߦߟߌߣߐ߫ ߢߊߓߐߣߍ߲ %{note_name}
-      hidden_title: ߦߟߌߣߐ߫ ߢߡߊߘߏ߲߰ߣߍ߲ %{note_name}
-      opened_by_html: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{user}<abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ߟߋ߬ ߓߟߏ߫
-      opened_by_anonymous_html: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߟߊ߫ ߓߟߏ߫ <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: ߡߙߌߣߊ߲ ߞߊ߬ ߝߘߊ߫ %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      commented_by_anonymous_html: ߡߙߌߣߊ߲ ߞߊ߬ ߝߘߊ߫ ߕߐ߯ߒߕߊ߲ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ߟߊ߫
-      closed_by_html: ߊ߬ ߢߊߓߐߣߍ߲߫ ߦߋ߫ %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ߓߟߏ߫
-      closed_by_anonymous_html: ߊ߬ ߢߊߓߐߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ߟߋ߬ ߓߟߏ߫
-      reopened_by_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߕߎ߲߯ %{user} ߟߋ߬ ߓߟߏ߫ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      reopened_by_anonymous_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߓߟߏ߫ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      hidden_by_html: ߊ߬ ߢߡߊߘߏ߲߰ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߓߟߏ߫ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      report: ߞߟߏߜߍ ߣߌ߲߬ ߠߊߞߏߝߐ߫
+      email_link: ߢ:ߞߏ߲ߘߏ %{email}
      query:
        title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
        introduction: ߡߊߔ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߌ ߡߊߛߘߎ߬ߧߊ߬ ߟߊߓߊ߯ߙߊߟߌ ߟߎ߫ ߢߌߣߌ߲߫.
        nearby: ߕߙߐ߬ߝߍ߬ ߟߊߓߊ߯ߙߊߟߌ
        enclosing: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߫ ߡߊߛߎ߬ߘߎ߲߬ߧߊ߬ߣߍ߲ ߠߎ߬
      query:
        title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
        introduction: ߡߊߔ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߌ ߡߊߛߘߎ߬ߧߊ߬ ߟߊߓߊ߯ߙߊߟߌ ߟߎ߫ ߢߌߣߌ߲߫.
        nearby: ߕߙߐ߬ߝߍ߬ ߟߊߓߊ߯ߙߊߟߌ
        enclosing: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߫ ߡߊߛߎ߬ߘߎ߲߬ߧߊ߬ߣߍ߲ ߠߎ߬
+  changeset_comments:
+    feeds:
+      comment:
+        comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+          %{author} ߓߟߏ߫
+        commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
+      show:
+        title_all: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ ߘߊߘߐߖߊߥߏ
+        title_particular: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+          ߘߊߘߐߖߊߥߏ
+      timeout:
+        sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߞߊ߲߬ߞߎߡߊ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ
+          ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
    changesets:
    changesets:
-    changeset_paging_nav:
-      showing_page: ߞߐߜߍ %{page}
-      next: ߟߊ߬ߕߎ߲߰ߠߊ»
-      previous: ߟߊ߬ߕߎ߲߰ߠߊ ߟߎ߬
      changeset:
      changeset:
-      anonymous: ߕߐ߯ߒߕߊ߲
        no_edits: (ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬)
        view_changeset_details: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲ ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
        no_edits: (ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬)
        view_changeset_details: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲ ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
-    changesets:
-      id: ID
-      saved_at: ߊ߬ ߓߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
-      user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
-      comment: ߡߙߌߣߊ߲
-      area: ߦߙߐ
      index:
        title: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߡߊߝߊ߬ߟߋ߲߫
        title_user: '%{user} ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫'
      index:
        title: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߡߊߝߊ߬ߟߋ߲߫
        title_user: '%{user} ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫'
+      title_user_link_html: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ %{user_link} ߓߟߏ߫
        title_friend: ߒ ߕߋߙߌ ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
        title_nearby: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߡߍ߲ ߟߊߘߏ߲߬ߣߍ߲߫ ߛߌ߬ߢߐ߲߰ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߓߟߏ߫
        empty: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
        title_friend: ߒ ߕߋߙߌ ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
        title_nearby: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߡߍ߲ ߟߊߘߏ߲߬ߣߍ߲߫ ߛߌ߬ߢߐ߲߰ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߓߟߏ߫
        empty: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
@@ -348,12 +380,41 @@ nqo:
        no_more_area: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߣߌ߲߬ ߘߐ߫.
        no_more_user: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߟߊߘߏ߲߬ߣߍ߲߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫
        load_more: ߘߏߜߘߍ߫ ߟߎ߫ ߟߊߢߎ߲߫
        no_more_area: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߣߌ߲߬ ߘߐ߫.
        no_more_user: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߟߊߘߏ߲߬ߣߍ߲߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫
        load_more: ߘߏߜߘߍ߫ ߟߎ߫ ߟߊߢߎ߲߫
+      feed:
+        title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id}
+        title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
+        created: ߛߌ߲ߘߌߣߍ߲
+        closed: ߘߊߕߎ߲߯ߣߍ߲
+        belongs_to: ߛߓߍߦߟߊ
+    show:
+      title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}'
+      created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago}
+      closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago}
+      created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫
+      closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫
+      discussion: ߘߊߘߐߖߊߥߏ
+      join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
+      still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
+        ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
+      subscribe: ߊ߬ ߡߊߝߘߎ߫
+      unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫
+      comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
+      hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
+      hide_comment: ߊ߬ ߢߡߊߘߏ߲߰
+      unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫
+      comment: ߡߙߌߣߊ߲
+      changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+      osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
+    paging_nav:
+      nodes: ߥߎߙߋ߲ߛߋ߲ %{count}
+      nodes_paginated: ߥߎߙߋ߲ߛߋ߲ %{x}-%{y} ߦߋ߫ %{count}
+      ways: ߛߌߟߊ (%{count})
+      ways_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count})
+      relations: ߕߍߓߊ߯ߦߊ (%{count})
+      relations_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
      timeout:
        sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ ߘߐ߫ ߌ ߓߟߏ߫߸
          ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
      timeout:
        sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ ߘߐ߫ ߌ ߓߟߏ߫߸
          ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
-  changeset_comments:
-    comment:
-      commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
    dashboards:
      contact:
        km away: ߞߎߘߍ %{count} ߝߏ߬ߣߊ߲ ߠߊ߫
    dashboards:
      contact:
        km away: ߞߎߘߍ %{count} ߝߏ߬ߣߊ߲ ߠߊ߫
@@ -388,9 +449,8 @@ nqo:
        new_title: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ߫ ߛߏ߯ߙߏ߫ ߒ ߕߋ߬ߟߋ߲ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߘߐ߫
        my_diary: ߒ ߕߋ߬ߟߋ߲
        no_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ߬ ߟߎ߬ ߕߴߦߋ߲߬
        new_title: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ߫ ߛߏ߯ߙߏ߫ ߒ ߕߋ߬ߟߋ߲ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߘߐ߫
        my_diary: ߒ ߕߋ߬ߟߋ߲
        no_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ߬ ߟߎ߬ ߕߴߦߋ߲߬
+    page:
        recent_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ ߞߐߟߕߊ ߟߎ߬
        recent_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ ߞߐߟߕߊ ߟߎ߬
-      older_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߞߘߐ߬ߡߊ߲ ߠߎ߬
-      newer_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊߟߡߊ ߟߎ߬
      edit:
        title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߦߟߍ߬ߡߊ߲߫
        marker_text: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߌ߲߬ߞߌߙߊ ߟߎ߬
      edit:
        title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߦߟߍ߬ߡߊ߲߫
        marker_text: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߌ߲߬ߞߌߙߊ ߟߎ߬
@@ -404,11 +464,12 @@ nqo:
        title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬
        heading: 'ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬ id: %{id} ߘߌ߫'
      diary_entry:
        title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬
        heading: 'ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬ id: %{id} ߘߌ߫'
      diary_entry:
-      posted_by_html: ߊ߬ ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{link_user} ߓߟߏ߫ %{created} %{language_link}
-        ß\9fß\8bß¬ ß\9eß\8aß²ß¬
+      posted_by_html: ߊ߬ ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{link_user} ߓߟߏ߫ %{created} ߦߋ߫ %{language_link}
+        ß\9fß\8bß¬ ß\98ß\90ß«
        updated_at_html: ߟߊ߬ߞߎ߬ߘߦߊ߬ߟߌ߬ ߞߐߟߕߊ %{updated} ߘߐ߫
        comment_link: ߡߙߌߣߊ߲ ߡߍ߲ ߦߋ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߠߊ߫
        reply_link: ߗߋߛߓߍ ߗߋ߫ ߛߓߍߦߟߊ ߡߊ߬
        updated_at_html: ߟߊ߬ߞߎ߬ߘߦߊ߬ߟߌ߬ ߞߐߟߕߊ %{updated} ߘߐ߫
        comment_link: ߡߙߌߣߊ߲ ߡߍ߲ ߦߋ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߠߊ߫
        reply_link: ߗߋߛߓߍ ߗߋ߫ ߛߓߍߦߟߊ ߡߊ߬
+      no_comments: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߕߴߦߋ߲߬
        edit_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߡߊߦߟߍ߬ߡߊ߲߫
        hide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰
        unhide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰ߣߍ߲ ߓߐ߫
        edit_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߡߊߦߟߍ߬ߡߊ߲߫
        hide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰
        unhide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰ߣߍ߲ ߓߐ߫
@@ -422,8 +483,6 @@ nqo:
        report: ߡߙߌߣߊ߲ ߣߌ߲߬ ߠߊߞߏߝߐ߫
      location:
        location: 'ߘߌ߲߬ߞߌߙߊ:'
        report: ߡߙߌߣߊ߲ ߣߌ߲߬ ߠߊߞߏߝߐ߫
      location:
        location: 'ߘߌ߲߬ߞߌߙߊ:'
-      view: ߦߌ߬ߘߊ߬ߟߌ
-      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
      feed:
        user:
          title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ %{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
      feed:
        user:
          title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ %{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
@@ -435,21 +494,30 @@ nqo:
        all:
          title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
          description: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߞߊ߲߬
        all:
          title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
          description: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߞߊ߲߬
-    comments:
+  diary_comments:
+    index:
        title: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫
        heading: '%{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߠߎ߬'
        subheading_html: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫
        no_comments: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߕߴߦߋ߲߬
        title: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫
        heading: '%{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߠߎ߬'
        subheading_html: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫
        no_comments: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߕߴߦߋ߲߬
+    page:
        post: ߗߋߓߏ߲
        when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
        comment: ߡߙߌߣߊ߲ߦߌߘߊ
        post: ߗߋߓߏ߲
        when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
        comment: ߡߙߌߣߊ߲ߦߌߘߊ
-      newer_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
-      older_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
    doorkeeper:
      flash:
        applications:
          create:
            notice: ߟߥߊ߬ߟߌ߬ߟߌ ߓߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
    doorkeeper:
      flash:
        applications:
          create:
            notice: ߟߥߊ߬ߟߌ߬ߟߌ ߓߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
+  errors:
+    contact:
+      contact: ߛߊ߲߬ߓߊ߬ߕߐ߮
+    forbidden:
+      title: ߟߊߕߐ߲ߣߍ߲߫
+    internal_server_error:
+      title: ߟߥߊ߬ߟߌ߬ߟߌ ߝߎ߬ߕߎ߲߬ߕߌ
+    not_found:
+      title: ߞߐߕߐ߮ ߡߊ߬ ߛߐ߬ߘߐ߲߬
    friendships:
      make_friend:
        heading: ' ߞߊ߬ %{user} ߞߍ߫ ߌ ߕߋߙߌ ߘߌ߫؟'
    friendships:
      make_friend:
        heading: ' ߞߊ߬ %{user} ߞߍ߫ ߌ ߕߋߙߌ ߘߌ߫؟'
@@ -467,36 +535,40 @@ nqo:
    geocoder:
      search:
        title:
    geocoder:
      search:
        title:
-        latlon_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="https://openstreetmap.org/">ߞߣߐߟߊ</a>
-        ca_postcode_html: ߞߐߝߟߌ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ <a href="https://geocoder.ca/">ߘߎ߱ߘߏߞߊ߲</a>
-        osm_nominatim_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="https://nominatim.openstreetmap.org/">ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ</a>
-          ߟߊ߫
-        geonames_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="http://www.geonames.org/">ߘߎ߱ߕߐ߮</a>
-          ߟߊ߫
-        osm_nominatim_reverse_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="https://nominatim.openstreetmap.org/">ߕߐ߯ߦߊߟߌ</a>
-          ߟߊ߫
-        geonames_reverse_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="http://www.geonames.org/">ߘߎ߱ߕߐ߮</a>
+        latlon: ߞߣߐߟߊ
      search_osm_nominatim:
        prefix:
          aerialway:
            cable_car: ߘߎ߲ߞߎߟߎ߲
            chair_lift: ߥߎߟߊߛߌ߯ߝߋ߲
      search_osm_nominatim:
        prefix:
          aerialway:
            cable_car: ߘߎ߲ߞߎߟߎ߲
            chair_lift: ߥߎߟߊߛߌ߯ߝߋ߲
+          drag_lift: ߕߣߍ߬ߣߍ߬ߡߟߊߡߟߊ
+          gondola: ߖߟߎ߬ߞߎߟߎ߲
+          magic_carpet: ߘߎ߰ߓߍ߲߬ ߞߘߎߞߘߎߟߊ
+          platter: ߕߊ߬ߢߍ߲ߞߍߘߍ߲
+          pylon: ߟߐ߲
+          station: ߘߎ߲ߞߎߟߎ߲ ߟߐ߬ߘߊ߮
+          "yes": ߛߊ߲ߡߊ߫ ߛߌߟߊ (ߘߎ߲ߞߎߟߎ߲)
          aeroway:
          aeroway:
-          gate: ߘߏ߲߬ߘߊ
+          aerodrome: ߛߊ߲ߡߊߞߎߟߎ߲߫ ߜߘߋ
+          airstrip: ߖߌ߰ߟߌ߬ ߜߘߋ (ߛߊ߲ߡߊߞߎߟߎ߲)
+          gate: ߛߊ߲ߡߊߘߊ߲ ߘߏ߲߬ߘߊ
            hangar: ߜߕߊ
            helipad: ߛߊ߲ߡߊߘߊ߲
            holding_position: ߛߊ߲ߡߊߘߊ߲߫ ߦߙߐ
            hangar: ߜߕߊ
            helipad: ߛߊ߲ߡߊߘߊ߲
            holding_position: ߛߊ߲ߡߊߘߊ߲߫ ߦߙߐ
-          navigationaid: ß\9bß\8aß²ß¡ß\8aß\98ß\8aß² ß\9bß\8fß¯ß\93ß\8aß\9fß\8c ߘߍ߬ߡߍ߲߬ߠߌ߲ ߠߎ߬
+          navigationaid: ß\9bß\8aß²ß¡ß\8aß\9eß\8eß\9fß\8eß² ß\96ß\8aß²ß\93ß\8aß²ß ß\8cß² ߘߍ߬ߡߍ߲߬ߠߌ߲ ߠߎ߬
            parking_position: ߟߐ߬ߟߌ ߘߌ߲߬ߞߌߙߊ
            runway: ߓߏ߬ߙߌ߬ ߛߌߟߊ
            taxilane: ߛߌߟߊ߫ ߡߊߡߌ߬ߘߊ߬ߣߍ߲ ߠߎ߬ ߞߐ߲߰ߛߏ ߛߙߊ߬ߕߊ ߦߋ߫
            taxiway: ߥߊߛߌߥߊߟߌ߫ ߛߌߟߊ
            parking_position: ߟߐ߬ߟߌ ߘߌ߲߬ߞߌߙߊ
            runway: ߓߏ߬ߙߌ߬ ߛߌߟߊ
            taxilane: ߛߌߟߊ߫ ߡߊߡߌ߬ߘߊ߬ߣߍ߲ ߠߎ߬ ߞߐ߲߰ߛߏ ߛߙߊ߬ߕߊ ߦߋ߫
            taxiway: ߥߊߛߌߥߊߟߌ߫ ߛߌߟߊ
-          terminal: ß\9fß\8aß¬ß\93ß\8aß²
+          terminal: ß\9bß\8aß²ß¡ß\8aß\98ß\8aß² ß\9eß\8eß²ß¬ß\9dß\8aß®
          amenity:
          amenity:
+          animal_boarding: ߓߌߦߊ߲߫ ߠߊߦߟߍ߫ ߦߌߟߊ
+          animal_shelter: ߓߌߦߊ߲ ߠߎ߬ ߥߊ߬ߣߊߙߌ
            arts_centre: ߞߎ߬ߛߊ߲߬ߧߊ ߕߊ߲ߓߊ߲
            bank: ߜߍߓߏ߲
            bar: ߡߌ߲߬ߓߏ߲
            bbq: BBQ
            arts_centre: ߞߎ߬ߛߊ߲߬ߧߊ ߕߊ߲ߓߊ߲
            bank: ߜߍߓߏ߲
            bar: ߡߌ߲߬ߓߏ߲
            bbq: BBQ
+          bench: ߛߌ߰ߟߊ߲
            bicycle_parking: ߣߍ߰ߛߏ߬ ߜߘߋ
            bicycle_rental: ߣߍ߰ߛߏ߬ ߛߎߝߙߎ
            bicycle_repair_station: ߣߍ߰ߛߏ߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
            bicycle_parking: ߣߍ߰ߛߏ߬ ߜߘߋ
            bicycle_rental: ߣߍ߰ߛߏ߬ ߛߎߝߙߎ
            bicycle_repair_station: ߣߍ߰ߛߏ߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
@@ -507,6 +579,7 @@ nqo:
            bus_station: ߞߎߟߎ߲ߓߏ߲߫ ߟߐ߫ ߦߙߐ
            cafe: ߞߊߝߋ
            car_rental: ߞߐ߲߬ߛߏ߬ ߛߎ߬ߝߙߎ߬ ߦߙߐ
            bus_station: ߞߎߟߎ߲ߓߏ߲߫ ߟߐ߫ ߦߙߐ
            cafe: ߞߊߝߋ
            car_rental: ߞߐ߲߬ߛߏ߬ ߛߎ߬ߝߙߎ߬ ߦߙߐ
+          car_sharing: ߘߍ߬ߒ߬ߡߊ߬ߞߐ߲ߛߏ
            car_wash: ߞߐ߲߬ߛߏ߬ ߞߏ߬ ߦߌߟߊ
            casino: ߞߊߛߌߣߏ
            childcare: ߘߋ߲ߣߍ߲߫ ߠߊߡߙߊ߫ ߦߌߟߊ
            car_wash: ߞߐ߲߬ߛߏ߬ ߞߏ߬ ߦߌߟߊ
            casino: ߞߊߛߌߣߏ
            childcare: ߘߋ߲ߣߍ߲߫ ߠߊߡߙߊ߫ ߦߌߟߊ
@@ -519,13 +592,18 @@ nqo:
            drinking_water: ߖߌ߫ ߡߌ߲߬ߕߊ
            driving_school: ߞߐ߲߬ߛߏ߬ ߞߊߙߊ߲ߕߊ
            embassy: ߟߊ߬ߛߌ߰ߘߊ
            drinking_water: ߖߌ߫ ߡߌ߲߬ߕߊ
            driving_school: ߞߐ߲߬ߛߏ߬ ߞߊߙߊ߲ߕߊ
            embassy: ߟߊ߬ߛߌ߰ߘߊ
+          fast_food: ߛߎ߬ߡߊ߲߬ ߞߊߟߌ߲
+          ferry_terminal: ߝߋ߰ߙߌ ߘߊ߲߬ߦߙߐ
            fire_station: ߕߊ߫ ߟߊߛߟߊ ߟߎ߬
            fountain: ߕߋ߲߬ߞߋ
            fire_station: ߕߊ߫ ߟߊߛߟߊ ߟߎ߬
            fountain: ߕߋ߲߬ߞߋ
-          fuel: ߖߋ߬ߣߌ߲߬ߕߊ
+          fuel: ߖߋ߬ߣߌ߲߬ߕߊ ߝߊߝߊ
            gambling: ߣߊ߲߬ߞߊ߬ߡߎ߲߬ߣߊ߲ߞߊߡߎ߲
            grave_yard: ߞߊߓߙߎߟߏ
            hospital: ߘߊ߲ߘߊߛߏ
            gambling: ߣߊ߲߬ߞߊ߬ߡߎ߲߬ߣߊ߲ߞߊߡߎ߲
            grave_yard: ߞߊߓߙߎߟߏ
            hospital: ߘߊ߲ߘߊߛߏ
+          hunting_stand: ߟߐ߬ ߞߊ߬ ߓߏ߲
+          ice_cream: ߣߍߣߍߞߓߊ
            internet_cafe: ߓߟߐߟߐ߫ ߞߊߝߋ
            internet_cafe: ߓߟߐߟߐ߫ ߞߊߝߋ
+          kindergarten: ߘߡߊߞߟߏ߫ ߞߊߙߊ߲ߕߊ
            language_school: ߞߊ߲߫ ߞߊߙߊ߲ߕߊ
            library: ߛߓߍߘߊ
            love_hotel: ߦߙߊ߬ߓߌ ߖߌ߬ߦߊ߬ߓߏ߲
            language_school: ߞߊ߲߫ ߞߊߙߊ߲ߕߊ
            library: ߛߓߍߘߊ
            love_hotel: ߦߙߊ߬ߓߌ ߖߌ߬ߦߊ߬ߓߏ߲
@@ -547,9 +625,13 @@ nqo:
            public_bath: ߝߘߏ߬ߓߊ߬ ߞߏ߬ߦߙߐ
            public_bookcase: ߝߘߏ߬ߓߊ߬ ߛߓߍߘߊ
            public_building: ߝߘߏ߬ߓߊ߬ ߓߏ߲
            public_bath: ߝߘߏ߬ߓߊ߬ ߞߏ߬ߦߙߐ
            public_bookcase: ߝߘߏ߬ߓߊ߬ ߛߓߍߘߊ
            public_building: ߝߘߏ߬ߓߊ߬ ߓߏ߲
+          recycling: ߟߊ߬ߞߎ߬ߘߦߊ߬ߟߌ߫ ߘߊߞߎ߲ (recyclage)
            restaurant: ߘߊߥߎ߲ߠߌ߲߫ ߦߙߐ
            school: ߞߊ߬ߙߊ߲߬ߕߊ
            restaurant: ߘߊߥߎ߲ߠߌ߲߫ ߦߙߐ
            school: ߞߊ߬ߙߊ߲߬ߕߊ
+          shelter: ߥߊ߬ߣߊߙߌ
            shower: ߢߍ߲߮
            shower: ߢߍ߲߮
+          social_centre: ߘߍ߬ߘߐ߬ߞߏ ߟߎ߫ ߕߊ߲ߓߊ߲
+          social_facility: ߘߍ߬ߢߐ߲߰ߦߊ߬ ߗߋߘߊ \ ߓߊ߬ߛߊ߲߬ߢߐ߲߰ߘߐ߬ ߘߊߞߎ߲
            studio: ߓߟߏߦߊߛߏ
            swimming_pool: ߣߊߡߎ߲ߠߌ߲߫ ߘߟߊ
            taxi: ߥߊߟߌߥߊߟߌ
            studio: ߓߟߏߦߊߛߏ
            swimming_pool: ߣߊߡߎ߲ߠߌ߲߫ ߘߟߊ
            taxi: ߥߊߟߌߥߊߟߌ
@@ -558,15 +640,19 @@ nqo:
            toilets: ߢߍ߲߮
            townhall: ߛߏߕߌ߯ߘߊ
            university: ߖߊ߯ߓߘߊ
            toilets: ߢߍ߲߮
            townhall: ߛߏߕߌ߯ߘߊ
            university: ߖߊ߯ߓߘߊ
+          vehicle_inspection: ߓߏ߬ߙߌ߬ߝߋ߲߬ ߝߛߍ߬ߝߛߍ߫ ߦߌߟߊ
+          vending_machine: ߝߋ߰ߙߋ߬ߞߍ߬ ߕߙߏߞߏ
            veterinary: ߓߌߦߊ߲ߘߊ߲ߘߟߊ ߘߐ߬ߓߛߏ߬ߟߌ
            village_hall: ߕߏ߯ߘߊ ߛߏߕߌ߯ߟߊ߫
            waste_basket: ߢߡߊ߬ߞߍ߬ߝߋ߲
            waste_disposal: ߢߡߊ߬ߘߊ߲߬ߘߊ߫ ߦߌߟߊ
            waste_dump_site: ߛߎ߬ߣߎ߲߬ߞߎ߲
            veterinary: ߓߌߦߊ߲ߘߊ߲ߘߟߊ ߘߐ߬ߓߛߏ߬ߟߌ
            village_hall: ߕߏ߯ߘߊ ߛߏߕߌ߯ߟߊ߫
            waste_basket: ߢߡߊ߬ߞߍ߬ߝߋ߲
            waste_disposal: ߢߡߊ߬ߘߊ߲߬ߘߊ߫ ߦߌߟߊ
            waste_dump_site: ߛߎ߬ߣߎ߲߬ߞߎ߲
+          watering_place: ߖߌߡߊ߫ ߦߙߐ
            water_point: ߖߌ߫ ߡߊ߫ ߦߙߐ
            weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲
          boundary:
            administrative: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
            water_point: ߖߌ߫ ߡߊ߫ ߦߙߐ
            weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲
          boundary:
            administrative: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
+          political: ߛߎߥߊ߲ߘߟߌ ߓߐߕߏ߲
            protected_area: ߦߙߐ߫ ߟߊߞߊ߲ߘߊߣߍ߲
            "yes": ߓߐߕߏ߲
          bridge:
            protected_area: ߦߙߐ߫ ߟߊߞߊ߲ߘߊߣߍ߲
            "yes": ߓߐߕߏ߲
          bridge:
@@ -578,26 +664,53 @@ nqo:
            commercial: ߖߎ߬ߟߦߊ ߓߏ߲
            construction: ߓߏ߲ ߡߍ߲ ߦߋ߫ ߟߐ߬ߟߌ ߘߊߞߘߐ߫
            farm: ߛߣߍ߬ߘߐ߬ ߟߎ
            commercial: ߖߎ߬ߟߦߊ ߓߏ߲
            construction: ߓߏ߲ ߡߍ߲ ߦߋ߫ ߟߐ߬ߟߌ ߘߊߞߘߐ߫
            farm: ߛߣߍ߬ߘߐ߬ ߟߎ
+          garage: ߘߐ߬ߓߍ߲߬ߘߊ
+          garages: ߘߐ߬ߓߍ߲߬ߘߊ
+          greenhouse: ߥߟߊߞߘߊߡߊ
            hangar: ߜߕߊ
            hospital: ߘߊ߲ߘߊߛߏ ߓߏ߲
            hotel: ߖߌ߬ߦߊ߬ߓߏ߲
            house: ߟߎ
            hangar: ߜߕߊ
            hospital: ߘߊ߲ߘߊߛߏ ߓߏ߲
            hotel: ߖߌ߬ߦߊ߬ߓߏ߲
            house: ߟߎ
+          houseboat: ߝߎ߲ߓߏ߲
+          hut: ߓߎ߭ (ߖߐ߲߬ߞߐ\ߕߏ߮)
            industrial: ߝߊ߲ߓߏ߲ ߓߏ߲
            kindergarten: ߘߋߣߍ߲߫ ߓߘߎߓߘߎ߫ ߞߊߙߊ߲ߕߊ
            manufacture: ߝߊ߲ߓߏ߲
            office: ߛߓߍߘߊ߫ ߓߏ߲
            public: ߝߘߏ߬ߓߊ߬ ߓߏ߲
            residential: ߡߊ߬ߞߍ߬ߦߙߐ߬ ߓߏ߲
            industrial: ߝߊ߲ߓߏ߲ ߓߏ߲
            kindergarten: ߘߋߣߍ߲߫ ߓߘߎߓߘߎ߫ ߞߊߙߊ߲ߕߊ
            manufacture: ߝߊ߲ߓߏ߲
            office: ߛߓߍߘߊ߫ ߓߏ߲
            public: ߝߘߏ߬ߓߊ߬ ߓߏ߲
            residential: ߡߊ߬ߞߍ߬ߦߙߐ߬ ߓߏ߲
+          retail: ߣߍ߰ߛߌߟߊ ߡߣߐ߬ߓߏ߲
+          roof: ߕߌߓߊ
+          ruins: ߓߏ߲߫ ߜߘߊ
            school: ߞߊ߬ߙߊ߲߬ߕߊ
            school: ߞߊ߬ߙߊ߲߬ߕߊ
+          train_station: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߘߊ߬ߟߊ߫ ߓߏ߲
            university: ߖߊ߯ߓߘߊ ߓߏ߲
            university: ߖߊ߯ߓߘߊ ߓߏ߲
+          warehouse: ߡߣߐ߬ߓߏ߲
+          "yes": ߓߏ߲
+        club:
+          sport: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ߫ ߛߘߍ
+          "yes": ߛߘߍ
          craft:
          craft:
+          beekeeper: ߟߞߌߛߍ߫ ߡߙߊߟߊ
+          blacksmith: ߣߎ߬ߡߎ߲
+          brewery: ߢߐ߬ߘߟߐ߬ ߝߊ߲ߓߏ߲
+          carpenter: ߓߏ߲߫ ߜߊ߲ߜߊ߲ߠߊ \ ߦߙߌߛߊ߯ߟߊ
+          dressmaker: ߞߙߊߟߌߟߊ
            electrician: ߢߎߡߍߦߟߊ
            electronics_repair: ߢߎߡߍ߫ ߘߐߓߍ߲߫ ߦߙߐ
            electrician: ߢߎߡߍߦߟߊ
            electronics_repair: ߢߎߡߍ߫ ߘߐߓߍ߲߫ ߦߙߐ
+          gardener: ߣߊߞߐߦߟߊ
+          glaziery: ߘߎ߬ߡߊ (ߝ߭ߌߕߙߌ) ߓߊ߯ߙߊ߫ ߦߙߐ
+          handicraft: ߓߟߏߟߊߓߊ߯ߙߟߊ
+          hvac: ߓߊ߲ߘߦߊߟߊ߲߫ ߟߊߘߊ߲߫ ߦߙߐ
+          metal_construction: ߣߍ߰ߘߐ߬ߓߍ߲߬ߠߊ\ߟߊߘߊ߲ߠߊ
            painter: ߓߐߙߐ߲ߦߟߊ
            photographer: ߖߌ߬ߦߕߊ߬ߟߊ
            plumber: ߘߎ߰ߡߊ߬ߟߊ߬ߟߊ
            painter: ߓߐߙߐ߲ߦߟߊ
            photographer: ߖߌ߬ߦߕߊ߬ߟߊ
            plumber: ߘߎ߰ߡߊ߬ߟߊ߬ߟߊ
+          sawmill: ߦߙߌߛߌ߯ߘߊ \ ߦߙߌߕߋߘߊ
            shoemaker: ߛߊ߬ߡߘߊ߬ ߘߐ߬ߓߍ߲߬ߠߊ
            shoemaker: ߛߊ߬ߡߘߊ߬ ߘߐ߬ߓߍ߲߬ߠߊ
+          stonemason: ߓߐ߰ߟߐ߬ߟߊ \ ߓߏ߲ߟߐߟߊ
            tailor: ߞߙߊߟߌߟߊ
            tailor: ߞߙߊߟߌߟߊ
+          window_construction: ߝߢߐߘߊ߫ ߟߊߘߊ߲ߠߊ
          emergency:
            fire_extinguisher: ߕߊ߫ ߟߛߊߟߊ
            fire_water_pond: ߕߟߊߛߊ߫ ߝߌߙߏ߲
          emergency:
            fire_extinguisher: ߕߊ߫ ߟߛߊߟߊ
            fire_water_pond: ߕߟߊߛߊ߫ ߝߌߙߏ߲
@@ -608,7 +721,10 @@ nqo:
            bus_stop: ߞߎߟߎ߲ߓߏ߲߫ ߘߟߐߦߙߐ
            construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
            living_street: ߛߏߞߣߐ߫ ߛߌߟߊ
            bus_stop: ߞߎߟߎ߲ߓߏ߲߫ ߘߟߐߦߙߐ
            construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
            living_street: ߛߏߞߣߐ߫ ߛߌߟߊ
+          motorway: ߝߏ߲߬ߘߏ
+          passing_place: ߕߊ߬ߡߌ߲߬ ߦߌߟߊ
            path: ߛߌߟߊ
            path: ߛߌߟߊ
+          pedestrian: ߛߋ߲߬ߡߊ߬ ߛߌߟߊ
            primary: ߛߌߟߊ ߓߊߖߎߟߞߊ
            primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ
            proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲
            primary: ߛߌߟߊ ߓߊߖߎߟߞߊ
            primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ
            proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲
@@ -621,7 +737,10 @@ nqo:
            service: ߗߋߘߊ߫ ߛߌߟߊ
            speed_camera: ߞߊߟߌߦߊ ߖߊ߬ߛߏ߲߬ߟߊ߲
            steps: ߛߊ߲߬ߞߊ߬ߛߊ߲ߞߊ
            service: ߗߋߘߊ߫ ߛߌߟߊ
            speed_camera: ߞߊߟߌߦߊ ߖߊ߬ߛߏ߲߬ߟߊ߲
            steps: ߛߊ߲߬ߞߊ߬ߛߊ߲ߞߊ
+          stop: ߟߐ߬ߟߌ߬ ߛߙߋ
            street_lamp: ߝߏ߲߬ߘߏ߬ߞߊ߲߬ ߡߟߍߞߘߍ
            street_lamp: ߝߏ߲߬ߘߏ߬ߞߊ߲߬ ߡߟߍߞߘߍ
+          traffic_signals: ߛߌߟߊ ߖߌ߰ߣߌ߬ߦߟߍ߫ ߞߐ߯ߙߍߦߊ
+          trailhead: ߥߟߌ߬ ߦߙߐ
            unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
            "yes": ߛߌߟߊ
          historic:
            unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
            "yes": ߛߌߟߊ
          historic:
@@ -630,12 +749,16 @@ nqo:
            bomb_crater: ߘߐ߬ߝߐ ߝߏߘߏ߲ ߝߏ߲ߝߊ߲
            battlefield: ߞߟߊߘߊ
            boundary_stone: ߓߐߕߏ߲ ߘߊ߲߬ߞߓߊ
            bomb_crater: ߘߐ߬ߝߐ ߝߏߘߏ߲ ߝߏ߲ߝߊ߲
            battlefield: ߞߟߊߘߊ
            boundary_stone: ߓߐߕߏ߲ ߘߊ߲߬ߞߓߊ
+          building: ߓߏ߲߫ ߞߘߐߞߘߐ
            castle: ߖߌ߲߬ߓߏ߲
            church: ߓߊ߬ߕߏ߬ߓߏ߲
            castle: ߖߌ߲߬ߓߏ߲
            church: ߓߊ߬ߕߏ߬ߓߏ߲
+          heritage: ߞߍߦߙߐ \ ߝߘߏ߬ߓߊ߬ߗߍ߮
            house: ߟߎ
            mine: ߘߊ߬ߡߊ߲
            monument: ߝߙߎߕߎ
            railway: ߣߍ߰ߛߌߟߊ ߘߝߐ߬ߡߊ
            house: ߟߎ
            mine: ߘߊ߬ߡߊ߲
            monument: ߝߙߎߕߎ
            railway: ߣߍ߰ߛߌߟߊ ߘߝߐ߬ߡߊ
+          ruins: ߕߏ߲ߓߏ߲
+          rune_stone: ߕߏ߲ߓߏ߲߫ ߞߓߊ
            stone: ߞߓߊ
            tomb: ߛߊ߬ߙߌ
            tower: ߛߊ߲ߓߏ߲
            stone: ߞߓߊ
            tomb: ߛߊ߬ߙߌ
            tower: ߛߊ߲ߓߏ߲
@@ -644,26 +767,39 @@ nqo:
            "yes": ߓߍ߲߬ߕߍ
          landuse:
            cemetery: ߛߊ߬ߙߌ߬ߟߏ
            "yes": ߓߍ߲߬ߕߍ
          landuse:
            cemetery: ߛߊ߬ߙߌ߬ߟߏ
-          farm: ߝߏ߬ߘߏ
+          commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
+          conservation: ߦߙߐ߫ ߟߊߕߏߣߍ߲ \ ߟߊߡߙߊ߬ߣߍ߲
+          construction: ߟߐ߬ߟߌ߬ ߘߊߞߎ߲
+          farmland: ߛߣߍ߬ߞߍ߬ ߘߊߞߎ߲ \ ߝߏ߬ߘߏ
+          farmyard: ߝߏ߬ߘߏ \ ߖߛߊ \ ߥߍ߫ߙߍ
            forest: ߕߎ
            forest: ߕߎ
+          garages: ߘߐ߬ߓߍ߲߬ߘߊ
+          grass: ߓߌ߲ \ ߖߍߥߎߟߍ
+          industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
            military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
            mine: ߘߊ߬ߡߊ߲
            railway: ߣߍ߰ߛߌߟߊ
          leisure:
            fishing: ߘߏߟߋ߲ߓߌߟߊ߫ ߦߙߐ
            fitness_centre: ߞߍ߲ߘߍߦߊ ߕߊ߲ߓߊ߲
            military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
            mine: ߘߊ߬ߡߊ߲
            railway: ߣߍ߰ߛߌߟߊ
          leisure:
            fishing: ߘߏߟߋ߲ߓߌߟߊ߫ ߦߙߐ
            fitness_centre: ߞߍ߲ߘߍߦߊ ߕߊ߲ߓߊ߲
+          fitness_station: ߘߊ߲ߘߊߟߌ ߕߏ߲߬ߜߏ
            garden: ߣߊߞߐ
            garden: ߣߊߞߐ
-          horse_riding: ß\9bß\8fß¬ ß\93ß\8fß\99ß\8c
+          horse_riding: ß\9bß\8fß¬ ß\93ß\8fß¬ß\99ß\8cß« ß\9eß£ß\8d
            nature_reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
            park: ߖߛߊ ߥߟߊ߫ ߥߍ߬ߙߍ
            sports_centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
            stadium: ߞߊߡߊ߲
            swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ
          man_made:
            nature_reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
            park: ߖߛߊ ߥߟߊ߫ ߥߍ߬ߙߍ
            sports_centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
            stadium: ߞߊߡߊ߲
            swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ
          man_made:
+          beehive: ߜߏ߲߬ߞߊ߲
            bridge: ߛߍ߲
            bridge: ߛߍ߲
+          cross: ߓߊߙߊ߲ߕߏ߲
            mine: ߘߊ߬ߡߊ߲
            telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲
            tower: ߛߊ߲ߓߏ߲
            mine: ߘߊ߬ߡߊ߲
            telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲
            tower: ߛߊ߲ߓߏ߲
+          wastewater_plant: ߖߌ߫ ߣߐ߯ ߛߍ߲ߛߍ߲߫ ߦߌߟߊ
+          watermill: ߖߌߡߣߐ
+          water_tap: ߖߌߓߘߎ
            water_tower: ߖߌߡߣߐ
            water_well: ߊ߬ ߞߊߢߌ߲߬
            water_works: ߖߌ߫ ߓߊ߯ߙߊ
            water_tower: ߖߌߡߣߐ
            water_well: ߊ߬ ߞߊߢߌ߲߬
            water_works: ߖߌ߫ ߓߊ߯ߙߊ
@@ -672,23 +808,39 @@ nqo:
            "yes": ߡߐ߱ ߛߌ߲ߘߟߌߣߐ
          military:
            airfield: ߣߊ߲߬ߕߌ߰ ߛߊ߲ߡߊߘߊ߲
            "yes": ߡߐ߱ ߛߌ߲ߘߟߌߣߐ
          military:
            airfield: ߣߊ߲߬ߕߌ߰ ߛߊ߲ߡߊߘߊ߲
+          barracks: ߘߊ߮
+          "yes": ߛߏ߬ߙߌ߬ߡߊ߬ߘߋ߲
          natural:
          natural:
+          cape: ߜߙߋߞߎ߲
+          cave_entrance: ߝߊߟߊ߲ ߘߏ߲߬ߘߊ
            forest: ߕߎ
            hill: ߞߎ߬ߙߎ
            island: ߕߌ߲
            forest: ߕߎ
            hill: ߞߎ߬ߙߎ
            island: ߕߌ߲
+          land: ߘߎ߱
+          marsh: ߖߌߓߛߍ
+          mud: ߓߐ߭
+          peak: ߞߎ߲߬ߕߍ
+          peninsula: ߕߌ߲ߡߎߣߎ߲
            point: ߕߏ߲ߘߋ
            sand: ߕߌ߬ߢߍ
            point: ߕߏ߲ߘߋ
            sand: ߕߌ߬ߢߍ
+          stone: ߞߓߊ
+          strait: ߕߟߍ
            tree: ߦߙߌߖߎ
            tree: ߦߙߌߖߎ
+          tree_row: ߦߙߌ߫ ߛߝߊ
            valley: ߝߏ߲ߝߊ߲
            valley: ߝߏ߲ߝߊ߲
+          volcano: ߕߊߞߙߎ
            water: ߖߌ
            wetland: ߦߙߐ߫ ߦߌߟߌ߲ߣߍ߲
            wood: ߦߙߌ
            water: ߖߌ
            wetland: ߦߙߐ߫ ߦߌߟߌ߲ߣߍ߲
            wood: ߦߙߌ
+          "yes": ߛߎ߲ߞߎ߲ ߝߌ߬ߛߌ
          office:
            company: ߖߊ߬ߥߏ߬ߘߊ
            diplomatic: ߕߍߓߊ߯ߦߊ ߛߓߍߘߊ
            educational_institution: ߟߊ߬ߞߙߐ߬ߛߌ߬ߟߌ ߘߋ߬ߙߌ߬ߘߊ
            employment_agency: ߓߊ߯ߙߊ ߖߋ߬ߕߌ߰ߘߊ
          office:
            company: ߖߊ߬ߥߏ߬ߘߊ
            diplomatic: ߕߍߓߊ߯ߦߊ ߛߓߍߘߊ
            educational_institution: ߟߊ߬ߞߙߐ߬ߛߌ߬ߟߌ ߘߋ߬ߙߌ߬ߘߊ
            employment_agency: ߓߊ߯ߙߊ ߖߋ߬ߕߌ߰ߘߊ
+          financial: ߣߊ߲߬ߝߟߏ߬ߦߊ߬ߟߌ ߛߓߍߘߊ
            government: ߞߎ߲߬ߠߊ߬ߛߌ߮ ߟߊ߫ ߛߓߍߘߊ
            government: ߞߎ߲߬ߠߊ߬ߛߌ߮ ߟߊ߫ ߛߓߍߘߊ
+          insurance: ߟߊ߬ߘߍ߲߬ߞߣߍ߬ߦߊ߬ߟߌ ߛߓߍߘߊ
            it: ߕߞ ߛߓߍߘߊ
            lawyer: ߟߊ߬ߝߛߊ߬ߟߌ߬ߟߊ
            logistics: ߕߞߌߦߊ ߛߓߍߘߊ
            it: ߕߞ ߛߓߍߘߊ
            lawyer: ߟߊ߬ߝߛߊ߬ߟߌ߬ߟߊ
            logistics: ߕߞߌߦߊ ߛߓߍߘߊ
@@ -721,23 +873,40 @@ nqo:
            construction: ߣߍ߰ߛߌߟߊ ߡߍ߲ ߦߋ߫ ߓߏ߲߫ ߟߐ߬ߣߍ߲ ߠߎ߬ ߞߘߐ߫
            halt: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
            junction: ߣߍ߰ߛߌߟߊ ߓߍ߲߬ߕߍ
            construction: ߣߍ߰ߛߌߟߊ ߡߍ߲ ߦߋ߫ ߓߏ߲߫ ߟߐ߬ߣߍ߲ ߠߎ߬ ߞߘߐ߫
            halt: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
            junction: ߣߍ߰ߛߌߟߊ ߓߍ߲߬ߕߍ
+          light_rail: ߣߍ߰ߛߌ߬ߟߊ߫ ߡߊ߲ߞߊ߲
+          miniature: ߣߍ߰ߛߌ߬ߟߊ߫ ߡߌߛߍ߲
+          preserved: ߣߍ߰ߛߌ߬ߟߊ߬ ߟߊߞߊ߲ߘߊߣߍ߲
+          proposed: ߣߍ߰ߛߌߟߊ ߖߊ߬ߕߋ߬ߘߐ߬ߛߌ߰ߣߍ߲
+          rail: ߣߍ߰ߛߌߟߊ
+          spur: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
            station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
            stop: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
            subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
            station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
            stop: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
            subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
+          yard: ߣߍ߰ߛߌߟߊ ߝߍ߬ߟߊ
          shop:
          shop:
+          agrarian: ߛߣߍ߬ߞߍ߬ ߖߐ߰ߙߊ߲߬ ߝߎ߲ߞߎ߲
            art: ߞߎ߬ߛߊ߲߬ߧߊ ߛߎ߲ߞߎ߲
            bag: ߓߘߐ߬ ߝߎ߲ߞߎ߲
            bakery: ߓߙߎߜߊߛߌ߫ ߦߙߐ
            art: ߞߎ߬ߛߊ߲߬ߧߊ ߛߎ߲ߞߎ߲
            bag: ߓߘߐ߬ ߝߎ߲ߞߎ߲
            bakery: ߓߙߎߜߊߛߌ߫ ߦߙߐ
+          beauty: ߘߐ߬ߓߍ߲߬ߠߌ߲߬ߝߋ߲߫ ߝߎ߲ߞߎ߲
+          beverages: ߡߌ߲߬ߝߋ߲߬ ߝߎ߲ߞߎ߲
            bicycle: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
            books: ߞߝߊ߬ ߝߎ߲ߞߎ߲
            boutique: ߝߎ߲ߞߎ߲
            bicycle: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
            books: ߞߝߊ߬ ߝߎ߲ߞߎ߲
            boutique: ߝߎ߲ߞߎ߲
+          butcher: ߥߊ߬ߦߌ߬ߘߊ
            car: ߞߐ߲߬ߛߏ߬ ߝߎ߲ߞߎ߲
            car_parts: ߞߐ߲߬ߛߏ߬ ߖߐ߯ߙߊ߲
            car_repair: ߞߐ߲߬ߛߏ߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
            car: ߞߐ߲߬ߛߏ߬ ߝߎ߲ߞߎ߲
            car_parts: ߞߐ߲߬ߛߏ߬ ߖߐ߯ߙߊ߲
            car_repair: ߞߐ߲߬ߛߏ߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
+          carpet: ߘߎ߰ߓߍ߲߬ ߝߎ߲ߞߎ߲
+          chocolate: ߛߞߏߟߊ
            clothes: ߝߊ߰ߣߌ߲߬ ߝߎ߲ߞߎ߲
            coffee: ߞߊߝߋ߫ ߝߎ߲ߞߎ߲
            computer: ߕߟߋ߬ߓߊ߰ ߝߎ߲ߞߎ߲
            clothes: ߝߊ߰ߣߌ߲߬ ߝߎ߲ߞߎ߲
            coffee: ߞߊߝߋ߫ ߝߎ߲ߞߎ߲
            computer: ߕߟߋ߬ߓߊ߰ ߝߎ߲ߞߎ߲
+          copyshop: ߖߌ߬ߦߊ߬ߖߊ߬ߛߏ߲߬ ߝߎ߲ߞߎ߲
            cosmetics: ߡߊ߬ߡߎ߲߬ߕߟߎ ߝߎ߲ߞߎ߲
            cosmetics: ߡߊ߬ߡߎ߲߬ߕߟߎ ߝߎ߲ߞߎ߲
+          craft: ߓߟߏߟߊߓߊ߯ߙߟߊ ߟߎ߬ ߡߊߛߐ߫ ߝߎ߲ߞߎ߲
+          curtain: ߥߊ߲߬ߥߊ߲߬ ߝߎ߲ߞߎ߲
+          department_store: ߡߣߐ߬ߓߏ߲߬ ߓߊ
            doityourself: ߞߵߊ߬ ߞߴߌ ߖߘߍ߬ߦߋ߫
            e-cigarette: ߢߎߡߍߙߋ߲߫ ߛߙߊߡߟߋߞߋ ߝߎ߲ߞߎ߲
            electronics: ߢߎߡߍߙߋ߲߫ ߝߎ߲ߞߎ߲
            doityourself: ߞߵߊ߬ ߞߴߌ ߖߘߍ߬ߦߋ߫
            e-cigarette: ߢߎߡߍߙߋ߲߫ ߛߙߊߡߟߋߞߋ ߝߎ߲ߞߎ߲
            electronics: ߢߎߡߍߙߋ߲߫ ߝߎ߲ߞߎ߲
@@ -746,7 +915,12 @@ nqo:
            fashion: ߘߐ߬ߓߍ߲߬ߠߌ߲߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
            fishing: ߖߍ߯ ߡߌߘߊ߫ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
            food: ߛߎ߬ߡߊ߲߬ ߝߎ߲ߞߎ߲
            fashion: ߘߐ߬ߓߍ߲߬ߠߌ߲߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
            fishing: ߖߍ߯ ߡߌߘߊ߫ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
            food: ߛߎ߬ߡߊ߲߬ ߝߎ߲ߞߎ߲
+          frame: ߡߊ߬ߞߟߐ ߡߣߐ߬ߓߏ߲
            gas: ߥߊߦߌ߲߫ ߝߎ߲ߞߎ߲
            gas: ߥߊߦߌ߲߫ ߝߎ߲ߞߎ߲
+          general: ߢߌ߰ߡߌ߬ߢߊ߰ߡߊ߬ ߝߎ߲ߞߎ߲
+          gift: ߣߌ߬ߟߌ߫ ߝߎ߲ߞߎ߲
+          greengrocer: ߦߙߌߘߋ߲ ߣߌ߫ ߣߊߞߘߐߝߋ߲
+          grocery: ߣߟߊߞߍߝߋ߲߫ ߝߎ߲ߞߎ߲
            hairdresser: ߞߎ߲߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
            hardware: ߛߎ߲ߝߘߍ߫ ߝߎ߲ߞߎ߲
            health_food: ߞߍ߲ߘߍߦߊ߫ ߓߊߟߏ ߟߎ߬ ߝߎ߲ߞߎ߲
            hairdresser: ߞߎ߲߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
            hardware: ߛߎ߲ߝߘߍ߫ ߝߎ߲ߞߎ߲
            health_food: ߞߍ߲ߘߍߦߊ߫ ߓߊߟߏ ߟߎ߬ ߝߎ߲ߞߎ߲
@@ -758,7 +932,12 @@ nqo:
            music: ߘߐ߲߬ߞߟߌ ߝߎ߲ߞߎ߲
            musical_instrument: ߘߐ߲߬ߞߟߌ߬ߟߊ߬ ߡߎߙߊ߲ ߠߎ߬
            nutrition_supplements: ߛߎ߬ߡߊ߲߬ ߡߊ߬ߛߐ߬ߟߊ ߟߎ߫
            music: ߘߐ߲߬ߞߟߌ ߝߎ߲ߞߎ߲
            musical_instrument: ߘߐ߲߬ߞߟߌ߬ߟߊ߬ ߡߎߙߊ߲ ߠߎ߬
            nutrition_supplements: ߛߎ߬ߡߊ߲߬ ߡߊ߬ߛߐ߬ߟߊ ߟߎ߫
+          paint: ߓߐߙߐ߲ߜߍ߫ ߝߎ߲ߞߎ߲
+          pet: ߓߌߦߊ߲ ߠߎ߬ ߟߊ߫ ߝߎ߲ߞߎ߲
+          pet_grooming: ߛߏߞߣߐ߫ ߓߌߦߊ߲ ߠߎ߬ ߘߊ߲ߘߊ߫ ߦߌߟߊ
+          photo: ߖߌ߬ߦߊ߬ߖߊߛߏ߲ ߝߎ߲ߞߎ߲
            second_hand: ߝߋ߲߫ ߡߊߞߟߏߣߍ߲߫ ߝߎ߲ߞߎ߲
            second_hand: ߝߋ߲߫ ߡߊߞߟߏߣߍ߲߫ ߝߎ߲ߞߎ߲
+          shoes: ߛߡߊ߬ߘߊ߬ ߝߎ߲ߞߎ߲
            sports: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
            supermarket: ߘߎ߲߬ߘߎ߬ߡߊ߬ ߟߐ߯ߝߍ
            tailor: ߞߙߊߟߌߟߊ
            sports: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
            supermarket: ߘߎ߲߬ߘߎ߬ߡߊ߬ ߟߐ߯ߝߍ
            tailor: ߞߙߊߟߌߟߊ
@@ -775,6 +954,7 @@ nqo:
            wine: ߖߊ߬ߓߌ߬ߙߋ߲߬ ߘߟߐ ߝߎ߲ߞߎ߲
            "yes": ߝߎ߲ߞߎ߲
          tourism:
            wine: ߖߊ߬ߓߌ߬ߙߋ߲߬ ߘߟߐ ߝߎ߲ߞߎ߲
            "yes": ߝߎ߲ߞߎ߲
          tourism:
+          cabin: ߓߎ߭
            camp_site: ߞߎ߲ߝߊ߲ߓߐ߫ ߞߣߍ
            hostel: ߖߌ߬ߦߊ߬ߓߏ߲
            hotel: ߖߌ߬ߦߊ߬ߓߏ߲
            camp_site: ߞߎ߲ߝߊ߲ߓߐ߫ ߞߣߍ
            hostel: ߖߌ߬ߦߊ߬ߓߏ߲
            hotel: ߖߌ߬ߦߊ߬ߓߏ߲
@@ -785,6 +965,7 @@ nqo:
          waterway:
            artificial: ߖߛߌߟߊ߫ ߟߊߘߊ߲ߣߍ߲
            river: ߓߊ
          waterway:
            artificial: ߖߛߌߟߊ߫ ߟߊߘߊ߲ߣߍ߲
            river: ߓߊ
+          stream: ߞߙߏ߬ߝߏ
            waterfall: ߖߌ߫ ߛߎߙߎ߲ߘߎ
            "yes": ߖߛߌߟߊ
        admin_levels:
            waterfall: ߖߌ߫ ߛߎߙߎ߲ߘߎ
            "yes": ߖߛߌߟߊ
        admin_levels:
@@ -796,9 +977,6 @@ nqo:
          level8: ߛߏ ߓߐߕߏ߲
          level9: ߕߏߘߊ ߓߐߕߏ߲
          level11: ߛߌ߰ߢߐ߲߰ߦߊ߬ ߦߙߐ ߓߐߕߏ߲
          level8: ߛߏ ߓߐߕߏ߲
          level9: ߕߏߘߊ ߓߐߕߏ߲
          level11: ߛߌ߰ߢߐ߲߰ߦߊ߬ ߦߙߐ ߓߐߕߏ߲
-      types:
-        towns: ߛߏ
-        places: ߘߌ߲߬ߞߌߙߊ
      results:
        no_results: ߞߐߝߟߌ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
        more_results: ߞߐߝߟߌ߫ ߜߘߍ ߟߎ߬
      results:
        no_results: ߞߐߝߟߌ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
        more_results: ߞߐߝߟߌ߫ ߜߘߍ ߟߎ߬
@@ -811,27 +989,21 @@ nqo:
        not_updated: ߊ߬ ߡߊ߫ ߟߏ߲ߘߐߦߊ߫
        search: ߢߌߣߌ߲ߠߌ߲
        search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫
        not_updated: ߊ߬ ߡߊ߫ ߟߏ߲ߘߐߦߊ߫
        search: ߢߌߣߌ߲ߠߌ߲
        search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫
+      states:
+        ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
+        open: ߊ߬ ߟߊߞߊ߬
+        resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫
+    page:
        user_not_found: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߕߴߦߋ߲߬
        issues_not_found: ߒ߬ߒ߫ ߓߐ߲ߘߊ߫ ߛߎ߮ ߏ߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
        status: ߡߊ߬ߘߎ߮
        last_updated: ߟߏ߲ߘߐߦߊߟߌ ߞߐ߯ߟߕߊ
        user_not_found: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߕߴߦߋ߲߬
        issues_not_found: ߒ߬ߒ߫ ߓߐ߲ߘߊ߫ ߛߎ߮ ߏ߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
        status: ߡߊ߬ߘߎ߮
        last_updated: ߟߏ߲ߘߐߦߊߟߌ ߞߐ߯ߟߕߊ
-      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr>%{user} ߡߊ߬
-      link_to_reports: ߞߏߝߐߟߌ߫ ߟߎ߬ ߘߐߜߍ߫
        reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
        reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
-      states:
-        ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
-        open: ߊ߬ ߟߊߞߊ߬
-        resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫
-    update:
-      new_report: ߌ ߟߊ߫ ߟߊ߬ߢߌߣߌ߲ ߟߊߞߎ߲߬ߘߎ ߓߘߊ߫ ߓߊ߲߫ ߟߊߞߎ߲߬ߘߎ߬ ߟߊ߫ ߞߏߟߌߞߏߟߌ߫
-      successful_update: ߌ ߟߊ߫ ߟߊ߬ߢߌߣߌ߲ ߓߘߊ߫ ߓߊ߲߫ ߠߊߞߎ߲߬ߘߎ߫ ߟߊ߫ ߞߏߟߌߞߏߟߌ߫
-      provide_details: ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߬ߣߍ߲ ߠߎ߬ ߡߊߛߐ߫ ߖߊ߰ߣߌ߲߫
      show:
        title: '%{status} ߝߌ߬ߛߌ #%{issue_id}'
      show:
        title: '%{status} ߝߌ߬ߛߌ #%{issue_id}'
-      report_created_at: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
-      last_resolved_at: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
-      last_updated_at: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
+      report_created_at_html: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
+      last_resolved_at_html: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
+      last_updated_at_html: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
          ߓߟߏ߫
        resolve: ߊ߬ ߢߊߓߐ߫
        ignore: ߊ߬ ߡߋߓߌ߬ߟߊ߫
          ߓߟߏ߫
        resolve: ߊ߬ ߢߊߓߐ߫
        ignore: ߊ߬ ߡߋߓߌ߬ߟߊ߫
@@ -882,38 +1054,24 @@ nqo:
      home: ߕߊ߯ ߛߏ߫ ߘߌ߲߬ߞߌߙߊ ߘߐ߫
      logout: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
      log_in: ߌ ߜߊ߲߬ߞߎ߲߫
      home: ߕߊ߯ ߛߏ߫ ߘߌ߲߬ߞߌߙߊ ߘߐ߫
      logout: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
      log_in: ߌ ߜߊ߲߬ߞߎ߲߫
-    log_in_tooltip: ߌ ߜߊ߲߬ߞߎ߲߫ ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߞߊ߬ߣߍ߲ ߘߏ߫ ߟߊ߫
      sign_up: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
      start_mapping: ߔߊ߬ߔߘߊ߬ ߡߊ߬ߝߟߍ ߘߊߡߌ߬ߣߊ߬
      sign_up: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
      start_mapping: ߔߊ߬ߔߘߊ߬ ߡߊ߬ߝߟߍ ߘߊߡߌ߬ߣߊ߬
-    sign_up_tooltip: ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊߞߊ߬ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߊ߲ߡߊ߬
      edit: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
      history: ߘߐ߬ߝߐ
      export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
      issues: ߓߐ߲ߘߊ ߟߎ߫
      edit: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
      history: ߘߐ߬ߝߐ
      export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
      issues: ߓߐ߲ߘߊ ߟߎ߫
-    data: ߓߟߏߡߟߊ
-    export_data: ߓߟߏߡߟߊ ߟߊߝߏ߬ߦߌ߬
      gps_traces: GPS ߣߐ߬ߣߐ߬ߟߌ
      gps_traces: GPS ߣߐ߬ߣߐ߬ߟߌ
-    gps_traces_tooltip: GPS ߜߙߋ߬ߓߐ߬ߟߌ ߘߊߘߐߓߍ߲߬
      user_diaries: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߋߟߋ߲ ߠߎ߬
      user_diaries: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߋߟߋ߲ ߠߎ߬
-    user_diaries_tooltip: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߋ߬ߟߋ߲ ߦߋ߫
      edit_with: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ %{editor} ߘߌ߫
      edit_with: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ %{editor} ߘߌ߫
-    tag_line: ߥߞߌ ߛߙߊ߬ߓߊߟߌ ߘߎߢߊ߫ ߔߊ߬ߔߘߊ
      intro_header: ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߞߊ߲߬߹
      intro_text: ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߦߋ߫ ߘߎߢߊ߫ ߔߊ߬ߔߘߊ ߟߋ߬ ߘߌ߫߸ ߡߍ߲ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߡߐ߱ ߟߎ߬
        ߓߟߏ߫ ߦߏ߫ ߌߟߋ߸ ߊ߬ ߟߊߓߊ߯ߙߊ ߦߋ߫ ߛߙߊ߬ߓߊߟߌ ߟߋ߬ ߘߌ߫ ߟߊ߬ߘߤߊ߬ߟߌ߫ ߘߊߦߟߍ߬ߣߍ߲ ߞߘߐ߫.
      intro_header: ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߞߊ߲߬߹
      intro_text: ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߦߋ߫ ߘߎߢߊ߫ ߔߊ߬ߔߘߊ ߟߋ߬ ߘߌ߫߸ ߡߍ߲ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߡߐ߱ ߟߎ߬
        ߓߟߏ߫ ߦߏ߫ ߌߟߋ߸ ߊ߬ ߟߊߓߊ߯ߙߊ ߦߋ߫ ߛߙߊ߬ߓߊߟߌ ߟߋ߬ ߘߌ߫ ߟߊ߬ߘߤߊ߬ߟߌ߫ ߘߊߦߟߍ߬ߣߍ߲ ߞߘߐ߫.
-    intro_2_create_account: ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߘߊߦߟߍ߬
-    partners_ucl: UCL
+    partners_fastly: ߝߊߛߕߑߟߋ߫
      partners_partners: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬
      tou: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߛߙߊߕߌ
      help: ߘߍ߬ߡߍ߲߬ߠߌ߲
      about: ߞߊ߬ ߓߍ߲߬
      copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ
      partners_partners: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬
      tou: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߛߙߊߕߌ
      help: ߘߍ߬ߡߍ߲߬ߠߌ߲
      about: ߞߊ߬ ߓߍ߲߬
      copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ
-    community: ߘߍ߬ߘߊ
-    foundation: ߖߎ߬ߓߌߟߊ
-    foundation_title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߖߎ߬ߓߌߟߊ
-    make_a_donation:
-      title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߐߡߊߓߌ߲ߓߌ߲߫ ߥߏߘߌ ߣߌ߬ߟߌ ߟߊ߫
-      text: ߣߌ߬ߟߌ ߘߏ߫ ߞߍ߫
      learn_more: ߘߏߜߘߍ߫ ߟߎ߫ ߘߐߞߊ߬ߙߊ߲߬
      more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
    user_mailer:
      learn_more: ߘߏߜߘߍ߫ ߟߎ߫ ߘߐߞߊ߬ߙߊ߲߬
      more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
    user_mailer:
@@ -953,7 +1111,6 @@ nqo:
      gpx_failure:
        hi: '%{to_user} ߣߌ߫ ߕߎ߬ߡߊ߬'
        failed_to_import: 'ߟߊ߬ߛߣߍ߬ߟߌ߬ ߗߌߙߏ߲ߣߍ߲. ߝߎ߬ߕߎ߲߬ߕߌ ߦߋ߫ ߦߊ߲߬:'
      gpx_failure:
        hi: '%{to_user} ߣߌ߫ ߕߎ߬ߡߊ߬'
        failed_to_import: 'ߟߊ߬ߛߣߍ߬ߟߌ߬ ߗߌߙߏ߲ߣߍ߲. ߝߎ߬ߕߎ߲߬ߕߌ ߦߋ߫ ߦߊ߲߬:'
-      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
        subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ ߓߘߊ߫ ߗߌߙߏ߲߫'
      gpx_success:
        hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
        subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ ߓߘߊ߫ ߗߌߙߏ߲߫'
      gpx_success:
        hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
@@ -1019,7 +1176,6 @@ nqo:
          ߘߐ߫.
      changeset_comment_notification:
        hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
          ߘߐ߫.
      changeset_comment_notification:
        hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
-      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
        commented:
          partial_changeset_with_comment: ߡߙߌߣߊ߲ ߘߌ߫ %{changeset_comment}ߴ
          partial_changeset_without_comment: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫
        commented:
          partial_changeset_with_comment: ߡߙߌߣߊ߲ ߘߌ߫ %{changeset_comment}ߴ
          partial_changeset_without_comment: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫
@@ -1034,8 +1190,6 @@ nqo:
        success: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߓߘߊ߫ ߟߊߛߙߋߦߊ߫߸ ߌ ߣߌ߫ ߗߋ߫ ߌ ߜߊ߲߬ߞߎ߲ ߠߊ߫߹
        already active: ߖߊ߬ߕߋ߬ߘߊ ߣߌ߲߬ ߠߊߛߙߋߦߊߣߍ߲߫ ߞߘߐ ߟߋ߬ ߦߋ߫.
        unknown token: ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߘߏߞߊ߲ ߏ߬ ߛߕߊ ߓߘߊ߫ ߝߊ߫ ߥߟߴߊ߬ ߕߴߦߋ߲߬.
        success: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߓߘߊ߫ ߟߊߛߙߋߦߊ߫߸ ߌ ߣߌ߫ ߗߋ߫ ߌ ߜߊ߲߬ߞߎ߲ ߠߊ߫߹
        already active: ߖߊ߬ߕߋ߬ߘߊ ߣߌ߲߬ ߠߊߛߙߋߦߊߣߍ߲߫ ߞߘߐ ߟߋ߬ ߦߋ߫.
        unknown token: ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߘߏߞߊ߲ ߏ߬ ߛߕߊ ߓߘߊ߫ ߝߊ߫ ߥߟߴߊ߬ ߕߴߦߋ߲߬.
-      reconfirm_html: ߣߴߌ ߞߍ߫ ߘߴߊ߬ ߝߍ߬ ߊ߲ ߧߋ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߗߋߛߓߍ ߗߋ߫ ߕߎ߲߯ߣߌ߲߫߸ <a
-        href="%{reconfirm}">ߦߊ߲߬ ߛߐ߲߬ߞߌ߲߫</a>
      confirm_resend:
        failure: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{name} ߡߊ߫ ߛߐ߬ߘߐ߲߫.
      confirm_email:
      confirm_resend:
        failure: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{name} ߡߊ߫ ߛߐ߬ߘߐ߲߫.
      confirm_email:
@@ -1049,25 +1203,22 @@ nqo:
    messages:
      inbox:
        title: ߗߋߛߓߍ߫ ߟߊߣߊ߬ߣߍ߲
    messages:
      inbox:
        title: ߗߋߛߓߍ߫ ߟߊߣߊ߬ߣߍ߲
-      my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ
-      my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
        messages: '%{new_messages} ߟߎ߬ ߣߌ߫ %{old_messages} ߠߎ߬ ߦߴߌ ߓߟߏ߫'
        messages: '%{new_messages} ߟߎ߬ ߣߌ߫ %{old_messages} ߠߎ߬ ߦߴߌ ߓߟߏ߫'
-      from: ߞߊ߬ ߝߘߊ߫
-      subject: ߝߐߡߊ
-      date: ߕߎ߬ߡߊ߬ߘߊ
        no_messages_yet_html: ߗߋߛߓߍ߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߡߊ߰ߒ߬ߠߊ߬ߟߌ
          ߘߐ߫  %{people_mapping_nearby_link} ߟߊ߫؟
        people_mapping_nearby: ߛߌ߰ߢߐ߰ߡߊ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬
        no_messages_yet_html: ߗߋߛߓߍ߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߡߊ߰ߒ߬ߠߊ߬ߟߌ
          ߘߐ߫  %{people_mapping_nearby_link} ߟߊ߫؟
        people_mapping_nearby: ߛߌ߰ߢߐ߰ߡߊ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬
+    messages_table:
+      from: ߞߊ߬ ߝߘߊ߫
+      to: ߞߊ߬ ߕߊ߯
+      subject: ߝߐߡߊ
+      date: ߕߎ߬ߡߊ߬ߘߊ
      message_summary:
        unread_button: ߊ߬ ߞߍ߫ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
        read_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
      message_summary:
        unread_button: ߊ߬ ߞߍ߫ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
        read_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
-      reply_button: ߊ߬ ߞߐߖߋ߬ߓߌ߬
        destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
      new:
        title: ߗߋߛߓߍ ߗߋ߫
        send_message_to_html: ߗߋߛߓߍ߫ ߞߎߘߊ ߘߏ߫ ߗߋ߫ %{name} ߡߊ߬
        destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
      new:
        title: ߗߋߛߓߍ ߗߋ߫
        send_message_to_html: ߗߋߛߓߍ߫ ߞߎߘߊ ߘߏ߫ ߗߋ߫ %{name} ߡߊ߬
-      subject: ߝߐߡߊ
-      body: ߝߊ߬ߘߌ
        back_to_inbox: ߌ ߞߐߛߊ߬ߦߌ߬ ߗߋߛߓߍ߫ ߞߏ߲ߘߏ ߡߊ߬
      create:
        message_sent: ߗߋߛߓߍ߫ ߗߋߣߍ߲
        back_to_inbox: ߌ ߞߐߛߊ߬ߦߌ߬ ߗߋߛߓߍ߫ ߞߏ߲ߘߏ ߡߊ߬
      create:
        message_sent: ߗߋߛߓߍ߫ ߗߋߣߍ߲
@@ -1079,11 +1230,6 @@ nqo:
        body: ߤߊߞߍ߬ߕߏ߫߸ ߗߋߛߓߍ߫ ߛߌ߫ ߕߍ߫ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߟߊ߫.
      outbox:
        title: ߗߋߟߌ߫ ߞߏ߲ߘߏ
        body: ߤߊߞߍ߬ߕߏ߫߸ ߗߋߛߓߍ߫ ߛߌ߫ ߕߍ߫ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߟߊ߫.
      outbox:
        title: ߗߋߟߌ߫ ߞߏ߲ߘߏ
-      my_inbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߛߐ߬ߡߐ߲߲߬ߣߍ߲
-      my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
-      to: ߞߊ߬ ߕߊ߯
-      subject: ߝߐߡߊ
-      date: ߕߎ߬ߡߊ߬ߘߊ
        no_sent_messages_html: ߗߋߛߓߍ߫ ߗߋߣߍ߲߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߓߌ߬ߟߊ߬ߒ߬ߡߊ߬ߟߌ
          ߘߐ߫ %{people_mapping_nearby_link}؟
        people_mapping_nearby: ߡߐ߱ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬ ߌ ߕߙߐߝߍ߬
        no_sent_messages_html: ߗߋߛߓߍ߫ ߗߋߣߍ߲߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߓߌ߬ߟߊ߬ߒ߬ߡߊ߬ߟߌ
          ߘߐ߫ %{people_mapping_nearby_link}؟
        people_mapping_nearby: ߡߐ߱ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬ ߌ ߕߙߐߝߍ߬
@@ -1093,41 +1239,38 @@ nqo:
          ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߖߋ߬ߓߌ߬ ߟߊ߫.
      show:
        title: ߗߋߛߓߍ ߘߐߞߊ߬ߙߊ߲߬
          ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߖߋ߬ߓߌ߬ ߟߊ߫.
      show:
        title: ߗߋߛߓߍ ߘߐߞߊ߬ߙߊ߲߬
-      from: ߞߊ߬ ߝߘߊ߫
-      subject: ߝߐߡߊ
-      date: ߕߎ߬ߡߊ߬ߘߊ
        reply_button: ߊ߬ ߞߐߖߋ߬ߓߌ߬
        unread_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
        destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
        back: ߌ ߞߐߛߊ߬ߦߌ߬
        reply_button: ߊ߬ ߞߐߖߋ߬ߓߌ߬
        unread_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
        destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
        back: ߌ ߞߐߛߊ߬ߦߌ߬
-      to: ߞߊ߬ ߕߊ߯
        wrong_user: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߘߌ߫ ߒ߬ߞߊ߬ ߌ ߢߌ߬ߣߊ߬ߣߍ߲߫ ߗߋߛߓߍ ߡߍ߲
          ߘߐߞߊ߬ߙߊ߲߬ ߞߏ ߡߊ߬߸ ߏ߬ ߗߋߣߍ߲߫ ߕߴߏ߬ ߓߟߏ߫ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߡߊ߬. ߌ ߜߊ߲߬ߞߎ߲߫
          ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫ ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߘߐߞߊ߬ߙߊ߲߬ ߠߊ߫.
      sent_message_summary:
        destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
        wrong_user: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߘߌ߫ ߒ߬ߞߊ߬ ߌ ߢߌ߬ߣߊ߬ߣߍ߲߫ ߗߋߛߓߍ ߡߍ߲
          ߘߐߞߊ߬ߙߊ߲߬ ߞߏ ߡߊ߬߸ ߏ߬ ߗߋߣߍ߲߫ ߕߴߏ߬ ߓߟߏ߫ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߡߊ߬. ߌ ߜߊ߲߬ߞߎ߲߫
          ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫ ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߘߐߞߊ߬ߙߊ߲߬ ߠߊ߫.
      sent_message_summary:
        destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
+    heading:
+      my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ
+      my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
      mark:
        as_read: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߫ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
        as_unread: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
      destroy:
        destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
    passwords:
      mark:
        as_read: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߫ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
        as_unread: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
      destroy:
        destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
    passwords:
-    lost_password:
+    new:
        title: ߓߣߐ߬ ߓߘߊ߫ ߞߍ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߘߐ߫
        heading: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
        email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
        new password button: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
        help_text: ߢ:ߞߏ߲ߘߏ ߟߊߘߏ߲߬ ߌ ߞߊ߬ ߡߍ߲ ߠߊߓߊ߯ߙߊ߫ ߞߵߌ ߜߊ߲߬ߞߎ߲߫߸ ߊ߲ ߘߌ߫ ߛߘߌ߬ߜߋ߲ ߗߴߌ
          ߡߵߊ߬ ߟߊ߫ ߌ ߘߴߏ߬ ߟߊߓߊ߯ߙߊ߫ ߞߵߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫.
        title: ߓߣߐ߬ ߓߘߊ߫ ߞߍ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߘߐ߫
        heading: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
        email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
        new password button: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
        help_text: ߢ:ߞߏ߲ߘߏ ߟߊߘߏ߲߬ ߌ ߞߊ߬ ߡߍ߲ ߠߊߓߊ߯ߙߊ߫ ߞߵߌ ߜߊ߲߬ߞߎ߲߫߸ ߊ߲ ߘߌ߫ ߛߘߌ߬ߜߋ߲ ߗߴߌ
          ߡߵߊ߬ ߟߊ߫ ߌ ߘߴߏ߬ ߟߊߓߊ߯ߙߊ߫ ߞߵߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫.
-      notice email on way: ߤߊߞߍ߬ߕߏ߫ ߌ ߓߘߊ߫ ߓߐߣߵߊ߬ ߘߐ߫:-(ߒ߬ߞߊ߬ ߗߋߛߓߍ ߘߏ߫ ߦߴߊ߬ ߞߣߐ߫
-        ߏ߬ ߘߐ߫ ߌ ߘߌ߫ ߛߴߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫ ߖߏߣߊ߫.
-      notice email cannot find: ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߕߴߛߋ߫ ߢߌߣߌ߲߫ ߠߊ߫߸ ߤߊߞߍ߬ߕߏ߫.
-    reset_password:
+    edit:
        title: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
        heading: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫ %{user} ߦߋ߫
        reset: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
        title: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
        heading: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫ %{user} ߦߋ߫
        reset: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
-      flash changed: ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߓߘߊ߫ ߓߊ߲߫ ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫.
        flash token bad: ߌ ߞߊߣߊ߬ ߖߐߟߐ߲ߞߐ ߏ߬ ߢߌߣߌ߲߫߸ URL ߡߊߝߟߍ߫ ߕߎ߬ߡߊ߬ߘߐ߫؟
        flash token bad: ߌ ߞߊߣߊ߬ ߖߐߟߐ߲ߞߐ ߏ߬ ߢߌߣߌ߲߫߸ URL ߡߊߝߟߍ߫ ߕߎ߬ߡߊ߬ߘߐ߫؟
+    update:
+      flash changed: ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߓߘߊ߫ ߓߊ߲߫ ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫.
    preferences:
      show:
        title: ߒ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬
    preferences:
      show:
        title: ߒ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬
@@ -1136,77 +1279,50 @@ nqo:
        edit_preferences: ߦߟߌߡߊߛߙߋ ߡߊߦߟߍ߬ߡߊ߲߫
      edit:
        title: ߦߟߌߡߊߛߙߋ ߡߊߦߟߍ߬ߡߊ߲߫
        edit_preferences: ߦߟߌߡߊߛߙߋ ߡߊߦߟߍ߬ߡߊ߲߫
      edit:
        title: ߦߟߌߡߊߛߙߋ ߡߊߦߟߍ߬ߡߊ߲߫
+      save: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߟߊߞߎߘߦߊ߫
        cancel: ߊ߬ ߘߐߛߊ߬
        cancel: ߊ߬ ߘߐߛߊ߬
+    update:
+      failure: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߕߍ߫ ߛߐ߲߬ ߟߊߞߎߘߦߊ߫ ߟߊ߫.
+    update_success_flash:
+      message: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫.
    profiles:
      edit:
        title: ߢߊߞߙߍ ߡߊߦߟߍ߬ߡߊ߲߫
        save: ߢߊߞߙߍ ߟߊߞߎߘߦߊ߫
        cancel: ߊ߬ ߘߐߛߊ߬
        image: ߖߌ߬ߦߊ߬ߓߍ
    profiles:
      edit:
        title: ߢߊߞߙߍ ߡߊߦߟߍ߬ߡߊ߲߫
        save: ߢߊߞߙߍ ߟߊߞߎߘߦߊ߫
        cancel: ߊ߬ ߘߐߛߊ߬
        image: ߖߌ߬ߦߊ߬ߓߍ
+      gravatar:
+        gravatar: ߜ߭ߙߊߝ߭ߕߊ߫ ߟߊߓߊ߯ߙߊ߫
+        link: https://wiki.openstreetmap.org/wiki/nqo:Gravatar
+        what_is_gravatar: ߡߎ߲߬ ߦߋ߫ ߜ߭ߙߊߝ߭ߕߊ ߘߌ߫؟
+        disabled: ߜ߭ߙߊߝ߭ߕߊ ߓߘߊ߫ ߓߴߊ߬ ߟߊ߫
+        enabled: ߌ ߟߊ߫ ߜ߭ߙߊߝ߭ߕߊ߫ ߦߌ߬ߘߊ߬ߟߌ ߓߘߊ߫ ߓߌ߬ߟߴߊ߬ ߟߊ߫.
        new image: ߖߌ߬ߦߊ߬ߓߍ ߘߏ߫ ߝߙߊ߬
        keep image: ߖߌ߬ߦߊ߬ߓߍ ߞߘߐ߬ߡߊ߲ ߠߊߡߙߊ߬
        delete image: ߖߌ߬ߦߊ߬ߓߍ ߞߘߐ߬ߡߊ߲ ߛߋ߲߬ߓߐ߫
        replace image: ߖߌ߬ߦߊ߬ߓߍ ߡߍ߲ ߦߋ߫ ߦߋ߲߬ ߕߊ߲߬߸ ߏ߬ ߣߐ߬ߘߐߓߌ߬ߟߊ߬
        new image: ߖߌ߬ߦߊ߬ߓߍ ߘߏ߫ ߝߙߊ߬
        keep image: ߖߌ߬ߦߊ߬ߓߍ ߞߘߐ߬ߡߊ߲ ߠߊߡߙߊ߬
        delete image: ߖߌ߬ߦߊ߬ߓߍ ߞߘߐ߬ߡߊ߲ ߛߋ߲߬ߓߐ߫
        replace image: ߖߌ߬ߦߊ߬ߓߍ ߡߍ߲ ߦߋ߫ ߦߋ߲߬ ߕߊ߲߬߸ ߏ߬ ߣߐ߬ߘߐߓߌ߬ߟߊ߬
+      image size hint: (ߖߌ߬ߦߊ߬ߓߍ ߕߎ߲ߞߎ߲ ߠߎ߬ ߓߊ߯ ߞߍ߫ ߁߀߀×߁߀߀ ߟߋ߬ ߦߋ߫ ߓߊ߯ߙߊ߫ ߟߊ߫ ߞߏߢߊ߬)
        home location: ߌ ߓߘߊ ߘߌ߲߬ߞߌߙߊ
        no home location: ߌ ߡߴߌ ߟߊ߫ ߟߎ ߘߌ߲߬ߞߌߙߊ ߟߊߘߏ߲߬ ߝߟߐ߫
        update home location on click: ߞߊ߬ ߟߎ ߘߌ߲߬ߞߌߙߊ ߡߊߝߊ߬ߟߋ߲߫ ߣߌ߫ ߒ ߞߊ߬ ߡߊߔ ߛߐ߲߬ߞߌ߲߫؟
        home location: ߌ ߓߘߊ ߘߌ߲߬ߞߌߙߊ
        no home location: ߌ ߡߴߌ ߟߊ߫ ߟߎ ߘߌ߲߬ߞߌߙߊ ߟߊߘߏ߲߬ ߝߟߐ߫
        update home location on click: ߞߊ߬ ߟߎ ߘߌ߲߬ߞߌߙߊ ߡߊߝߊ߬ߟߋ߲߫ ߣߌ߫ ߒ ߞߊ߬ ߡߊߔ ߛߐ߲߬ߞߌ߲߫؟
+    update:
+      success: ߢߊߞߙߍ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫
+      failure: ߢߊߞߙߍ ߕߍ߫ ߛߐ߲߬ ߟߏ߲ߘߐߦߊ߫ ߟߊ߫.
    sessions:
      new:
    sessions:
      new:
-      title: ߌ ߜߊ߲߬ߞߎ߲߫
-      heading: ߌ ߜߊ߲߬ߞߎ߲߫
+      tab_title: ߌ ߜߊ߲߬ߞߎ߲߫
        email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
        password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
        email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
        password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
-      openid_html: '%{logo} ߘߊߦߟߍߟߌ߫ ID:'
        remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
        lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
        login_button: ߌ ߜߊ߲߬ߞߎ߲߫
        remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
        lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
        login_button: ߌ ߜߊ߲߬ߞߎ߲߫
-      register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫
-      with username: 'ߓߊ߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߦߴߌ ߓߟߏ߫ ߟߋ߬؟ ߒ߬ߓߊ߬ ߌ ߜߊ߲߬ߞߎ߲߬
-        ߌ ߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮ ߟߴߊ߬ ߣߴߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲:'
-      new to osm: ߌ ߞߎߘߊ ߟߋ߬ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬؟
-      to make changes: ߖߐ߲߬ߛߊ߫ ߞߊ߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߐ߲ߕߊ ߟߎ߫ ߡߝߊ߬ߟߋ߲߬ߠߌ߲߸ ߝߏ߫ ߖߊ߬ߕߋ߬ߘߊ
-        ߘߏ߫ ߦߋ߫ ߞߴߌ ߓߟߏ߫.
-      create account minute: ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߛߌ߲ߘߌ߫. ߊ߬ ߦߋ߫ ߓߍ߲߬ ߠߊ߫ ߡߌ߬ߛߍ߲߬ ߞߋߟߋ߲߫ ߠߋ߬
-        ߡߊ߬.
-      no account: ߖߊ߬ߕߋ߬ߘߊ߬ ߕߴߌ ߓߟߏ߫ ߓߊ߬؟
-      account not active: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߡߊ߫ ߓߌ߬ߟߵߊ߬ ߟߊ߫ ߡߎߣߎ߲߬. <a href="%{reconfirm}">ߛߘߌ߬ߜߋ߲
-        ߡߍ߲ ߦߋ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߢ:ߞߏ߲ߘߏ ߞߣߐ߫߸ ߏ߬ ߟߊߓߊ߯ߙߊ߫ ߖߊ߰ߣߌ߲߫ ߞߵߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ
-        ߟߊߞߎߣߎ߲߫߸ ߥߟߊ߫ %{reconfirm}</a>ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߗߋߛߓߍ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫<a/>
        auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
        auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
-      openid_logo_alt: ߌ ߜߊ߲߬ߞߎ߲߬ ߏߔߌ߲ ID ߟߊ߫
-      auth_providers:
-        openid:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID ߘߌ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID URL ߟߊ߫
-        google:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߏߔߌ߲ ID ߟߊ߫
-        facebook:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
-        windowslive:
-          title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        github:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        wikipedia:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        wordpress:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߏߔߌ߲ ID ߟߊ߫
-        aol:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߏߔߌ߲ ID ߟߊ߫
      destroy:
        title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
        heading: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫
        logout_button: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
    shared:
      markdown_help:
      destroy:
        title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
        heading: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫
        logout_button: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
    shared:
      markdown_help:
-      title_html: ߊ߬ ߞߛߍ߬ߞߛߍ߫ <a href="https://kramdown.gettalong.org/quickref.html">ߞߙߊߡߑߘߐߥ</a>
-        ߟߊ߫
        headings: ߞߎ߲߬ߕߐ߮
        heading: ߞߎ߲߬ߕߐ߮
        subheading: ߞߎ߲߬ߕߐ߰ߘߎ߯ߟߊ
        headings: ߞߎ߲߬ߕߐ߮
        heading: ߞߎ߲߬ߕߐ߮
        subheading: ߞߎ߲߬ߕߐ߰ߘߎ߯ߟߊ
@@ -1221,10 +1337,18 @@ nqo:
      richtext_field:
        edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
        preview: ߟߊ߬ߕߎ߲߰ߠߊ
      richtext_field:
        edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
        preview: ߟߊ߬ߕߎ߲߰ߠߊ
+    pagination:
+      diary_comments:
+        older: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+        newer: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
+      diary_entries:
+        older: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+        newer: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊߟߡߊ ߟߎ߬
+      traces:
+        older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+        newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
    site:
      about:
    site:
      about:
-      next: ߢߍߕߊ
-      copyright_html: <span>&copy;</span>ߏߔߌ߲߫ ߛߑߕߙߌߕ ߡߊߔ<br>ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߠߎ߬
        used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲
          ߟߥߊ߬ߟߌ߬ߟߊ߲ ߣߌ߫ ߞߍߟߊ߲߫ ߛߎ߲ߝߘߍߡߊ ߟߎ߬'
        lede_text: "ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊߘߊ߲ߣߍ߲߫ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߍ߬ߘߊ ߟߎ߬ ߟߋ߬ ߓߟߏ߫ ߡߍ߲
        used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲
          ߟߥߊ߬ߟߌ߬ߟߊ߲ ߣߌ߫ ߞߍߟߊ߲߫ ߛߎ߲ߝߘߍߡߊ ߟߎ߬'
        lede_text: "ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊߘߊ߲ߣߍ߲߫ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߍ߬ߘߊ ߟߎ߬ ߟߋ߬ ߓߟߏ߫ ߡߍ߲
@@ -1236,6 +1360,7 @@ nqo:
        open_data_title: ߓߟߏߡߟߊ߫ ߘߊߦߟߍ߬ߣߍ߲
        partners_title: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬
      copyright:
        open_data_title: ߓߟߏߡߟߊ߫ ߘߊߦߟߍ߬ߣߍ߲
        partners_title: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬
      copyright:
+      title: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ
        foreign:
          title: ߞߊ߬ ߓߍ߲߬ ߘߟߊߡߌߘߊߟߌ ߣߌ߲߬ ߡߊ߬
          english_link: ߊ߲߬ߜ߭ߌߟߋ ߓߊߖߎߡߊ
        foreign:
          title: ߞߊ߬ ߓߍ߲߬ ߘߟߊߡߌߘߊߟߌ ߣߌ߲߬ ߡߊ߬
          english_link: ߊ߲߬ߜ߭ߌߟߋ ߓߊߖߎߡߊ
@@ -1244,14 +1369,10 @@ nqo:
          native_link: ߒߞߏ_ߕߐ߮_ߦߋ߫_ߦߊ߲߬ ߟߦߍ߬ߡߊ߲߬ߠߌ߲
          mapping_link: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
        legal_babble:
          native_link: ߒߞߏ_ߕߐ߮_ߦߋ߫_ߦߊ߲߬ ߟߦߍ߬ߡߊ߲߬ߠߌ߲
          mapping_link: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
        legal_babble:
-        title_html: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ
          credit_title_html: ߟߊߒߣߦߊ ߦߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫ ߘߌ߬
          more_title_html: ߛߌߦߊߡߊ߲߫ ߜߘߍ߫ ߟߎ߫ ߢߌߣߌ߲ ߦߴߌ ߘߐ߫
          contributors_title_html: ߊ߲ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߠߎ߬
      index:
          credit_title_html: ߟߊߒߣߦߊ ߦߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫ ߘߌ߬
          more_title_html: ߛߌߦߊߡߊ߲߫ ߜߘߍ߫ ߟߎ߫ ߢߌߣߌ߲ ߦߴߌ ߘߐ߫
          contributors_title_html: ߊ߲ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߠߎ߬
      index:
-      permalink: ߛߘߌ߬ߜߋ߲߬ ߓߟߏߕߍ߰ߓߊߟߌ
-      shortlink: ߛߘߌ߬ߜߋ߲߬ ߛߎߘߎ߲
-      createnote: ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬
        license:
          copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲
            ߞߘߐ߫
        license:
          copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲
            ߞߘߐ߫
@@ -1266,11 +1387,7 @@ nqo:
        id_not_configured: ID ߡߊ߫ ߘߊߘߐߓߍ߲߬ ߡߎߣߎ߲߬
      export:
        title: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
        id_not_configured: ID ߡߊ߫ ߘߊߘߐߓߍ߲߬ ߡߎߣߎ߲߬
      export:
        title: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
-      area_to_export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ ߞߍ߫ ߦߙߐ
        manually_select: ߦߙߐ߫ ߓߐߣߍ߲ߢߐ߲߰ߡߊ ߟߎ߬ ߓߊߕߐ߬ߡߐ߲߬ ߓߟߏߟߕߊߦߊ ߘߐ߫
        manually_select: ߦߙߐ߫ ߓߐߣߍ߲ߢߐ߲߰ߡߊ ߟߎ߬ ߓߊߕߐ߬ߡߐ߲߬ ߓߟߏߟߕߊߦߊ ߘߐ߫
-      format_to_export: ߖߙߎߡߎ߲߫ ߛߏ߲߯ߓߕߊ
-      osm_xml_data: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ XML ߟߐ߲ߕߊ
-      map_image: ߡߊߔ ߖߌ߬ߦߊ߬ߓߍ (ߓߊߖߎ ߟߊߟߊߟߌ ߦߌ߬ߘߊ߬ߟߌ)
        too_large:
          planet:
            title: ߖߊ߯ߓߊߟߌ OSM
        too_large:
          planet:
            title: ߖߊ߯ߓߊߟߌ OSM
@@ -1278,11 +1395,6 @@ nqo:
            title: ߛߎ߲߫ ߜߘߍ ߟߎ߬
            description: ߊ߬ ߛߎ߲߫ ߞߏ ߡߞߊ߬ߝߏ߬ߟߌ߬ ߜߘߍ߫ ߟߎ߫ ߛߙߍߘߍ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ
              ߞߊ߲߬
            title: ߛߎ߲߫ ߜߘߍ ߟߎ߬
            description: ߊ߬ ߛߎ߲߫ ߞߏ ߡߞߊ߬ߝߏ߬ߟߌ߬ ߜߘߍ߫ ߟߎ߫ ߛߙߍߘߍ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ
              ߞߊ߲߬
-      options: ߢߣߊߕߊߟߌ
-      format: ߖߙߎߡߎ߲
-      image_size: ߖߌ߬ߦߊ߬ߓߍ ߢߊ߲ߞߊ߲
-      zoom: ߡߛߊ߬ߡߊ߲߬ߠߌ߲
-      add_marker: ߣߐ߬ߣߐ߬ߟߊ߲ ߓߌ߬ߟߊ߬ ߡߊߔ ߟߊ߫
        export_button: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
      fixthemap:
        title: ߝߙߋߞߋ ߘߏ߫ ߟߊߞߏߝߐ߫\ߔߊ߬ߔߘߊ ߘߐߓߍ߲߬
        export_button: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
      fixthemap:
        title: ߝߙߋߞߋ ߘߏ߫ ߟߊߞߏߝߐ߫\ߔߊ߬ߔߘߊ ߘߐߓߍ߲߬
@@ -1290,6 +1402,8 @@ nqo:
          title: ߘߍ߬ߡߍ߲ ߦߋ߫ ߞߍ߫ ߟߊ߫ ߘߌ߬
          join_the_community:
            title: ߕߘߍ߬ ߘߍ߬ߘߊ ߘߏ߫ ߘߐ߫
          title: ߘߍ߬ߡߍ߲ ߦߋ߫ ߞߍ߫ ߟߊ߫ ߘߌ߬
          join_the_community:
            title: ߕߘߍ߬ ߘߍ߬ߘߊ ߘߏ߫ ߘߐ߫
+      other_concerns:
+        title: ߞߣߐߜߊ߫ ߜߘߍ߫ ߟߎ߫
      help:
        title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߡߊߛߐ߬ߘߐ߲
        introduction: ߛߎ߲߫ ߥߙߍߓߊߓߊ ߟߎ߬ ߟߋ߬ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߓߟߏ߫ ߖߊ߬ߕߋ߬ߘߐ߬ߛߌ߮ ߟߎ߬
      help:
        title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߡߊߛߐ߬ߘߐ߲
        introduction: ߛߎ߲߫ ߥߙߍߓߊߓߊ ߟߎ߬ ߟߋ߬ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߓߟߏ߫ ߖߊ߬ߕߋ߬ߘߐ߬ߛߌ߮ ߟߎ߬
@@ -1299,31 +1413,21 @@ nqo:
          url: /welcome
          title: ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߞߊ߲߬߹
        beginners_guide:
          url: /welcome
          title: ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߞߊ߲߬߹
        beginners_guide:
-        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
          title: ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߢߍߡߌߘߊ
          description: ߘߍ߬ߘߊ ߦߋ߫ ߢߍߡߌߘߊ ߘߏ߫ ߘߐߓߍ߲߬ ߠߊ߫ ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߦߋ߫.
          title: ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߢߍߡߌߘߊ
          description: ߘߍ߬ߘߊ ߦߋ߫ ߢߍߡߌߘߊ ߘߏ߫ ߘߐߓߍ߲߬ ߠߊ߫ ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߦߋ߫.
-      help:
-        url: https://help.openstreetmap.org/
-        title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߟߐ߯ߓߊߟߐ
-        description: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߘߏ߫ ߞߍ߫ ߤߊߡߊ߲ߕߍ߫ ߞߊ߬ ߖߋ߬ߓߌ ߘߏ߫ ߟߎ߫ ߡߊߝߟߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ
-          ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ-ߣߴߊ߬-ߖߋ߬ߓߌ ߞߍߦߙߐ ߞߊ߲߬.
        mailing_lists:
          title: ߢߎߡߍߙߋ߲ߦߊߟߌ ߛߙߍߘߍ ߟߎ߬
        mailing_lists:
          title: ߢߎߡߍߙߋ߲ߦߊߟߌ ߛߙߍߘߍ ߟߎ߬
-      forums:
-        title: ߟߐ߯ߓߊߟߐ
        welcomemat:
        welcomemat:
-        url: https://welcome.openstreetmap.org/
          title: ߛߌ߲߬ߝߏ߲߬ߘߊ ߢߍ߫
        wiki:
          title: ߛߌ߲߬ߝߏ߲߬ߘߊ ߢߍ߫
        wiki:
-        url: https://wiki.openstreetmap.org/
          title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ
          description: ߥߞߌ ߛߏ߲߯ߓߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߘߐ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߘߐߘߎ߲߰ߧߊ߬ߣߍ߲߬ ߞߏ߫ ߘߐ߫
          title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ
          description: ߥߞߌ ߛߏ߲߯ߓߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߘߐ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߘߐߘߎ߲߰ߧߊ߬ߣߍ߲߬ ߞߏ߫ ߘߐ߫
+    any_questions:
+      title: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߬ ߛߌ߫؟
      sidebar:
        search_results: ߞߐߝߟߌ ߟߎ߬ ߢߌߣߌ߲߫
      sidebar:
        search_results: ߞߐߝߟߌ ߟߎ߬ ߢߌߣߌ߲߫
-      close: ߊ߬ ߘߊߕߎ߲߯
      search:
        search: ߢߌߣߌ߲ߣߌ߲
      search:
        search: ߢߌߣߌ߲ߣߌ߲
-      get_directions: ߞߎ߲߬ߕߋߟߋ߲ ߠߎ߬ ߡߊߛߐ߬ߘߐ߲߬
        get_directions_title: ߞߎ߲߬ߕߋߟߋ߲ ߢߌߣߌ߲߫ ߘߊߞߎ߲߫ ߝߌ߬ߟߊ߬ ߟߎ߫ ߕߍ߫
        from: ߞߊ߬ ߝߘߊ߫
        to: ߞߊ߬ ߕߊ߯
        get_directions_title: ߞߎ߲߬ߕߋߟߋ߲ ߢߌߣߌ߲߫ ߘߊߞߎ߲߫ ߝߌ߬ߟߊ߬ ߟߎ߫ ߕߍ߫
        from: ߞߊ߬ ߝߘߊ߫
        to: ߞߊ߬ ߕߊ߯
@@ -1333,30 +1437,32 @@ nqo:
      key:
        table:
          entry:
      key:
        table:
          entry:
+          motorway: ߝߏ߲߬ߘߏ
            main_road: ߛߌߟߊ߫ ߓߊߖߎߡߊ
            main_road: ߛߌߟߊ߫ ߓߊߖߎߡߊ
+          primary: ߛߌߟߊ ߓߊߖߎߟߞߊ
+          unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
            footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
            rail: ߣߍ߰ߛߌߟߊ
            subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
            footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
            rail: ߣߍ߰ߛߌߟߊ
            subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
-          cable:
-          - ߘߎ߲ߞߎߟߎ߲
-          runway:
-          - ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
-          - ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
+          cable_car: ߘߎ߲ߞߎߟߎ߲
+          runway: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
+          taxiway: ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
            admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
            forest: ߕߎ
            wood: ߦߙߌ
            admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
            forest: ߕߎ
            wood: ߦߙߌ
+          common: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
+          resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
+          retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
            industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
            commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
            industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
            commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
-          lake:
-          - ߞߐ߰ߖߌ߬ߘߟߊ
+          lake: ߞߐ߰ߖߌ߬ߘߟߊ
            farm: ߝߏ߬ߘߏ
            cemetery: ߞߊߓߙߎߟߏ
            centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
            reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
            military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
            farm: ߝߏ߬ߘߏ
            cemetery: ߞߊߓߙߎߟߏ
            centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
            reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
            military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
-          school:
-          - ߞߊ߬ߙߊ߲߬ߕߊ
-          - ߖߊ߯ߓߘߊ
+          school: ߞߊ߬ߙߊ߲߬ߕߊ
+          university: ߖߊ߯ߓߘߊ
            station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
            construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
            bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
            station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
            construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
            bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
@@ -1366,8 +1472,6 @@ nqo:
        title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹
        whats_on_the_map:
          title: ߡߎ߲߬ ߠߋ߬ ߦߋ߫ ߡߊߔ ߞߊ߲߬
        title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹
        whats_on_the_map:
          title: ߡߎ߲߬ ߠߋ߬ ߦߋ߫ ߡߊߔ ߞߊ߲߬
-      questions:
-        title: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߬ ߛߌ߫؟
        start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
        add_a_note:
          title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹
        start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
        add_a_note:
          title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹
@@ -1375,7 +1479,6 @@ nqo:
      new:
        upload_trace: GPS ߜߋ߬ߙߋ ߟߊߞߎߘߦߊ߫
        visibility_help: ߣߌ߲߬ ߞߘߐ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
      new:
        upload_trace: GPS ߜߋ߬ߙߋ ߟߊߞߎߘߦߊ߫
        visibility_help: ߣߌ߲߬ ߞߘߐ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
        help: ߘߍ߬ߡߍ߲߬ߠߌ߲
        help_url: https://wiki.openstreetmap.org/ߥߞߌ/ߟߊ߬ߦߟߍ߬ߟߌ
      create:
        help: ߘߍ߬ߡߍ߲߬ߠߌ߲
        help_url: https://wiki.openstreetmap.org/ߥߞߌ/ߟߊ߬ߦߟߍ߬ߟߌ
      create:
@@ -1387,11 +1490,10 @@ nqo:
        visibility_help: ߣߌ߲߬ ߞߘߐ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
      update:
        updated: ߜߋ߬ߙߋ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫
        visibility_help: ߣߌ߲߬ ߞߘߐ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
      update:
        updated: ߜߋ߬ߙߋ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫
-    trace_optionals:
-      tags: ߘߎ߲ߛߓߍ ߟߎ߬
      show:
        title: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
        heading: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
      show:
        title: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
        heading: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
+      pending: ߡߊ߬ߞߐ߬ߣߐ߲߬ߠߌ߲ ߘߐ߫
        filename: ߞߐߕߐ߮ ߕߐ߮
        download: ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲
        uploaded: 'ߛߊ߬ߦߌ߬ߣߍ߲߫:'
        filename: ߞߐߕߐ߮ ߕߐ߮
        download: ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲
        uploaded: 'ߛߊ߬ߦߌ߬ߣߍ߲߫:'
@@ -1408,33 +1510,24 @@ nqo:
        trace_not_found: ߜߋ߬ߙߋ ߡߊ߫ ߛߐ߬ߘߐ߲߫߹
        visibility: 'ߦߋߟߌ:'
        confirm_delete: ߞߊ߬ ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫؟
        trace_not_found: ߜߋ߬ߙߋ ߡߊ߫ ߛߐ߬ߘߐ߲߫߹
        visibility: 'ߦߋߟߌ:'
        confirm_delete: ߞߊ߬ ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫؟
-    trace_paging_nav:
-      showing_page: ߞߐߜߍ %{page}
-      older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
-      newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
      trace:
      trace:
+      pending: ߡߊ߬ߞߐ߬ߣߐ߲߬ߠߌ߲ ߘߐ߫
        more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
        view_map: ߡߊߔ ߦߋ߫
        edit_map: ߡߊߔ ߡߊߦߟߍ߬ߡߊ߲߫
        public: ߡߌ߬ߙߌ߲߬ߘߌ
        identifiable: ߡߊ߬ߟߐ߲߬ߕߊ
        more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
        view_map: ߡߊߔ ߦߋ߫
        edit_map: ߡߊߔ ߡߊߦߟߍ߬ߡߊ߲߫
        public: ߡߌ߬ߙߌ߲߬ߘߌ
        identifiable: ߡߊ߬ߟߐ߲߬ߕߊ
+      private: ߘߎ߲߬ߘߎ߬ߡߊ
        trackable: ߜߙߋ߬ߓߐ߬ߕߊ
        trackable: ߜߙߋ߬ߓߐ߬ߕߊ
-      by: ߞߊ߬ ߝߘߊ߫
-      in: ߘߐ߫
      index:
        public_traces: ߜߍߘߐ߫ GPS ߜߋ߬ߙߋ ߟߎ߬
      index:
        public_traces: ߜߍߘߐ߫ GPS ߜߋ߬ߙߋ ߟߎ߬
-      my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
        public_traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
        public_traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
-      empty_html: ߝߏߦߌ߬ ߕߍ߫ ߦߊ߲߬ ߡߎߣߎ߲߬. <a href='%{upload_link}'>ߜߙߋ߬ ߞߎߘߊ߫ ߟߊߦߟߍ߬</a>ߥߟߊ߫
-        ߘߏ߫ ߜߘߍ߫ ߟߎ߫ ߘߐߞߊ߬ߙߊ߲ ߞߊ߬ ߓߍ߲߬ GPS ߜߙߋ߬ߓߐ߬ߟߌ ߡߊ߬ <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>ߥߞߌ߫
-        ߞߐߜߍ</a> ߞߊ߲߬.
        upload_trace: ߜߋ߬ߙߋ ߘߏ߫ ߟߊߦߟߍ߬
        all_traces: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
        upload_trace: ߜߋ߬ߙߋ ߘߏ߫ ߟߊߦߟߍ߬
        all_traces: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
+      my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
        traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
      destroy:
        scheduled_for_deletion: ߜߋ߬ߙߋ ߟߐ߯ߟߊߟߌ ߖߏ߰ߛߌ߬ ߞߊ߲ߡߊ߬
        traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
      destroy:
        scheduled_for_deletion: ߜߋ߬ߙߋ ߟߐ߯ߟߊߟߌ ߖߏ߰ߛߌ߬ ߞߊ߲ߡߊ߬
-    make_public:
-      made_public: ߜߋ߬ߙߋ ߡߍ߲ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߖߊ߬ߡߊ ߓߟߏ߫
      offline_warning:
        message: GPX ߞߐߕߐ߮ ߟߊߦߟߍ߬ ߞߊ߲ߞߋ ߕߴߊ߬ ߟߊ߫ ߕߍ߯ߣߍ߲ ߣߌ߲߬ ߘߐ߫ ߕߊ߲߬
      offline:
      offline_warning:
        message: GPX ߞߐߕߐ߮ ߟߊߦߟߍ߬ ߞߊ߲ߞߋ ߕߴߊ߬ ߟߊ߫ ߕߍ߯ߣߍ߲ ߣߌ߲߬ ߘߐ߫ ߕߊ߲߬
      offline:
@@ -1449,8 +1542,6 @@ nqo:
      require_cookies:
        cookies_needed: ߌ ߞߎ߲߬ߓߐߣߍ߲߫ ߠߋ߬ ߦߏ߫ ߞߎߞߌߦߋ ߓߐߣߴߊ߬ ߟߴߌ ߓߟߏ߫ - ߞߎߞߌߦߋ ߓߌ߬ߟߵߊ߬
          ߟߴߌ ߟߊ߫ ߛߏ߲߯ߓߊߟߊ߲ ߠߊ߫ ߦߊ߬ߣߴߌ ߦߋ߫ ߛߌߟߊ ߘߊߓߊ߲߫.
      require_cookies:
        cookies_needed: ߌ ߞߎ߲߬ߓߐߣߍ߲߫ ߠߋ߬ ߦߏ߫ ߞߎߞߌߦߋ ߓߐߣߴߊ߬ ߟߴߌ ߓߟߏ߫ - ߞߎߞߌߦߋ ߓߌ߬ߟߵߊ߬
          ߟߴߌ ߟߊ߫ ߛߏ߲߯ߓߊߟߊ߲ ߠߊ߫ ߦߊ߬ߣߴߌ ߦߋ߫ ߛߌߟߊ ߘߊߓߊ߲߫.
-    require_admin:
-      not_an_admin: ߌ ߞߊߡߊ߲߫ ߞߊ߬ ߞߍ߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ ߘߌ߫ ߦߊ߬ߣߴߌ ߦߋ߫ ߞߴߏ߬ ߓߟߏߦߊ߫.
      setup_user_auth:
        blocked_zero_hour: ' ߌ ߓߘߊ߫ ߜߍ߬ߘߍ߲߬ߘߐ߬ ߗߋߛߓߍ ߘߏ߫ ߛߐ߬ߘߐ߲߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߓߟߐߟߐ߫
          ߞߍߦߙߐ ߟߊ߫. ߌ ߞߊߞߊ߲߫ ߞߵߏ߬ ߞߊ߬ߙߊ߲߬ ߡߎߣߎ߲߬ ߏ߬ ߓߊ߯ ߞߴߌ ߘߌ߫ ߛߋ߫ ߞߵߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
      setup_user_auth:
        blocked_zero_hour: ' ߌ ߓߘߊ߫ ߜߍ߬ߘߍ߲߬ߘߐ߬ ߗߋߛߓߍ ߘߏ߫ ߛߐ߬ߘߐ߲߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߓߟߐߟߐ߫
          ߞߍߦߙߐ ߟߊ߫. ߌ ߞߊߞߊ߲߫ ߞߵߏ߬ ߞߊ߬ߙߊ߲߬ ߡߎߣߎ߲߬ ߏ߬ ߓߊ߯ ߞߴߌ ߘߌ߫ ߛߋ߫ ߞߵߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
@@ -1462,28 +1553,28 @@ nqo:
          ߡߊ߬߸ ߞߏ߬ߣߌ߲߬ ߌ ߦߴߊ߬ߟߎ߬ ߦߋ߫ ߕߎ߲߫.
      settings_menu:
        account_settings: ߖߊ߬ߕߋ߬ߘߊ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߫
          ߡߊ߬߸ ߞߏ߬ߣߌ߲߬ ߌ ߦߴߊ߬ߟߎ߬ ߦߋ߫ ߕߎ߲߫.
      settings_menu:
        account_settings: ߖߊ߬ߕߋ߬ߘߊ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߫
+      oauth2_applications: 0Auth 2 ߟߥߊ߬ߟߌ߬ߟߌ ߟߎ߬
+      oauth2_authorizations: 0Auth 2 ߖߡߊ߬ߙߌ߬ߦߊ߬ߟߌ
+    auth_providers:
+      openid:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID ߘߌ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID URL ߟߊ߫
+      google:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߏߔߌ߲ ID ߟߊ߫
+      facebook:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
+      microsoft:
+        title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+      github:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+      wikipedia:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
    oauth:
    oauth:
-    authorize:
-      title: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲ ߠߊߘߌ߬ߢߍ߬
-      request_access_html: ߟߥߊ߬ߟߌ߬ߟߊ߲ %{app_name} ߦߴߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲߬ ߞߏ ߡߊߢߌߣߌ߲߫
-        ߠߊ߫߸ %{user} ߊ߬ ߡߊߝߟߍ߫ ߡߎߣߎ߲߬ ߖߊ߰ߣߌ߲߫ ߣߌ߫ ߟߥߊ߬ߟߌ߬ߟߊ߲ ߠߊ߫ ߛߋߞߏߦߊ ߏ߬ ߟߎ߬ ߟߊߛߐ߬ߘߐ߲
-        ߞߊߘߴߌ ߦߋ߫. ߌ ߘߌ߫ ߛߋ߫ ߛߌߦߊߡߊ߲߫ ߛߎߥߊ߲ߘߌ߫ ߟߴߊ߬ߟߎ߬ ߘߐ߫ ߥߟߊ߫ ߞߋߟߋ߲߫߸ ߡߍ߲ ߓߊ߯ ߘߌߦߊ߫
-        ߌ ߦߋ߫ ߕߎ߲߫.
-      allow_to: 'ߛߊ߲߬ߠߌ߲߬ߢߐ߲߰ ߟߥߊߟߌߟߊ߲ ߠߊߘߌ߬ߢߍ߫ ߞߊ߬:'
-      allow_read_prefs: ߌ ߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߞߊ߬ߙߊ߲߫.
-      allow_write_prefs: ߌ ߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫.
-      allow_write_diary: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߛߌ߲ߘߌ߫߸ ߡߙߌߣߊ߲ ߊ߬ ߣߌ߫ ߞߊ߬ ߕߋߙߌ ߟߎ߬ ߟߊߘߊ߲߫.
-      allow_write_api: ߔߊ߬ߔߘߊ ߡߊߦߟߍ߬ߡߊ߲߫
-      allow_read_gpx: ߌ ߘߎ߲߬ߘߎ߬ߡߊ߬ GPS ߝߏ߲߬ߝߏ߲ ߠߎ߬ ߘߐߞߊ߬ߙߊ߲߬
-      allow_write_gpx: GPS ߝߏ߲߬ߝߏ߲ ߠߊߞߎߘߦߊ߫.
-      allow_write_notes: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-      grant_access: ߟߊ߬ߛߐ߬ߘߐ߲߬ߠߌ߲ ߠߊߡߌ߬ߘߊ߬
-    authorize_success:
-      title: ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ ߓߘߊ߫ ߟߊߘߤߊ߬
-      verification: ߝߛߍ߬ߝߛߍ߬ߟߌ ߘߏߞߊ߲ ߦߋ߫ %{code} ߟߋ߬ ߘߌ߫
-    authorize_failure:
-      title: ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ ߓߘߊ߫ ߗߌߙߏ߲߫
-      invalid: ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ ߖߐߟߐ߲ߞߐ ߓߍ߲߬ߣߍ߲߫ ߕߍ߫
      scopes:
        read_prefs: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߘߐߞߊ߬ߙߊ߲߬
        write_prefs: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
      scopes:
        read_prefs: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߘߐߞߊ߬ߙߊ߲߬
        write_prefs: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
@@ -1492,26 +1583,6 @@ nqo:
        write_gpx: GPS ߝߏ߲߬ߝߏ߲ ߠߊߦߟߍ߬
        write_notes: ߦߟߌߣߐ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
        read_email: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߞߊ߬ߙߊ߲߬
        write_gpx: GPS ߝߏ߲߬ߝߏ߲ ߠߊߦߟߍ߬
        write_notes: ߦߟߌߣߐ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
        read_email: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߞߊ߬ߙߊ߲߬
-  oauth_clients:
-    new:
-      title: ߟߥߊ߬ߟߌ߬ߟߌ߬ ߞߎߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
-    edit:
-      title: ߌ ߟߊ߫ ߟߥߊ߬ߟߌ߬ߟߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫
-    show:
-      title: OAuthn %{app_name} ߝߊߙߊ߲ߝߊ߯ߛߟߌ
-      url: 'ߖߐߟߐ߲ߞߐ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ URL:'
-      access_url: 'ߟߊ߬ߛߐ߬ߘߐ߲߬ߠߌ߲ ߖߐߟߐ߲ߞߐ URL:'
-      edit: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-      delete: ߛߊ߲߬ߠߌ߲߬ߢߐ߲߮ ߖߏ߬ߛߌ߫
-      confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟
-    not_found:
-      sorry: ߤߊߞߍ߬ߕߏ߫߸ %{type} ߕߍߣߊ߬ ߛߐ߬ߘߐ߲߬ ߠߊ߫.
-    create:
-      flash: ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߟߊߞߎ߲߬ߘߎ߬ߟߌ ߓߘߊ߫ ߛߎߘߊ߲߫ ߞߏߟߌߞߏߟߌ߫
-    update:
-      flash: ߛߊ߲߬ߣߌ߲߬ߢߐ߲߮ ߞߎ߲߬ߠߊ߬ߝߏߣߌ߲ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫.
-    destroy:
-      flash: ߛߊ߲߬ߠߌ߲߬ߢߐ߲߰ ߟߥߊߟߌߟߊ߲ ߕߐ߯ߛߓߍߟߌ ߓߘߊ߫ ߘߐߕߌߢߍ߫ ߔߛߐߞߐ߫.
    oauth2_applications:
      index:
        title: ߒ ߛߊ߲߬ߠߌ߲߬ߢߐ߲߰ ߟߥߊߟߌߟߊ߲ ߠߎ߬
    oauth2_applications:
      index:
        title: ߒ ߛߊ߲߬ߠߌ߲߬ߢߐ߲߰ ߟߥߊߟߌߟߊ߲ ߠߎ߬
@@ -1554,9 +1625,6 @@ nqo:
    users:
      new:
        title: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
    users:
      new:
        title: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
-      email address: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
-      confirm email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫:'
-      display name: 'ߟߊ߬ߓߊ߰ߙߊ߬ ߕߐ߮:'
        display name description: ߌ ߓߘߊ߫ ߕߐ߮ ߟߊߓߊ߯ߙߕߊ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫.ߌ ߘߌ߫ ߛߴߏ߬
          ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߞߣߐ߫ ߞߐߝߍ߬.
        continue: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
        display name description: ߌ ߓߘߊ߫ ߕߐ߮ ߟߊߓߊ߯ߙߕߊ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫.ߌ ߘߌ߫ ߛߴߏ߬
          ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߞߣߐ߫ ߞߐߝߍ߬.
        continue: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
@@ -1572,11 +1640,7 @@ nqo:
          ߞߍ ߘߐ߫ ߖߊ߬ߡߊ ߘߍ߬ߒ߬ߡߊ߬ߝߋ߲ ߘߌ߫
        consider_pd_why: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
        consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
          ߞߍ ߘߐ߫ ߖߊ߬ߡߊ ߘߍ߬ߒ߬ߡߊ߬ߝߋ߲ ߘߌ߫
        consider_pd_why: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
        consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
-      guidance_html: 'ߞߎ߲߬ߠߊ߬ߝߏߣߌ߲ ߡߍ߲ ߦߋ߫ ߦߋ߲߬ ߞߊ߬ ߛߋ߫ ߛߙߊߕߌ ߏ߬ ߝߊ߰ߡߎ߲߬ ߠߊ߫: <a href="%{summary}">ߡߐ߱
-        ߟߊ߫ ߛߟߊ߫ ߘߐߞߊ߬ߙߊ߲߬ߕߊ</a> ߣߌ߫ <a href="%{translations}">ߞߎ߲߬ߠߊ߬ߝߏߣߌ߲ ߘߟߊߡߌߘߊߟߌ</a>
-        ߘߏ߫ ߟߎ߫'
        continue: ߊ߬ ߘߊߓߊ߲߫
        continue: ߊ߬ ߘߊߓߊ߲߫
-      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
        legale_select: 'ߌ ߛߌ߰ߣߍ߲߬ ߦߋ߫ ߖߡߊ߬ߣߊ ߡߍ߲ ߘߐ߫:'
        legale_names:
          france: ߝߊ߬ߙߊ߲߬ߛߌ߫
        legale_select: 'ߌ ߛߌ߰ߣߍ߲߬ ߦߋ߫ ߖߡߊ߬ߣߊ ߡߍ߲ ߘߐ߫:'
        legale_names:
          france: ߝߊ߬ߙߊ߲߬ߛߌ߫
@@ -1587,7 +1651,6 @@ nqo:
          ߞߎߘߊ ߛߙߊߕߌ ߟߊߡߌ߬ߣߊ߫ ߟߊ߫. ߛߴߌ ߘߌ߫ ߞߎ߲߬ߠߊ߬ߝߏ߬ߣߌ߲߫ ߛߌߦߊߡߊ߲߫ ߞߏ ߘߐ߫߸ %{terms_declined_link}
          ߘߐߜߍ߫ ߖߊ߰ߣߌ߲߫.
        terms_declined_link: ߥߞߌ߫ ߞߐߜߍ ߣߌ߲߬
          ߞߎߘߊ ߛߙߊߕߌ ߟߊߡߌ߬ߣߊ߫ ߟߊ߫. ߛߴߌ ߘߌ߫ ߞߎ߲߬ߠߊ߬ߝߏ߬ߣߌ߲߫ ߛߌߦߊߡߊ߲߫ ߞߏ ߘߐ߫߸ %{terms_declined_link}
          ߘߐߜߍ߫ ߖߊ߰ߣߌ߲߫.
        terms_declined_link: ߥߞߌ߫ ߞߐߜߍ ߣߌ߲߬
-      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      no_such_user:
        title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߛߎ߮ ߏ߬ ߕߍ߫ ߦߋ߲߬
        heading: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{user} ߕߍ߫ ߦߋ߲߬
      no_such_user:
        title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߛߎ߮ ߏ߬ ߕߍ߫ ߦߋ߲߬
        heading: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{user} ߕߍ߫ ߦߋ߲߬
@@ -1596,16 +1659,17 @@ nqo:
        deleted: ߖߏ߬ߛߌ߬ߣߍ߲
      show:
        my diary: ߒ ߕߋ߬ߟߋ߲
        deleted: ߖߏ߬ߛߌ߬ߣߍ߲
      show:
        my diary: ߒ ߕߋ߬ߟߋ߲
-      new diary entry: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ
        my edits: ߒ ߠߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
        my traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
        my notes: ߒ ߠߊ߫ ߦߟߌߣߐ ߟߎ߫
        my messages: ߒ ߠߊ߫ ߗߋߛߓߍ ߟߎ߬
        my edits: ߒ ߠߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
        my traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
        my notes: ߒ ߠߊ߫ ߦߟߌߣߐ ߟߎ߫
        my messages: ߒ ߠߊ߫ ߗߋߛߓߍ ߟߎ߬
+      my profile: ߒ ߠߊ߫ ߢߊߞߙߍ
        my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
        my comments: ߒ ߠߊ߫ ߡߙߌߣߊ߲ ߠߎ߬
        my_preferences: ߒ ߠߊ߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
        blocks on me: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߡߍ߲ ߦߋ߫ ߒ ߞߊ߲߬
        blocks by me: ߡߍ߲ ߠߎ߬ ߓߊ߬ߟߊ߲߬ߣߍ߲߫ ߦߋ߫ ߒߠߋ ߓߟߏ߫
        my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
        my comments: ߒ ߠߊ߫ ߡߙߌߣߊ߲ ߠߎ߬
        my_preferences: ߒ ߠߊ߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
        blocks on me: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߡߍ߲ ߦߋ߫ ߒ ߞߊ߲߬
        blocks by me: ߡߍ߲ ߠߎ߬ ߓߊ߬ߟߊ߲߬ߣߍ߲߫ ߦߋ߫ ߒߠߋ ߓߟߏ߫
+      edit_profile: ߢߊߞߙߍ ߡߊߦߟߍ߬ߡߊ߲߫
        send message: ߗߋߛߓߍ߫ ߗߋߣߍ߲
        diary: ߕߋ߬ߟߋ߲
        edits: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
        send message: ߗߋߛߓߍ߫ ߗߋߣߍ߲
        diary: ߕߋ߬ߟߋ߲
        edits: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
@@ -1614,10 +1678,9 @@ nqo:
        remove as friend: ߕߋߙߌߦߊ ߝߘߊ߫
        add as friend: ߕߋߙߌ ߝߙߊ߬
        mapper since: 'ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߌ߫ ߞߊ߬ߦߌ߯:'
        remove as friend: ߕߋߙߌߦߊ ߝߘߊ߫
        add as friend: ߕߋߙߌ ߝߙߊ߬
        mapper since: 'ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߌ߫ ߞߊ߬ߦߌ߯:'
+      ct status: 'ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬:'
        email address: 'ߢߎߡߍߙߋ߲߫ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
        created from: 'ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߞߊ߬ ߝߘߊ߫:'
        email address: 'ߢߎߡߍߙߋ߲߫ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
        created from: 'ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߞߊ߬ ߝߘߊ߫:'
-      description: ߞߊ߲߬ߛߓߍߟߌ
-      user location: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߘߌ߲߬ߞߌߙߊ
        role:
          administrator: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߦߋ߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ ߟߋ߬ ߘߌ߫
        create_block: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߊ߬ߟߌ߬
        role:
          administrator: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߦߋ߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ ߟߋ߬ ߘߌ߫
        create_block: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߊ߬ߟߌ߬
@@ -1628,6 +1691,138 @@ nqo:
        delete_user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߖߏ߰ߛߌ߫
        confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
        report: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߠߊߞߏߝߐ߫
        delete_user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߖߏ߰ߛߌ߫
        confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
        report: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߠߊߞߏߝߐ߫
+    index:
+      title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬
+      heading: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬
+      summary_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{ip_address} ߟߋ߬ ߡߊ߬ %{date} ߟߊ߫'
+      summary_no_ip_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{date} ߟߋ߬ ߟߊ߫'
+      empty: ߕߙߏ߬ߞߏ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߫
+    page:
+      confirm: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߟߊߛߙߋߦߊ߫
+      hide: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߢߡߊߘߏ߲߰
+    suspended:
+      title: ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߘߎ߲ߣߍ߲
+      heading: ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߘߎ߲ߣߍ߲
+      support: ߘߍ߬ߡߍ߲߬ߠߌ߲
      auth_failure:
        unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫
      auth_failure:
        unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫
+  user_blocks:
+    helper:
+      time_future_html: ߘߌ߫ ߓߊ߲߫ %{time} ߟߊ߫.
+    show:
+      created: 'ߛߌ߲ߘߌߣߍ߲:'
+      duration: 'ߘߎ߲ߡߊߟߌ:'
+      status: 'ߡߊ߬ߘߎ߮:'
+      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+      reason: 'ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭:'
+    block:
+      show: ߊ߬ ߦߌ߬ߘߊ߬
+      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+    page:
+      creator_name: ߛߌ߲ߘߌߟߊ߲
+      reason: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭
+  notes:
+    index:
+      no_notes: ߦߟߌߣߐ߫ ߛߌ߫ ߕߴߦߋ߲߬
+      id: ߡߊ߬ߟߐ߲ߟߊ߲
+      creator: ߛߌ߲ߘߌߟߊ߲
+      description: ߞߊ߲߬ߛߓߍߟߌ
+      created_at: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫
+      last_changed: ߞߐ߯ߟߊ߫ ߡߊߦߟߍߡߊ߲ߠߌ߲
+    show:
+      title: 'ߦߟߌߣߐ: %{id}'
+      description: ߕߐ߯ߛߓߍߟߌ
+      open_title: ߦߟߌߣߐ߫ ߢߊߓߐߓߊߟߌ %{note_name}
+      closed_title: ߦߟߌߣߐ߫ ߢߊߓߐߣߍ߲ %{note_name}
+      hidden_title: ߦߟߌߣߐ߫ ߢߡߊߘߏ߲߰ߣߍ߲ %{note_name}
+      report: ߦߟߌߣߐ ߣߌ߲߬ ߠߊߞߏߝߐ߫
+      hide: ߊ߬ ߢߡߊߘߏ߲߰
+      resolve: ߊ߬ ߢߊߓߐ߫
+      reactivate: ߊ߬ ߟߊߞߎߣߎ߲߫
+    new:
+      title: ߦߟߌߣߐ߫ ߞߎߘߊ߫
+      add: ߦߟߌߣߐ ߝߙߊ߬
+    notes_paging_nav:
+      showing_page: ߞߐߜߍ %{page}
+  javascripts:
+    close: ߊ߬ ߘߊߕߎ߲߯
+    share:
+      title: ߊ߬ ߟߊߖߍ߲ߛߍ߲߫
+      cancel: ߊ߬ ߘߐߛߊ߬
+      image: ߖߌ߬ߦߊ߬ߓߍ
+      link: ߛߘߌ߬ߜߋ߲ ߥߟߊ߫ HTML
+      long_link: ߛߘߌ߬ߜߋ߲
+      short_link: ߛߘߌ߬ߜߋ߲߫ ߛߎߘߎ߲
+      geo_uri: ߘߎ߰ߡ URL
+      embed: HTML
+      format: 'ߖߙߎߡߎ߲:'
+      download: ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲
+      short_url: URL ߛߎߘߎ߲
+      center_marker: ߔߊ߬ߔߘߊ ߕߊ߲ߓߊ߲ߓߐ߫ ߣߐ߬ߣߐ߬ߟߊ߲ ߠߊ߫
+      view_larger_map: ߔߊ߬ߔߘߊ߬ ߘߐߥߛߊ߬ߣߍ߲ ߦߋ߫
+    map:
+      zoom:
+        in: ߞߵߊ߬ ߡߊߛߊ߬ߡߊ߲߫
+        out: ߊ߬ ߡߊߓߐ߫
+      locate:
+        title: ߒ ߘߌ߲߬ߞߌߙߊ ߦߌ߬ߘߊ߬
+      base:
+        standard: ߛߎߡߊ߲ߘߊ߲ߕߊ
+        transport_map: ߡߊ߬ߘߏ߬ߣߌ߲߬ߠߌ߲ ߔߊ߬ߔߘߊ
+      layers:
+        notes: ߡߊߔ ߦߟߌߣߐ ߟߎ߬
+        data: ߔߊ߬ߔߘߊ ߟߐ߲ߕߊ
+        gps: ߜߍߘߐ߫ GPS ߜߋ߬ߙߋ ߟߎ߬
+    site:
+      edit_tooltip: ߔߊ߬ߔߘߊ ߡߊߦߟߍ߬ߡߊ߲߫
+      edit_disabled_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߔߊ߬ߔߘߊ ߡߊߦߟߍ߬ߡߊ߲߫
+      createnote_tooltip: ߦߟߌߣߐ ߘߏ߫ ߓߌ߬ߟߊ߫ ߔߊ߬ߔߘߊ ߟߊ߫
+      createnote_disabled_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߦߟߌߣߐ ߘߏ߫ ߓߌ߬ߟߊ߫ ߔߊ߬ߔߘߊ ߟߊ߫
+      map_notes_zoom_in_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߔߊ߬ߔߘߊ ߦߟߌߣߐ ߟߎ߬ ߦߋ߫
+      map_data_zoom_in_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߔߊ߬ߔߘߊ ߟߐ߲ߕߊ ߦߋ߫
+      queryfeature_tooltip: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
+      queryfeature_disabled_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߘߏ߫ ߟߎ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
+    directions:
+      engines:
+        fossgis_osrm_bike: ߣߍ߰ߛߏ (OSRM)
+        fossgis_osrm_car: ߞߐ߲߬ߛߏ (OSRM)
+        fossgis_osrm_foot: ߛߋ߲߬ߡߊ߬ߟߊ (OSRM)
+        graphhopper_bicycle: ߣߍ߰ߛߏ (GraphHopper)
+        graphhopper_car: ߞߐ߲߬ߛߏ (GraphHopper)
+        graphhopper_foot: ߛߋ߲߬ߡߊ߬ߟߊ (GraphHopper)
+      directions: ߞߎ߲߬ߕߋߟߋ߲
+      distance: ߝߏ߬ߣߊ߲
+      errors:
+        no_route: ߛߌߟߊ߫ ߕߍ߫ ߛߐ߲߬ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߦߙߐ߫ ߝߌ߬ߟߊ ߏ߬ ߟߎ߫ ߕߍߟߊ ߘߐ߫.
+        no_place: ߤߊߞߍ߬ߕߏ߫ - '%{place}' ߕߍ߫ ߛߐ߲߬ ߛߐ߬ߘߐ߲߬ ߠߊ߫.
+      instructions:
+        continue_without_exit: ߊ߬ ߘߊߓߊ߲߫ %{name} ߘߌ߫
+        slight_right_without_exit: ߊ߬ ߕߟߌߡߌ߲߫ ߞߌߣߌ߲ ߝߍ߬ %{name} ߟߊ߫.
+        turn_right_without_exit: ߊ߬ ߕߟߌߡߌ߲߫ ߞߌߣߌ߲ ߝߍ߬ %{name} ߟߊ߫.
+        sharp_right_without_exit: ߊ߬ ߕߟߌߡߌ߲߫ ߞߌߣߌ߲ ߝߍ߬ %{name} ߟߊ߫.
+        uturn_without_exit: ߌ ߡߎߙߎ߲ߘߎ߫ ߞߵߌ ߞߐߛߊ߬ߦߌ߫ %{name} ߡߊ߬
+        sharp_left_without_exit: ߊ߬ ߕߟߌߡߌ߲߫ ߣߎߡߊ߲ ߝߍ߬ %{name} ߘߌ߫
+        turn_left_without_exit: ߊ߬ ߕߟߌߡߌ߲߫ ߣߎߡߊ߲ ߝߍ߬ %{name} ߘߌ߫
+        follow_without_exit: '%{name} ߟߊߓߊ߬ߕߏ߬'
+        start_without_exit: ߊ߬ ߘߊߡߌ߬ߣߊ߬ %{name} ߡߊ߬
+        destination_without_exit: ߕߊ߯ߦߙߐ ߟߊߛߐ߬ߘߐ߲߬
+        unnamed: ߛߌߟߊ߫ ߕߐ߯ߒߕߊ߲
+        exit_counts:
+          first: ߁߭
+          second: ߂߲
+          third: ߃߲
+          fourth: ߄߲
+          fifth: ߅߲
+          sixth: ߆߲
+          seventh: ߇߲
+          eighth: ߈߲
+          ninth: ߉߲
+          tenth: ߁߀߲
+      time: ߕߎ߬ߡߊ
+    query:
+      node: ߥߎߙߋ߲ߛߋ߲
+      way: ߛߌߟߊ
+  redactions:
+    show:
+      confirm: ߌ ߘߍ߲߬ߞߣߍ߬ߦߊ߬ߣߍ߲߫؟
  ...
  ...