From: Tom Hughes <tom@compton.nu>
Date: Wed, 21 Oct 2020 19:53:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2890'
X-Git-Tag: live~2613
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/8a42bc2eff8563d206615cb8810ad87e9e6e5be2?hp=cde4ac61a26b43d32b8dd919feaa944a1d6ee4de

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7529d6148..73b8cfa3f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -167,8 +167,6 @@ Rails/OutputSafety:
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/changesets_helper.rb'
     - 'app/helpers/geocoder_helper.rb'
-    - 'app/helpers/note_helper.rb'
-    - 'app/helpers/open_graph_helper.rb'
     - 'app/helpers/user_blocks_helper.rb'
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
diff --git a/FAQ.md b/FAQ.md
index 423ef70a6..fd5535975 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -4,27 +4,20 @@ We occasionally display banner images on the main page of [openstreetmap.org](ht
 promote a large OpenStreetMap focused conference or host a worldwide donation
 drive.  This is a great way to reach a lot of people!
 
-1. Please review [openstreetmap/operations#150](https://github.com/openstreetmap/operations/issues/150) to
-know whether your event qualifies for a front-page banner.
-
+1. Please review the Operations Working Group's [Banner Policy](https://operations.osmfoundation.org/policies/banner/) to know whether your event qualifies for a front-page banner.
 2. Create the banner image.  Some guidelines:
-  * Image should be 350px wide (exactly) x 350px tall (or shorter).
-  * Use a standard web image format (.gif, .jpg, .png)
-  * Note that a close 'X' button will be drawn over the top right 60x60px
-  corner of the banner, so please do not put anything important in that space.
-
+   * Image should be 350px wide (exactly) x 350px tall (or shorter).
+   * Use a standard web image format (.gif, .jpg, .png)
+   * Note that a close 'X' button will be drawn over the top right 60x60px corner of the banner, so please do not put anything important in that space.
 3. Prepare a pull request which includes the following:
-  * The banner should be saved under the
-  [`app/assets/images/banners/`](https://github.com/openstreetmap/openstreetmap-website/tree/master/app/assets/images/banners) folder, and should have a name that makes it clear what it is for (e.g. `donate-2017.jpg`)
-  * Edit [`config/banners.yml`](https://github.com/openstreetmap/openstreetmap-website/blob/master/config/banners.yml)
-  to contain an entry for the event banner.  It should contain the following:
-    * `id` - a unique identifier (e.g. `donate2017`)
-    * `alt` - alt name for the image (e.g. `OpenStreetMap Funding Drive 2017`)
-    * `link` - URL for your event page (e.g. `https://donate.openstreetmap.org/`)
-    * `img` - the filename for the banner image (e.g. `banners/donate-2017.jpg`)
-    * `enddate` - the final date that the banner will be shown (e.g. `2017-oct-31`)
-  * (optional) Feel free to cleanup the old images from the `app/assets/images/banners/`
-  folder and old entries in the `config/banners.yml` file.
+   * The banner should be saved under the [`app/assets/images/banners/`](https://github.com/openstreetmap/openstreetmap-website/tree/master/app/assets/images/banners) folder, and should have a name that makes it clear what it is for (e.g. `donate-2017.jpg`)
+   * Edit [`config/banners.yml`](https://github.com/openstreetmap/openstreetmap-website/blob/master/config/banners.yml) to contain an entry for the event banner.  It should contain the following:
+     * `id` - a unique identifier (e.g. `donate2017`)
+     * `alt` - alt name for the image (e.g. `OpenStreetMap Funding Drive 2017`)
+     * `link` - URL for your event page (e.g. `https://donate.openstreetmap.org/`)
+     * `img` - the filename for the banner image (e.g. `banners/donate-2017.jpg`)
+     * `enddate` - the final date that the banner will be shown (e.g. `2017-oct-31`)
+   * (optional) Feel free to cleanup the old images from the `app/assets/images/banners/` folder and old entries in the `config/banners.yml` file.
 
 See [PR #1296](https://github.com/openstreetmap/openstreetmap-website/pull/1296)
 as an example.
diff --git a/Gemfile.lock b/Gemfile.lock
index d87fa93ac..c08bc0f20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,8 +74,8 @@ GEM
     autoprefixer-rails (10.0.1.0)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.380.0)
-    aws-sdk-core (3.109.0)
+    aws-partitions (1.383.0)
+    aws-sdk-core (3.109.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -83,7 +83,7 @@ GEM
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.0)
+    aws-sdk-s3 (1.83.1)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -209,8 +209,9 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     ffi (1.13.1)
     ffi-libarchive (1.0.4)
       ffi (~> 1.0)
@@ -299,7 +300,7 @@ GEM
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-facebook (7.0.0)
+    omniauth-facebook (8.0.0)
       omniauth-oauth2 (~> 1.2)
     omniauth-github (1.4.0)
       omniauth (~> 1.5)
@@ -411,6 +412,7 @@ GEM
       rubocop (>= 0.87.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     rubyzip (2.3.0)
     sanitize (5.2.1)
       crass (~> 1.0.2)
@@ -459,7 +461,7 @@ GEM
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
-    webmock (3.9.2)
+    webmock (3.9.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index f74dd0bb7..68beefeb6 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -196,7 +196,7 @@ $(document).ready(function () {
     $(".welcome").addClass("visible");
   }
 
-  $(".welcome .close-wrap").on("click", function () {
+  $(".welcome .close").on("click", function () {
     $(".welcome").removeClass("visible");
     $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" });
   });
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4c5827558..cb92af8fb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -344,7 +344,7 @@ class UsersController < ApplicationController
       flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
     else
       UserMailer.signup_confirm(user, user.tokens.create).deliver_later
-      flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => Settings.support_email).html_safe
+      flash[:notice] = t "users.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email
     end
 
     redirect_to :action => "login"
diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index dbe0c89f7..d85881a31 100644
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,14 +1,16 @@
 module NoteHelper
+  include ActionView::Helpers::TranslationHelper
+
   def note_event(event, at, by)
     if by.nil?
-      I18n.t("browse.note." + event + "_by_anonymous",
-             :when => friendly_date_ago(at),
-             :exact_time => l(at)).html_safe
+      t("browse.note." + event + "_by_anonymous_html",
+        :when => friendly_date_ago(at),
+        :exact_time => l(at))
     else
-      I18n.t("browse.note." + event + "_by",
-             :when => friendly_date_ago(at),
-             :exact_time => l(at),
-             :user => note_author(by)).html_safe
+      t("browse.note." + event + "_by_html",
+        :when => friendly_date_ago(at),
+        :exact_time => l(at),
+        :user => note_author(by))
     end
   end
 
diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb
index 11cfe5030..99b8d00a3 100644
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -10,8 +10,8 @@ module OpenGraphHelper
       "og:description" => t("layouts.intro_text")
     }
 
-    tags.map do |property, content|
+    safe_join(tags.map do |property, content|
       tag(:meta, :property => property, :content => content)
-    end.join("").html_safe
+    end, "\n")
   end
 end
diff --git a/app/views/application/_sidebar_header.html.erb b/app/views/application/_sidebar_header.html.erb
new file mode 100644
index 000000000..5413b4205
--- /dev/null
+++ b/app/views/application/_sidebar_header.html.erb
@@ -0,0 +1,10 @@
+<div class="d-flex w-100">
+  <div class="flex-grow-1 text-break">
+    <h2><%= title %></h2>
+  </div>
+  <div class="px-3 py-3">
+    <a class="geolink" href="<%= root_path %>">
+      <span class="icon close"></span>
+    </a>
+  </div>
+</div>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 1217c03be..35cd4477b 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,9 +1,6 @@
 <% set_title(t(".title", :id => @changeset.id)) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t(".title", :id => @changeset.id) %>
-</h2>
+<%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
 
 <div class="browse-section">
   <p class="font-italic">
@@ -37,10 +34,10 @@
             <% if comment.visible %>
               <li id="c<%= comment.id %>">
                 <small class='text-muted'>
-                  <%= t(".commented_by",
+                  <%= t(".commented_by_html",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),
-                        :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %>
+                        :user => link_to(comment.author.display_name, user_path(comment.author))) %>
                   <% if current_user and current_user.moderator? %>
                     — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span>
                   <% end %>
@@ -50,10 +47,10 @@
             <% elsif current_user and current_user.moderator? %>
               <li id="c<%= comment.id %>">
                 <small class='text-muted'>
-                  <%= t(".hidden_commented_by",
+                  <%= t(".hidden_commented_by_html",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),
-                        :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %>
+                        :user => link_to(comment.author.display_name, user_path(comment.author))) %>
                   — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
                  </small>
                 <%= comment.body.to_html %>
diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb
index 75e54f0b2..c5c26330e 100644
--- a/app/views/browse/feature.html.erb
+++ b/app/views/browse/feature.html.erb
@@ -1,9 +1,6 @@
 <% set_title(t("browse.#{@type}.title_html", :name => printable_name(@feature))) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t("browse.#{@type}.title_html", :name => printable_name(@feature)) %>
-</h2>
+<%= render "sidebar_header", :title => t("browse.#{@type}.title_html", :name => printable_name(@feature)) %>
 
 <%= render :partial => @type, :object => @feature %>
 
diff --git a/app/views/browse/history.html.erb b/app/views/browse/history.html.erb
index faa88359e..ebf8bcb30 100644
--- a/app/views/browse/history.html.erb
+++ b/app/views/browse/history.html.erb
@@ -1,9 +1,6 @@
 <% set_title(t("browse.#{@type}.history_title_html", :name => printable_name(@feature))) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t("browse.#{@type}.history_title_html", :name => printable_name(@feature)) %>
-</h2>
+<%= render "sidebar_header", :title => t("browse.#{@type}.history_title_html", :name => printable_name(@feature)) %>
 
 <%= render :partial => @type, :collection => @feature.send("old_#{@type}s").reverse %>
 
diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb
index 4e4f571cc..e647eab13 100644
--- a/app/views/browse/new_note.html.erb
+++ b/app/views/browse/new_note.html.erb
@@ -1,9 +1,6 @@
 <% set_title(t("browse.note.new_note")) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t "browse.note.new_note" %>
-</h2>
+<%= render "sidebar_header", :title => t("browse.note.new_note") %>
 
 <div class="note browse-section">
   <p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
diff --git a/app/views/browse/not_found.html.erb b/app/views/browse/not_found.html.erb
index 3c4e8a4c8..084c247dc 100644
--- a/app/views/browse/not_found.html.erb
+++ b/app/views/browse/not_found.html.erb
@@ -1,4 +1,7 @@
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>
-</h2>
+<% set_title(t(".title")) %>
+
+<%= render "sidebar_header", :title => t(".title") %>
+
+<div class="browse-section">
+  <p><%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>
+</div>
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index ab0344e35..f94fda12a 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,9 +1,6 @@
 <% set_title(t(".title", :id => @note.id)) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t ".#{@note.status}_title", :note_name => @note.id %>
-</h2>
+<%= render "sidebar_header", :title => t(".#{@note.status}_title", :note_name => @note.id) %>
 
 <div class="browse-section">
   <h4><%= t(".description") %></h4>
diff --git a/app/views/browse/query.html.erb b/app/views/browse/query.html.erb
index ad6fdddb5..65231641c 100644
--- a/app/views/browse/query.html.erb
+++ b/app/views/browse/query.html.erb
@@ -1,9 +1,6 @@
 <% set_title(t(".title")) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t ".title" %>
-</h2>
+<%= render "sidebar_header", :title => t(".title") %>
 
 <div class="query-intro">
   <p><%= t(".introduction") %></p>
diff --git a/app/views/browse/timeout.html.erb b/app/views/browse/timeout.html.erb
index a9f53db15..084c247dc 100644
--- a/app/views/browse/timeout.html.erb
+++ b/app/views/browse/timeout.html.erb
@@ -1,4 +1,7 @@
+<% set_title(t(".title")) %>
+
+<%= render "sidebar_header", :title => t(".title") %>
+
 <div class="browse-section">
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>
+  <p><%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>
 </div>
diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb
index e3df87490..f9eb01a6d 100644
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -11,10 +11,7 @@
                 @title
               end %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= @heading %>
-</h2>
+<%= render "sidebar_header", :title => @heading %>
 
 <div class="changesets">
   <%= image_tag "searching.gif", :class => "loader" %>
diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index 13144d568..9f19be48a 100644
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -1,9 +1,7 @@
 <% set_title(@params[:query]) %>
 
-<h2>
-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= t("site.sidebar.search_results") %>
-</h2>
+<%= render "sidebar_header", :title => t("site.sidebar.search_results") %>
+
 <% @sources.each do |source| %>
   <h4 class="inner12"><%= t(".title.#{source}_html") %></h4>
   <div class="search_results_entry" data-href="<%= url_for @params.merge(:action => "search_#{source}") %>">
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 1f8366ccb..33737ae23 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -40,8 +40,7 @@
 
     <% unless current_user %>
       <div class="welcome">
-        <h2><%= t "layouts.intro_header" %></h2>
-        <div class="close-wrap"><span class="icon close"></span></div>
+        <%= render "sidebar_header", :title => t("layouts.intro_header") %>
         <p><%= t "layouts.intro_text" %></p>
         <p><%= t "layouts.hosting_partners_html",
                  :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index b6d91ca31..934b56a02 100644
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,9 +1,6 @@
 <% set_title(t(".title")) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t ".title" %>
-</h2>
+<%= render "sidebar_header", :title => t(".title") %>
 
 <%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form standard-form" }) do %>
   <%= hidden_field_tag "format", "osm" %>
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 83387de3e..72b7e6e89 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1161,7 +1161,7 @@ af:
       text: Skenk aan die projek
     learn_more: Meer inligting
     more: Meer
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} het kommentaar op ''n dagboekinskrywing gelewer'
       hi: Hallo %{to_user},
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 5c2cdb730..085fa67ba 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -645,7 +645,7 @@ aln:
     make_a_donation:
       title: OpenStreetMap Mbështetje me një donacion monetar
       text: Bëni një donacion
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} ka komentu në shënimin tond të ditarit'
       hi: Tung %{to_user},
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 9ad85193f..65ede963e 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -44,6 +44,8 @@ ar:
       friendly: '%e %B %Y في %H:%M'
       blog: '%e %B %Y'
   helpers:
+    file:
+      prompt: اختر الملف
     submit:
       diary_comment:
         create: حفظ
@@ -579,10 +581,12 @@ ar:
           hunting_stand: مربط للصيد
           ice_cream: مثلجات
           kindergarten: حضانة أطفال
+          language_school: مدرسة لغات
           library: مكتبة
           marketplace: سوق
           monastery: دير
           motorcycle_parking: مرآب دراجات نارية
+          music_school: مدرسة موسيقى
           nightclub: نادي ليلي
           nursing_home: دار رعاية
           parking: موقف سيارات
@@ -610,6 +614,7 @@ ar:
           theatre: مسرح
           toilets: مراحيض
           townhall: مبنى بلدية
+          training: منشأة تدريب
           university: جامعة
           vending_machine: آلة بيع
           veterinary: جراحة بيطرية
@@ -630,6 +635,7 @@ ar:
           viaduct: جسر
           "yes": جسر
         building:
+          apartment: شقة
           apartments: مجموعة شقق
           chapel: معبد/مصلى
           church: كنيسة
@@ -653,7 +659,9 @@ ar:
         craft:
           brewery: مصنع الجعة
           carpenter: نجار
+          confectionery: محل حلوى
           electrician: كهربائي
+          electronics_repair: إصلاح إلكترونيات
           gardener: بستاني
           painter: رسام
           photographer: مصور
@@ -1254,7 +1262,7 @@ ar:
       text: تبرع
     learn_more: التعرف على المزيد
     more: المزيد
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[خريطة الشارع المفتوحة] %{user} علق على مدخلتك في اليومية'
       hi: مرحبًا %{to_user}،
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 85d023e47..599c70fa7 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -589,7 +589,7 @@ arz:
     make_a_donation:
       title: ادعم خريطه الشارع المفتوحه بهبه نقدية
       text: تبرع
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[خريطه الشارع المفتوحة] %{user} أضاف تعليقًا على مدخلتك فى اليومية'
       hi: مرحبًا %{to_user}،
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 165fed1cb..cc0e9f58d 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1217,7 +1217,7 @@ ast:
       text: Fai un donativu
     learn_more: Más información
     more: Más
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} comentó n''una entrada del diariu'
       hi: Bones %{to_user},
diff --git a/config/locales/az.yml b/config/locales/az.yml
index e9bc4e6f8..39a894395 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -804,7 +804,7 @@ az:
     make_a_donation:
       title: OpenStreetMap-i dəstəkləmək üçün maddi yardım et
       text: Maddi yardım et
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} adlı istifadəçi sənin gündəliy yazına şərh
         yazıb'
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index f8df760b0..1366a459f 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -800,7 +800,7 @@ be-Tarask:
     make_a_donation:
       title: Падтрымаць OpenStreetMap грашовым ахвяраваньнем
       text: Зрабіць ахвяраваньне
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: Карыстальнік [OpenStreetMap] %{user} пакінуў камэнтар у дзёньніку
       hi: Вітаем, %{to_user},
diff --git a/config/locales/be.yml b/config/locales/be.yml
index f6629ca5e..b9ab7c869 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1228,7 +1228,7 @@ be:
       text: Зрабіць ахвяраванне
     learn_more: Даведацца больш
     more: Больш падрабязна
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} пакінуў каментар у вашым дзённіку'
       hi: Вітанні, %{to_user},
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 7a00f9bb3..ddc45905c 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1189,7 +1189,7 @@ bg:
       text: Направете дарение
     learn_more: Научете повече
     more: Още
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: Здравейте %{to_user},
     message_notification:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index eec506f84..c2e450dcd 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1086,7 +1086,7 @@ bn:
       text: দান করুন
     learn_more: আরও পড়ুন
     more: আরও
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} একটি দিনলিপির ভুক্তিতে মন্তব্য করেছেন'
       hi: সুপ্রিয় %{to_user},
diff --git a/config/locales/br.yml b/config/locales/br.yml
index d9c3e8758..4609973e3 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1257,7 +1257,7 @@ br:
       text: Ober un donezon
     learn_more: Gouzout hiroc'h
     more: Muioc'h
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} en deus lezet un addispleg war hoc''h enmoned
         en deizlevr'
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index b95335859..3baef581c 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -855,7 +855,7 @@ bs:
       title: Podržite Openstreetmap novčanom donacijom
       text: Donirajte
     learn_more: Saznaj više
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} je komentirao tvoj unos u dnevnik'
       hi: Zdravo %{to_user},
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index cd8b9a030..265f01f37 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1267,7 +1267,7 @@ ca:
       text: Feu una donació
     learn_more: Aprèn-ne més
     more: Més
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} ha comentat una entrada de diari'
       hi: Hola %{to_user},
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 97b99fb6f..a57c4c9b1 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -763,7 +763,7 @@ ce:
     copyright: Авторийн бакъонаш
     learn_more: Цул совнаха хаа
     more: Кхин а
-  notifier:
+  user_mailer:
     gpx_notification:
       greeting: Маршалла,
     signup_confirm:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 6dd28fa12..dcf903730 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1443,7 +1443,7 @@ cs:
       text: Pošlete příspěvek
     learn_more: Více informací
     more: Další
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} okomentoval záznam v deníku'
       hi: Ahoj, uživateli %{to_user},
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 96900eec2..a0bfb2dca 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1036,7 +1036,7 @@ cy:
       text: Gwneud Cyfraniad
     learn_more: Dysgu Mwy
     more: Mwy
-  notifier:
+  user_mailer:
     message_notification:
       hi: Pa hwyl %{to_user}?
     friendship_notification:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 5b18bd517..74a4938bb 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1428,7 +1428,7 @@ da:
       text: Donér
     learn_more: Lær mere
     more: Mere
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} kommenterede på et blogindlæg'
       hi: Hej %{to_user},
diff --git a/config/locales/de.yml b/config/locales/de.yml
index cd69e411e..b0fc4cf67 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1477,7 +1477,7 @@ de:
       text: Spenden
     learn_more: Mehr erfahren
     more: Mehr
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} hat zu einem Blogeintrag kommentiert'
       hi: Hallo %{to_user},
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index fb982b0af..7ff55e9f3 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -721,7 +721,7 @@ diq:
     community_blogs: Blogê Cemaeti
     learn_more: Tayêna bımuse
     more: Zêde
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: Merheba %{to_user},
     message_notification:
@@ -1027,7 +1027,7 @@ diq:
       preferred editor: 'Editorê ke tercih kerê:'
       image: 'Resım:'
       new image: Yew resım cı ke
-      home location: 'Herun:'
+      home location: 'Herune:'
       latitude: 'Verıniye:'
       longitude: 'Derganiye:'
       save changes button: Vurnayışan qeyd ke
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 06840f5ff..c72c4a20e 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -889,7 +889,7 @@ dsb:
       text: Pósćiś
     learn_more: Dalšne informacije
     more: Wěcej
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} jo twój zapisk dnjownika komentěrował.'
       hi: Witaj %{to_user},
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 7c8502ff1..c07f570c8 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1255,7 +1255,7 @@ el:
       text: Κάντε μια δωρεά
     learn_more: Μάθετε περισσότερα
     more: Περισσότερα
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] Ο χρήστης %{user} σχολίασε μια καταχώριση ημερολογίου'
       hi: Γεια σας %{to_user},
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 18760b30b..1f1794127 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1140,7 +1140,7 @@ en-GB:
       text: Make a Donation
     learn_more: Learn More
     more: More
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commented on a diary entry'
       hi: Hi %{to_user},
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6157fa517..cc1fa7316 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -254,8 +254,8 @@ en:
       relation: "Relations (%{count})"
       relation_paginated: "Relations (%{x}-%{y} of %{count})"
       comment: "Comments (%{count})"
-      hidden_commented_by: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      hidden_commented_by_html: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
@@ -294,6 +294,7 @@ en:
       entry_html: "Relation %{relation_name}"
       entry_role_html: "Relation %{relation_name} (as %{relation_role})"
     not_found:
+      title: Not Found
       sorry: "Sorry, %{type} #%{id} could not be found."
       type:
         node: node
@@ -302,6 +303,7 @@ en:
         changeset: changeset
         note: note
     timeout:
+      title: Timeout Error
       sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
       type:
         node: node
@@ -337,15 +339,15 @@ en:
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
-      opened_by: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      opened_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      opened_by_html: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      opened_by_anonymous_html: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      commented_by_anonymous_html: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      closed_by_html: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      closed_by_anonymous_html: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      reopened_by_html: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      reopened_by_anonymous_html: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      hidden_by_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
       report: Report this note
       coordinates_html: "%{latitude}, %{longitude}"
     query:
@@ -1248,10 +1250,6 @@ en:
         level8: "City Boundary"
         level9: "Village Boundary"
         level10: "Suburb Boundary"
-    description:
-      title:
-        osm_nominatim: 'Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-        geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities
         towns: Towns
@@ -2282,7 +2280,6 @@ en:
           <p>Unlike other maps, OpenStreetMap is completely created by people like you,
           and it's free for anyone to fix, update, download and use.</p>
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
-      license_agreement: 'When you confirm your account you will need to agree to the <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       not_displayed_publicly_html: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'
@@ -2458,7 +2455,7 @@ en:
       unknown token: "That confirmation code has expired or does not exist."
       reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
     confirm_resend:
-      success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
+      success_html: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
       failure: "User %{name} not found."
     confirm_email:
       heading: Confirm a change of email address
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 2ca9b42b1..271e52711 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1432,7 +1432,7 @@ eo:
       text: Donaci
     learn_more: Ekscii pli
     more: Pli
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} komentis pri taglibra afiŝo'
       hi: Saluton %{to_user},
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d1e93f64c..0663f3dd0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1286,7 +1286,7 @@ es:
       text: Hacer una donación
     learn_more: Más información
     more: Más
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} ha comentado en una entrada de diario'
       hi: Hola %{to_user},
diff --git a/config/locales/et.yml b/config/locales/et.yml
index f862460cf..37f8a7efe 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -970,7 +970,7 @@ et:
       text: Anneta
     learn_more: Lisateave
     more: Veel
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} kommenteeris päeviku sissekannet'
       hi: Tere, %{to_user}!
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index f7d71adf7..c52f34f06 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1173,7 +1173,7 @@ eu:
       text: Dohaintza egin
     learn_more: Ikasi gehiago
     more: Gehiago
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} eguneroko sarrera batean iruzkina utzi du'
       hi: Kaixo %{to_user},
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 70c2cc9f8..ddc39e5be 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1301,7 +1301,7 @@ fa:
       text: کمک مالی کنید
     learn_more: اطلاعات بیشتر
     more: بیشتر
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] ‫%{user} روی روزنوشت نظر داد‬'
       hi: ‫سلام %{to_user}،‬
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 5e3161a47..ed11f9e8d 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1272,7 +1272,7 @@ fi:
       text: Lahjoita
     learn_more: Lisätietoja
     more: Lisää
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} on lisännyt kommentin päiväkirjamerkintääsi'
       hi: Hei %{to_user}!
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index e690977aa..d291209dc 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -626,7 +626,7 @@ fit:
     community: Föreeninki
     learn_more: Lue lissää
     more: Lissää
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: Hei %{to_user},
     message_notification:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 68ba6a578..07a046359 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1497,7 +1497,7 @@ fr:
       text: Faire un don
     learn_more: En savoir plus
     more: Plus
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} a publié un commentaire sur un article de
         journal'
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index c49c99e74..3ef565f7c 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -712,7 +712,7 @@ fur:
       text: Done alc
     learn_more: Par savênt di plui
     more: Plui
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} al à zontât un coment ae tô vôs dal diari'
       hi: Mandi %{to_user},
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 8d74d5e05..2f4431c0e 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1055,7 +1055,7 @@ ga:
       text: Tabhair Síntiús Airgid
     learn_more: Tuilleadh Eolais
     more: Tuilleadh
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] Rinne %{user} nóta tráchta faoi iontráil dialainne'
       hi: A %{to_user}, a chara,
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index ceb8e04ed..df59c082c 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -969,7 +969,7 @@ gd:
       text: Thoir tìodhlac dhuinn
     learn_more: Barrachd fiosrachaidh
     more: Barrachd
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] Thug %{user} seachad beachd air leabhar-latha'
       hi: Shin thu, %{to_user},
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index b08f003ea..cd18ff92e 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1441,7 +1441,7 @@ gl:
       text: Facer unha doazón
     learn_more: Máis información
     more: Máis
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} comentou nunha entrada de diario'
       hi: 'Ola %{to_user}:'
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 4081fda87..75c512da5 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -308,7 +308,11 @@ he:
       title_html: 'דרך: %{name}'
       history_title_html: 'היסטוריית הדרך: %{name}'
       nodes: נקודות
-      nodes_count: '{{PLURAL|%{count} נקודות}'
+      nodes_count:
+        one: נקודה אחת
+        two: שתי נקודות
+        many: '%{count} נקודות'
+        other: '%{count} נקודות'
       also_part_of_html:
         one: חלק מדרך %{related_ways}
         other: חלק מהדרכים %{related_ways}
@@ -1448,7 +1452,7 @@ he:
       text: תרומה
     learn_more: מידע נוסף
     more: עוד
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[אופן סטריט מאפ OpenStreetMap] תגובה מאת %{user} נוספה לרשומת יומן'
       hi: שלום %{to_user},
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 87a3c37f3..3b60e697b 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -958,7 +958,7 @@ hr:
       text: Donirajte
     learn_more: Saznaj više
     more: Više
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} je komentirao tvoj unos u dnevnik'
       hi: Bok %{to_user},
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index ac3270d4c..92179831b 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1189,7 +1189,7 @@ hsb:
       text: Darić
     learn_more: Wjace zhonić
     more: Wjace
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} je twój dźenikowy zapisk komentował(a)'
       hi: Witaj %{to_user},
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 0048efa08..5fc8252a2 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1245,7 +1245,7 @@ hu:
       text: Adományozz
     learn_more: További info
     more: Több
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} hozzászólt a naplóbejegyzésedhez'
       hi: Szia, %{to_user}!
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 4207ed62e..896adb225 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1300,7 +1300,7 @@ ia:
       text: Facer un donation
     learn_more: Leger plus
     more: Plus
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commentava un entrata de diario'
       hi: Salute %{to_user},
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 25f4fd393..856d3d9b0 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1213,7 +1213,7 @@ id:
       text: Menyumbang
     learn_more: Pelajari Lagi
     more: Selanjutnya
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} mengomentari sebuah entri catatan harian'
       hi: Halo %{to_user},
diff --git a/config/locales/is.yml b/config/locales/is.yml
index aa9c9579e..5a51cf1ef 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1438,7 +1438,7 @@ is:
       text: Styrkja verkefnið
     learn_more: Vita meira
     more: Meira
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} bætti athugasemd við bloggfærslu þína'
       hi: Hæ %{to_user},
diff --git a/config/locales/it.yml b/config/locales/it.yml
index c78af8a85..18005b472 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1409,7 +1409,7 @@ it:
       text: Fai una donazione
     learn_more: Ulteriori informazioni
     more: Altro
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} ha commentato una voce del diario'
       hi: Ciao %{to_user},
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 263ab68dd..08bf088fb 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1416,7 +1416,7 @@ ja:
       text: 寄付
     learn_more: 詳細
     more: その他
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap]の%{user}さんが日記エントリにコメントしました'
       hi: こんにちは、%{to_user} さん。
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index ca78ea724..8949db2da 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -5,6 +5,7 @@
 # Author: David1010
 # Author: MIKHEIL
 # Author: Temuri rajavi
+# Author: Გიო ოქრო
 ---
 ka:
   time:
@@ -777,7 +778,8 @@ ka:
     foundation_title: ფონდი OpenStreetMap
     make_a_donation:
       text: პროექტის დახმარება
-  notifier:
+    more: მეტი
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap]-ის მომხმარებელმა %{user} თქვენს დღიურში დატოვა კომენტარი'
       hi: გამარჯობა %{to_user},
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index cb209ecc5..1ef00e768 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -786,7 +786,7 @@ kab:
       text: Mudd tawsa
     learn_more: Issin ugar
     more: Ugar
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} yuzen-d awennit ar umagrad n uɣmis'
       hi: Azzul %{to_user},
diff --git a/config/locales/km.yml b/config/locales/km.yml
index e36a551a1..79201b8e8 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -624,7 +624,7 @@ km:
       text: ជួយ​ឧបត្ថម្ភ​
     learn_more: ស្វែងយល់បន្ថែម
     more: ផ្សេងទៀត
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: សួស្ដី %{to_user},
     message_notification:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 8885f5d98..f599764fe 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1233,7 +1233,7 @@ ko:
       text: 기부하기
     learn_more: 더 알아보기
     more: 더 보기
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[오픈스트리트맵] %{user}님이 일기 항목에 덧글을 남겼습니다'
       hi: 안녕하세요 %{to_user}님,
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 23a21a18b..ce2250086 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1226,7 +1226,7 @@ ku-Latn:
       text: Bexş bike
     learn_more: Zêdetir Hîn Bibe
     more: Zêdetir
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} li ser nivîsek rojane şirove kir'
       hi: Silav %{to_user},
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 439ae7dde..966074232 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -770,7 +770,7 @@ lb:
       text: En Don maachen
     learn_more: Méi wëssen
     more: Méi
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: Salut %{to_user},
     message_notification:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 4b3deb3e9..66a02952a 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1213,7 +1213,7 @@ lt:
       text: Paremkite
     learn_more: Sužinoti daugiau
     more: Daugiau
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} pakomentavo dienoraščio įrašą'
       hi: Sveiki, %{to_user},
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 3af01a946..434930c6e 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1042,7 +1042,7 @@ lv:
       text: Ziedot attīstībai
     learn_more: Uzzināt Vairāk
     more: Vairāk
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} komentēja jūsu dienasgrāmatas ierakstu'
       hi: Sveiks %{to_user},
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 62173e114..8790d019a 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1427,7 +1427,7 @@ mk:
       text: Дарувајте
     learn_more: Дознајте повеќе
     more: Повеќе
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} коментираше на дневничка ставка'
       hi: Здраво %{to_user},
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 1a5c0c1ce..349107242 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -815,7 +815,7 @@ mr:
       text: देणगी द्या
     learn_more: अधिक जाणून घ्या
     more: अधिक
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user}ने एका अनुदिनीतील नोंदीवर अभिप्राय दिला'
     message_notification:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index d7f769608..74da460cd 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1084,7 +1084,7 @@ ms:
       text: Derma
     learn_more: Ketahui Lebih Lanjut
     more: Selebihnya
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} mengulas catatan diari anda'
       hi: Apa khabar %{to_user},
diff --git a/config/locales/my.yml b/config/locales/my.yml
index bae16c56e..16f88a5f8 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -533,7 +533,7 @@ my:
       text: အလှူတစ်ခု ပြုလုပ်ရန်
     learn_more: ပိုမို လေ့လာရန်
     more: ပို၍
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: ဟိုင်း %{to_user}၊
     message_notification:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 35b12acaa..70a07d8fa 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1235,7 +1235,7 @@ nb:
       text: Doner
     learn_more: Lær mer
     more: Mer
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} kommenterte et dagbokinnlegg'
       hi: Hei %{to_user},
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index b01a4e5fd..9f4d85f2c 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -822,7 +822,7 @@ ne:
       text: दान गर्नुहोस्
     learn_more: थप जान्नुहोस्
     more: थप
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: नमस्ते %{to_user},
     message_notification:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 00ad8d57f..a3e3d386b 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1272,7 +1272,7 @@ nl:
       text: Doneren
     learn_more: Meer lezen
     more: Meer
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} heeft een reactie bij uw dagboek geplaatst'
       hi: Hallo %{to_user},
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 88e6eb80b..a74ee41ab 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -969,7 +969,7 @@ nn:
       text: Gje pengegåve
     learn_more: Les meir
     more: Meir
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} kommenterte på ein oppføring i dagboka di'
       hi: Hei %{to_user},
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
new file mode 100644
index 000000000..031e8a8ce
--- /dev/null
+++ b/config/locales/nqo.yml
@@ -0,0 +1,724 @@
+# Messages for N’Ko (ߒߞߏ)
+# Exported from translatewiki.net
+# Export driver: phpyaml
+# Author: Aboubacar.banamoridou.toure
+# Author: Lancine.kounfantoh.fofana
+# Author: Youssoufkadialy
+---
+nqo:
+  time:
+    formats:
+      friendly: '%e %B %Y at %H:%M'
+  helpers:
+    file:
+      prompt: ߞߐߕߐ߮ ߛߎߥߊ߲ߘߟߌ
+    submit:
+      diary_comment:
+        create: ߊ߬ ߟߊߞߎ߲߬ߘߎ߬
+      diary_entry:
+        create: ߟߊ߬ߥߊ߲߬ߞߊ߬ߟߌ
+        update: ߟߏ߲ߘߐߦߊߟߌ
+      issue_comment:
+        create: ߡߙߌߣߊ߲ ߦߌ߬ߘߊ߬
+      message:
+        create: ߊ߬ ߗߋ߫
+      client_application:
+        create: ߕߐ߯ߛߓߍߟߌ
+        update: ߟߏ߲ߘߐߦߊߟߌ
+      redaction:
+        create: ߛߓߍߦߊߟߌ ߛߌ߲ߘߌ߫
+        update: ߛߓߍߦߊߟߌ ߟߊߞߎ߲߬ߘߎ߫
+      trace:
+        create: ߟߊ߬ߦߟߍ߬ߟߌ
+        update: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߠߊߞߎ߲߬ߘߎ߬
+      user_block:
+        create: ߘߏߙߊ ߘߏ߫ ߛߌ߲ߘߌ߫
+        update: ߘߏߙߊ ߘߏ߫ ߟߊߦߟߍ߬
+  activerecord:
+    errors:
+      messages:
+        invalid_email_address: ߊ߬ ߡߊ߫ ߓߐ߫ ߦߏ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߓߍ߲߬ߣߍ߲ ߠߋ߬
+        email_address_not_routable: ߊ߬ ߕߍ߫ ߛߙߊ߬ߕߊ߫ ߘߌ߫
+    models:
+      acl: ߞߣߐ߬ߜߍ߲߬ ߛߙߍߘߍ ߟߊߛߐ߬ߘߐ߲߫
+      changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+      changeset_tag: ߞߍߛߙߋ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+      country: ߖߡߊ߬ߣߊ
+      diary_comment: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲
+      diary_entry: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲
+      friend: ߘߍ߬ߢߐ߲߮
+      issue: ߓߐ߲ߘߊ
+      language: ߞߊ߲
+      message: ߗߋߛߓߍ
+      node: ߘߐ߬ߞߌߛߍ
+      node_tag: ߖߌߝߟߐ ߞߘߎ߬ߜߋ߲
+      notifier: ߦߟߌߣߐߕߊ
+      old_node: ߘߐ߬ߞߌ߬ߛߍ߬ ߞߘߐ
+      old_node_tag: ߖߌߝߟߐ ߞߘߎ߬ߜߋ߲߬ ߞߘߐ
+      old_relation: ߕߍߓߊ߯ߦߊ߫ ߞߘߐ
+      old_relation_member: ߕߍߓߊ߯ߦߊ߫ ߞߘߐ ߛߌ߲߬ߝߏ߲
+      old_relation_tag: ߕߍߓߊ߯ߦߊ߫ ߞߘߐ ߞߍߛߙߋ
+      old_way: ߛߌߟߊ߫ ߞߘߐ
+      old_way_node: ߛߌߟߊ ߞߘߎ߬ߜߋ߲߬ ߞߘߐ
+      old_way_tag: ߛߌߟߊ߫ ߞߘߐ ߞߍߛߙߋ
+      relation: ߕߍߓߊ߯ߦߊ
+      relation_member: ߕߍߓߊ߯ߦߊ ߛߌ߲߬ߝߏ߲
+      relation_tag: ߕߍߓߊ߯ߦߊ ߞߍߛߙߋ
+      report: ߜߋ߲߬ߞߘߎ߬ߢߐ߲߰ߦߊ
+      session: ߥߎ߬ߛߎ
+      trace: ߣߐ߭
+      tracepoint: ߣߐ߬ߞߊ߬ߒ߬ߓߌߟߊ
+      tracetag: ߞߊ߬ ߓߌ߬ߟߊ߫ ߡߊ߬ߛߙߋ ߞߐ߫
+      user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
+      user_preference: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߦߟߌߡߊߛߙߋ
+      user_token: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߖߐߟߐ߲ߞߐ
+      way: ߛߌߟߊ
+      way_node: ߛߌߟߊ ߘߐ߬ߞߌߛߍ
+      way_tag: ߛߌߟߊ ߞߍߛߙߋ
+    attributes:
+      client_application:
+        name: ߕߐ߮ (ߢߌ߬ߣߌ߲߬ߞߊ߬ߣߍ߲)
+        url: ߟߥߊߟߌߟߊ߲ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߕߊ߲ߓߊ߲ URL (ߘߌߦߊߜߏߦߊ)
+        callback_url: ߛߊ߲߬ߓߊ߬ߕߐ߮ URL ߞߟߌߟߌ ߡߊߛߊ߬ߦߌ
+        support_url: URL ߞߐߞߘߐߓߌ߲ߓߌ߲
+        allow_read_prefs: ߊ߬ߟߎ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߦߟߌߡߊߛߙߋ ߘߐߞߊ߬ߙߊ߲߬
+        allow_write_prefs: ߊ߬ߟߎ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߦߟߌߡߊߛߙߋ ߡߊߦߟߍ߬ߡߊ߲߫
+        allow_write_diary: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߛߌ߲ߘߌ߫߸ ߡߙߌߣߊ߲ ߊ߬ ߣߌ߫ ߞߊ߬ ߕߋߙߌ ߟߎ߬ ߟߊߘߊ߲߫
+        allow_write_api: ߔߊ߬ߔߘߊ ߡߊߦߟߍ߬ߡߊ߲߫
+        allow_read_gpx: ߊ߬ߟߎ߫ ߘߎ߲߬ߘߎ߬ߡߊ߬ GPS ߝߏ߲߬ߝߏ߲ ߠߎ߬ ߘߐߞߊ߬ߙߊ߲߬
+        allow_write_gpx: GPS ߝߏ߲߬ߝߏ߲ ߠߎ߬ ߟߊߦߟߍ߬
+        allow_write_notes: ߦߙߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲
+      diary_comment:
+        body: ߝߊ߬ߘߌ
+      diary_entry:
+        user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
+        title: ߝߐߡߊ
+        latitude: ߦߙߐ ߘߟߊߕߍ߯ߦߊ߫
+        longitude: ߘߎ߰ߕߍ߬ߟߍ߲߬ߦߊ
+        language: ߞߊ߲
+      friend:
+        user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
+        friend: ߘߍ߬ߢߐ߲߮
+      trace:
+        user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
+        visible: ߦߋߕߊ
+        name: ߞߐߕߐ߮ ߕߐ߮
+        size: ߢߊ߲ߞߊ߲
+        latitude: ߓߊߙߌ
+        public: ߝߘߏ߬ߓߊ
+        description: ߕߐ߯ߛߓߍߟߌ
+        gpx_file: GPX ߞߐߕߐ߮ ߟߊߦߟߍ߬
+        visibility: ߦߋߟߌ
+        tagstring: ߘߎ߲ߛߓߍ ߟߎ߬
+      message:
+        sender: ߗߋߓߊ߮
+        title: ߝߐߡߊ
+        body: ߝߊ߬ߘߌ
+        recipient: ߟߊ߬ߛߐ߬ߘߐ߲߬ߕߊ
+      user:
+        email: ߢ:ߞߏ߲ߘߏ
+        display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
+        description: ߕߐ߯ߛߓߍߟߌ
+        languages: ߞߊ߲ ߠߎ߬
+        pass_crypt: ߕߊ߬ߡߌ߲߬ߞߊ߲
+        pass_crypt_confirmation: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊߛߙߋߦߊ߫
+  datetime:
+    distance_in_words_ago:
+      half_a_minute: ߡߌ߬ߛߍ߲߬ ߕߟߊ߫ ߞߘߐ߫
+  editor:
+    default: ߓߐߛߎ߲ (ߕߋ߲߭ߕߋ߲߭ %{name})
+    id:
+      name: iD
+      description: ID (ߛߏ߲߯ߓߊߟߊ߲ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߘߐ߫)
+    remote:
+      name: ߥߎߟߊߟߡߊߡߙߊߟߊ߲
+  auth:
+    providers:
+      none: ߝߏߦߊ߲߫
+      openid: ߏߔߌ߲ ID
+      google: ߜ߭ߎߜ߭ߏߟ
+      facebook: ߝߋߛߑߓߎߞ
+      windowslive: ߥߌ߲ߘߏߛ ߟߊ߯ߌߝ߭
+      wikipedia: ߥߞߌߔߋߘߌߦߊ
+  api:
+    notes:
+      comment:
+        opened_at_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{when}
+        opened_at_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{when} %{user} ߓߟߏ߫
+        commented_at_html: ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{when}
+        commented_at_by_html: ߟߊߥߟߌ߬ߣߍ߲߫ %{when} %{user} ߓߟߏ߫
+      rss:
+        opened: ߞߟߏߜߍ߫ ߞߎߘߊ߫ (%{place} ߘߊߝߍ߬})
+        commented: ߡߙߌߣߊ߲߫ ߞߎߘߊ߫ (%{place} ߘߊߝߍ߬)
+        closed: ߞߟߏߜߍ߫ ߘߊߕߎ߲߯ߣߍ߲ (%{place} ߘߊߝߍ߬)
+      entry:
+        comment: ߡߙߌߣߊ߲
+  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}
+    in_changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+    anonymous: ߕߐ߯ߒߕߊ߲
+    part_of: ߝߊ߲߭ ߘߏ߫
+    download_xml: XML ߟߊߖߌ߰ ߌ ߞߎ߲߬
+    view_history: ߘߐ߬ߝߐ ߘߐߜߍ߫
+    view_details: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
+    location: ߘߌ߲߬ߞߌߙߊ
+    changeset:
+      title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}'
+      belongs_to: ߛߓߍߦߟߊ
+      changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+      join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
+      discussion: ߘߊߘߐߖߊߥߏ
+    way:
+      title_html: 'ߛߌߟߊ: %{name}'
+      history_title_html: 'ߛߌߟߊ ߘߐ߬ߝߐ: %{name}'
+    relation:
+      title_html: 'ߕߍߓߊ߯ߦߊ: %{name}'
+      history_title_html: 'ߕߍߓߊ߯ߦߊ ߟߊ߫ ߘߐ߬ߝߐ: %{name}'
+      members: ߛߌ߲߬ߝߏ߲ ߠߎ߬
+    relation_member:
+      type:
+        node: ߘߐ߬ߞߌߛߍ
+        way: ߛߌߟߊ
+        relation: ߕߍߓߊ߯ߦߊ
+    containing_relation:
+      entry_html: ߕߍߓߊ߯ߦߊ %{relation_name}
+      entry_role_html: ߕߍߓߊ߯ߦߊ %{relation_role} %{relation_name} ߘߌ߫
+    not_found:
+      sorry: 'ߤߊߞߍ߬ߕߏ߫߸ %{type} #%{id} ߕߍߣߊ߬ ߛߐ߬ߘߐ߲߬ ߠߊ߫.'
+      type:
+        node: ߘߐ߬ߞߌߛߍ
+        way: ߛߌߟߊ
+        relation: ߕߍߓߊ߯ߦߊ
+        changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+        note: ߦߟߌߣߐ
+    timeout:
+      sorry: ߤߊߞߍ߬ߕߏ߫߸ %{type} ߕߊ߫ ߓߟߏߡߟߊ ߡ.ߟ %{id} ߘߌ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ߖߊ߲߫ ߕߵߊ߬ ߡߊߝߍߣߍ߲
+        ߠߊ߫.
+      type:
+        node: ߘߐ߬ߞߌߛߍ
+        way: ߛߌߟߊ
+        relation: ߕߍߓߊ߯ߦߊ
+        changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲
+        note: ߘߐ߬ߞߌߛߍ
+    redacted:
+      type:
+        way: ߛߌߟߊ
+        relation: ߕߍߓߊ߯ߦߊ
+    start_rjs:
+      load_data: ߓߟߏߡߟߊ ߟߊߢߎ߲߫
+      loading: ߟߊ߬ߢߎ߲߬ߠߌ߲...
+    tag_details:
+      tags: ߘߎ߲ߛߓߍ ߟߎ߬
+      wiki_link:
+        key: ߥߞߌ ߞߊ߲߬ߛߓߍ߬ߟߌ߬ ߞߐߜߍ %{key} ߘߎ߲ߛߓߍ ߦߋ߫
+        tag: ߥߞߌ ߞߊ߲߬ߛߓߍ߬ߟߌ߬ ߞߐߜߍ %{key}=%{value} ߘߎ߲ߛߓߍ ߦߋ߫
+      wikidata_link: '%{page} ߞߣߐߘߐ ߥߞߌߘߕߊ ߞߊ߲߬'
+      wikipedia_link: '%{page} ߦߌߟߡߊ ߥߞߌߔߋߘߌߦߊ ߞߊ߲߬'
+      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: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{user}<abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+        ߟߋ߬ ߓߟߏ߫
+      opened_by_anonymous: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߟߊ߫ ߓߟߏ߫ <abbr title='%{exact_time}'>%{when}</abbr>
+      report: ߞߟߏߜߍ ߣߌ߲߬ ߠߊߞߏߝߐ߫
+    query:
+      title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
+      introduction: ߡߊߔ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߌ ߡߊߛߘߎ߬ߧߊ߬ ߟߊߓߊ߯ߙߊߟߌ ߟߎ߫ ߢߌߣߌ߲߫.
+      nearby: ߕߙߐ߬ߝߍ߬ ߟߊߓߊ߯ߙߊߟߌ
+  changesets:
+    changeset_paging_nav:
+      showing_page: ߞߐߜߍ %{page}
+      next: ߟߊ߬ߕߎ߲߰ߠߊ»
+      previous: ߟߊ߬ߕߎ߲߰ߠߊ ߟߎ߬
+    changeset:
+      anonymous: ߕߐ߯ߒߕߊ߲
+      no_edits: (ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬)
+      view_changeset_details: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲ ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
+    changesets:
+      id: ID
+      saved_at: ߊ߬ ߓߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
+      user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
+      comment: ߡߙߌߣߊ߲
+      area: ߦߙߐ
+    index:
+      title: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߡߊߝߊ߬ߟߋ߲߫
+      title_user: '%{user} ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫'
+      title_friend: ߒ ߕߋߙߌ ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+      title_nearby: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߡߍ߲ ߟߊߘߏ߲߬ߣߍ߲߫ ߛߌ߬ߢߐ߲߰ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߓߟߏ߫
+      empty: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
+      empty_area: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲߬ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߘߐ߫.
+      empty_user: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߟߊߘߏ߲߬ߣߍ߲߬ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫
+      no_more: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߟߎ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
+      no_more_area: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߣߌ߲߬ ߘߐ߫.
+      no_more_user: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߟߊߘߏ߲߬ߣߍ߲߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫
+      load_more: ߘߏߜߘߍ߫ ߟߎ߫ ߟߊߢߎ߲߫
+  diary_entries:
+    new:
+      title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ
+    form:
+      subject: 'ߝߐߡߊ:'
+      body: 'ߝߊ߬ߘߌ:'
+      language: 'ߞߊ߲:'
+      location: 'ߘߌ߲߬ߞߌߙߊ:'
+      latitude: ߓߊߙߌ
+      use_map_link: ߔߊ߬ߔߘߊ ߟߊߓߊ߯ߙߊ߫
+    index:
+      title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߕߋ߬ߟߋ߲
+      title_friends: ߕߋߙߌ ߟߎ߬ ߕߋ߬ߟߋ߲
+      title_nearby: ߛߌ߰ߢߐ߲߮ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߕߋ߬ߟߋ߲
+      user_title: '%{user} ߕߋ߬ߟߋ߲'
+      in_language_title: '%{language} ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬'
+      new: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ
+      new_title: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ߫ ߛߏ߯ߙߏ߫ ߒ ߕߋ߬ߟߋ߲ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߘߐ߫
+      my_diary: ߒ ߕߋ߬ߟߋ߲
+      no_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ߬ ߟߎ߬ ߕߴߦߋ߲߬
+      recent_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ ߞߐߟߕߊ ߟߎ߬
+      older_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+      newer_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊߟߡߊ ߟߎ߬
+    edit:
+      title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߦߟߍ߬ߡߊ߲߫
+      marker_text: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߌ߲߬ߞߌߙߊ ߟߎ߬
+    show:
+      title: '%{user} ߕߋ߬ߟߋ߲|%{title}'
+      user_title: '%{user} ߕߋ߬ߟߋ߲'
+      leave_a_comment: ߡߙߌߣߊ߲ ߘߏ߫ ߘߌ߫
+      login_to_leave_a_comment_html: '%{login_link} ߞߊ߬ ߛߋ߫ ߡߙߌߣߊ߲ ߦߌ߬ߘߊ߬ ߟߊ߫'
+      login: ߌ ߜߊ߲߬ߞߎ߲߫
+    no_such_entry:
+      title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬
+      heading: 'ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬ id: %{id} ߘߌ߫'
+    diary_entry:
+      posted_by_html: ߊ߬ ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{link_user} ߓߟߏ߫ %{created} %{language_link}
+        ߟߋ߬ ߞߊ߲߬
+      comment_link: ߡߙߌߣߊ߲ ߡߍ߲ ߦߋ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߠߊ߫
+      reply_link: ߗߋߛߓߍ ߗߋ߫ ߛߓߍߦߟߊ ߡߊ߬
+      edit_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߡߊߦߟߍ߬ߡߊ߲߫
+      hide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰
+      unhide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰ߣߍ߲ ߓߐ߫
+      confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
+      report: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߠߊߞߏߝߐ߫
+    diary_comment:
+      comment_from_html: ߡߙߌߣߊ߲ ߞߊ߬ ߝߘߊ߫ %{link_user} ߟߊ߫ %{comment_created_at} ߘߐ߫
+      hide_link: ߡߙߌߣߊ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰
+      unhide_link: ߡߙߌߣߊ߲ ߣߌ߲߬ ߥߣߊ߬ߙߌ߬ߣߍ߲ ߓߐ߫
+      confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
+      report: ߡߙߌߣߊ߲ ߣߌ߲߬ ߠߊߞߏߝߐ߫
+    location:
+      location: 'ߘߌ߲߬ߞߌߙߊ:'
+      view: ߦߌ߬ߘߊ߬ߟߌ
+      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+    feed:
+      user:
+        title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ %{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
+        description: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ %{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
+      language:
+        title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ %{language_name} ߘߐ߫
+        description: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߣߍ߲߬ ߞߎߘߊ ߟߎ߬ ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ
+          ߞߊ߲߬ %{language_name} ߘߐ߫
+      all:
+        title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
+        description: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߞߊ߲߬
+    comments:
+      has_commented_on: '%{display_name} ߟߎ߫ ߓߘߴߊ߬ߟߎ߬ ߡߙߌߣߊ߲ ߦߌ߬ߘߊ߬ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ
+        ߟߎ߫ ߞߊ߲߬'
+      post: ߗߋߓߏ߲
+      comment: ߡߙߌߣߊ߲ߦߌߘߊ
+      newer_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
+      older_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+  friendships:
+    make_friend:
+      heading: ' ߞߊ߬ %{user} ߞߍ߫ ߌ ߕߋߙߌ ߘߌ߫؟'
+      button: ߞߍ߫ ߕߋߙߌ ߘߌ߫
+      success: '%{name} ߓߘߊ߫ ߞߴߌ ߕߋߙߌ ߘߌ߫߹'
+      failed: ߤߊߞߍ߬ߕߏ߫߸ %{name} ߓߘߊ߫ ߗߌߙߏ߲߫ ߝߊ߬ߙߊ ߘߐ߫ ߕߋߙߌ ߟߎ߬ ߟߊ߫
+      already_a_friend: ߌ ߕߋߙߌ ߟߋ߬ ߦߋ߫ %{name} ߘߌ߫ ߞߘߐ߬ߡߊ߲߫
+    remove_friend:
+      heading: ߡߍ߲ ߕߴߌ ߕߋߙߌ߫ ߘߌ߫ %{user}؟
+      button: ߌ ߕߋߙߌ߫ ߕߍ߫
+      success: '%{name} ߓߘߊ߫ ߓߊ߲߫ ߓߐ߫ ߟߴߌ ߕߋߙߌߦߊ ߟߊ߫'
+      not_a_friend: '%{name} ߕߴߌ ߕߋߙߌ ߝߋ߲߫ ߘߌ߫.'
+  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>
+    search_osm_nominatim:
+      prefix:
+        aerialway:
+          cable_car: ߘߎ߲ߞߎߟߎ߲
+        aeroway:
+          hangar: ߜߕߊ
+          parking_position: ߟߐ߬ߟߌ ߘߌ߲߬ߞߌߙߊ
+          runway: ߓߏ߬ߙߌ߬ ߛߌߟߊ
+          taxiway: ߥߊߛߌߥߊߟߌ߫ ߛߌߟߊ
+        amenity:
+          bank: ߜߍߓߏ߲
+          bar: ߡߌ߲߬ߓߏ߲
+          bbq: BBQ
+          bicycle_repair_station: ߣߍ߰ߛߏ߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
+          biergarten: ߢߐ߬ߘߟߐ ߣߊߞߐ
+          boat_rental: ߕߊߞߎߟߎ߲߫ ߛߎߝߙߎ߫ ߦߙߐ
+          bus_station: ߞߎߟߎ߲ߓߏ߲߫ ߟߐ߫ ߦߙߐ
+          cafe: ߞߊߝߋ
+          car_rental: ߞߐ߲߬ߛߏ߬ ߛߎ߬ߝߙߎ߬ ߦߙߐ
+          car_wash: ߞߐ߲߬ߛߏ߬ ߞߏ߬ ߦߌߟߊ
+          childcare: ߘߋ߲ߣߍ߲߫ ߠߊߡߙߊ߫ ߦߌߟߊ
+          clinic: ߓߎ߬ߙߋ (ߞߑߟߣߌߞ)
+          clock: ߕߎ߬ߡߊ߬ߟߊ߲
+          college: ߞߊ߬ߙߊ߲߬ߘߊ
+          dentist: ߢߌ߲߫ ߘߊ߲ߘߊ
+          doctors: ߘߊ߲ߘߟߊ ߟߎ߫
+          drinking_water: ߖߌ߫ ߡߌ߲߬ߕߊ
+          driving_school: ߞߐ߲߬ߛߏ߬ ߞߊߙߊ߲ߕߊ
+          embassy: ߟߊ߬ߛߌ߰ߘߊ
+          fire_station: ߕߊ߫ ߟߊߛߟߊ ߟߎ߬
+          fountain: ߕߋ߲߬ߞߋ
+          fuel: ߖߋ߬ߣߌ߲߬ߕߊ
+          hospital: ߘߊ߲ߘߊߛߏ
+          internet_cafe: ߓߟߐߟߐ߫ ߞߊߝߋ
+          language_school: ߞߊ߲߫ ߞߊߙߊ߲ߕߊ
+          library: ߛߓߍߘߊ
+          marketplace: ߟߐ߯ߝߍ ߘߌ߲߬ߞߌߙߊ
+          mobile_money_agent: ߜߋߟߋ߲ߜߋߟߋ߲ ߥߏߘߌ ߖߋ߬ߕߌ߰ߘߊ
+          money_transfer: ߥߏߘߌ߫ ߟߕߊߡߌ߲߫ ߦߙߐ
+          motorcycle_parking: ߔߏߔߏ߫ ߟߊߟߐ߬ ߦߌߟߊ
+          music_school: ߘߐ߲߬ߞߟߌ߬ ߞߊߙߊ߲ߕߊ
+          nightclub: ߘߐ߲߬ߓߏ߲
+          parking: ߞߐ߲߬ߛߏ߬ߜߘߋ
+          pharmacy: ߓߊߛߌߓߏ߲
+          police: ߕߐ߲ߓߟߏߡߊ
+          prison: ߥߛߎߓߏ߲
+          public_building: ߝߘߏ߬ߓߊ߬ ߓߏ߲
+          restaurant: ߘߊߥߎ߲ߠߌ߲߫ ߦߙߐ
+          school: ߞߊ߬ߙߊ߲߬ߕߊ
+          shower: ߢߍ߲߮
+          swimming_pool: ߣߊߡߎ߲ߠߌ߲߫ ߘߟߊ
+          taxi: ߥߊߟߌߥߊߟߌ
+          telephone: ߝߘߏ߬ߓߊ߬ ߜߋߟߋ߲ߜߋߟߋ߲
+          theatre: ߓߙߊߘߐߦߊ
+          toilets: ߢߍ߲߮
+          townhall: ߛߏߕߌ߯ߘߊ
+          university: ߖߊ߯ߓߘߊ
+          veterinary: ߓߌߦߊ߲ߘߊ߲ߘߟߊ ߘߐ߬ߓߛߏ߬ߟߌ
+          village_hall: ߕߏ߯ߘߊ ߛߏߕߌ߯ߟߊ߫
+          waste_basket: ߢߡߊ߬ߞߍ߬ߝߋ߲
+          waste_disposal: ߢߡߊ߬ߘߊ߲߬ߘߊ߫ ߦߌߟߊ
+          waste_dump_site: ߛߎ߬ߣߎ߲߬ߞߎ߲
+          weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲
+        boundary:
+          protected_area: ߦߙߐ߫ ߟߊߞߊ߲ߘߊߣߍ߲
+        bridge:
+          suspension: ߛߍ߲߫ ߠߊߘߎ߲ߣߍ߲
+          "yes": ߛߍ߲
+        building:
+          hangar: ߜߕߊ
+          hospital: ߘߊ߲ߘߊߛߏ ߓߏ߲
+          hotel: ߖߌ߬ߦߊ߬ߓߏ߲
+          house: ߟߎ
+          public: ߝߘߏ߬ߓߊ߬ ߓߏ߲
+          university: ߖߊ߯ߓߘߊ ߓߏ߲
+        craft:
+          electrician: ߢߎߡߍߦߟߊ
+          electronics_repair: ߢߎߡߍ߫ ߘߐߓߍ߲߫ ߦߙߐ
+          painter: ߓߐߙߐ߲ߦߟߊ
+          photographer: ߖߌ߬ߦߕߊ߬ߟߊ
+          plumber: ߘߎ߰ߡߊ߬ߟߊ߬ߟߊ
+          shoemaker: ߛߊ߬ߡߘߊ߬ ߘߐ߬ߓߍ߲߬ߠߊ
+          tailor: ߞߙߊߟߌߟߊ
+        highway:
+          bus_stop: ߞߎߟߎ߲ߓߏ߲߫ ߘߟߐߦߙߐ
+          construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
+          road: ߛߌߟߊ
+          secondary: ߛߌߟߊ߫ ߝߌߟߊߣߊ߲
+          secondary_link: ߛߌߟߊ߫ ߝߌߟߊߣߊ߲
+          unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
+          "yes": ߛߌߟߊ
+        historic:
+          castle: ߖߌ߲߬ߓߏ߲
+          church: ߓߊ߬ߕߏ߬ߓߏ߲
+          house: ߟߎ
+          monument: ߝߙߎߕߎ
+          tomb: ߛߊ߬ߙߌ
+          tower: ߛߊ߲ߓߏ߲
+          "yes": ߘߐ߬ߝߐ ߞߍߦߙߐ
+        junction:
+          "yes": ߓߍ߲߬ߕߍ
+        landuse:
+          cemetery: ߛߊ߬ߙߌ߬ߟߏ
+          farm: ߝߏ߬ߘߏ
+          forest: ߕߎ
+          military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
+          mine: ߘߊ߬ߡߊ߲
+          railway: ߣߍ߰ߛߌߟߊ
+        leisure:
+          fishing: ߘߏߟߋ߲ߓߌߟߊ߫ ߦߙߐ
+          fitness_centre: ߞߍ߲ߘߍߦߊ ߕߊ߲ߓߊ߲
+          garden: ߣߊߞߐ
+          horse_riding: ߛߏ߬ ߓߏߙߌ
+          nature_reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
+          sports_centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
+          swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ
+        man_made:
+          bridge: ߛߍ߲
+          telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲
+          tower: ߛߊ߲ߓߏ߲
+          water_tower: ߖߌߡߣߐ
+          works: ߝߊ߲ߓߏ߲
+          "yes": ߡߐ߱ ߛߌ߲ߘߟߌߣߐ
+        military:
+          airfield: ߣߊ߲߬ߕߌ߰ ߛߊ߲ߡߊߘߊ߲
+        natural:
+          forest: ߕߎ
+          hill: ߞߎ߬ߙߎ
+          island: ߕߌ߲
+          sand: ߕߌ߬ߢߍ
+          tree: ߦߙߌߖߎ
+          valley: ߝߏ߲ߝߊ߲
+          water: ߖߌ
+          wetland: ߦߙߐ߫ ߦߌߟߌ߲ߣߍ߲
+          wood: ߦߙߌ
+        office:
+          government: ߞߎ߲߬ߠߊ߬ߛߌ߮ ߟߊ߫ ߛߓߍߘߊ
+          ngo: ߛ.ߘ.ߞ ߛߓߍߘߊ
+          telecommunication: ߓߌ߬ߟߊ߬ߢߐ߲߱ߡߊ ߛߓߍߘߊ
+          "yes": ߛߓߍߘߊ
+        place:
+          country: ߖߡߊ߬ߣߊ
+          farm: ߝߏ߬ߘߏ
+          house: ߟߎ
+          houses: ߟߎ ߟߎ߬
+          island: ߕߌ߲
+          region: ߕߌ߲߬ߞߎߘߎ߲
+          sea: ߞߐ߰ߖߌ
+          state: ߞߊ߬ߝߏ
+          town: ߛߏ
+          village: ߓߎ߬ߘߊ
+          "yes": ߘߌ߲߬ߞߌߙߊ
+        railway:
+          abandoned: ߣߍ߰ߛߌ߬ߟߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲
+          construction: ߣߍ߰ߛߌߟߊ ߡߍ߲ ߦߋ߫ ߓߏ߲߫ ߟߐ߬ߣߍ߲ ߠߎ߬ ߞߘߐ߫
+          halt: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
+          junction: ߣߍ߰ߛߌߟߊ ߓߍ߲߬ߕߍ
+          stop: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
+        shop:
+          art: ߞߎ߬ߛߊ߲߬ߧߊ ߛߎ߲ߞߎ߲
+          bag: ߓߘߐ߬ ߝߎ߲ߞߎ߲
+          bakery: ߓߙߎߜߊߛߌ߫ ߦߙߐ
+          bicycle: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
+          books: ߞߝߊ߬ ߝߎ߲ߞߎ߲
+          boutique: ߝߎ߲ߞߎ߲
+          car: ߞߐ߲߬ߛߏ߬ ߝߎ߲ߞߎ߲
+          car_parts: ߞߐ߲߬ߛߏ߬ ߖߐ߯ߙߊ߲
+          car_repair: ߞߐ߲߬ߛߏ߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
+          clothes: ߝߊ߰ߣߌ߲߬ ߝߎ߲ߞߎ߲
+          coffee: ߞߊߝߋ߫ ߝߎ߲ߞߎ߲
+          computer: ߕߟߋ߬ߓߊ߰ ߝߎ߲ߞߎ߲
+          cosmetics: ߡߊ߬ߡߎ߲߬ߕߟߎ ߝߎ߲ߞߎ߲
+          e-cigarette: ߢߎߡߍߙߋ߲߫ ߛߙߊߡߟߋߞߋ ߝߎ߲ߞߎ߲
+          electronics: ߢߎߡߍߙߋ߲߫ ߝߎ߲ߞߎ߲
+          erotic: ߋߙߏߕߌߞ ߝߎ߲ߞߎ߲
+          gas: ߥߊߦߌ߲߫ ߝߎ߲ߞߎ߲
+          hairdresser: ߞߎ߲߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
+          hardware: ߛߎ߲ߝߘߍ߫ ߝߎ߲ߞߎ߲
+          health_food: ߞߍ߲ߘߍߦߊ߫ ߓߊߟߏ ߟߎ߬ ߝߎ߲ߞߎ߲
+          kitchen: ߜߊ߬ߞߣߐ߬ߝߋ߲ ߠߎ߬ ߝߎ߲ߞߎ߲
+          massage: ߗߋߛߓߍ
+          mobile_phone: ߓߟߏߟߊ߫ ߜߋߟߋ߲ߜߋߟߋ߲߫ ߝߎ߲ߞߎ߲
+          motorcycle: ߔߏߔߏ߫ ߝߎ߲ߞߎ߲
+          motorcycle_repair: ߔߏߔߏ߫ ߘߐߓߍ߲߫ ߖߐ߯ߙߊ߲ ߠߎ߬ ߝߎ߲ߞߎ߲
+          music: ߘߐ߲߬ߞߟߌ ߝߎ߲ߞߎ߲
+          musical_instrument: ߘߐ߲߬ߞߟߌ߬ߟߊ߬ ߡߎߙߊ߲ ߠߎ߬
+          nutrition_supplements: ߛߎ߬ߡߊ߲߬ ߡߊ߬ߛߐ߬ߟߊ ߟߎ߫
+          supermarket: ߘߎ߲߬ߘߎ߬ߡߊ߬ ߟߐ߯ߝߍ
+          tailor: ߞߙߊߟߌߟߊ
+          tattoo: ߥߍ߬ߢߍ߲ ߝߎ߲ߞߎ߲
+          tea: ߕߋ߫ ߝߎ߲ߞߎ߲
+          tobacco: ߖߊ߲߬ߓߊ߬ ߝߎ߲ߞߎ߲
+          tyres: ߞߐ߲߬ߡߘߊ߬ ߝߎ߲ߞߎ߲
+          variety_store: ߢߌ߰ߡߌ߬ߢߊ߰ߡߊ߬ ߝߎ߲ߞߎ߲
+          video: ߖߌ߬ߦߊ߬ߖߟߎ߬ ߝߎ߲ߞߎ߲
+          video_games: ߕߏߟߏ߲߫ ߖߌ߬ߦߊ߬ߖߟߎ߬ߡߊ ߝߎ߲ߞߎ߲
+          wholesale: ߥߊߝߎߟߌ߫ ߝߎ߲ߞߎ߲
+          wine: ߖߊ߬ߓߌ߬ߙߋ߲߬ ߘߟߐ ߝߎ߲ߞߎ߲
+          "yes": ߝߎ߲ߞߎ߲
+        tourism:
+          hotel: ߖߌ߬ߦߊ߬ߓߏ߲
+          museum: ߗߍߓߏ߲
+          zoo: ߥߘߊߓߊ ߝߟߍ߫ ߛߏ
+        waterway:
+          river: ߓߊ
+          waterfall: ߖߌ߫ ߛߎߙߎ߲ߘߎ
+          "yes": ߖߛߌߟߊ
+      admin_levels:
+        level2: ߖߡߊ߬ߣߊ ߓߐߕߏ߲
+        level4: ߞߊ߬ߝߏ ߓߐߕߏ߲
+        level5: ߕߌ߲ߞߎߘߎ߲ ߓߐߕߏ߲
+        level6: ߖߡߊ߬ߣߊ ߓߐߕߏ߲
+        level8: ߛߏ ߓߐߕߏ߲
+        level9: ߕߏߘߊ ߓߐߕߏ߲
+    description:
+      types:
+        towns: ߛߏ
+        places: ߘߌ߲߬ߞߌߙߊ
+    results:
+      no_results: ߞߐߝߟߌ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
+      more_results: ߞߐߝߟߌ߫ ߜߘߍ ߟߎ߬
+  issues:
+    index:
+      title: ߓߐ߲ߘߊ ߟߎ߫
+      select_type: ߛߎ߯ߦߊ ߓߊߕߐ߬ߡߐ߲߫
+      search: ߢߌߣߌ߲ߠߌ߲
+      search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫
+      user_not_found: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߕߴߦߋ߲߬
+      issues_not_found: ߒ߬ߒ߫ ߓߐ߲ߘߊ߫ ߛߎ߮ ߏ߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
+      states:
+        ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
+        open: ߊ߬ ߟߊߞߊ߬
+        resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫
+    update:
+      provide_details: ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߬ߣߍ߲ ߠߎ߬ ߡߊߛߐ߫ ߖߊ߰ߣߌ߲߫
+    show:
+      resolve: ߊ߬ ߢߊߓߐ߫
+      ignore: ߊ߬ ߡߋߓߌ߬ߟߊ߫
+      reopen: ߊ߬ ߟߊߞߊ߬ ߕߎ߲߯
+  reports:
+    new:
+      categories:
+        diary_entry:
+          other_label: ߘߏ߫ ߜߘߍ߫
+        user:
+          other_label: ߘߏ߫ ߜߘߍ߫
+  layouts:
+    logo:
+      alt_text: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߛߌ߲ߞߐ߲
+    home: ߕߊ߯ ߛߏ߫ ߘߌ߲߬ߞߌߙߊ ߘߐ߫
+    logout: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
+    log_in: ߌ ߜߊ߲߬ߞߎ߲߫
+    log_in_tooltip: ߌ ߜߊ߲߬ߞߎ߲߫ ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߞߊ߬ߣߍ߲ ߘߏ߫ ߟߊ߫
+    sign_up: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
+    start_mapping: ߔߊ߬ߔߘߊ߬ ߡߊ߬ߝߟߍ ߘߊߡߌ߬ߣߊ߬
+    sign_up_tooltip: ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊߞߊ߬ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߊ߲ߡߊ߬
+    edit: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
+    history: ߘߐ߬ߝߐ
+    export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
+    issues: ߓߐ߲ߘߊ ߟߎ߫
+    data: ߓߟߏߡߟߊ
+    export_data: ߓߟߏߡߟߊ ߟߊߝߏ߬ߦߌ߬
+    gps_traces: GPS ߣߐ߬ߣߐ߬ߟߌ
+    gps_traces_tooltip: GPS ߜߙߋ߬ߓߐ߬ߟߌ ߘߊߘߐߓߍ߲߬
+    user_diaries: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߋߟߋ߲ ߠߎ߬
+    user_diaries_tooltip: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߋ߬ߟߋ߲ ߦߋ߫
+    edit_with: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ %{editor} ߘߌ߫
+    tag_line: ߥߞߌ ߛߙߊ߬ߓߊߟߌ ߘߎߢߊ߫ ߔߊ߬ߔߘߊ
+    intro_header: ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߞߊ߲߬߹
+    intro_text: ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߦߋ߫ ߘߎߢߊ߫ ߔߊ߬ߔߘߊ ߟߋ߬ ߘߌ߫߸ ߡߍ߲ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߡߐ߱ ߟߎ߬
+      ߓߟߏ߫ ߦߏ߫ ߌߟߋ߸ ߊ߬ ߟߊߓߊ߯ߙߊ ߦߋ߫ ߛߙߊ߬ߓߊߟߌ ߟߋ߬ ߘߌ߫ ߟߊ߬ߘߤߊ߬ߟߌ߫ ߘߊߦߟߍ߬ߣߍ߲ ߞߘߐ߫.
+    intro_2_create_account: ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߘߊߦߟߍ߬
+    partners_ucl: UCL
+    help: ߘߍ߬ߡߍ߲߬ߠߌ߲
+    about: ߞߊ߬ ߓߍ߲߬
+    copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ
+    community: ߘߍ߬ߘߊ
+    make_a_donation:
+      text: ߣߌ߬ߟߌ ߘߏ߫ ߞߍ߫
+    learn_more: ߘߏߜߘߍ߫ ߟߎ߫ ߘߐߞߊ߬ߙߊ߲߬
+    more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
+  user_mailer:
+    diary_comment_notification:
+      subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{user} ߓߘߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߏ߫ ߡߓߊߟߌߡߊ߫'
+      hi: ߌ ߣߌ߫ ߗߋ߫ %{to_user}.
+      header: '%{from_user} ߓߘߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߏ߫ ߡߓߊߟߌߡߊ߫ ߝߐߡߊ
+        %{subject} ߘߌ߫'
+    lost_password_html:
+      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
+      hopefully_you: ߡߐ߱ ߘߏ߫ (ߊ߬ ߘߌ߫ ߛߋ߫ ߞߍ߫ ߟߴߌ ߖߍ߬ߘߍ ߘߌ߫) ߓߘߊ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߞߍ߫
+        ߕߊ߬ߡߌ߲߬ߞߊ߲߬ ߡߊߦߟߍߡߊ߲ ߡߊ߬ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊ߫ openstreetmap.org ߖߊ߬ߕߋ߬ߘߊ
+        ߣߌ߲߬ ߞߊ߲߬.
+      click_the_link: ߣߴߊ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߣߌ߲߬ ߛߐ߲߬ߞߌ߲߫ ߖߊ߰ߣߌ߲߫ ߞߵߌ
+        ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߝߊ߬ߟߋ߲߬.
+    note_comment_notification:
+      anonymous: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߕߐ߯ߒߕߊ߲ ߘߏ߫
+      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
+      commented:
+        subject_own: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{commenter} ߓߘߴߌ ߟߊ߫ ߦߟߌߣߐ ߘߏ߫ ߡߓߊߟߌߡߊ߫'
+        subject_other: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{commenter} ߓߘߊ߫ ߦߟߌߣߐ ߘߏ߫ ߡߓߊߟߌߡߊ߫ ߌ ߣߴߌ
+          ߘߐ߱ߘߏ߲߬ ߠߊ߫ ߡߍ߲ ߠߊ߫'
+        your_note: '%{commenter} ߓߘߊ߫ ߡߙߌߣߊ߲ ߘߏ߫ ߓߌ߬ߟߊ߬ ߌ ߟߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫ %{place}
+          ߞߍ߬ߙߍߝߍ߬.'
+  messages:
+    inbox:
+      from: ߞߊ߬ ߝߘߊ߫
+      subject: ߝߐߡߊ
+      date: ߕߎ߬ߡߊ߬ߘߊ
+      no_messages_yet_html: ߗߋߛߓߍ߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߡߊ߰ߒ߬ߠߊ߬ߟߌ
+        ߘߐ߫  %{people_mapping_nearby_link} ߟߊ߫؟
+      people_mapping_nearby: ߛߌ߰ߢߐ߰ߡߊ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬
+    message_summary:
+      unread_button: ߊ߬ ߞߍ߫ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
+      read_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
+      reply_button: ߊ߬ ߞߐߖߋ߬ߓߌ߬
+      destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
+    new:
+      title: ߗߋߛߓߍ ߗߋ߫
+      send_message_to_html: ߗߋߛߓߍ߫ ߞߎߘߊ ߘߏ߫ ߗߋ߫ %{name} ߡߊ߬
+      subject: ߝߐߡߊ
+      body: ߝߊ߬ߘߌ
+      back_to_inbox: ߌ ߞߐߛߊ߬ߦߌ߬ ߗߋߛߓߍ߫ ߞߏ߲ߘߏ ߡߊ߬
+    create:
+      message_sent: ߗߋߛߓߍ߫ ߗߋߣߍ߲
+      limit_exceeded: ߌ ߓߊ߲߫ ߛߊ߲ ߠߋ߬ ߦߋ߫ ߗߋߛߓߍ߫ ߥߙߍߓߊߓߊ ߟߋ߬ ߗߋ߫ ߟߊ߫. ߥߊ߯ߕߌߣߍ߲߫ ߡߊߞߐ߬ߣߐ߲߫
+        ߖߊ߰ߣߌ߲߫ ߦߊ߬ߣߴߌ ߞߍߕߐ߫ ߘߏ߫ ߜߘߍ߫ ߗߋ߫ ߟߊ߫.
+    no_such_message:
+      title: ߗߋߛߓߍ߫ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬
+      heading: ߗߋߛߓߍ߫ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬
+      body: ߤߊߞߍ߬ߕߏ߫߸ ߗߋߛߓߍ߫ ߛߌ߫ ߕߍ߫ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߟߊ߫.
+    outbox:
+      title: ߗߋߟߌ߫ ߞߏ߲ߘߏ
+      my_inbox_html: ߒ ߠߊ߫ %{inbox_link}
+      outbox: ߗߋߟߌ߫ ߞߏ߲ߘߏ
+      subject: ߝߐߡߊ
+    show:
+      title: ߗߋߛߓߍ ߘߐߞߊ߬ߙߊ߲߬
+      from: ߞߊ߬ ߝߘߊ߫
+      subject: ߝߐߡߊ
+      date: ߕߎ߬ߡߊ߬ߘߊ
+      reply_button: ߊ߬ ߞߐߖߋ߬ߓߌ߬
+      unread_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
+      destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
+      back: ߌ ߞߐߛߊ߬ߦߌ߬
+      to: ߞߊ߬ ߕߊ߯
+      wrong_user: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߘߌ߫ ߒ߬ߞߊ߬ ߌ ߢߌ߬ߣߊ߬ߣߍ߲߫ ߗߋߛߓߍ ߡߍ߲
+        ߘߐߞߊ߬ߙߊ߲߬ ߞߏ ߡߊ߬߸ ߏ߬ ߗߋߣߍ߲߫ ߕߴߏ߬ ߓߟߏ߫ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߡߊ߬. ߌ ߜߊ߲߬ߞߎ߲߫
+        ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫ ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߘߐߞߊ߬ߙߊ߲߬ ߠߊ߫.
+    sent_message_summary:
+      destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
+    mark:
+      as_read: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߫ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
+      as_unread: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
+    destroy:
+      destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
+  site:
+    about:
+      next: ߢߍߕߊ
+      copyright_html: <span>&copy;</span>ߏߔߌ߲߫ ߛߑߕߙߌߕ ߡߊߔ<br>ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߠߎ߬
+      used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲
+        ߟߥߊ߬ߟߌ߬ߟߊ߲ ߣߌ߫ ߞߍߟߊ߲߫ ߛߎ߲ߝߘߍߡߊ ߟߎ߬'
+...
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 1bde1ae51..6da328d14 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1205,7 +1205,7 @@ oc:
       text: Far un don
     learn_more: Ne saber mai
     more: Mai
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} a postat un comentari sus un article de jornal'
       hi: Bonjorn %{to_user},
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 6601ae66f..249fccf5f 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -728,7 +728,7 @@ pa:
       text: ਦਾਨ ਦਿਉ
     learn_more: ਹੋਰ ਜਾਣੋ
     more: ਹੋਰ
-  notifier:
+  user_mailer:
     gpx_notification:
       greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ,
     signup_confirm:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 59b1209d8..15f5f971f 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1512,7 +1512,7 @@ pl:
       text: Przekaż darowiznę
     learn_more: Dowiedz się więcej
     more: Więcej
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] Użytkownik %{user} skomentował wpis dziennika'
       hi: Witaj %{to_user},
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index f7e772b05..c8a3b69c5 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1472,7 +1472,7 @@ pt-BR:
       text: Faça uma doação
     learn_more: Saiba Mais
     more: Mais
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} comentou em uma entrada do diário'
       hi: Olá %{to_user},
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index a50c790cb..cfb5e5493 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1460,7 +1460,7 @@ pt-PT:
       text: Fazer donativo
     learn_more: Mais informações
     more: Mais
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} comentou uma publicação de diário'
       hi: Olá, %{to_user}.
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 6d213ad95..4f494d3b2 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1345,7 +1345,7 @@ ro:
       text: Faceți o donație
     learn_more: Aflați mai multe
     more: Mai multe
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} a comentat o intrare în jurnal'
       hi: Salut %{to_user},
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 4bdb420bc..41c1397c7 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1354,7 +1354,7 @@ ru:
       text: Поддержать проект
     learn_more: Узнать больше
     more: Ещё
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: Пользователь [OpenStreetMap] %{user} оставил комментарий в дневнике
       hi: Здравствуйте, %{to_user},
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 110cb9c19..93efac1fb 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -712,7 +712,7 @@ sc:
     foundation: Fundatzione
     learn_more: Leghe àteru
     more: Àteru
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: Salude %{to_user},
       header: '%{from_user} at cummentadu s''intrada cuotidiana de OpenStreetMap cun
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 115a7e3ed..24edf793e 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -948,7 +948,7 @@ scn:
       text: Fai na dunazzioni
     learn_more: Sapìrinni cchiossai
     more: Àutri cosi
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} cummintau na vuci dû tò diariu'
       hi: Salutamu %{to_user},
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index c583a22ab..69b94bda8 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -832,7 +832,7 @@ sco:
       text: Make a Donation
     learn_more: Learn Mair
     more: Mair
-  notifier:
+  user_mailer:
     lost_password_plain:
       hopefully_you: Someane (possibly ye) haes asked for the passwird tae be reset
         on this email address's openstreetmap.org accoont.
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 0cd3dee23..501ee00fb 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1077,7 +1077,7 @@ sk:
       text: Darovanie
     learn_more: Viac info
     more: Ďalšie
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} okomentoval záznam vo vašom denníku'
       hi: Ahoj %{to_user},
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 97db76c11..7d4d365fd 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1057,7 +1057,7 @@ sl:
       text: Prispevajte finančna sredstva
     learn_more: Več o tem
     more: Več
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} je komentiral vnos v dnevnik'
       hi: Pozdravljen, %{to_user}!
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 6334330bc..d2827696b 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -943,7 +943,7 @@ sq:
       text: Dhuro
     learn_more: Mëso më shumë
     more: Më shumë
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: Përshëndetje %{to_user},
     message_notification:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 1cf62d02f..438e71fd2 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -756,7 +756,7 @@ sr-Latn:
     make_a_donation:
       title: Podržite Openstritmap novčanim prilogom
       text: Priložite novac
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} prokomentarisa vaš unos u dnevniku'
       hi: Pozdrav, %{to_user},
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 0f44adebc..b19baabf7 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1122,7 +1122,7 @@ sr:
       text: Донирајте
     learn_more: Детаљније
     more: Више
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '%{user} је прокоментарисао дневнички запис'
       hi: Поздрав, %{to_user},
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index a1278ea3f..ff16f329a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1349,7 +1349,7 @@ sv:
       text: Donera
     learn_more: Läs mer
     more: Mer
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} kommenterade på ett dagboksinlägg'
       hi: Hej %{to_user},
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 570691e7a..e842e2d2d 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -525,7 +525,7 @@ ta:
       text: ஒரு நன்கொடையை அளிக்கவும்
     learn_more: மேலும் அறிய
     more: மேலும்
-  notifier:
+  user_mailer:
     gpx_notification:
       greeting: வணக்கம்,
     email_confirm_plain:
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 6096f32fc..1bde47e47 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -498,7 +498,7 @@ te:
       text: విరాళమివ్వండి
     learn_more: మరింత తెలుసుకోండి
     more: మరిన్ని
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: హలో %{to_user},
     message_notification:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 66582f586..22b0893ca 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -19,17 +19,21 @@ th:
     formats:
       friendly: '%e %B %Y เมื่อเวลา %H:%M น.'
   helpers:
+    file:
+      prompt: เลือกแฟ้ม
     submit:
       diary_comment:
         create: บันทึก
       diary_entry:
         create: เผยแพร่
         update: อัปเดต
+      issue_comment:
+        create: เพิ่มคำอธิบายหรือความเห็น
       message:
         create: ส่ง
       client_application:
         create: ลงทะเบียน
-        update: แก้ไข
+        update: ปรับปรุง
       redaction:
         create: สร้างการตรวจทาน
         update: บันทึกการตรวจทาน
@@ -43,6 +47,7 @@ th:
     errors:
       messages:
         invalid_email_address: ดูเหมือนจะไม่ใช่ที่อยู่อีเมลที่ถูกต้อง
+        email_address_not_routable: ไม่สามารถกำหนดที่มาที่ไปได้
     models:
       acl: รายการควบคุมการเข้าถึง
       changeset: ชุดการเปลี่ยนแปลง
@@ -51,6 +56,7 @@ th:
       diary_comment: ความคิดเห็นสำหรับบันทึก
       diary_entry: รายการบันทึก
       friend: เพื่อน
+      issue: ปัญหา
       language: ภาษา
       message: ข้อความ
       node: หมุด
@@ -67,6 +73,7 @@ th:
       relation: ความสัมพันธ์
       relation_member: สมาชิกของความสัมพันธ์
       relation_tag: ป้ายกำกับของความสัมพันธ์
+      report: รายงาน
       session: การเข้าใช้งาน
       trace: รอยทาง
       tracepoint: จุดรอยทาง
@@ -79,8 +86,17 @@ th:
       way_tag: ป้ายกำกับเส้นทาง
     attributes:
       client_application:
+        name: ชื่อ (จำเป็นต้องใส่)
+        url: ที่อยู่ยูอาร์แอลแอปพลิเคชันหลัก (จำเป็นต้องใส่)
         callback_url: ที่อยู่เว็บเรียกกลับ
         support_url: ที่อยู่เว็บสำหรับสนับสนุน
+        allow_read_prefs: อ่านการตั้งค่าผู้ใช้
+        allow_write_prefs: แก้ไขการตั้งค่าผู้ใช้
+        allow_write_diary: สร้างรายการบันทึก ข้อคิดเห็น และพบเพื่อนใหม่
+        allow_write_api: แก้ไขแผนที่
+        allow_read_gpx: อ่านรอยทาง GPS ส่วนบุคคล
+        allow_write_gpx: อัปโหลดรอยทาง GPS
+        allow_write_notes: แก้ไขหมายเหตุ
       diary_comment:
         body: เนื้อหา
       diary_entry:
@@ -95,7 +111,7 @@ th:
       trace:
         user: ผู้ใช้งาน
         visible: เปิดเผย
-        name: ชื่อ
+        name: ชื่อแฟ้ม
         size: ขนาด
         latitude: ละติจูด
         longitude: ลองติจูด
@@ -109,6 +125,9 @@ th:
         title: หัวเรื่อง
         body: เนื้อหา
         recipient: ผู้รับ
+      report:
+        category: เลือกเหตุผลของปัญหาที่ท่านแจ้ง
+        details: โปรดให้คำอธิบายเพิ่มเติมเกี่ยวกับปัญหา (จำเป็นต้องใส่)
       user:
         email: อีเมล์
         active: เปิดใช้
@@ -116,14 +135,31 @@ th:
         description: คำอธิบาย
         languages: ภาษา
         pass_crypt: รหัสผ่าน
+        pass_crypt_confirmation: ยืนยันรหัสผ่าน
     help:
       trace:
         tagstring: คั่นด้วยจุลภาค
   datetime:
     distance_in_words_ago:
+      about_x_hours:
+        one: เมื่อประมาณ 1 ชั่วโมงที่แล้ว
+        other: ประมาณ %{count} ชั่วโมงที่แล้ว
+      about_x_months:
+        one: เมื่อประมาณ 1 เดือนที่แล้ว
+        other: ประมาณ %{count} เดือนที่แล้ว
       about_x_years: ประมาณ %{count} ปีก่อน
       almost_x_years: เกือบ %{count} ปีก่อน
+      half_a_minute: ครึ่งนาทีที่แล้ว
+      less_than_x_seconds:
+        one: น้อยกว่า 1 วินาทีที่แล้ว
+        other: น้อยกว่า %{count} วินาทีที่แล้ว
+      less_than_x_minutes:
+        one: น้อยกว่า 1 นาทีที่แล้ว
+        other: น้อยกว่า %{count} นาทีที่แล้ว
       over_x_years: มากกว่า %{count} ปีก่อน
+      x_seconds:
+        one: 1 วินาทีที่แล้ว
+        other: '%{count} วินาทีที่แล้ว'
       x_years: '%{count} ปีก่อน'
   editor:
     default: ค่าปกติ (ขณะนี้ %{name})
@@ -1057,7 +1093,7 @@ th:
       text: บริจาค
     learn_more: เรียนรู้เพิ่มเติม
     more: เพิ่มเติม
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] ผู้ใช้ %{user} แสดงความคิดเห็นต่อรายการบันทึก'
       hi: เรียนคุณ %{to_user},
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 316e7e5be..010ced043 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -894,7 +894,7 @@ tl:
       text: Magkaloob ng isang Abuloy
     learn_more: Umalam pa
     more: Marami pa
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] Si %{user} ay nagbigay ng puna sa ipinasok mo sa talaarawan'
       hi: Kumusta %{to_user},
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index f5ccf87b0..91f95b48b 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1476,7 +1476,7 @@ tr:
       text: Bağış Yapın
     learn_more: Daha Fazla Bilgi
     more: Daha fazla
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user}, günlük bir girdi hakkında yorum yaptı.'
       hi: Merhaba %{to_user},
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 4066a240d..589482891 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -569,7 +569,7 @@ tt:
     make_a_donation:
       title: OpenStreetMap'ка иганә бирегез
       text: Иганә кертү
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: Сәлам, %{to_user},
     message_notification:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 082f7899e..5d6e3a246 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1285,7 +1285,7 @@ uk:
       text: Підтримайте проект
     learn_more: Дізнатись більше
     more: Більше
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} залишив коментар у вашому щоденнику'
       hi: Привіт, %{to_user},
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 243b9c5e8..8012763d3 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1301,7 +1301,7 @@ vi:
       text: Quyên góp
     learn_more: Tìm hiểu Thêm
     more: Thêm
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} đã bình luận về mục nhật ký'
       hi: Chào %{to_user},
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 1b363c327..d81817ffb 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1379,7 +1379,7 @@ zh-CN:
       text: 捐款
     learn_more: 了解更多
     more: 更多
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} 在日记项目留下了评论'
       hi: 您好，%{to_user}：
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index e73b8d8ed..1a6e4be70 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1450,7 +1450,7 @@ zh-TW:
       text: 進行捐款
     learn_more: 瞭解更多
     more: 更多
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} 已評論日記項目'
       hi: '%{to_user} 您好，'
diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml
new file mode 100644
index 000000000..c453b6870
--- /dev/null
+++ b/config/locales/zh-hk.yml
@@ -0,0 +1,881 @@
+# Messages for Chinese (Hong Kong) (中文（香港）‎)
+# Exported from translatewiki.net
+# Export driver: phpyaml
+# Author: C933103
+# Author: Hkjacksonhk
+# Author: Liuxinyu970226
+---
+zh-hk:
+  time:
+    formats:
+      friendly: '%Y年%m月%e日 %H:%M'
+  helpers:
+    file:
+      prompt: 選擇檔案
+    submit:
+      diary_comment:
+        create: 儲存
+      diary_entry:
+        create: 發佈
+        update: 更新
+      message:
+        create: 傳送
+      client_application:
+        create: 註冊
+        update: 更新
+      trace:
+        create: 上載
+        update: 儲存變更
+      user_block:
+        create: 創建封鎖
+        update: 更新封鎖
+  activerecord:
+    errors:
+      messages:
+        invalid_email_address: 不像是有效的電郵地址。
+    models:
+      acl: 存取控制清單
+      changeset: 變更集
+      changeset_tag: 變更集標籤
+      country: 國家
+      diary_comment: 日記註解
+      diary_entry: 日記項目
+      friend: 朋友
+      language: 語言
+      message: 訊息
+      node: 節點
+      node_tag: 節點標籤
+      notifier: 通知
+      old_node: 舊節點
+      old_way: 舊路徑
+      old_way_node: 舊路徑節點
+      old_way_tag: 舊路徑標籤
+      session: 作業階段
+      user: 用戶
+      user_preference: 用戶設定
+      user_token: 用戶令牌
+      way: 路徑
+      way_node: 路徑節點
+      way_tag: 路徑標籤
+    attributes:
+      client_application:
+        name: 名稱（必需）
+        url: 主程式URL（必需）
+        support_url: 支援URL
+        allow_read_prefs: 讀取他們的用戶設定。
+        allow_write_prefs: 修改他們的用戶設定。
+        allow_write_diary: 建立日記項目、評論和加入好友
+        allow_write_api: 修改地圖
+        allow_read_gpx: 讀取他們的私人GPS軌跡
+        allow_write_gpx: 上載GPS軌跡
+      diary_comment:
+        body: 內文
+      diary_entry:
+        user: 用戶
+        title: 主題
+        latitude: 緯度
+        longitude: 經度
+        language: 語言
+      friend:
+        user: 用戶
+        friend: 朋友
+      trace:
+        user: 用戶
+        name: 檔案名稱
+        size: 大小
+        latitude: 緯度
+        longitude: 經度
+        public: 公開
+        description: 描述
+        gpx_file: 上載GPX檔案
+        visibility: 可見度
+        tagstring: 標籤
+      message:
+        sender: 寄件者
+        title: 主題
+        body: 內文
+        recipient: 收件者
+      report:
+        details: 請就這問題提供多點詳情（必需）。
+      user:
+        email: 電郵
+        active: 活躍
+        display_name: 顯示名稱
+        description: 描述
+        languages: 語言
+        pass_crypt: 密碼
+        pass_crypt_confirmation: 確認密碼
+    help:
+      trace:
+        tagstring: 以逗號分隔
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: 約1小時前
+        other: 約%{count}小時前
+      about_x_months:
+        one: 約1個月前
+        other: 約%{count}個月前
+      about_x_years:
+        one: 約1年前
+        other: 約%{count}年前
+      almost_x_years:
+        one: 差不多1年前
+        other: 差不多%{count}年前
+      half_a_minute: 半分鐘前
+      less_than_x_seconds:
+        one: 不到1秒前
+        other: 不到%{count}秒前
+      less_than_x_minutes:
+        one: 不到1分鐘前
+        other: 不到%{count}分鐘前
+      over_x_years:
+        one: 超過1年前
+        other: 超過%{count}年前
+      x_seconds:
+        one: 1秒前
+        other: '%{count}秒前'
+      x_minutes:
+        one: 1分鐘前
+        other: '%{count}分鐘前'
+      x_days:
+        one: 1日前
+        other: '%{count}日前'
+      x_months:
+        one: 1個月前
+        other: '%{count}個月前'
+      x_years:
+        one: 1年前
+        other: '%{count}年前'
+  editor:
+    default: 預設（現為%{name}）
+    potlatch:
+      name: Potlatch 1
+      description: Potlatch 1 (瀏覽器內的編輯器)
+    id:
+      name: iD
+      description: iD (瀏覽器內的編輯器)
+    potlatch2:
+      name: Potlatch 2
+      description: Potlatch 2 (瀏覽器內的編輯器)
+    remote:
+      name: 遙遠控制
+      description: 遙遠控制 (JOSM 或 Merkaartor)
+  auth:
+    providers:
+      none: 無
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: 維基百科
+  api:
+    notes:
+      comment:
+        opened_at_html: 於%{when}建立
+        opened_at_by_html: 由%{user}於%{when}建立
+        commented_at_html: 於%{when}更新
+        commented_at_by_html: 由%{user}於%{when}更新
+        closed_at_html: 已於%{when}解決
+        closed_at_by_html: 已由%{user}於%{when}解決
+        reopened_at_html: 於%{when}重新開啟
+        reopened_at_by_html: 由%{user}於%{when}重新開啟
+      entry:
+        comment: 評論
+  browse:
+    version: 版本
+    in_changeset: 變更集
+    anonymous: 匿名
+    no_comment: （沒有評論）
+    part_of: 屬於：
+    download_xml: 下載 XML
+    view_history: 檢視歷史
+    view_details: 檢視詳細資料
+    location: 位置：
+    changeset:
+      title: 變更集：%{id}
+      belongs_to: 製作者
+      feed:
+        title: 變更集 %{id}
+    relation_member:
+      type:
+        node: 節點
+        way: 路徑
+    not_found:
+      sorry: '抱歉，找不到 %{type} #%{id}。'
+      type:
+        node: 節點
+        way: 路徑
+        changeset: 變更集
+    timeout:
+      type:
+        node: 節點
+        way: 路徑
+        changeset: 變更集
+    redacted:
+      type:
+        node: 節點
+        way: 路徑
+    start_rjs:
+      feature_warning: 正在載入%{num_features}項地圖特徵，可能會拖慢您的瀏覽器或導致瀏覽器未能回應。您是否肯定想要顯示這些資料？
+    query:
+      title: 查詢地圖特徴
+      introduction: 點擊地圖以尋找附近的地圖特徵。
+      enclosing: 包圍着的地圖特徵
+  changesets:
+    changeset_paging_nav:
+      showing_page: 第%{page}頁
+      next: 下一頁 »
+      previous: « 上一頁
+    changeset:
+      anonymous: 匿名
+    changesets:
+      id: ID
+      saved_at: 已儲存於
+      user: 用戶
+      comment: 評論
+      area: 區域
+    index:
+      title: 變更集
+      title_user: '%{user}的變更集'
+      title_nearby: 附近用戶的變更集
+      empty_area: 此區域沒有變更集。
+      empty_user: 此用戶沒有變更集。
+      no_more_area: 此區域沒有更多變更集。
+      no_more_user: 此用戶沒有更多變更集。
+      load_more: 載入更多
+  diary_entries:
+    form:
+      subject: 主題：
+      body: 內文：
+      language: 語言：
+      location: 位置：
+      latitude: 緯度：
+      longitude: 經度：
+      use_map_link: 使用地圖
+    index:
+      title: 用戶日記
+      title_nearby: 附近用戶的日記
+      new_title: 在我的用戶日記中撰寫新文章
+    show:
+      title: '%{user}的日記 | %{title}'
+      login: 登入
+    diary_comment:
+      confirm: 確認
+    location:
+      location: 位置：
+      view: 檢視
+      edit: 編輯
+    feed:
+      user:
+        title: '%{user}的OpenStreetMap日記文章'
+        description: 近期由%{user}所寫的OpenStreetMap日記文章
+      language:
+        description: 近期以%{language_name}撰寫的OpenStreetMap用戶日記文章
+      all:
+        description: 近期的OpenStreetMap用戶日記文章
+  friendships:
+    make_friend:
+      heading: 將%{user}加為好友？
+    remove_friend:
+      heading: 刪除好友%{user}？
+  geocoder:
+    search_osm_nominatim:
+      prefix:
+        aeroway:
+          apron: 停機坪
+          gate: 閘口
+          hangar: 機庫
+          helipad: 直升機坪
+          navigationaid: 航空導航輔助
+          taxiway: 滑行道
+          terminal: 客運大樓
+        amenity:
+          arts_centre: 藝術中心
+          atm: 自動櫃員機
+          bank: 銀行
+          bar: 酒吧
+          bbq: 燒烤場
+          bench: 長椅
+          bicycle_parking: 單車停泊處
+          bicycle_rental: 單車租貸
+          bicycle_repair_station: 單車維修站
+          biergarten: 啤酒庭園
+          blood_bank: 血庫
+          boat_rental: 船艇租貸
+          brothel: 妓院
+          bureau_de_change: 找換店
+          bus_station: 巴士總站
+          cafe: Cafe
+          car_rental: 汽車租貸
+          car_wash: 洗車
+          casino: è³­å ´
+          charging_station: 充電站
+          cinema: 戲院
+          clinic: 診所
+          clock: 時鐘
+          college: 學院
+          community_centre: 社區中心
+          courthouse: 法院
+          crematorium: 火葬場
+          dentist: 牙醫
+          doctors: 醫生
+          drinking_water: 飲用水
+          driving_school: 駕駛學校
+          embassy: 大使館
+          events_venue: 活動場地
+          fast_food: 快餐店
+          ferry_terminal: 渡輪碼頭
+          fire_station: 消防局
+          food_court: 美食廣場
+          fountain: 噴泉
+          gambling: 博彩
+          grave_yard: 墳場
+          hospital: 醫院
+          ice_cream: 雪糕
+          internet_cafe: 網吧
+          kindergarten: 幼稚園
+          language_school: 語言學校
+          library: 圖書館
+          marketplace: 墟市/市集
+          monastery: 修道院
+          motorcycle_parking: 電單車停車場
+          music_school: 音樂學校
+          nightclub: 夜總會
+          nursing_home: 看護中心
+          parking: 停車場
+          parking_entrance: 停車場入口
+          parking_space: 停車位
+          payment_terminal: 支付終端
+          pharmacy: 藥房
+          place_of_worship: 宗教場所
+          police: 警察
+          post_box: 郵箱
+          post_office: 郵局
+          prison: 監獄
+          public_bath: 公眾浴場
+          public_building: 公共建築
+          restaurant: 餐廳
+          school: 學校
+          shelter: 涼亭
+          shower: 淋浴
+          social_centre: 非盈利團體會所
+          swimming_pool: 游泳池
+          taxi: 的士
+          telephone: 公眾電話
+          theatre: 劇院
+          toilets: 廁所
+          townhall: 市政廳
+          training: 訓練設施
+          university: 大學
+          vehicle_inspection: 車輛檢查
+          vending_machine: 自動售賣機
+          village_hall: 村公所
+          waste_basket: 垃圾桶
+          waste_disposal: 垃圾收集站
+        boundary:
+          administrative: 行政邊界
+          census: 人口普查邊界
+          national_park: 國家公園
+          political: 選區分界
+          protected_area: 保護區
+          "yes": 邊界
+        bridge:
+          suspension: 吊橋
+          "yes": 橋
+        building:
+          dormitory: 宿舍
+          greenhouse: 溫室
+          house: 房屋
+          houseboat: 船屋
+          warehouse: 倉庫
+          "yes": 建築物
+        craft:
+          brewery: 釀酒
+        emergency:
+          defibrillator: 除顫器
+          phone: 緊急電話
+        highway:
+          bridleway: 馬車路
+          bus_guideway: 導軌巴士專線
+          bus_stop: 巴士站
+          corridor: 走廊
+          cycleway: 單車徑
+          elevator: 電梯
+          emergency_bay: 緊急停車灣
+          footway: 行人徑
+          give_way: 讓路標誌
+          rest_area: 休息區
+        historic:
+          building: 歷史建築
+          castle: 城堡
+          church: 教堂
+          city_gate: 城門
+          citywalls: 城牆
+          house: 房屋
+          manor: 莊園
+        landuse:
+          basin: 盆地
+          brownfield: 棕地
+          cemetery: 墓地
+          commercial: 商業區
+          conservation: 保護區
+          construction: 地盤
+          farm: 農業用地
+          farmland: 農地
+          grass: 草地
+          industrial: 工業區
+          landfill: 堆填區
+          meadow: 牧草地
+          military: 軍事區
+          quarry: 石礦場
+          railway: 鐵路
+          recreation_ground: 休憩用地
+          reservoir: 水庫
+          reservoir_watershed: 水庫集水區
+          residential: 住宅區
+          retail: 零售用地
+          village_green: 社區綠化空間
+        leisure:
+          dog_park: 狗公園
+          fitness_centre: 健身中心
+          garden: 花園
+          golf_course: 哥爾夫球場
+          miniature_golf: 小型高爾夫球場
+          nature_reserve: 自然保護區
+          outdoor_seating: 戶外座椅
+          park: 公園
+          picnic_table: 野餐桌
+          pitch: 運動場
+          playground: 兒童遊樂場
+          resort: 度假村
+          sauna: 桑拿
+          sports_centre: 運動中心
+          stadium: 體育館
+          swimming_pool: 游泳池
+          water_park: 水上樂園
+          "yes": 休閒
+        man_made:
+          advertising: 廣告
+          antenna: 天線
+          beacon: 浮標
+          breakwater: 防波堤
+          bridge: 橋
+          bunker_silo: 碉堡
+          chimney: 煙囪
+          communications_tower: 通訊塔
+          lighthouse: 燈塔
+          mine: 礦場
+          pipeline: 管線
+          telescope: 望遠鏡
+          tower: 塔
+          wastewater_plant: 污水處理廠
+          watermill: 水車
+          water_tap: 水龍頭
+          water_tower: 水塔
+          water_well: 井
+          water_works: 供水設施
+          windmill: 風車
+          works: 工廠
+          "yes": 人造設施
+        military:
+          airfield: 軍用機場
+          barracks: 軍營
+          bunker: 碉堡
+          checkpoint: 檢查站
+          trench: 壕溝
+          "yes": 軍事
+        natural:
+          bay: 灣
+          beach: 沙灘
+          cape: 海角
+          cave_entrance: 洞穴入口
+          cliff: 懸崖
+          crater: 火山口
+          dune: 沙丘
+          fjord: 峽灣
+          forest: 森林
+          glacier: 冰河
+          grassland: 草地
+          hot_spring: 溫泉
+          island: 島嶼
+          land: 陸地
+          mud: 泥地
+          peak: 山頂
+          reef: 礁
+          ridge: 山脊
+          volcano: 火山
+          "yes": 自然特徵
+        office:
+          travel_agent: 旅行社
+          "yes": 辦公室
+        place:
+          city: 城市
+          country: 國家
+          county: 縣
+          farm: 農田
+          house: 房屋
+          island: 島嶼
+          islet: 小島
+          postcode: 郵政編號
+          region: 區域
+          sea: æµ·
+          square: 廣場
+          suburb: 市郊
+          town: 鎮
+          village: 村落
+          "yes": 地點
+        railway:
+          abandoned: 廢棄鐵路
+          disused: 已停用鐵路
+          funicular: 纜索鐵路
+          monorail: 單軌鐵路
+          narrow_gauge: 窄軌鐵路
+          spur: 鐵路支線
+          subway: 地鐵
+          subway_entrance: 地鐵出入口
+          tram: 路面電車軌道
+          tram_stop: 路面電車站
+        shop:
+          bakery: 麵包店
+          beauty: 美容店
+          beverages: 飲料店
+          bicycle: 單車店
+          bookmaker: 投注站
+          books: 書店
+          boutique: 精品店
+          car_parts: 汽車零件店
+          charity: 慈善商店
+          computer: 電腦商店
+          copyshop: 影印店
+          cosmetics: 化妝品店
+          department_store: 百貨公司
+          doityourself: DIY用品店
+          dry_cleaning: 乾洗店
+          e-cigarette: 電子煙店
+          erotic: 情趣用品店
+          estate_agent: 地產代理
+          fashion: 時裝店
+          fishing: 釣魚用品店
+          florist: 花店
+          hairdresser: 理髮店
+          hifi: Hi-Fi
+          jewelry: 珠寶店
+          laundry: 洗衣店
+          lottery: 彩票
+          mall: 商場
+          massage: 按摩
+          mobile_phone: 手機店
+          optician: 視光師
+          organic: 有機食品店
+          pet: 寵物店
+          seafood: 海鮮店
+          second_hand: 二手商店
+          shoes: 鞋店
+          stationery: 文具店
+          supermarket: 超級市場
+          tobacco: 煙草店
+          toys: 玩具店
+          travel_agency: 旅行社
+          "yes": 商店
+        tourism:
+          museum: 博物館
+          picnic_site: 野餐地點
+          theme_park: 主題公園
+          viewpoint: 觀景點
+          zoo: 動物園
+        tunnel:
+          "yes": 隧道
+        waterway:
+          canal: 運河
+          dam: 水壩
+          river: 河流
+          stream: 小溪
+          waterfall: 瀑布
+      admin_levels:
+        level2: 國界
+        level4: 省界
+        level5: 區界
+        level6: 縣界
+        level8: 市界
+        level9: 村界
+        level10: 市郊邊界
+    description:
+      types:
+        cities: 城市
+        towns: 市鎮
+        places: 地點
+    results:
+      no_results: 找不到結果
+      more_results: 更多結果
+  issues:
+    index:
+      reported_user: 曾經舉報的用戶
+      user_not_found: 用戶並不存在
+    show:
+      resolve: 解決
+      ignore: 忽略
+      reopen: 重新開啟
+  reports:
+    new:
+      categories:
+        user:
+          spam_label: 此用戶個人檔案為/含有垃圾信息
+          threat_label: 此用戶個人檔案含有威脅或恐嚇內容
+    create:
+      provide_details: 請提供所需要的詳情
+  layouts:
+    logo:
+      alt_text: OpenStreetMap標誌
+    logout: 登出
+    log_in: 登入
+    log_in_tooltip: 登入既有賬戶
+    sign_up: 註冊
+    start_mapping: 開始繪圖
+    sign_up_tooltip: 建立帳號以進行編輯
+    edit: 編輯
+    history: 歷史
+    export: 匯出
+    gps_traces: GPS軌跡
+    gps_traces_tooltip: 管理GPS軌跡
+    user_diaries: 用戶日記
+    user_diaries_tooltip: 檢視用戶日記
+    edit_with: 用%{editor}來編輯
+    intro_header: 歡迎來到 OpenStreetMap！
+    intro_2_create_account: 建立用戶帳號
+    tou: 使用條款
+    help: 幫助
+    copyright: 版權
+    foundation: 基金會
+    foundation_title: OpenStreetMap基金會
+  user_mailer:
+    diary_comment_notification:
+      subject: '[OpenStreetMap] %{user}在日記中留下了評論'
+    friendship_notification:
+      subject: '[OpenStreetMap] %{user} 添加了您成為好友'
+      see_their_profile: 您可以在 %{userurl} 查看他的個人檔案。
+    email_confirm_plain:
+      greeting: 您好，
+    email_confirm_html:
+      greeting: 您好，
+    lost_password:
+      subject: '[OpenStreetMap] 密碼重設請求'
+    lost_password_plain:
+      greeting: 您好，
+      hopefully_you: 有人 (或許是您) 要求將以此電子郵件地址註冊的openstreetmap.org帳號的密碼重設。
+      click_the_link: 如果是您請求的話，請按下列連結重設您的密碼。
+    lost_password_html:
+      greeting: 您好，
+      hopefully_you: 有人 (或許是您) 要求將以此電子郵件地址註冊的openstreetmap.org帳號的密碼重設。
+      click_the_link: 如果是您的話，請按下列連結重設您的密碼。
+    note_comment_notification:
+      anonymous: 一位匿名用戶
+      greeting: 您好，
+  messages:
+    outbox:
+      title: 寄件匣
+      inbox: 收件匣
+      outbox: 寄件匣
+  site:
+    edit:
+      not_public: 您尚未把編輯公開。
+      not_public_description_html: 您不這樣設定的話就將再無法編輯地圖。您可以在%{user_page}將閣下的編輯設為公開。
+      no_iframe_support: 閣下的瀏覽器並未支援此功能所必需的HTML iframes。
+    export:
+      title: 匯出
+      area_to_export: 要匯出的範圍
+      manually_select: 手動選擇另一範圍
+      format_to_export: 匯出格式
+      map_image: 地圖影像 (顯示標準圖層)
+      embeddable_html: 可內嵌的HTML
+      licence: 授權
+      options: 選項
+      format: 格式
+      scale: 比例
+      max: 最大
+      latitude: 緯度：
+      longitude: 經度：
+    help:
+      beginners_guide:
+        description: 由社群編修的新手指南。
+      help:
+        description: 在OpenStreetMap的問答網站上提問或搜尋答案。
+      mailing_lists:
+        description: 在有着各式各樣主題或地域分類的郵件列表中發問或討論有趣的事。
+      forums:
+        description: 給喜好論壇界面的人提問和討論。
+      irc:
+        title: IRC
+      welcomemat:
+        url: https://welcome.openstreetmap.org/
+    sidebar:
+      search_results: 搜尋結果
+      close: 關閉
+    search:
+      search: 搜尋
+      where_am_i: 這是哪裡？
+      reverse_directions_text: 反轉方向
+    key:
+      table:
+        entry:
+          motorway: 高速公路
+          rail: 鐵路
+          subway: 地鐵
+          tram:
+          - 輕便鐵路
+          - 電車
+          runway:
+          - 機場跑道
+          apron:
+          - 機場停機坪
+          - 客運大樓
+          admin: 行政邊界
+          forest: 森林
+          golf: 哥爾夫球場
+          park: 公園
+          resident: 住宅區
+          industrial: 工業區
+          commercial: 商業區
+          lake:
+          - 湖泊
+          - 水庫
+          brownfield: 棕地
+          cemetery: 墓地
+          pitch: 運動場
+          centre: 運動中心
+          reserve: 自然保護區
+          military: 軍事區
+          school:
+          - 學校
+          - 大學
+          station: 火車站
+          bicycle_shop: 單車店
+          bicycle_parking: 單車停泊處
+          toilets: 廁所
+    richtext_area:
+      edit: 編輯
+      preview: 預覽
+    welcome:
+      introduction_html: 歡迎來到OpenStreetMap，自由而可以編輯的世界地圖。現在您已經注冊完成，繪製地圖所需要的準備已經就緒。以下是一份快速指南，裡面包含着您所需要知道的最重要事項。
+      rules:
+        paragraph_1_html: OpenStreetMap沒多少正式規則，但我們期望所有參與者都會與社群合作，也會和社群溝通。如果你想用任何不只是純人手編輯的方式做任何事的話，請先閱讀並遵循<a
+          href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>匯入</a>以及<a
+          href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>自動化編輯</a>規範。
+      add_a_note:
+        title: 沒時間編輯？加一個註記吧！
+        paragraph_1_html: 如果你只想讓一些小問題得以更正，而沒有時間注冊並學習如何編輯，那麼加入註記是非常容易的。
+  traces:
+    create:
+      traces_waiting: 您有%{count}條軌跡等待上傳。請考慮先讓目前的軌跡處理完成後，再來繼續上傳其他軌跡，以免阻礙其他用戶的排程。
+    index:
+      public_traces_from: '%{user}的公開GPS軌跡'
+  oauth:
+    authorize:
+      allow_read_prefs: 讀取您的用戶設定。
+  oauth_clients:
+    show:
+      requests: 向用戶要求下列權限：
+    index:
+      revoke: 撤銷！
+      oauth: OAuth
+    form:
+      requests: 向用戶要求下列權限：
+  users:
+    login:
+      email or username: 電郵地址或用戶名稱：
+      password: 密碼：
+      lost password link: 忘記您的密碼？
+      with username: 已經有OpenStreetMap的帳號了嗎？請使用您的用戶名稱和密碼登入：
+    logout:
+      title: 登出
+    lost_password:
+      title: 忘記密碼
+      heading: 忘記密碼？
+      email address: 電郵地址：
+      new password button: 重設密碼
+      help_text: 輸入您註冊時用的電郵地址，我們會將可用於重設密碼的連結發送至該地址。
+    reset_password:
+      title: 重設密碼
+      heading: 重設%{user}的密碼
+      reset: 重設密碼
+      flash changed: 您的密碼已經變更。
+    new:
+      title: 註冊
+      no_auto_account_create: 很不幸地我們目前無法為您自動建立帳號。
+      contact_webmaster_html: 請聯絡<a href="%{webmaster}">網站管理員</a>以安排建立帳號，我們會儘快嘗試並處理相關要求。
+      about:
+        header: 自由而可編輯
+      email address: 電郵地址：
+      confirm email address: 確認電郵地址：
+      display name: 顯示名稱：
+      display name description: 您公開顯示的用戶名稱。以後還可以在設定中更換。
+      external auth: 第三方身份認證：
+      password: 密碼：
+      confirm password: 確認密碼：
+      auth no password: 啟用第三方認證後密碼並非必須，但一些額外的工具或伺服器可能仍需要使用密碼。
+      continue: 註冊
+      terms accepted: 感謝您接受新的貢獻條款！
+    terms:
+      title: 條款
+      heading: 條款
+      heading_ct: 貢獻者條款
+      read_tou: 我已經閱讀過並同意使用條款
+      consider_pd: 除上述條款之外，我會把我的貢獻釋放到公共領域(Public Domain)
+      guidance_html: 幫助理解這些條款的資料：一個<a href="%{summary}">給普通人閱讀的摘要</a>和一些<a href="%{translations}">非正式翻譯</a>
+      continue: 繼續
+      decline: 拒絕
+      legale_select: 請選擇您的居住地：
+      legale_names:
+        france: 法國
+        italy: 意大利
+        rest_of_world: 世界其他地方
+    no_such_user:
+      title: 沒有這用戶
+      body: 抱歉，沒有名為%{user}的用戶。請檢查您的拼寫，或者您可能按到了錯誤的連結。
+    show:
+      my settings: 我的設定
+      oauth settings: OAuth設定
+      user location: 用戶位置
+      if_set_location_html: 在%{settings_link}處設定您家的位置後就能查看附近的使用者。
+      nearby users: 其他附近的用戶
+      no nearby users: 附近還沒有已加入製圖的用戶。
+      report: 舉報此用戶
+    account:
+      my settings: 我的設定
+    confirm_resend:
+      failure: 找不到用戶%{name}。
+    index:
+      title: 用戶
+      heading: 用戶
+    auth_association:
+      option_2: 如果您已經有帳號，您可以用該帳號的用戶名稱和密碼登入，然後到用戶設定中把您的ID和帳號關聯到一起。
+  javascripts:
+    share:
+      embed: HTML
+      download: 下載
+      center_marker: 將地圖置中於標記處
+    map:
+      zoom:
+        in: 放大
+        out: 縮小
+      locate:
+        title: 顯示我的位置
+      base:
+        standard: 標準
+        cycle_map: 單車地圖
+        transport_map: 交通地圖
+        hot: 人道地圖
+        opnvkarte: ÖPNVKarte
+      layers:
+        header: 地圖圖層
+        title: 圖層
+    site:
+      queryfeature_tooltip: 查詢地圖特徴
+      queryfeature_disabled_tooltip: 放大以查詢地圖特徴
+    query:
+      nothing_found: 沒找到地圖特徵
+    context:
+      query_features: 查詢地圖特徴
+      centre_map: 將地圖置中於此
+...
diff --git a/script/deliver-message b/script/deliver-message
index 6907637a6..047969532 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -33,6 +33,6 @@ mail = Mail.new($stdin.read
 message = Message.from_mail(mail, from, to)
 message.save!
 
-Notifier.message_notification(message).deliver
+UserMailer.message_notification(message).deliver
 
 exit 0
diff --git a/test/lib/locale_test.rb b/test/lib/locale_test.rb
index 13df643b2..a005b03d5 100644
--- a/test/lib/locale_test.rb
+++ b/test/lib/locale_test.rb
@@ -91,7 +91,7 @@ class LocaleTest < ActiveSupport::TestCase
     assert_equal "de", Locale.available.preferred(Locale.list("zh-Hant", "de")).to_s
     assert_equal "zh-TW", Locale.available.preferred(Locale.list("zh-Hant-TW", "de")).to_s
     assert_equal "zh-TW", Locale.available.preferred(Locale.list("zh-TW", "de")).to_s
-    assert_equal "zh-TW", Locale.available.preferred(Locale.list("zh-HK", "zh-hk", "zh-Hant", "zh-hant", "zh-TW", "zh-tw", "zh", "zh-yue", "yue", "yue-Hant", "yue-HK", "yue-Hans", "zh-classical", "lzh", "ja-Hani", "ko-Hani", "ko_hanja", "vi-Hani", "ja-hani", "ko-hani", "vi-hani", "en-HK", "en-hk", "en-SG", "en-sg", "en-GB", "en-gb", "en-US", "en-us", "en", "ja")).to_s
+    assert_equal "zh-HK", Locale.available.preferred(Locale.list("zh-HK", "zh-hk", "zh-Hant", "zh-hant", "zh-TW", "zh-tw", "zh", "zh-yue", "yue", "yue-Hant", "yue-HK", "yue-Hans", "zh-classical", "lzh", "ja-Hani", "ko-Hani", "ko_hanja", "vi-Hani", "ja-hani", "ko-hani", "vi-hani", "en-HK", "en-hk", "en-SG", "en-sg", "en-GB", "en-gb", "en-US", "en-us", "en", "ja")).to_s
     assert_equal "en", Locale.available.preferred(Locale.list("yue")).to_s
   end
 end