From 8e443649f374f14e522749949d6012eca1c6a973 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Thu, 2 Feb 2023 13:14:55 +0100
Subject: [PATCH] Localisation updates from https://translatewiki.net.

---
 config/locales/af.yml        |  46 +++++++--------
 config/locales/ar.yml        |  70 +++++++++++------------
 config/locales/ast.yml       |  66 +++++++++++----------
 config/locales/az.yml        |   5 +-
 config/locales/ba.yml        |  52 +++++++++--------
 config/locales/be-Tarask.yml |   7 ++-
 config/locales/be.yml        |  70 +++++++++++------------
 config/locales/bg.yml        |  56 +++++++++---------
 config/locales/bn.yml        |  73 ++++++++++++------------
 config/locales/br.yml        |  80 +++++++++++++-------------
 config/locales/bs.yml        |  19 +++----
 config/locales/ca.yml        |  75 ++++++++++++------------
 config/locales/ce.yml        |  64 ++++++++++-----------
 config/locales/cs.yml        |  82 +++++++++++++--------------
 config/locales/cy.yml        |  52 ++++++++---------
 config/locales/da.yml        |  80 +++++++++++++-------------
 config/locales/de.yml        |  82 +++++++++++++--------------
 config/locales/diq.yml       |  19 +++----
 config/locales/dsb.yml       |  70 +++++++++++------------
 config/locales/el.yml        |  80 +++++++++++++-------------
 config/locales/en-GB.yml     |  62 ++++++++++----------
 config/locales/eo.yml        |  80 +++++++++++++-------------
 config/locales/es.yml        |  79 +++++++++++++-------------
 config/locales/et.yml        | 107 +++++++++++++++++------------------
 config/locales/eu.yml        |  86 ++++++++++++++--------------
 config/locales/fa.yml        |  84 ++++++++++++++-------------
 config/locales/fi.yml        |  90 +++++++++++++++--------------
 config/locales/fit.yml       |  39 +++++++------
 config/locales/fr.yml        |  80 +++++++++++++-------------
 config/locales/fur.yml       |  76 ++++++++++++-------------
 config/locales/fy.yml        |  71 +++++++++++------------
 config/locales/ga.yml        |  56 +++++++++---------
 config/locales/gd.yml        |  77 ++++++++++++-------------
 config/locales/gl.yml        |  78 +++++++++++++------------
 config/locales/he.yml        |  70 +++++++++++------------
 config/locales/hi.yml        |  86 ++++++++++++++--------------
 config/locales/hr.yml        |  76 ++++++++++++-------------
 config/locales/hsb.yml       |  66 +++++++++++----------
 config/locales/hu.yml        |  98 ++++++++++++++++++--------------
 config/locales/ia.yml        |  79 +++++++++++++-------------
 config/locales/id.yml        |  86 ++++++++++++++--------------
 config/locales/is.yml        |  84 ++++++++++++++-------------
 config/locales/it.yml        |  78 +++++++++++++------------
 config/locales/ja.yml        |  60 ++++++++++----------
 config/locales/ka.yml        |  24 ++++----
 config/locales/kab.yml       |  60 ++++++++++----------
 config/locales/kk-cyrl.yml   |  18 +++---
 config/locales/km.yml        |  22 +++----
 config/locales/kn.yml        |  16 +++---
 config/locales/ko.yml        |  85 +++++++++++++++-------------
 config/locales/ku-Latn.yml   |  96 +++++++++++++++----------------
 config/locales/lb.yml        |  50 ++++++++--------
 config/locales/lt.yml        |  66 +++++++++++----------
 config/locales/lv.yml        |  78 +++++++++++++------------
 config/locales/mk.yml        |  79 +++++++++++++-------------
 config/locales/mo.yml        |  52 +++++++++--------
 config/locales/mr.yml        |  65 +++++++++++----------
 config/locales/ms.yml        |  70 ++++++++++++-----------
 config/locales/my.yml        |  15 +++--
 config/locales/nb.yml        |  70 +++++++++++------------
 config/locales/ne.yml        |  59 ++++++++++---------
 config/locales/nl.yml        |  91 +++++++++++++++--------------
 config/locales/nn.yml        |  62 ++++++++++----------
 config/locales/nqo.yml       |  81 +++++++++++++++++---------
 config/locales/oc.yml        |  68 +++++++++++-----------
 config/locales/pa.yml        |  22 ++++---
 config/locales/pl.yml        |  80 +++++++++++++-------------
 config/locales/pnb.yml       |  54 +++++++++---------
 config/locales/ps.yml        |   8 +--
 config/locales/pt-BR.yml     |  81 +++++++++++++-------------
 config/locales/pt-PT.yml     | 103 +++++++++++++++++++--------------
 config/locales/ro.yml        |  66 +++++++++++----------
 config/locales/ru.yml        |  78 +++++++++++++------------
 config/locales/sat.yml       |  21 ++++---
 config/locales/sc.yml        |  80 +++++++++++++-------------
 config/locales/scn.yml       |  72 ++++++++++++-----------
 config/locales/sco.yml       |  54 +++++++++---------
 config/locales/sk.yml        |  78 +++++++++++++------------
 config/locales/sl.yml        |  82 +++++++++++++--------------
 config/locales/sq.yml        |  52 +++++++++--------
 config/locales/sr.yml        |  65 ++++++++++-----------
 config/locales/sv.yml        |  70 +++++++++++------------
 config/locales/ta.yml        |   8 ++-
 config/locales/te.yml        |  76 ++++++++++++-------------
 config/locales/th.yml        |  54 +++++++++---------
 config/locales/tl.yml        |  62 ++++++++++----------
 config/locales/tr.yml        |  88 ++++++++++++++--------------
 config/locales/tt.yml        |  16 +++---
 config/locales/uk.yml        |  79 +++++++++++++-------------
 config/locales/vi.yml        |  80 +++++++++++++-------------
 config/locales/xmf.yml       |  51 +++++++++--------
 config/locales/zh-CN.yml     |  81 +++++++++++++-------------
 config/locales/zh-HK.yml     |  13 +++--
 config/locales/zh-TW.yml     |  77 ++++++++++++++-----------
 94 files changed, 2970 insertions(+), 3004 deletions(-)

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 2aa2318a0..24dc8c8d5 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -379,24 +379,6 @@ af:
       wikimedia_commons_link: Die item %{page} op Wikimedia Commons
       telephone_link: Skakel %{phone_number}
       colour_preview: Kleur %{colour_value}-voorskou
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nuwe nota
-      description: Beskrywing
-      open_title: 'Onopgeloste nota #%{note_name}'
-      closed_title: 'Opgeloste nota #%{note_name}'
-      hidden_title: 'Verborge nota #%{note_name}'
-      opened_by_html: Geskep deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Geskep deur anoniem <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      commented_by_html: Kommentaar van %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentaar deur anoniem <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Opgelos deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Opgelos deur anoniem <abbr title ='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Geheraktiveer deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Geheraktiveer deur anoniem <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Versteek deur %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Rapporteer hierdie nota
     query:
       title: Soek bakens op
       introduction: Klik op die kaart om bakens naby te ontdek.
@@ -2170,6 +2152,28 @@ af:
       id: Id
       created_at: Geskep op
       last_changed: Laas gewysig
+    show:
+      title: 'Nota: %{id}'
+      description: Beskrywing
+      open_title: 'Onopgeloste nota #%{note_name}'
+      closed_title: 'Opgeloste nota #%{note_name}'
+      hidden_title: 'Verborge nota #%{note_name}'
+      opened_by_html: Geskep deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Geskep deur anoniem <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_html: Kommentaar van %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentaar deur anoniem <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Opgelos deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Opgelos deur anoniem <abbr title ='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Geheraktiveer deur %{user} <abbr title ='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Geheraktiveer deur anoniem <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Versteek deur %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Rapporteer hierdie nota
+      hide: Versteek
+      comment: Reageer
+    new:
+      title: Nuwe nota
+      add: Voeg nota by
   javascripts:
     close: Sluit
     share:
@@ -2217,12 +2221,6 @@ af:
         unsubscribe: Kanselleer subskripsie
         hide_comment: versteek
         unhide_comment: bring weer aan die lig
-    notes:
-      new:
-        add: Voeg nota by
-      show:
-        hide: Versteek
-        comment: Reageer
     directions:
       engines:
         fossgis_osrm_car: Kar (OSRM)
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index bc899a484..c2cc49704 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -436,27 +436,6 @@ ar:
       wikimedia_commons_link: العنصر %{page} في ويكيميديا ​​كومنز
       telephone_link: اتصل بـ%{phone_number}
       colour_preview: معاينة اللون %{colour_value}
-    note:
-      title: 'ملاحظة: %{id}'
-      new_note: ملاحظة جديدة
-      description: الوصف
-      open_title: 'ملاحظة لم يتم حلها: %{note_name}'
-      closed_title: 'ملاحظات محلولة: %{note_name}'
-      hidden_title: 'ملاحظة مخفيّة #%{note_name}'
-      opened_by_html: أنشأه المستخدم %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: أنشأه مستخدم مجهول <abbr title='%{exact_time}'>%{when}
-        </abbr>
-      commented_by_html: تعليق من %{user} <abbr title='%{exact_time}'>%{when} </abbr>
-      commented_by_anonymous_html: تعليق من مجهول <abbr title='%{exact_time}'>%{when}
-        </abbr>
-      closed_by_html: تم الحل بواسطة %{user} <abbr title='%{exact_time}'>%{when} </abbr>
-      closed_by_anonymous_html: تم الحل بواسطة مجهول <abbr title='%{exact_time}'>%{when}
-        </abbr>
-      reopened_by_html: أعاد تنشيطه %{user}<abbr title='%{exact_time}'>%{when} </abbr>
-      reopened_by_anonymous_html: أعاد تنشيطه مجهول <abbr title='%{exact_time}'>%{when}
-        </abbr>
-      hidden_by_html: أخفاه %{user} <abbr title='%{exact_time}'>%{when} =</abbr>
-      report: أبلغ عن هذه الملاحظة
     query:
       title: ميزات الاستفهام
       introduction: اضغط على الخريطة لمعرفة النقاط القريبة
@@ -2554,6 +2533,40 @@ ar:
       description: الوصف
       created_at: أنشأ في
       last_changed: أحدث تغيير
+    show:
+      title: 'ملاحظة: %{id}'
+      description: الوصف
+      open_title: 'ملاحظة لم يتم حلها: %{note_name}'
+      closed_title: 'ملاحظات محلولة: %{note_name}'
+      hidden_title: 'ملاحظة مخفيّة #%{note_name}'
+      opened_by_html: أنشأه المستخدم %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: أنشأه مستخدم مجهول <abbr title='%{exact_time}'>%{when}
+        </abbr>
+      commented_by_html: تعليق من %{user} <abbr title='%{exact_time}'>%{when} </abbr>
+      commented_by_anonymous_html: تعليق من مجهول <abbr title='%{exact_time}'>%{when}
+        </abbr>
+      closed_by_html: تم الحل بواسطة %{user} <abbr title='%{exact_time}'>%{when} </abbr>
+      closed_by_anonymous_html: تم الحل بواسطة مجهول <abbr title='%{exact_time}'>%{when}
+        </abbr>
+      reopened_by_html: أعاد تنشيطه %{user}<abbr title='%{exact_time}'>%{when} </abbr>
+      reopened_by_anonymous_html: أعاد تنشيطه مجهول <abbr title='%{exact_time}'>%{when}
+        </abbr>
+      hidden_by_html: أخفاه %{user} <abbr title='%{exact_time}'>%{when} =</abbr>
+      report: أبلغ عن هذه الملاحظة
+      anonymous_warning: تتضمن هذه المذكرة تعليقات المستخدمين المجهولين التي ينبغي
+        التحقق منها بشكل مستقل.
+      hide: إخفاء
+      resolve: حل
+      reactivate: نشط
+      comment_and_resolve: علِّق و حلّ
+      comment: تعليق
+    new:
+      title: ملاحظة جديدة
+      intro: رصد خطأ أو شيء مفقود؟ دع مصممي الخرائط الآخرين يعرفون ذلك حتى نتمكن من
+        إصلاحه. انقل العلامة إلى الموضع الصحيح واكتب ملاحظة لشرح المشكلة.
+      advice: ملاحظتك عامة ويمكن استخدامها لتحديث الخريطة ، لذا لا تدخل معلومات شخصية
+        أو معلومات من خرائط محمية بحقوق النشر أو قوائم دليل.
+      add: أضف ملاحظة
   javascripts:
     close: أغلق
     share:
@@ -2640,21 +2653,6 @@ ar:
         unsubscribe: إلغاء الاشتراك
         hide_comment: إخفاء
         unhide_comment: أظهر
-    notes:
-      new:
-        intro: رصد خطأ أو شيء مفقود؟ دع مصممي الخرائط الآخرين يعرفون ذلك حتى نتمكن
-          من إصلاحه. انقل العلامة إلى الموضع الصحيح واكتب ملاحظة لشرح المشكلة.
-        advice: ملاحظتك عامة ويمكن استخدامها لتحديث الخريطة ، لذا لا تدخل معلومات
-          شخصية أو معلومات من خرائط محمية بحقوق النشر أو قوائم دليل.
-        add: أضف ملاحظة
-      show:
-        anonymous_warning: تتضمن هذه المذكرة تعليقات المستخدمين المجهولين التي ينبغي
-          التحقق منها بشكل مستقل.
-        hide: إخفاء
-        resolve: حل
-        reactivate: نشط
-        comment_and_resolve: علِّق و حلّ
-        comment: تعليق
     edit_help: انقل الخريطة وكبر الموقع الذي تريد تحريره، ثم اضغط هنا.
     directions:
       ascend: رفع
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index fadeee704..1a20ed66f 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -357,23 +357,6 @@ ast:
       wikimedia_commons_link: L'elementu %{page} en Wikimedia Commons
       telephone_link: Llamar a %{phone_number}
       colour_preview: Entever el color %{colour_value}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nota nueva
-      description: Descripción
-      open_title: 'Nota ensin resolver #%{note_name}'
-      closed_title: 'Nota resuelta #%{note_name}'
-      hidden_title: 'Nota tapecida #%{note_name}'
-      opened_by_html: Creáu por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Creáu por un anónimu <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comentariu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comentariu d'un anónimu <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resuelto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resuelto por un anónimu <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reactivao por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reactivao por un anónimu <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Tapecío por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Informar d'esta nota
     query:
       title: Consultar entidaes
       introduction: Fai clic nel mapa p'alcontrar entidaes cercanes.
@@ -2428,6 +2411,38 @@ ast:
       description: Descripción
       created_at: Creada el
       last_changed: Cambéu postreru
+    show:
+      title: 'Nota: %{id}'
+      description: Descripción
+      open_title: 'Nota ensin resolver #%{note_name}'
+      closed_title: 'Nota resuelta #%{note_name}'
+      hidden_title: 'Nota tapecida #%{note_name}'
+      opened_by_html: Creáu por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Creáu por un anónimu <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comentariu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comentariu d'un anónimu <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resuelto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resuelto por un anónimu <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivao por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivao por un anónimu <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Tapecío por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Informar d'esta nota
+      anonymous_warning: Esta nota incluye comentarios d'usuarios anónimos que tendríen
+        de comprobase de mou independiente.
+      hide: Anubrir
+      resolve: Resolver
+      reactivate: Reactivar
+      comment_and_resolve: Comentar y resolver
+      comment: Comentar
+    new:
+      title: Nota nueva
+      intro: ¿Alcontrasti un error o falta daqué? Informa a otros mapeadores pa que
+        podamos igualo. Mueve'l marcador a la posición correuta y escribi una nota
+        pa esplicar el problema.
+      advice: La nota ye pública y puede usase p'anovar el mapa, de mou que nun escribas
+        información personal, o información de mapes con drechos d'autor o llistes
+        de teléfonos).
+      add: Amestar nota
   javascripts:
     close: Zarrar
     share:
@@ -2506,23 +2521,6 @@ ast:
         unsubscribe: Date de baxa
         hide_comment: anubrir
         unhide_comment: amosar
-    notes:
-      new:
-        intro: ¿Alcontrasti un error o falta daqué? Informa a otros mapeadores pa
-          que podamos igualo. Mueve'l marcador a la posición correuta y escribi una
-          nota pa esplicar el problema.
-        advice: La nota ye pública y puede usase p'anovar el mapa, de mou que nun
-          escribas información personal, o información de mapes con drechos d'autor
-          o llistes de teléfonos).
-        add: Amestar nota
-      show:
-        anonymous_warning: Esta nota incluye comentarios d'usuarios anónimos que tendríen
-          de comprobase de mou independiente.
-        hide: Anubrir
-        resolve: Resolver
-        reactivate: Reactivar
-        comment_and_resolve: Comentar y resolver
-        comment: Comentar
     edit_help: Mueve'l mapa y amplía al llugar que quies editar, llueu calca equí.
     directions:
       ascend: Ascender
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 9868cb755..d174be40a 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -240,8 +240,6 @@ az:
         key: '%{key} teqini təsvir edən viki səhifəsi'
         tag: '%{key}=%{value} teqini təsvir edən viki səhifəsi'
       wikipedia_link: Vikipediyada %{page} məqaləsi
-    note:
-      description: Təsvir
   changesets:
     changeset_paging_nav:
       showing_page: Səhifə %{page}
@@ -1159,6 +1157,9 @@ az:
       revoker_name: Tərəfindən ləgv edilib
       next: Növbəti »
       previous: « Əvvəlki
+  notes:
+    show:
+      description: Təsvir
   javascripts:
     map:
       base:
diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index a312814ef..0ad0fd516 100644
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -372,31 +372,6 @@ ba:
       wikimedia_commons_link: Wikimedia Commonsта %{page} элемент
       telephone_link: Шылтыратырға %{phone_number}
       colour_preview: Төҫтәрҙе ҡарау %{colour_value}
-    note:
-      title: ' %{id} искәрмәһе'
-      new_note: Яңы мәҡәлә
-      description: Тасуирлама
-      open_title: 'Эшкәртелмәгән мәҡәлә #%{note_name}'
-      closed_title: 'Эшкәртелгән мәҡәләа #%{note_name}'
-      hidden_title: 'Йәшерелгән яҙма #%{note_name}'
-      opened_by_html: Ҡулланыусы тарафынан булдырылған %{user} <abbr title='%{exact_time}'>%{when}
-        кирегә</abbr>
-      opened_by_anonymous_html: Аноним тарафынан булдырылған <abbr title='%{exact_time}'>%{when}
-        кирегә</abbr>
-      commented_by_html: Ҡулланыусы комментарийы %{user} <abbr title='%{exact_time}'>%{when}
-        кирегә</abbr>
-      commented_by_anonymous_html: Аноним комментарийы  <abbr title='%{exact_time}'>%{when}
-        кирегә</abbr>
-      closed_by_html: Ҡулланыусы тарафынан эшкәртелгән %{user} <abbr title='%{exact_time}'>%{when}
-        кирегә</abbr>
-      closed_by_anonymous_html: Аноним тарафынан рөхсәт ителгән <abbr title='%{exact_time}'>%{when}
-        кирегә</abbr>
-      reopened_by_html: Ҡулланыусы тарафынан ҡабаттан асылған %{user} <abbr title='%{exact_time}'>%{when}
-        кирегә</abbr>
-      reopened_by_anonymous_html: Аноним тарафынан ҡабаттан асылған <abbr title='%{exact_time}'>%{when}
-        кирегә</abbr>
-      hidden_by_html: Йәшерелгән %{user} <abbr title='%{exact_time}'>%{when} кирегә</abbr>
-      report: Был яҙма тураһында хәбәр итеү
     query:
       title: Объекттар тураһында мәғлүмәт
       introduction: Яҡындағы объекттарҙы табыу өсөн картаға баҫығыҙ
@@ -1030,6 +1005,33 @@ ba:
       latitude: 'Киңлек:'
       longitude: 'Оҙонлоҡ:'
       paste_html: Сайтҡа индереп ҡуйыу өсөн HTML-код
+  notes:
+    show:
+      title: ' %{id} искәрмәһе'
+      description: Тасуирлама
+      open_title: 'Эшкәртелмәгән мәҡәлә #%{note_name}'
+      closed_title: 'Эшкәртелгән мәҡәләа #%{note_name}'
+      hidden_title: 'Йәшерелгән яҙма #%{note_name}'
+      opened_by_html: Ҡулланыусы тарафынан булдырылған %{user} <abbr title='%{exact_time}'>%{when}
+        кирегә</abbr>
+      opened_by_anonymous_html: Аноним тарафынан булдырылған <abbr title='%{exact_time}'>%{when}
+        кирегә</abbr>
+      commented_by_html: Ҡулланыусы комментарийы %{user} <abbr title='%{exact_time}'>%{when}
+        кирегә</abbr>
+      commented_by_anonymous_html: Аноним комментарийы  <abbr title='%{exact_time}'>%{when}
+        кирегә</abbr>
+      closed_by_html: Ҡулланыусы тарафынан эшкәртелгән %{user} <abbr title='%{exact_time}'>%{when}
+        кирегә</abbr>
+      closed_by_anonymous_html: Аноним тарафынан рөхсәт ителгән <abbr title='%{exact_time}'>%{when}
+        кирегә</abbr>
+      reopened_by_html: Ҡулланыусы тарафынан ҡабаттан асылған %{user} <abbr title='%{exact_time}'>%{when}
+        кирегә</abbr>
+      reopened_by_anonymous_html: Аноним тарафынан ҡабаттан асылған <abbr title='%{exact_time}'>%{when}
+        кирегә</abbr>
+      hidden_by_html: Йәшерелгән %{user} <abbr title='%{exact_time}'>%{when} кирегә</abbr>
+      report: Был яҙма тураһында хәбәр итеү
+    new:
+      title: Яңы мәҡәлә
   javascripts:
     share:
       only_standard_layer: Бары стандарт ҡатлам ғына һүрәт кеүек экспортлана ала
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 3fcf255b4..733d4a64a 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -382,9 +382,6 @@ be-Tarask:
         key: Старонка вікі, якая апісвае тэг %{key}
         tag: Старонка вікі, якая апісвае тэг %{key}=%{value}
       wikipedia_link: Артыкул %{page} у Вікіпэдыі
-    note:
-      title: 'Нататка: %{id}'
-      commented_by_anonymous_html: Камэнтар ад ананіма <abbr title='%{exact_time}'>%{when}</abbr>
   changesets:
     changeset_paging_nav:
       showing_page: Старонка %{page}
@@ -1665,6 +1662,10 @@ be-Tarask:
       reason: Прычына блякаваньня
       status: Статус
       revoker_name: Адкліканае
+  notes:
+    show:
+      title: 'Нататка: %{id}'
+      commented_by_anonymous_html: Камэнтар ад ананіма <abbr title='%{exact_time}'>%{when}</abbr>
   javascripts:
     map:
       base:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 7f3450828..cd413e348 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -395,25 +395,6 @@ be:
       wikimedia_commons_link: '%{page} ў Вікісховішчы'
       telephone_link: Патэлефанаваць %{phone_number}
       colour_preview: Прагляд колеру %{colour_value}
-    note:
-      title: 'Заўвага: %{id}'
-      new_note: Новая заўвага
-      description: Апісанне
-      open_title: 'Нявырашаная заўвага #%{note_name}'
-      closed_title: 'Вырашаная заўвага #%{note_name}'
-      hidden_title: 'Схаваная заўвага #%{note_name}'
-      opened_by_html: Створана %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Створана ананімным карыстальнікам <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Каментарый ад %{user} <abbr title='%{exact_time}'>%{when}
-        </abbr>
-      commented_by_anonymous_html: Ананімны каментарый <abbr title='%{exact_time}'>%{when}
-        </abbr>
-      closed_by_html: Вырашана ўдзельнікам %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Вырашана ананімным удзельнікам <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Паўторна актывавана ўдзельнікам %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Пераадкрыта ананімным удзельнікам <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Схавана ўдзельнікам %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: паскардзіцца на гэтую заўвагу
     query:
       title: Пошук аб’ектаў
       introduction: Націсніце на карце, каб атрымаць звесткі пра аб’екты паблізу.
@@ -2451,6 +2432,40 @@ be:
       description: Апісанне
       created_at: Створаны ў
       last_changed: Апошнія змены
+    show:
+      title: 'Заўвага: %{id}'
+      description: Апісанне
+      open_title: 'Нявырашаная заўвага #%{note_name}'
+      closed_title: 'Вырашаная заўвага #%{note_name}'
+      hidden_title: 'Схаваная заўвага #%{note_name}'
+      opened_by_html: Створана %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Створана ананімным карыстальнікам <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Каментарый ад %{user} <abbr title='%{exact_time}'>%{when}
+        </abbr>
+      commented_by_anonymous_html: Ананімны каментарый <abbr title='%{exact_time}'>%{when}
+        </abbr>
+      closed_by_html: Вырашана ўдзельнікам %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Вырашана ананімным удзельнікам <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Паўторна актывавана ўдзельнікам %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Пераадкрыта ананімным удзельнікам <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Схавана ўдзельнікам %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: паскардзіцца на гэтую заўвагу
+      anonymous_warning: Гэтая нататка змяшчае каментары ад ананімных карыстальнікаў,
+        што павінны быць незалежна правераны.
+      hide: Схаваць
+      resolve: Вырашыць
+      reactivate: Актываваць паўторна
+      comment_and_resolve: Каментаваць і вырашыць
+      comment: Каментаваць
+    new:
+      title: Новая заўвага
+      intro: Заўважылі памылку або чагосьці не стае? Дайце іншым удзельнікам магчымасць
+        даведацца пра памылку і такім чынам мы выправім яе. Перамясціце маркер у патрэбную
+        пазіцыю і напішыце заўвагу з тлумачэннем праблемы.
+      advice: Ваша заўвага агульнадаступная і можа выкарыстоўвацца для абнаўлення
+        карты, таму не ўводзьце асабістую інфармацыю або інфармацыю з абароненых аўтарскім
+        правам карт або рэестраў.
+      add: Дадаць заўвагу
   javascripts:
     close: Закрыць
     share:
@@ -2530,23 +2545,6 @@ be:
         unsubscribe: Адпісацца
         hide_comment: схаваць
         unhide_comment: паказаць
-    notes:
-      new:
-        intro: Заўважылі памылку або чагосьці не стае? Дайце іншым удзельнікам магчымасць
-          даведацца пра памылку і такім чынам мы выправім яе. Перамясціце маркер у
-          патрэбную пазіцыю і напішыце заўвагу з тлумачэннем праблемы.
-        advice: Ваша заўвага агульнадаступная і можа выкарыстоўвацца для абнаўлення
-          карты, таму не ўводзьце асабістую інфармацыю або інфармацыю з абароненых
-          аўтарскім правам карт або рэестраў.
-        add: Дадаць заўвагу
-      show:
-        anonymous_warning: Гэтая нататка змяшчае каментары ад ананімных карыстальнікаў,
-          што павінны быць незалежна правераны.
-        hide: Схаваць
-        resolve: Вырашыць
-        reactivate: Актываваць паўторна
-        comment_and_resolve: Каментаваць і вырашыць
-        comment: Каментаваць
     edit_help: Перамясціце карту і наблізце месца, якое вы хочаце рэдагаваць, затым
       націсніце тут.
     directions:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 38a815df9..1c5814cc7 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -359,24 +359,6 @@ bg:
       wikipedia_link: Статията %{page} в Уикипедия
       telephone_link: Позвънете на %{phone_number}
       colour_preview: Преглед на цвета %{colour_value}
-    note:
-      title: Бележка № %{id}
-      new_note: Нова бележка
-      description: Описание
-      open_title: Нерешена бележка № %{note_name}
-      closed_title: Решена бележка № %{note_name}
-      hidden_title: Скрита бележка № %{note_name}
-      opened_by_html: Създадена от %{user} <abbr title='%{exact_time}'> %{when}</abbr>
-      opened_by_anonymous_html: Създадена от анонимен <abbr title='%{exact_time}'>
-        %{when}</abbr>
-      commented_by_html: Коментар от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Коментар от анонимен <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Решена от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Решена от анонимен <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Повторно отворена от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Повторно отворена от анонимен <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Скрита от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: докладване на бележката
     query:
       title: Търсене на обекти
       introduction: Щракнете върху картата, за да търсите обекти в близост.
@@ -1964,6 +1946,33 @@ bg:
       description: Описание
       created_at: Създадена на
       last_changed: Последна промяна
+    show:
+      title: Бележка № %{id}
+      description: Описание
+      open_title: Нерешена бележка № %{note_name}
+      closed_title: Решена бележка № %{note_name}
+      hidden_title: Скрита бележка № %{note_name}
+      opened_by_html: Създадена от %{user} <abbr title='%{exact_time}'> %{when}</abbr>
+      opened_by_anonymous_html: Създадена от анонимен <abbr title='%{exact_time}'>
+        %{when}</abbr>
+      commented_by_html: Коментар от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Коментар от анонимен <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Решена от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Решена от анонимен <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Повторно отворена от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Повторно отворена от анонимен <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Скрита от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: докладване на бележката
+      anonymous_warning: Бележката е от анонимен потребител и съдържа твърдения, които
+        трябва да бъдат проверени.
+      hide: Скриване
+      resolve: Решаване
+      reactivate: Повторно отваряне
+      comment_and_resolve: Коментиране и решаване
+      comment: Коментиране
+    new:
+      title: Нова бележка
+      add: Добавяне на бележка
   javascripts:
     close: Затваряне
     share:
@@ -2027,17 +2036,6 @@ bg:
         unsubscribe: Отписване
         hide_comment: скриване
         unhide_comment: показване
-    notes:
-      new:
-        add: Добавяне на бележка
-      show:
-        anonymous_warning: Бележката е от анонимен потребител и съдържа твърдения,
-          които трябва да бъдат проверени.
-        hide: Скриване
-        resolve: Решаване
-        reactivate: Повторно отваряне
-        comment_and_resolve: Коментиране и решаване
-        comment: Коментиране
     directions:
       ascend: Изкачване
       engines:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 5d205c0b7..9e9723718 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -451,32 +451,6 @@ bn:
       telephone_link: '%{phone_number}-এ কল করুন'
       colour_preview: রঙ %{colour_value} প্রাকদর্শন
       email_link: ইমেল %{email}
-    note:
-      title: 'টীকা: %{id}'
-      new_note: নতুন টীকা
-      description: 'বর্ণনা:'
-      open_title: 'অমীমাংসিত টীকা #%{note_name}'
-      closed_title: 'মীমাংসিত টীকা #%{note_name}'
-      hidden_title: 'লুকানো টীকা #%{note_name}'
-      opened_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
-        তৈরিকৃত'
-      opened_by_anonymous_html: বেনামী ব্যবহারকারী কর্তৃক <abbr title='%{exact_time}'>%{when}</abbr>
-        তৈরিকৃত
-      commented_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
-        করা মন্তব্য'
-      commented_by_anonymous_html: বেনামী ব্যবহারকারী কর্তৃক <abbr title='%{exact_time}'>%{when}</abbr>
-        করা মন্তব্য
-      closed_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
-        মীমাংসিত'
-      closed_by_anonymous_html: বেনামি ব্যবহারকারী দ্বারা <abbr title='%{exact_time}'>%{when}</abbr>
-        মীমাংসিত
-      reopened_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
-        পুনঃসক্রিয়কৃত'
-      reopened_by_anonymous_html: বেনামি ব্যবহারকারী দ্বারা <abbr title='%{exact_time}'>%{when}</abbr>
-        পুনঃসক্রিয়কৃত
-      hidden_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
-        লুক্কায়িত'
-      report: এই নোট সম্পর্কে অভিযোগ জানান
     query:
       title: বৈশিষ্ট্য অনুসন্ধান করুন
       introduction: নিকটবর্তী বৈশিষ্ট্য খুঁজে পেতে মানচিত্রে ক্লিক করুন।
@@ -2050,6 +2024,42 @@ bn:
       display_name: বাধাপ্রাপ্ত ব্যবহারকারী
       next: পরবর্তী »
       previous: « পূর্ববর্তী
+  notes:
+    show:
+      title: 'টীকা: %{id}'
+      description: 'বর্ণনা:'
+      open_title: 'অমীমাংসিত টীকা #%{note_name}'
+      closed_title: 'মীমাংসিত টীকা #%{note_name}'
+      hidden_title: 'লুকানো টীকা #%{note_name}'
+      opened_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
+        তৈরিকৃত'
+      opened_by_anonymous_html: বেনামী ব্যবহারকারী কর্তৃক <abbr title='%{exact_time}'>%{when}</abbr>
+        তৈরিকৃত
+      commented_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
+        করা মন্তব্য'
+      commented_by_anonymous_html: বেনামী ব্যবহারকারী কর্তৃক <abbr title='%{exact_time}'>%{when}</abbr>
+        করা মন্তব্য
+      closed_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
+        মীমাংসিত'
+      closed_by_anonymous_html: বেনামি ব্যবহারকারী দ্বারা <abbr title='%{exact_time}'>%{when}</abbr>
+        মীমাংসিত
+      reopened_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
+        পুনঃসক্রিয়কৃত'
+      reopened_by_anonymous_html: বেনামি ব্যবহারকারী দ্বারা <abbr title='%{exact_time}'>%{when}</abbr>
+        পুনঃসক্রিয়কৃত
+      hidden_by_html: '%{user} কর্তৃক <abbr title=''%{exact_time}''>%{when}</abbr>
+        লুক্কায়িত'
+      report: এই নোট সম্পর্কে অভিযোগ জানান
+      hide: লুকান
+      resolve: মিমাংসা করুন
+      reactivate: পুনঃসক্রিয়
+      comment: মন্তব্য
+      report_link_html: যদি এই নোটটিতে সংবেদনশীল তথ্য থাকে যা অপসারণ করা উচিত, তাহলে
+        %{link}। নোটের সাথে অন্যান্য সমস্ত সমস্যার জন্য, দয়া করে একটি মন্তব্যের মাধ্যমে
+        এটি নিজেই সমাধান করুন৷
+    new:
+      title: নতুন টীকা
+      add: টীকাযুক্ত করুন
   javascripts:
     close: বন্ধ
     share:
@@ -2068,17 +2078,6 @@ bn:
     changesets:
       show:
         comment: মন্তব্য
-    notes:
-      new:
-        add: টীকাযুক্ত করুন
-      show:
-        hide: লুকান
-        resolve: মিমাংসা করুন
-        reactivate: পুনঃসক্রিয়
-        comment: মন্তব্য
-        report_link_html: যদি এই নোটটিতে সংবেদনশীল তথ্য থাকে যা অপসারণ করা উচিত, তাহলে
-          %{link}। নোটের সাথে অন্যান্য সমস্ত সমস্যার জন্য, দয়া করে একটি মন্তব্যের
-          মাধ্যমে এটি নিজেই সমাধান করুন৷
     directions:
       engines:
         graphhopper_car: গাড়ি (GraphHopper)
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 06d061a18..82eae7db5 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -454,30 +454,6 @@ br:
       telephone_link: Gervel %{phone_number}
       colour_preview: Rakwel al liv %{colour_value}
       email_link: Chomlec'h postel %{email}
-    note:
-      title: 'Notenn: %{id}'
-      new_note: Notenn nevez
-      description: Deskrivadur
-      open_title: 'Neket bet diskoulmet an notenn #%{note_name}'
-      closed_title: 'Notenn diskoulmet #%{note_name}'
-      hidden_title: 'Notenn kuzhet #%{note_name}'
-      opened_by_html: Krouet gant %{user} <abbr title='%{exact_time}'>%{when} 'zo</abbr>
-      opened_by_anonymous_html: Krouet gant un den dianav <abbr title='%{exact_time}'>%{when}
-        'zo</abbr>
-      commented_by_html: Evezhiadenn gant %{user} <abbr title='%{exact_time}'>%{when}
-        'zo</abbr>
-      commented_by_anonymous_html: Evezhiadenn gant un den dizanv <abbr title='%{exact_time}'>%{when}
-        'zo</abbr>
-      closed_by_html: Diskoulmet gant %{user} <abbr title='%{exact_time}'>%{when}
-        'zo</abbr>
-      closed_by_anonymous_html: Diskoulmet gant un den dizanv <abbr title='%{exact_time}'>%{when}
-        'zo</abbr>
-      reopened_by_html: Adenaouet gant %{user} <abbr title='%{exact_time}'>%{when}
-        'zo</abbr>
-      reopened_by_anonymous_html: Adenaouet gant un den dizanv <abbr title='%{exact_time}'>%{when}
-        'zo</abbr>
-      hidden_by_html: Kuzhet gant %{user} <abbr title='%{exact_time}'>%{when} 'zo</abbr>
-      report: danevelliñ an notenn-mañ
     query:
       title: Arc'hweladurioù enklask
       introduction: Klikit war ar gartenn evit kavout arc'hweladurioù e-kichen.
@@ -2864,6 +2840,45 @@ br:
       description: Deskrivadur
       created_at: Krouet e
       last_changed: Kemm diwezhañ
+    show:
+      title: 'Notenn: %{id}'
+      description: Deskrivadur
+      open_title: 'Neket bet diskoulmet an notenn #%{note_name}'
+      closed_title: 'Notenn diskoulmet #%{note_name}'
+      hidden_title: 'Notenn kuzhet #%{note_name}'
+      opened_by_html: Krouet gant %{user} <abbr title='%{exact_time}'>%{when} 'zo</abbr>
+      opened_by_anonymous_html: Krouet gant un den dianav <abbr title='%{exact_time}'>%{when}
+        'zo</abbr>
+      commented_by_html: Evezhiadenn gant %{user} <abbr title='%{exact_time}'>%{when}
+        'zo</abbr>
+      commented_by_anonymous_html: Evezhiadenn gant un den dizanv <abbr title='%{exact_time}'>%{when}
+        'zo</abbr>
+      closed_by_html: Diskoulmet gant %{user} <abbr title='%{exact_time}'>%{when}
+        'zo</abbr>
+      closed_by_anonymous_html: Diskoulmet gant un den dizanv <abbr title='%{exact_time}'>%{when}
+        'zo</abbr>
+      reopened_by_html: Adenaouet gant %{user} <abbr title='%{exact_time}'>%{when}
+        'zo</abbr>
+      reopened_by_anonymous_html: Adenaouet gant un den dizanv <abbr title='%{exact_time}'>%{when}
+        'zo</abbr>
+      hidden_by_html: Kuzhet gant %{user} <abbr title='%{exact_time}'>%{when} 'zo</abbr>
+      report: danevelliñ an notenn-mañ
+      anonymous_warning: En notenn-mañ ez eus evezhiadennoù gant implijerien dianav
+        hag a zlefe bezañ gwiriekaet unan-ha-unan.
+      hide: Kuzhat
+      resolve: Diskoulmañ
+      reactivate: Adweredekaat
+      comment_and_resolve: Addisplegañ & Diskoulmañ
+      comment: Evezhiadenn
+    new:
+      title: Notenn nevez
+      intro: Gwelet ho peus ur fazi pe un dra a vank ? Roit an dra-se da c'houzout
+        d'ar gartennaouerien all evit ma vo renket. Lakait ar merker el lec'h mat
+        ha skrivit un notenn da zisplegañ ar gudenn.
+      advice: Foran eo ho notenn ha ne c'hall ket bezañ implijet evit hizivaat ar
+        gartenn. Setu perak eo abarat ebarzhiñ titouroù personel pe titouroù o tont
+        eus kartennoù gwarezet na endalc'hioù rolloù.
+      add: Ouzhpennañ un notenn
   javascripts:
     close: Serriñ
     share:
@@ -2947,23 +2962,6 @@ br:
         unsubscribe: Digoumanantiñ
         hide_comment: kuzhat
         unhide_comment: diskouez
-    notes:
-      new:
-        intro: Gwelet ho peus ur fazi pe un dra a vank ? Roit an dra-se da c'houzout
-          d'ar gartennaouerien all evit ma vo renket. Lakait ar merker el lec'h mat
-          ha skrivit un notenn da zisplegañ ar gudenn.
-        advice: Foran eo ho notenn ha ne c'hall ket bezañ implijet evit hizivaat ar
-          gartenn. Setu perak eo abarat ebarzhiñ titouroù personel pe titouroù o tont
-          eus kartennoù gwarezet na endalc'hioù rolloù.
-        add: Ouzhpennañ un notenn
-      show:
-        anonymous_warning: En notenn-mañ ez eus evezhiadennoù gant implijerien dianav
-          hag a zlefe bezañ gwiriekaet unan-ha-unan.
-        hide: Kuzhat
-        resolve: Diskoulmañ
-        reactivate: Adweredekaat
-        comment_and_resolve: Addisplegañ & Diskoulmañ
-        comment: Evezhiadenn
     edit_help: Dilec'hiit ar gartenn ha zoumit war ul lec'h a fell deoc'h aozañ, ha
       neuze klikit amañ.
     directions:
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 007e3ef08..fb824c4a6 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -273,9 +273,6 @@ bs:
         key: Wiki stranica opisa za oznaku %{key} (tag)
         tag: Wiki stranica opisa za oznaku %{key}=%{value} (tag)
       wikipedia_link: Članak o %{page} na Wikipediji
-    note:
-      new_note: Nova bilješka
-      description: Opis
     query:
       title: Informacije o objektima
       nearby: Obližnje značajke
@@ -1715,6 +1712,15 @@ bs:
       description: Opis
       created_at: 'Napravljeno:'
       last_changed: Posljednja izmjena
+    show:
+      description: Opis
+      hide: Sakrij
+      resolve: Riješi
+      reactivate: Reaktiviraj
+      comment_and_resolve: Komentiraj i riješi
+      comment: Komentiraj
+    new:
+      title: Nova bilješka
   javascripts:
     close: Zatvori
     share:
@@ -1757,13 +1763,6 @@ bs:
       edit_disabled_tooltip: Uvećati za uređivanje karte
       queryfeature_tooltip: Informacije o objektima
       queryfeature_disabled_tooltip: Zumiraj za informacije o objektima
-    notes:
-      show:
-        hide: Sakrij
-        resolve: Riješi
-        reactivate: Reaktiviraj
-        comment_and_resolve: Komentiraj i riješi
-        comment: Komentiraj
     context:
       directions_from: Uputstva odavde
       directions_to: Uputstva dovde
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d27d36a8f..96b38a279 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -473,23 +473,6 @@ ca:
       telephone_link: Trucar %{phone_number}
       colour_preview: Previsualització de color %{colour_value}
       email_link: Correu %{email}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nota nova
-      description: Descripció
-      open_title: 'Nota no resolta: #%{note_name}'
-      closed_title: 'Nota resolta #%{note_name}'
-      hidden_title: 'Nota oculta #%{note_name}'
-      opened_by_html: Creat per %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Creat per un anònim a <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comentari de %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comentari d'un anònim a <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resolt per %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resolt per un anònim a <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reactivat per %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reactivat per un anònim a <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Ocultat per %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
-      report: informa d'aquesta nota
     query:
       title: Consultar objectes
       introduction: Feu clic al mapa per a trobar objectes propers.
@@ -2949,6 +2932,42 @@ ca:
       description: Descripció
       created_at: Creat a
       last_changed: Últim canvi
+    show:
+      title: 'Nota: %{id}'
+      description: Descripció
+      open_title: 'Nota no resolta: #%{note_name}'
+      closed_title: 'Nota resolta #%{note_name}'
+      hidden_title: 'Nota oculta #%{note_name}'
+      opened_by_html: Creat per %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Creat per un anònim a <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comentari de %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comentari d'un anònim a <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolt per %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolt per un anònim a <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivat per %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivat per un anònim a <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Ocultat per %{user} a <abbr title='%{exact_time}'>%{when}</abbr>
+      report: informa d'aquesta nota
+      anonymous_warning: Aquesta nota inclou comentaris d'usuaris anònims que haurien
+        de ser verificats independentment.
+      hide: Amaga
+      resolve: Resol
+      reactivate: Reactivar
+      comment_and_resolve: Comenta i resol
+      comment: Comenta
+      report_link_html: Si aquesta nota conté informació delicada que cal eliminar,
+        podeu %{link}.
+      other_problems_resolved: Per a tots els altres problemes, la resolució és suficient.
+      disappear_date_html: Aquesta nota resolta desapareixerà del mapa en %{disappear_in}.
+    new:
+      title: Nota nova
+      intro: Heu trobat un error o bé hi falta res? Informeu-ne a altres col·laboradors
+        per tal que puguin solucionar-ho. Moveu el marcador a la posició correcta
+        i escriviu-hi una anotació per tal de descriure el problema.
+      advice: La vostra nota és pública i pot utilitzar-se per actualitzar el mapa,
+        per tant, no hi introduïu cap informació personal, o informació de mapes amb
+        copyright o bé llistats de directori.
+      add: Afegeix una nota
   javascripts:
     close: Tanca
     share:
@@ -3030,28 +3049,6 @@ ca:
         unsubscribe: Dona de baixa
         hide_comment: ocultar
         unhide_comment: mostrar
-    notes:
-      new:
-        intro: Heu trobat un error o bé hi falta res? Informeu-ne a altres col·laboradors
-          per tal que puguin solucionar-ho. Moveu el marcador a la posició correcta
-          i escriviu-hi una anotació per tal de descriure el problema.
-        advice: La vostra nota és pública i pot utilitzar-se per actualitzar el mapa,
-          per tant, no hi introduïu cap informació personal, o informació de mapes
-          amb copyright o bé llistats de directori.
-        add: Afegeix una nota
-      show:
-        anonymous_warning: Aquesta nota inclou comentaris d'usuaris anònims que haurien
-          de ser verificats independentment.
-        hide: Amaga
-        resolve: Resol
-        reactivate: Reactivar
-        comment_and_resolve: Comenta i resol
-        comment: Comenta
-        report_link_html: Si aquesta nota conté informació delicada que cal eliminar,
-          podeu %{link}.
-        other_problems_resolved: Per a tots els altres problemes, la resolució és
-          suficient.
-        disappear_date_html: Aquesta nota resolta desapareixerà del mapa en %{disappear_in}.
     edit_help: Moveu el mapa i feu zoom sobre una ubicació que vulgueu editar, i a
       continuació, feu clic aquí.
     directions:
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index a649a7835..32f16bfa7 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -286,30 +286,6 @@ ce:
       wikidata_link: Элемент %{page} Викихаамашкахь
       wikipedia_link: АгӀо %{page} Википедин чохь
       telephone_link: Телпо тоха %{phone_number}
-    note:
-      title: 'Билгалдаккхар: %{id}'
-      new_note: Керла билгало
-      description: Цуьнах лаьцна
-      open_title: 'Кечйина йоцу билгало #%{note_name}'
-      closed_title: 'Кечйина билгало #%{note_name}'
-      hidden_title: 'Къайлайаьккхина билгало #%{note_name}'
-      opened_by_html: Кхоьллина декъашхочо %{user} <abbr title='%{exact_time}'>%{when}
-        хьалха</abbr>
-      opened_by_anonymous_html: Кхоьллина цӀе хьулйина декъашхочо <abbr title='%{exact_time}'>%{when}
-        хьалха</abbr>
-      commented_by_html: Декъашхочун коммент %{user} <abbr title='%{exact_time}'>%{when}
-        хьалха</abbr>
-      commented_by_anonymous_html: Коммент цӀе хьулйина декъашхочун <abbr title='%{exact_time}'>%{when}
-        хьалха</abbr>
-      closed_by_html: Кечйина %{user} <abbr title='%{exact_time}'>%{when} хьалха</abbr>
-      closed_by_anonymous_html: Кечйина цӀе хьулйина декъашхочо <abbr title='%{exact_time}'>%{when}
-        хьалха</abbr>
-      reopened_by_html: Кечйина %{user} <abbr title='%{exact_time}'>%{when} хьалха</abbr>
-      reopened_by_anonymous_html: Кечйина цӀе хьулйина декъашхочо <abbr title='%{exact_time}'>%{when}
-        хьалха</abbr>
-      hidden_by_html: Къайлайаьккхина %{user} <abbr title='%{exact_time}'>%{when}
-        хьалха</abbr>
-      report: Хаамбе хӀокху билгалонах
     query:
       title: ХӀун йу кхузахь?
       introduction: Уллера объекташ карайан, картан тӀетаӀае
@@ -1020,6 +996,37 @@ ce:
       description: Цуьнах лаьцна
       created_at: Кхоьллина
       last_changed: Хийцина
+    show:
+      title: 'Билгалдаккхар: %{id}'
+      description: Цуьнах лаьцна
+      open_title: 'Кечйина йоцу билгало #%{note_name}'
+      closed_title: 'Кечйина билгало #%{note_name}'
+      hidden_title: 'Къайлайаьккхина билгало #%{note_name}'
+      opened_by_html: Кхоьллина декъашхочо %{user} <abbr title='%{exact_time}'>%{when}
+        хьалха</abbr>
+      opened_by_anonymous_html: Кхоьллина цӀе хьулйина декъашхочо <abbr title='%{exact_time}'>%{when}
+        хьалха</abbr>
+      commented_by_html: Декъашхочун коммент %{user} <abbr title='%{exact_time}'>%{when}
+        хьалха</abbr>
+      commented_by_anonymous_html: Коммент цӀе хьулйина декъашхочун <abbr title='%{exact_time}'>%{when}
+        хьалха</abbr>
+      closed_by_html: Кечйина %{user} <abbr title='%{exact_time}'>%{when} хьалха</abbr>
+      closed_by_anonymous_html: Кечйина цӀе хьулйина декъашхочо <abbr title='%{exact_time}'>%{when}
+        хьалха</abbr>
+      reopened_by_html: Кечйина %{user} <abbr title='%{exact_time}'>%{when} хьалха</abbr>
+      reopened_by_anonymous_html: Кечйина цӀе хьулйина декъашхочо <abbr title='%{exact_time}'>%{when}
+        хьалха</abbr>
+      hidden_by_html: Къайлайаьккхина %{user} <abbr title='%{exact_time}'>%{when}
+        хьалха</abbr>
+      report: Хаамбе хӀокху билгалонах
+      hide: Къайлайаккха
+      resolve: Кечъян
+      reactivate: Йуха йела
+      comment_and_resolve: Жопделла кечъе
+      comment: Жопдала
+    new:
+      title: Керла билгало
+      add: ТӀетоха билгало
   javascripts:
     close: ДӀачӀагӀа
     share:
@@ -1052,15 +1059,6 @@ ce:
         comment: Коммент
         hide_comment: къайлайаккха
         unhide_comment: гайта
-    notes:
-      new:
-        add: ТӀетоха билгало
-      show:
-        hide: Къайлайаккха
-        resolve: Кечъян
-        reactivate: Йуха йела
-        comment_and_resolve: Жопделла кечъе
-        comment: Жопдала
     directions:
       ascend: Хьала
       engines:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index ddb56329c..6be4b50ef 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -484,26 +484,6 @@ cs:
       telephone_link: Volat %{phone_number}
       colour_preview: Náhled barvy %{colour_value}
       email_link: Poslat e-mail na %{email}
-    note:
-      title: 'Poznámka: %{id}'
-      new_note: Nová poznámka
-      description: Popis
-      open_title: 'Nevyřešená poznámka #%{note_name}'
-      closed_title: 'Vyřešená poznámka #%{note_name}'
-      hidden_title: 'Skrytá poznámka #%{note_name}'
-      opened_by_html: Vytvořil %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Vytvořil anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: <abbr title='%{exact_time}'>%{when}</abbr> okomentoval %{user}
-      commented_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> okomentoval
-        anonym
-      closed_by_html: Vyřešeno od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Vyřešil anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Znovu aktivoval <abbr title='%{exact_time}'>%{when}</abbr>
-        uživatel %{user}
-      reopened_by_anonymous_html: Znovu aktivoval <abbr title='%{exact_time}'>%{when}</abbr>
-        anonym
-      hidden_by_html: Skryl <abbr title='%{exact_time}'>%{when}</abbr> uživatel %{user}
-      report: nahlásit tuto poznámku
     query:
       title: Průzkum prvků
       introduction: Pro nalezení okolních prvků klikněte na mapu.
@@ -2972,6 +2952,46 @@ cs:
       description: Popis
       created_at: Vytvořeno
       last_changed: Poslední změna
+    show:
+      title: 'Poznámka: %{id}'
+      description: Popis
+      open_title: 'Nevyřešená poznámka #%{note_name}'
+      closed_title: 'Vyřešená poznámka #%{note_name}'
+      hidden_title: 'Skrytá poznámka #%{note_name}'
+      opened_by_html: Vytvořil %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Vytvořil anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: <abbr title='%{exact_time}'>%{when}</abbr> okomentoval %{user}
+      commented_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> okomentoval
+        anonym
+      closed_by_html: Vyřešeno od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Vyřešil anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Znovu aktivoval <abbr title='%{exact_time}'>%{when}</abbr>
+        uživatel %{user}
+      reopened_by_anonymous_html: Znovu aktivoval <abbr title='%{exact_time}'>%{when}</abbr>
+        anonym
+      hidden_by_html: Skryl <abbr title='%{exact_time}'>%{when}</abbr> uživatel %{user}
+      report: nahlásit tuto poznámku
+      anonymous_warning: Tato poznámka zahrnuje komentáře anonymních uživatelů, které
+        by se měly nezávisle ověřit.
+      hide: Skrýt
+      resolve: Vyřešit
+      reactivate: Reaktivovat
+      comment_and_resolve: Okomentovat a vyřešit
+      comment: Okomentovat
+      report_link_html: Pokud tato poznámka obsahuje citlivé údaje, které je třeba
+        odstranit, můžete %{link}.
+      other_problems_resolve: Pokud má tato poznámka jakýkoli jiný problém, přidejte
+        komentář a označte ji za vyřešenou.
+      other_problems_resolved: U všech ostatních problémů stačí označení za vyřešenou.
+      disappear_date_html: Tato vyřešená poznámka z mapy zmizí za %{disappear_in}.
+    new:
+      title: Nová poznámka
+      intro: Zahlédli jste chybu nebo prázdné místo? Dejte vědět ostatním uživatelům,
+        aby to mohli napravit. Posuňte značku na správné místo a napište poznámku
+        vysvětlující problém.
+      advice: Vaše poznámka je veřejná a může sloužit k úpravám mapy, proto nevkládejte
+        žádné osobní údaje ani informace z autorskoprávně chráněných map či adresářů.
+      add: Přidat poznámku
   javascripts:
     close: Zavřít
     share:
@@ -3055,28 +3075,6 @@ cs:
         unsubscribe: Zrušit odebírání
         hide_comment: skrýt
         unhide_comment: odkrýt
-    notes:
-      new:
-        intro: Zahlédli jste chybu nebo prázdné místo? Dejte vědět ostatním uživatelům,
-          aby to mohli napravit. Posuňte značku na správné místo a napište poznámku
-          vysvětlující problém.
-        advice: Vaše poznámka je veřejná a může sloužit k úpravám mapy, proto nevkládejte
-          žádné osobní údaje ani informace z autorskoprávně chráněných map či adresářů.
-        add: Přidat poznámku
-      show:
-        anonymous_warning: Tato poznámka zahrnuje komentáře anonymních uživatelů,
-          které by se měly nezávisle ověřit.
-        hide: Skrýt
-        resolve: Vyřešit
-        reactivate: Reaktivovat
-        comment_and_resolve: Okomentovat a vyřešit
-        comment: Okomentovat
-        report_link_html: Pokud tato poznámka obsahuje citlivé údaje, které je třeba
-          odstranit, můžete %{link}.
-        other_problems_resolve: Pokud má tato poznámka jakýkoli jiný problém, přidejte
-          komentář a označte ji za vyřešenou.
-        other_problems_resolved: U všech ostatních problémů stačí označení za vyřešenou.
-        disappear_date_html: Tato vyřešená poznámka z mapy zmizí za %{disappear_in}.
     edit_help: Posuňte si mapu a zvětšete si místo, které chcete editovat, a klikněte
       zde.
     directions:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index bf5898ff2..2b183e477 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -301,24 +301,6 @@ cy:
       wikipedia_link: Erthygl %{page} ar Wicipedia
       telephone_link: Galw %{phone_number}
       email_link: E-bost %{email}
-    note:
-      title: 'Nodyn: %{id}'
-      new_note: Nodyn Newydd
-      description: Disgrifiad
-      open_title: '#%{note_name} heb ei ddatrus'
-      closed_title: '#%{note_name} wedi''i ddatrus'
-      hidden_title: Nodyn cudd %{note_name}
-      opened_by_html: Crëwyd gan %{user} <abbr title='%{exact_time}'>%{when} yn ôl</abbr>
-      opened_by_anonymous_html: Crëwyd yn ddienw <abbr title='%{exact_time}'>%{when}
-        yn ôl</abbr>
-      commented_by_html: Sylw gan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Sylw dienw <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Wedi'i ddatrus gan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Wedi ei ddatrus gan <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Gwnaed yn weithredol gan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Gwnaed yn weithredol gan olygydd dienw <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Cuddwyd gan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Adroddwch am y nodyn hwn
     query:
       title: Nodweddion Ymholiad
       introduction: Cliciwch ar y map i ddarganfod nodweddion gerllaw.
@@ -1634,6 +1616,31 @@ cy:
   notes:
     index:
       id: Id
+    show:
+      title: 'Nodyn: %{id}'
+      description: Disgrifiad
+      open_title: '#%{note_name} heb ei ddatrus'
+      closed_title: '#%{note_name} wedi''i ddatrus'
+      hidden_title: Nodyn cudd %{note_name}
+      opened_by_html: Crëwyd gan %{user} <abbr title='%{exact_time}'>%{when} yn ôl</abbr>
+      opened_by_anonymous_html: Crëwyd yn ddienw <abbr title='%{exact_time}'>%{when}
+        yn ôl</abbr>
+      commented_by_html: Sylw gan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Sylw dienw <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Wedi'i ddatrus gan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Wedi ei ddatrus gan <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Gwnaed yn weithredol gan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Gwnaed yn weithredol gan olygydd dienw <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Cuddwyd gan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Adroddwch am y nodyn hwn
+      hide: Cuddio
+      resolve: Datrys
+      reactivate: Ail roi ar waith
+      comment_and_resolve: Sylw a Datrys
+      comment: Adweithio
+    new:
+      title: Nodyn Newydd
+      add: Ychwanegu Nodyn
   javascripts:
     close: Cau
     share:
@@ -1683,15 +1690,6 @@ cy:
         unsubscribe: Dad-danysgrifio
         hide_comment: cuddio
         unhide_comment: datguddio
-    notes:
-      new:
-        add: Ychwanegu Nodyn
-      show:
-        hide: Cuddio
-        resolve: Datrys
-        reactivate: Ail roi ar waith
-        comment_and_resolve: Sylw a Datrys
-        comment: Adweithio
     directions:
       engines:
         fossgis_valhalla_bicycle: Beic (Valhalla)
diff --git a/config/locales/da.yml b/config/locales/da.yml
index b19394f01..679bcf385 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -462,23 +462,6 @@ da:
       telephone_link: Ring til %{phone_number}
       colour_preview: Forhåndsvisning af farve %{colour_value}
       email_link: E-mail %{email}
-    note:
-      title: 'Bemærkning: %{id}'
-      new_note: Ny bemærkning
-      description: Beskrivelse
-      open_title: 'Uløst bemærkning #%{note_name}'
-      closed_title: 'Løst bemærkning #%{note_name}'
-      hidden_title: 'Skjult bemærkning #%{note_name}'
-      opened_by_html: Oprettet af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Oprettet af anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Kommentar fra %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentar fra anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Løst af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Løst af anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Genaktiveret af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Genaktiveret af anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Skjult af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: rapportere denne bemærkning
     query:
       title: Find kortobjekter
       introduction: Klik på kortet for at finde kortobjekter i nærheden.
@@ -2991,6 +2974,45 @@ da:
       description: Beskrivelse
       created_at: Oprettet den
       last_changed: Sidst ændret
+    show:
+      title: 'Bemærkning: %{id}'
+      description: Beskrivelse
+      open_title: 'Uløst bemærkning #%{note_name}'
+      closed_title: 'Løst bemærkning #%{note_name}'
+      hidden_title: 'Skjult bemærkning #%{note_name}'
+      opened_by_html: Oprettet af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Oprettet af anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Kommentar fra %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentar fra anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Løst af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Løst af anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Genaktiveret af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Genaktiveret af anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Skjult af %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: rapportere denne bemærkning
+      anonymous_warning: Denne bemærkning indeholder kommentarer fra anonyme brugere
+        som bør undergå en uafhængig kontrol af oplysningerne.
+      hide: Skjul
+      resolve: Løs
+      reactivate: Genaktiver
+      comment_and_resolve: Kommentere på og løse
+      comment: Kommenter
+      report_link_html: Hvis denne bemærkning indeholder følsomme oplysninger, der
+        skal fjernes, kan du %{link}.
+      other_problems_resolve: For alle andre problemer med bemærkningen, bedes du
+        løse det selv med en kommentar.
+      other_problems_resolved: For alle andre problemer, vil en løsning af bemærkningen
+        være tilstrækkelig.
+      disappear_date_html: Denne løste bemærkning vil forsvinde fra kortet om %{disappear_in}.
+    new:
+      title: Ny bemærkning
+      intro: Opdaget en fejl eller noget der mangler? Lad andre kortlæggere vide det,
+        så vi kan ordne det. Flyt markøren til den korrekte position, og skriv en
+        bemærkning for at forklare problemet.
+      advice: Dine oplysninger er offentlige og vil måske blive brugt til at opdatere
+        kortet, så indtast ikke personlige oplysninger eller oplysninger fra kort
+        beskyttet af ophavsret eller mappeoversigter.
+      add: Tilføj bemærkning
   javascripts:
     close: Luk
     share:
@@ -3072,30 +3094,6 @@ da:
         unsubscribe: Afmeld
         hide_comment: skjul
         unhide_comment: fjern skjul
-    notes:
-      new:
-        intro: Opdaget en fejl eller noget der mangler? Lad andre kortlæggere vide
-          det, så vi kan ordne det. Flyt markøren til den korrekte position, og skriv
-          en bemærkning for at forklare problemet.
-        advice: Dine oplysninger er offentlige og vil måske blive brugt til at opdatere
-          kortet, så indtast ikke personlige oplysninger eller oplysninger fra kort
-          beskyttet af ophavsret eller mappeoversigter.
-        add: Tilføj bemærkning
-      show:
-        anonymous_warning: Denne bemærkning indeholder kommentarer fra anonyme brugere
-          som bør undergå en uafhængig kontrol af oplysningerne.
-        hide: Skjul
-        resolve: Løs
-        reactivate: Genaktiver
-        comment_and_resolve: Kommentere på og løse
-        comment: Kommenter
-        report_link_html: Hvis denne bemærkning indeholder følsomme oplysninger, der
-          skal fjernes, kan du %{link}.
-        other_problems_resolve: For alle andre problemer med bemærkningen, bedes du
-          løse det selv med en kommentar.
-        other_problems_resolved: For alle andre problemer, vil en løsning af bemærkningen
-          være tilstrækkelig.
-        disappear_date_html: Denne løste bemærkning vil forsvinde fra kortet om %{disappear_in}.
     edit_help: Flyt kortet og zoom ind på et sted, du vil redigere, og klik så her.
     directions:
       ascend: Stigning
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f932ee215..090033602 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -533,23 +533,6 @@ de:
       telephone_link: '%{phone_number} anrufen'
       colour_preview: Farbe %{colour_value} Vorschau
       email_link: E-Mail %{email}
-    note:
-      title: 'Hinweis: %{id}'
-      new_note: Neuer Hinweis
-      description: Beschreibung
-      open_title: Ungelöster Hinweis Nr. %{note_name}
-      closed_title: Erledigter Hinweis Nr. %{note_name}
-      hidden_title: Versteckter Hinweis Nr. %{note_name}
-      opened_by_html: Erstellt von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Erstellt von Anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Kommentar von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentar von Anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Erledigt von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Erledigt von Anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reaktiviert von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reaktiviert von Anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Versteckt von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: diesen Hinweis melden
     query:
       title: Objektabfrage
       introduction: Klicke auf die Karte, um benachbarte Objekte zu finden.
@@ -3106,6 +3089,46 @@ de:
       description: Hinweis
       created_at: Erstellt am
       last_changed: Zuletzt geändert
+    show:
+      title: 'Hinweis: %{id}'
+      description: Beschreibung
+      open_title: Ungelöster Hinweis Nr. %{note_name}
+      closed_title: Erledigter Hinweis Nr. %{note_name}
+      hidden_title: Versteckter Hinweis Nr. %{note_name}
+      opened_by_html: Erstellt von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Erstellt von Anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Kommentar von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentar von Anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Erledigt von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Erledigt von Anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reaktiviert von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reaktiviert von Anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Versteckt von %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: diesen Hinweis melden
+      anonymous_warning: Dieser Hinweis enthält Kommentare von anonymen Benutzern,
+        die unabhängig geprüft werden sollten.
+      hide: Verstecken
+      resolve: Erledigt
+      reactivate: Reaktivieren
+      comment_and_resolve: Kommentieren & Erledigen
+      comment: Kommentieren
+      report_link_html: Wenn diese Notiz sensible Informationen enthält, die entfernt
+        werden müssen, kannst du %{link}.
+      other_problems_resolve: Für alle anderen Probleme mit dem Hinweis, erledige
+        ihn bitte selbst mit einem Kommentar.
+      other_problems_resolved: Für alle anderen Probleme reicht es, den Hinweis zu
+        erledigen.
+      disappear_date_html: Dieser erledigte Hinweis wird in %{disappear_in} von der
+        Karte verschwinden.
+    new:
+      title: Neuer Hinweis
+      intro: Fehlt etwas oder hast du einen Fehler gefunden? Bitte verschiebe den
+        Marker auf die exakte Position und gib genaue Hinweise/Informationen an bzw.
+        beschreibe den Fehler in der Karte möglichst präzise.
+      advice: Deine Meldung ist öffentlich und kann zur Aktualisierung der Karte verwendet
+        werden. Gib deshalb keine persönlichen oder urheberrechtlich geschützten Informationen
+        von anderen Karten oder Verzeichnislisten an.
+      add: Hinweis/Fehler melden
   javascripts:
     close: Schließen
     share:
@@ -3191,31 +3214,6 @@ de:
         unsubscribe: Abbestellen
         hide_comment: verstecken
         unhide_comment: einblenden
-    notes:
-      new:
-        intro: Fehlt etwas oder hast du einen Fehler gefunden? Bitte verschiebe den
-          Marker auf die exakte Position und gib genaue Hinweise/Informationen an
-          bzw. beschreibe den Fehler in der Karte möglichst präzise.
-        advice: Deine Meldung ist öffentlich und kann zur Aktualisierung der Karte
-          verwendet werden. Gib deshalb keine persönlichen oder urheberrechtlich geschützten
-          Informationen von anderen Karten oder Verzeichnislisten an.
-        add: Hinweis/Fehler melden
-      show:
-        anonymous_warning: Dieser Hinweis enthält Kommentare von anonymen Benutzern,
-          die unabhängig geprüft werden sollten.
-        hide: Verstecken
-        resolve: Erledigt
-        reactivate: Reaktivieren
-        comment_and_resolve: Kommentieren & Erledigen
-        comment: Kommentieren
-        report_link_html: Wenn diese Notiz sensible Informationen enthält, die entfernt
-          werden müssen, kannst du %{link}.
-        other_problems_resolve: Für alle anderen Probleme mit dem Hinweis, erledige
-          ihn bitte selbst mit einem Kommentar.
-        other_problems_resolved: Für alle anderen Probleme reicht es, den Hinweis
-          zu erledigen.
-        disappear_date_html: Dieser erledigte Hinweis wird in %{disappear_in} von
-          der Karte verschwinden.
     edit_help: Wähle eine höhere Zoomstufe und verschiebe die Karte an einen Ort,
       den du bearbeiten möchtest, und klicke hier.
     directions:
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 08c8c20b4..d36df13d7 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -272,12 +272,6 @@ diq:
     tag_details:
       tags: 'Etiketi:'
       telephone_link: Veynd %{phone_number}
-    note:
-      title: 'Not: %{id}'
-      new_note: Nota Newi
-      description: Şınasnayış
-      hidden_by_html: '%{user} <abbr title=''%{exact_time}''>%{when}</abbr> bınımnê'
-      report: Nê noti rapor ke
     query:
       title: Xısusiyetan bıasne
       introduction: Xısusiyetanê nezdiyan vinayışi rê xeriter sero bıploğnê
@@ -1143,6 +1137,15 @@ diq:
   notes:
     index:
       description: Şınasnayış
+    show:
+      title: 'Not: %{id}'
+      description: Şınasnayış
+      hidden_by_html: '%{user} <abbr title=''%{exact_time}''>%{when}</abbr> bınımnê'
+      report: Nê noti rapor ke
+      hide: Bınımne
+      comment: Mışewre
+    new:
+      title: Nota Newi
   javascripts:
     close: Kip ke
     share:
@@ -1170,10 +1173,6 @@ diq:
         unsubscribe: Aboneyiye ra veciye
         hide_comment: bınımne
         unhide_comment: menımne
-    notes:
-      show:
-        hide: Bınımne
-        comment: Mışewre
     directions:
       engines:
         fossgis_osrm_bike: Bisiklet (OSRM)
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index feacc67d4..7fa8ff0a6 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -277,27 +277,6 @@ dsb:
       wikidata_link: Zapisk %{page} na Wikidata
       wikipedia_link: Nastawk %{page} we Wikipediji
       telephone_link: Na %{phone_number} zazwoniś
-    note:
-      title: 'Suk: %{id}'
-      new_note: Nowa notica
-      description: Wopisanje
-      open_title: 'Njedocynjona pokazka #%{note_name}'
-      closed_title: 'Docynjona pokazka #%{note_name}'
-      hidden_title: 'Schowana pokazka #%{note_name}'
-      opened_by_html: Napórany wót %{user} <abbr title='%{exact_time}'>pśed %{when}</abbr>
-      opened_by_anonymous_html: Napórany wót anonymnego <abbr title='%{exact_time}'>pśed
-        %{when}</abbr>
-      commented_by_html: Komentar wót %{user} <abbr title='%{exact_time}'>pśed %{when}</abbr>
-      commented_by_anonymous_html: Komentar wót anonymnego <abbr title='%{exact_time}'>pśed
-        %{when}</abbr>
-      closed_by_html: Docynjony wót %{user} <abbr title='%{exact_time}'>pśed %{when}</abbr>
-      closed_by_anonymous_html: Docynjony wót anonymnego <abbr title='%{exact_time}'>pśed
-        %{when}</abbr>
-      reopened_by_html: Reaktiwěrowany wót %{user} <abbr title='%{exact_time}'>pśed
-        %{when}</abbr>
-      reopened_by_anonymous_html: Reaktiwěrowany wót anonymnego <abbr title='%{exact_time}'>pśed
-        %{when}</abbr>
-      hidden_by_html: Schowany wót %{user} <abbr title='%{exact_time}'>pśed %{when}</abbr>
   changesets:
     changeset_paging_nav:
       showing_page: Bok %{page}
@@ -1894,6 +1873,40 @@ dsb:
       description: Wopis
       created_at: Napórany
       last_changed: Slědny raz změnjony
+    show:
+      title: 'Suk: %{id}'
+      description: Wopisanje
+      open_title: 'Njedocynjona pokazka #%{note_name}'
+      closed_title: 'Docynjona pokazka #%{note_name}'
+      hidden_title: 'Schowana pokazka #%{note_name}'
+      opened_by_html: Napórany wót %{user} <abbr title='%{exact_time}'>pśed %{when}</abbr>
+      opened_by_anonymous_html: Napórany wót anonymnego <abbr title='%{exact_time}'>pśed
+        %{when}</abbr>
+      commented_by_html: Komentar wót %{user} <abbr title='%{exact_time}'>pśed %{when}</abbr>
+      commented_by_anonymous_html: Komentar wót anonymnego <abbr title='%{exact_time}'>pśed
+        %{when}</abbr>
+      closed_by_html: Docynjony wót %{user} <abbr title='%{exact_time}'>pśed %{when}</abbr>
+      closed_by_anonymous_html: Docynjony wót anonymnego <abbr title='%{exact_time}'>pśed
+        %{when}</abbr>
+      reopened_by_html: Reaktiwěrowany wót %{user} <abbr title='%{exact_time}'>pśed
+        %{when}</abbr>
+      reopened_by_anonymous_html: Reaktiwěrowany wót anonymnego <abbr title='%{exact_time}'>pśed
+        %{when}</abbr>
+      hidden_by_html: Schowany wót %{user} <abbr title='%{exact_time}'>pśed %{when}</abbr>
+      anonymous_warning: Toś ta pokazka wopśimujo komentary wót anonymnych wužywarjow,
+        kótarež by měli se njewótwisnje pśeglědaś.
+      hide: Schowaś
+      resolve: Wótbyty
+      reactivate: Znowego aktiwěrowaś
+      comment_and_resolve: Komentěrowaś a cyniś
+      comment: Reagěrowaś
+    new:
+      title: Nowa notica
+      intro: Sy zmólku wiźeł abo až něco felujo? Informěruj drugich kartěrowarjow,  aby
+        mógli to korigěrowaś. Pśesuń marku ku korektnej poziciji a zapiš pokazku,
+        aby problem rozkładł. (Pšosym njezapódaj wósobinske informacije abo informacije
+        z kórtow šćitanych pśez awtorske pšawo abo lisćiny zarědnikow.)
+      add: Pokazku pśidaś
   javascripts:
     close: Zacyniś
     share:
@@ -1946,21 +1959,6 @@ dsb:
     changesets:
       show:
         comment: Reagěrowaś
-    notes:
-      new:
-        intro: Sy zmólku wiźeł abo až něco felujo? Informěruj drugich kartěrowarjow,  aby
-          mógli to korigěrowaś. Pśesuń marku ku korektnej poziciji a zapiš pokazku,
-          aby problem rozkładł. (Pšosym njezapódaj wósobinske informacije abo informacije
-          z kórtow šćitanych pśez awtorske pšawo abo lisćiny zarědnikow.)
-        add: Pokazku pśidaś
-      show:
-        anonymous_warning: Toś ta pokazka wopśimujo komentary wót anonymnych wužywarjow,
-          kótarež by měli se njewótwisnje pśeglědaś.
-        hide: Schowaś
-        resolve: Wótbyty
-        reactivate: Znowego aktiwěrowaś
-        comment_and_resolve: Komentěrowaś a cyniś
-        comment: Reagěrowaś
     edit_help: Pśesuń kórtu do městna, kótarež coš wobźěłaś, powětš tam a klikni pótom
       how.
     directions:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 48c88226f..136e545dc 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -473,23 +473,6 @@ el:
       telephone_link: Καλέστε %{phone_number}
       colour_preview: Προεπισκόπηση χρώματος %{colour_value}
       email_link: Email %{email}
-    note:
-      title: 'Σημείωση: %{id}'
-      new_note: Νέα σημείωση
-      description: Περιγραφή
-      open_title: 'Ανοικτή σημείωση #%{note_name}'
-      closed_title: 'Επιλυμένη σημείωση #%{note_name}'
-      hidden_title: 'Κρυφή σημείωση #%{note_name}'
-      opened_by_html: Δημιουργήθηκε από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Δημιουργήθηκε από ανώνυμο χρήστη <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Σχόλιο από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Σχόλιο από ανώνυμο χρήστη <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Επιλύθηκε από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Επιλύθηκε από ανώνυμο χρήστη <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Επανενεργοποιήθηκε από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Επανενεργοποιήθηκε από ανώνυμο χρήστη <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Έγινε κρυφό από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: αναφορά αυτής της σημείωσης
     query:
       title: Πληροφορίες χαρακτηριστικών
       introduction: Κάντε κλικ στον χάρτη για να βρείτε κοντινά χαρακτηριστικά.
@@ -3021,6 +3004,45 @@ el:
       description: Περιγραφή
       created_at: Δημιουργήθηκε στις
       last_changed: Τελευταία αλλαγή
+    show:
+      title: 'Σημείωση: %{id}'
+      description: Περιγραφή
+      open_title: 'Ανοικτή σημείωση #%{note_name}'
+      closed_title: 'Επιλυμένη σημείωση #%{note_name}'
+      hidden_title: 'Κρυφή σημείωση #%{note_name}'
+      opened_by_html: Δημιουργήθηκε από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Δημιουργήθηκε από ανώνυμο χρήστη <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Σχόλιο από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Σχόλιο από ανώνυμο χρήστη <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Επιλύθηκε από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Επιλύθηκε από ανώνυμο χρήστη <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Επανενεργοποιήθηκε από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Επανενεργοποιήθηκε από ανώνυμο χρήστη <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Έγινε κρυφό από τον %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: αναφορά αυτής της σημείωσης
+      anonymous_warning: Αυτό η σημείωση περιλαμβάνει σχόλια από ανώνυμους χρήστες
+        που πρέπει να επαληθεύονται ανεξάρτητα.
+      hide: Απόκρυψη
+      resolve: Επιλύστε
+      reactivate: Επανενεργοποίηση
+      comment_and_resolve: Σχολιάστε και Επιλύστε
+      comment: Σχολιάζω
+      report_link_html: Εάν αυτή η σημείωση περιέχει ευαίσθητες πληροφορίες που πρέπει
+        να αφαιρεθούν, μπορείτε %{link}.
+      other_problems_resolve: Για όλα τα άλλα προβλήματα με τη σημείωση, επιλύστε
+        το μόνοι σας με ένα σχόλιο.
+      other_problems_resolved: Για όλα τα άλλα προβλήματα, αρκεί η επίλυση.
+      disappear_date_html: Αυτή η επιλυμένη σημείωση θα εξαφανιστεί από τον χάρτη
+        στις %{disappear_in}.
+    new:
+      title: Νέα σημείωση
+      intro: Εντοπίσατε λάθος ή κάτι που λείπει; Πείτε το στους άλλους χαρτογράφους
+        ώστε να λυθεί το πρόβλημα. Μετακινείστε το δείκτη στη σωστή θέση και γράψτε
+        μια περιγραφή του προβλήματος ως εξήγηση.
+      advice: Η σημείωση σας είναι δημόσια και μπορεί να χρησιμοποιηθεί για την ενημέρωση
+        του χάρτη, γι'αυτό μην προστέθετε προσωπικές πληροφορίες, ή πληροφορίες από
+        χάρτες που καλύπτονται από πνευματικά δικαιώματα ή καταχωρήσεις καταλόγου.
+      add: Προσθήκη Σημείωσης
   javascripts:
     close: Κλείσιμο
     share:
@@ -3105,30 +3127,6 @@ el:
         unsubscribe: Κατάργηση εγγραφής
         hide_comment: απόκρυψη
         unhide_comment: επανεμφάνιση
-    notes:
-      new:
-        intro: Εντοπίσατε λάθος ή κάτι που λείπει; Πείτε το στους άλλους χαρτογράφους
-          ώστε να λυθεί το πρόβλημα. Μετακινείστε το δείκτη στη σωστή θέση και γράψτε
-          μια περιγραφή του προβλήματος ως εξήγηση.
-        advice: Η σημείωση σας είναι δημόσια και μπορεί να χρησιμοποιηθεί για την
-          ενημέρωση του χάρτη, γι'αυτό μην προστέθετε προσωπικές πληροφορίες, ή πληροφορίες
-          από χάρτες που καλύπτονται από πνευματικά δικαιώματα ή καταχωρήσεις καταλόγου.
-        add: Προσθήκη Σημείωσης
-      show:
-        anonymous_warning: Αυτό η σημείωση περιλαμβάνει σχόλια από ανώνυμους χρήστες
-          που πρέπει να επαληθεύονται ανεξάρτητα.
-        hide: Απόκρυψη
-        resolve: Επιλύστε
-        reactivate: Επανενεργοποίηση
-        comment_and_resolve: Σχολιάστε και Επιλύστε
-        comment: Σχολιάζω
-        report_link_html: Εάν αυτή η σημείωση περιέχει ευαίσθητες πληροφορίες που
-          πρέπει να αφαιρεθούν, μπορείτε %{link}.
-        other_problems_resolve: Για όλα τα άλλα προβλήματα με τη σημείωση, επιλύστε
-          το μόνοι σας με ένα σχόλιο.
-        other_problems_resolved: Για όλα τα άλλα προβλήματα, αρκεί η επίλυση.
-        disappear_date_html: Αυτή η επιλυμένη σημείωση θα εξαφανιστεί από τον χάρτη
-          στις %{disappear_in}.
     edit_help: Μετακινήστε το χάρτη και να κάνετε ζουμ σε μια τοποθεσία που θέλετε
       να επεξεργαστείτε, στη συνέχεια, κάντε κλικ εδώ.
     directions:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 677fafc62..df4ba9d42 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -387,22 +387,6 @@ en-GB:
       wikimedia_commons_link: The %{page} item on Wikimedia Commons
       telephone_link: Call %{phone_number}
       colour_preview: Colour %{colour_value} preview
-    note:
-      title: 'Note: %{id}'
-      new_note: New Note
-      description: Description
-      open_title: 'Unresolved note #%{note_name}'
-      closed_title: 'Resolved note #%{note_name}'
-      hidden_title: 'Hidden note #%{note_name}'
-      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>
     query:
       title: Query Features
       introduction: Click on the map to find nearby features.
@@ -2274,6 +2258,36 @@ en-GB:
       description: Description
       created_at: Created at
       last_changed: Last changed
+    show:
+      title: 'Note: %{id}'
+      description: Description
+      open_title: 'Unresolved note #%{note_name}'
+      closed_title: 'Resolved note #%{note_name}'
+      hidden_title: 'Hidden note #%{note_name}'
+      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>
+      anonymous_warning: This note includes comments from anonymous users which should
+        be independently verified.
+      hide: Hide
+      resolve: Resolve
+      reactivate: Reactivate
+      comment_and_resolve: Comment & Resolve
+      comment: Comment
+    new:
+      title: New Note
+      intro: Spotted a mistake or something missing? Let other mappers know so we
+        can fix it. Move the marker to the correct position and type a note to explain
+        the problem.
+      advice: Your note is public and may be used to update the map, so don't enter
+        personal information or information from copyrighted maps or directory listings.
+      add: Add Note
   javascripts:
     close: Close
     share:
@@ -2337,22 +2351,6 @@ en-GB:
         unsubscribe: Unsubscribe
         hide_comment: hide
         unhide_comment: unhide
-    notes:
-      new:
-        intro: Spotted a mistake or something missing? Let other mappers know so we
-          can fix it. Move the marker to the correct position and type a note to explain
-          the problem.
-        advice: Your note is public and may be used to update the map, so don't enter
-          personal information or information from copyrighted maps or directory listings.
-        add: Add Note
-      show:
-        anonymous_warning: This note includes comments from anonymous users which
-          should be independently verified.
-        hide: Hide
-        resolve: Resolve
-        reactivate: Reactivate
-        comment_and_resolve: Comment & Resolve
-        comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index d3ec3e21b..8cba03ffe 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -450,24 +450,6 @@ eo:
       telephone_link: Telefoni %{phone_number}
       colour_preview: Antaŭvido de koloro “%{colour_value}”
       email_link: Sendi retleteron al %{email}
-    note:
-      title: 'Rimarko: %{id}'
-      new_note: Nova rimarko
-      description: Priskribo
-      open_title: 'Nesolvita rimarko #%{note_name}'
-      closed_title: 'Solvita rimarko #%{note_name}'
-      hidden_title: 'Kaŝita rimarko #%{note_name}'
-      opened_by_html: Kreita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Kreita de anonimulo <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Komento de %{user} de <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Anonima komento de <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Solvita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Solvita de anonimulo <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Remalfermita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Remalfermita de anonimulo <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Kaŝita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: raporti tiun ĉi rimarkon
-      coordinates_html: '%{latitude}; %{longitude}'
     query:
       title: Informoj pri objektoj
       introduction: Alklaku la mapon por trovi proksimajn objektojn.
@@ -2925,6 +2907,45 @@ eo:
       description: Priskribo
       created_at: Kreita je
       last_changed: Laste ŝanĝita
+    show:
+      title: 'Rimarko: %{id}'
+      description: Priskribo
+      open_title: 'Nesolvita rimarko #%{note_name}'
+      closed_title: 'Solvita rimarko #%{note_name}'
+      hidden_title: 'Kaŝita rimarko #%{note_name}'
+      opened_by_html: Kreita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Kreita de anonimulo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Komento de %{user} de <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Anonima komento de <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Solvita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Solvita de anonimulo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Remalfermita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Remalfermita de anonimulo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Kaŝita de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: raporti tiun ĉi rimarkon
+      coordinates_html: '%{latitude}; %{longitude}'
+      anonymous_warning: Ĉi tiu rimarko enhavas komentojn de anonimuloj, kiuj devas
+        esti kontrolitaj sendepende.
+      hide: Kaŝi
+      resolve: Solvi
+      reactivate: Remalfermi
+      comment_and_resolve: Komenti kaj solvi
+      comment: Komenti
+      report_link_html: Se tiu ĉi rimarko enhavas privatajn informojn, kiuj ne devas
+        esti publikigitaj, vi povas %{link}.
+      other_problems_resolve: Koncerne al ĉiuj aliaj problemoj pri la rimarko, solvu
+        ilin mem kaj skribi komenton.
+      other_problems_resolved: Koncerne ĉiuj aliaj problemoj, solvu la rimarkon.
+      disappear_date_html: Tiu ĉi solvita rimarko malaperos el la mapo post %{disappear_in}.
+    new:
+      title: Nova rimarko
+      intro: Ĉu vi rimarkis eraron aŭ io mankas? Sciigu aliajn mapigistojn, por ili
+        povos ripari tion. Movu la markon al la respektivan pozicion kaj enmetu la
+        rimarkon priskribantan la problemon.
+      advice: Via rimarko estas publika kaj povas esti uzita por ĝisdatigi la mapon,
+        do ne enmetu privatajn informojn kaj informojn el kopirajtaj mapoj aÅ­ aliaj
+        datumbazoj.
+      add: Aldoni rimarkon
   javascripts:
     close: Fermi
     share:
@@ -3006,29 +3027,6 @@ eo:
         unsubscribe: Malobservi
         hide_comment: kaŝi
         unhide_comment: malkaŝi
-    notes:
-      new:
-        intro: Ĉu vi rimarkis eraron aŭ io mankas? Sciigu aliajn mapigistojn, por
-          ili povos ripari tion. Movu la markon al la respektivan pozicion kaj enmetu
-          la rimarkon priskribantan la problemon.
-        advice: Via rimarko estas publika kaj povas esti uzita por ĝisdatigi la mapon,
-          do ne enmetu privatajn informojn kaj informojn el kopirajtaj mapoj aÅ­ aliaj
-          datumbazoj.
-        add: Aldoni rimarkon
-      show:
-        anonymous_warning: Ĉi tiu rimarko enhavas komentojn de anonimuloj, kiuj devas
-          esti kontrolitaj sendepende.
-        hide: Kaŝi
-        resolve: Solvi
-        reactivate: Remalfermi
-        comment_and_resolve: Komenti kaj solvi
-        comment: Komenti
-        report_link_html: Se tiu ĉi rimarko enhavas privatajn informojn, kiuj ne devas
-          esti publikigitaj, vi povas %{link}.
-        other_problems_resolve: Koncerne al ĉiuj aliaj problemoj pri la rimarko, solvu
-          ilin mem kaj skribi komenton.
-        other_problems_resolved: Koncerne ĉiuj aliaj problemoj, solvu la rimarkon.
-        disappear_date_html: Tiu ĉi solvita rimarko malaperos el la mapo post %{disappear_in}.
     edit_help: Movu la mapon kaj pligrandigu al loko kiun vi volas redakti, kaj poste
       alklaku tie ĉi.
     directions:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d38c33655..431460251 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -522,23 +522,6 @@ es:
       telephone_link: Llamar al %{phone_number}
       colour_preview: Vista previa del color %{colour_value}
       email_link: Correo electrónico %{email}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nota nueva
-      description: Descripción
-      open_title: 'Nota sin resolver #%{note_name}'
-      closed_title: 'Nota resuelta #%{note_name}'
-      hidden_title: 'Nota oculta #%{note_name}'
-      opened_by_html: Creado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Creado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comentario de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comentario de anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resuelto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resuelto por anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reactivado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reactivado por anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Oculto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: denunciar esta nota
     query:
       title: Consultar elementos
       introduction: Pulse en el mapa para encontrar elementos cercanos.
@@ -3057,6 +3040,44 @@ es:
       description: Descripción
       created_at: Creado el
       last_changed: Última modificación
+    show:
+      title: 'Nota: %{id}'
+      description: Descripción
+      open_title: 'Nota sin resolver #%{note_name}'
+      closed_title: 'Nota resuelta #%{note_name}'
+      hidden_title: 'Nota oculta #%{note_name}'
+      opened_by_html: Creado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Creado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comentario de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comentario de anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resuelto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resuelto por anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivado por anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Oculto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: denunciar esta nota
+      anonymous_warning: Esta nota incluye comentarios de usuarios anónimos que deben
+        ser verificados de forma independiente.
+      hide: Ocultar
+      resolve: Resolver
+      reactivate: Reactivar
+      comment_and_resolve: Comentar y resolver
+      comment: Comentar
+      report_link_html: Si esta nota contiene información sensible que debe ser eliminada,
+        puede %{link}.
+      other_problems_resolve: Para todos los demás problemas con la nota, resuélvalo
+        con un comentario.
+      other_problems_resolved: Para todos los demás problemas, la resolución es suficiente.
+      disappear_date_html: Esta nota resuelta desaparecerá del mapa en %{disappear_in}.
+    new:
+      title: Nota nueva
+      intro: ¿Detectó un error o falta algo? Informe a otros mapeadores para que podamos
+        solucionarlo. Mueva el marcador a la posición correcta y escriba una nota
+        para explicar el problema.
+      advice: La nota será pública y podría utilizarse para actualizar el mapa, así
+        que no des información personal ni datos provenientes de mapas o catálogos
+        protegidos por derechos de autor.
+      add: Añadir nota
   javascripts:
     close: Cerrar
     share:
@@ -3139,30 +3160,6 @@ es:
         unsubscribe: Cancelar suscripción
         hide_comment: ocultar
         unhide_comment: mostrar
-    notes:
-      new:
-        intro: ¿Detectó un error o falta algo? Informe a otros mapeadores para que
-          podamos solucionarlo. Mueva el marcador a la posición correcta y escriba
-          una nota para explicar el problema.
-        advice: La nota será pública y podría utilizarse para actualizar el mapa,
-          así que no des información personal ni datos provenientes de mapas o catálogos
-          protegidos por derechos de autor.
-        add: Añadir nota
-      show:
-        anonymous_warning: Esta nota incluye comentarios de usuarios anónimos que
-          deben ser verificados de forma independiente.
-        hide: Ocultar
-        resolve: Resolver
-        reactivate: Reactivar
-        comment_and_resolve: Comentar y resolver
-        comment: Comentar
-        report_link_html: Si esta nota contiene información sensible que debe ser
-          eliminada, puede %{link}.
-        other_problems_resolve: Para todos los demás problemas con la nota, resuélvalo
-          con un comentario.
-        other_problems_resolved: Para todos los demás problemas, la resolución es
-          suficiente.
-        disappear_date_html: Esta nota resuelta desaparecerá del mapa en %{disappear_in}.
     edit_help: Mueva el mapa el mapa y acerca a una ubicación que desees editar, luego
       haga clic aquí.
     directions:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 22458a271..3a9e245e8 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -23,7 +23,7 @@ et:
       prompt: Vali fail
     submit:
       diary_comment:
-        create: Salvesta
+        create: Kommenteeri
       diary_entry:
         create: Avalda
       issue_comment:
@@ -94,6 +94,7 @@ et:
       diary_entry:
         user: Kasutaja
         title: Teema
+        body: Kehatekst
         latitude: Laius
         longitude: Pikkus
         language_code: Keel
@@ -407,23 +408,6 @@ et:
       wikidata_link: '%{page} Wikidatas'
       wikipedia_link: Artikkel %{page} Vikipeedias
       telephone_link: Helista %{phone_number}
-    note:
-      title: 'Märkus: %{id}'
-      new_note: Uus märkus
-      description: Kirjeldus
-      open_title: 'Lahendamata märkus: #%{note_name}'
-      closed_title: 'Lahendatud märkus: #%{note_name}'
-      hidden_title: 'Peidetud märkus #%{note_name}'
-      opened_by_html: Loonud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Loonud anonüümne kasutaja <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Kommentaar kasutajalt %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentaar anonüümselt kasutajalt <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Lahendanud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Lahendanud anonüümne kasutaja <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Taasaktiveerinud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Taasaktiveerinud anonüümne kasutaja <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Peitnud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: sellest märkusest teada anda
     query:
       title: Info objektide kohta
       introduction: Klõpsa kaardil, et leida läheduses asuvad objektid.
@@ -1808,29 +1792,29 @@ et:
           construction: Ehitatavad teed
     welcome:
       title: Tere tulemast!
-      introduction_html: Tere tulemast OpenStreetMappi, vabasse ja muudetavasse maailmakaarti.
-        Registreerumine on nüüd tehtud ja sa võid alustada kaardistamist. Siin on
-        lühiülevaade kõige olulisematest asjadest, mida peaksid teadma.
+      introduction_html: Tere tulemast OpenStreetMapi, vabasse ja muudetavasse maailmakaarti.
+        Registreerumine on nüüd tehtud ja võid alustada kaardistamist. Siin on lühiülevaade
+        kõige olulisematest asjadest, mida peaksid teadma.
       whats_on_the_map:
         title: Mis on kaardil?
-        on_html: OpenStreetMap on koht, kus saab kaardile kanda objekte mis on <em>reaalselt
-          antud hetkel olemas</em> - nendeks on miljonid hooned, teed ja muud üksikasjad.
-          Sa võid kaardile kanda suvalisi reaalselt eksisteerivaid üksikasju, mis
-          sulle huvi pakuvad.
-        off_html: Kaart <em>ei sisalda</em> arvamuslikke andmeid, nagu näiteks hinnangud,
-          ajaloolisi või hüpoteetilisi omadusi, ega andmeid autoriõigustega kaitstud
-          allikatest. Kui sul puudub eriluba siis ära kopeeri võrgus olevatelt või
-          paberkaartidelt.
+        on_html: |-
+          OpenStreetMap on koht, kus saab kaardile kanda objekte, mis on <em>praegu päriselt olemas</em>.
+          Need on miljonid hooned, teed ja muud kohti puudutavad üksikasjad.
+          Võid kaardile kanda looduses leiduvaid mis tahes objekte, mis sulle huvi pakuvad.
+        off_html: |-
+          Kaart <em>ei sisalda</em> seisukohti väljendavaid andmed nagu hinnangud, ajaloolisi
+          ega oletuslikke objekte ega andmeid autoriõigusega kaitstud allikatest. Kui sul
+          puudub eriluba, siis ära kopeeri veebi- ega paberkaartidelt.
       basic_terms:
         title: Põhilised mõisted kaardistamisel
         paragraph_1_html: OpenStreetMapil on omad erialased mõisted. Siin on mõned
           peamised mõisted, mida tasub meelde jätta.
         editor_html: <strong>Redaktor</strong> on programm või veebileht, mida saab
           kasutada kaardi redigeerimiseks.
-        node_html: <strong>Sõlm</strong> on punkt kaardil, nagu näiteks restoran või
-          puu.
-        way_html: <strong>Joon</strong> on joon või ala ja tähistab näiteks teed,
-          oja, järve või hoonet.
+        node_html: <strong>Sõlm</strong> on kaardil punkt, mis tähistab näiteks restorani
+          või puud.
+        way_html: <strong>Joon</strong> tähistab joonobjekti või ala nagu tee, oja,
+          järv või hoone.
         tag_html: <strong>Silt</strong> sisaldab väikest hulka andmeid sõlme või joone
           kohta, näiteks restorani nime või tee kiiruspiirangut.
       rules:
@@ -2336,6 +2320,42 @@ et:
       description: Kirjeldus
       created_at: Loodud
       last_changed: Viimati muudetud
+    show:
+      title: 'Märkus: %{id}'
+      description: Kirjeldus
+      open_title: 'Lahendamata märkus: #%{note_name}'
+      closed_title: 'Lahendatud märkus: #%{note_name}'
+      hidden_title: 'Peidetud märkus #%{note_name}'
+      opened_by_html: Loonud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Loonud anonüümne kasutaja <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Kommentaar kasutajalt %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentaar anonüümselt kasutajalt <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Lahendanud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Lahendanud anonüümne kasutaja <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Taasaktiveerinud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Taasaktiveerinud anonüümne kasutaja <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Peitnud %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: sellest märkusest teada anda
+      anonymous_warning: See märkus sisaldab anonüümsete kasutajate kommentaare, mis
+        tuleks eraldi üle kontrollida.
+      hide: Peida
+      resolve: Lahenda
+      reactivate: Aktiveeri uuesti
+      comment_and_resolve: Kommenteeri ja lahenda
+      comment: Kommenteeri
+      report_link_html: Kui see märkus sisaldab tundlikku teavet, mis tuleks eemaldada,
+        saad %{link}.
+      other_problems_resolve: Kõigi märkusega seotud muude probleemide korral lahenda
+        see ise kommentaariga.
+    new:
+      title: Uus märkus
+      intro: Kas märkasid viga või midagi, mis vajab täiendamist? Anna sellest teistele
+        kaardistajatele teada, et nad saaksid seda parandada. Lohista marker õigele
+        kohale ja kirjuta märkus, et probleemi selgitada.
+      advice: Märkus on avalik ja seda võidakse kasutada kaardi uuendamiseks. Seega
+        palun ära kirjuta siia isiklikku teavet ega teavet autoriõigustega kaitstud
+        kaartidelt ega kataloogiloenditest.
+      add: Lisa märkus
   javascripts:
     close: Sulge
     share:
@@ -2401,27 +2421,6 @@ et:
         unsubscribe: Lõpeta tellimus
         hide_comment: peida
         unhide_comment: nähtavale
-    notes:
-      new:
-        intro: Kas märkasid viga või midagi, mis vajab täiendamist? Anna sellest teistele
-          kaardistajatele teada, et nad saaksid seda parandada. Lohista marker õigele
-          kohale ja kirjuta märkus, et probleemi selgitada.
-        advice: Märkus on avalik ja seda võidakse kasutada kaardi uuendamiseks. Seega
-          palun ära kirjuta siia isiklikku teavet ega teavet autoriõigustega kaitstud
-          kaartidelt ega kataloogiloenditest.
-        add: Lisa märkus
-      show:
-        anonymous_warning: See märkus sisaldab anonüümsete kasutajate kommentaare,
-          mis tuleks eraldi üle kontrollida.
-        hide: Peida
-        resolve: Lahenda
-        reactivate: Aktiveeri uuesti
-        comment_and_resolve: Kommenteeri ja lahenda
-        comment: Kommenteeri
-        report_link_html: Kui see märkus sisaldab tundlikku teavet, mis tuleks eemaldada,
-          saad %{link}.
-        other_problems_resolve: Kõigi märkusega seotud muude probleemide korral lahenda
-          see ise kommentaariga.
     edit_help: Nihuta kaarti ja suumi sisse asukohta mida soovid redigeerida ja seejärel
       kliki siia.
     directions:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 39305d128..9a7866af4 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -449,30 +449,6 @@ eu:
       wikimedia_commons_link: '%{page} elementua Wikimedia Commons-en'
       telephone_link: Deitu %{phone_number} zenbakira
       colour_preview: '%{colour_value} kolore aurrikuspena'
-    note:
-      title: 'Oharra: %{id}'
-      new_note: Ohar berria
-      description: Deskribapena
-      open_title: 'Konpondugabeko #%{note_name} oharra'
-      closed_title: 'Konpondutako #%{note_name} oharra'
-      hidden_title: 'Ezkutatuko #%{note_name} oharra'
-      opened_by_html: '%{user} erabiltzaileak duela <abbr title=''%{exact_time}''>%{when}</abbr>
-        sortua'
-      opened_by_anonymous_html: Erabiltzaile ezezagun batek duela <abbr title='%{exact_time}'>%{when}</abbr>
-        sortua
-      commented_by_html: '%{user} erabiltzaileak duela <abbr title=''%{exact_time}''>%{when}</abbr>
-        egindako iruzkina'
-      commented_by_anonymous_html: Erabiltzaile ezezagun batek duela <abbr title='%{exact_time}'>%{when}
-        </abbr> egindako iruzkina
-      closed_by_html: '%{user} erabiltzaileak duela <abbr title=''%{exact_time}''>%{when}
-        </abbr> konpondua'
-      closed_by_anonymous_html: Erabiltzaile ezezagun batek duela <abbr title='%{exact_time}'>%{when}
-        </abbr> konpondua
-      reopened_by_html: '%{user} erabiltzaileak duela <abbr title=''%{exact_time}''>%{when}
-        </abbr> berraktibatua'
-      reopened_by_anonymous_html: Ezezagun batek berraktibatua duela <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: '%{user} erabiltzaileak ezkutatua duela <abbr title=''%{exact_time}''>%{when}</abbr>'
-      report: Reportatu ohar hau
     query:
       title: Eskaeraren ezaugarriak
       introduction: Egin klik mapan hurbileko ezaugarriak aurkitzeko.
@@ -2903,6 +2879,48 @@ eu:
       description: Deskribapena
       created_at: 'Non sortua:'
       last_changed: Azkenik aldaketua
+    show:
+      title: 'Oharra: %{id}'
+      description: Deskribapena
+      open_title: 'Konpondugabeko #%{note_name} oharra'
+      closed_title: 'Konpondutako #%{note_name} oharra'
+      hidden_title: 'Ezkutatuko #%{note_name} oharra'
+      opened_by_html: '%{user} erabiltzaileak duela <abbr title=''%{exact_time}''>%{when}</abbr>
+        sortua'
+      opened_by_anonymous_html: Erabiltzaile ezezagun batek duela <abbr title='%{exact_time}'>%{when}</abbr>
+        sortua
+      commented_by_html: '%{user} erabiltzaileak duela <abbr title=''%{exact_time}''>%{when}</abbr>
+        egindako iruzkina'
+      commented_by_anonymous_html: Erabiltzaile ezezagun batek duela <abbr title='%{exact_time}'>%{when}
+        </abbr> egindako iruzkina
+      closed_by_html: '%{user} erabiltzaileak duela <abbr title=''%{exact_time}''>%{when}
+        </abbr> konpondua'
+      closed_by_anonymous_html: Erabiltzaile ezezagun batek duela <abbr title='%{exact_time}'>%{when}
+        </abbr> konpondua
+      reopened_by_html: '%{user} erabiltzaileak duela <abbr title=''%{exact_time}''>%{when}
+        </abbr> berraktibatua'
+      reopened_by_anonymous_html: Ezezagun batek berraktibatua duela <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: '%{user} erabiltzaileak ezkutatua duela <abbr title=''%{exact_time}''>%{when}</abbr>'
+      report: Reportatu ohar hau
+      anonymous_warning: Ohar honek independenteak izan behar diren erabiltzaile anonimoen
+        iruzkinak barne hartzen ditu.
+      hide: Ezkutatu
+      resolve: Konpondu
+      reactivate: Berriz aktibatu
+      comment_and_resolve: Utzi iruzkina eta Konpondu
+      comment: Iruzkina
+      report_link_html: 'Ohar honek ezabatu beharreko informazio sentikorra badu,
+        hau egin dezakezu: %{link}. Oharraren gainontzeko arazo guztientzat, mesedez
+        konpondu zuk zeuk iruzkin batekin.'
+    new:
+      title: Ohar berria
+      intro: Akats bat edo zerbait falta zaizula ikusi duzu? Utzi beste mapa editatzaileek
+        jakin dezaten, beraz konpon dezakegun. Mugitu markatzailea posizio egokira
+        eta idatzi ohar bat arazoa azaltzeko.
+      advice: "Zure oharra publikoa da eta mapa eguneratzeko erabili daiteke. Horregatik,
+        ez sartu informazio pertsonala edo \ncopyright-dun mapei edo direktorio zerrendei
+        buruzko informaziorik."
+      add: Gehitu oharra
   javascripts:
     close: Itxi
     share:
@@ -2986,26 +3004,6 @@ eu:
         unsubscribe: Harpidetza kendu
         hide_comment: ezkutatu
         unhide_comment: erakutsi
-    notes:
-      new:
-        intro: Akats bat edo zerbait falta zaizula ikusi duzu? Utzi beste mapa editatzaileek
-          jakin dezaten, beraz konpon dezakegun. Mugitu markatzailea posizio egokira
-          eta idatzi ohar bat arazoa azaltzeko.
-        advice: "Zure oharra publikoa da eta mapa eguneratzeko erabili daiteke. Horregatik,
-          ez sartu informazio pertsonala edo \ncopyright-dun mapei edo direktorio
-          zerrendei buruzko informaziorik."
-        add: Gehitu oharra
-      show:
-        anonymous_warning: Ohar honek independenteak izan behar diren erabiltzaile
-          anonimoen iruzkinak barne hartzen ditu.
-        hide: Ezkutatu
-        resolve: Konpondu
-        reactivate: Berriz aktibatu
-        comment_and_resolve: Utzi iruzkina eta Konpondu
-        comment: Iruzkina
-        report_link_html: 'Ohar honek ezabatu beharreko informazio sentikorra badu,
-          hau egin dezakezu: %{link}. Oharraren gainontzeko arazo guztientzat, mesedez
-          konpondu zuk zeuk iruzkin batekin.'
     edit_help: Mugitu mapa eta zooma editatu nahi duzun kokaleku batean erabili, gero
       klik hemen egin.
     directions:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 592e06e04..4338586cd 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -465,30 +465,6 @@ fa:
       wikimedia_commons_link: آیتم %{page} در ویکی‌انبار
       telephone_link: ' تماس با %{phone_number}'
       colour_preview: پیش‌نمایش رنگ %{colour_value}
-    note:
-      title: 'یادداشت: %{id}'
-      new_note: یادداشت تازه
-      description: توضیحات
-      open_title: 'یادداشت حل‌نشده #%{note_name}'
-      closed_title: 'یادداشت حل‌شده #%{note_name}'
-      hidden_title: 'یادداشت پنهان #%{note_name}'
-      opened_by_html: <abbr title='%{exact_time}'>%{when} </abbr> %{user} آن را ایجاد
-        کرد
-      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> فرد گمنام
-        آن را ایجاد کرد.
-      commented_by_html: نظر از %{user}،‏ <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: نظر از گمنام، <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} آن را حل
-        کرد
-      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> فرد گمنام
-        آن را حل کرد
-      reopened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} دوباره
-        آن را فعال کرد
-      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> فرد گمنام
-        دوباره آن را فعال کرد
-      hidden_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} آن را مخفی
-        کرد
-      report: این یادداشت را گزارش کنید
     query:
       title: پرس‌وجوی عارضه‌ها
       introduction: روی نقشه کلیک کنید تا عارضه‌های نزدیک را بیابید
@@ -2848,6 +2824,47 @@ fa:
       description: شرح
       created_at: ایجادشده در
       last_changed: آخرین تغییر
+    show:
+      title: 'یادداشت: %{id}'
+      description: توضیحات
+      open_title: 'یادداشت حل‌نشده #%{note_name}'
+      closed_title: 'یادداشت حل‌شده #%{note_name}'
+      hidden_title: 'یادداشت پنهان #%{note_name}'
+      opened_by_html: <abbr title='%{exact_time}'>%{when} </abbr> %{user} آن را ایجاد
+        کرد
+      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> فرد گمنام
+        آن را ایجاد کرد.
+      commented_by_html: نظر از %{user}،‏ <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: نظر از گمنام، <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} آن را حل
+        کرد
+      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> فرد گمنام
+        آن را حل کرد
+      reopened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} دوباره
+        آن را فعال کرد
+      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> فرد گمنام
+        دوباره آن را فعال کرد
+      hidden_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} آن را مخفی
+        کرد
+      report: این یادداشت را گزارش کنید
+      anonymous_warning: این یادداشت حاوی نظر کاربران گمنام است و باید به‌طور مستقل
+        راستی‌آزمایی شود.
+      hide: نهفتن
+      resolve: حل شد
+      reactivate: فعال‌سازی مجدد
+      comment_and_resolve: نظر + حل شد
+      comment: نظر
+      report_link_html: اگر این یادداشت حاوی اطلاعات حساسی است که باید حذف شود، می‌توانید
+        %{link}. برای سایر مشکلات مربوط به این یادداشت لطفاً خودتان همراه با نوشتن
+        نظر آن را حل کنید.
+    new:
+      title: یادداشت تازه
+      intro: مشکلی بر روی نقشه پیدا کرده‌اید یا چیزی از قلم افتاده؟ به نقشه‌کش‌های
+        دیگر اطلاع دهید تا آن را اصلاح کنند. نشانه را بر روی محلی که مشکل دارد قرار
+        دهید و با نوشتن یادداشت، مشکل را به‌طور کامل شرح دهید.
+      advice: همهٔ افراد این یادداشت شما را می‌بینند. بنابراین اطلاعات خصوصی یا اطلاعات
+        برداشت‌شده از منابع دارای حق نشر را اینجا ننویسید.
+      add: افزودن یادداشت
   javascripts:
     close: بستن
     share:
@@ -2928,25 +2945,6 @@ fa:
         unsubscribe: لغو اشتراک
         hide_comment: نهفتن
         unhide_comment: نمایش
-    notes:
-      new:
-        intro: مشکلی بر روی نقشه پیدا کرده‌اید یا چیزی از قلم افتاده؟ به نقشه‌کش‌های
-          دیگر اطلاع دهید تا آن را اصلاح کنند. نشانه را بر روی محلی که مشکل دارد قرار
-          دهید و با نوشتن یادداشت، مشکل را به‌طور کامل شرح دهید.
-        advice: همهٔ افراد این یادداشت شما را می‌بینند. بنابراین اطلاعات خصوصی یا
-          اطلاعات برداشت‌شده از منابع دارای حق نشر را اینجا ننویسید.
-        add: افزودن یادداشت
-      show:
-        anonymous_warning: این یادداشت حاوی نظر کاربران گمنام است و باید به‌طور مستقل
-          راستی‌آزمایی شود.
-        hide: نهفتن
-        resolve: حل شد
-        reactivate: فعال‌سازی مجدد
-        comment_and_resolve: نظر + حل شد
-        comment: نظر
-        report_link_html: اگر این یادداشت حاوی اطلاعات حساسی است که باید حذف شود،
-          می‌توانید %{link}. برای سایر مشکلات مربوط به این یادداشت لطفاً خودتان همراه
-          با نوشتن نظر آن را حل کنید.
     edit_help: نقشه را جابه‌جا کنید و روی مکانی که می‌خواهید ویرایش نمایید بزرگ‌نمایی
       کنید. سپس اینجا کلیک کنید.
     directions:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 395957a53..656da25ca 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -145,6 +145,7 @@ fi:
       diary_entry:
         user: Käyttäjä
         title: Aihe
+        body: Sisältö
         latitude: Leveyspiiri
         longitude: Pituuspiiri
         language_code: Kieli
@@ -474,23 +475,6 @@ fi:
       telephone_link: Soita %{phone_number}
       colour_preview: Värin %{colour_value} esikatselu
       email_link: Sähköposti %{email}
-    note:
-      title: 'Karttailmoitus: %{id}'
-      new_note: Uusi karttailmoitus
-      description: Kuvaus
-      open_title: 'Ratkaisematon karttailmoitus #%{note_name}'
-      closed_title: 'Ratkaistu karttailmoitus #%{note_name}'
-      hidden_title: 'Piilotettu karttailmoitus #%{note_name}'
-      opened_by_html: Lähettänyt käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Luonut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Kommentti käyttäjältä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentti tuntemattomalta käyttäjältä <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Ratkaissut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Ratkaissut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Avannut uudelleen käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Avannut uudelleen tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Piilottanut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: ilmianna karttailmoitus
     query:
       title: Ominaisuuskysely
       introduction: Napsauta karttaa löytääksesi lähistön karttakohteita.
@@ -565,7 +549,7 @@ fi:
       title: Uusi päiväkirjamerkintä
     form:
       location: Sijainti
-      use_map_link: Käytä Karttaa
+      use_map_link: Käytä karttaa
     index:
       title: Käyttäjien päiväkirjamerkinnät
       title_friends: Kaverien päiväkirjat
@@ -644,6 +628,10 @@ fi:
         create:
           notice: Sovellus rekisteröity.
   errors:
+    contact:
+      contact: Ota yhteyttä
+      contact_the_community_html: '%{contact_link} OpenStreetMap-yhteisöön, jos olet
+        löytänyt rikkinäisen linkin / virheen. Kirjoita muistiin pyyntösi tarkka URL-osoite.'
     forbidden:
       title: Kielletty
       description: OpenStreetMap-palvelimella pyytämäsi toiminto on vain järjestelmänvalvojien
@@ -833,6 +821,7 @@ fi:
           chapel: Kappeli
           church: Kirkkorakennus
           civic: Julkinen rakennus
+          college: Yliopistorakennus
           commercial: Liikerakennus
           construction: Rakenteilla oleva rakennus
           detached: Omakotitalo
@@ -1916,6 +1905,7 @@ fi:
       logout_button: Kirjaudu ulos
     suspended_flash:
       suspended: Valitettavasti tilisi on jäädytetty epäilyttävän toiminnan vuoksi.
+      contact_support_html: Ota yhteyttä %{support_link}, jos haluat keskustella tästä.
       support: tuki
   shared:
     markdown_help:
@@ -2084,12 +2074,12 @@ fi:
           (esimerkiksi Google-kartoista tai paperikartoista) ilman tekijänoikeuden haltijan nimenomaista lupaa on kielletty.
         infringement_2_html: Jos kuka tahansa OpenStreetMapin käyttäjä epäilee, että
           karttatietoja on otettu luvattomasta lähteestä OpenStreetMapin karttatietoihin
-          tai sivustolle, siitä tulee tehdä <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">poistopyyntö</a>
+          tai sivustolle, siitä tulee tehdä <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">poistopyyntö</a>
           tai <a href="https://dmca.openstreetmap.org/">ilmoittaa suoraan</a>.
         trademarks_title_html: <span id="trademarks"></span>Tavaramerkit
-        trademarks_1_html: OpenStreetMap, suurennuslasilogo ja maailmankarttalogo
-          ovat OpenStreetMap-säätiön rekisteröityjä tavaramerkkejä. Tutustu ohjeeseen
-          <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">tavaramerkkien
+        trademarks_1_html: OpenStreetMap, suurennuslasilogo ja State of the Map ovat
+          OpenStreetMap-säätiön rekisteröityjä tavaramerkkejä. Tutustu ohjeeseen <a
+          href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">tavaramerkkien
           käytöstä.</a>
     index:
       js_1: Selain ei tue JavaScriptiä tai sen suorittaminen on estetty.
@@ -2462,6 +2452,7 @@ fi:
       all_traces: Kaikki jäljet
       my_traces: Omat jäljet
       traces_from: Julkiset jäljet käyttäjältä %{user}
+      remove_tag_filter: Poista tunnistesuodatin
     destroy:
       scheduled_for_deletion: Jälki on poistojonossa.
     make_public:
@@ -2596,6 +2587,8 @@ fi:
       client_secret_warning: Varmista, että tallennat tämän salaisuuden - et näe sitä
         enää uudelleen
       permissions: Oikeudet
+    not_found:
+      sorry: Valitettavasti sovellusta ei löytynyt.
   oauth2_authorizations:
     new:
       title: Valtuutus vaaditaan
@@ -2899,6 +2892,40 @@ fi:
       description: Kuvaus
       created_at: Luotu
       last_changed: Viimeksi muutettu
+    show:
+      title: 'Karttailmoitus: %{id}'
+      description: Kuvaus
+      open_title: 'Ratkaisematon karttailmoitus #%{note_name}'
+      closed_title: 'Ratkaistu karttailmoitus #%{note_name}'
+      hidden_title: 'Piilotettu karttailmoitus #%{note_name}'
+      opened_by_html: Lähettänyt käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Luonut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Kommentti käyttäjältä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentti tuntemattomalta käyttäjältä <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Ratkaissut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Ratkaissut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Avannut uudelleen käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Avannut uudelleen tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Piilottanut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: ilmianna karttailmoitus
+      anonymous_warning: Suhtaudu varauksella tunnistautumattomien käyttäjien karttailmoituksiin
+        ja kommentteihin.
+      hide: Piilota
+      resolve: Ratkaise
+      reactivate: Avaa uudelleen
+      comment_and_resolve: Kommentoi + ratkaise
+      comment: Kommentoi
+      report_link_html: Jos tämä huomautus sisältää arkaluontoisia tietoja, jotka
+        on poistettava, voit %{link}.
+    new:
+      title: Uusi karttailmoitus
+      intro: Huomasitko virheen tai puuttuvan kohteen? Ilmoita siitä muille kartoittajille,
+        jolloin virhe voidaan korjata. Siirrä merkkipiste oikeaan kohtaan ja kirjoita
+        selite ongelmasta.
+      advice: Merkintä näkyy julkisesti kaikille, älä kirjoita henkilökohtaisia tietoja.
+        Aineistoa kehitetään palautteen perusteella, minkä takia älä käytä lähteenä
+        muita karttoja tai hakemistoja.
+      add: Lähetä ilmoitus
   javascripts:
     close: Sulje
     share:
@@ -2978,25 +3005,6 @@ fi:
         unsubscribe: Lopeta tilaus
         hide_comment: piilota
         unhide_comment: näytä
-    notes:
-      new:
-        intro: Huomasitko virheen tai puuttuvan kohteen? Ilmoita siitä muille kartoittajille,
-          jolloin virhe voidaan korjata. Siirrä merkkipiste oikeaan kohtaan ja kirjoita
-          selite ongelmasta.
-        advice: Merkintä näkyy julkisesti kaikille, älä kirjoita henkilökohtaisia
-          tietoja. Aineistoa kehitetään palautteen perusteella, minkä takia älä käytä
-          lähteenä muita karttoja tai hakemistoja.
-        add: Lähetä ilmoitus
-      show:
-        anonymous_warning: Suhtaudu varauksella tunnistautumattomien käyttäjien karttailmoituksiin
-          ja kommentteihin.
-        hide: Piilota
-        resolve: Ratkaise
-        reactivate: Avaa uudelleen
-        comment_and_resolve: Kommentoi + ratkaise
-        comment: Kommentoi
-        report_link_html: Jos tämä huomautus sisältää arkaluontoisia tietoja, jotka
-          on poistettava, voit %{link}.
     edit_help: Siirrä ja lähennä kartta muokattavaan paikkaan ja napsauta sitten tästä.
     directions:
       ascend: Nousu
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 24b03284e..149d9e30f 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -303,23 +303,6 @@ fit:
       wikimedia_commons_link: '%{page} Wikimeetia Commonsissa'
       telephone_link: Soita %{phone_number}
       colour_preview: Värin %{colour_value} esikattelu
-    note:
-      title: 'Karttailmoitus: %{id}'
-      new_note: Uusi karttailmoitus
-      description: Kuvvaus
-      open_title: 'Ratkaisematon karttailmotus #%{note_name}'
-      closed_title: 'Ratkaistu karttailmotus #%{note_name}'
-      hidden_title: 'Piilotettu karttailmotus #%{note_name}'
-      opened_by_html: Lähättänyt käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Luonut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Kommentti käyttäjältä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentti tuntemattomalta käyttäjältä <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Ratkaissut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Ratkaissut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Aukassu uuesti käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Aukassu uuesti tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Piilottanut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Ilmianna karttailmotus
     query:
       title: Ominaisuuskysely
       introduction: Näytä luettelo lähistön karttakohteista knapauttamalla karthaa.
@@ -1008,6 +991,25 @@ fit:
   notes:
     index:
       description: Kuvvaus
+    show:
+      title: 'Karttailmoitus: %{id}'
+      description: Kuvvaus
+      open_title: 'Ratkaisematon karttailmotus #%{note_name}'
+      closed_title: 'Ratkaistu karttailmotus #%{note_name}'
+      hidden_title: 'Piilotettu karttailmotus #%{note_name}'
+      opened_by_html: Lähättänyt käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Luonut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Kommentti käyttäjältä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentti tuntemattomalta käyttäjältä <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Ratkaissut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Ratkaissut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Aukassu uuesti käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Aukassu uuesti tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Piilottanut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Ilmianna karttailmotus
+      comment: Kommentoi
+    new:
+      title: Uusi karttailmoitus
   javascripts:
     close: Sulje
     share:
@@ -1023,9 +1025,6 @@ fit:
     changesets:
       show:
         comment: Kommentoi
-    notes:
-      show:
-        comment: Kommentoi
     directions:
       instructions:
         unnamed: nimetön tie
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e693814cd..2ed8a79d4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -532,24 +532,6 @@ fr:
       telephone_link: Appeler %{phone_number}
       colour_preview: Aperçu de la couleur %{colour_value}
       email_link: Courriel %{email}
-    note:
-      title: 'Note : %{id}'
-      new_note: Nouvelle note
-      description: Description
-      open_title: Note non résolue nº %{note_name}
-      closed_title: Note résolue nº %{note_name}
-      hidden_title: Note masquée nº %{note_name}
-      opened_by_html: Créée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
-      opened_by_anonymous_html: Créée par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
-      commented_by_html: Commentée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
-      commented_by_anonymous_html: Commentée par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
-      closed_by_html: Résolue par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
-      closed_by_anonymous_html: Résolue par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
-      reopened_by_html: Réactivée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
-      reopened_by_anonymous_html: Réactivée par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
-      hidden_by_html: Masquée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
-      report: signaler cette note
-      coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Interroger les objets
       introduction: Cliquer sur la carte pour trouver des objets à proximité.
@@ -3111,6 +3093,45 @@ fr:
       description: Description
       created_at: Créée le
       last_changed: Dernière modification
+    show:
+      title: 'Note : %{id}'
+      description: Description
+      open_title: Note non résolue nº %{note_name}
+      closed_title: Note résolue nº %{note_name}
+      hidden_title: Note masquée nº %{note_name}
+      opened_by_html: Créée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
+      opened_by_anonymous_html: Créée par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
+      commented_by_html: Commentée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
+      commented_by_anonymous_html: Commentée par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
+      closed_by_html: Résolue par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
+      closed_by_anonymous_html: Résolue par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
+      reopened_by_html: Réactivée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
+      reopened_by_anonymous_html: Réactivée par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
+      hidden_by_html: Masquée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
+      report: signaler cette note
+      coordinates_html: '%{latitude}, %{longitude}'
+      anonymous_warning: Cette note comprend des commentaires d’utilisateurs anonymes,
+        qui devraient être vérifiés de façon indépendante.
+      hide: Masquer
+      resolve: Résoudre
+      reactivate: Réactiver
+      comment_and_resolve: Commenter et résoudre
+      comment: Commenter
+      report_link_html: Si cette note contient des informations sensibles qui doivent
+        être supprimées, vous pouvez %{link}.
+      other_problems_resolve: Pour tout autre problème avec la note, veuillez le résoudre
+        vous-même avec un commentaire.
+      other_problems_resolved: Pour tous les autres problèmes, la résolution suffit.
+      disappear_date_html: Cette note résolue disparaîtra de la carte dans %{disappear_in}.
+    new:
+      title: Nouvelle note
+      intro: Vous avez repéré une erreur ou un manque ? Faites-le savoir aux autres
+        cartographes afin qu’ils puissent y remédier. Déplacez le marqueur à la position
+        exacte et écrivez une note pour expliquer le problème.
+      advice: Votre note est publique et peut être utilisée pour mettre à jour la
+        carte, aussi n’entrez aucune information personnelle, ni aucune information
+        venant de cartes protégées, ni aucune entrée de répertoire ou d’annuaire.
+      add: Ajouter une note
   javascripts:
     close: Fermer
     share:
@@ -3192,29 +3213,6 @@ fr:
         unsubscribe: Se désabonner
         hide_comment: masquer
         unhide_comment: démasquer
-    notes:
-      new:
-        intro: Vous avez repéré une erreur ou un manque ? Faites-le savoir aux autres
-          cartographes afin qu’ils puissent y remédier. Déplacez le marqueur à la
-          position exacte et écrivez une note pour expliquer le problème.
-        advice: Votre note est publique et peut être utilisée pour mettre à jour la
-          carte, aussi n’entrez aucune information personnelle, ni aucune information
-          venant de cartes protégées, ni aucune entrée de répertoire ou d’annuaire.
-        add: Ajouter une note
-      show:
-        anonymous_warning: Cette note comprend des commentaires d’utilisateurs anonymes,
-          qui devraient être vérifiés de façon indépendante.
-        hide: Masquer
-        resolve: Résoudre
-        reactivate: Réactiver
-        comment_and_resolve: Commenter et résoudre
-        comment: Commenter
-        report_link_html: Si cette note contient des informations sensibles qui doivent
-          être supprimées, vous pouvez %{link}.
-        other_problems_resolve: Pour tout autre problème avec la note, veuillez le
-          résoudre vous-même avec un commentaire.
-        other_problems_resolved: Pour tous les autres problèmes, la résolution suffit.
-        disappear_date_html: Cette note résolue disparaîtra de la carte dans %{disappear_in}.
     edit_help: Déplacez la carte et zoomez sur un emplacement que vous voulez modifier,
       puis cliquez dessus.
     directions:
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index d0c3c753a..395299803 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -361,28 +361,6 @@ fur:
       wikidata_link: L'element %{page} su Wikidata
       wikipedia_link: La vôs su %{page} te Vichipedie
       telephone_link: Clame %{phone_number}
-    note:
-      title: 'Note: %{id}'
-      new_note: Gnove note
-      description: Descrizion
-      open_title: 'Note no risolte #%{note_name}'
-      closed_title: 'Note risolte #%{note_name}'
-      hidden_title: 'Note platade #%{note_name}'
-      opened_by_html: Creade di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
-      opened_by_anonymous_html: Creade di un anonim <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      commented_by_html: Coment di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
-      commented_by_anonymous_html: Coment di un anonim <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      closed_by_html: Risolte di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
-      closed_by_anonymous_html: Risolte di anonim <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      reopened_by_html: Tornade a ativâ di %{user} <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      reopened_by_anonymous_html: Tornade a ativâ di un anonim <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      hidden_by_html: Platade di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
-      report: Segnale cheste note
     query:
       title: Ce ch'al è intun lûc
       introduction: Frache su la mape par cjatâ lis robis dongje.
@@ -1678,6 +1656,43 @@ fur:
       description: Descrizion
       created_at: Creade ai
       last_changed: Ultin cambiament
+    show:
+      title: 'Note: %{id}'
+      description: Descrizion
+      open_title: 'Note no risolte #%{note_name}'
+      closed_title: 'Note risolte #%{note_name}'
+      hidden_title: 'Note platade #%{note_name}'
+      opened_by_html: Creade di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
+      opened_by_anonymous_html: Creade di un anonim <abbr title='%{exact_time}'>%{when}
+        indaûr</abbr>
+      commented_by_html: Coment di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
+      commented_by_anonymous_html: Coment di un anonim <abbr title='%{exact_time}'>%{when}
+        indaûr</abbr>
+      closed_by_html: Risolte di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
+      closed_by_anonymous_html: Risolte di anonim <abbr title='%{exact_time}'>%{when}
+        indaûr</abbr>
+      reopened_by_html: Tornade a ativâ di %{user} <abbr title='%{exact_time}'>%{when}
+        indaûr</abbr>
+      reopened_by_anonymous_html: Tornade a ativâ di un anonim <abbr title='%{exact_time}'>%{when}
+        indaûr</abbr>
+      hidden_by_html: Platade di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
+      report: Segnale cheste note
+      anonymous_warning: Cheste note e inclût coments di utents anonims che a varessin
+        di jessi verificâts in mût indipendent.
+      hide: Plate
+      resolve: Risolf
+      reactivate: Torne a ativâ
+      comment_and_resolve: Comente e risolf
+      comment: Coment
+    new:
+      title: Gnove note
+      intro: Âstu cjatât un erôr o alc ch'al mancje? Informe i altris mapadôrs cussì
+        che al podedi jessi corezût. Sposte il segnalut te posizion juste e inserìs
+        une note par spiegâ il probleme.
+      advice: La tô note e je publiche e e pues jessi doprade par inzornâ la mape,
+        par cui no sta zontâ informazions personâls o di mapis cuviertis dal copyright
+        o listis.
+      add: Zonte une note
   javascripts:
     close: Siere
     share:
@@ -1740,23 +1755,6 @@ fur:
         unsubscribe: Disnotiti
         hide_comment: plate
         unhide_comment: mostre
-    notes:
-      new:
-        intro: Âstu cjatât un erôr o alc ch'al mancje? Informe i altris mapadôrs cussì
-          che al podedi jessi corezût. Sposte il segnalut te posizion juste e inserìs
-          une note par spiegâ il probleme.
-        advice: La tô note e je publiche e e pues jessi doprade par inzornâ la mape,
-          par cui no sta zontâ informazions personâls o di mapis cuviertis dal copyright
-          o listis.
-        add: Zonte une note
-      show:
-        anonymous_warning: Cheste note e inclût coments di utents anonims che a varessin
-          di jessi verificâts in mût indipendent.
-        hide: Plate
-        resolve: Risolf
-        reactivate: Torne a ativâ
-        comment_and_resolve: Comente e risolf
-        comment: Coment
     edit_help: Môf la mape e aumente il zoom tal lûc che tu vuelis cambiâ, po frache
       culì
     directions:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 704408d08..1d0cda61f 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -428,23 +428,6 @@ fy:
       wikimedia_commons_link: It bestân %{page} op Wikimedia Commons
       telephone_link: '%{phone_number} skilje'
       colour_preview: Proefbyld kleur %{colour_value}
-    note:
-      title: 'Notysje: %{id}'
-      new_note: Nije notysje
-      description: Beskriuwing
-      open_title: 'Unoploste notysje #%{note_name}'
-      closed_title: 'Oploste notysje #%{note_name}'
-      hidden_title: 'Ferburgen notysje #%{note_name}'
-      opened_by_html: Makke troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Makke troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Reäksje fan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Reäksje fan anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Oplost troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Oplost troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Weraktivearre troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Weraktivearre troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Ferburgen troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: dizze notysje melde
     query:
       title: Skaaimerken opfreegje
       introduction: Klik op 'e kaart foar skaaimerken fuortby.
@@ -2917,6 +2900,40 @@ fy:
       description: Beskriuwing
       created_at: Makke op
       last_changed: Lêst wizige
+    show:
+      title: 'Notysje: %{id}'
+      description: Beskriuwing
+      open_title: 'Unoploste notysje #%{note_name}'
+      closed_title: 'Oploste notysje #%{note_name}'
+      hidden_title: 'Ferburgen notysje #%{note_name}'
+      opened_by_html: Makke troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Makke troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Reäksje fan %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Reäksje fan anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Oplost troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Oplost troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Weraktivearre troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Weraktivearre troch anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Ferburgen troch %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: dizze notysje melde
+      anonymous_warning: Dizze notysje befettet reäksjes fan anonime meidoggers dy't
+        apart neigien wurde moatte.
+      hide: Ferbergje
+      resolve: Oplosse
+      reactivate: Weraktivearje
+      comment_and_resolve: Reägearje & oplosse
+      comment: Reägearje
+      report_link_html: At dizze notysje gefoelige ynformaasje befettet dy't fuorthelle
+        wurde moat, dan kinne jo %{link}. Los alle oare problemen mei de notysje graach
+        sels op fia in reäksje.
+    new:
+      title: Nije notysje
+      intro: Flater sjoen of mist der wat? Lit it de oare kaartmakkers witte, dan
+        meitsje wy it yn oarder. Sko de markearder op it krekte plak, en typ in notysje
+        oer it probleem.
+      advice: Jo notysje is iepenbier en kin brûkt wurde ta ferbettering fan 'e kaart;
+        dat fier neat persoanliks yn, gjin ynfo fan kaarten of yndeksen mei auteursrjocht.
+      add: Notysje taheakje
   javascripts:
     close: Slute
     share:
@@ -2998,26 +3015,6 @@ fy:
         unsubscribe: Net folgje
         hide_comment: ferbergje
         unhide_comment: werompleatse
-    notes:
-      new:
-        intro: Flater sjoen of mist der wat? Lit it de oare kaartmakkers witte, dan
-          meitsje wy it yn oarder. Sko de markearder op it krekte plak, en typ in
-          notysje oer it probleem.
-        advice: Jo notysje is iepenbier en kin brûkt wurde ta ferbettering fan 'e
-          kaart; dat fier neat persoanliks yn, gjin ynfo fan kaarten of yndeksen mei
-          auteursrjocht.
-        add: Notysje taheakje
-      show:
-        anonymous_warning: Dizze notysje befettet reäksjes fan anonime meidoggers
-          dy't apart neigien wurde moatte.
-        hide: Ferbergje
-        resolve: Oplosse
-        reactivate: Weraktivearje
-        comment_and_resolve: Reägearje & oplosse
-        comment: Reägearje
-        report_link_html: At dizze notysje gefoelige ynformaasje befettet dy't fuorthelle
-          wurde moat, dan kinne jo %{link}. Los alle oare problemen mei de notysje
-          graach sels op fia in reäksje.
     edit_help: Sko de kaart en sûm yn op 'e lokaasje dy't jo bewurkje wolle, klik
       dan hjir.
     directions:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index f92fbd4b3..48ba1f9fa 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -312,29 +312,6 @@ ga:
       wikidata_link: An mhír %{page} ar Vicíshonraí
       wikipedia_link: An t-alt %{page} ar an Vicipéid
       telephone_link: Glaoigh ar %{phone_number}
-    note:
-      title: 'Nóta: %{id}'
-      new_note: Nóta Nua
-      description: Cur síos
-      open_title: 'Nóta neamhréitithe #%{note_name}'
-      closed_title: 'Nóta réitithe #%{note_name}'
-      hidden_title: 'Nóta folaithe #%{note_name}'
-      opened_by_html: Cruthaithe ag %{user} <abbr title='%{exact_time}'>%{when} ó
-        shin</abbr>
-      opened_by_anonymous_html: Cruthaithe ag duine gan ainm <abbr title='%{exact_time}'>%{when}
-        ó shin</abbr>
-      commented_by_html: Nóta tráchta ó %{user} <abbr title='%{exact_time}'>%{when}
-        ó shin</abbr>
-      commented_by_anonymous_html: Nóta tráchta ó dhuine gan ainm <abbr title='%{exact_time}'>%{when}
-        ó shin</abbr>
-      closed_by_html: Réitithe ag %{user} <abbr title='%{exact_time}'>%{when} ó shin</abbr>
-      closed_by_anonymous_html: Réitithe ag duine gan ainm <abbr title='%{exact_time}'>%{when}
-        ó shin</abbr>
-      reopened_by_html: Athghníomhachtaithe ag %{user} <abbr title='%{exact_time}'>%{when}
-        ó shin</abbr>
-      reopened_by_anonymous_html: Athghníomhachtaithe ag duine gan ainm <abbr title='%{exact_time}'>%{when}
-        ó shin</abbr>
-      hidden_by_html: Folaithe ag %{user} <abbr title='%{exact_time}'>%{when} ó shin</abbr>
     query:
       title: Gnéithe a Fhiosrú
       introduction: Cliceáil ar an léarscáil chun gnéithe in aice láimhe a aimsiú.
@@ -2048,6 +2025,33 @@ ga:
     index:
       id: ID
       last_changed: Athrú deireanach
+    show:
+      title: 'Nóta: %{id}'
+      description: Cur síos
+      open_title: 'Nóta neamhréitithe #%{note_name}'
+      closed_title: 'Nóta réitithe #%{note_name}'
+      hidden_title: 'Nóta folaithe #%{note_name}'
+      opened_by_html: Cruthaithe ag %{user} <abbr title='%{exact_time}'>%{when} ó
+        shin</abbr>
+      opened_by_anonymous_html: Cruthaithe ag duine gan ainm <abbr title='%{exact_time}'>%{when}
+        ó shin</abbr>
+      commented_by_html: Nóta tráchta ó %{user} <abbr title='%{exact_time}'>%{when}
+        ó shin</abbr>
+      commented_by_anonymous_html: Nóta tráchta ó dhuine gan ainm <abbr title='%{exact_time}'>%{when}
+        ó shin</abbr>
+      closed_by_html: Réitithe ag %{user} <abbr title='%{exact_time}'>%{when} ó shin</abbr>
+      closed_by_anonymous_html: Réitithe ag duine gan ainm <abbr title='%{exact_time}'>%{when}
+        ó shin</abbr>
+      reopened_by_html: Athghníomhachtaithe ag %{user} <abbr title='%{exact_time}'>%{when}
+        ó shin</abbr>
+      reopened_by_anonymous_html: Athghníomhachtaithe ag duine gan ainm <abbr title='%{exact_time}'>%{when}
+        ó shin</abbr>
+      hidden_by_html: Folaithe ag %{user} <abbr title='%{exact_time}'>%{when} ó shin</abbr>
+      comment_and_resolve: Fág nóta tráchta agus réitigh é
+      comment: Freagair
+    new:
+      title: Nóta Nua
+      add: Cuir Nóta Leis
   javascripts:
     close: Dún
     share:
@@ -2101,12 +2105,6 @@ ga:
         unsubscribe: Díliostáil
         hide_comment: folaigh
         unhide_comment: dífholaigh
-    notes:
-      new:
-        add: Cuir Nóta Leis
-      show:
-        comment_and_resolve: Fág nóta tráchta agus réitigh é
-        comment: Freagair
     edit_help: Bog an léarscáil agus zúmáil isteach ar áit is mian leat a chur in
       eagar, ansin cliceáil anseo.
     directions:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 130969c9c..dbdf6740e 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -293,30 +293,6 @@ gd:
       wikidata_link: An nì %{page} air Wikidata
       wikipedia_link: An artaigil %{page} air Wikidata
       telephone_link: Cuir fòn gu %{phone_number}
-    note:
-      title: 'Nòta: %{id}'
-      new_note: Nòta ùr
-      description: Tuairisgeul
-      open_title: Nòta àireamh %{note_name} gun fhuasgladh
-      closed_title: Nòta àireamh %{note_name} a chaidh fhuasgladh
-      hidden_title: Nòta falaichte àireamh %{note_name}
-      opened_by_html: Chaidh a chruthachadh le %{user} <abbr title='%{exact_time}'>o
-        chionn %{when}</abbr>
-      opened_by_anonymous_html: Chaidh a chruthachadh gun urra <abbr title='%{exact_time}'>o
-        chionn %{when}</abbr>
-      commented_by_html: Beachd le %{user} <abbr title='%{exact_time}'>o chionn %{when}</abbr>
-      commented_by_anonymous_html: Beachd gun urra <abbr title='%{exact_time}'>o chionn
-        %{when}</abbr>
-      closed_by_html: Chaidh fhuasgladh le %{user} <abbr title='%{exact_time}'>o chionn
-        %{when}</abbr>
-      closed_by_anonymous_html: Chaidh fhuasgladh gun urra <abbr title='%{exact_time}'>o
-        chionn %{when}</abbr>
-      reopened_by_html: Chaidh ath-ghnìomhachadh le %{user} <abbr title='%{exact_time}'>o
-        chionn %{when}</abbr>
-      reopened_by_anonymous_html: Chaidh ath-ghnìomhachadh gun urra <abbr title='%{exact_time}'>o
-        chionn %{when}</abbr>
-      hidden_by_html: Chaidh fhalach le %{user} <abbr title='%{exact_time}'>o chionn
-        %{when}</abbr>
     query:
       title: Lorg feartan sònraichte
       introduction: Briog air a' mhapa gus feartan faisg air a lorg.
@@ -2101,6 +2077,43 @@ gd:
       description: Tuairisgeul
       created_at: Air a chruthachadh
       last_changed: An t-atharrachadh mu dheireadh
+    show:
+      title: 'Nòta: %{id}'
+      description: Tuairisgeul
+      open_title: Nòta àireamh %{note_name} gun fhuasgladh
+      closed_title: Nòta àireamh %{note_name} a chaidh fhuasgladh
+      hidden_title: Nòta falaichte àireamh %{note_name}
+      opened_by_html: Chaidh a chruthachadh le %{user} <abbr title='%{exact_time}'>o
+        chionn %{when}</abbr>
+      opened_by_anonymous_html: Chaidh a chruthachadh gun urra <abbr title='%{exact_time}'>o
+        chionn %{when}</abbr>
+      commented_by_html: Beachd le %{user} <abbr title='%{exact_time}'>o chionn %{when}</abbr>
+      commented_by_anonymous_html: Beachd gun urra <abbr title='%{exact_time}'>o chionn
+        %{when}</abbr>
+      closed_by_html: Chaidh fhuasgladh le %{user} <abbr title='%{exact_time}'>o chionn
+        %{when}</abbr>
+      closed_by_anonymous_html: Chaidh fhuasgladh gun urra <abbr title='%{exact_time}'>o
+        chionn %{when}</abbr>
+      reopened_by_html: Chaidh ath-ghnìomhachadh le %{user} <abbr title='%{exact_time}'>o
+        chionn %{when}</abbr>
+      reopened_by_anonymous_html: Chaidh ath-ghnìomhachadh gun urra <abbr title='%{exact_time}'>o
+        chionn %{when}</abbr>
+      hidden_by_html: Chaidh fhalach le %{user} <abbr title='%{exact_time}'>o chionn
+        %{when}</abbr>
+      anonymous_warning: Gabhaidh an nòta seo a-steach beachdan o chleachdaichean
+        gun ainm a bu chòir dhuinn dearbhadh gu neo-eisimeileach.
+      hide: Falaich
+      resolve: Fuasgail
+      reactivate: Ath-ghnìomhaich
+      comment_and_resolve: Thoir beachd ⁊ fuasgail
+      comment: Thoir beachd
+    new:
+      title: Nòta ùr
+      intro: Na mhothaich thu air mearachd no rudeigin a tha a dhìth? Innis do luchd-mapachaidh
+        eile ach an urrainn dhuinn seo a chàradh. Gluais an comharra gun ionad cheart
+        agus sgrìobh nòta gus an duilgheadas a mhìneachadh. (Thoir an aire nach cuir
+        thu a-steach fiosrachadh pearsanta no o mhapaichean no eòlairean fo chòir-lethbhreac.)
+      add: Cuir nòta ris
   javascripts:
     close: Dùin
     share:
@@ -2161,22 +2174,6 @@ gd:
         unsubscribe: Cuir crìoch air an fh-sgrìobhadh
         hide_comment: falaich
         unhide_comment: neo-fhalaich
-    notes:
-      new:
-        intro: Na mhothaich thu air mearachd no rudeigin a tha a dhìth? Innis do luchd-mapachaidh
-          eile ach an urrainn dhuinn seo a chàradh. Gluais an comharra gun ionad cheart
-          agus sgrìobh nòta gus an duilgheadas a mhìneachadh. (Thoir an aire nach
-          cuir thu a-steach fiosrachadh pearsanta no o mhapaichean no eòlairean fo
-          chòir-lethbhreac.)
-        add: Cuir nòta ris
-      show:
-        anonymous_warning: Gabhaidh an nòta seo a-steach beachdan o chleachdaichean
-          gun ainm a bu chòir dhuinn dearbhadh gu neo-eisimeileach.
-        hide: Falaich
-        resolve: Fuasgail
-        reactivate: Ath-ghnìomhaich
-        comment_and_resolve: Thoir beachd ⁊ fuasgail
-        comment: Thoir beachd
     edit_help: Gluais am mapa agus sùm a-steach air ionad a tha thu airson deasachadh.
       Briog an-seo an uairsin.
     directions:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 5043e5339..d9c81a823 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -445,23 +445,6 @@ gl:
       telephone_link: Chamar a %{phone_number}
       colour_preview: Previsualización da cor %{colour_value}
       email_link: Correo electrónico %{email}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nova nota
-      description: Descrición
-      open_title: Nota sen resolver nº%{note_name}
-      closed_title: Nota resolta nº%{note_name}
-      hidden_title: Nota agochada nº%{note_name}
-      opened_by_html: Creado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Creado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comentado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comentado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resolto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resolto por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reactivado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reactivado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Agochado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: denunciar esta nota
     query:
       title: Consultar os elementos
       introduction: Prema no mapa para atopar elementos preto daquí.
@@ -2957,6 +2940,44 @@ gl:
       description: Descrición
       created_at: Creado o
       last_changed: Última modificación
+    show:
+      title: 'Nota: %{id}'
+      description: Descrición
+      open_title: Nota sen resolver nº%{note_name}
+      closed_title: Nota resolta nº%{note_name}
+      hidden_title: Nota agochada nº%{note_name}
+      opened_by_html: Creado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Creado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comentado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comentado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolto por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Agochado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: denunciar esta nota
+      anonymous_warning: Esta nota inclúe comentarios de usuarios anónimos que deben
+        verificarse de xeito independente.
+      hide: Agochar
+      resolve: Resolver
+      reactivate: Reactivar
+      comment_and_resolve: Comentar e resolver
+      comment: Comentar
+      report_link_html: Se esta nota contén información confidencial que debe eliminarse,
+        podes %{link}.
+      other_problems_resolve: Para calquera outro problema coa nota, resólveo ti cun
+        comentario.
+      other_problems_resolved: Para calquera outro problema, a resolución é suficiente.
+      disappear_date_html: Esta nota resolta desaparecerá do mapa en %{disappear_in}.
+    new:
+      title: Nova nota
+      intro: Atopou un erro ou descobriu que falla algún dato? Informe ós outros cartógrafos
+        para que poidamos solucionalo. Mova o marcador á posición correcta e escriba
+        unha nota expoñendo o problema.
+      advice: A túa nota será pública e poderás empregarse para actualizar o mapa,
+        por conseguinte, non insira información persoal, nin datos de mapas protexidos
+        por dereitos de autoría ou listaxes de directorios.
+      add: Engadir a nota
   javascripts:
     close: Pechar
     share:
@@ -3038,29 +3059,6 @@ gl:
         unsubscribe: Rexeitar a subscrición
         hide_comment: agochar
         unhide_comment: amosar
-    notes:
-      new:
-        intro: Atopou un erro ou descobriu que falla algún dato? Informe ós outros
-          cartógrafos para que poidamos solucionalo. Mova o marcador á posición correcta
-          e escriba unha nota expoñendo o problema.
-        advice: A túa nota será pública e poderás empregarse para actualizar o mapa,
-          por conseguinte, non insira información persoal, nin datos de mapas protexidos
-          por dereitos de autoría ou listaxes de directorios.
-        add: Engadir a nota
-      show:
-        anonymous_warning: Esta nota inclúe comentarios de usuarios anónimos que deben
-          verificarse de xeito independente.
-        hide: Agochar
-        resolve: Resolver
-        reactivate: Reactivar
-        comment_and_resolve: Comentar e resolver
-        comment: Comentar
-        report_link_html: Se esta nota contén información confidencial que debe eliminarse,
-          podes %{link}.
-        other_problems_resolve: Para calquera outro problema coa nota, resólveo ti
-          cun comentario.
-        other_problems_resolved: Para calquera outro problema, a resolución é suficiente.
-        disappear_date_html: Esta nota resolta desaparecerá do mapa en %{disappear_in}.
     edit_help: Desplaza o mapa e achégao na localización que queiras editar; logo,
       preme aquí.
     directions:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index f52a432e7..068263ebc 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -489,23 +489,6 @@ he:
       telephone_link: להתקשר למספר %{phone_number}
       colour_preview: תצוגה מקדימה של הצבע %{colour_value}
       email_link: דוא״ל %{email}
-    note:
-      title: 'הערה: %{id}'
-      new_note: הערה חדשה
-      description: תיאור
-      open_title: הערה שלא נפתרה מס׳ %{note_name}
-      closed_title: הערה פתורה מס׳ %{note_name}
-      hidden_title: הערה מוסתרת מס׳ %{note_name}
-      opened_by_html: נוצרה על־ידי %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: נוצרה על־ידי אלמוני <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: הערה על ידי %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: הערה על ידי אלמוני <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: נפתר על־ידי %{user} ב־<abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: נפתר על־ידי אלמוני ב־<abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: הופעל מחדש על־ידי %{user} ב־<abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: הופעל מחדש על־ידי אלמוני ב־<abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: הוסתר על־ידי %{user} ב־<abbr title='%{exact_time}'>%{when}</abbr>
-      report: לדווח על ההערה הזאת
     query:
       title: שאילתת ישויות
       introduction: יש ללחוץ על המפה כדי למצוא ישויות בסביבה.
@@ -2957,6 +2940,40 @@ he:
       description: תיאור
       created_at: 'יצירה:'
       last_changed: 'שינוי אחרון:'
+    show:
+      title: 'הערה: %{id}'
+      description: תיאור
+      open_title: הערה שלא נפתרה מס׳ %{note_name}
+      closed_title: הערה פתורה מס׳ %{note_name}
+      hidden_title: הערה מוסתרת מס׳ %{note_name}
+      opened_by_html: נוצרה על־ידי %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: נוצרה על־ידי אלמוני <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: הערה על ידי %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: הערה על ידי אלמוני <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: נפתר על־ידי %{user} ב־<abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: נפתר על־ידי אלמוני ב־<abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: הופעל מחדש על־ידי %{user} ב־<abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: הופעל מחדש על־ידי אלמוני ב־<abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: הוסתר על־ידי %{user} ב־<abbr title='%{exact_time}'>%{when}</abbr>
+      report: לדווח על ההערה הזאת
+      anonymous_warning: ההערה הזאת כוללת תגובות ממשתמשים אלמוניים שצריך לאמת באופן
+        עצמאי.
+      hide: להסתיר
+      resolve: לפתור
+      reactivate: הפעלה מחדש
+      comment_and_resolve: להגיב ולפתור
+      comment: להגיב
+      report_link_html: אם ההערה הזאת מכילה מידע רגיש שיש להסיר, אפשר %{link}.
+      other_problems_resolve: עבור כל שאר הבעיות עם ההערה, נא לפתור אותה בעצמך באמצעות
+        הערה.
+      other_problems_resolved: עבור כל שאר הבעיות, מספיק לפתור.
+      disappear_date_html: הערה שנפתרה תיעלם מהמפה בעוד %{disappear_in}.
+    new:
+      title: הערה חדשה
+      intro: יש פה טעות או שחסר משהו? אנו מבקשים ממך לספר את זה לממפים אחרים. לשם
+        כך צריך להזיז את הסמן למקום הנכון ולכתוב הערה שמסבירה את הבעיה.
+      advice: /start
+      add: הוספת הערה
   javascripts:
     close: סגירה
     share:
@@ -3042,25 +3059,6 @@ he:
         unsubscribe: ביטול מינוי
         hide_comment: הסתרה
         unhide_comment: ביטול הסתרה
-    notes:
-      new:
-        intro: יש פה טעות או שחסר משהו? אנו מבקשים ממך לספר את זה לממפים אחרים. לשם
-          כך צריך להזיז את הסמן למקום הנכון ולכתוב הערה שמסבירה את הבעיה.
-        advice: /start
-        add: הוספת הערה
-      show:
-        anonymous_warning: ההערה הזאת כוללת תגובות ממשתמשים אלמוניים שצריך לאמת באופן
-          עצמאי.
-        hide: להסתיר
-        resolve: לפתור
-        reactivate: הפעלה מחדש
-        comment_and_resolve: להגיב ולפתור
-        comment: להגיב
-        report_link_html: אם ההערה הזאת מכילה מידע רגיש שיש להסיר, אפשר %{link}.
-        other_problems_resolve: עבור כל שאר הבעיות עם ההערה, נא לפתור אותה בעצמך באמצעות
-          הערה.
-        other_problems_resolved: עבור כל שאר הבעיות, מספיק לפתור.
-        disappear_date_html: הערה שנפתרה תיעלם מהמפה בעוד %{disappear_in}.
     edit_help: יש להזיז את המפה ולהתמקד על מיקום שברצונך לערוך ואז ללחוץ כאן.
     directions:
       ascend: מעלה
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 4ad091f32..726735ce7 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -382,32 +382,6 @@ hi:
       wikimedia_commons_link: विकिमीडिया कॉमन्स पर %{page} आइटम
       telephone_link: '%{phone_number} मिलाएं'
       colour_preview: रंग %{colour_value} का पूर्वावलोकन
-    note:
-      title: 'नोट: %{id}'
-      new_note: नया टिप
-      description: विवरण
-      open_title: 'अनसुलझा नोट #%{note_name}'
-      closed_title: 'सुलझा नोट #%{note_name}'
-      hidden_title: 'छिपाया नोट #%{note_name}'
-      opened_by_html: '%{user} द्वारा <abbr title=''%{exact_time}''>%{when}</abbr>
-        बनाया गया'
-      opened_by_anonymous_html: गुमनाम द्वारा <abbr title='%{exact_time}'>%{when}</abbr>
-        बनाया गया
-      commented_by_html: '%{user} से <abbr title=''%{exact_time}''>%{when}</abbr>
-        का कमेंट'
-      commented_by_anonymous_html: गुमनाम से <abbr title='%{exact_time}'>%{when}</abbr>
-        का कमेंट
-      closed_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} द्वारा सुलझाया
-        गया
-      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> गुमनाम
-        द्वारा सुलझाया गया
-      reopened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} द्वारा
-        फिर चालू किया गया
-      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> गुमनाम
-        द्वारा फिर चालू किया गया
-      hidden_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} द्वारा छिपाया
-        गया
-      report: इस नोट को रिपोर्ट कर
     query:
       title: क्वेरी की सुविधाएँ
       introduction: आस-पास की सुविधाओं के लिए नक़्शे पर क्लिक करें
@@ -1063,30 +1037,54 @@ hi:
     index:
       created_at: 'निर्माण का समय:'
       last_changed: अंतिम परिवर्तन
+    show:
+      title: 'नोट: %{id}'
+      description: विवरण
+      open_title: 'अनसुलझा नोट #%{note_name}'
+      closed_title: 'सुलझा नोट #%{note_name}'
+      hidden_title: 'छिपाया नोट #%{note_name}'
+      opened_by_html: '%{user} द्वारा <abbr title=''%{exact_time}''>%{when}</abbr>
+        बनाया गया'
+      opened_by_anonymous_html: गुमनाम द्वारा <abbr title='%{exact_time}'>%{when}</abbr>
+        बनाया गया
+      commented_by_html: '%{user} से <abbr title=''%{exact_time}''>%{when}</abbr>
+        का कमेंट'
+      commented_by_anonymous_html: गुमनाम से <abbr title='%{exact_time}'>%{when}</abbr>
+        का कमेंट
+      closed_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} द्वारा सुलझाया
+        गया
+      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> गुमनाम
+        द्वारा सुलझाया गया
+      reopened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} द्वारा
+        फिर चालू किया गया
+      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> गुमनाम
+        द्वारा फिर चालू किया गया
+      hidden_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} द्वारा छिपाया
+        गया
+      report: इस नोट को रिपोर्ट कर
+      hide: छुपाएँ
+      resolve: समाधान करें
+      reactivate: 'पुन: सक्रिय करें'
+      comment_and_resolve: टिप्पणी कर समाधान करें
+      comment: जवाब देना
+      report_link_html: अगर इस नोट में संवेदनशील जानकारी है जिसे हटाना उचित है, आप
+        %{link} सकते हैं। नोट से जुड़ी दूसरी समस्याओं के लिए कृपया एक टिप्पणी से उन्हें
+        सुलझाएँ।
+    new:
+      title: नया टिप
+      intro: अगर आपको कोई‌ गलती नज़र आई है, या नक्षे में कोई वस्तु मौजूद नहीं है,
+        तो आप इस बारे में अन्य नक्षाकारों को सूचित कर सकते हैं ताकि वे इसे ठीक कर
+        सकें। चिन्ह को सही जगह पर लाएं और समस्या का विवरण दें।
+      advice: आपका नोट सार्वजनिक है और मानचित्र को अपडेट करने के लिए उपयोग किया जा
+        सकता है, इसलिए निजी जानकारी दर्ज न करें या कॉपीराइट वाले नक्शे या निर्देशिका
+        सूची से जानकारी न दें।
+      add: नोट जोड़ें
   javascripts:
     site:
       createnote_disabled_tooltip: नोट जोड़ने के लिए जूम इन करें
     changesets:
       show:
         comment: जवाब देना
-    notes:
-      new:
-        intro: अगर आपको कोई‌ गलती नज़र आई है, या नक्षे में कोई वस्तु मौजूद नहीं है,
-          तो आप इस बारे में अन्य नक्षाकारों को सूचित कर सकते हैं ताकि वे इसे ठीक कर
-          सकें। चिन्ह को सही जगह पर लाएं और समस्या का विवरण दें।
-        advice: आपका नोट सार्वजनिक है और मानचित्र को अपडेट करने के लिए उपयोग किया
-          जा सकता है, इसलिए निजी जानकारी दर्ज न करें या कॉपीराइट वाले नक्शे या निर्देशिका
-          सूची से जानकारी न दें।
-        add: नोट जोड़ें
-      show:
-        hide: छुपाएँ
-        resolve: समाधान करें
-        reactivate: 'पुन: सक्रिय करें'
-        comment_and_resolve: टिप्पणी कर समाधान करें
-        comment: जवाब देना
-        report_link_html: अगर इस नोट में संवेदनशील जानकारी है जिसे हटाना उचित है,
-          आप %{link} सकते हैं। नोट से जुड़ी दूसरी समस्याओं के लिए कृपया एक टिप्पणी
-          से उन्हें सुलझाएँ।
     directions:
       directions: रास्ता
       distance: दूरी
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index ea62106a0..5a1f0e036 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -390,27 +390,6 @@ hr:
       wikipedia_link: Članak o %{page} na Wikipediji
       wikimedia_commons_link: '%{page} element na Wikimedia Commons'
       telephone_link: Nazovi %{phone_number}
-    note:
-      title: 'Bilješka: %{id}'
-      new_note: Nova bilješka
-      description: Opis
-      open_title: Neriješena bilješka broj %{note_name}
-      closed_title: Riješena bilješka broj %{note_name}
-      hidden_title: Skrivena bilješka broj %{note_name}
-      opened_by_html: Zabilježio/la %{user} <abbr title='%{exact_time}'> u %{when}</abbr>
-      opened_by_anonymous_html: Zabilježeno anonimno <abbr title='%{exact_time}'>
-        u %{when}</abbr>
-      commented_by_html: Komentirao/la %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Komentirano anonimno <abbr title='%{exact_time}'>
-        u %{when}</abbr>
-      closed_by_html: Riješio/la %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Riješeno anonimno <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Ponovno aktivirao/la %{user} <abbr title='%{exact_time}'>
-        u %{when}</abbr>
-      reopened_by_anonymous_html: Ponovno aktivirano anonimno <abbr title='%{exact_time}'>
-        u %{when}</abbr>
-      hidden_by_html: Sakrio/la %{user} <abbr title='%{exact_time}'> u %{when}</abbr>
-      report: prijavi ovu bilješku
     query:
       title: Provjeri elemente karte
       introduction: Klikni na kartu za pronalazak okolnih elemenata karte.
@@ -2072,6 +2051,43 @@ hr:
       description: Opis
       created_at: Napravljeno
       last_changed: Zadnji put promijenjeno
+    show:
+      title: 'Bilješka: %{id}'
+      description: Opis
+      open_title: Neriješena bilješka broj %{note_name}
+      closed_title: Riješena bilješka broj %{note_name}
+      hidden_title: Skrivena bilješka broj %{note_name}
+      opened_by_html: Zabilježio/la %{user} <abbr title='%{exact_time}'> u %{when}</abbr>
+      opened_by_anonymous_html: Zabilježeno anonimno <abbr title='%{exact_time}'>
+        u %{when}</abbr>
+      commented_by_html: Komentirao/la %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Komentirano anonimno <abbr title='%{exact_time}'>
+        u %{when}</abbr>
+      closed_by_html: Riješio/la %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Riješeno anonimno <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Ponovno aktivirao/la %{user} <abbr title='%{exact_time}'>
+        u %{when}</abbr>
+      reopened_by_anonymous_html: Ponovno aktivirano anonimno <abbr title='%{exact_time}'>
+        u %{when}</abbr>
+      hidden_by_html: Sakrio/la %{user} <abbr title='%{exact_time}'> u %{when}</abbr>
+      report: prijavi ovu bilješku
+      anonymous_warning: Ova bilješka sadrži komentare anonimnih korisnika koje bi
+        trebalo neovisno provjeriti.
+      hide: Sakrij
+      resolve: Razriješi
+      reactivate: Ponovno aktiviraj
+      comment_and_resolve: Komentiraj i razriješi
+      comment: Komentiraj
+    new:
+      title: Nova bilješka
+      intro: Primjetili ste grešku ili nedostatak nečega? Javite ostalim kartografima
+        kako bismo to ispravili. Stavite oznaku na pravo mjesto i dodajte bilješku
+        s opisom problema. (Molimo ne unašajte osobne podatke ili podatke s karata
+        koje su zaštićene autorskim pravima)
+      advice: Vaša bilješka je javna i može se koristiti za ažuriranje karte, zato
+        ne upisujte osobne podatke, ili podatke sa karata ili tablica podataka zaštićenih
+        autorskim pravima.
+      add: Dodaj bilješku
   javascripts:
     close: Zatvori
     share:
@@ -2134,24 +2150,6 @@ hr:
         unsubscribe: Otkaži pretplatu
         hide_comment: sakrij
         unhide_comment: vrati sakriveno
-    notes:
-      new:
-        intro: Primjetili ste grešku ili nedostatak nečega? Javite ostalim kartografima
-          kako bismo to ispravili. Stavite oznaku na pravo mjesto i dodajte bilješku
-          s opisom problema. (Molimo ne unašajte osobne podatke ili podatke s karata
-          koje su zaštićene autorskim pravima)
-        advice: Vaša bilješka je javna i može se koristiti za ažuriranje karte, zato
-          ne upisujte osobne podatke, ili podatke sa karata ili tablica podataka zaštićenih
-          autorskim pravima.
-        add: Dodaj bilješku
-      show:
-        anonymous_warning: Ova bilješka sadrži komentare anonimnih korisnika koje
-          bi trebalo neovisno provjeriti.
-        hide: Sakrij
-        resolve: Razriješi
-        reactivate: Ponovno aktiviraj
-        comment_and_resolve: Komentiraj i razriješi
-        comment: Komentiraj
     edit_help: Pomakni kartu i približi dio koji želiš urediti, zatim klikni ovdje.
     directions:
       engines:
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 99c18bf98..3810bc7df 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -398,26 +398,6 @@ hsb:
       wikimedia_commons_link: Element %{page} na Wikimedija Commons
       telephone_link: '%{phone_number} zawołać'
       colour_preview: Přehlad barba %{colour_value}
-    note:
-      title: 'Suk: %{id}'
-      new_note: Nowa pokazka
-      description: Wopisanje
-      open_title: 'Njesčinjena pokazka #%{note_name}'
-      closed_title: 'Sčinjena pokazka #%{note_name}'
-      hidden_title: 'Schowana pokazka #%{note_name}'
-      opened_by_html: Wutworjeny wot %{user} <abbr title='%{exact_time}'>před %{when}</abbr>
-      opened_by_anonymous_html: Wutworjeny wot anonymneho <abbr title='%{exact_time}'>před
-        %{when}</abbr>
-      commented_by_html: Komentar wot %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Komentar wot anonymneho <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Rozrisany wot %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Rozrisany wot anonymneho <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reaktiwizowany wot %{user} <abbr title='%{exact_time}'>před
-        %{when}</abbr>
-      reopened_by_anonymous_html: Reaktiwizowany wot anonymneho <abbr title='%{exact_time}'>před
-        %{when}</abbr>
-      hidden_by_html: Schowany wot %{user} <abbr title='%{exact_time}'>před %{when}</abbr>
-      report: Tutón pokiw zdźělić
     query:
       title: Funkcije naprašować
       introduction: Klikń na kartu, zo by susodne objekty namakał(a).
@@ -2764,6 +2744,38 @@ hsb:
       description: Wopisanje
       created_at: 'Wutworjeny:'
       last_changed: Posledni raz změnjeny
+    show:
+      title: 'Suk: %{id}'
+      description: Wopisanje
+      open_title: 'Njesčinjena pokazka #%{note_name}'
+      closed_title: 'Sčinjena pokazka #%{note_name}'
+      hidden_title: 'Schowana pokazka #%{note_name}'
+      opened_by_html: Wutworjeny wot %{user} <abbr title='%{exact_time}'>před %{when}</abbr>
+      opened_by_anonymous_html: Wutworjeny wot anonymneho <abbr title='%{exact_time}'>před
+        %{when}</abbr>
+      commented_by_html: Komentar wot %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Komentar wot anonymneho <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Rozrisany wot %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Rozrisany wot anonymneho <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reaktiwizowany wot %{user} <abbr title='%{exact_time}'>před
+        %{when}</abbr>
+      reopened_by_anonymous_html: Reaktiwizowany wot anonymneho <abbr title='%{exact_time}'>před
+        %{when}</abbr>
+      hidden_by_html: Schowany wot %{user} <abbr title='%{exact_time}'>před %{when}</abbr>
+      report: Tutón pokiw zdźělić
+      anonymous_warning: Tuta pokazka wobsahuje komentary wot anonymnych wužiwarjow,
+        kotrež měli so njewotwisnje přepruwować.
+      hide: Schować
+      resolve: Sčinjeny
+      reactivate: Znowa aktiwizować
+      comment_and_resolve: Komentować a sčinić
+      comment: Komentar
+    new:
+      title: Nowa pokazka
+      intro: Sy zmylk widźał abo zo něšto faluje? Informuj druhich kartografow, zo
+        móhli to porjedźić. Přesuń marku ke korektnej poziciji a zapisaj pokazku,
+        zo by problem wujasnił.
+      add: Pokazku přidać
   javascripts:
     close: Začinić
     share:
@@ -2841,20 +2853,6 @@ hsb:
         unsubscribe: Wotskazać
         hide_comment: schować
         unhide_comment: pokazać
-    notes:
-      new:
-        intro: Sy zmylk widźał abo zo něšto faluje? Informuj druhich kartografow,
-          zo móhli to porjedźić. Přesuń marku ke korektnej poziciji a zapisaj pokazku,
-          zo by problem wujasnił.
-        add: Pokazku přidać
-      show:
-        anonymous_warning: Tuta pokazka wobsahuje komentary wot anonymnych wužiwarjow,
-          kotrež měli so njewotwisnje přepruwować.
-        hide: Schować
-        resolve: Sčinjeny
-        reactivate: Znowa aktiwizować
-        comment_and_resolve: Komentować a sčinić
-        comment: Komentar
     edit_help: Přesuń kartu do městna, kotrež chceš wobdźěłać, powjetš tam a klikń
       potom tu.
     directions:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e7eab28d8..d07a5936f 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -463,23 +463,6 @@ hu:
       telephone_link: '%{phone_number} felhívása'
       colour_preview: '%{colour_value} szín előnézete'
       email_link: Email %{email}
-    note:
-      title: '%{id} jegyzet'
-      new_note: Új jegyzet
-      description: Leírás
-      open_title: '%{note_name} megoldatlan jegyzet'
-      closed_title: '%{note_name} megoldott jegyzet'
-      hidden_title: '%{note_name} rejtett jegyzet'
-      opened_by_html: Létrehozta %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Létrehozva névtelenül, <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: '%{user} hozzászólása, <abbr title=''%{exact_time}''>%{when}</abbr>'
-      commented_by_anonymous_html: Névtelen megjegyzés, <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Megoldotta %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Megoldva névtelenül, <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Újraaktiválta %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Újraaktiválva névtelenül, <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Elrejtette %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
-      report: jegyzet bejelentése
     query:
       title: Objektumok lekérdezése
       introduction: Kattints a térképre a közeli objektumok megtalálásához.
@@ -637,13 +620,23 @@ hu:
           notice: Alkalmazás regisztrálva.
   errors:
     contact:
+      contact_url_title: A különféle kapcsolatfelvételi csatornák magyarázata
       contact: kapcsolat
+      contact_the_community_html: Nyugodtan keresse fel az OpenStreetMap közösséget
+        (%{contact_link}), ha hibás linket vagy más hibát talál. Kérjük, ne felejtse
+        el feljegyezni a hibás oldal pontos URL-jét.
     forbidden:
       title: Tiltott
+      description: Az OpenStreetMap szerveren kért művelet csak a rendszergazdáknak
+        érhető el (HTTP 403).
     internal_server_error:
       title: Alkalmazáshiba
+      description: Az OpenStreetMap szerver váratlan feltétellel találkozott, amely
+        megakadályozta a kérés teljesítésében (HTTP 500)
     not_found:
       title: A fájl nem található
+      description: Nem található ilyen nevű fájl/könyvtár/API-művelet az OpenStreetMap
+        szerveren (HTTP 404)
   friendships:
     make_friend:
       heading: '%{user} hozzáadása ismerősként?'
@@ -2673,6 +2666,10 @@ hu:
       title: Felhasználói fiók létrehozása
       no_auto_account_create: Sajnos jelenleg nem tudunk neked létrehozni automatikusan
         egy felhasználói fiókot.
+      please_contact_support_html: Kérjük, lépjen kapcsolatba velünk (%{support_link}),
+        hogy elrendezhessük a fiók létrehozását. Kérését igyekszünk a lehető leggyorsabban
+        feldolgozni.
+      support: támogatás
       about:
         header: Szabad és szerkeszthető
         html: |-
@@ -2803,6 +2800,10 @@ hu:
       title: Felhasználói fiók felfüggesztve
       heading: Felhasználói fiók felfüggesztve
       support: támogatás
+      automatically_suspended: Sajnáljuk, fiókja gyanús tevékenység miatt automatikusan
+        felfüggesztődött.
+      contact_support_html: A döntést hamarosan felülvizsgálja egy rendszergazda,
+        vagy ha szeretné megvitatni, Ön is felveheti a kapcsolatot velünk (%{support_link}).
     auth_failure:
       connection_failed: Nem sikerült csatlakozni a hitelesítés szolgáltatójához
       invalid_credentials: Hibás hitelesítési adatok
@@ -2954,6 +2955,45 @@ hu:
       description: Leírás
       created_at: Létrehozva ekkor
       last_changed: Utoljára módosítva
+    show:
+      title: '%{id} jegyzet'
+      description: Leírás
+      open_title: '%{note_name} megoldatlan jegyzet'
+      closed_title: '%{note_name} megoldott jegyzet'
+      hidden_title: '%{note_name} rejtett jegyzet'
+      opened_by_html: Létrehozta %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Létrehozva névtelenül, <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: '%{user} hozzászólása, <abbr title=''%{exact_time}''>%{when}</abbr>'
+      commented_by_anonymous_html: Névtelen megjegyzés, <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Megoldotta %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Megoldva névtelenül, <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Újraaktiválta %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Újraaktiválva névtelenül, <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Elrejtette %{user}, <abbr title='%{exact_time}'>%{when}</abbr>
+      report: jegyzet bejelentése
+      anonymous_warning: Ez a jegyzet névtelen felhasználók hozzászólásait is tartalmazza,
+        amelyeket független módon kell ellenőrizni.
+      hide: Elrejtés
+      resolve: Megoldás
+      reactivate: Újraaktiválás
+      comment_and_resolve: Hozzászólás és megoldás
+      comment: Hozzászólás
+      report_link_html: Ha ez a jegyzet eltávolítandó érzékeny információkat tartalmaz,
+        akkor használhatod a %{link} funkciót.
+      other_problems_resolve: A jegyzettel kapcsolatos összes többi problémánál légy
+        szíves, oldd meg magad egy hozzászólással.
+      other_problems_resolved: Minden más problémánál elegendő a megoldás.
+      disappear_date_html: A megoldott jegyzet %{disappear_in} múlva el fog tűnni
+        a térképről.
+    new:
+      title: Új jegyzet
+      intro: Hibát találtál vagy valami hiányzik? Tudasd a többi térképezővel, hogy
+        javítani tudjuk. Mozgasd a jelölőt a megfelelő helyre, és minél pontosabban
+        írd le a problémát.
+      advice: A jegyzeted nyilvános és használható a térkép frissítéséhez, ezért ne
+        adj meg személyes adatokat vagy jogvédett térképről vagy katalógusokból származó
+        információkat.
+      add: Jegyzet hozzáadása
   javascripts:
     close: Bezárás
     share:
@@ -3038,30 +3078,6 @@ hu:
         unsubscribe: Leiratkozás
         hide_comment: elrejt
         unhide_comment: megjelenít
-    notes:
-      new:
-        intro: Hibát találtál vagy valami hiányzik? Tudasd a többi térképezővel, hogy
-          javítani tudjuk. Mozgasd a jelölőt a megfelelő helyre, és minél pontosabban
-          írd le a problémát.
-        advice: A jegyzeted nyilvános és használható a térkép frissítéséhez, ezért
-          ne adj meg személyes adatokat vagy jogvédett térképről vagy katalógusokból
-          származó információkat.
-        add: Jegyzet hozzáadása
-      show:
-        anonymous_warning: Ez a jegyzet névtelen felhasználók hozzászólásait is tartalmazza,
-          amelyeket független módon kell ellenőrizni.
-        hide: Elrejtés
-        resolve: Megoldás
-        reactivate: Újraaktiválás
-        comment_and_resolve: Hozzászólás és megoldás
-        comment: Hozzászólás
-        report_link_html: Ha ez a jegyzet eltávolítandó érzékeny információkat tartalmaz,
-          akkor használhatod a %{link} funkciót.
-        other_problems_resolve: A jegyzettel kapcsolatos összes többi problémánál
-          légy szíves, oldd meg magad egy hozzászólással.
-        other_problems_resolved: Minden más problémánál elegendő a megoldás.
-        disappear_date_html: A megoldott jegyzet %{disappear_in} múlva el fog tűnni
-          a térképről.
     edit_help: Mozgasd a térképet, nagyíts ott ahol módosítani szeretnéd, majd kattints
       ide.
     directions:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index ef16d1b2f..6b7a72919 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -437,23 +437,6 @@ ia:
       telephone_link: Telephonar %{phone_number}
       colour_preview: Previsualisation del color %{colour_value}
       email_link: E-mail %{email}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nove nota
-      description: Description
-      open_title: Nota non resolvite №%{note_name}
-      closed_title: Nota resolvite №%{note_name}
-      hidden_title: Nota celate №%{note_name}
-      opened_by_html: Create per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Create per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Commento de un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resolvite per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resolvite per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reactivate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Celate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: signalar iste nota
     query:
       title: Cercar objectos
       introduction: Clicca sur le carta pro cercar objectos a proximitate.
@@ -2975,6 +2958,45 @@ ia:
       description: Description
       created_at: Create a
       last_changed: Ultime modification
+    show:
+      title: 'Nota: %{id}'
+      description: Description
+      open_title: Nota non resolvite №%{note_name}
+      closed_title: Nota resolvite №%{note_name}
+      hidden_title: Nota celate №%{note_name}
+      opened_by_html: Create per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Create per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Commento de un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolvite per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolvite per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Celate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: signalar iste nota
+      coordinates_html: '%{latitude}; %{longitude}'
+      anonymous_warning: Iste nota include commentos de usatores anonyme que debe
+        esser verificate independentemente.
+      hide: Celar
+      resolve: Resolver
+      reactivate: Reactivar
+      comment_and_resolve: Commentar e resolver
+      comment: Commento
+      report_link_html: Si iste nota contine information sensibile que debe esser
+        removite, tu pote %{link}.
+      other_problems_resolve: Pro tote altere problema con le nota, per favor resolve
+        lo tu mesme con un commento.
+      other_problems_resolved: Pro tote altere problemas, suffice resolver.
+      disappear_date_html: Iste nota resolvite disparera del carta in %{disappear_in}.
+    new:
+      title: Nove nota
+      intro: Tu ha trovate un error? Qualcosa manca? Face lo saper al altere cartographos
+        a fin que nos pote corriger lo. Displacia le marcator al position correcte
+        e scribe un nota pro explicar le problema.
+      advice: Tu nota es public e pote esser usate pro actualisar le carta. Dunque,
+        non insere alcun information personal, ni datos ab cartas o catalogos protegite
+        per derectos de autor.
+      add: Adder nota
   javascripts:
     close: Clauder
     share:
@@ -3057,29 +3079,6 @@ ia:
         unsubscribe: Cancellar subscription
         hide_comment: celar
         unhide_comment: revelar
-    notes:
-      new:
-        intro: Tu ha trovate un error? Qualcosa manca? Face lo saper al altere cartographos
-          a fin que nos pote corriger lo. Displacia le marcator al position correcte
-          e scribe un nota pro explicar le problema.
-        advice: Tu nota es public e pote esser usate pro actualisar le carta. Dunque,
-          non insere alcun information personal, ni datos ab cartas o catalogos protegite
-          per derectos de autor.
-        add: Adder nota
-      show:
-        anonymous_warning: Iste nota include commentos de usatores anonyme que debe
-          esser verificate independentemente.
-        hide: Celar
-        resolve: Resolver
-        reactivate: Reactivar
-        comment_and_resolve: Commentar e resolver
-        comment: Commento
-        report_link_html: Si iste nota contine information sensibile que debe esser
-          removite, tu pote %{link}.
-        other_problems_resolve: Pro tote altere problema con le nota, per favor resolve
-          lo tu mesme con un commento.
-        other_problems_resolved: Pro tote altere problemas, suffice resolver.
-        disappear_date_html: Iste nota resolvite disparera del carta in %{disappear_in}.
     edit_help: Displacia le carta e face zoom avante in un loco que tu vole modificar,
       postea clicca hic.
     directions:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index e2af5e336..a5a015f18 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -448,32 +448,6 @@ id:
       wikimedia_commons_link: Item %{page} di Wikimedia Commons
       telephone_link: Hubungi %{phone_number}
       colour_preview: Pratinjau warna %{colour_value}
-    note:
-      title: 'Catatan: %{id}'
-      new_note: Catatan Baru
-      description: Deskripsi
-      open_title: 'Catatan belum tuntas: %{note_name}'
-      closed_title: 'Catatan tuntas: %{note_name}'
-      hidden_title: 'Catatan tersembunyi #%{note_name}'
-      opened_by_html: Dibuat oleh %{user} <abbr title='%{exact_time}'>%{when} yang
-        lalu</abbr>
-      opened_by_anonymous_html: Dibuat oleh anonim <abbr title='%{exact_time}'>%{when}
-        yang lalu</abbr>
-      commented_by_html: Komentar dari %{user} <abbr title='%{exact_time}'>%{when}
-        yang lalu</abbr>
-      commented_by_anonymous_html: Komentar dari anonim <abbr title='%{exact_time}'>%{when}
-        yang lalu</abbr>
-      closed_by_html: Diselesaikan oleh %{user} <abbr title='%{exact_time}'>%{when}
-        yang lalu</abbr>
-      closed_by_anonymous_html: Diselesaikan oleh anonim <abbr title='%{exact_time}'>%{when}
-        yang lalu</abbr>
-      reopened_by_html: Diaktifkan kembali oleh %{user} <abbr title='%{exact_time}'>%{when}
-        yang lalu</abbr>
-      reopened_by_anonymous_html: Diaktifkan kembali oleh anonim <abbr title='%{exact_time}'>%{when}
-        yang lalu</abbr>
-      hidden_by_html: Disembunyikan oleh %{user} <abbr title='%{exact_time}'>%{when}
-        yang lalu</abbr>
-      report: laporkan catatan ini
     query:
       title: Fitur Kueri
       introduction: Klik di peta untuk mencari fitur terdekat.
@@ -2867,6 +2841,48 @@ id:
       description: Deskripsi
       created_at: Dibuat pada
       last_changed: Terakhir diubah
+    show:
+      title: 'Catatan: %{id}'
+      description: Deskripsi
+      open_title: 'Catatan belum tuntas: %{note_name}'
+      closed_title: 'Catatan tuntas: %{note_name}'
+      hidden_title: 'Catatan tersembunyi #%{note_name}'
+      opened_by_html: Dibuat oleh %{user} <abbr title='%{exact_time}'>%{when} yang
+        lalu</abbr>
+      opened_by_anonymous_html: Dibuat oleh anonim <abbr title='%{exact_time}'>%{when}
+        yang lalu</abbr>
+      commented_by_html: Komentar dari %{user} <abbr title='%{exact_time}'>%{when}
+        yang lalu</abbr>
+      commented_by_anonymous_html: Komentar dari anonim <abbr title='%{exact_time}'>%{when}
+        yang lalu</abbr>
+      closed_by_html: Diselesaikan oleh %{user} <abbr title='%{exact_time}'>%{when}
+        yang lalu</abbr>
+      closed_by_anonymous_html: Diselesaikan oleh anonim <abbr title='%{exact_time}'>%{when}
+        yang lalu</abbr>
+      reopened_by_html: Diaktifkan kembali oleh %{user} <abbr title='%{exact_time}'>%{when}
+        yang lalu</abbr>
+      reopened_by_anonymous_html: Diaktifkan kembali oleh anonim <abbr title='%{exact_time}'>%{when}
+        yang lalu</abbr>
+      hidden_by_html: Disembunyikan oleh %{user} <abbr title='%{exact_time}'>%{when}
+        yang lalu</abbr>
+      report: laporkan catatan ini
+      anonymous_warning: Catatan ini termasuk komentar dari pengguna anonim yang harus
+        diverifikasi secara independen.
+      hide: Sembunyikan
+      resolve: Selesaikan
+      reactivate: Aktifkan kembali
+      comment_and_resolve: Komentar & Selesaikan
+      comment: Komentar
+      other_problems_resolved: Untuk semua masalah lain, penyelesaian sudah cukup.
+    new:
+      title: Catatan Baru
+      intro: Melihat kesalahan atau sesuatu yang hilang? Biarkan pembuat peta lainnya
+        agar kami dapat memperbaikinya. Pindahkan penanda ke posisi yang benar dan
+        ketik catatan untuk menjelaskan masalah.
+      advice: Catatan Anda bersifat publik dan bisa digunakan untuk memperbarui peta,
+        jadi jangan masukkan informasi pribadi, atau informasi dari peta atau daftar
+        direktori yang berhak cipta.
+      add: Tambah Catatan
   javascripts:
     close: Tutup
     share:
@@ -2950,24 +2966,6 @@ id:
         unsubscribe: Berhenti berlangganan
         hide_comment: sembunyikan
         unhide_comment: Jangan sembunyikan
-    notes:
-      new:
-        intro: Melihat kesalahan atau sesuatu yang hilang? Biarkan pembuat peta lainnya
-          agar kami dapat memperbaikinya. Pindahkan penanda ke posisi yang benar dan
-          ketik catatan untuk menjelaskan masalah.
-        advice: Catatan Anda bersifat publik dan bisa digunakan untuk memperbarui
-          peta, jadi jangan masukkan informasi pribadi, atau informasi dari peta atau
-          daftar direktori yang berhak cipta.
-        add: Tambah Catatan
-      show:
-        anonymous_warning: Catatan ini termasuk komentar dari pengguna anonim yang
-          harus diverifikasi secara independen.
-        hide: Sembunyikan
-        resolve: Selesaikan
-        reactivate: Aktifkan kembali
-        comment_and_resolve: Komentar & Selesaikan
-        comment: Komentar
-        other_problems_resolved: Untuk semua masalah lain, penyelesaian sudah cukup.
     edit_help: Memindahkan peta dan memperbesar lokasi yang ingin Anda sunting, kemudian
       klik di sini.
     directions:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 65f8c2155..fe428e2a5 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -449,25 +449,6 @@ is:
       telephone_link: Hringja í %{phone_number}
       colour_preview: Forskoðun á litnum %{colour_value}
       email_link: Tölvupóstfang %{email}
-    note:
-      title: 'Minnispunktur: %{id}'
-      new_note: Nýr minnispunktur
-      description: Lýsing
-      open_title: 'Minnispunktur án lausnar #%{note_name}'
-      closed_title: 'Minnispunktur með lausn #%{note_name}'
-      hidden_title: 'Falinn minnispunktur #%{note_name}'
-      opened_by_html: Búið til af %{user} <abbr title='%{exact_time}'>fyrir %{when}
-        síðan</abbr>
-      opened_by_anonymous_html: Búið til af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}
-        síðan</abbr>
-      commented_by_html: Umsögn frá %{user} <abbr title='%{exact_time}'> %{when}</abbr>
-      commented_by_anonymous_html: Umsögn frá nafnlausum notanda <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Leyst af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
-      closed_by_anonymous_html: Leyst af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Endurvirkjað af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
-      reopened_by_anonymous_html: Endurvirkjað af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Falið af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
-      report: tilkynnt þennan minnispunkt
     query:
       title: Rannsaka fitjur
       introduction: Smelltu á kortið til að finna fitjur í nágrenninu.
@@ -2981,6 +2962,47 @@ is:
       description: Lýsing
       created_at: Búið til í
       last_changed: Síðast breytt
+    show:
+      title: 'Minnispunktur: %{id}'
+      description: Lýsing
+      open_title: 'Minnispunktur án lausnar #%{note_name}'
+      closed_title: 'Minnispunktur með lausn #%{note_name}'
+      hidden_title: 'Falinn minnispunktur #%{note_name}'
+      opened_by_html: Búið til af %{user} <abbr title='%{exact_time}'>fyrir %{when}
+        síðan</abbr>
+      opened_by_anonymous_html: Búið til af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}
+        síðan</abbr>
+      commented_by_html: Umsögn frá %{user} <abbr title='%{exact_time}'> %{when}</abbr>
+      commented_by_anonymous_html: Umsögn frá nafnlausum notanda <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Leyst af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
+      closed_by_anonymous_html: Leyst af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Endurvirkjað af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
+      reopened_by_anonymous_html: Endurvirkjað af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Falið af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
+      report: tilkynnt þennan minnispunkt
+      anonymous_warning: Þessi minnispunktur inniheldur athugasemdir frá óskráðum
+        notendum sem ætti að yfirfara sérstaklega.
+      hide: Fela
+      resolve: Leysa
+      reactivate: Virkja aftur
+      comment_and_resolve: Athugasemd & leysa
+      comment: Athugasemd
+      report_link_html: Ef þessi minnispunktur inniheldur viðkvæmar upplýsingar sem
+        þarf að fjarlægja geturðu %{link}.
+      other_problems_resolve: Fyrir öll önnur vandamál með minnispunktinn, skaltu
+        leysa þau sjálf/ur með athugasemd.
+      other_problems_resolved: Fyrir öll önnur vandamál með minnispunktinn, ætti að
+        vera nóg að leysa þau.
+      disappear_date_html: Þessi leysta athugasemd mun hverfa af kortinu eftir %{disappear_in}.
+    new:
+      title: Nýr minnispunktur
+      intro: Fannstu mistök eða eitthvað sem vantar? Láttu aðra kortagerðarmenn vita
+        svo hægt sé að laga það. Færðu kortamerkið á réttan stað og skrifaðu minnispunkt
+        til að útskýra vandamálið.
+      advice: Minnispunkturinn þinn er opinber og gæti verið notaður til að uppfæra
+        kortið; því ættirðu ekki að setja inn neinar persónulegar upplýsingar, eða
+        upplýsingar úr höfundarvörðu efni.
+      add: Bæta við minnispunkti
   javascripts:
     close: Loka
     share:
@@ -3062,30 +3084,6 @@ is:
         unsubscribe: Hætta í áskrift
         hide_comment: fela
         unhide_comment: hætta að fela
-    notes:
-      new:
-        intro: Fannstu mistök eða eitthvað sem vantar? Láttu aðra kortagerðarmenn
-          vita svo hægt sé að laga það. Færðu kortamerkið á réttan stað og skrifaðu
-          minnispunkt til að útskýra vandamálið.
-        advice: Minnispunkturinn þinn er opinber og gæti verið notaður til að uppfæra
-          kortið; því ættirðu ekki að setja inn neinar persónulegar upplýsingar, eða
-          upplýsingar úr höfundarvörðu efni.
-        add: Bæta við minnispunkti
-      show:
-        anonymous_warning: Þessi minnispunktur inniheldur athugasemdir frá óskráðum
-          notendum sem ætti að yfirfara sérstaklega.
-        hide: Fela
-        resolve: Leysa
-        reactivate: Virkja aftur
-        comment_and_resolve: Athugasemd & leysa
-        comment: Athugasemd
-        report_link_html: Ef þessi minnispunktur inniheldur viðkvæmar upplýsingar
-          sem þarf að fjarlægja geturðu %{link}.
-        other_problems_resolve: Fyrir öll önnur vandamál með minnispunktinn, skaltu
-          leysa þau sjálf/ur með athugasemd.
-        other_problems_resolved: Fyrir öll önnur vandamál með minnispunktinn, ætti
-          að vera nóg að leysa þau.
-        disappear_date_html: Þessi leysta athugasemd mun hverfa af kortinu eftir %{disappear_in}.
     edit_help: Færðu kortið og stilltu aðdrátt inn á staðinn sem þú vilt breyta, smelltu
       síðan hér.
     directions:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 04a201ffe..727269179 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -493,23 +493,6 @@ it:
       telephone_link: Chiama %{phone_number}
       colour_preview: Anteprima colore %{colour_value}
       email_link: Email %{email}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nuova nota
-      description: Descrizione
-      open_title: 'Nota irrisolta #%{note_name}'
-      closed_title: 'Nota risolta #%{note_name}'
-      hidden_title: 'Nota nascosta #%{note_name}'
-      opened_by_html: Creata da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Creata da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Commento da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Commento da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Risolta da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Risolta da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Riattivata da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Riattivata da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Nascosta da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: segnalare questa nota
     query:
       title: Ricerca di elementi
       introduction: Clicca sulla cartina per disponibilità nei pressi.
@@ -3038,6 +3021,44 @@ it:
       description: Descrizione
       created_at: Creata il
       last_changed: Modificata per l'ultima volta
+    show:
+      title: 'Nota: %{id}'
+      description: Descrizione
+      open_title: 'Nota irrisolta #%{note_name}'
+      closed_title: 'Nota risolta #%{note_name}'
+      hidden_title: 'Nota nascosta #%{note_name}'
+      opened_by_html: Creata da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Creata da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Commento da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Commento da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Risolta da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Risolta da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Riattivata da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Riattivata da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Nascosta da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: segnalare questa nota
+      anonymous_warning: Questa nota include commenti da parte di utenti anonimi che
+        devono essere verificati in modo indipendente.
+      hide: Nascondi
+      resolve: Risolta
+      reactivate: Riattiva
+      comment_and_resolve: Commenta e chiudi
+      comment: Commenta
+      report_link_html: Se questa nota contiene informazioni sensibili che devono
+        essere rimosse, puoi %{link}.
+      other_problems_resolve: Per tutti gli altri problemi con la nota, risolvilo
+        tu stesso con un commento.
+      other_problems_resolved: Per tutti gli altri problemi, la risoluzione è sufficiente.
+      disappear_date_html: Questa nota risolta scomparirà dalla mappa tra %{disappear_in}.
+    new:
+      title: Nuova nota
+      intro: Ti sei accorto di un errore o di qualcosa che manca? Fallo sapere agli
+        altri mappatori così possono correggerlo. Sposta il puntatore nella posizione
+        esatta e inserisci una nota per spiegare il problema.
+      advice: La tua nota è pubblica e potrebbe essere utilizzata per aggiornare la
+        mappa, pertanto non inserire informazioni personali e neppure dati provenienti
+        da mappe protette da copyright oppure elenchi.
+      add: Aggiungi la nota
   javascripts:
     close: Chiudi
     share:
@@ -3120,29 +3141,6 @@ it:
         unsubscribe: Cancella iscrizione
         hide_comment: nascondi
         unhide_comment: Rendi visibile
-    notes:
-      new:
-        intro: Ti sei accorto di un errore o di qualcosa che manca? Fallo sapere agli
-          altri mappatori così possono correggerlo. Sposta il puntatore nella posizione
-          esatta e inserisci una nota per spiegare il problema.
-        advice: La tua nota è pubblica e potrebbe essere utilizzata per aggiornare
-          la mappa, pertanto non inserire informazioni personali e neppure dati provenienti
-          da mappe protette da copyright oppure elenchi.
-        add: Aggiungi la nota
-      show:
-        anonymous_warning: Questa nota include commenti da parte di utenti anonimi
-          che devono essere verificati in modo indipendente.
-        hide: Nascondi
-        resolve: Risolta
-        reactivate: Riattiva
-        comment_and_resolve: Commenta e chiudi
-        comment: Commenta
-        report_link_html: Se questa nota contiene informazioni sensibili che devono
-          essere rimosse, puoi %{link}.
-        other_problems_resolve: Per tutti gli altri problemi con la nota, risolvilo
-          tu stesso con un commento.
-        other_problems_resolved: Per tutti gli altri problemi, la risoluzione è sufficiente.
-        disappear_date_html: Questa nota risolta scomparirà dalla mappa tra %{disappear_in}.
     edit_help: Sposta la mappa e usa lo zoom sulla posizione che vuoi modificare,
       quindi clicca qui.
     directions:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 382f67096..c0c1892c1 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -459,23 +459,6 @@ ja:
       telephone_link: '%{phone_number}に電話'
       colour_preview: 色彩%{colour_value}プレビュー
       email_link: メール %{email}
-    note:
-      title: 'メモ: %{id}'
-      new_note: 新しいメモ
-      description: 説明
-      open_title: '未解決のメモ #%{note_name}'
-      closed_title: '解決済のメモ #%{note_name}'
-      hidden_title: '非表示のメモ #%{note_name}'
-      opened_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に作成'
-      opened_by_anonymous_html: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に作成
-      commented_by_html: '%{user}さんによる<abbr title=''%{exact_time}''>%{when}</abbr>のコメント'
-      commented_by_anonymous_html: 誰かによる<abbr title='%{exact_time}'>%{when}</abbr>のコメント
-      closed_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に解決'
-      closed_by_anonymous_html: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に解決
-      reopened_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に再開'
-      reopened_by_anonymous_html: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に再開
-      hidden_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に非表示化'
-      report: このノートを報告
     query:
       title: 地物を検索
       introduction: 地図上をクリックすると、近くの地物を探します。
@@ -2723,6 +2706,35 @@ ja:
       description: 説明
       created_at: 作成日時
       last_changed: 最近の変更
+    show:
+      title: 'メモ: %{id}'
+      description: 説明
+      open_title: '未解決のメモ #%{note_name}'
+      closed_title: '解決済のメモ #%{note_name}'
+      hidden_title: '非表示のメモ #%{note_name}'
+      opened_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に作成'
+      opened_by_anonymous_html: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に作成
+      commented_by_html: '%{user}さんによる<abbr title=''%{exact_time}''>%{when}</abbr>のコメント'
+      commented_by_anonymous_html: 誰かによる<abbr title='%{exact_time}'>%{when}</abbr>のコメント
+      closed_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に解決'
+      closed_by_anonymous_html: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に解決
+      reopened_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に再開'
+      reopened_by_anonymous_html: 誰かが<abbr title='%{exact_time}'>%{when}</abbr>に再開
+      hidden_by_html: '%{user}さんが<abbr title=''%{exact_time}''>%{when}</abbr>に非表示化'
+      report: このノートを報告
+      anonymous_warning: このメモはIP利用者によるコメントも含んでいるため、個別に確認してください。
+      hide: 隠す
+      resolve: 解決
+      reactivate: 再有効化
+      comment_and_resolve: コメント & 解決
+      comment: コメント
+      report_link_html: このメモに削除が必要な機密情報が含まれている場合は、%{link}してください。
+      other_problems_resolved: 他の問題には、解くだけで十分です。
+    new:
+      title: 新しいメモ
+      intro: 間違いや情報の抜けがありましたか？　他のマッパーが修正できるよう、お知らせください。マーカーを正しい位置に移動し、問題を説明するメモを入力します。
+      advice: 投稿した地図メモは公開され、地図の更新に利用されます。そのため、著作権保護された地図や一覧情報からの転用情報や、個人情報の入力は行わないでください。
+      add: メモを追加
   javascripts:
     close: 閉じる
     share:
@@ -2803,20 +2815,6 @@ ja:
         unsubscribe: 購読停止
         hide_comment: 非表示
         unhide_comment: 非表示を解除
-    notes:
-      new:
-        intro: 間違いや情報の抜けがありましたか？　他のマッパーが修正できるよう、お知らせください。マーカーを正しい位置に移動し、問題を説明するメモを入力します。
-        advice: 投稿した地図メモは公開され、地図の更新に利用されます。そのため、著作権保護された地図や一覧情報からの転用情報や、個人情報の入力は行わないでください。
-        add: メモを追加
-      show:
-        anonymous_warning: このメモはIP利用者によるコメントも含んでいるため、個別に確認してください。
-        hide: 隠す
-        resolve: 解決
-        reactivate: 再有効化
-        comment_and_resolve: コメント & 解決
-        comment: コメント
-        report_link_html: このメモに削除が必要な機密情報が含まれている場合は、%{link}してください。
-        other_problems_resolved: 他の問題には、解くだけで十分です。
     edit_help: 編集したい位置に移動してズームインしてから、ここをクリックしてください。
     directions:
       ascend: 上り坂
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 863bc95c4..83ead68c6 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -224,13 +224,6 @@ ka:
     tag_details:
       wikipedia_link: სტატია %{page} ვიკიპედიაში
       telephone_link: დარეკეთ %{phone_number}
-    note:
-      title: 'შენიშვნა: %{id}'
-      new_note: ახალი შენიშვნა
-      description: აღწერა
-      open_title: 'დაუმუშავებელი შენიშვნა #%{note_name}'
-      closed_title: 'დამუშავებული შენიშვნა #%{note_name}'
-      hidden_title: 'დამალული შენიშვნა #%{note_name}'
   changesets:
     changeset_paging_nav:
       showing_page: გვერდი %{page}
@@ -1169,6 +1162,17 @@ ka:
     index:
       creator: შემქმნელი
       description: აღწერა
+    show:
+      title: 'შენიშვნა: %{id}'
+      description: აღწერა
+      open_title: 'დაუმუშავებელი შენიშვნა #%{note_name}'
+      closed_title: 'დამუშავებული შენიშვნა #%{note_name}'
+      hidden_title: 'დამალული შენიშვნა #%{note_name}'
+      hide: დამალვა
+      comment: კომენტარი
+    new:
+      title: ახალი შენიშვნა
+      add: შენიშვნის დამატება
   javascripts:
     map:
       base:
@@ -1179,12 +1183,6 @@ ka:
       edit_tooltip: რუკის რედაქტირება
       edit_disabled_tooltip: რედაქტირებისათვის გაზარდეთ რუკის მასშტაბი
       createnote_tooltip: რუკაზე შენიშვნის დამატება
-    notes:
-      new:
-        add: შენიშვნის დამატება
-      show:
-        hide: დამალვა
-        comment: კომენტარი
     context:
       show_address: მისამართის ჩვენება
   redactions:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index d805791dd..028a4a367 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -335,28 +335,6 @@ kab:
       wikimedia_commons_link: Aferdis %{page} deg Wikimedia Commons
       telephone_link: Siwel ar %{phone_number}
       colour_preview: Taskant n yini %{colour_value}
-    note:
-      title: 'Tazmilt: %{id}'
-      new_note: Tazmilt tamaynut
-      description: Aglam
-      open_title: 'Tazmilt ur yefrin ara  #%{note_name}'
-      closed_title: 'Tazmilt ur yefrin ara #%{note_name}'
-      hidden_title: 'Tazmilt yeffren #%{note_name}'
-      opened_by_html: Yerna-t %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
-      opened_by_anonymous_html: Yernat useqdac udrig <abbr title='%{exact_time}'>%{when}
-        aya</abbr>
-      commented_by_html: Awennit sɣur %{user} <abbr title='%{exact_time}'>%{when}
-        aya</abbr>
-      commented_by_anonymous_html: Awennit n useqdac udrig <abbr title='%{exact_time}'>%{when}
-        aya</abbr>
-      closed_by_html: Yefra-t %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
-      closed_by_anonymous_html: YEfra-t useqdac udrig <abbr title='%{exact_time}'>%{when}
-        aya</abbr>
-      reopened_by_html: Irmed-it %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
-      reopened_by_anonymous_html: Irmed-it useqdac udrig <abbr title='%{exact_time}'>%{when}
-        aya</abbr>
-      hidden_by_html: Yeffer-it %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
-      report: Sillef tazmilt agi
     query:
       title: Tuttriwin ɣef tɣawsiwin
       introduction: Sit ɣef tkarḍa allen ad tafeḍ tiɣawsiwin iqeṛben.
@@ -1459,6 +1437,35 @@ kab:
       description: Aglam
       created_at: Yettwarna di
       last_changed: Asnifel aneggaru
+    show:
+      title: 'Tazmilt: %{id}'
+      description: Aglam
+      open_title: 'Tazmilt ur yefrin ara  #%{note_name}'
+      closed_title: 'Tazmilt ur yefrin ara #%{note_name}'
+      hidden_title: 'Tazmilt yeffren #%{note_name}'
+      opened_by_html: Yerna-t %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
+      opened_by_anonymous_html: Yernat useqdac udrig <abbr title='%{exact_time}'>%{when}
+        aya</abbr>
+      commented_by_html: Awennit sɣur %{user} <abbr title='%{exact_time}'>%{when}
+        aya</abbr>
+      commented_by_anonymous_html: Awennit n useqdac udrig <abbr title='%{exact_time}'>%{when}
+        aya</abbr>
+      closed_by_html: Yefra-t %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
+      closed_by_anonymous_html: YEfra-t useqdac udrig <abbr title='%{exact_time}'>%{when}
+        aya</abbr>
+      reopened_by_html: Irmed-it %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
+      reopened_by_anonymous_html: Irmed-it useqdac udrig <abbr title='%{exact_time}'>%{when}
+        aya</abbr>
+      hidden_by_html: Yeffer-it %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
+      report: Sillef tazmilt agi
+      hide: Ffer
+      resolve: Fru
+      reactivate: Rmed
+      comment_and_resolve: Rnu awennit & Fru
+      comment: Awennit
+    new:
+      title: Tazmilt tamaynut
+      add: Rnu tazmilt
   javascripts:
     close: Mdel
     share:
@@ -1491,15 +1498,6 @@ kab:
         unsubscribe: Ffeɣ seg ujerred
         hide_comment: ffer
         unhide_comment: sken
-    notes:
-      new:
-        add: Rnu tazmilt
-      show:
-        hide: Ffer
-        resolve: Fru
-        reactivate: Rmed
-        comment_and_resolve: Rnu awennit & Fru
-        comment: Awennit
     directions:
       engines:
         fossgis_osrm_car: S tkeṛṛust (<i>OSRM</i>)
diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 615c9f513..d8eceda1d 100644
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -312,11 +312,6 @@ kk-cyrl:
       telephone_link: '%{phone_number} қоңырау шалу'
       colour_preview: '%{colour_value} түсін көру'
       email_link: '%{email} хат жіберу'
-    note:
-      title: 'Естелік: %{id}'
-      new_note: Жаңа естелік
-      description: Сипаттама
-      opened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} жасаған
   changesets:
     changeset_paging_nav:
       showing_page: '%{page}-беті'
@@ -1134,6 +1129,14 @@ kk-cyrl:
   notes:
     index:
       description: Сипаттама
+    show:
+      title: 'Естелік: %{id}'
+      description: Сипаттама
+      opened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} жасаған
+      hide: Жасыру
+    new:
+      title: Жаңа естелік
+      add: Естелік қосу
   javascripts:
     close: Жабу
     share:
@@ -1168,11 +1171,6 @@ kk-cyrl:
         subscribe: Жазылу
         hide_comment: жасыру
         unhide_comment: көрсету
-    notes:
-      new:
-        add: Естелік қосу
-      show:
-        hide: Жасыру
     directions:
       engines:
         fossgis_osrm_bike: Велосипед (OSRM)
diff --git a/config/locales/km.yml b/config/locales/km.yml
index 03f3bdf52..6876a5ad2 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -170,16 +170,6 @@ km:
     tag_details:
       tags: ស្លាក​
       wikipedia_link: អត្ថបទ %{page} នៅលើវិគីភីឌា
-    note:
-      title: កំណត់សម្គាល់៖ %{id}
-      new_note: កំណត់សម្គាល់ថ្មី
-      description: ការពិពណ៌នា
-      opened_by_html: បង្កើតដោយ %{user} <abbr title='%{exact_time}'>%{when} មុន</abbr>
-      opened_by_anonymous_html: បង្កើតឡើងដោយជនអនាមិក <abbr title='%{exact_time}'>%{when}
-        មុន</abbr>
-      commented_by_html: មតិពី %{user} <abbr title='%{exact_time}'>%{when} មុន</abbr>
-      commented_by_anonymous_html: មតិពីជនអនាមិក <abbr title='%{exact_time}'>%{when}
-        មុន</abbr>
   changesets:
     changeset_paging_nav:
       showing_page: ទំព័រ %{page}
@@ -799,6 +789,18 @@ km:
       remove as friend: ដកចេញជាមិត្ត​
       add as friend: បន្ថែមជាមិត្ត​
       description: បរិយាយ​
+  notes:
+    show:
+      title: កំណត់សម្គាល់៖ %{id}
+      description: ការពិពណ៌នា
+      opened_by_html: បង្កើតដោយ %{user} <abbr title='%{exact_time}'>%{when} មុន</abbr>
+      opened_by_anonymous_html: បង្កើតឡើងដោយជនអនាមិក <abbr title='%{exact_time}'>%{when}
+        មុន</abbr>
+      commented_by_html: មតិពី %{user} <abbr title='%{exact_time}'>%{when} មុន</abbr>
+      commented_by_anonymous_html: មតិពីជនអនាមិក <abbr title='%{exact_time}'>%{when}
+        មុន</abbr>
+    new:
+      title: កំណត់សម្គាល់ថ្មី
   javascripts:
     embed:
       report_problem: រាយការណ៍​បញ្ហា
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 1056a417c..dda76034a 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -254,13 +254,6 @@ kn:
     tag_details:
       tags: ಟ್ಯಾಗ್‌ಗಳು
       telephone_link: '%{phone_number} ಕರೆಮಾಡಿ'
-    note:
-      title: 'ಟಿಪ್ಪಣಿ: %{id}'
-      new_note: ಹೊಸ ಟಿಪ್ಪಣಿ
-      description: ವಿವರ
-      open_title: 'ಬಗೆಹರಿಯದ ಟಿಪ್ಪಣಿ #%{note_name}'
-      closed_title: 'ಬಗೆಹರಿದ ಟಿಪ್ಪಣಿ #%{note_name}'
-      hidden_title: 'ಅಡಗಿಸಿದ ಟಿಪ್ಪಣಿ #%{note_name}'
     query:
       introduction: ಹತ್ತಿರದ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಹುಡುಕಲು ನಕ್ಷೆಯ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ.
       nearby: ಹತ್ತಿರದ ವೈಶಿಷ್ಟ್ಯಗಳು
@@ -797,6 +790,15 @@ kn:
   user_blocks:
     show:
       created: 'ಸೃಷ್ಟಿಸಲ್ಪಟ್ಟಿದೆ:'
+  notes:
+    show:
+      title: 'ಟಿಪ್ಪಣಿ: %{id}'
+      description: ವಿವರ
+      open_title: 'ಬಗೆಹರಿಯದ ಟಿಪ್ಪಣಿ #%{note_name}'
+      closed_title: 'ಬಗೆಹರಿದ ಟಿಪ್ಪಣಿ #%{note_name}'
+      hidden_title: 'ಅಡಗಿಸಿದ ಟಿಪ್ಪಣಿ #%{note_name}'
+    new:
+      title: ಹೊಸ ಟಿಪ್ಪಣಿ
   javascripts:
     directions:
       instructions:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 88fd2464d..b466d0391 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -421,26 +421,6 @@ ko:
       telephone_link: '%{phone_number}(으)로 전화 걸기'
       colour_preview: '%{colour_value}색 미리 보기'
       email_link: 이메일 %{email}
-    note:
-      title: '참고: %{id}'
-      new_note: 새로운 참고
-      description: 설명
-      open_title: '해결되지 않은 참고 #%{note_name}'
-      closed_title: '해결된 참고 #%{note_name}'
-      hidden_title: '숨겨진 참고 #%{note_name}'
-      opened_by_html: '%{user}님이 <abbr title=''%{exact_time}''>%{when}</abbr>에 만듦'
-      opened_by_anonymous_html: 익명이 <abbr title='%{exact_time}'>%{when}</abbr>에 만듦
-      commented_by_html: '%{user}님의 <abbr title=''%{exact_time}''>%{when}</abbr> 의견'
-      commented_by_anonymous_html: 익명 사용자의 <abbr title='%{exact_time}'>%{when}</abbr>
-        의견
-      closed_by_html: '%{user}님이 <abbr title=''%{exact_time}''>%{when}</abbr>에 해결함'
-      closed_by_anonymous_html: 익명이 <abbr title='%{exact_time}'>%{when}</abbr>에 해결함
-      reopened_by_html: '%{user} 님이 <abbr title=''%{exact_time}''>%{when}</abbr>에
-        다시 활성화함'
-      reopened_by_anonymous_html: 익명이 <abbr title='%{exact_time}'>%{when}</abbr>에
-        다시 활성화함
-      hidden_by_html: '%{user}님이 <abbr title=''%{exact_time}''>%{when}</abbr>에 숨김'
-      report: 이 참고 신고
     query:
       title: 지물 정보
       introduction: 근처의 지물을 찾으려면 지도에서 클릭하세요.
@@ -1080,6 +1060,7 @@ ko:
           stone: 돌
           strait: 해협
           tree: 나무
+          tree_row: 나무 열
           tundra: 툰드라
           valley: 골짜기
           volcano: 화산
@@ -1102,7 +1083,9 @@ ko:
           insurance: 보험 회사 사옥
           it: IT 오피스
           lawyer: 변호사 사무실
+          newspaper: 신문사
           ngo: 비정부 기구 사무실
+          research: 연구실
           tax_advisor: 세무사
           telecommunication: 통신 회사 사옥
           travel_agent: 여행사
@@ -1211,6 +1194,7 @@ ko:
           fishing: 낚시용품점
           florist: 꽃집
           food: 음식 가게
+          frame: 액자 가게
           funeral_directors: 장례식장
           furniture: 가구점
           garden_centre: 원예 용품점
@@ -1260,6 +1244,7 @@ ko:
           shoes: 신발 가게
           sports: 스포츠용품점
           stationery: 문구점
+          storage_rental: 창고 대여
           supermarket: 대형 슈퍼마켓
           tailor: 양복점
           tattoo: 문신소
@@ -1273,6 +1258,7 @@ ko:
           variety_store: 잡화점
           video: 비디오 가게
           video_games: 게임 판매점
+          wholesale: 도매점
           wine: 와인 상점
           "yes": 상점
         tourism:
@@ -1763,6 +1749,8 @@ ko:
       heading: OpenStreetMap에서 로그아웃
       logout_button: 로그아웃
     suspended_flash:
+      suspended: 죄송합니다. 의심스러운 활동으로 인해 계정이 정지되었습니다.
+      contact_support_html: 이에 대해 논의하려면 %{support_link}에 문의하세요.
       support: 지원
   shared:
     markdown_help:
@@ -1843,7 +1831,7 @@ ko:
           <a href="https://creativecommons.org/licenses/by-sa/2.0/">크리에이티브
           커먼즈 저작자표시-동일조건변경허락 2.0</a> 라이선스(CC BY-SA)에 따라 사용할 수 있습니다.
         credit_title_html: OpenStreetMap 제작진 넣는 방법
-        credit_1_html: '&ldquo;&copy; OpenStreetMap 기여자&rdquo;를 저작자로 사용해야 합니다.'
+        credit_1_html: OpenStreetMap 데이터를 사용하는 경우 다음 두 가지를 수행해야 합니다.
         credit_2_1_html: |-
           또한 데이터는 오픈 데이터베이스 라이선스에 따라 사용할 수 있으며, 지도 제작은
           지도 타일을 사용할 때에 CC-BY-SA로 허가한다는 내용을 명확하게 통지해야 합니다.
@@ -2438,6 +2426,7 @@ ko:
       title: 내 인증한 애플리케이션
       application: 애플리케이션
       permissions: 권한
+      no_applications_html: 아직 %{oauth2} 애플리케이션을 승인하지 않았습니다.
     application:
       revoke: 접근 취소
       confirm_revoke: 이 애플리케이션에 대한 액세스 권한을 취소하시겠습니까?
@@ -2570,6 +2559,7 @@ ko:
       heading: 계정 정지
       support: 지원
       automatically_suspended: 죄송합니다. 의심스러운 활동으로 인해 귀하의 계정이 자동으로 정지되었습니다.
+      contact_support_html: 곧 관리자에게 검토됩니다. 논의를 원하시면 %{support_link}에 연락하실 수 있습니다.
     auth_failure:
       connection_failed: 인증 제공자와 연결하는 데 실패했습니다
       invalid_credentials: 잘못된 인증 자격 증명
@@ -2710,6 +2700,41 @@ ko:
       description: 설명
       created_at: 만든 날짜
       last_changed: 마지막으로 바뀜
+    show:
+      title: '참고: %{id}'
+      description: 설명
+      open_title: '해결되지 않은 참고 #%{note_name}'
+      closed_title: '해결된 참고 #%{note_name}'
+      hidden_title: '숨겨진 참고 #%{note_name}'
+      opened_by_html: '%{user}님이 <abbr title=''%{exact_time}''>%{when}</abbr>에 만듦'
+      opened_by_anonymous_html: 익명이 <abbr title='%{exact_time}'>%{when}</abbr>에 만듦
+      commented_by_html: '%{user}님의 <abbr title=''%{exact_time}''>%{when}</abbr> 의견'
+      commented_by_anonymous_html: 익명 사용자의 <abbr title='%{exact_time}'>%{when}</abbr>
+        의견
+      closed_by_html: '%{user}님이 <abbr title=''%{exact_time}''>%{when}</abbr>에 해결함'
+      closed_by_anonymous_html: 익명이 <abbr title='%{exact_time}'>%{when}</abbr>에 해결함
+      reopened_by_html: '%{user} 님이 <abbr title=''%{exact_time}''>%{when}</abbr>에
+        다시 활성화함'
+      reopened_by_anonymous_html: 익명이 <abbr title='%{exact_time}'>%{when}</abbr>에
+        다시 활성화함
+      hidden_by_html: '%{user}님이 <abbr title=''%{exact_time}''>%{when}</abbr>에 숨김'
+      report: 이 참고 신고
+      anonymous_warning: 이 참고에는 익명 사용자의 덧글도 있으므로 별도로 확인해야 합니다.
+      hide: 숨기기
+      resolve: 해결
+      reactivate: 다시 활성화
+      comment_and_resolve: 의견 및 해결
+      comment: 의견
+      report_link_html: 이 참고에 삭제해야 하는 민감한 정보가 포함되어 있으면 %{link}할 수 있습니다.
+      other_problems_resolve: 참고의 다른 모든 문제는 댓글로 직접 해결하시기 바랍니다.
+      other_problems_resolved: 다른 모든 문제는 해결하는 것으로 충분합니다.
+      disappear_date_html: 이 해결된 참고는 %{disappear_in}에 지도에서 사라집니다.
+    new:
+      title: 새로운 참고
+      intro: 실수했거나 없는 무언가를 발견했나요? 다른 매퍼에게 알려주어 고칠 수 있게 해주세요. 마커를 올바른 위치로 이동하고, 참고를
+        남겨 문제를 설명해주세요.
+      advice: 노트는 공개되어 지도 업데이트에 쓰일 수 있으므로 개인정보 또는 저작권이 있는 지도나 디렉터리 리스팅의 정보를 입력하지 마십시오.
+      add: 참고 추가
   javascripts:
     close: 닫기
     share:
@@ -2788,24 +2813,6 @@ ko:
         unsubscribe: 구독 해지
         hide_comment: 숨기기
         unhide_comment: 숨기기 취소
-    notes:
-      new:
-        intro: 실수했거나 없는 무언가를 발견했나요? 다른 매퍼에게 알려주어 고칠 수 있게 해주세요. 마커를 올바른 위치로 이동하고, 참고를
-          남겨 문제를 설명해주세요.
-        advice: 노트는 공개되어 지도 업데이트에 쓰일 수 있으므로 개인정보 또는 저작권이 있는 지도나 디렉터리 리스팅의 정보를 입력하지
-          마십시오.
-        add: 참고 추가
-      show:
-        anonymous_warning: 이 참고에는 익명 사용자의 덧글도 있으므로 별도로 확인해야 합니다.
-        hide: 숨기기
-        resolve: 해결
-        reactivate: 다시 활성화
-        comment_and_resolve: 의견 및 해결
-        comment: 의견
-        report_link_html: 이 참고에 삭제해야 하는 민감한 정보가 포함되어 있으면 %{link}할 수 있습니다.
-        other_problems_resolve: 참고의 다른 모든 문제는 댓글로 직접 해결하시기 바랍니다.
-        other_problems_resolved: 다른 모든 문제는 해결하는 것으로 충분합니다.
-        disappear_date_html: 이 해결된 참고는 %{disappear_in}에 지도에서 사라집니다.
     edit_help: 편집하려는 위치에 지도를 이동하고 확대한 다음, 여기를 클릭하세요.
     directions:
       ascend: 올라가기
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index d2811c3ee..a71c8476c 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -446,31 +446,6 @@ ku-Latn:
       telephone_link: Li %{phone_number} bigere
       colour_preview: Pêşdîtina rengê %{colour_value}
       email_link: Epeyam bişîne %{email}
-    note:
-      title: 'Not: %{id}'
-      new_note: Notê nû
-      description: Danasîn
-      open_title: 'Nota ku nehatiye çarekirin #%{note_name}'
-      closed_title: 'Nota ku hatiye çarekirin #%{note_name}'
-      hidden_title: 'Notê veşartî #%{note_name}'
-      opened_by_html: Ji alî %{user} ve berî</abbr>  <abbr title='%{exact_time}'>%{when}
-        hatiye çêkirin
-      opened_by_anonymous_html: Berî</abbr> <abbr title='%{exact_time}'>%{when} wek
-        anonîm hate çêkirin.
-      commented_by_html: Şiroveya ji %{user} </abbr> <abbr title='%{exact_time}'>%{when}
-      commented_by_anonymous_html: Şîrove ji alî bikarhênerek anonîm ve </abbr> <abbr
-        title='%{exact_time}'>%{when}
-      closed_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when}
-        hate çareserkirin
-      closed_by_anonymous_html: Ji aliyê bikarhênerek anonîm ve </abbr> <abbr title='%{exact_time}'>%{when}
-        hate çareserkirin
-      reopened_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when}
-        ji nû ve hate aktîvkirin
-      reopened_by_anonymous_html: Ji aliyê bikarhênerek anonîm ve </abbr> <abbr title='%{exact_time}'>%{when}
-        ji nû ve hate aktîvkirin
-      hidden_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when}
-        hate veşartin
-      report: vê nîşeyê gilî bike
     query:
       title: Taybetmendiyan Nîşan Bide
       introduction: Ji bo ku hûn taybetmendiyên din yên nêzîkî bibînin, bitikînin
@@ -2986,6 +2961,53 @@ ku-Latn:
       description: Danasîn
       created_at: Wextê çêkirinê
       last_changed: Guherandinê dawîn
+    show:
+      title: 'Not: %{id}'
+      description: Danasîn
+      open_title: 'Nota ku nehatiye çarekirin #%{note_name}'
+      closed_title: 'Nota ku hatiye çarekirin #%{note_name}'
+      hidden_title: 'Notê veşartî #%{note_name}'
+      opened_by_html: Ji alî %{user} ve berî</abbr>  <abbr title='%{exact_time}'>%{when}
+        hatiye çêkirin
+      opened_by_anonymous_html: Berî</abbr> <abbr title='%{exact_time}'>%{when} wek
+        anonîm hate çêkirin.
+      commented_by_html: Şiroveya ji %{user} </abbr> <abbr title='%{exact_time}'>%{when}
+      commented_by_anonymous_html: Şîrove ji alî bikarhênerek anonîm ve </abbr> <abbr
+        title='%{exact_time}'>%{when}
+      closed_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when}
+        hate çareserkirin
+      closed_by_anonymous_html: Ji aliyê bikarhênerek anonîm ve </abbr> <abbr title='%{exact_time}'>%{when}
+        hate çareserkirin
+      reopened_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when}
+        ji nû ve hate aktîvkirin
+      reopened_by_anonymous_html: Ji aliyê bikarhênerek anonîm ve </abbr> <abbr title='%{exact_time}'>%{when}
+        ji nû ve hate aktîvkirin
+      hidden_by_html: Ji aliyê %{user} ve </abbr> <abbr title='%{exact_time}'>%{when}
+        hate veşartin
+      report: vê nîşeyê gilî bike
+      anonymous_warning: Ji ber ku di vê notê de ji bikarhênerên anonîm şirove hene,
+        divê bi awayekî serbixwe were teyîdkirin.
+      hide: Veşêre
+      resolve: Çareser bike
+      reactivate: Jinûve bide aktîvkirin
+      comment_and_resolve: Şirove û çareserî
+      comment: Şîrove
+      report_link_html: Ger ev not agahiyên hesas yên ku divê bên rakirin bihewîne,
+        tu dikarî %{link}.
+      other_problems_resolve: Ji bo hemû problemên din yên bi vê notê, ji kerema xwe
+        bi şîroveyekê tu bixwe wê çareser bike.
+      other_problems_resolved: Ji bo hemû pirsgirêkên din, çareserkirin têr dike
+      disappear_date_html: Ev nota çareserkirî wê ser nexşeyê winda bibe di %{disappear_in}
+        de.
+    new:
+      title: Notê nû
+      intro: Gelo te xetayek dît an jî tiştek kêm e? Ji bo ku ev pirsgirêk were çareserkirin
+        nexşesazên jê agahdar bike. Nîşankerê bibe cihê rast û notekî ku pirsgirêkê
+        îzah bike binivîse.
+      advice: Notê te ji her kesê re vekirî ye û dibe ku ji bo nûkirina nexşeyê were
+        bikaranîn, lewma agahiyên xwe yên şexsî an jî agahiyên ji nexşeyên ku bi mafê
+        daneriyê tên parastin an jî agahiyên ji lîsteya naverokê nenivîse.
+      add: Notê lê zêde bike
   javascripts:
     close: Bigre
     share:
@@ -3068,30 +3090,6 @@ ku-Latn:
         unsubscribe: Ji abonetiyê derkeve
         hide_comment: veşêre
         unhide_comment: neveşêre
-    notes:
-      new:
-        intro: Gelo te xetayek dît an jî tiştek kêm e? Ji bo ku ev pirsgirêk were
-          çareserkirin nexşesazên jê agahdar bike. Nîşankerê bibe cihê rast û notekî
-          ku pirsgirêkê îzah bike binivîse.
-        advice: Notê te ji her kesê re vekirî ye û dibe ku ji bo nûkirina nexşeyê
-          were bikaranîn, lewma agahiyên xwe yên şexsî an jî agahiyên ji nexşeyên
-          ku bi mafê daneriyê tên parastin an jî agahiyên ji lîsteya naverokê nenivîse.
-        add: Notê lê zêde bike
-      show:
-        anonymous_warning: Ji ber ku di vê notê de ji bikarhênerên anonîm şirove hene,
-          divê bi awayekî serbixwe were teyîdkirin.
-        hide: Veşêre
-        resolve: Çareser bike
-        reactivate: Jinûve bide aktîvkirin
-        comment_and_resolve: Şirove û çareserî
-        comment: Şîrove
-        report_link_html: Ger ev not agahiyên hesas yên ku divê bên rakirin bihewîne,
-          tu dikarî %{link}.
-        other_problems_resolve: Ji bo hemû problemên din yên bi vê notê, ji kerema
-          xwe bi şîroveyekê tu bixwe wê çareser bike.
-        other_problems_resolved: Ji bo hemû pirsgirêkên din, çareserkirin têr dike
-        disappear_date_html: Ev nota çareserkirî wê ser nexşeyê winda bibe di %{disappear_in}
-          de.
     edit_help: Nexşeyê bide hereketkirin û li cihê ku tu dixwazî biguherînî nêzîk
       bike, piştre jî bitikîne ser vir.
     directions:
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index df961dcc4..1e4830f73 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -437,24 +437,6 @@ lb:
       telephone_link: '%{phone_number} uruffen'
       colour_preview: Faarw %{colour_value} Ausbléck
       email_link: E-Mail %{email}
-    note:
-      title: 'Notiz: %{id}'
-      new_note: Nei Notiz
-      description: Beschreiwung
-      open_title: 'Ongeléisten Hiweis #%{note_name}'
-      closed_title: 'Geléisten Hiweis #%{note_name}'
-      hidden_title: Verstoppt Notiz N° %{note_name}
-      opened_by_html: Ugeluecht vum %{user} <abbr title='%{exact_time}'>viru(n) %{when}</abbr>
-      opened_by_anonymous_html: Ugeluecht vun engem Anonymen <abbr title='%{exact_time}'>
-        viru(n) %{when}</abbr>
-      commented_by_html: Bemierkung vum %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Bemierkung vun engem Anonymen <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Geléist vum %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Geléist vun engem Anonymen <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reaktivéiert vum %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reaktivéiert vun engem Anonymen <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Verstoppt vum %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Dësen Hiweis mellen
     query:
       title: Objetsoffro
       introduction: Klick op d'Kaart, fir Objeten an der Noperschaft ze fannen.
@@ -2504,6 +2486,30 @@ lb:
       no_notes: Keng Notizen
       description: Beschreiwung
       last_changed: Lescht Ännerung
+    show:
+      title: 'Notiz: %{id}'
+      description: Beschreiwung
+      open_title: 'Ongeléisten Hiweis #%{note_name}'
+      closed_title: 'Geléisten Hiweis #%{note_name}'
+      hidden_title: Verstoppt Notiz N° %{note_name}
+      opened_by_html: Ugeluecht vum %{user} <abbr title='%{exact_time}'>viru(n) %{when}</abbr>
+      opened_by_anonymous_html: Ugeluecht vun engem Anonymen <abbr title='%{exact_time}'>
+        viru(n) %{when}</abbr>
+      commented_by_html: Bemierkung vum %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Bemierkung vun engem Anonymen <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Geléist vum %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Geléist vun engem Anonymen <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reaktivéiert vum %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reaktivéiert vun engem Anonymen <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Verstoppt vum %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Dësen Hiweis mellen
+      hide: Verstoppen
+      resolve: Léisen
+      reactivate: Reaktivéieren
+      comment: Kommentéieren
+    new:
+      title: Nei Notiz
+      add: Notiz derbäisetzen
   javascripts:
     close: Zoumaachen
     share:
@@ -2568,14 +2574,6 @@ lb:
         unsubscribe: Ofbestellen
         hide_comment: verstoppen
         unhide_comment: nees weisen
-    notes:
-      new:
-        add: Notiz derbäisetzen
-      show:
-        hide: Verstoppen
-        resolve: Léisen
-        reactivate: Reaktivéieren
-        comment: Kommentéieren
     edit_help: Vergréisser a verschib d'Kaart un en Uert, deens du beaarbechte wëlls,
       a klick hei
     directions:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index a88ba2e19..845e238d3 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -387,23 +387,6 @@ lt:
       wikimedia_commons_link: '%{page} Wikimedia Commons elementas'
       telephone_link: Skambinti %{phone_number}
       colour_preview: Spalvos %{colour_value} peržiūra
-    note:
-      title: 'Pastaba: %{id}'
-      new_note: Nauja pastaba
-      description: Aprašymas
-      open_title: 'Neišspręsta pastaba: %{note_name}'
-      closed_title: 'Išspręsta pastaba: %{note_name}'
-      hidden_title: 'Paslėpta pastaba #%{note_name}'
-      opened_by_html: Sukurta naudotojo %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Sukurta anonimo <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Naudotojo %{user} komentaras <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Anonimo komentaras <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Išsprendė naudotojas %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Išsprendė anonimas <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: IÅ¡ naujo aktyvavo naudotojas %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: IÅ¡ naujo aktyvavo anonimas <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Paslėpė naudotojas %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Pranešti apie šią pastabą
     query:
       title: Ieškoti geoobjektų
       introduction: Spauskite ant žemėlapio, norėdami rasti gretimus objektus
@@ -2427,6 +2410,38 @@ lt:
       description: Aprašymas
       created_at: Sukurta
       last_changed: Paskutinį kartą atnaujinta
+    show:
+      title: 'Pastaba: %{id}'
+      description: Aprašymas
+      open_title: 'Neišspręsta pastaba: %{note_name}'
+      closed_title: 'Išspręsta pastaba: %{note_name}'
+      hidden_title: 'Paslėpta pastaba #%{note_name}'
+      opened_by_html: Sukurta naudotojo %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Sukurta anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Naudotojo %{user} komentaras <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Anonimo komentaras <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Išsprendė naudotojas %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Išsprendė anonimas <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: IÅ¡ naujo aktyvavo naudotojas %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: IÅ¡ naujo aktyvavo anonimas <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Paslėpė naudotojas %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Pranešti apie šią pastabą
+      anonymous_warning: Ši pastaba turi komentarų nuo anoniminių naudotojų, kurie
+        turėtų būti nepriklausomai patikrinti.
+      hide: Slėpti
+      resolve: Išspręsti
+      reactivate: IÅ¡ naujo suaktyvinti
+      comment_and_resolve: Komentuoti & išspręsti
+      comment: Komentuoti
+    new:
+      title: Nauja pastaba
+      intro: Pastebėjote klaidą ar kažko trūksta? Praneškite kitiems žymėtojams, kad
+        jie galėtų pataisyti. Perkelkite žymeklį į teisingą poziciją ir įrašykite
+        pastabą, aprašančią problemą.
+      advice: Jūsų pastaba yra vieša ir gali būti naudojama žemėlapio atnaujinimui,
+        todėl neįvedinėkite asmeninės informacijos arba informacijos iš autorių teisių
+        apsaugotų žemėlapių ar katalogų.
+      add: Pridėti pastabą
   javascripts:
     close: Uždaryti
     share:
@@ -2492,23 +2507,6 @@ lt:
         unsubscribe: Atsisakyti
         hide_comment: slėpti
         unhide_comment: neslėpti
-    notes:
-      new:
-        intro: Pastebėjote klaidą ar kažko trūksta? Praneškite kitiems žymėtojams,
-          kad jie galėtų pataisyti. Perkelkite žymeklį į teisingą poziciją ir įrašykite
-          pastabą, aprašančią problemą.
-        advice: Jūsų pastaba yra vieša ir gali būti naudojama žemėlapio atnaujinimui,
-          todėl neįvedinėkite asmeninės informacijos arba informacijos iš autorių
-          teisių apsaugotų žemėlapių ar katalogų.
-        add: Pridėti pastabą
-      show:
-        anonymous_warning: Ši pastaba turi komentarų nuo anoniminių naudotojų, kurie
-          turėtų būti nepriklausomai patikrinti.
-        hide: Slėpti
-        resolve: Išspręsti
-        reactivate: IÅ¡ naujo suaktyvinti
-        comment_and_resolve: Komentuoti & išspręsti
-        comment: Komentuoti
     edit_help: Pastumkite žemėlapį ir padidinkite vietą, kurią norite keisti, tada
       spauskite čia.
     directions:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index e6077e95c..79fd8d5d9 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -312,29 +312,6 @@ lv:
       wikidata_link: '%{page} ieraksts Vikidatos'
       wikipedia_link: '%{page} šķirklis Vikipēdijā'
       telephone_link: Zvanīt %{phone_number}
-    note:
-      title: 'Piezīme: %{id}'
-      new_note: Jauna piezīme
-      description: Apraksts
-      open_title: 'Neatrisināta piezīme: #%{note_name}'
-      closed_title: 'Atrisināta piezīme: #%{note_name}'
-      hidden_title: 'Paslēpta piezīme #%{note_name}'
-      opened_by_html: Izveidoja %{user} <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
-      opened_by_anonymous_html: Izveidoja anonīms <abbr title='%{exact_time}'>%{when}
-        atpakaļ</abbr>
-      commented_by_html: Komentārs no %{user} <abbr title='%{exact_time}'>%{when}
-        atpakaļ</abbr>
-      commented_by_anonymous_html: Komentārs no anonīma <abbr title='%{exact_time}'>%{when}
-        atpakaļ</abbr>
-      closed_by_html: Atrisināja %{user} <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
-      closed_by_anonymous_html: Atrisināja anonīms <abbr title='%{exact_time}'>%{when}
-        atpakaļ</abbr>
-      reopened_by_html: Atkal aktivizēja %{user} <abbr title='%{exact_time}'>%{when}
-        atpakaļ</abbr>
-      reopened_by_anonymous_html: Atkal aktivizēja anonīms <abbr title='%{exact_time}'>%{when}
-        atpakaļ</abbr>
-      hidden_by_html: Paslēpa %{user} <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
-      report: Ziņot par šo piezīmi
     query:
       title: Vaicājuma funkcijas
       introduction: Noklikšķiniet uz kartes, lai atrastu tuvumā esošos objektus.
@@ -2182,6 +2159,44 @@ lv:
       description: Apraksts
       created_at: Izveidots
       last_changed: Pēdējā izmaiņa
+    show:
+      title: 'Piezīme: %{id}'
+      description: Apraksts
+      open_title: 'Neatrisināta piezīme: #%{note_name}'
+      closed_title: 'Atrisināta piezīme: #%{note_name}'
+      hidden_title: 'Paslēpta piezīme #%{note_name}'
+      opened_by_html: Izveidoja %{user} <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
+      opened_by_anonymous_html: Izveidoja anonīms <abbr title='%{exact_time}'>%{when}
+        atpakaļ</abbr>
+      commented_by_html: Komentārs no %{user} <abbr title='%{exact_time}'>%{when}
+        atpakaļ</abbr>
+      commented_by_anonymous_html: Komentārs no anonīma <abbr title='%{exact_time}'>%{when}
+        atpakaļ</abbr>
+      closed_by_html: Atrisināja %{user} <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
+      closed_by_anonymous_html: Atrisināja anonīms <abbr title='%{exact_time}'>%{when}
+        atpakaļ</abbr>
+      reopened_by_html: Atkal aktivizēja %{user} <abbr title='%{exact_time}'>%{when}
+        atpakaļ</abbr>
+      reopened_by_anonymous_html: Atkal aktivizēja anonīms <abbr title='%{exact_time}'>%{when}
+        atpakaļ</abbr>
+      hidden_by_html: Paslēpa %{user} <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
+      report: Ziņot par šo piezīmi
+      anonymous_warning: Šī piezīme ietver komentārus no anonīmiem lietotājiem, kurus
+        nepieciešams pārbaudīt neatkarīgi.
+      hide: Slēpt
+      resolve: Atrisināt
+      reactivate: Atkal aktivizēt
+      comment_and_resolve: Komentēt un atrisināt
+      comment: Komentēt
+    new:
+      title: Jauna piezīme
+      intro: Piezīmes domātas, lai norādītu uz kartes kļūdām. Ja vēlies pamēģināt
+        pats ievietot informāciju, zīmēt vai izlabot kļūdu, izmanto pogu "Labot" lapas
+        augšpusē. Piezīmes parādās citiem kartētājiem, tādēļ lūdzu, cik vien iespējams
+        precīzāk un detalizētāk visu izklāsti, kā arī marķieri novieto pēc iespējas
+        pareizākajā pozīcijā. (Lūdzu neizmantojiet personīgo informāciju vai arī informāciju
+        no citām ar autortiesībām aizsargātām kartēm.)
+      add: Pievienot piezīmi
   javascripts:
     close: Aizvērt
     share:
@@ -2245,23 +2260,6 @@ lv:
         unsubscribe: Atteikties no abonējuma
         hide_comment: paslēpt
         unhide_comment: parādīt
-    notes:
-      new:
-        intro: Piezīmes domātas, lai norādītu uz kartes kļūdām. Ja vēlies pamēģināt
-          pats ievietot informāciju, zīmēt vai izlabot kļūdu, izmanto pogu "Labot"
-          lapas augšpusē. Piezīmes parādās citiem kartētājiem, tādēļ lūdzu, cik vien
-          iespējams precīzāk un detalizētāk visu izklāsti, kā arī marķieri novieto
-          pēc iespējas pareizākajā pozīcijā. (Lūdzu neizmantojiet personīgo informāciju
-          vai arī informāciju no citām ar autortiesībām aizsargātām kartēm.)
-        add: Pievienot piezīmi
-      show:
-        anonymous_warning: Šī piezīme ietver komentārus no anonīmiem lietotājiem,
-          kurus nepieciešams pārbaudīt neatkarīgi.
-        hide: Slēpt
-        resolve: Atrisināt
-        reactivate: Atkal aktivizēt
-        comment_and_resolve: Komentēt un atrisināt
-        comment: Komentēt
     edit_help: Pārvieto karti un pietuvini vietai, kuru vēlies labot, tad spied šeit.
     directions:
       engines:
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 825d322bf..142c973e0 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -435,23 +435,6 @@ mk:
       telephone_link: Јави се на %{phone_number}
       colour_preview: Преглед на бојата %{colour_value}
       email_link: Е-пошта %{email}
-    note:
-      title: 'Белешка: %{id}'
-      new_note: Нова белешка
-      description: Опис
-      open_title: Нерешена белешка бр. %{note_name}
-      closed_title: Решена белешка бр. %{note_name}
-      hidden_title: 'Скриена белешка бр. #%{note_name}'
-      opened_by_html: Создадено од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Создадено од анонимен <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Коментар на %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Коментар на анонимен <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Решено од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Решено од анонимен <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Преактивирано од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Преактивирано од анонимен <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Скриено од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: пријави го јазолов
     query:
       title: Пребарување на елементи
       introduction: Стиснете на картата за да ги најдете елементите во близина.
@@ -2958,6 +2941,45 @@ mk:
       description: Опис
       created_at: Создадена
       last_changed: Изменета
+    show:
+      title: 'Белешка: %{id}'
+      description: Опис
+      open_title: Нерешена белешка бр. %{note_name}
+      closed_title: Решена белешка бр. %{note_name}
+      hidden_title: 'Скриена белешка бр. #%{note_name}'
+      opened_by_html: Создадено од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Создадено од анонимен <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Коментар на %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Коментар на анонимен <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Решено од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Решено од анонимен <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Преактивирано од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Преактивирано од анонимен <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Скриено од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: пријави го јазолов
+      coordinates_html: '%{latitude}, %{longitude}'
+      anonymous_warning: Оваа белешка има коментари од анонимни корисници што треба
+        независно да се проверат.
+      hide: Скриј
+      resolve: Решена
+      reactivate: Реактивирај
+      comment_and_resolve: Коментирај и реши
+      comment: Коментирај
+      report_link_html: Доколку оваа белешка содржи чувствителни информации кои треба
+        да се остранат, можете да %{link}.
+      other_problems_resolve: За сите други проблеми со белешката, решете ги самите
+        со коментар.
+      other_problems_resolved: За сите други проблеми, решението е доволно.
+      disappear_date_html: Оваа решена белешка ќе исчезне од картата за %{disappear_in}.
+    new:
+      title: Нова белешка
+      intro: Забележавте некоја грешка или нешто недостасува? Дајте им на знаење на
+        другите картографи за да ја средиме работата. Поместете го бележникот на исправното
+        место и внесете порака, објаснувајќи го проблемот.
+      advice: Вашата белешка е јавна и може да се употреби за поднова на картата.
+        Затоа, не внесувајте лични податоци, или пак податоци од карти или именици
+        заштитени со авторски права.
+      add: Додај белешка
   javascripts:
     close: Затвори
     share:
@@ -3039,29 +3061,6 @@ mk:
         unsubscribe: Отпиши ме
         hide_comment: скриј
         unhide_comment: откриј
-    notes:
-      new:
-        intro: Забележавте некоја грешка или нешто недостасува? Дајте им на знаење
-          на другите картографи за да ја средиме работата. Поместете го бележникот
-          на исправното место и внесете порака, објаснувајќи го проблемот.
-        advice: Вашата белешка е јавна и може да се употреби за поднова на картата.
-          Затоа, не внесувајте лични податоци, или пак податоци од карти или именици
-          заштитени со авторски права.
-        add: Додај белешка
-      show:
-        anonymous_warning: Оваа белешка има коментари од анонимни корисници што треба
-          независно да се проверат.
-        hide: Скриј
-        resolve: Решена
-        reactivate: Реактивирај
-        comment_and_resolve: Коментирај и реши
-        comment: Коментирај
-        report_link_html: Доколку оваа белешка содржи чувствителни информации кои
-          треба да се остранат, можете да %{link}.
-        other_problems_resolve: За сите други проблеми со белешката, решете ги самите
-          со коментар.
-        other_problems_resolved: За сите други проблеми, решението е доволно.
-        disappear_date_html: Оваа решена белешка ќе исчезне од картата за %{disappear_in}.
     edit_help: Поместете ја картата и приближете во местото што сакате да го уредите,
       па стиснете тука.
     directions:
diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 9181c8a9f..73be5c64b 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -158,31 +158,6 @@ mo:
       loading: Се ынкаркэ...
     tag_details:
       tags: Маркаже
-    note:
-      title: 'Нотэ: %{id}'
-      new_note: Нотэ ноуэ
-      description: Дескриере
-      open_title: 'Нотэ нерезолватэ #%{note_name}'
-      closed_title: 'Нотэ резолватэ #%{note_name}'
-      hidden_title: 'Нотэ аскунсэ #%{note_name}'
-      opened_by_html: Креатэ де %{user} <abbr title='%{exact_time}'>ку %{when} ын
-        урмэ</abbr>
-      opened_by_anonymous_html: Креатэ аноним <abbr title='%{exact_time}'>ку %{when}
-        ын урмэ</abbr>
-      commented_by_html: Коментариу скрис де %{user} <abbr title='%{exact_time}'>ку
-        %{when} ын урмэ</abbr>
-      commented_by_anonymous_html: Коментариу аноним <abbr title='%{exact_time}'>ку
-        %{when} ын урмэ</abbr>
-      closed_by_html: Резолватэ де %{user} <abbr title='%{exact_time}'>ку %{when}
-        ын урмэ</abbr>
-      closed_by_anonymous_html: Резолватэ аноним <abbr title='%{exact_time}'>ку %{when}
-        ын урмэ</abbr>
-      reopened_by_html: Редескисэ де %{user} <abbr title='%{exact_time}'>ку %{when}
-        ын урмэ</abbr>
-      reopened_by_anonymous_html: Редескисэ аноним <abbr title='%{exact_time}'>ку
-        %{when} ын урмэ</abbr>
-      hidden_by_html: Аскунсэ де кэтре %{user} <abbr title='%{exact_time}'>ку %{when}
-        ын урмэ</abbr>
   changesets:
     changeset_paging_nav:
       showing_page: Паӂина %{page}
@@ -653,4 +628,31 @@ mo:
       my profile: Профилул меу
       my settings: Реглажеле меле
       my comments: Коментарииле меле
+  notes:
+    show:
+      title: 'Нотэ: %{id}'
+      description: Дескриере
+      open_title: 'Нотэ нерезолватэ #%{note_name}'
+      closed_title: 'Нотэ резолватэ #%{note_name}'
+      hidden_title: 'Нотэ аскунсэ #%{note_name}'
+      opened_by_html: Креатэ де %{user} <abbr title='%{exact_time}'>ку %{when} ын
+        урмэ</abbr>
+      opened_by_anonymous_html: Креатэ аноним <abbr title='%{exact_time}'>ку %{when}
+        ын урмэ</abbr>
+      commented_by_html: Коментариу скрис де %{user} <abbr title='%{exact_time}'>ку
+        %{when} ын урмэ</abbr>
+      commented_by_anonymous_html: Коментариу аноним <abbr title='%{exact_time}'>ку
+        %{when} ын урмэ</abbr>
+      closed_by_html: Резолватэ де %{user} <abbr title='%{exact_time}'>ку %{when}
+        ын урмэ</abbr>
+      closed_by_anonymous_html: Резолватэ аноним <abbr title='%{exact_time}'>ку %{when}
+        ын урмэ</abbr>
+      reopened_by_html: Редескисэ де %{user} <abbr title='%{exact_time}'>ку %{when}
+        ын урмэ</abbr>
+      reopened_by_anonymous_html: Редескисэ аноним <abbr title='%{exact_time}'>ку
+        %{when} ын урмэ</abbr>
+      hidden_by_html: Аскунсэ де кэтре %{user} <abbr title='%{exact_time}'>ку %{when}
+        ын урмэ</abbr>
+    new:
+      title: Нотэ ноуэ
 ...
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 998f72a2e..e5660e70b 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -250,31 +250,6 @@ mr:
         key: '%{key} खूणपताकेसाठी विकी वर्णन पान'
         tag: '%{key}=%{value} खूणपताकेसाठी विकी वर्णन पान'
       wikipedia_link: विकिपिडियावरील %{page} हा लेख
-    note:
-      title: 'टीप: %{id}'
-      new_note: नवी टीप
-      description: 'वर्णन:'
-      open_title: 'निराकरण न झालेली टीप #%{note_name}'
-      closed_title: 'निराकरण झालेली टीप #%{note_name}'
-      hidden_title: 'लपविलेली टीप #%{note_name}'
-      opened_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user} ने
-        तयार केले
-      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>
-        अनामिकाने तयार केले
-      commented_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user}
-        ची टिप्पणी
-      commented_by_anonymous_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>
-        अनामिकाची टिप्पणी
-      closed_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user} ने
-        वियोजित केले
-      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>
-        अनामिकाने वियोजित केले
-      reopened_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user} ने
-        सक्रिय केले
-      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>
-        अनामिकाने सक्रिय केले
-      hidden_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user} ने
-        लपविले
   changesets:
     changeset_paging_nav:
       showing_page: लेख %{page}
@@ -1381,6 +1356,38 @@ mr:
       showing_page: पान %{page}
       next: पुढील »
       previous: « मागील
+  notes:
+    show:
+      title: 'टीप: %{id}'
+      description: 'वर्णन:'
+      open_title: 'निराकरण न झालेली टीप #%{note_name}'
+      closed_title: 'निराकरण झालेली टीप #%{note_name}'
+      hidden_title: 'लपविलेली टीप #%{note_name}'
+      opened_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user} ने
+        तयार केले
+      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>
+        अनामिकाने तयार केले
+      commented_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user}
+        ची टिप्पणी
+      commented_by_anonymous_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>
+        अनामिकाची टिप्पणी
+      closed_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user} ने
+        वियोजित केले
+      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>
+        अनामिकाने वियोजित केले
+      reopened_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user} ने
+        सक्रिय केले
+      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>
+        अनामिकाने सक्रिय केले
+      hidden_by_html: <abbr title='%{exact_time}'>%{when} पूर्वी</abbr>%{user} ने
+        लपविले
+      resolve: निराकरण करा
+    new:
+      title: नवी टीप
+      intro: काही चूक आढळली किंवा काही हरपले आहे काय? इतर नकाशाकारांना ते कळु द्या
+        म्हणजे ते आम्ही ठिकठाक करु. मार्करला अचूक स्थानी न्या व ती समस्या समजवण्यास
+        एक सूचना टंका. (कृपया येथे काही वैयक्तिक माहिती टाकू नका.)
+      add: टीप जोडा
   javascripts:
     close: बंद करा
     share:
@@ -1412,14 +1419,6 @@ mr:
     site:
       edit_tooltip: नकाशा संपादा
       createnote_tooltip: नकाशावर टीप जोडा
-    notes:
-      new:
-        intro: काही चूक आढळली किंवा काही हरपले आहे काय? इतर नकाशाकारांना ते कळु द्या
-          म्हणजे ते आम्ही ठिकठाक करु. मार्करला अचूक स्थानी न्या व ती समस्या समजवण्यास
-          एक सूचना टंका. (कृपया येथे काही वैयक्तिक माहिती टाकू नका.)
-        add: टीप जोडा
-      show:
-        resolve: निराकरण करा
     directions:
       instructions:
         offramp_right_with_exit: उजवीकडील %{exit}ने बाहेर पडा
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index a60fb5826..867890c8f 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -350,24 +350,6 @@ ms:
       wikidata_link: Perkara %{page} di Wikidata
       wikipedia_link: Rencana %{page} di Wikipedia
       telephone_link: Hubungi %{phone_number}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nota Baru
-      description: Keterangan
-      open_title: 'Nota yang belum diselesaikan: #%{note_name}'
-      closed_title: 'Nota yang telah diselesaikan: #%{note_name}'
-      hidden_title: 'Nota tersembunyi #%{note_name}'
-      opened_by_html: Dicipta oleh %{user} <abbr title='%{exact_time}'>%{when} lalu</abbr>
-      opened_by_anonymous_html: Dicipta oleh pengguna awanama <abbr title='%{exact_time}'>%{when}
-        lalu</abbr>
-      commented_by_html: Komen oleh %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Komen oleh pengguna awanama <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Diselesaikan oleh %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Diselesaikan oleh pengguna awanama <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Diaktifkan semula oleh %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Diaktifkan semula oleh pengguna awanama <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Disembunyikan oleh %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Laporkan nota ini
     query:
       title: Ciri-ciri pertanyaan
       introduction: Klik pada peta untuk mencari ciri-ciri terdekat.
@@ -494,6 +476,11 @@ ms:
       comment: Komen
       newer_comments: Komen Terbaru
       older_comments: Komen Lama
+  errors:
+    internal_server_error:
+      title: Ralat aplikasi
+    not_found:
+      title: Fail tidak dijumpai
   friendships:
     make_friend:
       heading: Jadikan %{user} sebagai kawan?
@@ -2208,6 +2195,37 @@ ms:
       description: Keterangan
       created_at: Dicatatkan pada
       last_changed: Kali terakhir disunting
+    show:
+      title: 'Nota: %{id}'
+      description: Keterangan
+      open_title: 'Nota yang belum diselesaikan: #%{note_name}'
+      closed_title: 'Nota yang telah diselesaikan: #%{note_name}'
+      hidden_title: 'Nota tersembunyi #%{note_name}'
+      opened_by_html: Dicipta oleh %{user} <abbr title='%{exact_time}'>%{when} lalu</abbr>
+      opened_by_anonymous_html: Dicipta oleh pengguna awanama <abbr title='%{exact_time}'>%{when}
+        lalu</abbr>
+      commented_by_html: Komen oleh %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Komen oleh pengguna awanama <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Diselesaikan oleh %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Diselesaikan oleh pengguna awanama <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Diaktifkan semula oleh %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Diaktifkan semula oleh pengguna awanama <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Disembunyikan oleh %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Laporkan nota ini
+      anonymous_warning: Nota ini merangkumi komen-komen daripada pengguna awanama
+        yang wajar ditentusahkan secara bebas.
+      hide: Sorokkan
+      resolve: Selesaikan
+      reactivate: Aktifkan semula
+      comment_and_resolve: Ulas & Selesaikan
+      comment: Komen
+    new:
+      title: Nota Baru
+      intro: Terjumpa kesilapan atau sesuatu tertinggal? Beritahu pemeta-pemeta lain
+        supaya kami boleh membaikinya. Alihkan penanda ke kedudukan betul dan taipkan
+        nota untuk menerangkan kemusykilan itu. (Tolong jangan isikan maklumat peribadi
+        ataupun maklumat daripada peta-peta atau senarai direktori yang terhakcipta.)
+      add: Tambah Nota
   javascripts:
     close: Tutup
     share:
@@ -2265,22 +2283,6 @@ ms:
         unsubscribe: Berhenti melanggan
         hide_comment: sorokkan
         unhide_comment: Dedahkan
-    notes:
-      new:
-        intro: Terjumpa kesilapan atau sesuatu tertinggal? Beritahu pemeta-pemeta
-          lain supaya kami boleh membaikinya. Alihkan penanda ke kedudukan betul dan
-          taipkan nota untuk menerangkan kemusykilan itu. (Tolong jangan isikan maklumat
-          peribadi ataupun maklumat daripada peta-peta atau senarai direktori yang
-          terhakcipta.)
-        add: Tambah Nota
-      show:
-        anonymous_warning: Nota ini merangkumi komen-komen daripada pengguna awanama
-          yang wajar ditentusahkan secara bebas.
-        hide: Sorokkan
-        resolve: Selesaikan
-        reactivate: Aktifkan semula
-        comment_and_resolve: Ulas & Selesaikan
-        comment: Komen
     edit_help: Alihkan peta dan zum dekat pada lokasi yang ingin anda sunting, kemudian
       klik di sini.
     directions:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index cd97829bd..625d14c59 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -171,11 +171,6 @@ my:
       tags: အမည်တွဲများ
       wikidata_link: ဝီကီဒေတာပေါ်ရှိ %{page} item
       wikipedia_link: ဝီကီပီးဒီးယားပေါ်ရှိ %{page} ဆောင်းပါး
-    note:
-      title: 'မှတ်စု: %{id}'
-      new_note: မှတ်စု အသစ်
-      description: ဖော်ပြချက်
-      hidden_title: 'ဝှက်ထားသော မှတ်စု #%{note_name}'
   changesets:
     changeset_paging_nav:
       showing_page: စာမျက်နှာ %{page}
@@ -833,6 +828,13 @@ my:
     index:
       creator: ဖန်တီးသူ
       description: ဖော်ပြချက်
+    show:
+      title: 'မှတ်စု: %{id}'
+      description: ဖော်ပြချက်
+      hidden_title: 'ဝှက်ထားသော မှတ်စု #%{note_name}'
+      hide: ဝှက်ရန်
+    new:
+      title: မှတ်စု အသစ်
   javascripts:
     close: ပိတ်ရန်
     share:
@@ -847,9 +849,6 @@ my:
       show:
         hide_comment: ဝှက်
         unhide_comment: မဝှက်တော့ရန်
-    notes:
-      show:
-        hide: ဝှက်ရန်
     directions:
       distance: အကွာအဝေး
       time: အချိန်
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 1f534e27a..7f4d6f9ff 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -430,25 +430,6 @@ nb:
       wikimedia_commons_link: Elementet %{page} på Wikimedia Commons
       telephone_link: Ring %{phone_number}
       colour_preview: Forhåndsvisning av fargen %{colour_value}
-    note:
-      title: 'Merknad: %{id}'
-      new_note: Ny merknad
-      description: Beskrivelse
-      open_title: 'Uavklart merknad #%{note_name}'
-      closed_title: 'Avklart merknad: #%{note_name}'
-      hidden_title: 'Skjult notis #%{note_name}'
-      opened_by_html: Opprettet av %{user} for <abbr title='%{exact_time}'>%{when}
-        siden</abbr>
-      opened_by_anonymous_html: Opprettet av anonym bruker for <abbr title='%{exact_time}'>%{when}
-        siden</abbr>
-      commented_by_html: Kommentar fra %{user} for <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentar fra anonym bruker for <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Løst av %{user} for <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Løst av anonym bruker for <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Gjenåpnet av %{user} for <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Gjenåpnet av anonym bruker for <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Skjult av %{user} for <abbr title='%{exact_time}'>%{when}</abbr>
-      report: rapporter denne notisen
     query:
       title: Se over elementer
       introduction: Klikk på kartet for å finne nærliggende funksjoner.
@@ -2595,6 +2576,40 @@ nb:
       description: Beskrivelse
       created_at: Opprettet
       last_changed: Sist endret
+    show:
+      title: 'Merknad: %{id}'
+      description: Beskrivelse
+      open_title: 'Uavklart merknad #%{note_name}'
+      closed_title: 'Avklart merknad: #%{note_name}'
+      hidden_title: 'Skjult notis #%{note_name}'
+      opened_by_html: Opprettet av %{user} for <abbr title='%{exact_time}'>%{when}
+        siden</abbr>
+      opened_by_anonymous_html: Opprettet av anonym bruker for <abbr title='%{exact_time}'>%{when}
+        siden</abbr>
+      commented_by_html: Kommentar fra %{user} for <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentar fra anonym bruker for <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Løst av %{user} for <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Løst av anonym bruker for <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Gjenåpnet av %{user} for <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Gjenåpnet av anonym bruker for <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Skjult av %{user} for <abbr title='%{exact_time}'>%{when}</abbr>
+      report: rapporter denne notisen
+      anonymous_warning: Denne merknaden inneholder kommentarer fra anonyme brukere
+        som bør bekreftes uavhengig.
+      hide: Skjul
+      resolve: Løs
+      reactivate: Reaktiver
+      comment_and_resolve: Kommenter og løs
+      comment: Kommenter
+    new:
+      title: Ny merknad
+      intro: Funnet en feil eller noe som mangler? La andre kartleggere få vite det
+        så vi kan fikse det. Flytt markøren til riktig posisjon og skriv en merknad
+        som beskriver problemet.
+      advice: Merknaden din blir publisert offentlig og blir brukt av kartleggere
+        for å oppdatere kartet, så ikke inkluder personlig info eller informasjon
+        fra opphavsrett-beskyttede kart eller kataloger.
+      add: Legg til merknad
   javascripts:
     close: Lukk
     share:
@@ -2672,23 +2687,6 @@ nb:
         unsubscribe: Avslutt abonnement
         hide_comment: skjul
         unhide_comment: vis
-    notes:
-      new:
-        intro: Funnet en feil eller noe som mangler? La andre kartleggere få vite
-          det så vi kan fikse det. Flytt markøren til riktig posisjon og skriv en
-          merknad som beskriver problemet.
-        advice: Merknaden din blir publisert offentlig og blir brukt av kartleggere
-          for å oppdatere kartet, så ikke inkluder personlig info eller informasjon
-          fra opphavsrett-beskyttede kart eller kataloger.
-        add: Legg til merknad
-      show:
-        anonymous_warning: Denne merknaden inneholder kommentarer fra anonyme brukere
-          som bør bekreftes uavhengig.
-        hide: Skjul
-        resolve: Løs
-        reactivate: Reaktiver
-        comment_and_resolve: Kommenter og løs
-        comment: Kommenter
     edit_help: Flytt kartet og forstørr utvalg til et sted du vil redigere, og klikk
       så her.
     directions:
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 2f86d72dd..48a2d183a 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -254,32 +254,6 @@ ne:
       wikidata_link: '%{page} वस्तु विकिडेटा मा'
       wikipedia_link: '%{page}को बारेमा विकिपीडियामा भएको लेख'
       telephone_link: '%{phone_number} मा फोन गर्नुहोस्'
-    note:
-      title: 'टिप्पणी: %{id}'
-      new_note: नयाँ टिप्पणी
-      description: विवरण
-      open_title: 'समाधान नगरिएको टिप्पणी #%{note_name}'
-      closed_title: 'समाधान गरिएको टिप्पणी #%{note_name}'
-      hidden_title: 'लुकाइएको टिप्पणी #%{note_name}'
-      opened_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
-        सिर्जना गरिएको'
-      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when} अगाडि</abbr> अज्ञात
-        व्यक्तिद्वारा सिर्जना गरिएको
-      commented_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
-        गरिएको टिप्पणी'
-      commented_by_anonymous_html: अज्ञात व्यक्तिद्वारा <abbr title='%{exact_time}'>%{when}
-        अगाडि</abbr> गरिएको टिप्पणी
-      closed_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
-        समाधान गरिएको'
-      closed_by_anonymous_html: अज्ञात व्यक्तिद्वारा <abbr title='%{exact_time}'>%{when}
-        अगाडि</abbr> समाधान गरिएको
-      reopened_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
-        पुनःसक्रिय गरिएको'
-      reopened_by_anonymous_html: अज्ञात व्यक्तिद्वारा <abbr title='%{exact_time}'>%{when}
-        अगाडि</abbr> पुनःसक्रिय गरिएको
-      hidden_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
-        लुकाइएको'
-      report: यस टिपोटलाई उजुरी गर्नुहोस्
     query:
       title: क्वेरी गुणहरू
       introduction: नजिकैका फिचरहरू भेटाउन नक्सामा क्लिक गर्नुहोस्
@@ -1222,6 +1196,35 @@ ne:
       id: आईडी
       creator: सर्जक
       description: वर्णन
+    show:
+      title: 'टिप्पणी: %{id}'
+      description: विवरण
+      open_title: 'समाधान नगरिएको टिप्पणी #%{note_name}'
+      closed_title: 'समाधान गरिएको टिप्पणी #%{note_name}'
+      hidden_title: 'लुकाइएको टिप्पणी #%{note_name}'
+      opened_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
+        सिर्जना गरिएको'
+      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when} अगाडि</abbr> अज्ञात
+        व्यक्तिद्वारा सिर्जना गरिएको
+      commented_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
+        गरिएको टिप्पणी'
+      commented_by_anonymous_html: अज्ञात व्यक्तिद्वारा <abbr title='%{exact_time}'>%{when}
+        अगाडि</abbr> गरिएको टिप्पणी
+      closed_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
+        समाधान गरिएको'
+      closed_by_anonymous_html: अज्ञात व्यक्तिद्वारा <abbr title='%{exact_time}'>%{when}
+        अगाडि</abbr> समाधान गरिएको
+      reopened_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
+        पुनःसक्रिय गरिएको'
+      reopened_by_anonymous_html: अज्ञात व्यक्तिद्वारा <abbr title='%{exact_time}'>%{when}
+        अगाडि</abbr> पुनःसक्रिय गरिएको
+      hidden_by_html: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
+        लुकाइएको'
+      report: यस टिपोटलाई उजुरी गर्नुहोस्
+      hide: लुकाउनुहोस्
+      comment: टिप्पणी
+    new:
+      title: नयाँ टिप्पणी
   javascripts:
     close: बन्द गर्नुहोस्
     share:
@@ -1248,10 +1251,6 @@ ne:
         subscribe: सदस्यता लिनुहोस्
         unsubscribe: सदस्यता खारेज गर्नुहोस्
         hide_comment: लुकाउ
-    notes:
-      show:
-        hide: लुकाउनुहोस्
-        comment: टिप्पणी
     directions:
       instructions:
         exit_counts:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e8c66591e..94babca7b 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -493,28 +493,6 @@ nl:
       telephone_link: Bel %{phone_number}
       colour_preview: Kleur %{colour_value} voorbeeld
       email_link: E-mail %{email}
-    note:
-      title: 'Opmerking: %{id}'
-      new_note: Nieuwe opmerking
-      description: Beschrijving
-      open_title: 'Onopgeloste opmerking #%{note_name}'
-      closed_title: 'Opgeloste opmerking #%{note_name}'
-      hidden_title: 'Verborgen opmerking #%{note_name}'
-      opened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> aangemaakt door %{user}
-      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> aangemaakt
-        door anoniem
-      commented_by_html: Reactie van %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Reactie van anoniem <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: <abbr title='%{exact_time}'>%{when}</abbr> opgelost door %{user}
-      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> opgelost
-        door anoniem
-      reopened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> opnieuw geactiveerd
-        door %{user}
-      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> opnieuw
-        geactiveerd door anoniem
-      hidden_by_html: <abbr title='%{exact_time}'>%{when} ago</abbr> verborgen door
-        %{user}
-      report: deze opmerking rapporteren
     query:
       title: Objecten opvragen
       introduction: Klik op de kaart om nabije objecten te vinden.
@@ -3042,6 +3020,51 @@ nl:
       description: Beschrijving
       created_at: Aangemaakt op
       last_changed: Laatste wijziging
+    show:
+      title: 'Opmerking: %{id}'
+      description: Beschrijving
+      open_title: 'Onopgeloste opmerking #%{note_name}'
+      closed_title: 'Opgeloste opmerking #%{note_name}'
+      hidden_title: 'Verborgen opmerking #%{note_name}'
+      opened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> aangemaakt door %{user}
+      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> aangemaakt
+        door anoniem
+      commented_by_html: Reactie van %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Reactie van anoniem <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: <abbr title='%{exact_time}'>%{when}</abbr> opgelost door %{user}
+      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> opgelost
+        door anoniem
+      reopened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> opnieuw geactiveerd
+        door %{user}
+      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> opnieuw
+        geactiveerd door anoniem
+      hidden_by_html: <abbr title='%{exact_time}'>%{when} ago</abbr> verborgen door
+        %{user}
+      report: deze opmerking rapporteren
+      coordinates_html: '%{latitude}; %{longitude}'
+      anonymous_warning: In deze opmerking staan reacties van anonieme gebruikers
+        die moeten worden gecontroleerd.
+      hide: Verbergen
+      resolve: Oplossen
+      reactivate: Opnieuw activeren
+      comment_and_resolve: Reageren en oplossen
+      comment: Reageren
+      report_link_html: Als deze opmerking gevoelige informatie bevat die verwijderd
+        moet worden, kunt u %{link}.
+      other_problems_resolve: Voor alle andere problemen met de notitie, gelieve deze
+        zelf op te lossen met een opmerking.
+      other_problems_resolved: Voor alle andere problemen is oplossen voldoende.
+      disappear_date_html: Deze opgeloste opmerking zal van de kaart verdwijnen over
+        %{disappear_in}.
+    new:
+      title: Nieuwe opmerking
+      intro: Een fout gezien of ontbreekt er iets? Laat het andere mappers weten zodat
+        wij het kunnen oplossen. Verplaats de markering naar de correcte positie en
+        beschrijf het probleem.
+      advice: Deze opmerking is openbaar en kan gebruikt worden om de kaart bij te
+        werken. Vul hier dus geen persoonlijke informatie in, en ook geen informatie
+        uit kaarten of telefoonboeken waar auteursrechtelijke bescherming op rust.
+      add: Opmerking toevoegen
   javascripts:
     close: Sluiten
     share:
@@ -3123,30 +3146,6 @@ nl:
         unsubscribe: Uitschrijven
         hide_comment: verbergen
         unhide_comment: zichtbaar maken
-    notes:
-      new:
-        intro: Een fout gezien of ontbreekt er iets? Laat het andere mappers weten
-          zodat wij het kunnen oplossen. Verplaats de markering naar de correcte positie
-          en beschrijf het probleem.
-        advice: Deze opmerking is openbaar en kan gebruikt worden om de kaart bij
-          te werken. Vul hier dus geen persoonlijke informatie in, en ook geen informatie
-          uit kaarten of telefoonboeken waar auteursrechtelijke bescherming op rust.
-        add: Opmerking toevoegen
-      show:
-        anonymous_warning: In deze opmerking staan reacties van anonieme gebruikers
-          die moeten worden gecontroleerd.
-        hide: Verbergen
-        resolve: Oplossen
-        reactivate: Opnieuw activeren
-        comment_and_resolve: Reageren en oplossen
-        comment: Reageren
-        report_link_html: Als deze opmerking gevoelige informatie bevat die verwijderd
-          moet worden, kunt u %{link}.
-        other_problems_resolve: Voor alle andere problemen met de notitie, gelieve
-          deze zelf op te lossen met een opmerking.
-        other_problems_resolved: Voor alle andere problemen is oplossen voldoende.
-        disappear_date_html: Deze opgeloste opmerking zal van de kaart verdwijnen
-          over %{disappear_in}.
     edit_help: Verplaats de kaart en zoom in op een plaats die u wilt bewerken. Klik
       daarna hier.
     directions:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index de4bc29cb..2e9d5b5c1 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -336,27 +336,6 @@ nn:
       wikidata_link: Elementet %{page} på Wikidata
       wikipedia_link: Artikkelen %{page} på Wikipedia
       telephone_link: Ring %{phone_number}
-    note:
-      title: 'Merknad: %{id}'
-      new_note: Ny merknad
-      description: Skildring
-      open_title: 'Uavklart merknad #%{note_name}'
-      closed_title: 'Avklart merknad: #%{note_name}'
-      hidden_title: 'Gøymd merknad #%{note_name}'
-      opened_by_html: Oppretta av %{user} <abbr title='%{exact_time}'>%{when} sidan</abbr>
-      opened_by_anonymous_html: Oppretta av anonym <abbr title='%{exact_time}'>%{when}
-        sidan</abbr>
-      commented_by_html: Kommentar frå %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentar frå anonym <abbr title='%{exact_time}'>%{when}
-        sidan</abbr>
-      closed_by_html: Løyst av %{user} <abbr title='%{exact_time}'>%{when} sidan</abbr>
-      closed_by_anonymous_html: Løyst av anonym <abbr title='%{exact_time}'>%{when}
-        sidan</abbr>
-      reopened_by_html: Reaktivert av %{user} <abbr title='%{exact_time}'>%{when}
-        sidan</abbr>
-      reopened_by_anonymous_html: Reaktivert av anonym for <abbr title='%{exact_time}'>%{when}
-        sidan</abbr>
-      report: Rapporter denne merknaden
     query:
       title: Førespurnadsfunksjonar
       nearby: Nærliggjande funksjonar
@@ -1977,6 +1956,36 @@ nn:
       description: Skildring
       created_at: Oppretta den
       last_changed: Sist endra
+    show:
+      title: 'Merknad: %{id}'
+      description: Skildring
+      open_title: 'Uavklart merknad #%{note_name}'
+      closed_title: 'Avklart merknad: #%{note_name}'
+      hidden_title: 'Gøymd merknad #%{note_name}'
+      opened_by_html: Oppretta av %{user} <abbr title='%{exact_time}'>%{when} sidan</abbr>
+      opened_by_anonymous_html: Oppretta av anonym <abbr title='%{exact_time}'>%{when}
+        sidan</abbr>
+      commented_by_html: Kommentar frå %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentar frå anonym <abbr title='%{exact_time}'>%{when}
+        sidan</abbr>
+      closed_by_html: Løyst av %{user} <abbr title='%{exact_time}'>%{when} sidan</abbr>
+      closed_by_anonymous_html: Løyst av anonym <abbr title='%{exact_time}'>%{when}
+        sidan</abbr>
+      reopened_by_html: Reaktivert av %{user} <abbr title='%{exact_time}'>%{when}
+        sidan</abbr>
+      reopened_by_anonymous_html: Reaktivert av anonym for <abbr title='%{exact_time}'>%{when}
+        sidan</abbr>
+      report: Rapporter denne merknaden
+      anonymous_warning: Denne merknaden har kommentarar frå anonyme brukarar og bør
+        stadfestast.
+      hide: Gøym
+      resolve: Løys
+      reactivate: Reaktiver
+      comment_and_resolve: Kommenter og løys
+      comment: Kommenter
+    new:
+      title: Ny merknad
+      add: Legg til merknad
   javascripts:
     close: Lat att
     share:
@@ -2039,17 +2048,6 @@ nn:
         unsubscribe: Avslutt abonnement
         hide_comment: gøym
         unhide_comment: vis
-    notes:
-      new:
-        add: Legg til merknad
-      show:
-        anonymous_warning: Denne merknaden har kommentarar frå anonyme brukarar og
-          bør stadfestast.
-        hide: Gøym
-        resolve: Løys
-        reactivate: Reaktiver
-        comment_and_resolve: Kommenter og løys
-        comment: Kommenter
     directions:
       ascend: Stigande
       engines:
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 8737a4f73..d8056a66e 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -100,6 +100,7 @@ nqo:
       diary_entry:
         user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
         title: ߝߐߡߊ
+        body: ߝߊ߬ߘߌ
         latitude: ߦߙߐ ߘߟߊߕߍ߯ߦߊ߫
         longitude: ߘߎ߰ߕߍ߬ߟߍ߲߬ߦߊ
         language_code: ߞߊ߲
@@ -364,27 +365,6 @@ nqo:
       telephone_link: ߞߟߌߟߌ %{phone_number}
       colour_preview: ߞߐ߬ߟߐ %{colour_value} ߢߍߕߊ
       email_link: ߢ:ߞߏ߲ߘߏ %{email}
-    note:
-      title: 'ߦߟߌߣߐ: %{id}'
-      new_note: ߦߟߌߣߐ߫ ߞߎߘߊ߫
-      description: ߕߐ߯ߛߓߍߟߌ
-      open_title: ߦߟߌߣߐ߫ ߢߊߓߐߓߊߟߌ %{note_name}
-      closed_title: ߦߟߌߣߐ߫ ߢߊߓߐߣߍ߲ %{note_name}
-      hidden_title: ߦߟߌߣߐ߫ ߢߡߊߘߏ߲߰ߣߍ߲ %{note_name}
-      opened_by_html: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{user}<abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ߟߋ߬ ߓߟߏ߫
-      opened_by_anonymous_html: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߟߊ߫ ߓߟߏ߫ <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: ߡߙߌߣߊ߲ ߞߊ߬ ߝߘߊ߫ %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      commented_by_anonymous_html: ߡߙߌߣߊ߲ ߞߊ߬ ߝߘߊ߫ ߕߐ߯ߒߕߊ߲ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ߟߊ߫
-      closed_by_html: ߊ߬ ߢߊߓߐߣߍ߲߫ ߦߋ߫ %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ߓߟߏ߫
-      closed_by_anonymous_html: ߊ߬ ߢߊߓߐߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ߟߋ߬ ߓߟߏ߫
-      reopened_by_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߕߎ߲߯ %{user} ߟߋ߬ ߓߟߏ߫ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      reopened_by_anonymous_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߓߟߏ߫ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      hidden_by_html: ߊ߬ ߢߡߊߘߏ߲߰ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߓߟߏ߫ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      report: ߦߟߌߣߐ ߣߌ߲߬ ߠߊߞߏߝߐ߫
     query:
       title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
       introduction: ߡߊߔ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߌ ߡߊߛߘߎ߬ߧߊ߬ ߟߊߓߊ߯ߙߊߟߌ ߟߎ߫ ߢߌߣߌ߲߫.
@@ -522,6 +502,15 @@ nqo:
       applications:
         create:
           notice: ߟߥߊ߬ߟߌ߬ߟߌ ߓߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
+  errors:
+    contact:
+      contact: ߛߊ߲߬ߓߊ߬ߕߐ߮
+    forbidden:
+      title: ߟߊߕߐ߲ߣߍ߲߫
+    internal_server_error:
+      title: ߟߥߊ߬ߟߌ߬ߟߌ ߝߎ߬ߕߎ߲߬ߕߌ
+    not_found:
+      title: ߞߐߕߐ߮ ߡߊ߬ ߛߐ߬ߘߐ߲߬
   friendships:
     make_friend:
       heading: ' ߞߊ߬ %{user} ߞߍ߫ ߌ ߕߋߙߌ ߘߌ߫؟'
@@ -553,6 +542,7 @@ nqo:
           gondola: ߖߟߎ߬ߞߎߟߎ߲
           magic_carpet: ߘߎ߰ߓߍ߲߬ ߞߘߎߞߘߎߟߊ
           platter: ߕߊ߬ߢߍ߲ߞߍߘߍ߲
+          pylon: ߟߐ߲
           station: ߘߎ߲ߞߎߟߎ߲ ߟߐ߬ߘߊ߮
           "yes": ߛߊ߲ߡߊ߫ ߛߌߟߊ (ߘߎ߲ߞߎߟߎ߲)
         aeroway:
@@ -655,6 +645,7 @@ nqo:
           weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲
         boundary:
           administrative: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
+          political: ߛߎߥߊ߲ߘߟߌ ߓߐߕߏ߲
           protected_area: ߦߙߐ߫ ߟߊߞߊ߲ߘߊߣߍ߲
           "yes": ߓߐߕߏ߲
         bridge:
@@ -707,7 +698,9 @@ nqo:
           construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
           living_street: ߛߏߞߣߐ߫ ߛߌߟߊ
           motorway: ߝߏ߲߬ߘߏ
+          passing_place: ߕߊ߬ߡߌ߲߬ ߦߌߟߊ
           path: ߛߌߟߊ
+          pedestrian: ߛߋ߲߬ߡߊ߬ ߛߌߟߊ
           primary: ߛߌߟߊ ߓߊߖߎߟߞߊ
           primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ
           proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲
@@ -720,7 +713,10 @@ nqo:
           service: ߗߋߘߊ߫ ߛߌߟߊ
           speed_camera: ߞߊߟߌߦߊ ߖߊ߬ߛߏ߲߬ߟߊ߲
           steps: ߛߊ߲߬ߞߊ߬ߛߊ߲ߞߊ
+          stop: ߟߐ߬ߟߌ߬ ߛߙߋ
           street_lamp: ߝߏ߲߬ߘߏ߬ߞߊ߲߬ ߡߟߍߞߘߍ
+          traffic_signals: ߛߌߟߊ ߖߌ߰ߣߌ߬ߦߟߍ߫ ߞߐ߯ߙߍߦߊ
+          trailhead: ߥߟߌ߬ ߦߙߐ
           unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
           "yes": ߛߌߟߊ
         historic:
@@ -732,10 +728,13 @@ nqo:
           building: ߓߏ߲߫ ߞߘߐߞߘߐ
           castle: ߖߌ߲߬ߓߏ߲
           church: ߓߊ߬ߕߏ߬ߓߏ߲
+          heritage: ߞߍߦߙߐ \ ߝߘߏ߬ߓߊ߬ߗߍ߮
           house: ߟߎ
           mine: ߘߊ߬ߡߊ߲
           monument: ߝߙߎߕߎ
           railway: ߣߍ߰ߛߌߟߊ ߘߝߐ߬ߡߊ
+          ruins: ߕߏ߲ߓߏ߲
+          rune_stone: ߕߏ߲ߓߏ߲߫ ߞߓߊ
           stone: ߞߓߊ
           tomb: ߛߊ߬ߙߌ
           tower: ߛߊ߲ߓߏ߲
@@ -744,7 +743,14 @@ nqo:
           "yes": ߓߍ߲߬ߕߍ
         landuse:
           cemetery: ߛߊ߬ߙߌ߬ߟߏ
+          commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
+          conservation: ߦߙߐ߫ ߟߊߕߏߣߍ߲ \ ߟߊߡߙߊ߬ߣߍ߲
+          construction: ߟߐ߬ߟߌ߬ ߘߊߞߎ߲
+          farmland: ߛߣߍ߬ߞߍ߬ ߘߊߞߎ߲ \ ߝߏ߬ߘߏ
+          farmyard: ߝߏ߬ߘߏ \ ߖߛߊ \ ߥߍ߫ߙߍ
           forest: ߕߎ
+          garages: ߘߐ߬ߓߍ߲߬ߘߊ
+          grass: ߓߌ߲ \ ߖߍߥߎߟߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
           mine: ߘߊ߬ߡߊ߲
@@ -1857,6 +1863,32 @@ nqo:
       description: ߞߊ߲߬ߛߓߍߟߌ
       created_at: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫
       last_changed: ߞߐ߯ߟߊ߫ ߡߊߦߟߍߡߊ߲ߠߌ߲
+    show:
+      title: 'ߦߟߌߣߐ: %{id}'
+      description: ߕߐ߯ߛߓߍߟߌ
+      open_title: ߦߟߌߣߐ߫ ߢߊߓߐߓߊߟߌ %{note_name}
+      closed_title: ߦߟߌߣߐ߫ ߢߊߓߐߣߍ߲ %{note_name}
+      hidden_title: ߦߟߌߣߐ߫ ߢߡߊߘߏ߲߰ߣߍ߲ %{note_name}
+      opened_by_html: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{user}<abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+        ߟߋ߬ ߓߟߏ߫
+      opened_by_anonymous_html: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߟߊ߫ ߓߟߏ߫ <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: ߡߙߌߣߊ߲ ߞߊ߬ ߝߘߊ߫ %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+      commented_by_anonymous_html: ߡߙߌߣߊ߲ ߞߊ߬ ߝߘߊ߫ ߕߐ߯ߒߕߊ߲ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+        ߟߊ߫
+      closed_by_html: ߊ߬ ߢߊߓߐߣߍ߲߫ ߦߋ߫ %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+        ߓߟߏ߫
+      closed_by_anonymous_html: ߊ߬ ߢߊߓߐߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+        ߟߋ߬ ߓߟߏ߫
+      reopened_by_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߕߎ߲߯ %{user} ߟߋ߬ ߓߟߏ߫ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+      reopened_by_anonymous_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߓߟߏ߫ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+      hidden_by_html: ߊ߬ ߢߡߊߘߏ߲߰ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߓߟߏ߫ <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+      report: ߦߟߌߣߐ ߣߌ߲߬ ߠߊߞߏߝߐ߫
+      hide: ߊ߬ ߢߡߊߘߏ߲߰
+      resolve: ߊ߬ ߢߊߓߐ߫
+      reactivate: ߊ߬ ߟߊߞߎߣߎ߲߫
+    new:
+      title: ߦߟߌߣߐ߫ ߞߎߘߊ߫
+      add: ߦߟߌߣߐ ߝߙߊ߬
   javascripts:
     close: ߊ߬ ߘߊߕߎ߲߯
     share:
@@ -1902,13 +1934,6 @@ nqo:
         unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫
         hide_comment: ߊ߬ ߢߡߊߘߏ߲߰
         unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫
-    notes:
-      new:
-        add: ߦߟߌߣߐ ߝߙߊ߬
-      show:
-        hide: ߊ߬ ߢߡߊߘߏ߲߰
-        resolve: ߊ߬ ߢߊߓߐ߫
-        reactivate: ߊ߬ ߟߊߞߎߣߎ߲߫
     directions:
       engines:
         fossgis_osrm_bike: ߣߍ߰ߛߏ (OSRM)
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 3e9419a9d..e41fda7f6 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -436,27 +436,6 @@ oc:
       wikimedia_commons_link: L'element %{page} sus Wikimedia Commons
       telephone_link: Sonar %{phone_number}
       colour_preview: Previsualizacion de la color %{colour_value}
-    note:
-      title: 'Nòta : %{id}'
-      new_note: Nòta novèla
-      description: Descripcion
-      open_title: Nòta pas resouguda nº %{note_name}
-      closed_title: Nòta resouguda nº %{note_name}
-      hidden_title: Nòta amagada nº %{note_name}
-      opened_by_html: Creat per %{user} <abbr title='%{exact_time}'>fa %{when}</abbr>
-      opened_by_anonymous_html: Creat per un utilizaire anonim <abbr title='%{exact_time}'>fa
-        %{when}</abbr>
-      commented_by_html: Comentari de %{user} fa <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comentat per un utilizaire anonim <abbr title='%{exact_time}'>fa
-        %{when}</abbr>
-      closed_by_html: Reglat per %{user} <abbr title='%{exact_time}'>fa %{when}</abbr>
-      closed_by_anonymous_html: Reglat per un utilizaire anonim <abbr title='%{exact_time}'>fa
-        %{when}</abbr>
-      reopened_by_html: Reactivat per %{user}  fa <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reactivat per un utilizaire anonim fa <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Amagat per %{user} <abbr title='%{exact_time}'>fa %{when}</abbr>
-      report: Avisar d’aquesta nòta
-      coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Requèsta sus leis objèctes
       introduction: Clicar sus la mapa per trobar los objèctes a proximitat.
@@ -2679,6 +2658,39 @@ oc:
       description: Descripcion
       created_at: Creat lo
       last_changed: Darrièr cambiament
+    show:
+      title: 'Nòta : %{id}'
+      description: Descripcion
+      open_title: Nòta pas resouguda nº %{note_name}
+      closed_title: Nòta resouguda nº %{note_name}
+      hidden_title: Nòta amagada nº %{note_name}
+      opened_by_html: Creat per %{user} <abbr title='%{exact_time}'>fa %{when}</abbr>
+      opened_by_anonymous_html: Creat per un utilizaire anonim <abbr title='%{exact_time}'>fa
+        %{when}</abbr>
+      commented_by_html: Comentari de %{user} fa <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comentat per un utilizaire anonim <abbr title='%{exact_time}'>fa
+        %{when}</abbr>
+      closed_by_html: Reglat per %{user} <abbr title='%{exact_time}'>fa %{when}</abbr>
+      closed_by_anonymous_html: Reglat per un utilizaire anonim <abbr title='%{exact_time}'>fa
+        %{when}</abbr>
+      reopened_by_html: Reactivat per %{user}  fa <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivat per un utilizaire anonim fa <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Amagat per %{user} <abbr title='%{exact_time}'>fa %{when}</abbr>
+      report: Avisar d’aquesta nòta
+      coordinates_html: '%{latitude}, %{longitude}'
+      anonymous_warning: Aquela nòta compren de comentaris d'usatgiers anonimes que
+        li faudriá èsser verificats independentament.
+      hide: Amagar
+      resolve: Resòlvre
+      reactivate: Reactivar
+      comment_and_resolve: Comentar e resòlvre
+      comment: Comentari
+    new:
+      title: Nòta novèla
+      intro: Avètz trobat una error o una manca ? Fasètz-lo saber a d’autres cartografes
+        per que i pòscan remediar. Desplaçatz lo marcador a la posicion exacta e escrivètz
+        una nòta per explicar lo problèma.
+      add: Ajustar una nòta
   javascripts:
     close: Plegar
     share:
@@ -2748,20 +2760,6 @@ oc:
         unsubscribe: Se desabonar
         hide_comment: amagar
         unhide_comment: desamagar
-    notes:
-      new:
-        intro: Avètz trobat una error o una manca ? Fasètz-lo saber a d’autres cartografes
-          per que i pòscan remediar. Desplaçatz lo marcador a la posicion exacta e
-          escrivètz una nòta per explicar lo problèma.
-        add: Ajustar una nòta
-      show:
-        anonymous_warning: Aquela nòta compren de comentaris d'usatgiers anonimes
-          que li faudriá èsser verificats independentament.
-        hide: Amagar
-        resolve: Resòlvre
-        reactivate: Reactivar
-        comment_and_resolve: Comentar e resòlvre
-        comment: Comentari
     edit_help: Movètz la mapa e fasètz zoom sus una posicion que volètz editar, e
       de contunh, fasètz clic aicí.
     directions:
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index de39cea2f..0cebb111f 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -212,10 +212,6 @@ pa:
       tags: ਟੈਗ
       wikipedia_link: '%{page} ਲੇਖ ਵਿਕਿਪੀਡਿਆ ਉੱਤੇ'
       telephone_link: '%{phone_number} ਨੂੰ ਫੋਨ ਕਰੋ'
-    note:
-      title: 'ਟਿੱਪਣੀ: %{id}'
-      new_note: ਨਵੀੰ ਟਿੱਪਣੀ
-      description: ਵੇਰਵਾ
   changesets:
     changeset_paging_nav:
       showing_page: ਵਰਕਾ %{page}
@@ -1186,6 +1182,16 @@ pa:
       description: ਵੇਰਵਾ
       created_at: ਕਦੋਂ ਸਿਰਜਿਆ ਗਿਆ
       last_changed: ਆਖ਼ਰੀ ਤਬਦੀਲੀ
+    show:
+      title: 'ਟਿੱਪਣੀ: %{id}'
+      description: ਵੇਰਵਾ
+      hide: ਉਹਲੇ ਕਰੋ
+      resolve: ਹੱਲ਼ ਕੱਢੋ
+      reactivate: ਮੁੜ ਚਾਲੂ ਕਰੋ
+      comment: ਟਿੱਪਣੀ ਕਰੋ
+    new:
+      title: ਨਵੀੰ ਟਿੱਪਣੀ
+      add: ਟਿੱਪਣੀ ਜੋੜੋ
   javascripts:
     close: ਬੰਦ ਕਰੋ
     share:
@@ -1226,14 +1232,6 @@ pa:
       edit_disabled_tooltip: ਨਕਸ਼ਾ ਸੋਧਣ ਵਾਸਤੇ ਅੰਦਰ ਨੂੰ ਜਾਉ
       createnote_tooltip: ਨਕਸ਼ੇ 'ਤੇ ਕੋਈ ਨੋਟ ਜੋੜੋ
       createnote_disabled_tooltip: ਨਕਸ਼ੇ 'ਤੇ ਕੋਈ ਨੋਟ ਜੋੜਨ ਵਾਸਤੇ ਅੰਦਰ ਨੂੰ ਜਾਉ
-    notes:
-      new:
-        add: ਟਿੱਪਣੀ ਜੋੜੋ
-      show:
-        hide: ਉਹਲੇ ਕਰੋ
-        resolve: ਹੱਲ਼ ਕੱਢੋ
-        reactivate: ਮੁੜ ਚਾਲੂ ਕਰੋ
-        comment: ਟਿੱਪਣੀ ਕਰੋ
   redactions:
     show:
       confirm: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ?
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 86a8ca56c..3a1629192 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -525,23 +525,6 @@ pl:
       telephone_link: Zadzwoń pod %{phone_number}
       colour_preview: Podgląd koloru %{colour_value}
       email_link: E-mail %{email}
-    note:
-      title: 'Uwaga: %{id}'
-      new_note: Nowa uwaga
-      description: 'Opis:'
-      open_title: 'Nierozwiązana uwaga #%{note_name}'
-      closed_title: 'Rozwiązana uwaga #%{note_name}'
-      hidden_title: 'Ukryta uwaga #%{note_name}'
-      opened_by_html: 'Utworzona przez: %{user} <abbr title=''%{exact_time}''>%{when}</abbr>'
-      opened_by_anonymous_html: Utworzona anonimowo <abbr title='%{exact_time}'>%{when}.</abbr>
-      commented_by_html: Komentarz od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Skomentowana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: 'Rozwiązana przez: %{user} <abbr title=''%{exact_time}''>%{when}</abbr>'
-      closed_by_anonymous_html: Rozwiązana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Ponownie aktywowana przez %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Ponownie aktywowana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Ukryte przez %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: ją zgłosić
     query:
       title: Dane obiektów
       introduction: Kliknij na mapie, by wyszukać pobliskie obiekty.
@@ -3055,6 +3038,45 @@ pl:
       description: Opis
       created_at: Utworzono w dniu
       last_changed: Ostatnio zmieniono
+    show:
+      title: 'Uwaga: %{id}'
+      description: 'Opis:'
+      open_title: 'Nierozwiązana uwaga #%{note_name}'
+      closed_title: 'Rozwiązana uwaga #%{note_name}'
+      hidden_title: 'Ukryta uwaga #%{note_name}'
+      opened_by_html: 'Utworzona przez: %{user} <abbr title=''%{exact_time}''>%{when}</abbr>'
+      opened_by_anonymous_html: Utworzona anonimowo <abbr title='%{exact_time}'>%{when}.</abbr>
+      commented_by_html: Komentarz od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Skomentowana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: 'Rozwiązana przez: %{user} <abbr title=''%{exact_time}''>%{when}</abbr>'
+      closed_by_anonymous_html: Rozwiązana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Ponownie aktywowana przez %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Ponownie aktywowana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Ukryte przez %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: ją zgłosić
+      anonymous_warning: Uwaga zawiera informacje od anonimowych użytkowników, które
+        należy zweryfikować przed wprowadzeniem zmian na mapie.
+      hide: Ukryj
+      resolve: Oznacz jako rozwiązaną
+      reactivate: Ponownie aktywuj
+      comment_and_resolve: Skomentuj i rozwiąż
+      comment: Dodaj komentarz
+      report_link_html: Jeśli ta uwaga zawiera wrażliwe informacje, które należy usunąć,
+        możesz %{link}.
+      other_problems_resolve: W przypadku wszystkich innych problemów z tą uwagą,
+        rozwiąż ją z odpowiednim komentarzem.
+      other_problems_resolved: W przypadku wszystkich innych problemów wystarczy ją
+        rozwiązać.
+      disappear_date_html: Ta rozwiązana uwaga zniknie z mapy za %{disappear_in}.
+    new:
+      title: Nowa uwaga
+      intro: Zauważyłeś błąd lub brak czegoś? Daj znać innym mapującym, aby mogli
+        to poprawić. Przesuń znacznik do właściwej pozycji i wpisz notatkę opisującą
+        problem.
+      advice: Twoja uwaga jest publiczna i może zostać użyta do zaktualizowania mapy,
+        nie podawaj tu więc informacji osobistych oraz informacji z map i źródeł chronionych
+        prawami autorskimi.
+      add: Dodaj uwagę
   javascripts:
     close: Zamknij
     share:
@@ -3141,30 +3163,6 @@ pl:
         unsubscribe: Nie obserwuj
         hide_comment: ukryj
         unhide_comment: pokaż
-    notes:
-      new:
-        intro: Zauważyłeś błąd lub brak czegoś? Daj znać innym mapującym, aby mogli
-          to poprawić. Przesuń znacznik do właściwej pozycji i wpisz notatkę opisującą
-          problem.
-        advice: Twoja uwaga jest publiczna i może zostać użyta do zaktualizowania
-          mapy, nie podawaj tu więc informacji osobistych oraz informacji z map i
-          źródeł chronionych prawami autorskimi.
-        add: Dodaj uwagę
-      show:
-        anonymous_warning: Uwaga zawiera informacje od anonimowych użytkowników, które
-          należy zweryfikować przed wprowadzeniem zmian na mapie.
-        hide: Ukryj
-        resolve: Oznacz jako rozwiązaną
-        reactivate: Ponownie aktywuj
-        comment_and_resolve: Skomentuj i rozwiąż
-        comment: Dodaj komentarz
-        report_link_html: Jeśli ta uwaga zawiera wrażliwe informacje, które należy
-          usunąć, możesz %{link}.
-        other_problems_resolve: W przypadku wszystkich innych problemów z tą uwagą,
-          rozwiąż ją z odpowiednim komentarzem.
-        other_problems_resolved: W przypadku wszystkich innych problemów wystarczy
-          ją rozwiązać.
-        disappear_date_html: Ta rozwiązana uwaga zniknie z mapy za %{disappear_in}.
     edit_help: Proszę przesunąć mapę i przybliżyć modyfikowane położenie, a następnie
       kliknąć tutaj.
     directions:
diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index e68646327..af93abb22 100644
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -397,25 +397,6 @@ pnb:
       wikimedia_commons_link: وِکیمیڈیا کامنز تے %{page} لئی آئیٹم
       telephone_link: '%{phone_number} نوں فون کرو'
       colour_preview: رنگ %{colour_value} ویکھیو
-    note:
-      title: 'نوٹ: %{id}'
-      new_note: نواں نوٹ
-      description: تفصیل
-      open_title: 'حل نہیں لبھݨ نوٹ: %{note_name}'
-      closed_title: 'بند کرن نوٹ: %{note_name}'
-      hidden_title: 'لُکاݨ نوٹ: %{note_name}'
-      opened_by_html: <abbr title='%{exact_time}'>%{when} «%{user}» نوٹ بݨایا</abbr>
-      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when} انام ورتنوالا
-        نوٹ بݨایا</abbr>
-      commented_by_html: <abbr title='%{exact_time}'>%{when} «%{user}» ٹپݨی پائی گئی</abbr>
-      commented_by_anonymous_html: <abbr title='%{exact_time}'>%{when} ان ورتنوالا
-        ٹپݨی پئی گئی</abbr>
-      closed_by_html: <abbr title='%{exact_time}'>%{when} «%{user}» نوٹ بند کیتا</abbr>
-      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when} انام ورتنوالا
-        نوٹ بند کیتا</abbr>
-      hidden_by_html: <abbr title='%{exact_time}'>%{when} «%{user}» نوٹ لُکایا</abbr>
-      report: ایہہ نوٹ رپورٹ کرو
-      coordinates_html: '%{latitude}; %{longitude}'
     query:
       title: نقشاں لئی پرشن
       introduction: اِتھے نقشے تے نقش لبھیو
@@ -2191,6 +2172,32 @@ pnb:
       description: تفصیل
       created_at: کدوں سرجیا گیا
       last_changed: آخری تبدیلی
+    show:
+      title: 'نوٹ: %{id}'
+      description: تفصیل
+      open_title: 'حل نہیں لبھݨ نوٹ: %{note_name}'
+      closed_title: 'بند کرن نوٹ: %{note_name}'
+      hidden_title: 'لُکاݨ نوٹ: %{note_name}'
+      opened_by_html: <abbr title='%{exact_time}'>%{when} «%{user}» نوٹ بݨایا</abbr>
+      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when} انام ورتنوالا
+        نوٹ بݨایا</abbr>
+      commented_by_html: <abbr title='%{exact_time}'>%{when} «%{user}» ٹپݨی پائی گئی</abbr>
+      commented_by_anonymous_html: <abbr title='%{exact_time}'>%{when} ان ورتنوالا
+        ٹپݨی پئی گئی</abbr>
+      closed_by_html: <abbr title='%{exact_time}'>%{when} «%{user}» نوٹ بند کیتا</abbr>
+      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when} انام ورتنوالا
+        نوٹ بند کیتا</abbr>
+      hidden_by_html: <abbr title='%{exact_time}'>%{when} «%{user}» نوٹ لُکایا</abbr>
+      report: ایہہ نوٹ رپورٹ کرو
+      coordinates_html: '%{latitude}; %{longitude}'
+      hide: لُکاؤ
+      resolve: حل کڈھو
+      reactivate: مڑ چالو کرو
+      comment_and_resolve: ٹپݨی کرو، حل کرو تے بند کرو
+      comment: ٹپݨی کرو
+    new:
+      title: نواں نوٹ
+      add: نوٹ پایو
   javascripts:
     close: بند کرو
     share:
@@ -2258,15 +2265,6 @@ pnb:
         comment: ٹپݨی کرو
         hide_comment: لُکاؤ
         unhide_comment: نہیں لُکاؤ
-    notes:
-      new:
-        add: نوٹ پایو
-      show:
-        hide: لُکاؤ
-        resolve: حل کڈھو
-        reactivate: مڑ چالو کرو
-        comment_and_resolve: ٹپݨی کرو، حل کرو تے بند کرو
-        comment: ٹپݨی کرو
     directions:
       engines:
         fossgis_osrm_bike: سائیکل (او ایس آر ایم)
diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 07bdc1543..5c96f1d0b 100644
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -460,13 +460,13 @@ ps:
     blocks:
       creator_name: جوړونکی
       status: دريځ
+  notes:
+    show:
+      hide: پټول
+      comment: تبصره
   javascripts:
     map:
       copyright: © <a href='%{copyright_url}'>د اوفن سټریټ ميپ مرسته کوونکی</a>
-    notes:
-      show:
-        hide: پټول
-        comment: تبصره
     directions:
       distance: واټن
       instructions:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index a00979335..98527cc7f 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -145,6 +145,7 @@ pt-BR:
       diary_entry:
         user: Usuário
         title: Assunto
+        body: Corpo
         latitude: Latitude
         longitude: Longitude
         language_code: Idioma
@@ -364,7 +365,7 @@ pt-BR:
         o seu e-mail para confirmar seu novo endereço.
       success: Sucesso ao atualizar informação de usuário.
     destroy:
-      success: Conta Eliminada.
+      success: Conta eliminada.
   browse:
     created: Criado
     closed: Fechado
@@ -481,23 +482,6 @@ pt-BR:
       telephone_link: Ligar para %{phone_number}
       colour_preview: Pré-visualização da cor %{colour_value}
       email_link: E-mail %{email}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nova nota
-      description: Descrição
-      open_title: 'Nota não resolvida #%{note_name}'
-      closed_title: 'Nota resolvida #%{note_name}'
-      hidden_title: 'Nota oculta #%{note_name}'
-      opened_by_html: Criado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Criado por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comentado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comentado por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resolvido por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resolvido por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reaberto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reaberto por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Ocultado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: denunciar esta nota
     query:
       title: Consultar elementos
       introduction: Clique no mapa para achar elementos próximos
@@ -1028,7 +1012,7 @@ pt-BR:
           brownfield: Terreno Abandonado
           cemetery: Cemitério Secular
           commercial: Área de Negócios
-          conservation: Área de Conservação
+          conservation: Área de conservação
           construction: Área de Construção
           farmland: Lavoura
           farmyard: Pátio de fazenda
@@ -2998,6 +2982,42 @@ pt-BR:
       description: Descrição
       created_at: Criado em
       last_changed: Última alteração
+    show:
+      title: 'Nota: %{id}'
+      description: Descrição
+      open_title: 'Nota não resolvida #%{note_name}'
+      closed_title: 'Nota resolvida #%{note_name}'
+      hidden_title: 'Nota oculta #%{note_name}'
+      opened_by_html: Criado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Criado por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comentado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comentado por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolvido por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolvido por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reaberto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reaberto por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Ocultado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: denunciar esta nota
+      anonymous_warning: Esta nota contém comentários de usuários anônimos que devem
+        ser conferidos separadamente.
+      hide: Esconder
+      resolve: Resolver
+      reactivate: Reativar
+      comment_and_resolve: Comentar e resolver
+      comment: Comentar
+      report_link_html: Se esta nota contiver informação sensível que tenha de ser
+        removida, podes %{link}.
+      other_problems_resolved: Para todos os outros problemas, a sua resolução é suficiente.
+      disappear_date_html: Esta nota resolvida desaparecerá do mapa em %{disappear_in}.
+    new:
+      title: Nova nota
+      intro: Encontrou um erro ou algo faltando? Informe outros mapeadores para que
+        isso possa ser corrigido. Mova o marcador para a posição correta e digite
+        uma nota para explicar o problema.
+      advice: A sua nota será pública e pode ser usada para atualizar o mapa, portanto,
+        não insira informações pessoais ou dados de mapas protegidos por direitos
+        autorais ou listas de diretórios.
+      add: Incluir nota
   javascripts:
     close: Fechar
     share:
@@ -3079,29 +3099,6 @@ pt-BR:
         unsubscribe: Cancelar inscrição
         hide_comment: esconder
         unhide_comment: exibir
-    notes:
-      new:
-        intro: Encontrou um erro ou algo faltando? Informe outros mapeadores para
-          que isso possa ser corrigido. Mova o marcador para a posição correta e digite
-          uma nota para explicar o problema.
-        advice: A sua nota será pública e pode ser usada para atualizar o mapa, portanto,
-          não insira informações pessoais ou dados de mapas protegidos por direitos
-          autorais ou listas de diretórios.
-        add: Incluir nota
-      show:
-        anonymous_warning: Esta nota contém comentários de usuários anônimos que devem
-          ser conferidos separadamente.
-        hide: Esconder
-        resolve: Resolver
-        reactivate: Reativar
-        comment_and_resolve: Comentar e resolver
-        comment: Comentar
-        report_link_html: Se esta nota contiver informação sensível que tenha de ser
-          removida, podes %{link}. Para qualquer outro problema com a nota, por favor,
-          resolve-a com um comentário.
-        other_problems_resolved: Para todos os outros problemas, a sua resolução é
-          suficiente.
-        disappear_date_html: Esta nota resolvida desaparecerá do mapa em %{disappear_in}.
     edit_help: Mover o mapa e ampliar uma localização que pretende editar e clique
       aqui.
     directions:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 58cf4e035..942a17da2 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -132,6 +132,7 @@ pt-PT:
       diary_entry:
         user: Utilizador
         title: Assunto
+        body: Mensagem
         latitude: Latitude
         longitude: Longitude
         language_code: Idioma
@@ -472,23 +473,6 @@ pt-PT:
       telephone_link: Telefonar %{phone_number}
       colour_preview: Antevisão da cor %{colour_value}
       email_link: E-mail %{email}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nova Nota
-      description: Descrição
-      open_title: Nota não resolvida n.º %{note_name}
-      closed_title: Nota resolvida n.º %{note_name}
-      hidden_title: Nota oculta n.º %{note_name}
-      opened_by_html: Criada por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Criada por um anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comentário de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comentário de um anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resolvida por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resolvida por um anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reaberto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reaberto por um anónimo <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Ocultada por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: denunciar esta nota
     query:
       title: Consultar elementos
       introduction: Clica no mapa para descobrir elementos próximos.
@@ -646,6 +630,25 @@ pt-PT:
       applications:
         create:
           notice: Aplicação registada.
+  errors:
+    contact:
+      contact_url_title: Vários canais de contacto explicados
+      contact: contactar
+      contact_the_community_html: Fique à vontade para %{contact_link} a comunidade
+        OpenStreetMap caso tenha encontrado uma ligação inativa ou um erro. Deixe
+        uma nota da URL exata da sua solicitação.
+    forbidden:
+      title: Proibido
+      description: A operação solicitada no servidor do OpenStreetMap só está disponível
+        para administradores (HTTP 403)
+    internal_server_error:
+      title: Erro de aplicação
+      description: O servidor do OpenStreetMap encontrou um problema inesperado que
+        o impediu de atender ao pedido (HTTP 500)
+    not_found:
+      title: Ficheiro não encontrado
+      description: Não foi possível encontrar uma operação de ficheiro/diretório/API
+        com esse nome no servidor do OpenStreetMap (HTTP 404)
   friendships:
     make_friend:
       heading: Adicionar %{user} à lista de amigos?
@@ -2981,6 +2984,45 @@ pt-PT:
       description: Descrição
       created_at: Criada em
       last_changed: Última alteração
+    show:
+      title: 'Nota: %{id}'
+      description: Descrição
+      open_title: Nota não resolvida n.º %{note_name}
+      closed_title: Nota resolvida n.º %{note_name}
+      hidden_title: Nota oculta n.º %{note_name}
+      opened_by_html: Criada por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Criada por um anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comentário de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comentário de um anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolvida por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolvida por um anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reaberto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reaberto por um anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Ocultada por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: denunciar esta nota
+      anonymous_warning: Esta nota inclui comentários de utilizadores anónimos que
+        devem ser confirmados por fonte independente.
+      hide: Esconder
+      resolve: Marcar como resolvido
+      reactivate: Reabrir
+      comment_and_resolve: Comentar e resolver
+      comment: Comentar
+      report_link_html: Se esta nota contiver informações sensíveis que precisem de
+        ser removidas, poderás %{link}.
+      other_problems_resolve: Para qualquer outro problema com a nota, resolve-a pessoalmente
+        com um comentário.
+      other_problems_resolved: Para todos os outros problemas, a sua resolução é suficiente.
+      disappear_date_html: Esta nota resolvida desaparecerá do mapa em %{disappear_in}.
+    new:
+      title: Nova Nota
+      intro: Encontraste um erro ou algo que está em falta no mapa? Deixa uma descrição
+        o mais pormenorizada possível sobre o que pretendes ver alterado no mapa,
+        para que outros mapeadores te possam ajudar. Posiciona o marcador no local
+        correto e escreve uma nota que explique o problema.
+      advice: 'Lembra-te: a tua nota é pública e poderá ser usada para atualizar o
+        mapa, portanto, não introduzas informações pessoais, dados de mapas ou catálogos
+        protegidos por direitos de autor.'
+      add: Adicionar Nota
   javascripts:
     close: Fechar
     share:
@@ -3063,30 +3105,6 @@ pt-PT:
         unsubscribe: Anular subscrição
         hide_comment: ocultar
         unhide_comment: desocultar
-    notes:
-      new:
-        intro: Encontraste um erro ou algo que está em falta? Informa os outros mapeadores
-          para que eles possam corrigi-lo. Posiciona o marcador no local correto e
-          escreve uma nota que explique o problema.
-        advice: A tua nota é pública e poderá ser utilizada para atualizar o mapa,
-          portanto, não introduzas informações pessoais, dados de mapas ou catálogos
-          protegidos por direitos de autor.
-        add: Adicionar Nota
-      show:
-        anonymous_warning: Esta nota inclui comentários de utilizadores anónimos que
-          devem ser confirmados por fonte independente.
-        hide: Esconder
-        resolve: Marcar como resolvido
-        reactivate: Reabrir
-        comment_and_resolve: Comentar e resolver
-        comment: Comentar
-        report_link_html: Se esta nota contiver informações sensíveis que precisem
-          de ser removidas, poderás %{link}.
-        other_problems_resolve: Para qualquer outro problema com a nota, resolve-a
-          pessoalmente com um comentário.
-        other_problems_resolved: Para todos os outros problemas, a sua resolução é
-          suficiente.
-        disappear_date_html: Esta nota resolvida desaparecerá do mapa em %{disappear_in}.
     edit_help: Move o mapa, amplia-o no local que pretendes editar e clica aqui.
     directions:
       ascend: Ascenção
@@ -3098,10 +3116,13 @@ pt-PT:
         graphhopper_car: Carro (GraphHopper)
         graphhopper_foot: A pé (GraphHopper)
         fossgis_valhalla_bicycle: Bicicleta (Valhalla)
+        fossgis_valhalla_car: Automóvel (Valhalla)
         fossgis_valhalla_foot: Pé (Valhalla)
       descend: Descida
       directions: Direções
       distance: Distância
+      distance_m: '%{distance} m'
+      distance_km: '%{distance} km'
       errors:
         no_route: Não foi encontrada uma rota entre os dois pontos.
         no_place: Desculpe - não foi possível encontrar '%{place}'.
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index f71e121eb..bf1e14119 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -420,23 +420,6 @@ ro:
       wikimedia_commons_link: Item-ul %{page} pe Wikimedia Commons
       telephone_link: Sună %{phone_number}
       colour_preview: Previzualizează %{colour_value} culoare
-    note:
-      title: 'Notă: %{id}'
-      new_note: Notă nouă
-      description: Descriere
-      open_title: 'Notă nerezolvată #%{note_name}'
-      closed_title: 'Notă rezolvată #%{note_name}'
-      hidden_title: 'Notă ascunsă #%{note_name}'
-      opened_by_html: Creat de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Creat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comentariu de la %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comentariu de la anonim <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Rezolvat de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Rezolvat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reactivat de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reactivat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Ascunsă de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Raportează această notă
     query:
       title: Interogări ale funcțiilor
       introduction: Dați clic pe hartă pentru a găsi obiectivele din apropiere.
@@ -2774,6 +2757,38 @@ ro:
       description: Descriere
       created_at: Creat  la
       last_changed: Ultima modificare
+    show:
+      title: 'Notă: %{id}'
+      description: Descriere
+      open_title: 'Notă nerezolvată #%{note_name}'
+      closed_title: 'Notă rezolvată #%{note_name}'
+      hidden_title: 'Notă ascunsă #%{note_name}'
+      opened_by_html: Creat de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Creat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comentariu de la %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comentariu de la anonim <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Rezolvat de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Rezolvat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivat de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Ascunsă de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Raportează această notă
+      anonymous_warning: Această notă include comentarii de la utilizatori anonimi,
+        care ar trebui verificați independent.
+      hide: Ascunde
+      resolve: Rezolvă
+      reactivate: Reactivează
+      comment_and_resolve: Comentariu & Rezolvare
+      comment: Comentariu
+    new:
+      title: Notă nouă
+      intro: A apărut o greșeală sau lipsește ceva? Lăsați alți cartografi să știe
+        pentru că putem rezolva asta. Deplasați marcatorul în poziția corectă și introduceți
+        o notă pentru a explica problema.
+      advice: Notația dvs. este publică și poate fi utilizată pentru actualizarea
+        hărții, astfel încât să nu introduceți informații personale sau informații
+        din hărți protejate prin drepturi de autor sau listări de directoare.
+      add: Adaugă notație
   javascripts:
     close: Închide
     share:
@@ -2854,23 +2869,6 @@ ro:
         unsubscribe: Dezabonare
         hide_comment: ascunde
         unhide_comment: arată
-    notes:
-      new:
-        intro: A apărut o greșeală sau lipsește ceva? Lăsați alți cartografi să știe
-          pentru că putem rezolva asta. Deplasați marcatorul în poziția corectă și
-          introduceți o notă pentru a explica problema.
-        advice: Notația dvs. este publică și poate fi utilizată pentru actualizarea
-          hărții, astfel încât să nu introduceți informații personale sau informații
-          din hărți protejate prin drepturi de autor sau listări de directoare.
-        add: Adaugă notație
-      show:
-        anonymous_warning: Această notă include comentarii de la utilizatori anonimi,
-          care ar trebui verificați independent.
-        hide: Ascunde
-        resolve: Rezolvă
-        reactivate: Reactivează
-        comment_and_resolve: Comentariu & Rezolvare
-        comment: Comentariu
     edit_help: Deplasați harta și măriți o locație pe care doriți să o editați, apoi
       faceți click aici.
     directions:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 1238eaeb5..be1ff495a 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -557,23 +557,6 @@ ru:
       telephone_link: Позвонить %{phone_number}
       colour_preview: Просмотр цвета %{colour_value}
       email_link: Электронная почта %{email}
-    note:
-      title: 'Заметка: %{id}'
-      new_note: Новая заметка
-      description: Описание
-      open_title: 'Незакрытая заметка #%{note_name}'
-      closed_title: 'Закрытая заметка #%{note_name}'
-      hidden_title: 'Скрытая заметка #%{note_name}'
-      opened_by_html: Создана %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Создано анонимно <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Комментарий от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Анонимный комментарий <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Закрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Закрыта анонимно <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Переоткрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Переоткрыта анонимно <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Скрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: пожаловаться на эту заметку
     query:
       title: Что здесь?
       introduction: Нажмите на карту, чтобы найти ближайшие объекты
@@ -3029,6 +3012,44 @@ ru:
       description: Описание
       created_at: Создана
       last_changed: Изменена
+    show:
+      title: 'Заметка: %{id}'
+      description: Описание
+      open_title: 'Незакрытая заметка #%{note_name}'
+      closed_title: 'Закрытая заметка #%{note_name}'
+      hidden_title: 'Скрытая заметка #%{note_name}'
+      opened_by_html: Создана %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Создано анонимно <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Комментарий от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Анонимный комментарий <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Закрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Закрыта анонимно <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Переоткрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Переоткрыта анонимно <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Скрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: пожаловаться на эту заметку
+      anonymous_warning: Эта заметка содержит комментарии анонимных участников. Требуется
+        независимая проверка сведений.
+      hide: Скрыть
+      resolve: Закрыть
+      reactivate: Открыть снова
+      comment_and_resolve: Закрыть с комментарием
+      comment: Комментировать
+      report_link_html: Если эта заметка содержит чувствительную информацию, которую
+        нужно удалить, вы можете %{link}.
+      other_problems_resolve: При всех других проблемах с заметкой, закройте её, пожалуйста,
+        самостоятельно с комментарием.
+      other_problems_resolved: При всех других проблемах, достаточно закрытия заметки.
+      disappear_date_html: Закрытая заметка исчезнет с карты через %{disappear_in}.
+    new:
+      title: Новая заметка
+      intro: Заметили ошибку или отсутствие чего-либо? Дайте знать об этом другим
+        картографам, чтобы они могли это исправить. Переместите маркер в нужное место
+        и напечатайте сообщение, объясняющее проблему.
+      advice: Ваша заметка является общедоступной и может использоваться для обновления
+        карты, поэтому не вводите личную информацию, информацию из защищённых авторскими
+        правами карт или справочников.
+      add: Добавить заметку
   javascripts:
     close: Закрыть
     share:
@@ -3117,29 +3138,6 @@ ru:
         unsubscribe: Отписаться
         hide_comment: скрыть
         unhide_comment: показать
-    notes:
-      new:
-        intro: Заметили ошибку или отсутствие чего-либо? Дайте знать об этом другим
-          картографам, чтобы они могли это исправить. Переместите маркер в нужное
-          место и напечатайте сообщение, объясняющее проблему.
-        advice: Ваша заметка является общедоступной и может использоваться для обновления
-          карты, поэтому не вводите личную информацию, информацию из защищённых авторскими
-          правами карт или справочников.
-        add: Добавить заметку
-      show:
-        anonymous_warning: Эта заметка содержит комментарии анонимных участников.
-          Требуется независимая проверка сведений.
-        hide: Скрыть
-        resolve: Закрыть
-        reactivate: Открыть снова
-        comment_and_resolve: Закрыть с комментарием
-        comment: Комментировать
-        report_link_html: Если эта заметка содержит чувствительную информацию, которую
-          нужно удалить, вы можете %{link}.
-        other_problems_resolve: При всех других проблемах с заметкой, закройте её,
-          пожалуйста, самостоятельно с комментарием.
-        other_problems_resolved: При всех других проблемах, достаточно закрытия заметки.
-        disappear_date_html: Закрытая заметка исчезнет с карты через %{disappear_in}.
     edit_help: Передвиньте карту и увеличьте место, которые вы хотите править, затем
       кликните здесь.
     directions:
diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 2ed8f7c1b..2778e6a0f 100644
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -200,11 +200,6 @@ sat:
     tag_details:
       tags: ᱴᱮᱜᱠᱚ
       telephone_link: '%{phone_number}ᱠᱟᱸᱞ ᱢᱮ'
-    note:
-      title: '%{id} :ᱠᱷᱟᱴᱟᱹ ᱚᱞ'
-      new_note: ᱱᱟᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ
-      description: ᱵᱤᱵᱨᱚᱱ
-      report: ᱱᱚᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ ᱨᱤᱯᱚᱴ ᱢᱮ
     query:
       introduction: ᱱᱚᱠᱥᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ ᱧᱟᱢ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱾
       nearby: ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ
@@ -696,6 +691,16 @@ sat:
       showing_page: ᱥᱟᱦᱴᱟ %{page}
       next: ᱤᱱᱟ ᱛᱟᱭᱚᱢ >>
       previous: << ᱛᱟᱭᱚᱢ
+  notes:
+    show:
+      title: '%{id} :ᱠᱷᱟᱴᱟᱹ ᱚᱞ'
+      description: ᱵᱤᱵᱨᱚᱱ
+      report: ᱱᱚᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ ᱨᱤᱯᱚᱴ ᱢᱮ
+      hide: ᱩᱠᱩ
+      comment: ᱚᱠᱛᱟ
+    new:
+      title: ᱱᱟᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ
+      add: ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
   javascripts:
     close: ᱵᱚᱸᱫᱚ
     share:
@@ -729,12 +734,6 @@ sat:
       show:
         comment: ᱚᱠᱛᱟ
         hide_comment: ᱫᱟᱱᱟᱝ
-    notes:
-      new:
-        add: ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
-      show:
-        hide: ᱩᱠᱩ
-        comment: ᱚᱠᱛᱟ
     directions:
       engines:
         fossgis_osrm_bike: ᱵᱟᱭᱥᱟᱭᱠᱤᱞ (OSRM)
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 827f799f0..5c946eb24 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -445,23 +445,6 @@ sc:
       telephone_link: Muti a su %{phone_number}
       colour_preview: Anteprima de su colore %{colour_value}
       email_link: Posta eletrònica %{email}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nota noa
-      description: Descritzione
-      open_title: 'Nota non risòlvida #%{note_name}'
-      closed_title: 'Nota risòlvida #%{note_name}'
-      hidden_title: 'Nota cuada #%{note_name}'
-      opened_by_html: Creada dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Creada dae un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Cummentu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Cummentu de un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Risòlvida dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Risòlvida dae un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Torrada a ativare dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Torrada a ativare dae un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Cuada dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: sinnalare custa nota
     query:
       title: Chirca de elementos
       introduction: Incarca in sa mapa pro agatare elementos a curtzu.
@@ -3017,6 +3000,45 @@ sc:
       description: Descritzione
       created_at: Creada su
       last_changed: Ùrtima modìfica
+    show:
+      title: 'Nota: %{id}'
+      description: Descritzione
+      open_title: 'Nota non risòlvida #%{note_name}'
+      closed_title: 'Nota risòlvida #%{note_name}'
+      hidden_title: 'Nota cuada #%{note_name}'
+      opened_by_html: Creada dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Creada dae un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Cummentu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Cummentu de un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Risòlvida dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Risòlvida dae un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Torrada a ativare dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Torrada a ativare dae un'anònimu <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Cuada dae %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: sinnalare custa nota
+      anonymous_warning: Custa nota includet cummentos de utentes anònimos chi diant
+        dèpere èssere verificatos in manera indipendente.
+      hide: Cua
+      resolve: Risolve
+      reactivate: Torra a ativare
+      comment_and_resolve: Cummenta e Risolve
+      comment: Cummentu
+      report_link_html: Si custa nota cuntenet informatziones sensìbiles chi tocat
+        de bogare, podes %{link}.
+      other_problems_resolve: Pro totu sos àteros problemas cun custa nota pro praghere
+        risolve·los tue matessi cun unu cummentu.
+      other_problems_resolved: Pro totu sos àteros problemas, sa risolutzione est
+        sufitziente.
+      disappear_date_html: Custa nota risolta at a isparire dae sa mapa in %{disappear_in}.
+    new:
+      title: Nota noa
+      intro: As agatadu una faddina o carchi cosa chi mancat? Informa sos àteros mapadores
+        a manera chi lu potzant acontzare. Move su marcadore a sa positzione curreta
+        e iscrie una nota pro descrìere su problema.
+      advice: Sa nota tua est pùblica e si podet impreare pro atualizare sa mapa,
+        duncas non nch'insertes peruna informatzione personale o informatzione de
+        mapas cun deretu de autore o elencos.
+      add: Annanghe una nota
   javascripts:
     close: Serra
     share:
@@ -3101,30 +3123,6 @@ sc:
         unsubscribe: Annulla s'iscritzione
         hide_comment: cua
         unhide_comment: ammustra
-    notes:
-      new:
-        intro: As agatadu una faddina o carchi cosa chi mancat? Informa sos àteros
-          mapadores a manera chi lu potzant acontzare. Move su marcadore a sa positzione
-          curreta e iscrie una nota pro descrìere su problema.
-        advice: Sa nota tua est pùblica e si podet impreare pro atualizare sa mapa,
-          duncas non nch'insertes peruna informatzione personale o informatzione de
-          mapas cun deretu de autore o elencos.
-        add: Annanghe una nota
-      show:
-        anonymous_warning: Custa nota includet cummentos de utentes anònimos chi diant
-          dèpere èssere verificatos in manera indipendente.
-        hide: Cua
-        resolve: Risolve
-        reactivate: Torra a ativare
-        comment_and_resolve: Cummenta e Risolve
-        comment: Cummentu
-        report_link_html: Si custa nota cuntenet informatziones sensìbiles chi tocat
-          de bogare, podes %{link}.
-        other_problems_resolve: Pro totu sos àteros problemas cun custa nota pro praghere
-          risolve·los tue matessi cun unu cummentu.
-        other_problems_resolved: Pro totu sos àteros problemas, sa risolutzione est
-          sufitziente.
-        disappear_date_html: Custa nota risolta at a isparire dae sa mapa in %{disappear_in}.
     edit_help: Move sa mapa, ismànnia in una positzione chi boles modificare e a pustis
       incarca inoghe
     directions:
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 51f4a1e01..b74f6ac60 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -346,27 +346,6 @@ scn:
       wikipedia_link: L'artìculu %{page} supra a Wikipedia
       telephone_link: Chiama lu %{phone_number}
       colour_preview: Antiprima culuri %{colour_value}
-    note:
-      title: 'Nota: %{id}'
-      new_note: Nota nova
-      description: Discrizzioni
-      open_title: 'Nota nun arrisurvuta #%{note_name}'
-      closed_title: 'Nota arrisurvuta #%{note_name}'
-      hidden_title: 'Nota ammucciata #%{note_name}'
-      opened_by_html: Criata di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
-      opened_by_anonymous_html: Criata di n'anònimu <abbr title='%{exact_time}'>%{when}
-        fa</abbr>
-      commented_by_html: Cummentu di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
-      commented_by_anonymous_html: Cummentu di n'anònimu <abbr title='%{exact_time}'>%{when}
-        fa</abbr>
-      closed_by_html: Arrisurvuta di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
-      closed_by_anonymous_html: Arrisurvuta di n'anònimu <abbr title='%{exact_time}'>%{when}
-        fa</abbr>
-      reopened_by_html: Arrigraputa di %{user} <abbr title='%{exact_time}'>%{when}
-        fa</abbr>
-      reopened_by_anonymous_html: Arrigraputa di n'anònimu <abbr title='%{exact_time}'>%{when}
-        fa</abbr>
-      hidden_by_html: Ammucciata di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
     query:
       title: Arricerca di l'elimenti
       introduction: Clicca supra â cartina pi circari l'elimenti vicini.
@@ -2244,6 +2223,41 @@ scn:
       description: Discrizzioni
       created_at: Criata lu
       last_changed: Canciata l'ùrtima vota lu
+    show:
+      title: 'Nota: %{id}'
+      description: Discrizzioni
+      open_title: 'Nota nun arrisurvuta #%{note_name}'
+      closed_title: 'Nota arrisurvuta #%{note_name}'
+      hidden_title: 'Nota ammucciata #%{note_name}'
+      opened_by_html: Criata di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
+      opened_by_anonymous_html: Criata di n'anònimu <abbr title='%{exact_time}'>%{when}
+        fa</abbr>
+      commented_by_html: Cummentu di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
+      commented_by_anonymous_html: Cummentu di n'anònimu <abbr title='%{exact_time}'>%{when}
+        fa</abbr>
+      closed_by_html: Arrisurvuta di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
+      closed_by_anonymous_html: Arrisurvuta di n'anònimu <abbr title='%{exact_time}'>%{when}
+        fa</abbr>
+      reopened_by_html: Arrigraputa di %{user} <abbr title='%{exact_time}'>%{when}
+        fa</abbr>
+      reopened_by_anonymous_html: Arrigraputa di n'anònimu <abbr title='%{exact_time}'>%{when}
+        fa</abbr>
+      hidden_by_html: Ammucciata di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
+      anonymous_warning: Sta nota cunteni cummenti di utenti anònimi, chi s'avìssiru
+        a virificari di fonti nnipinnenti.
+      hide: Ammuccia
+      resolve: Arrisorvi
+      reactivate: Attiva di novu
+      comment_and_resolve: Cummenta & arrisorvi
+      comment: Cummenta
+    new:
+      title: Nota nova
+      intro: Attruvasti nu sbagghiu o quarchi cosa chi ammanca? Faccillu sapiri a
+        l'àutri mappatura, accussì lu putemu cunzari. Sposta lu signali ntâ pusizzioni
+        curretta e scrivi na nota pi spigari quali è lu prubblema. (Pi favuri nun
+        mèttiri nfurmazzioni pirsunali, o puru chi vèninu di cartini o elenchi chi
+        sunnu prutetti di drittu d'auturi.)
+      add: Agghiunci la nota
   javascripts:
     close: Chiudi
     share:
@@ -2305,22 +2319,6 @@ scn:
         unsubscribe: Annulla l’abbunamentu
         hide_comment: ammuccia
         unhide_comment: Ammustra
-    notes:
-      new:
-        intro: Attruvasti nu sbagghiu o quarchi cosa chi ammanca? Faccillu sapiri
-          a l'àutri mappatura, accussì lu putemu cunzari. Sposta lu signali ntâ pusizzioni
-          curretta e scrivi na nota pi spigari quali è lu prubblema. (Pi favuri nun
-          mèttiri nfurmazzioni pirsunali, o puru chi vèninu di cartini o elenchi chi
-          sunnu prutetti di drittu d'auturi.)
-        add: Agghiunci la nota
-      show:
-        anonymous_warning: Sta nota cunteni cummenti di utenti anònimi, chi s'avìssiru
-          a virificari di fonti nnipinnenti.
-        hide: Ammuccia
-        resolve: Arrisorvi
-        reactivate: Attiva di novu
-        comment_and_resolve: Cummenta & arrisorvi
-        comment: Cummenta
     edit_help: Sposta la cartina e zumma ntôn postu chi voi canciari, e appoi clicca
       ccà.
     directions:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 09cfd7ef9..b3eccec90 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -190,28 +190,6 @@ sco:
       wikidata_link: The %{page} item on Wikidata
       wikipedia_link: The %{page} airticle on Wikipaedia
       telephone_link: Caw %{phone_number}
-    note:
-      title: 'Note: %{id}'
-      new_note: New Note
-      description: Descreeption
-      open_title: 'Unresolved note #%{note_name}'
-      closed_title: 'Resolved note #%{note_name}'
-      hidden_title: 'Hidden note #%{note_name}'
-      opened_by_html: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      opened_by_anonymous_html: Creatit bi anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      commented_by_html: Comment frae %{user} <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      commented_by_anonymous_html: Comment frae anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      closed_by_html: Resolved bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      closed_by_anonymous_html: Resolved bi anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      reopened_by_html: Reactivatit bi %{user} <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      reopened_by_anonymous_html: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      hidden_by_html: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
@@ -1065,12 +1043,34 @@ sco:
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location
+  notes:
+    show:
+      title: 'Note: %{id}'
+      description: Descreeption
+      open_title: 'Unresolved note #%{note_name}'
+      closed_title: 'Resolved note #%{note_name}'
+      hidden_title: 'Hidden note #%{note_name}'
+      opened_by_html: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      opened_by_anonymous_html: Creatit bi anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_html: Comment frae %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_anonymous_html: Comment frae anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      closed_by_html: Resolved bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      closed_by_anonymous_html: Resolved bi anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      reopened_by_html: Reactivatit bi %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      reopened_by_anonymous_html: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      hidden_by_html: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+    new:
+      title: New Note
+      intro: Spotted ae mistake or sommit missin? Lat ither mappers ken sae that we
+        can fix it. Muiv the maurker til the richt poseetion n type ae few wairds
+        tae explain the proablem. (Please dinna enter personal information here.)
   javascripts:
-    notes:
-      new:
-        intro: Spotted ae mistake or sommit missin? Lat ither mappers ken sae that
-          we can fix it. Muiv the maurker til the richt poseetion n type ae few wairds
-          tae explain the proablem. (Please dinna enter personal information here.)
     directions:
       errors:
         no_place: Sairy - couldna find that place.
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index b2229f372..506e0c5ac 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -480,23 +480,6 @@ sk:
       telephone_link: Vytočiť %{phone_number}
       colour_preview: Náhľad farby %{colour_value}
       email_link: E-mail %{email}
-    note:
-      title: 'Poznámka: %{id}'
-      new_note: Nová poznámka
-      description: Popis
-      open_title: 'Nevyriešená chyba #%{note_name}'
-      closed_title: 'Vyriešená chyba #%{note_name}'
-      hidden_title: Skrytá poznámka %{note_name}
-      opened_by_html: Vytvoril %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Vytvoril anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Komentár od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Komentoval anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Vyriešil %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Vyriešil anonym <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Opätovne aktivoval používateľ %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Opätovne aktivoval anonymný používateľ <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Skryl %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: nahlásiť túto poznámku
     query:
       title: Prieskum prvkov
       introduction: Pre nájdenie okolitých prvkov kliknite na mapu.
@@ -2693,6 +2676,44 @@ sk:
       description: Popis
       created_at: Vytvorené
       last_changed: Posledná zmena
+    show:
+      title: 'Poznámka: %{id}'
+      description: Popis
+      open_title: 'Nevyriešená chyba #%{note_name}'
+      closed_title: 'Vyriešená chyba #%{note_name}'
+      hidden_title: Skrytá poznámka %{note_name}
+      opened_by_html: Vytvoril %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Vytvoril anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Komentár od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Komentoval anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Vyriešil %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Vyriešil anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Opätovne aktivoval používateľ %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Opätovne aktivoval anonymný používateľ <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Skryl %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: nahlásiť túto poznámku
+      anonymous_warning: Táto poznámka zahŕňa komentáre anonymných používateľov, ktoré
+        by sa mali nezávisle preveriť.
+      hide: Skryť
+      resolve: Vyriešiť
+      reactivate: Opätovne aktivovať
+      comment_and_resolve: Okomentovať a vyriešiť
+      comment: Okomentovať
+      report_link_html: Ak táto poznámka obsahuje citlivé údaje, ktoré by mali byť
+        odstránené, môžete %{link}.
+      other_problems_resolve: Pre všetky ostatné problémy s poznámkou, prosím vyriešte
+        ju sami komentárom.
+      other_problems_resolved: Pre všetky ostatné problémy je vyriešenie dostatočné.
+      disappear_date_html: Táto vyriešená poznámka zmizne z mapy o %{disappear_in}.
+    new:
+      title: Nová poznámka
+      intro: Zahliadli ste chybu alebo že niečo chýba? Dajte to vedieť ostatným používateľom,
+        aby sme to mohli opraviť. Umiestnite značku na správnu pozíciu a zapíšte poznámku
+        na vysvetlenie problému.
+      advice: Vaša poznámka je verejná a môže slúžiť na úpravu mapy, preto nevkladajte
+        žiadne osobné údaje ani informácie z máp alebo databáz chránených autorskými
+        právami.
+      add: Pridať poznámku
   javascripts:
     close: Zavrieť
     share:
@@ -2758,29 +2779,6 @@ sk:
         unsubscribe: Zrušiť odoberanie
         hide_comment: skryť
         unhide_comment: zobraziť
-    notes:
-      new:
-        intro: Zahliadli ste chybu alebo že niečo chýba? Dajte to vedieť ostatným
-          používateľom, aby sme to mohli opraviť. Umiestnite značku na správnu pozíciu
-          a zapíšte poznámku na vysvetlenie problému.
-        advice: Vaša poznámka je verejná a môže slúžiť na úpravu mapy, preto nevkladajte
-          žiadne osobné údaje ani informácie z máp alebo databáz chránených autorskými
-          právami.
-        add: Pridať poznámku
-      show:
-        anonymous_warning: Táto poznámka zahŕňa komentáre anonymných používateľov,
-          ktoré by sa mali nezávisle preveriť.
-        hide: Skryť
-        resolve: Vyriešiť
-        reactivate: Opätovne aktivovať
-        comment_and_resolve: Okomentovať a vyriešiť
-        comment: Okomentovať
-        report_link_html: Ak táto poznámka obsahuje citlivé údaje, ktoré by mali byť
-          odstránené, môžete %{link}.
-        other_problems_resolve: Pre všetky ostatné problémy s poznámkou, prosím vyriešte
-          ju sami komentárom.
-        other_problems_resolved: Pre všetky ostatné problémy je vyriešenie dostatočné.
-        disappear_date_html: Táto vyriešená poznámka zmizne z mapy o %{disappear_in}.
     edit_help: Posuňte mapu a priblížte ju na miesto, ktoré chcete upraviť, potom
       kliknite sem.
     directions:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b7a1f510b..d9591234e 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -485,26 +485,6 @@ sl:
       telephone_link: Pokliči %{phone_number}
       colour_preview: Predogled barve %{colour_value}
       email_link: E-pošta %{email}
-    note:
-      title: 'Opomba: %{id}'
-      new_note: Nova opomba
-      description: Opis
-      open_title: 'Nerazrešena opomba #%{note_name}'
-      closed_title: 'Razrešena opomba #%{note_name}'
-      hidden_title: 'Skrita opomba #%{note_name}'
-      opened_by_html: Ustvaril %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Ustvaril anonimni uporabnik <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Komentar uporabnika %{user} <abbr title='%{exact_time}'>%{when}
-        nazaj</abbr>
-      commented_by_anonymous_html: Komentar anonimnega uporabnika <abbr title='%{exact_time}'>%{when}
-        nazaj</abbr>
-      closed_by_html: Razrešil_a %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Razrešil anonimni uporabnik <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Znova aktiviral %{user} ob <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Znova aktiviral anonimni ob <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Skril_a %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: prijavi to opombo
-      coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Preveri značilnosti
       introduction: Kliknite na zemljevid za iskanje bližnjih značilnosti.
@@ -3037,6 +3017,46 @@ sl:
       description: Opis
       created_at: Ustvarjeno
       last_changed: Zadnja sprememba
+    show:
+      title: 'Opomba: %{id}'
+      description: Opis
+      open_title: 'Nerazrešena opomba #%{note_name}'
+      closed_title: 'Razrešena opomba #%{note_name}'
+      hidden_title: 'Skrita opomba #%{note_name}'
+      opened_by_html: Ustvaril %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Ustvaril anonimni uporabnik <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Komentar uporabnika %{user} <abbr title='%{exact_time}'>%{when}
+        nazaj</abbr>
+      commented_by_anonymous_html: Komentar anonimnega uporabnika <abbr title='%{exact_time}'>%{when}
+        nazaj</abbr>
+      closed_by_html: Razrešil_a %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Razrešil anonimni uporabnik <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Znova aktiviral %{user} ob <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Znova aktiviral anonimni ob <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Skril_a %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: prijavi to opombo
+      coordinates_html: '%{latitude}, %{longitude}'
+      anonymous_warning: To opomba vključuje komentarje anonimnih uporabnikov, ki
+        bi morali biti neodvisno preverjeni.
+      hide: Skrij
+      resolve: Razreši
+      reactivate: Znova aktiviraj
+      comment_and_resolve: Komentiraj in razreši
+      comment: Komentiraj
+      report_link_html: Če ta opomba vsebuje občutljive podatke, ki jih je treba odstraniti,
+        lahko %{link}.
+      other_problems_resolve: Vse preostale težave z opombo rešite sami s komentarjem.
+      other_problems_resolved: Za vse druge težave zadostuje razrešitev.
+      disappear_date_html: Ta razrešena opomba bo izginila z zemljevida v %{disappear_in}.
+    new:
+      title: Nova opomba
+      intro: Ste opazili napako ali da kaj manjka? Obvestite druge kartografe o tem,
+        da lahko to popravimo. Premaknite oznako na pravilno lokacijo in vpišite opombo,
+        v kateri pojasnite problem.
+      advice: Vaša opomba je javna in se lahko uporabi za posodobitev zemljevida.
+        Ne vnašajte osebnih podatkov ali podatkov iz avtorsko zaščitenih zemljevidov
+        ali imenikov.
+      add: Dodaj opombo
   javascripts:
     close: Zapri
     share:
@@ -3124,28 +3144,6 @@ sl:
         unsubscribe: Odnaroči
         hide_comment: skrij
         unhide_comment: razkrij
-    notes:
-      new:
-        intro: Ste opazili napako ali da kaj manjka? Obvestite druge kartografe o
-          tem, da lahko to popravimo. Premaknite oznako na pravilno lokacijo in vpišite
-          opombo, v kateri pojasnite problem.
-        advice: Vaša opomba je javna in se lahko uporabi za posodobitev zemljevida.
-          Ne vnašajte osebnih podatkov ali podatkov iz avtorsko zaščitenih zemljevidov
-          ali imenikov.
-        add: Dodaj opombo
-      show:
-        anonymous_warning: To opomba vključuje komentarje anonimnih uporabnikov, ki
-          bi morali biti neodvisno preverjeni.
-        hide: Skrij
-        resolve: Razreši
-        reactivate: Znova aktiviraj
-        comment_and_resolve: Komentiraj in razreši
-        comment: Komentiraj
-        report_link_html: Če ta opomba vsebuje občutljive podatke, ki jih je treba
-          odstraniti, lahko %{link}.
-        other_problems_resolve: Vse preostale težave z opombo rešite sami s komentarjem.
-        other_problems_resolved: Za vse druge težave zadostuje razrešitev.
-        disappear_date_html: Ta razrešena opomba bo izginila z zemljevida v %{disappear_in}.
     edit_help: Premaknite zemljevid in približajte lokacijo, ki jo želite urediti,
       nato pa kliknite tukaj.
     directions:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 944f56e39..a44fc82c6 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -256,31 +256,6 @@ sq:
       wikidata_link: Artikulli %{page} në Wikidata
       wikipedia_link: Artikulli %{page} nē Wikipedia
       telephone_link: Thirr %{phone_number}
-    note:
-      title: 'Shënim: %{id}'
-      new_note: Shënim i ri
-      description: Përshkrimi
-      open_title: 'Shënim i pazgjidhur #%{note_name}'
-      closed_title: 'Shënim i zgjidhur #%{note_name}'
-      hidden_title: 'Shënim i fshehur #%{note_name}'
-      opened_by_html: Krijuar nga %{user} në <abbr title="%{exact_time}">%{when} më
-        parë</abbr>
-      opened_by_anonymous_html: Krijuar nga një person anonim <abbr title="%{exact_time}">%{when}
-        më parë</abbr>
-      commented_by_html: Krijuar nga %{user} në <abbr title="%{exact_time}">%{when}
-        më parë</abbr>
-      commented_by_anonymous_html: Krijuar nga një person anonim <abbr title="%{exact_time}">%{when}
-        më parë</abbr>
-      closed_by_html: Zgjidhur nga %{user} në <abbr title="%{exact_time}">%{when}
-        më parë</abbr>
-      closed_by_anonymous_html: Zgjidhur nga një person anonim <abbr title='%{exact_time}'>%{when}
-        më parë</abbr>
-      reopened_by_html: Riaktivizuar nga %{user} në <abbr title="%{exact_time}">%{when}
-        më parë</abbr>
-      reopened_by_anonymous_html: Riaktivizuar nga një person anonim <abbr title="%{exact_time}">%{when}
-        më parë</abbr>
-      hidden_by_html: Fshehur nga %{user} në <abbr title="%{exact_time}">%{when} më
-        parë</abbr>
     query:
       title: Tiparet e Pyetësorit
       introduction: Kliko në hartë për të gjetur tipare në afërsi.
@@ -1539,6 +1514,33 @@ sq:
     blocks:
       status: Statusi
       revoker_name: Revokuar nga
+  notes:
+    show:
+      title: 'Shënim: %{id}'
+      description: Përshkrimi
+      open_title: 'Shënim i pazgjidhur #%{note_name}'
+      closed_title: 'Shënim i zgjidhur #%{note_name}'
+      hidden_title: 'Shënim i fshehur #%{note_name}'
+      opened_by_html: Krijuar nga %{user} në <abbr title="%{exact_time}">%{when} më
+        parë</abbr>
+      opened_by_anonymous_html: Krijuar nga një person anonim <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      commented_by_html: Krijuar nga %{user} në <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      commented_by_anonymous_html: Krijuar nga një person anonim <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      closed_by_html: Zgjidhur nga %{user} në <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      closed_by_anonymous_html: Zgjidhur nga një person anonim <abbr title='%{exact_time}'>%{when}
+        më parë</abbr>
+      reopened_by_html: Riaktivizuar nga %{user} në <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      reopened_by_anonymous_html: Riaktivizuar nga një person anonim <abbr title="%{exact_time}">%{when}
+        më parë</abbr>
+      hidden_by_html: Fshehur nga %{user} në <abbr title="%{exact_time}">%{when} më
+        parë</abbr>
+    new:
+      title: Shënim i ri
   javascripts:
     site:
       edit_tooltip: Redakto hartën
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 3bc91da7f..84a9cd476 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -354,23 +354,6 @@ sr:
       wikidata_link: Ставка %{page} на Википодацима
       wikipedia_link: Чланак %{page} на Википедији
       telephone_link: Позови %{phone_number}
-    note:
-      title: Белешкаː %{id}
-      new_note: Нова белешка
-      description: Опис
-      open_title: Нерешена белешка бр. %{note_name}
-      closed_title: Решена белешка бр. %{note_name}
-      hidden_title: Скривена белешка бр. %{note_name}
-      opened_by_html: Направио %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Направио анониман корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Коментар корисника %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Коментар анонимног корисника пре <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Разрешио %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Разрешио анонимни корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Поново активирао %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Поново активирао анонимни корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Сакрио %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Пријави ову белешку
     query:
       title: Информације о објектима
       introduction: Кликните на мапу да бисте пронашли објекте у близини.
@@ -2383,6 +2366,37 @@ sr:
       description: Опис
       created_at: Направљено
       last_changed: Последња промена
+    show:
+      title: Белешкаː %{id}
+      description: Опис
+      open_title: Нерешена белешка бр. %{note_name}
+      closed_title: Решена белешка бр. %{note_name}
+      hidden_title: Скривена белешка бр. %{note_name}
+      opened_by_html: Направио %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Направио анониман корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Коментар корисника %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Коментар анонимног корисника пре <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Разрешио %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Разрешио анонимни корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Поново активирао %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Поново активирао анонимни корисник пре <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Сакрио %{user} пре <abbr title='%{exact_time}'>%{when}</abbr>
+      report: Пријави ову белешку
+      anonymous_warning: Ова белешка садржи коментаре анонимних корисника које би
+        требало посебно проверити.
+      hide: Сакриј
+      resolve: Разреши
+      reactivate: Поново покрени
+      comment_and_resolve: Коментариши и разреши
+      comment: Коментариши
+    new:
+      title: Нова белешка
+      intro: Наишли сте на грешку или нешто недостаје? Обавестите друге картографе
+        како бисмо решили проблем. Преместите маркер на исправно место и напишите
+        објашњење.
+      advice: Ваша белешка је јавна и може се користити за ажурирање карте, па не
+        уносите личне податке, податке који садрже ауторска права или податке из листинга.
+      add: Додај белешку
   javascripts:
     close: Затвори
     share:
@@ -2446,23 +2460,6 @@ sr:
         unsubscribe: Одјави ме
         hide_comment: сакриј
         unhide_comment: прикажи
-    notes:
-      new:
-        intro: Наишли сте на грешку или нешто недостаје? Обавестите друге картографе
-          како бисмо решили проблем. Преместите маркер на исправно место и напишите
-          објашњење.
-        advice: Ваша белешка је јавна и може се користити за ажурирање карте, па не
-          уносите личне податке, податке који садрже ауторска права или податке из
-          листинга.
-        add: Додај белешку
-      show:
-        anonymous_warning: Ова белешка садржи коментаре анонимних корисника које би
-          требало посебно проверити.
-        hide: Сакриј
-        resolve: Разреши
-        reactivate: Поново покрени
-        comment_and_resolve: Коментариши и разреши
-        comment: Коментариши
     edit_help: Помери карту и увећај на место које хоћеш да уредиш, затим кликни овде.
     directions:
       ascend: Растуће
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 5b33f7629..f75af61f7 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -473,25 +473,6 @@ sv:
       wikimedia_commons_link: Sidan %{page} finner du på Wikimedia Commons
       telephone_link: Ring %{phone_number}
       colour_preview: Förhandsgranskning av färgen %{colour_value}
-    note:
-      title: 'Anteckning: %{id}'
-      new_note: Ny anteckning
-      description: Beskrivning
-      open_title: 'Ej avklarad anteckning #%{note_name}'
-      closed_title: 'Avklarad anteckning #%{note_name}'
-      hidden_title: 'Dold anteckning #%{note_name}'
-      opened_by_html: Skapad av %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Skapad av anonym användare <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Kommentar från %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Kommentar från en anonym användare <abbr title='%{exact_time}'>för
-        %{when}</abbr>
-      closed_by_html: Löst av %{user} <abbr title='%{exact_time}'>för %{when}</abbr>
-      closed_by_anonymous_html: Löst av en anonym användare för <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Återaktiverades av %{user} för <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Återaktiverades av en anonym användare för <abbr
-        title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Doldes av %{user} <abbr title='%{exact_time}'>för %{when}</abbr>
-      report: rapportera denna anteckning
     query:
       title: Undersök kartobjekt
       introduction: Klicka på kartan för att hitta funktioner i närheten.
@@ -2946,6 +2927,40 @@ sv:
       description: Beskrivning
       created_at: Skapades den
       last_changed: Senast ändrad
+    show:
+      title: 'Anteckning: %{id}'
+      description: Beskrivning
+      open_title: 'Ej avklarad anteckning #%{note_name}'
+      closed_title: 'Avklarad anteckning #%{note_name}'
+      hidden_title: 'Dold anteckning #%{note_name}'
+      opened_by_html: Skapad av %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Skapad av anonym användare <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Kommentar från %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Kommentar från en anonym användare <abbr title='%{exact_time}'>för
+        %{when}</abbr>
+      closed_by_html: Löst av %{user} <abbr title='%{exact_time}'>för %{when}</abbr>
+      closed_by_anonymous_html: Löst av en anonym användare för <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Återaktiverades av %{user} för <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Återaktiverades av en anonym användare för <abbr
+        title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Doldes av %{user} <abbr title='%{exact_time}'>för %{when}</abbr>
+      report: rapportera denna anteckning
+      anonymous_warning: Denna anteckning innehåller kommentarer från anonyma användare
+        vilka bör bekräftas oberoende av varandra.
+      hide: Göm
+      resolve: Avklara
+      reactivate: Återaktivera
+      comment_and_resolve: Kommentera och Avklara
+      comment: Kommentera
+    new:
+      title: Ny anteckning
+      intro: Upptäckt ett misstag eller något som saknas? Låt andra karterare veta
+        så att vi kan fixa det. Flytta markören till rätt position och skriv in en
+        kommentar som förklarar problemet.
+      advice: Din anteckning är offentlig och kan användas för att uppdatera kartan,
+        så skriv inte personuppgifter eller information från upphovsrättsligt skyddade
+        kartor eller kataloger.
+      add: Lägg till anteckning
   javascripts:
     close: Stäng
     share:
@@ -3028,23 +3043,6 @@ sv:
         unsubscribe: Avsluta prenumeration
         hide_comment: dölj
         unhide_comment: Sluta dölja
-    notes:
-      new:
-        intro: Upptäckt ett misstag eller något som saknas? Låt andra karterare veta
-          så att vi kan fixa det. Flytta markören till rätt position och skriv in
-          en kommentar som förklarar problemet.
-        advice: Din anteckning är offentlig och kan användas för att uppdatera kartan,
-          så skriv inte personuppgifter eller information från upphovsrättsligt skyddade
-          kartor eller kataloger.
-        add: Lägg till anteckning
-      show:
-        anonymous_warning: Denna anteckning innehåller kommentarer från anonyma användare
-          vilka bör bekräftas oberoende av varandra.
-        hide: Göm
-        resolve: Avklara
-        reactivate: Återaktivera
-        comment_and_resolve: Kommentera och Avklara
-        comment: Kommentera
     edit_help: Flytta kartan och zooma in på en plats som du vill redigera, klicka
       sedan här.
     directions:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 163ca9a8f..df394579b 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -231,9 +231,6 @@ ta:
       tags: 'குறிச்சொற்கள்:'
       wiki_link:
         key: விக்கி  விளக்கப்பக்கம் %{key} குறிச்சொல்லுக்காக
-    note:
-      new_note: புதுக் குறிப்பு
-      description: விளக்கம்
   changesets:
     changeset_paging_nav:
       showing_page: பக்கம் %{page}
@@ -846,6 +843,11 @@ ta:
       display_name: தடைசெய்யப்பட்ட பயனர்
       creator_name: உருவாக்கியவர்
       status: நிலை
+  notes:
+    show:
+      description: விளக்கம்
+    new:
+      title: புதுக் குறிப்பு
   redactions:
     update:
       flash: மாற்றங்கள் சேமிக்கப்பட்டன
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 2a2835271..818484ff8 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -429,28 +429,6 @@ te:
       wikimedia_commons_link: వికీమీడియా కామన్స్‌లో %{page} అంశం
       telephone_link: '%{phone_number} కు కాల్ చెయ్యి'
       colour_preview: '%{colour_value} రంగు మునుజూపు'
-    note:
-      title: 'గమనిక: %{id}'
-      new_note: కొత్త గమనిక
-      description: వివరణ
-      open_title: 'పరిష్కరించని గమనిక #%{note_name}'
-      closed_title: 'పరిష్కారమైన గమనిక #%{note_name}'
-      hidden_title: 'దాచిన గమనిక #%{note_name}'
-      opened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} సృష్టించారు
-      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> అజ్ఞాత
-        సృష్టించారు
-      commented_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} చేసిన
-        వ్యాఖ్య
-      commented_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> అజ్ఞాత
-        చేసిన వ్యాఖ్య
-      closed_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} పరిష్కరించారు
-      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> అజ్ఞాత
-        పరిష్కరించారు
-      reopened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} పునరుజ్జీవింపజేసారు
-      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> అజ్ఞాత
-        పునరుజ్జీవింపజేసారు
-      hidden_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} దాచారు
-      report: ఈ గమనికపై ఫిర్యాదు చెయ్యండి
     query:
       title: క్వెరీ విశేషాలు
       introduction: సమీపం లోని అంశాలను చూసేందుకు మ్యాపుపై నొక్కండి.
@@ -2551,6 +2529,43 @@ te:
       description: వివరణ
       created_at: సృష్టించిన తేదీ
       last_changed: చివరి మార్పు
+    show:
+      title: 'గమనిక: %{id}'
+      description: వివరణ
+      open_title: 'పరిష్కరించని గమనిక #%{note_name}'
+      closed_title: 'పరిష్కారమైన గమనిక #%{note_name}'
+      hidden_title: 'దాచిన గమనిక #%{note_name}'
+      opened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} సృష్టించారు
+      opened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> అజ్ఞాత
+        సృష్టించారు
+      commented_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} చేసిన
+        వ్యాఖ్య
+      commented_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> అజ్ఞాత
+        చేసిన వ్యాఖ్య
+      closed_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} పరిష్కరించారు
+      closed_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> అజ్ఞాత
+        పరిష్కరించారు
+      reopened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} పునరుజ్జీవింపజేసారు
+      reopened_by_anonymous_html: <abbr title='%{exact_time}'>%{when}</abbr> అజ్ఞాత
+        పునరుజ్జీవింపజేసారు
+      hidden_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} దాచారు
+      report: ఈ గమనికపై ఫిర్యాదు చెయ్యండి
+      anonymous_warning: ఈ గమనికలో అజ్ఞాతలు చేసిన వ్యాఖ్యలు కూడా ఉన్నాయి. వాటిని విడిగా
+        ధ్రువీకరించుకోవాలి.
+      hide: దాచు
+      resolve: పరిష్కరించు
+      reactivate: పునరుజ్జీవింపజేయి
+      comment_and_resolve: వ్యాఖ్యానించి పరిష్కరించండి
+      comment: వ్యాఖ్యానించండి
+    new:
+      title: కొత్త గమనిక
+      intro: పొరపాట్లేమైనా కనిపించాయా? వటిని సరిచేసేందుకు గాను, ఇతర మ్యాపర్లకు కూడా
+        తెలియజేయండి. మార్కరును సరిన స్థానాంలో పెట్టి, సమస్యను వివరిస్తూ ఒక గమనికను
+        రాయండి.
+      advice: మీ గమనిక బహిరంగంగా కనిపిస్తుంది. దాన్ని బట్టి మ్యాపును తాజాకరిస్తారు.
+        అంచేత వ్యక్తిగత సమాచారాన్ని గానీ, కాపీహక్కులున్న మ్యాపుల సమాచారాన్ని గానీ,
+        డైరెక్టరీల లోని సమాచారాన్ని గానీ చేర్చకండి.
+      add: గమనికను చేర్చు
   javascripts:
     close: మూసివేయి
     share:
@@ -2613,23 +2628,6 @@ te:
         unsubscribe: గమనింపులనుండి తొలగించు
         hide_comment: దాచు
         unhide_comment: చూపించు
-    notes:
-      new:
-        intro: పొరపాట్లేమైనా కనిపించాయా? వటిని సరిచేసేందుకు గాను, ఇతర మ్యాపర్లకు కూడా
-          తెలియజేయండి. మార్కరును సరిన స్థానాంలో పెట్టి, సమస్యను వివరిస్తూ ఒక గమనికను
-          రాయండి.
-        advice: మీ గమనిక బహిరంగంగా కనిపిస్తుంది. దాన్ని బట్టి మ్యాపును తాజాకరిస్తారు.
-          అంచేత వ్యక్తిగత సమాచారాన్ని గానీ, కాపీహక్కులున్న మ్యాపుల సమాచారాన్ని గానీ,
-          డైరెక్టరీల లోని సమాచారాన్ని గానీ చేర్చకండి.
-        add: గమనికను చేర్చు
-      show:
-        anonymous_warning: ఈ గమనికలో అజ్ఞాతలు చేసిన వ్యాఖ్యలు కూడా ఉన్నాయి. వాటిని
-          విడిగా ధ్రువీకరించుకోవాలి.
-        hide: దాచు
-        resolve: పరిష్కరించు
-        reactivate: పునరుజ్జీవింపజేయి
-        comment_and_resolve: వ్యాఖ్యానించి పరిష్కరించండి
-        comment: వ్యాఖ్యానించండి
     edit_help: మ్యాపును జరిపి, మీరు సరిదిద్దాలనుకున్న స్థలంపై జూమిన్ చేసి, అప్పుడు
       ఇక్కడ నొక్కండి.
     directions:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 38b9f6c94..a2f4d221a 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -367,23 +367,6 @@ th:
       wikimedia_commons_link: รายการ %{page} บนวิกิมีเดียคอมมอนส์
       telephone_link: โทรไปที่หมายเลข %{phone_number}
       colour_preview: แสดงตัวอย่างสี %{colour_value}
-    note:
-      title: 'หมายเหตุ: %{id}'
-      new_note: หมายเหตุใหม่
-      description: คำอธิบาย
-      open_title: 'หมายเหตุที่ยังไม่มีคำตอบ #%{note_name}'
-      closed_title: หมายเหตุที่ตอบสนองแล้ว %{note_name}
-      hidden_title: 'หมายเหตุที่ซ่อนอยู่ #%{note_name}'
-      opened_by_html: จัดทำโดย %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: จัดทำโดยผู้ไม่ประสงค์ออกนามเมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: ความเห็นจาก %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: ความเห็นจากผู้ไม่ประสงค์ออกนามเมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: แก้ไขโดย %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: แก้ไขโดยผู้ไม่ประสงค์ออกนามเมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: เปิดใช้ซ้ำโดย %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: เปิดใช้ซ้ำโดยผู้ไม่ประสงค์ออกนาม เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: ซ่อนโดย %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
-      report: แจ้งปัญหาเกี่ยวกับหมายเหตุนี้
     query:
       title: ส่วนประกอบในพื้นที่
       introduction: คลิกบนแผนที่เพื่อค้นหาส่วนประกอบต่างๆ ที่อยู่ใกล้เคียง
@@ -2258,6 +2241,32 @@ th:
     index:
       heading: หมายเหตุของ %{user}
       creator: ผู้สร้าง
+    show:
+      title: 'หมายเหตุ: %{id}'
+      description: คำอธิบาย
+      open_title: 'หมายเหตุที่ยังไม่มีคำตอบ #%{note_name}'
+      closed_title: หมายเหตุที่ตอบสนองแล้ว %{note_name}
+      hidden_title: 'หมายเหตุที่ซ่อนอยู่ #%{note_name}'
+      opened_by_html: จัดทำโดย %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: จัดทำโดยผู้ไม่ประสงค์ออกนามเมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: ความเห็นจาก %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: ความเห็นจากผู้ไม่ประสงค์ออกนามเมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: แก้ไขโดย %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: แก้ไขโดยผู้ไม่ประสงค์ออกนามเมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: เปิดใช้ซ้ำโดย %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: เปิดใช้ซ้ำโดยผู้ไม่ประสงค์ออกนาม เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: ซ่อนโดย %{user} เมื่อ <abbr title='%{exact_time}'>%{when}</abbr>
+      report: แจ้งปัญหาเกี่ยวกับหมายเหตุนี้
+      anonymous_warning: หมายเหตุนี้มีข้อความจากผู้ที่ไม่ประสงค์จะออกนาม ซึ่งควรทำการตรวจสอบตามข้อมูลที่แจ้งมานี้ด้วยตัวคุณเองอีกครั้ง
+        ก่อนจะดำเนินการใดๆ ต่อ
+      hide: ซ่อน
+      resolve: ปิดเรื่อง
+      reactivate: รื้อฟื้นหมายเหตุ
+      comment_and_resolve: แสดงความเห็น และปิดเรื่อง
+      comment: แสดงความเห็น
+    new:
+      title: หมายเหตุใหม่
+      add: เพิ่มหมายเหตุ
   javascripts:
     close: ปิด
     share:
@@ -2311,17 +2320,6 @@ th:
         unsubscribe: เลิกรับข้อมูล
         hide_comment: ซ่อน
         unhide_comment: แสดง
-    notes:
-      new:
-        add: เพิ่มหมายเหตุ
-      show:
-        anonymous_warning: หมายเหตุนี้มีข้อความจากผู้ที่ไม่ประสงค์จะออกนาม ซึ่งควรทำการตรวจสอบตามข้อมูลที่แจ้งมานี้ด้วยตัวคุณเองอีกครั้ง
-          ก่อนจะดำเนินการใดๆ ต่อ
-        hide: ซ่อน
-        resolve: ปิดเรื่อง
-        reactivate: รื้อฟื้นหมายเหตุ
-        comment_and_resolve: แสดงความเห็น และปิดเรื่อง
-        comment: แสดงความเห็น
     directions:
       ascend: ลาดขึ้น
       engines:
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 7c0039f98..0518de77a 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -392,27 +392,6 @@ tl:
       wikipedia_link: Ang %{page} ng artikulo sa Wikipedia
       wikimedia_commons_link: Ang %{page} ng bagay sa Wikimedia Commons
       telephone_link: Tawagan ang %{phone_number}
-    note:
-      title: 'Tala: %{id}'
-      new_note: Bagong Tala
-      description: Paglalarawan
-      open_title: 'Hindi pa nalutas na tala #%{note_name}'
-      closed_title: 'Nalutas na tala #%{note_name}'
-      hidden_title: 'Nakatagong tala #%{note_name}'
-      opened_by_html: Nilikha ni %{user} <abbr title='%{exact_time}'>%{when} ang nakaraan</abbr>
-      opened_by_anonymous_html: Nilikha ng isang di-nagpakilalang tagagamit <abbr
-        title='%{exact_time}'>%{when} ang nakaraan</abbr>
-      commented_by_html: Puna mula kay %{user} <abbr title='%{exact_time}'>%{when}
-        ang nakaraan</abbr>
-      commented_by_anonymous_html: Puna ng isang di-nagpakilalang tagagamit <abbr
-        title='%{exact_time}'>%{when} ang nakaraan</abbr>
-      closed_by_html: Nalutas ni %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Nalutas ng isang di-nagpakilalang tagagamit <abbr
-        title='%{exact_time}'>%{when} ang nakaraan</abbr>
-      reopened_by_html: Binuhay muli ni %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Binuhay muli ng isang di-nagpakilalang tagagamit
-        <abbr title='%{exact_time}'>%{when} ang nakaraan</abbr>
-      hidden_by_html: Itinago ni %{user} <abbr title='%{exact_time}'>%{when} ang nakaraan</abbr>
     query:
       title: Usisain ang mga Tampok
       introduction: Pumindot sa mapa upang makahanap ng mga kalapit na tampok.
@@ -2387,6 +2366,36 @@ tl:
       description: Paglalarawan
       created_at: Nilikha Noong
       last_changed: Huling binago
+    show:
+      title: 'Tala: %{id}'
+      description: Paglalarawan
+      open_title: 'Hindi pa nalutas na tala #%{note_name}'
+      closed_title: 'Nalutas na tala #%{note_name}'
+      hidden_title: 'Nakatagong tala #%{note_name}'
+      opened_by_html: Nilikha ni %{user} <abbr title='%{exact_time}'>%{when} ang nakaraan</abbr>
+      opened_by_anonymous_html: Nilikha ng isang di-nagpakilalang tagagamit <abbr
+        title='%{exact_time}'>%{when} ang nakaraan</abbr>
+      commented_by_html: Puna mula kay %{user} <abbr title='%{exact_time}'>%{when}
+        ang nakaraan</abbr>
+      commented_by_anonymous_html: Puna ng isang di-nagpakilalang tagagamit <abbr
+        title='%{exact_time}'>%{when} ang nakaraan</abbr>
+      closed_by_html: Nalutas ni %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Nalutas ng isang di-nagpakilalang tagagamit <abbr
+        title='%{exact_time}'>%{when} ang nakaraan</abbr>
+      reopened_by_html: Binuhay muli ni %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Binuhay muli ng isang di-nagpakilalang tagagamit
+        <abbr title='%{exact_time}'>%{when} ang nakaraan</abbr>
+      hidden_by_html: Itinago ni %{user} <abbr title='%{exact_time}'>%{when} ang nakaraan</abbr>
+      anonymous_warning: Ang tala na ito ay may kasamang mga puna mula sa mga di-nagpakilalang
+        tagagamit na dapat ay independiyenteng ipagpatunay.
+      hide: Itago
+      resolve: Lutasin
+      reactivate: Buhayin muli
+      comment_and_resolve: Pumuna at Lutasin
+      comment: Pumuna
+    new:
+      title: Bagong Tala
+      add: Magdagdag ng Tala
   javascripts:
     close: Isara
     share:
@@ -2451,17 +2460,6 @@ tl:
         subscribe: Sumuskribi
         hide_comment: itago
         unhide_comment: pawalang-bisa ang pag-tago
-    notes:
-      new:
-        add: Magdagdag ng Tala
-      show:
-        anonymous_warning: Ang tala na ito ay may kasamang mga puna mula sa mga di-nagpakilalang
-          tagagamit na dapat ay independiyenteng ipagpatunay.
-        hide: Itago
-        resolve: Lutasin
-        reactivate: Buhayin muli
-        comment_and_resolve: Pumuna at Lutasin
-        comment: Pumuna
     directions:
       ascend: Umakyat
       engines:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 2c37f2497..0a5e345d4 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -476,32 +476,6 @@ tr:
       telephone_link: 'Ara: %{phone_number}'
       colour_preview: '%{colour_value} renginin önizlemesi'
       email_link: E-posta %{email}
-    note:
-      title: 'Not: %{id}'
-      new_note: Yeni Not
-      description: Açıklama
-      open_title: 'Çözümlenmemiş not: #%{note_name}'
-      closed_title: 'Çözümlenmiş not: #%{note_name}'
-      hidden_title: 'Gizli not #%{note_name}'
-      opened_by_html: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
-        oluşturuldu'
-      opened_by_anonymous_html: Anonim olarak <abbr title='%{exact_time}'>%{when}</abbr>
-        oluşturuldu
-      commented_by_html: '%{user} kullanıcısının <abbr title=''%{exact_time}''>%{when}</abbr>
-        yorumu'
-      commented_by_anonymous_html: Anonim kullanıcının <abbr title='%{exact_time}'>%{when}</abbr>
-        yorumu
-      closed_by_html: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
-        çözüldü'
-      closed_by_anonymous_html: Anonim kullanıcı tarafından <abbr title='%{exact_time}'>%{when}</abbr>
-        çözüldü
-      reopened_by_html: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
-        yeniden etkin hâle getirildi.'
-      reopened_by_anonymous_html: Anonim kullanıcı tarafından <abbr title='%{exact_time}'>%{when}</abbr>
-        yeniden etkin hâle getirildi.
-      hidden_by_html: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
-        gizlendi'
-      report: bu notu bildir
     query:
       title: Sorgu Özellikleri
       introduction: Yakındaki özellikleri bulmak için haritaya tıklayın.
@@ -2995,6 +2969,49 @@ tr:
       description: Açıklama
       created_at: Oluşturulma tarihi
       last_changed: Son değişiklik
+    show:
+      title: 'Not: %{id}'
+      description: Açıklama
+      open_title: 'Çözümlenmemiş not: #%{note_name}'
+      closed_title: 'Çözümlenmiş not: #%{note_name}'
+      hidden_title: 'Gizli not #%{note_name}'
+      opened_by_html: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
+        oluşturuldu'
+      opened_by_anonymous_html: Anonim olarak <abbr title='%{exact_time}'>%{when}</abbr>
+        oluşturuldu
+      commented_by_html: '%{user} kullanıcısının <abbr title=''%{exact_time}''>%{when}</abbr>
+        yorumu'
+      commented_by_anonymous_html: Anonim kullanıcının <abbr title='%{exact_time}'>%{when}</abbr>
+        yorumu
+      closed_by_html: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
+        çözüldü'
+      closed_by_anonymous_html: Anonim kullanıcı tarafından <abbr title='%{exact_time}'>%{when}</abbr>
+        çözüldü
+      reopened_by_html: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
+        yeniden etkin hâle getirildi.'
+      reopened_by_anonymous_html: Anonim kullanıcı tarafından <abbr title='%{exact_time}'>%{when}</abbr>
+        yeniden etkin hâle getirildi.
+      hidden_by_html: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
+        gizlendi'
+      report: bu notu bildir
+      anonymous_warning: Bu not anonim kullanıcılardan yorumlar içerdiğinden bağımsız
+        olarak doğrulanması gerekir.
+      hide: Gizle
+      resolve: Çözümle
+      reactivate: Yeniden etkinleştir
+      comment_and_resolve: Yorum ve Çözüm
+      comment: Yorum
+      report_link_html: Bu not, kaldırılması gereken hassas bilgiler içeriyorsa %{link}
+        bağlantısına tıklayınız.
+    new:
+      title: Yeni Not
+      intro: Bir hata mı buldunuz ya da eksik bir şey mi var? Bu sorunun düzeltilebilmesi
+        için diğer haritacılara bildirin. İmleci doğru konuma taşıyın ve sorunu açıklayan
+        bir not yazın.
+      advice: Notunuz herkese açıktır ve haritayı güncellemek için kullanılabilir,
+        bu nedenle kişisel bilgilerinizi veya telif hakkıyla korunan haritalar veya
+        dizin listelerinden bilgi girmeyin.
+      add: Not Ekle
   javascripts:
     close: Kapat
     share:
@@ -3077,25 +3094,6 @@ tr:
         unsubscribe: Abonelikten çık
         hide_comment: gizle
         unhide_comment: göster
-    notes:
-      new:
-        intro: Bir hata mı buldunuz ya da eksik bir şey mi var? Bu sorunun düzeltilebilmesi
-          için diğer haritacılara bildirin. İmleci doğru konuma taşıyın ve sorunu
-          açıklayan bir not yazın.
-        advice: Notunuz herkese açıktır ve haritayı güncellemek için kullanılabilir,
-          bu nedenle kişisel bilgilerinizi veya telif hakkıyla korunan haritalar veya
-          dizin listelerinden bilgi girmeyin.
-        add: Not Ekle
-      show:
-        anonymous_warning: Bu not anonim kullanıcılardan yorumlar içerdiğinden bağımsız
-          olarak doğrulanması gerekir.
-        hide: Gizle
-        resolve: Çözümle
-        reactivate: Yeniden etkinleştir
-        comment_and_resolve: Yorum ve Çözüm
-        comment: Yorum
-        report_link_html: Bu not, kaldırılması gereken hassas bilgiler içeriyorsa
-          %{link} bağlantısına tıklayınız.
     edit_help: Haritayı sürükleyip ve düzenleme yapmak istediğiniz konuma yakınlaştırdıktan
       sonra buraya tıklayın.
     directions:
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 5218e48d8..29452288b 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -193,12 +193,6 @@ tt:
     tag_details:
       tags: Тамгалар
       wikipedia_link: Википедиядә %{page} мәкаләсе
-    note:
-      title: 'Искәрмә: %{id}'
-      description: Тасвирлама
-      opened_by_html: '%{user} тарафыннан төзелгән <abbr title=''%{exact_time}''>%{when}</abbr>'
-      opened_by_anonymous_html: Аноним тарафыннан төзелгән <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: '%{user} тарафыннан яшеренгән <abbr title=''%{exact_time}''>%{when}</abbr>'
   changesets:
     changeset_paging_nav:
       showing_page: '%{page} бите'
@@ -785,6 +779,13 @@ tt:
       description: Тасвирлама
       created_at: Төзелде
       last_changed: Үзгәртелгән
+    show:
+      title: 'Искәрмә: %{id}'
+      description: Тасвирлама
+      opened_by_html: '%{user} тарафыннан төзелгән <abbr title=''%{exact_time}''>%{when}</abbr>'
+      opened_by_anonymous_html: Аноним тарафыннан төзелгән <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: '%{user} тарафыннан яшеренгән <abbr title=''%{exact_time}''>%{when}</abbr>'
+      hide: Яшерү
   javascripts:
     close: Ябу
     share:
@@ -806,9 +807,6 @@ tt:
       show:
         hide_comment: яшерү
         unhide_comment: күрсәтү
-    notes:
-      show:
-        hide: Яшерү
     directions:
       ascend: Менү
       engines:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 938d9ca99..98d5eb316 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -139,6 +139,7 @@ uk:
       diary_entry:
         user: Учасник
         title: Тема
+        body: Тіло
         latitude: Широта
         longitude: Довгота
         language_code: Мова
@@ -513,23 +514,6 @@ uk:
       telephone_link: Зателефонуйте на %{phone_number}
       colour_preview: Перегляд кольору %{colour_value}
       email_link: Надіслати електронний лист %{email}
-    note:
-      title: 'Нотатка: %{id}'
-      new_note: Нова нотатка
-      description: Опис
-      open_title: 'Неопрацьована нотатка #%{note_name}'
-      closed_title: 'Опрацьована нотатка #%{note_name}'
-      hidden_title: 'Прихована нотатка #%{note_name}'
-      opened_by_html: Створено %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Створено анонімом <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: '%{user} залишив(ла) коментар <abbr title=''%{exact_time}''>%{when}</abbr>'
-      commented_by_anonymous_html: Прокоментовано анонімом <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Розв’язано, %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Розв’язано анонімом <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Відновлено %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Відновлено анонімом <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Приховано %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: поскаржитися на цю нотатку
     query:
       title: Отримати об’єкти
       introduction: Клацніть на мапі, щоб отримати дані про об’єкти поруч.
@@ -3041,6 +3025,44 @@ uk:
       description: Опис
       created_at: Створено
       last_changed: Остання зміна
+    show:
+      title: 'Нотатка: %{id}'
+      description: Опис
+      open_title: 'Неопрацьована нотатка #%{note_name}'
+      closed_title: 'Опрацьована нотатка #%{note_name}'
+      hidden_title: 'Прихована нотатка #%{note_name}'
+      opened_by_html: Створено %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Створено анонімом <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: '%{user} залишив(ла) коментар <abbr title=''%{exact_time}''>%{when}</abbr>'
+      commented_by_anonymous_html: Прокоментовано анонімом <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Розв’язано, %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Розв’язано анонімом <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Відновлено %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Відновлено анонімом <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Приховано %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: поскаржитися на цю нотатку
+      anonymous_warning: Ця нотатка містить коментарі від анонімних учасників. Потрібна
+        додаткова перевірка відомостей.
+      hide: Приховати
+      resolve: Опрацьовано
+      reactivate: Поновити
+      comment_and_resolve: Прокоментувати та Опрацювати
+      comment: Коментар
+      report_link_html: Якщо ця нотатка містить конфіденційну інформацію, яку потрібно
+        видалити, ви можете %{link}.
+      other_problems_resolve: Всі інші проблеми з приміткою вирішуйте самостійно в
+        коментарях.
+      other_problems_resolved: Для всіх інших проблем достатньо вирішення.
+      disappear_date_html: Ця вирішена нотатка зникне з карти через %{disappear_in}.
+    new:
+      title: Нова нотатка
+      intro: Помітили помилку або чогось не вистачає? Дайте знати іншим маперам, щоб
+        можна було це виправити. Перемістіть позначку в потрібне місце та додайте
+        пояснення проблеми.
+      advice: Ваша нотатка є публічною та може бути використана для оновлення мапи.
+        Будь ласка, не додавайте персональні дані або інформацію, яка міститься на
+        захищених авторським правом мапах чи каталогах.
+      add: Додати нотатку
   javascripts:
     close: Закрити
     share:
@@ -3128,29 +3150,6 @@ uk:
         unsubscribe: Відписатись
         hide_comment: приховати
         unhide_comment: показати
-    notes:
-      new:
-        intro: Помітили помилку або чогось не вистачає? Дайте знати іншим маперам,
-          щоб можна було це виправити. Перемістіть позначку в потрібне місце та додайте
-          пояснення проблеми.
-        advice: Ваша нотатка є публічною та може бути використана для оновлення мапи.
-          Будь ласка, не додавайте персональні дані або інформацію, яка міститься
-          на захищених авторським правом мапах чи каталогах.
-        add: Додати нотатку
-      show:
-        anonymous_warning: Ця нотатка містить коментарі від анонімних учасників. Потрібна
-          додаткова перевірка відомостей.
-        hide: Приховати
-        resolve: Опрацьовано
-        reactivate: Поновити
-        comment_and_resolve: Прокоментувати та Опрацювати
-        comment: Коментар
-        report_link_html: Якщо ця нотатка містить конфіденційну інформацію, яку потрібно
-          видалити, ви можете %{link}.
-        other_problems_resolve: Всі інші проблеми з приміткою вирішуйте самостійно
-          в коментарях.
-        other_problems_resolved: Для всіх інших проблем достатньо вирішення.
-        disappear_date_html: Ця вирішена нотатка зникне з карти через %{disappear_in}.
     edit_help: Перемістіть мапу і наблизьтесь до місця, яке ви бажаєте змінити, потім
       клацніть тут.
     directions:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index d8bb45cbd..be3202c62 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -448,23 +448,6 @@ vi:
       telephone_link: Gọi %{phone_number}
       colour_preview: Xem trước màu %{colour_value}
       email_link: Gá»­i thÆ° cho %{email}
-    note:
-      title: 'Ghi chú: %{id}'
-      new_note: Ghi chú Mới
-      description: Miêu tả
-      open_title: 'Ghi chú chưa giải quyết #%{note_name}'
-      closed_title: 'Ghi chú đã giải quyết #%{note_name}'
-      hidden_title: 'Ghi chú ẩn #%{note_name}'
-      opened_by_html: Tạo bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Tạo vô danh <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Bình luận của %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Bình luận vô danh <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Giải quyết bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Giải quyết vô danh <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Mở lại bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Mở lại vô danh <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Ẩn bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: báo cáo ghi chú này
     query:
       title: Thăm dò Yếu tố
       introduction: Nhấn chuột vào bản đồ để tìm những yếu tố lân cận.
@@ -2844,6 +2827,45 @@ vi:
       description: Miêu tả
       created_at: Lúc tạo
       last_changed: Thay đổi gần đây nhất
+    show:
+      title: 'Ghi chú: %{id}'
+      description: Miêu tả
+      open_title: 'Ghi chú chưa giải quyết #%{note_name}'
+      closed_title: 'Ghi chú đã giải quyết #%{note_name}'
+      hidden_title: 'Ghi chú ẩn #%{note_name}'
+      opened_by_html: Tạo bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Tạo vô danh <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Bình luận của %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Bình luận vô danh <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Giải quyết bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Giải quyết vô danh <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Mở lại bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Mở lại vô danh <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Ẩn bởi %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      report: báo cáo ghi chú này
+      anonymous_warning: Ghi chú này có bình luận của người dùng vô danh đóng góp;
+        các bình luận này cần được xác nhận lại.
+      hide: Ẩn
+      resolve: Giải quyết
+      reactivate: Mở lại
+      comment_and_resolve: Bình luận & Giải quyết
+      comment: Bình luận
+      report_link_html: Nếu ghi chú này chứa thông tin nhạy cảm có thể cần xóa, bạn
+        có thể %{link}.
+      other_problems_resolve: Còn nếu ghi chú có vấn đề khác, xin vui lòng giải quyết
+        lấy bằng cách để lại lời bình luận.
+      other_problems_resolved: Còn nếu có vấn đề khác, chỉ việc giải quyết ghi chú.
+      disappear_date_html: Ghi chú được giải quyết sẽ được ẩn khỏi bản đồ trong vòng
+        %{disappear_in} nữa.
+    new:
+      title: Ghi chú Mới
+      intro: Bản đồ có thiếu gì hay sai lầm không? Hãy báo cho chúng tôi để chúng
+        tôi sửa chữa bản đồ. Chỉ việc kéo ghim vào vị trí đúng và viết lời giải thích
+        vấn đề.
+      advice: Ghi chú của bạn được hiển thị công khai và có thể được sử dụng để cập
+        nhật bản đồ. Xin đừng ghi thông tin cá nhân hoặc thông tin lấy từ bản đồ hay
+        danh bạ có bản quyền.
+      add: Thêm Ghi chú
   javascripts:
     close: Đóng
     share:
@@ -2927,30 +2949,6 @@ vi:
         unsubscribe: Không theo dõi
         hide_comment: ẩn
         unhide_comment: bỏ ẩn
-    notes:
-      new:
-        intro: Bản đồ có thiếu gì hay sai lầm không? Hãy báo cho chúng tôi để chúng
-          tôi sửa chữa bản đồ. Chỉ việc kéo ghim vào vị trí đúng và viết lời giải
-          thích vấn đề.
-        advice: Ghi chú của bạn được hiển thị công khai và có thể được sử dụng để
-          cập nhật bản đồ. Xin đừng ghi thông tin cá nhân hoặc thông tin lấy từ bản
-          đồ hay danh bạ có bản quyền.
-        add: Thêm Ghi chú
-      show:
-        anonymous_warning: Ghi chú này có bình luận của người dùng vô danh đóng góp;
-          các bình luận này cần được xác nhận lại.
-        hide: Ẩn
-        resolve: Giải quyết
-        reactivate: Mở lại
-        comment_and_resolve: Bình luận & Giải quyết
-        comment: Bình luận
-        report_link_html: Nếu ghi chú này chứa thông tin nhạy cảm có thể cần xóa,
-          bạn có thể %{link}.
-        other_problems_resolve: Còn nếu ghi chú có vấn đề khác, xin vui lòng giải
-          quyết lấy bằng cách để lại lời bình luận.
-        other_problems_resolved: Còn nếu có vấn đề khác, chỉ việc giải quyết ghi chú.
-        disappear_date_html: Ghi chú được giải quyết sẽ được ẩn khỏi bản đồ trong
-          vòng %{disappear_in} nữa.
     edit_help: Di chuyển bản đồ và phóng to một vị trí mà bạn muốn sửa đổi, rồi nhấn
       chuột vào đây.
     directions:
diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 70dd63140..b1ecc17e1 100644
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -347,31 +347,6 @@ xmf:
       wikimedia_commons_link: ელემენტი %{page} ვიკიოწკარუეს
       telephone_link: რეკუა %{phone_number}
       colour_preview: ფერი %{colour_value} გიწოთოლორაფა
-    note:
-      title: 'ხვილაფა: %{id}'
-      new_note: ახალი ხვილაფა
-      description: ეჭარუა
-      open_title: 'უდუმუშებუ ხვილაფა #%{note_name}'
-      closed_title: 'დამუშებული ხვილაფა #%{note_name}'
-      hidden_title: 'ტყობინაფილი ხვილაფა #%{note_name}'
-      opened_by_html: აკოქიმინუ მახვარებუქ %{user} <abbr title='%{exact_time}'>%{when}
-        კინოხ</abbr>
-      opened_by_anonymous_html: აკოქიმინუ ანონიმქ <abbr title='%{exact_time}'>%{when}
-        კინოხ</abbr>
-      commented_by_html: მახვარებუ %{user}-შ კომენტარი <abbr title='%{exact_time}'>%{when}
-        კინოხ</abbr>
-      commented_by_anonymous_html: ანონიმიშ კომენტარი <abbr title='%{exact_time}'>%{when}
-        კინოხ</abbr>
-      closed_by_html: დამუშებული რე მახვარებუ %{user}-შით <abbr title='%{exact_time}'>%{when}
-        კინოხ</abbr>
-      closed_by_anonymous_html: დამუშებული რე ანონიმურო <abbr title='%{exact_time}'>%{when}
-        კინოხ</abbr>
-      reopened_by_html: მახვარებუ %{user}-ქ ახალშე გონწყუ <abbr title='%{exact_time}'>%{when}
-        კინოხ</abbr>
-      reopened_by_anonymous_html: ახალშე გონწყუმილი რე ანონიმურო <abbr title='%{exact_time}'>%{when}
-        კინოხ</abbr>
-      hidden_by_html: დატყობინუ %{user}-ქ <abbr title='%{exact_time}'>%{when} კინოხ</abbr>
-      report: ქჷმოგინაფეთ თე მეღანკუაშ გეშა
     query:
       title: მუ რე თაქ?
       introduction: უახოლაში ობიექტეფიშ ოგორალო ქეგუნჭირით რუკა.
@@ -1002,4 +977,30 @@ xmf:
   notes:
     index:
       no_notes: ვა რე ხვილაფეფი
+    show:
+      title: 'ხვილაფა: %{id}'
+      description: ეჭარუა
+      open_title: 'უდუმუშებუ ხვილაფა #%{note_name}'
+      closed_title: 'დამუშებული ხვილაფა #%{note_name}'
+      hidden_title: 'ტყობინაფილი ხვილაფა #%{note_name}'
+      opened_by_html: აკოქიმინუ მახვარებუქ %{user} <abbr title='%{exact_time}'>%{when}
+        კინოხ</abbr>
+      opened_by_anonymous_html: აკოქიმინუ ანონიმქ <abbr title='%{exact_time}'>%{when}
+        კინოხ</abbr>
+      commented_by_html: მახვარებუ %{user}-შ კომენტარი <abbr title='%{exact_time}'>%{when}
+        კინოხ</abbr>
+      commented_by_anonymous_html: ანონიმიშ კომენტარი <abbr title='%{exact_time}'>%{when}
+        კინოხ</abbr>
+      closed_by_html: დამუშებული რე მახვარებუ %{user}-შით <abbr title='%{exact_time}'>%{when}
+        კინოხ</abbr>
+      closed_by_anonymous_html: დამუშებული რე ანონიმურო <abbr title='%{exact_time}'>%{when}
+        კინოხ</abbr>
+      reopened_by_html: მახვარებუ %{user}-ქ ახალშე გონწყუ <abbr title='%{exact_time}'>%{when}
+        კინოხ</abbr>
+      reopened_by_anonymous_html: ახალშე გონწყუმილი რე ანონიმურო <abbr title='%{exact_time}'>%{when}
+        კინოხ</abbr>
+      hidden_by_html: დატყობინუ %{user}-ქ <abbr title='%{exact_time}'>%{when} კინოხ</abbr>
+      report: ქჷმოგინაფეთ თე მეღანკუაშ გეშა
+    new:
+      title: ახალი ხვილაფა
 ...
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index e6840cdb5..53c4e0448 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -480,23 +480,6 @@ zh-CN:
       telephone_link: 请拨打 %{phone_number}
       colour_preview: '%{colour_value}的颜色预览'
       email_link: 电子邮件 %{email}
-    note:
-      title: 注记：%{id}
-      new_note: 新注记
-      description: 描述
-      open_title: '未解决注记 #%{note_name}'
-      closed_title: '已解决注记 #%{note_name}'
-      hidden_title: '隐藏注记 #%{note_name}'
-      opened_by_html: '%{user}创建于<abbr title=''%{exact_time}''>%{when}</abbr>'
-      opened_by_anonymous_html: 匿名用户创建于<abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: '%{user}于<abbr title=''%{exact_time}''>%{when}</abbr>发表的评论'
-      commented_by_anonymous_html: 匿名用户于<abbr title='%{exact_time}'>%{when}</abbr>发表的评论
-      closed_by_html: '%{user}解决于<abbr title=''%{exact_time}''>%{when}</abbr>'
-      closed_by_anonymous_html: 匿名用户解决于<abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: '%{user}重新激活于<abbr title=''%{exact_time}''>%{when}</abbr>'
-      reopened_by_anonymous_html: 匿名用户重新激活于<abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: '%{user}隐藏于<abbr title=''%{exact_time}''>%{when}</abbr>'
-      report: 举报此注记
     query:
       title: 查询要素
       introduction: 点击地图以查找附近要素。
@@ -648,6 +631,10 @@ zh-CN:
     contact:
       contact_url: http://wiki.openstreetmap.org/wiki/Contact
       contact: 联系
+    internal_server_error:
+      title: 应用程序错误
+    not_found:
+      title: 文件未找到
   friendships:
     make_friend:
       heading: 添加 %{user} 为朋友？
@@ -1230,9 +1217,9 @@ zh-CN:
           region: 地区
           sea: æµ·
           square: 广场
-          state: æ´²
+          state: 州/省
           subdivision: 细分
-          suburb: 郊区
+          suburb: 城市片区
           town: 镇
           village: 村
           "yes": 地方
@@ -1431,14 +1418,14 @@ zh-CN:
       admin_levels:
         level2: 国界
         level3: 大区界
-        level4: 州界(省界)
+        level4: 州界/省界
         level5: 地区界(地级行政区界)
         level6: 县界
         level7: 市边界
-        level8: 市界(乡级行政区界)
+        level8: 乡界
         level9: 村界
-        level10: 郊区界(村级行政区界)
-        level11: 邻里(小区)边界
+        level10: 村界
+        level11: 邻里界
       types:
         cities: 城市
         towns: 城镇
@@ -2740,6 +2727,37 @@ zh-CN:
       description: 描述
       created_at: 创建于
       last_changed: 最后更改于
+    show:
+      title: 注记：%{id}
+      description: 描述
+      open_title: '未解决注记 #%{note_name}'
+      closed_title: '已解决注记 #%{note_name}'
+      hidden_title: '隐藏注记 #%{note_name}'
+      opened_by_html: '%{user}创建于<abbr title=''%{exact_time}''>%{when}</abbr>'
+      opened_by_anonymous_html: 匿名用户创建于<abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: '%{user}于<abbr title=''%{exact_time}''>%{when}</abbr>发表的评论'
+      commented_by_anonymous_html: 匿名用户于<abbr title='%{exact_time}'>%{when}</abbr>发表的评论
+      closed_by_html: '%{user}解决于<abbr title=''%{exact_time}''>%{when}</abbr>'
+      closed_by_anonymous_html: 匿名用户解决于<abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: '%{user}重新激活于<abbr title=''%{exact_time}''>%{when}</abbr>'
+      reopened_by_anonymous_html: 匿名用户重新激活于<abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: '%{user}隐藏于<abbr title=''%{exact_time}''>%{when}</abbr>'
+      report: 举报此注记
+      anonymous_warning: 该注记包含匿名用户的评论，应独立地予以核实。
+      hide: 隐藏
+      resolve: 解决
+      reactivate: 重启
+      comment_and_resolve: 评论与解决
+      comment: 评论
+      report_link_html: 如果此注记包含需要被删除的敏感信息，您可以%{link}。
+      other_problems_resolve: 对于注记的所有其他问题，请通过评论自行解决。
+      other_problems_resolved: 对于所有其他问题，解决就足够了。
+      disappear_date_html: 此已解决的注记将在%{disappear_in}后从地图中消失。
+    new:
+      title: 新注记
+      intro: 发现错误或遗漏了什么？请告诉其他绘图者以便于我们更正错误。将标记移动到正确的位置并输入备注说明问题。
+      advice: 您的注释会公开，并可能用于更新地图，所以不要输入个人信息，或是来自版权保护地图的信息或目录列表。
+      add: 添加注记
   javascripts:
     close: 关闭
     share:
@@ -2819,22 +2837,6 @@ zh-CN:
         unsubscribe: 取消订阅
         hide_comment: 隐藏
         unhide_comment: 取消隐藏
-    notes:
-      new:
-        intro: 发现错误或遗漏了什么？请告诉其他绘图者以便于我们更正错误。将标记移动到正确的位置并输入备注说明问题。
-        advice: 您的注释会公开，并可能用于更新地图，所以不要输入个人信息，或是来自版权保护地图的信息或目录列表。
-        add: 添加注记
-      show:
-        anonymous_warning: 该注记包含匿名用户的评论，应独立地予以核实。
-        hide: 隐藏
-        resolve: 解决
-        reactivate: 重启
-        comment_and_resolve: 评论与解决
-        comment: 评论
-        report_link_html: 如果此注记包含需要被删除的敏感信息，您可以%{link}。
-        other_problems_resolve: 对于注记的所有其他问题，请通过评论自行解决。
-        other_problems_resolved: 对于所有其他问题，解决就足够了。
-        disappear_date_html: 此已解决的注记将在%{disappear_in}后从地图中消失。
     edit_help: 移动地图并在您想编辑的位置放大，然后点击这里。
     directions:
       ascend: 上升
@@ -2848,6 +2850,7 @@ zh-CN:
       descend: 下降
       directions: 方向
       distance: 距离
+      distance_km: '%{distance}公里'
       errors:
         no_route: 找不到那两个地方之间的路径。
         no_place: 对不起——无法定位“%{place}”。
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index b1983d418..dd25378d3 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -322,12 +322,6 @@ zh-HK:
         way: 路徑
     start_rjs:
       feature_warning: 正在載入%{num_features}項地圖特徵，可能會拖慢您的瀏覽器或導致瀏覽器未能回應。您是否肯定想要顯示這些資料？
-    note:
-      title: 註記：%{id}
-      new_note: 新增註記
-      open_title: 未解決的註記：#%{note_name}
-      closed_title: 已解決的註記：#%{note_name}
-      report: 舉報此註記
     query:
       title: 查詢地圖特徴
       introduction: 點擊地圖以尋找附近的地圖特徵。
@@ -1264,6 +1258,13 @@ zh-HK:
       title: 由%{user}提交或評論過的註記
       heading: '%{user}的註記'
       no_notes: 沒有註記
+    show:
+      title: 註記：%{id}
+      open_title: 未解決的註記：#%{note_name}
+      closed_title: 已解決的註記：#%{note_name}
+      report: 舉報此註記
+    new:
+      title: 新增註記
   javascripts:
     share:
       embed: HTML
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 76c36d63b..2fd31301b 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -56,7 +56,7 @@ zh-TW:
       prompt: 選擇檔案
     submit:
       diary_comment:
-        create: 儲存
+        create: 評論
       diary_entry:
         create: 發佈
         update: 更新
@@ -138,6 +138,7 @@ zh-TW:
       diary_entry:
         user: 使用者
         title: 標題
+        body: 正文
         latitude: 緯度
         longitude: 經度
         language_code: 語言
@@ -446,23 +447,6 @@ zh-TW:
       telephone_link: 致電 %{phone_number}
       colour_preview: 色彩%{colour_value}預覽
       email_link: 電子郵件 %{email}
-    note:
-      title: 註記：%{id}
-      new_note: 新增註記
-      description: 說明
-      open_title: 未解決的註記：#%{note_name}
-      closed_title: 已解決的註記：#%{note_name}
-      hidden_title: 已隱藏的註記：#%{note_name}
-      opened_by_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由%{user}建立
-      opened_by_anonymous_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由匿名使用者建立
-      commented_by_html: '%{user}於<abbr title=''%{exact_time}''>%{when}</abbr>的評論'
-      commented_by_anonymous_html: 匿名使用者於<abbr title='%{exact_time}'>%{when}</abbr>的評論
-      closed_by_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由%{user}解決
-      closed_by_anonymous_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由匿名使用者解決
-      reopened_by_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由%{user}重新開啟
-      reopened_by_anonymous_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由匿名使用者重新開啟
-      hidden_by_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由%{user}隱藏
-      report: 回報此註記
     query:
       title: 查詢圖徵
       introduction: 點選地圖以尋找附近的圖徵
@@ -610,6 +594,14 @@ zh-TW:
       applications:
         create:
           notice: 應用程式已註冊。
+  errors:
+    contact:
+      contact: 聯絡
+    internal_server_error:
+      title: 應用程式錯誤
+    not_found:
+      title: 檔案未找到
+      description: 在 OpenStreetMap 服務器上找不到該名稱的文件/目錄/API 操作 (HTTP 404)
   friendships:
     make_friend:
       heading: 將 %{user} 加入為好友？
@@ -2744,6 +2736,38 @@ zh-TW:
       description: 說明
       created_at: 建立於：
       last_changed: 最新變更
+    show:
+      title: 註記：%{id}
+      description: 說明
+      open_title: 未解決的註記：#%{note_name}
+      closed_title: 已解決的註記：#%{note_name}
+      hidden_title: 已隱藏的註記：#%{note_name}
+      opened_by_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由%{user}建立
+      opened_by_anonymous_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由匿名使用者建立
+      commented_by_html: '%{user}於<abbr title=''%{exact_time}''>%{when}</abbr>的評論'
+      commented_by_anonymous_html: 匿名使用者於<abbr title='%{exact_time}'>%{when}</abbr>的評論
+      closed_by_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由%{user}解決
+      closed_by_anonymous_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由匿名使用者解決
+      reopened_by_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由%{user}重新開啟
+      reopened_by_anonymous_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由匿名使用者重新開啟
+      hidden_by_html: 於<abbr title='%{exact_time}'>%{when}</abbr>由%{user}隱藏
+      report: 回報此註記
+      coordinates_html: '%{latitude}, %{longitude}'
+      anonymous_warning: 此項註記包含來自匿名使用者的評論，應作獨立核實。
+      hide: 隱藏
+      resolve: 解決
+      reactivate: 重新開啟
+      comment_and_resolve: 評論並解決
+      comment: 評論
+      report_link_html: 如果此註記含有需要移除的敏感資訊，您可以%{link}。
+      other_problems_resolve: 對於註記的所有其他問題，您可以依據評論內容來自行處理。
+      other_problems_resolved: 對於其他類型回報，解決已經足夠了。
+      disappear_date_html: 已經解決的註記會從地圖的 %{disappear_in} 消失
+    new:
+      title: 新增註記
+      intro: 發現錯誤或缺少些什麼東西嗎？請告訴其他地圖製作者以便於我們處理。將標記移動到正確的位置並輸入註記，以解釋問題。
+      advice: 您的註記已公開並可用於更新地圖，因此請不要輸入個人訊息，或是來自於具版權保護地圖的訊息以及目錄清單。
+      add: 送出註記
   javascripts:
     close: 關閉
     share:
@@ -2824,22 +2848,6 @@ zh-TW:
         unsubscribe: 取消訂閱
         hide_comment: 隱藏
         unhide_comment: 取消隱藏
-    notes:
-      new:
-        intro: 發現錯誤或缺少些什麼東西嗎？請告訴其他地圖製作者以便於我們處理。將標記移動到正確的位置並輸入註記，以解釋問題。
-        advice: 您的註記已公開並可用於更新地圖，因此請不要輸入個人訊息，或是來自於具版權保護地圖的訊息以及目錄清單。
-        add: 送出註記
-      show:
-        anonymous_warning: 此項註記包含來自匿名使用者的評論，應作獨立核實。
-        hide: 隱藏
-        resolve: 解決
-        reactivate: 重新開啟
-        comment_and_resolve: 評論並解決
-        comment: 評論
-        report_link_html: 如果此註記含有需要移除的敏感資訊，您可以%{link}。
-        other_problems_resolve: 對於註記的所有其他問題，您可以依據評論內容來自行處理。
-        other_problems_resolved: 對於其他類型回報，解決已經足夠了。
-        disappear_date_html: 已經解決的註記會從地圖的 %{disappear_in} 消失
     edit_help: 將地圖移至你想編輯的位置並放大，然後按這裡。
     directions:
       ascend: 上升
@@ -2856,6 +2864,7 @@ zh-TW:
       descend: 下降
       directions: 路線
       distance: 距離
+      distance_km: '%{distance}公里'
       errors:
         no_route: 查無兩個地點間的路徑。
         no_place: 抱歉 - 查無地點「%{place}」。
-- 
2.39.5