]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/nqo.yml
Merge pull request #4184 from AntonKhorev/print
[rails.git] / config / locales / nqo.yml
index b69b9398eacbe4f7cd043242a22bba05db786e85..846b4375e54e2c7b714412c5f8b6ca0c81ddf7ff 100644 (file)
@@ -59,7 +59,6 @@ nqo:
       message: ߗߋߛߓߍ
       node: ߘߐ߬ߞߌߛߍ
       node_tag: ߖߌߝߟߐ ߞߘߎ߬ߜߋ߲
-      notifier: ߦߟߌߣߐߕߊ
       old_node: ߘߐ߬ߞߌ߬ߛߍ߬ ߞߘߐ
       old_node_tag: ߖߌߝߟߐ ߞߘߎ߬ߜߋ߲߬ ߞߘߐ
       old_relation: ߕߍߓߊ߯ߦߊ߫ ߞߘߐ
@@ -100,9 +99,10 @@ nqo:
       diary_entry:
         user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
         title: ߝߐߡߊ
+        body: ߝߊ߬ߘߌ
         latitude: ߦߙߐ ߘߟߊߕߍ߯ߦߊ߫
         longitude: ߘߎ߰ߕߍ߬ߟߍ߲߬ߦߊ
-        language: ߞߊ߲
+        language_code: ߞߊ߲
       doorkeeper/application:
         name: ߕߐ߮
         redirect_uri: URLs ߟߊߞߎ߲߬ߛߌ߲߬ߠߌ߲
@@ -178,7 +178,7 @@ nqo:
       openid: ߏߔߌ߲ ID
       google: ߜ߭ߎߜ߭ߏߟ
       facebook: ߝߋߛߑߓߎߞ
-      windowslive: ߥߌ߲ߘߏߛ ߟߊ߯ߌߝ߭
+      microsoft: ߡߌߞߙߏߛߐߝߕ
       github: GitHub
       wikipedia: ߥߞߌߔߋߘߌߦߊ
   api:
@@ -247,16 +247,30 @@ nqo:
         disabled: ߊ߬ ߓߘߊ߫ ߓߴߊ߬ ߟߊ߫ ߊ߬ ߘߏ߲߬ ߕߍ߫ ߛߋ߫ ߟߐ߲ߕߊ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
           ߛߎ߯-ߎ-ߛߎ߫ ߞߐ߲߬ߣߍ߲߫ ߦߋ߫ ߢߍ ߘߐ߫߸ ߏ߬ ߓߍ߯ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߘߌ߫.
         disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
-      public editing note:
-        heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
       contributor terms:
         heading: ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬
         agreed: ߌ ߓߘߊ߫ ߘߌ߬ߢߍ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬.
         not yet agreed: ߌ ߡߊ߫ ߘߌ߬ߢߍ߬ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬ ߡߎߣߎ߲߬.
+        review link text: ߛߘߌ߬ߜߋ߲ ߣߌ߲߬ ߠߊߓߊ߬ߕߏ߫ ߌ ߟߊ߫ ߓߍ߲߬ߢߐ߲߰ߡߊ ߘߌ߫ ߖߊ߰ߣߌ߲߫߸، ߞߊ߬
+          ߓߟߏߡߊߜߍ߲߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߖߊ߬ߕߋߡߌ߬ߘߊ߬߸ ߊ߬ ߣߌ߫ ߞߵߊ߬ߟߎ߬ ߟߊߡߌ߬ߣߊ߬.
+        agreed_with_pd: ߌ ߓߘߊ߫ ߓߊ߲߫ ߊ߬ ߦߌ߬ߘߊ߬ ߟߊ߫ ߞߴߌ ߦߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߖߊ߬ߕߋ߬
+          ߟߊ߫ ߞߵߊ߬ ߦߋ߫ ߞߍ߫ ߝߘߏ߬ߓߊ߬ ߘߊߞߎ߲ ߘߐ߫.
         link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
       save changes button: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߠߊߞߎ߲߬ߘߎ߬
-      make edits public 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: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫. ߌ ߟߊ߫
         ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߡߊߝߟߍ߫ ߦߟߌߣߐ߫ ߞߏ ߘߐ߫ ߞߵߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫.
@@ -266,15 +280,12 @@ nqo:
   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} ߓߟߏ߫
+    created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago}
+    closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago}
+    created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫
+    closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫
+    deleted_ago_by_html: ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
+    edited_ago_by_html: ߡߊߙߟߍ߬ߡߊ߲߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
     version: ߦߌߟߡߊ
     in_changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
     anonymous: ߕߐ߯ߒߕߊ߲
@@ -294,8 +305,8 @@ nqo:
       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>
+      hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
+      comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
       changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
       osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
       feed:
@@ -303,6 +314,8 @@ nqo:
         title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
       join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
       discussion: ߘߊߘߐߖߊߥߏ
+      still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
+        ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
     node:
       title_html: 'ߥߎߙߋ߲ߛߋ߲: %{name}'
       history_title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}'
@@ -364,27 +377,6 @@ nqo:
       telephone_link: ߞߟߌߟߌ %{phone_number}
       colour_preview: ߞߐ߬ߟߐ %{colour_value} ߢߍߕߊ
       email_link: ߢ:ߞߏ߲ߘߏ %{email}
-    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: ߦߟߌߣߐ ߣߌ߲߬ ߠߊߞߏߝߐ߫
     query:
       title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
       introduction: ߡߊߔ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߌ ߡߊߛߘߎ߬ߧߊ߬ ߟߊߓߊ߯ߙߊߟߌ ߟߎ߫ ߢߌߣߌ߲߫.
@@ -423,9 +415,19 @@ nqo:
         ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   changeset_comments:
     comment:
+      comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id} %{author}
+        ߓߟߏ߫
       commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
+    comments:
+      comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id} ߠߊ߫
+        %{author} ߓߟߏ߫
     index:
       title_all: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ ߘߊߘߐߖߊߥߏ
+      title_particular: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+        ߘߊߘߐߖߊߥߏ
+    timeout:
+      sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߞߊ߲߬ߞߎߡߊ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ
+        ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   dashboards:
     contact:
       km away: ߞߎߘߍ %{count} ߝߏ߬ߣߊ߲ ߠߊ߫
@@ -476,11 +478,12 @@ nqo:
       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: ߗߋߛߓߍ ߗߋ߫ ߛߓߍߦߟߊ ߡߊ߬
+      no_comments: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߕߴߦߋ߲߬
       edit_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߡߊߦߟߍ߬ߡߊ߲߫
       hide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰
       unhide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰ߣߍ߲ ߓߐ߫
@@ -522,6 +525,15 @@ nqo:
       applications:
         create:
           notice: ߟߥߊ߬ߟߌ߬ߟߌ ߓߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
+  errors:
+    contact:
+      contact: ߛߊ߲߬ߓߊ߬ߕߐ߮
+    forbidden:
+      title: ߟߊߕߐ߲ߣߍ߲߫
+    internal_server_error:
+      title: ߟߥߊ߬ߟߌ߬ߟߌ ߝߎ߬ߕߎ߲߬ߕߌ
+    not_found:
+      title: ߞߐߕߐ߮ ߡߊ߬ ߛߐ߬ߘߐ߲߬
   friendships:
     make_friend:
       heading: ' ߞߊ߬ %{user} ߞߍ߫ ߌ ߕߋߙߌ ߘߌ߫؟'
@@ -539,15 +551,8 @@ nqo:
   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>
+        results_from_html: ߞߐߝߟߌ ߝߘߊߣߍ߲߫ ߦߋ߫ %{results_link} ߟߋ߬ ߟߊ߫
+        latlon: ߞߣߐߟߊ
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -557,6 +562,7 @@ nqo:
           gondola: ߖߟߎ߬ߞߎߟߎ߲
           magic_carpet: ߘߎ߰ߓߍ߲߬ ߞߘߎߞߘߎߟߊ
           platter: ߕߊ߬ߢߍ߲ߞߍߘߍ߲
+          pylon: ߟߐ߲
           station: ߘߎ߲ߞߎߟߎ߲ ߟߐ߬ߘߊ߮
           "yes": ߛߊ߲ߡߊ߫ ߛߌߟߊ (ߘߎ߲ߞߎߟߎ߲)
         aeroway:
@@ -636,11 +642,13 @@ nqo:
           public_bath: ߝߘߏ߬ߓߊ߬ ߞߏ߬ߦߙߐ
           public_bookcase: ߝߘߏ߬ߓߊ߬ ߛߓߍߘߊ
           public_building: ߝߘߏ߬ߓߊ߬ ߓߏ߲
+          recycling: ߟߊ߬ߞߎ߬ߘߦߊ߬ߟߌ߫ ߘߊߞߎ߲ (recyclage)
           restaurant: ߘߊߥߎ߲ߠߌ߲߫ ߦߙߐ
           school: ߞߊ߬ߙߊ߲߬ߕߊ
           shelter: ߥߊ߬ߣߊߙߌ
           shower: ߢߍ߲߮
           social_centre: ߘߍ߬ߘߐ߬ߞߏ ߟߎ߫ ߕߊ߲ߓߊ߲
+          social_facility: ߘߍ߬ߢߐ߲߰ߦߊ߬ ߗߋߘߊ \ ߓߊ߬ߛߊ߲߬ߢߐ߲߰ߘߐ߬ ߘߊߞߎ߲
           studio: ߓߟߏߦߊߛߏ
           swimming_pool: ߣߊߡߎ߲ߠߌ߲߫ ߘߟߊ
           taxi: ߥߊߟߌߥߊߟߌ
@@ -649,16 +657,19 @@ nqo:
           toilets: ߢߍ߲߮
           townhall: ߛߏߕߌ߯ߘߊ
           university: ߖߊ߯ߓߘߊ
+          vehicle_inspection: ߓߏ߬ߙߌ߬ߝߋ߲߬ ߝߛߍ߬ߝߛߍ߫ ߦߌߟߊ
           vending_machine: ߝߋ߰ߙߋ߬ߞߍ߬ ߕߙߏߞߏ
           veterinary: ߓߌߦߊ߲ߘߊ߲ߘߟߊ ߘߐ߬ߓߛߏ߬ߟߌ
           village_hall: ߕߏ߯ߘߊ ߛߏߕߌ߯ߟߊ߫
           waste_basket: ߢߡߊ߬ߞߍ߬ߝߋ߲
           waste_disposal: ߢߡߊ߬ߘߊ߲߬ߘߊ߫ ߦߌߟߊ
           waste_dump_site: ߛߎ߬ߣߎ߲߬ߞߎ߲
+          watering_place: ߖߌߡߊ߫ ߦߙߐ
           water_point: ߖߌ߫ ߡߊ߫ ߦߙߐ
           weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲
         boundary:
           administrative: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
+          political: ߛߎߥߊ߲ߘߟߌ ߓߐߕߏ߲
           protected_area: ߦߙߐ߫ ߟߊߞߊ߲ߘߊߣߍ߲
           "yes": ߓߐߕߏ߲
         bridge:
@@ -692,14 +703,31 @@ nqo:
           train_station: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߘߊ߬ߟߊ߫ ߓߏ߲
           university: ߖߊ߯ߓߘߊ ߓߏ߲
           warehouse: ߡߣߐ߬ߓߏ߲
+          "yes": ߓߏ߲
+        club:
+          sport: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ߫ ߛߘߍ
+          "yes": ߛߘߍ
         craft:
+          beekeeper: ߟߞߌߛߍ߫ ߡߙߊߟߊ
+          blacksmith: ߣߎ߬ߡߎ߲
+          brewery: ߢߐ߬ߘߟߐ߬ ߝߊ߲ߓߏ߲
+          carpenter: ߓߏ߲߫ ߜߊ߲ߜߊ߲ߠߊ \ ߦߙߌߛߊ߯ߟߊ
+          dressmaker: ߞߙߊߟߌߟߊ
           electrician: ߢߎߡߍߦߟߊ
           electronics_repair: ߢߎߡߍ߫ ߘߐߓߍ߲߫ ߦߙߐ
+          gardener: ߣߊߞߐߦߟߊ
+          glaziery: ߘߎ߬ߡߊ (ߝ߭ߌߕߙߌ) ߓߊ߯ߙߊ߫ ߦߙߐ
+          handicraft: ߓߟߏߟߊߓߊ߯ߙߟߊ
+          hvac: ߓߊ߲ߘߦߊߟߊ߲߫ ߟߊߘߊ߲߫ ߦߙߐ
+          metal_construction: ߣߍ߰ߘߐ߬ߓߍ߲߬ߠߊ\ߟߊߘߊ߲ߠߊ
           painter: ߓߐߙߐ߲ߦߟߊ
           photographer: ߖߌ߬ߦߕߊ߬ߟߊ
           plumber: ߘߎ߰ߡߊ߬ߟߊ߬ߟߊ
+          sawmill: ߦߙߌߛߌ߯ߘߊ \ ߦߙߌߕߋߘߊ
           shoemaker: ߛߊ߬ߡߘߊ߬ ߘߐ߬ߓߍ߲߬ߠߊ
+          stonemason: ߓߐ߰ߟߐ߬ߟߊ \ ߓߏ߲ߟߐߟߊ
           tailor: ߞߙߊߟߌߟߊ
+          window_construction: ߝߢߐߘߊ߫ ߟߊߘߊ߲ߠߊ
         emergency:
           fire_extinguisher: ߕߊ߫ ߟߛߊߟߊ
           fire_water_pond: ߕߟߊߛߊ߫ ߝߌߙߏ߲
@@ -711,7 +739,9 @@ nqo:
           construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
           living_street: ߛߏߞߣߐ߫ ߛߌߟߊ
           motorway: ߝߏ߲߬ߘߏ
+          passing_place: ߕߊ߬ߡߌ߲߬ ߦߌߟߊ
           path: ߛߌߟߊ
+          pedestrian: ߛߋ߲߬ߡߊ߬ ߛߌߟߊ
           primary: ߛߌߟߊ ߓߊߖߎߟߞߊ
           primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ
           proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲
@@ -724,7 +754,10 @@ nqo:
           service: ߗߋߘߊ߫ ߛߌߟߊ
           speed_camera: ߞߊߟߌߦߊ ߖߊ߬ߛߏ߲߬ߟߊ߲
           steps: ߛߊ߲߬ߞߊ߬ߛߊ߲ߞߊ
+          stop: ߟߐ߬ߟߌ߬ ߛߙߋ
           street_lamp: ߝߏ߲߬ߘߏ߬ߞߊ߲߬ ߡߟߍߞߘߍ
+          traffic_signals: ߛߌߟߊ ߖߌ߰ߣߌ߬ߦߟߍ߫ ߞߐ߯ߙߍߦߊ
+          trailhead: ߥߟߌ߬ ߦߙߐ
           unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
           "yes": ߛߌߟߊ
         historic:
@@ -736,10 +769,13 @@ nqo:
           building: ߓߏ߲߫ ߞߘߐߞߘߐ
           castle: ߖߌ߲߬ߓߏ߲
           church: ߓߊ߬ߕߏ߬ߓߏ߲
+          heritage: ߞߍߦߙߐ \ ߝߘߏ߬ߓߊ߬ߗߍ߮
           house: ߟߎ
           mine: ߘߊ߬ߡߊ߲
           monument: ߝߙߎߕߎ
           railway: ߣߍ߰ߛߌߟߊ ߘߝߐ߬ߡߊ
+          ruins: ߕߏ߲ߓߏ߲
+          rune_stone: ߕߏ߲ߓߏ߲߫ ߞߓߊ
           stone: ߞߓߊ
           tomb: ߛߊ߬ߙߌ
           tower: ߛߊ߲ߓߏ߲
@@ -748,7 +784,14 @@ nqo:
           "yes": ߓߍ߲߬ߕߍ
         landuse:
           cemetery: ߛߊ߬ߙߌ߬ߟߏ
+          commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
+          conservation: ߦߙߐ߫ ߟߊߕߏߣߍ߲ \ ߟߊߡߙߊ߬ߣߍ߲
+          construction: ߟߐ߬ߟߌ߬ ߘߊߞߎ߲
+          farmland: ߛߣߍ߬ߞߍ߬ ߘߊߞߎ߲ \ ߝߏ߬ߘߏ
+          farmyard: ߝߏ߬ߘߏ \ ߖߛߊ \ ߥߍ߫ߙߍ
           forest: ߕߎ
+          garages: ߘߐ߬ߓߍ߲߬ߘߊ
+          grass: ߓߌ߲ \ ߖߍߥߎߟߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
           mine: ߘߊ߬ߡߊ߲
@@ -758,13 +801,14 @@ nqo:
           fitness_centre: ߞߍ߲ߘߍߦߊ ߕߊ߲ߓߊ߲
           fitness_station: ߘߊ߲ߘߊߟߌ ߕߏ߲߬ߜߏ
           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:
+          beehive: ߜߏ߲߬ߞߊ߲
           bridge: ߛߍ߲
           cross: ߓߊߙߊ߲ߕߏ߲
           mine: ߘߊ߬ߡߊ߲
@@ -969,18 +1013,12 @@ nqo:
       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: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
       states:
         ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
         open: ߊ߬ ߟߊߞߊ߬
         resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫
-    update:
-      new_report: ߌ ߟߊ߫ ߟߊ߬ߢߌߣߌ߲ ߟߊߞߎ߲߬ߘߎ ߓߘߊ߫ ߓߊ߲߫ ߟߊߞߎ߲߬ߘߎ߬ ߟߊ߫ ߞߏߟߌߞߏߟߌ߫
-      successful_update: ߌ ߟߊ߫ ߟߊ߬ߢߌߣߌ߲ ߓߘߊ߫ ߓߊ߲߫ ߠߊߞߎ߲߬ߘߎ߫ ߟߊ߫ ߞߏߟߌߞߏߟߌ߫
-      provide_details: ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߬ߣߍ߲ ߠߎ߬ ߡߊߛߐ߫ ߖߊ߰ߣߌ߲߫
     show:
       title: '%{status} ߝߌ߬ߛߌ #%{issue_id}'
       report_created_at: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
@@ -1036,10 +1074,8 @@ nqo:
     home: ߕߊ߯ ߛߏ߫ ߘߌ߲߬ߞߌߙߊ ߘߐ߫
     logout: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
     log_in: ߌ ߜߊ߲߬ߞߎ߲߫
-    log_in_tooltip: ߌ ߜߊ߲߬ߞߎ߲߫ ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߞߊ߬ߣߍ߲ ߘߏ߫ ߟߊ߫
     sign_up: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
     start_mapping: ߔߊ߬ߔߘߊ߬ ߡߊ߬ߝߟߍ ߘߊߡߌ߬ߣߊ߬
-    sign_up_tooltip: ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊߞߊ߬ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߊ߲ߡߊ߬
     edit: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
     history: ߘߐ߬ߝߐ
     export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
@@ -1064,8 +1100,6 @@ nqo:
     about: ߞߊ߬ ߓߍ߲߬
     copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ
     community: ߘߍ߬ߘߊ
-    foundation: ߖߎ߬ߓߌߟߊ
-    foundation_title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߖߎ߬ߓߌߟߊ
     make_a_donation:
       title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߐߡߊߓߌ߲ߓߌ߲߫ ߥߏߘߌ ߣߌ߬ߟߌ ߟߊ߫
       text: ߣߌ߬ߟߌ ߘߏ߫ ߞߍ߫
@@ -1188,8 +1222,6 @@ nqo:
       success: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߓߘߊ߫ ߟߊߛߙߋߦߊ߫߸ ߌ ߣߌ߫ ߗߋ߫ ߌ ߜߊ߲߬ߞߎ߲ ߠߊ߫߹
       already active: ߖߊ߬ߕߋ߬ߘߊ ߣߌ߲߬ ߠߊߛߙߋߦߊߣߍ߲߫ ߞߘߐ ߟߋ߬ ߦߋ߫.
       unknown token: ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߘߏߞߊ߲ ߏ߬ ߛߕߊ ߓߘߊ߫ ߝߊ߫ ߥߟߴߊ߬ ߕߴߦߋ߲߬.
-      reconfirm_html: ߣߴߌ ߞߍ߫ ߘߴߊ߬ ߝߍ߬ ߊ߲ ߧߋ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߗߋߛߓߍ ߗߋ߫ ߕߎ߲߯ߣߌ߲߫߸ <a
-        href="%{reconfirm}">ߦߊ߲߬ ߛߐ߲߬ߞߌ߲߫</a>
     confirm_resend:
       failure: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{name} ߡߊ߫ ߛߐ߬ߘߐ߲߫.
     confirm_email:
@@ -1220,8 +1252,6 @@ nqo:
     new:
       title: ߗߋߛߓߍ ߗߋ߫
       send_message_to_html: ߗߋߛߓߍ߫ ߞߎߘߊ ߘߏ߫ ߗߋ߫ %{name} ߡߊ߬
-      subject: ߝߐߡߊ
-      body: ߝߊ߬ߘߌ
       back_to_inbox: ߌ ߞߐߛߊ߬ߦߌ߬ ߗߋߛߓߍ߫ ߞߏ߲ߘߏ ߡߊ߬
     create:
       message_sent: ߗߋߛߓߍ߫ ߗߋߣߍ߲
@@ -1247,14 +1277,10 @@ nqo:
         ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߖߋ߬ߓߌ߬ ߟߊ߫.
     show:
       title: ߗߋߛߓߍ ߘߐߞߊ߬ߙߊ߲߬
-      from: ߞߊ߬ ߝߘߊ߫
-      subject: ߝߐߡߊ
-      date: ߕߎ߬ߡߊ߬ߘߊ
       reply_button: ߊ߬ ߞߐߖߋ߬ߓߌ߬
       unread_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
       destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
       back: ߌ ߞߐߛߊ߬ߦߌ߬
-      to: ߞߊ߬ ߕߊ߯
       wrong_user: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߘߌ߫ ߒ߬ߞߊ߬ ߌ ߢߌ߬ߣߊ߬ߣߍ߲߫ ߗߋߛߓߍ ߡߍ߲
         ߘߐߞߊ߬ߙߊ߲߬ ߞߏ ߡߊ߬߸ ߏ߬ ߗߋߣߍ߲߫ ߕߴߏ߬ ߓߟߏ߫ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߡߊ߬. ߌ ߜߊ߲߬ߞߎ߲߫
         ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫ ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߘߐߞߊ߬ߙߊ߲߬ ߠߊ߫.
@@ -1330,17 +1356,7 @@ nqo:
       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: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
       openid_logo_alt: ߌ ߜߊ߲߬ߞߎ߲߬ ߏߔߌ߲ ID ߟߊ߫
       auth_providers:
@@ -1353,7 +1369,7 @@ nqo:
         facebook:
           title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
           alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
-        windowslive:
+        microsoft:
           title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
           alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
         github:
@@ -1374,8 +1390,6 @@ nqo:
       logout_button: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
   shared:
     markdown_help:
-      title_html: ߊ߬ ߞߛߍ߬ߞߛߍ߫ <a href="https://kramdown.gettalong.org/quickref.html">ߞߙߊߡߑߘߐߥ</a>
-        ߟߊ߫
       headings: ߞߎ߲߬ߕߐ߮
       heading: ߞߎ߲߬ߕߐ߮
       subheading: ߞߎ߲߬ߕߐ߰ߘߎ߯ߟߊ
@@ -1393,7 +1407,6 @@ nqo:
   site:
     about:
       next: ߢߍߕߊ
-      copyright_html: <span>&copy;</span>ߏߔߌ߲߫ ߛߑߕߙߌߕ ߡߊߔ<br>ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߠߎ߬
       used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲
         ߟߥߊ߬ߟߌ߬ߟߊ߲ ߣߌ߫ ߞߍߟߊ߲߫ ߛߎ߲ߝߘߍߡߊ ߟߎ߬'
       lede_text: "ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊߘߊ߲ߣߍ߲߫ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߍ߬ߘߊ ߟߎ߬ ߟߋ߬ ߓߟߏ߫ ߡߍ߲
@@ -1478,13 +1491,13 @@ nqo:
           ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ-ߣߴߊ߬-ߖߋ߬ߓߌ ߞߍߦߙߐ ߞߊ߲߬.
       mailing_lists:
         title: ߢߎߡߍߙߋ߲ߦߊߟߌ ߛߙߍߘߍ ߟߎ߬
-      forums:
-        title: ߟߐ߯ߓߊߟߐ
       welcomemat:
         title: ߛߌ߲߬ߝߏ߲߬ߘߊ ߢߍ߫
       wiki:
         title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ
         description: ߥߞߌ ߛߏ߲߯ߓߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߘߐ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߘߐߘߎ߲߰ߧߊ߬ߣߍ߲߬ ߞߏ߫ ߘߐ߫
+    any_questions:
+      title: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߬ ߛߌ߫؟
     sidebar:
       search_results: ߞߐߝߟߌ ߟߎ߬ ߢߌߣߌ߲߫
       close: ߊ߬ ߘߊߕߎ߲߯
@@ -1540,8 +1553,6 @@ nqo:
       title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹
       whats_on_the_map:
         title: ߡߎ߲߬ ߠߋ߬ ߦߋ߫ ߡߊߔ ߞߊ߲߬
-      questions:
-        title: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߬ ߛߌ߫؟
       start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       add_a_note:
         title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹
@@ -1583,7 +1594,6 @@ nqo:
       visibility: 'ߦߋߟߌ:'
       confirm_delete: ߞߊ߬ ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫؟
     trace_paging_nav:
-      showing_page: ߞߐߜߍ %{page}
       older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
       newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     trace:
@@ -1600,9 +1610,6 @@ nqo:
     index:
       public_traces: ߜߍߘߐ߫ GPS ߜߋ߬ߙߋ ߟߎ߬
       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: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
       my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
@@ -1739,9 +1746,6 @@ nqo:
   users:
     new:
       title: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
-      email address: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
-      confirm email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫:'
-      display name: 'ߟߊ߬ߓߊ߰ߙߊ߬ ߕߐ߮:'
       display name description: ߌ ߓߘߊ߫ ߕߐ߮ ߟߊߓߊ߯ߙߕߊ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫.ߌ ߘߌ߫ ߛߴߏ߬
         ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߞߣߐ߫ ߞߐߝߍ߬.
       continue: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
@@ -1757,9 +1761,6 @@ nqo:
         ߞߍ ߘߐ߫ ߖߊ߬ߡߊ ߘߍ߬ߒ߬ߡߊ߬ߝߋ߲ ߘߌ߫
       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: ߊ߬ ߘߊߓߊ߲߫
       legale_select: 'ߌ ߛߌ߰ߣߍ߲߬ ߦߋ߫ ߖߡߊ߬ߣߊ ߡߍ߲ ߘߐ߫:'
       legale_names:
@@ -1779,7 +1780,6 @@ nqo:
       deleted: ߖߏ߬ߛߌ߬ߣߍ߲
     show:
       my diary: ߒ ߕߋ߬ߟߋ߲
-      new diary entry: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ
       my edits: ߒ ߠߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
       my traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
       my notes: ߒ ߠߊ߫ ߦߟߌߣߐ ߟߎ߫
@@ -1802,8 +1802,6 @@ nqo:
       ct status: 'ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬:'
       email address: 'ߢߎߡߍߙߋ߲߫ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
       created from: 'ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߞߊ߬ ߝߘߊ߫:'
-      description: ߞߊ߲߬ߛߓߍߟߌ
-      user location: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߘߌ߲߬ߞߌߙߊ
       role:
         administrator: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߦߋ߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ ߟߋ߬ ߘߌ߫
       create_block: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߊ߬ߟߌ߬
@@ -1861,6 +1859,19 @@ nqo:
       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: ߦߟߌߣߐ ߝߙߊ߬
   javascripts:
     close: ߊ߬ ߘߊߕߎ߲߯
     share:
@@ -1906,13 +1917,6 @@ nqo:
         unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫
         hide_comment: ߊ߬ ߢߡߊߘߏ߲߰
         unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫
-    notes:
-      new:
-        add: ߦߟߌߣߐ ߝߙߊ߬
-      show:
-        hide: ߊ߬ ߢߡߊߘߏ߲߰
-        resolve: ߊ߬ ߢߊߓߐ߫
-        reactivate: ߊ߬ ߟߊߞߎߣߎ߲߫
     directions:
       engines:
         fossgis_osrm_bike: ߣߍ߰ߛߏ (OSRM)