From d4fcfc51d6f61b9acb69ada27fb12a9306c73d05 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Thu, 24 Jul 2025 14:19:36 +0200
Subject: [PATCH] Localisation updates from https://translatewiki.net.

---
 config/locales/af.yml        |  19 ++--
 config/locales/aln.yml       |  29 +++---
 config/locales/ar.yml        |  25 +++--
 config/locales/arz.yml       |  25 +++--
 config/locales/ast.yml       |  25 +++--
 config/locales/az.yml        |   5 +
 config/locales/be-Tarask.yml |  26 +++---
 config/locales/be.yml        |  32 +++----
 config/locales/bg.yml        |  13 +--
 config/locales/bn.yml        |  30 +++---
 config/locales/br.yml        |  35 ++++---
 config/locales/bs.yml        |  29 +++---
 config/locales/ca.yml        |  26 +++---
 config/locales/ce.yml        |  34 +++----
 config/locales/cs.yml        | 144 ++++++++++++++++++++++++-----
 config/locales/cy.yml        | 172 ++++++++++++++++++++++++-----------
 config/locales/da.yml        |  36 ++++----
 config/locales/de.yml        |  36 ++++----
 config/locales/diq.yml       |  19 ++--
 config/locales/dsb.yml       |  25 +++--
 config/locales/el.yml        |  48 ++++++----
 config/locales/en-GB.yml     |  19 ++--
 config/locales/eo.yml        |  32 +++----
 config/locales/es.yml        |  35 ++++---
 config/locales/et.yml        |  29 +++---
 config/locales/eu.yml        |  25 +++--
 config/locales/fa.yml        |  29 +++---
 config/locales/fi.yml        |  25 +++--
 config/locales/fr.yml        |  44 +++++----
 config/locales/fur.yml       |  11 ++-
 config/locales/fy.yml        |  29 +++---
 config/locales/ga.yml        |   7 +-
 config/locales/gd.yml        |  29 +++---
 config/locales/gl.yml        |  44 +++++----
 config/locales/gsw.yml       |  21 +++--
 config/locales/gu.yml        |   7 +-
 config/locales/he.yml        |  31 +++----
 config/locales/hi.yml        |   7 ++
 config/locales/hr.yml        |  29 +++---
 config/locales/hsb.yml       |  27 +++---
 config/locales/hu.yml        |  31 +++----
 config/locales/ia.yml        |  31 +++----
 config/locales/id.yml        |  35 ++++---
 config/locales/is.yml        |  31 +++----
 config/locales/it.yml        |  37 ++++----
 config/locales/ja.yml        |  29 +++---
 config/locales/ka.yml        |   5 +-
 config/locales/kab.yml       |  13 +--
 config/locales/ko.yml        |  31 +++----
 config/locales/ku-Latn.yml   |  27 +++---
 config/locales/lb.yml        |  29 +++---
 config/locales/lt.yml        |  31 +++----
 config/locales/lv.yml        |  29 +++---
 config/locales/mk.yml        |  49 ++++++----
 config/locales/ms.yml        |  29 +++---
 config/locales/my.yml        |   5 +-
 config/locales/nb.yml        |  27 +++---
 config/locales/ne.yml        |  17 ++--
 config/locales/nl.yml        |  57 ++++++++----
 config/locales/nn.yml        |  28 +++---
 config/locales/nqo.yml       |   5 +-
 config/locales/oc.yml        |  24 ++---
 config/locales/pa.yml        |  33 ++++---
 config/locales/pl.yml        |  31 +++----
 config/locales/pnb.yml       |  13 +--
 config/locales/pt-PT.yml     |  68 ++++++++------
 config/locales/pt.yml        |  53 +++++++----
 config/locales/ro.yml        |  32 +++----
 config/locales/ru.yml        |  34 +++----
 config/locales/sc.yml        |  34 +++----
 config/locales/scn.yml       |  25 +++--
 config/locales/sk.yml        |  46 ++++++----
 config/locales/skr-arab.yml  |   2 +
 config/locales/sl.yml        |  31 +++----
 config/locales/sq.yml        |  29 +++---
 config/locales/sr-Latn.yml   |  25 +++--
 config/locales/sr.yml        |  25 +++--
 config/locales/sv.yml        |  35 ++++---
 config/locales/ta.yml        |  19 ++--
 config/locales/te.yml        |  25 +++--
 config/locales/th.yml        |  28 +++---
 config/locales/tl.yml        |  29 +++---
 config/locales/tr.yml        |  35 ++++---
 config/locales/uk.yml        |  32 +++----
 config/locales/vi.yml        |  31 +++----
 config/locales/zh-CN.yml     |  54 +++++++----
 config/locales/zh-TW.yml     |  49 ++++++----
 87 files changed, 1523 insertions(+), 1208 deletions(-)

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 783837bb2..a84fc8bb3 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1824,15 +1824,6 @@ af:
       created from: 'Geskep vanaf:'
       status: 'Status:'
       spam score: 'SPAM-telling:'
-      role:
-        administrator: Hierdie gebruiker is 'n administrateur
-        moderator: Hierdie gebruiker is 'n moderator
-        grant:
-          administrator: Ken adminregte toe
-          moderator: Ken moderatorregte toe
-        revoke:
-          administrator: Herroep adminregte
-          moderator: Herroep moderatorregte
       block_history: Aktiewe Versperrings
       moderator_history: Uitgevoerde Versperrings
       comments: Kommentaar
@@ -1874,6 +1865,16 @@ af:
         post: Inskrywing
     auth_failure:
       no_authorization_code: Geen matigingskode
+    role_icons:
+      title:
+        administrator: Hierdie gebruiker is 'n administrateur
+        moderator: Hierdie gebruiker is 'n moderator
+      grant:
+        administrator: Ken adminregte toe
+        moderator: Ken moderatorregte toe
+      revoke:
+        administrator: Herroep adminregte
+        moderator: Herroep moderatorregte
   user_blocks:
     not_found:
       sorry: Jammer, die gebruiker met ID %{id} kon nie gevind word.
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index de30b00c7..278cb71e7 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -987,15 +987,6 @@ aln:
       created from: 'U krijue prej:'
       status: 'Statuti:'
       spam score: 'Piket e Badihavgjive:'
-      role:
-        administrator: Ky shfrytëzues asht aministrator
-        moderator: Ky shfrytëzues asht moderator
-        grant:
-          administrator: Banu administrator
-          moderator: Banu moderator
-        revoke:
-          administrator: Riqoje aksesin e administratorit
-          moderator: Riqoje aksesin e moderatorit
       block_history: shih blokimet e marrne
       moderator_history: shihe kan e ke blloku
       create_block: blloko ket shfrytzues
@@ -1035,17 +1026,25 @@ aln:
     suspended:
       title: Llogaria u Suspendu
       heading: Llogaria u Suspendu
+    role_icons:
+      title:
+        administrator: Ky shfrytëzues asht aministrator
+        moderator: Ky shfrytëzues asht moderator
+      grant:
+        administrator: Banu administrator
+        moderator: Banu moderator
+        are_you_sure: A jeni i sigurt që po doni mja dhonë rolin `%{role}' te përdoruesi
+          `%{name}'?
+      revoke:
+        administrator: Riqoje aksesin e administratorit
+        moderator: Riqoje aksesin e moderatorit
+        are_you_sure: A jeni i sigurt qe ju doni me zgjue rolin `%{role}' prej perdoruesit
+          `%{name}'?
   user_role:
     filter:
       not_a_role: Lidhja `%{role}' nuk asht rol valid.
       already_has_role: Shfrytzuesi tashmë ka ni rol %{role}.
       doesnt_have_role: Ky shfrytzeus nuk ka asni rrol %{role}
-    grant:
-      are_you_sure: A jeni i sigurt që po doni mja dhonë rolin `%{role}' te përdoruesi
-        `%{name}'?
-    revoke:
-      are_you_sure: A jeni i sigurt qe ju doni me zgjue rolin `%{role}' prej perdoruesit
-        `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Duhet të jetë një moderator për të krijuar ose rinovuar
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index a5c1a6dcd..f8cde4846 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2414,15 +2414,6 @@ ar:
       created from: 'أُنشِئ من:'
       status: 'الحالة:'
       spam score: 'نتيجة السخام:'
-      role:
-        administrator: هذا المستخدم إداري
-        moderator: هذا المستخدم مشرف
-        grant:
-          administrator: منح وصول إداري
-          moderator: منح وصول مشرف
-        revoke:
-          administrator: إبطال وصول إداري
-          moderator: إبطال وصول مشرف
       block_history: عمليات المنع المفعلة
       moderator_history: عمليات المنع المعطاة
       comments: التعليقات
@@ -2484,16 +2475,24 @@ ar:
         إذا كان لديك حساب بالفعل، فيمكنك تسجيل الدخول إلى حسابك
          باستخدام اسم المستخدم وكلمة المرور، ثم ربط الحساب
          بمعرفك في إعدادات المستخدم الخاصة بك.
+    role_icons:
+      title:
+        administrator: هذا المستخدم إداري
+        moderator: هذا المستخدم مشرف
+      grant:
+        administrator: منح وصول إداري
+        moderator: منح وصول مشرف
+        are_you_sure: هل أنت متأكد أنك تريد منح الدور '%{role}' للمستخدم '%{name}'؟
+      revoke:
+        administrator: إبطال وصول إداري
+        moderator: إبطال وصول مشرف
+        are_you_sure: هل أنت متأكد أنك تريد إلغاء الدور '%{role}' من المستخدم '%{name}'؟
   user_role:
     filter:
       not_a_role: السلسلة '%{role}' ليست دورًا صالحًا.
       already_has_role: لدى المستخدم الدور  %{role} سابقًا
       doesnt_have_role: ليس للمستخدم الدور %{role}.
       not_revoke_admin_current_user: لا يمكن إبطال دور المشرف من المستخدم الحالي.
-    grant:
-      are_you_sure: هل أنت متأكد أنك تريد منح الدور '%{role}' للمستخدم '%{name}'؟
-    revoke:
-      are_you_sure: هل أنت متأكد أنك تريد إلغاء الدور '%{role}' من المستخدم '%{name}'؟
   user_blocks:
     model:
       non_moderator_update: يجب أن تكون وسيط لإنشاء أو تحديث عرقلة.
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index bfcc5a7ef..cb2f73bd8 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -832,15 +832,6 @@ arz:
       mapper since: 'مُخطط منذ:'
       email address: 'عنوان البريد الإلكتروني:'
       created from: 'أُنشىء من:'
-      role:
-        administrator: هذا المستخدم إداري
-        moderator: هذا المستخدم وسيط
-        grant:
-          administrator: منح وصول إداري
-          moderator: منح وصول وسيط
-        revoke:
-          administrator: ابطل وصول إداري
-          moderator: ابطل وصول وسيط
       block_history: اعرض العرقلات الواصلة
       moderator_history: اعرض العرقلات المعطات
       create_block: منع هذا المستخدم
@@ -861,15 +852,23 @@ arz:
         title: العرقلات على %{name}
         heading_html: لائحه العرقلات على %{name}
         empty: '%{name} لم يتم عرقلته بعد.'
+    role_icons:
+      title:
+        administrator: هذا المستخدم إداري
+        moderator: هذا المستخدم وسيط
+      grant:
+        administrator: منح وصول إداري
+        moderator: منح وصول وسيط
+        are_you_sure: هل أنت متأكد من أنك تريد منح الدور `%{role}' إلى المستخدم `%{name}'؟
+      revoke:
+        administrator: ابطل وصول إداري
+        moderator: ابطل وصول وسيط
+        are_you_sure: أكنت متأكد انك بتريد إلغاء الدور '%{role}' من المستخدم '%{name}'?
   user_role:
     filter:
       not_a_role: السطر '%{role}' مش دور صالح.
       already_has_role: لدى المستخدم الدور  %{role} سابقًا
       doesnt_have_role: ليس للمستخدم الدور %{role}.
-    grant:
-      are_you_sure: هل أنت متأكد من أنك تريد منح الدور `%{role}' إلى المستخدم `%{name}'؟
-    revoke:
-      are_you_sure: أكنت متأكد انك بتريد إلغاء الدور '%{role}' من المستخدم '%{name}'?
   user_blocks:
     model:
       non_moderator_update: يجب أن تكون وسيط لإنشاء أو تحديث عرقله.
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index a23538ffd..6ff6fc93b 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1836,15 +1836,6 @@ ast:
       created from: 'Creáu dende:'
       status: 'Estáu:'
       spam score: 'Puntuación de corréu puxarra:'
-      role:
-        administrator: Esti usuariu ye alministrador
-        moderator: Esti usuariu ye moderador
-        grant:
-          administrator: Dar accesu d'alministrador
-          moderator: Dar accesu de moderador
-        revoke:
-          administrator: Quitar accesu d'alministrador
-          moderator: Quitar accesu de moderador
       block_history: Bloqueos activos
       moderator_history: Bloqueos puestos
       comments: Comentarios
@@ -1905,6 +1896,18 @@ ast:
         Si yá tienes una cuenta, puedes aniciar sesión nella
         usando'l to nome d'usuariu y contraseña y llueu asociar
         la cuenta cola ID nes preferencies d'usuariu.
+    role_icons:
+      title:
+        administrator: Esti usuariu ye alministrador
+        moderator: Esti usuariu ye moderador
+      grant:
+        administrator: Dar accesu d'alministrador
+        moderator: Dar accesu de moderador
+        are_you_sure: ¿Seguro que quies da-y el rol «%{role}» al usuariu «%{name}»?
+      revoke:
+        administrator: Quitar accesu d'alministrador
+        moderator: Quitar accesu de moderador
+        are_you_sure: ¿Seguro que quies quita-y el rol «%{role}» al usuariu «%{name}»?
   user_role:
     filter:
       not_a_role: La cadena «%{role}» nun ye un rol válidu.
@@ -1912,10 +1915,6 @@ ast:
       doesnt_have_role: L'usuariu nun tien el rol %{role}.
       not_revoke_admin_current_user: Nun pudo quitase'l rol d'alministrador al usuariu
         actual.
-    grant:
-      are_you_sure: ¿Seguro que quies da-y el rol «%{role}» al usuariu «%{name}»?
-    revoke:
-      are_you_sure: ¿Seguro que quies quita-y el rol «%{role}» al usuariu «%{name}»?
   user_blocks:
     model:
       non_moderator_update: Has de ser moderador pa crear o anovar un bloquéu.
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 6f4917156..24be23b34 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -5,6 +5,7 @@
 # Author: Cekli829
 # Author: Gravitystorm
 # Author: Huseyn
+# Author: Johannes 11
 # Author: Mushviq Abdulla
 # Author: NMW03
 # Author: Nemoralis
@@ -1009,6 +1010,8 @@ az:
       my comments: mənim şərhlərim
       send message: mesaj göndər
       diary: gündəlik
+      edits: Redaktələr
+      notes: Xəritə Qeydləri
       email address: 'E-poçt ünvanı:'
       status: 'Status:'
       create_block: bu istifadəçini blokla
@@ -1066,6 +1069,8 @@ az:
       base:
         standard: Standart
         transport_map: Nəqliyyat Xəritəsi
+      layers:
+        notes: Xəritə Qeydləri
     site:
       edit_tooltip: Xəritəni redaktə et
   redactions:
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index e9edb1cf1..3e5c64a68 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1266,15 +1266,6 @@ be-Tarask:
       created from: 'Створана з:'
       status: 'Статус:'
       spam score: 'Адзнака спаму:'
-      role:
-        administrator: Гэты карыстальнік зьяўляецца адміністратарам
-        moderator: Гэты карыстальнік зьяўляецца мадэратарам
-        grant:
-          administrator: Надаць правы адміністратара
-          moderator: Надаць правы мадэратара
-        revoke:
-          administrator: Скасаваць правы адміністратара
-          moderator: Скасаваць доступ мадэратара
       block_history: Актыўныя блякаваньні
       moderator_history: Пададзеныя блякаваньні
       create_block: Заблякаваць гэтага ўдзельніка
@@ -1316,15 +1307,24 @@ be-Tarask:
       heading: Рахунак заблякаваны
     auth_failure:
       invalid_credentials: Хібныя аўтэнтыфікацыйныя зьвесткі
+    role_icons:
+      title:
+        administrator: Гэты карыстальнік зьяўляецца адміністратарам
+        moderator: Гэты карыстальнік зьяўляецца мадэратарам
+      grant:
+        administrator: Надаць правы адміністратара
+        moderator: Надаць правы мадэратара
+        are_you_sure: Вы ўпэўнены, што жадаеце надаць ролю '%{role}' удзельніку '%{name}'?
+      revoke:
+        administrator: Скасаваць правы адміністратара
+        moderator: Скасаваць доступ мадэратара
+        are_you_sure: Вы ўпэўнены, што жадаеце скасаваць ролю '%{role}' удзельніка
+          '%{name}'?
   user_role:
     filter:
       not_a_role: Радок «%{role}» ня ёсьць слушнай роляй.
       already_has_role: Карыстальнік ужо мае ролю %{role}.
       doesnt_have_role: Карыстальнік ня мае ролі %{role}.
-    grant:
-      are_you_sure: Вы ўпэўнены, што жадаеце надаць ролю '%{role}' удзельніку '%{name}'?
-    revoke:
-      are_you_sure: Вы ўпэўнены, што жадаеце скасаваць ролю '%{role}' удзельніка '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Трэба быць мадэратарам, каб стварыць ці адбавіць блякаваньне.
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 76a6a0211..527e2f09d 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -2515,18 +2515,6 @@ be:
       created from: 'Створана з:'
       status: 'Статус:'
       spam score: 'Адзнака спаму:'
-      role:
-        administrator: Гэты карыстальнік з’яўляецца адміністратарам
-        moderator: Гэты карыстальнік з’яўляецца мадэратарам
-        importer: Гэты карыстальнік займаецца імпартам даных
-        grant:
-          administrator: Надаць правы адміністратара
-          moderator: Надаць правы мадэратара
-          importer: Дазволіць карыстальніку імпарт даных
-        revoke:
-          administrator: Адклікаць доступ з правамі адміністратара
-          moderator: Скасаваць доступ мадэратара
-          importer: Забараніць карыстальніку імпарт даных
       block_history: Дзейныя блакіроўкі
       moderator_history: Створаныя блакіроўкі
       revoke_all_blocks: Скасаваць усе блакіроўкі
@@ -2594,6 +2582,22 @@ be:
       option_2: Калі ў вас ужо ёсць уліковы запіс, то вы можаце ўвайсці ў свой уліковы
         запіс, выкарыстоўваючы сваё імя ўдзельніка і пароль, і затым звязаць уліковы
         запіс з вашым ID у вашых наладах удзельніка.
+    role_icons:
+      title:
+        administrator: Гэты карыстальнік з’яўляецца адміністратарам
+        moderator: Гэты карыстальнік з’яўляецца мадэратарам
+        importer: Гэты карыстальнік займаецца імпартам даных
+      grant:
+        administrator: Надаць правы адміністратара
+        moderator: Надаць правы мадэратара
+        importer: Дазволіць карыстальніку імпарт даных
+        are_you_sure: Вы ўпэўнены, што жадаеце надаць ролю `%{role}' удзельніку `%{name}'?
+      revoke:
+        administrator: Адклікаць доступ з правамі адміністратара
+        moderator: Скасаваць доступ мадэратара
+        importer: Забараніць карыстальніку імпарт даных
+        are_you_sure: Вы ўпэўнены, што жадаеце адмяніць ролю `%{role}' удзельніка
+          `%{name}'?
   user_role:
     filter:
       not_a_role: Радок «%{role}» не з’яўляецца слушнай роляй.
@@ -2601,10 +2605,6 @@ be:
       doesnt_have_role: Карыстальнік не мае ролі %{role}.
       not_revoke_admin_current_user: Немагчыма адазваць ролю адміністратара для гэтага
         карыстальніка.
-    grant:
-      are_you_sure: Вы ўпэўнены, што жадаеце надаць ролю `%{role}' удзельніку `%{name}'?
-    revoke:
-      are_you_sure: Вы ўпэўнены, што жадаеце адмяніць ролю `%{role}' удзельніка `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Трэба быць мадэратарам, каб стварыць ці зняць блакіроўку.
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 2e75c2762..f13ec8c3b 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1907,12 +1907,6 @@ bg:
       created from: 'Създадена от:'
       status: 'Състояние:'
       spam score: 'Оценка за спам:'
-      role:
-        administrator: Този потребител е администратор
-        moderator: Този потребител е модератор
-        grant:
-          administrator: Позволи администраторски достъп
-          moderator: Позволи модераторски достъп
       block_history: Активни блокирания
       moderator_history: Блокирания
       comments: Коментари
@@ -1942,6 +1936,13 @@ bg:
         post: Публикация
     suspended:
       support: поддръжка
+    role_icons:
+      title:
+        administrator: Този потребител е администратор
+        moderator: Този потребител е модератор
+      grant:
+        administrator: Позволи администраторски достъп
+        moderator: Позволи модераторски достъп
   user_blocks:
     not_found:
       back: Обратно към индекс
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index c58339f3b..03b598214 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -12,6 +12,7 @@
 # Author: Elias Ahmmad
 # Author: Greatder
 # Author: Gronthokeet
+# Author: Johannes 11
 # Author: Joysriramsarkar.manathetiger56
 # Author: Kayser Ahmad
 # Author: Marwin H.H.
@@ -1977,21 +1978,13 @@ bn:
       send message: বার্তা পাঠান
       diary: দিনলিপি
       edits: সম্পাদনাসমূহ
+      notes: মানচিত্রের নোট
       mapper since: 'এ থেকে মানচিত্র বানাচ্ছেন:'
       ct status: 'অবদানকারী শর্তাবলী:'
       ct undecided: সিদ্ধান্তহীন
       ct declined: বাতিলকৃত
       email address: 'ই-মেইল ঠিকানা:'
       status: 'অবস্থা:'
-      role:
-        administrator: এই ব্যবহারকারী একজন প্রশাসক
-        moderator: এই ব্যবহারকারী একজন মডারেটর
-        grant:
-          administrator: প্রশাসক প্রবেশাধিকার মঞ্জুর করুন
-          moderator: মডারেটর প্রবেশাধিকার মঞ্জুর করুন
-        revoke:
-          administrator: প্রশাসকের প্রবেশাধিকার প্রত্যাহার করুন
-          moderator: মডারেটর প্রবেশাধিকার প্রত্যাহার করুন
       block_history: সক্রিয় বাধাসমূহ
       moderator_history: প্রদত্ত বাধাগুলি
       comments: মন্তব্যসমূহ
@@ -2051,6 +2044,19 @@ bn:
       option_2: আপনি যদি পূর্বে নিবন্ধন করে থাকেন, তবে অনুগ্রহ করে ব্যবহারকারী নাম
         এবং পাসওয়ার্ড ব্যবহার করে লগইন করুন এবং সেটিংস থেকে আপনার অ্যাকাউন্ট আইডি
         যুক্ত করুন।
+    role_icons:
+      title:
+        administrator: এই ব্যবহারকারী একজন প্রশাসক
+        moderator: এই ব্যবহারকারী একজন মডারেটর
+      grant:
+        administrator: প্রশাসক প্রবেশাধিকার মঞ্জুর করুন
+        moderator: মডারেটর প্রবেশাধিকার মঞ্জুর করুন
+        are_you_sure: আপনি কি `%{name}' ব্যবহারকারী কে `%{role}' দায়িত্বটি দিতে চান?
+      revoke:
+        administrator: প্রশাসকের প্রবেশাধিকার প্রত্যাহার করুন
+        moderator: মডারেটর প্রবেশাধিকার প্রত্যাহার করুন
+        are_you_sure: আপনি কি নিশ্চিতভাবে `%{name}' ব্যবহারকারীর উক্ত `%{role}' দায়িত্বটি
+          বাতিল করতে চান?
   user_role:
     filter:
       not_a_role: উক্ত `%{role}' টি কোনো সঠিক দায়িত্ব নয়।
@@ -2058,11 +2064,6 @@ bn:
       doesnt_have_role: এই ব্যবহারকারীর %{role} দায়িত্বটি নেই।
       not_revoke_admin_current_user: বর্তমান ব্যবহারকারীর থেকে প্রশাসকের ভূমিকা প্রত্যাহার
         করা যাবে না৷
-    grant:
-      are_you_sure: আপনি কি `%{name}' ব্যবহারকারী কে `%{role}' দায়িত্বটি দিতে চান?
-    revoke:
-      are_you_sure: আপনি কি নিশ্চিতভাবে `%{name}' ব্যবহারকারীর উক্ত `%{role}' দায়িত্বটি
-        বাতিল করতে চান?
   user_blocks:
     model:
       non_moderator_revoke: একটি ব্লক প্রত্যাহার করতে অবশ্যই একজন মডারেটর হতে হবে।
@@ -2114,6 +2115,7 @@ bn:
       title: বণ্টন
     map:
       layers:
+        notes: মানচিত্রের নোট
         data: মানচিত্র উপাত্ত
       make_a_donation: দান করুন
       website_and_api_terms: ওয়েবসাইট এবং API শর্তাবলী
diff --git a/config/locales/br.yml b/config/locales/br.yml
index fb614ea9e..9ad8e5aa1 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2868,18 +2868,6 @@ br:
       created from: 'Krouet diwar :'
       status: 'Statud :'
       spam score: 'Notenn evit ar strob :'
-      role:
-        administrator: Ur merour eo an implijer-mañ
-        moderator: Un habaskaer eo an implijer-mañ
-        importer: Un enporzhier/ez eo an implijer/ez-mañ
-        grant:
-          administrator: Reiñ ar moned merour
-          moderator: Reiñ ar moned habaskaer
-          importer: Grataat gwirioù enporzhiañ
-        revoke:
-          administrator: Disteurel ar moned merour
-          moderator: Disteurel ar moned habaskaer
-          importer: Lemel ar gwirioù enporzhiañ
       block_history: stankadurioù oberiant
       moderator_history: Stankadurioù roet
       revoke_all_blocks: Dilemel an holl stankadennoù
@@ -2998,6 +2986,23 @@ br:
       option_2: M'ho peus ur gont dija e c'hallit kevreañ outi en ur implijout hoc'h
         anv implijer hag ho ker-tremen, ha goude-se liammañ ho kont ouzh hoc'h ID
         en ho tibaboù implijer.
+    role_icons:
+      title:
+        administrator: Ur merour eo an implijer-mañ
+        moderator: Un habaskaer eo an implijer-mañ
+        importer: Un enporzhier/ez eo an implijer/ez-mañ
+      grant:
+        administrator: Reiñ ar moned merour
+        moderator: Reiñ ar moned habaskaer
+        importer: Grataat gwirioù enporzhiañ
+        are_you_sure: Ha sur oc'h hoc'h eus c'hoant da reiñ ar roll "%{role}" d'an
+          implijer "%{name}" ?
+      revoke:
+        administrator: Disteurel ar moned merour
+        moderator: Disteurel ar moned habaskaer
+        importer: Lemel ar gwirioù enporzhiañ
+        are_you_sure: Ha sur oc'h hoc'h eus c'hoant da lemel ar roll "%{role}" digant
+          an implijer "%{name}" ?
   user_role:
     filter:
       not_a_role: An neudennad « %{role} » n'eo ket ur roll reizh.
@@ -3005,12 +3010,6 @@ br:
       doesnt_have_role: N'emañ ket ar roll %{role} gant an implijer.
       not_revoke_admin_current_user: Ne c'haller ket tennañ ar gwirioù melestrer digant
         an implijer bremañ.
-    grant:
-      are_you_sure: Ha sur oc'h hoc'h eus c'hoant da reiñ ar roll "%{role}" d'an implijer
-        "%{name}" ?
-    revoke:
-      are_you_sure: Ha sur oc'h hoc'h eus c'hoant da lemel ar roll "%{role}" digant
-        an implijer "%{name}" ?
   user_blocks:
     model:
       non_moderator_update: Ret eo deoc'h bezañ habaskaer evit krouiñ pe hizivaat
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index e74ade454..d8612c875 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1352,15 +1352,6 @@ bs:
       created from: 'Napravljeno iz:'
       status: 'Stanje:'
       spam score: 'Spam ocjena:'
-      role:
-        administrator: Ovaj korisnik je administrator
-        moderator: Ovaj korisnik je moderator
-        grant:
-          administrator: Dodjeliti pristup za administratora
-          moderator: Dodjeliti pristup za moderatora
-        revoke:
-          administrator: Opozvati pristup za administatora
-          moderator: Opozvati pristup za moderatora
       block_history: Aktivne blokade
       moderator_history: Date blokade
       comments: komentari
@@ -1404,17 +1395,25 @@ bs:
     suspended:
       title: Račun suspendiran
       heading: Račun suspendiran
+    role_icons:
+      title:
+        administrator: Ovaj korisnik je administrator
+        moderator: Ovaj korisnik je moderator
+      grant:
+        administrator: Dodjeliti pristup za administratora
+        moderator: Dodjeliti pristup za moderatora
+        are_you_sure: Jeste li sigurni da želite dodjeliti ulogu `%{role}' korisniku
+          `%{name}'?
+      revoke:
+        administrator: Opozvati pristup za administatora
+        moderator: Opozvati pristup za moderatora
+        are_you_sure: Jeste li sigurni da želite opozvati ulogu `%{role}' korisnika
+          `%{name}'?
   user_role:
     filter:
       not_a_role: String `%{role}' nije valjana uloga.
       already_has_role: Korisnik već ima ulogu %{role}.
       doesnt_have_role: Korisnik nema ulogu %{role}.
-    grant:
-      are_you_sure: Jeste li sigurni da želite dodjeliti ulogu `%{role}' korisniku
-        `%{name}'?
-    revoke:
-      are_you_sure: Jeste li sigurni da želite opozvati ulogu `%{role}' korisnika
-        `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Morate biti moderator da napravite ili osvježite blokadu.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 4554f6bbe..67dc1d073 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -2651,15 +2651,6 @@ ca:
       created from: 'Creat a partir de:'
       status: 'Estat:'
       spam score: 'Puntuació de contingut brossa:'
-      role:
-        administrator: Aquest usuari és administrador
-        moderator: Aquest usuari és moderador
-        grant:
-          administrator: Concedeix accés d'administrador
-          moderator: Concedeix accés de moderador
-        revoke:
-          administrator: Revoca l'accés d'administrador
-          moderator: Revocar l'accés de moderador
       block_history: Blocatges actius
       moderator_history: Blocatges fets
       comments: Comentaris
@@ -2733,6 +2724,19 @@ ca:
       option_2: |-
         Si ja teniu un compte, podeu iniciar sessió al vostre compte
         utilitzant el vostre nom d'usuari i contrasenya i, a continuació associar el compte amb l'ID a la configuració d'usuari.
+    role_icons:
+      title:
+        administrator: Aquest usuari és administrador
+        moderator: Aquest usuari és moderador
+      grant:
+        administrator: Concedeix accés d'administrador
+        moderator: Concedeix accés de moderador
+        are_you_sure: Esteu segur que voleu concedir el paper "%{role}" a l'usuari
+          "%{name}"?
+      revoke:
+        administrator: Revoca l'accés d'administrador
+        moderator: Revocar l'accés de moderador
+        are_you_sure: Esteu segur que voleu revocar el rol `%{role}' de l'usuari `%{name}'?
   user_role:
     filter:
       not_a_role: La cadena `%{role}' no és un rol vàlid.
@@ -2740,10 +2744,6 @@ ca:
       doesnt_have_role: L'usuari no té el rol %{role}.
       not_revoke_admin_current_user: No es poden retirar els drets d'administrador
         de l'usuari actual.
-    grant:
-      are_you_sure: Esteu segur que voleu concedir el paper "%{role}" a l'usuari "%{name}"?
-    revoke:
-      are_you_sure: Esteu segur que voleu revocar el rol `%{role}' de l'usuari `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Ha de ser un moderador per crear o un bloc d'actualització.
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 90d33e5f9..f804c05eb 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -2784,18 +2784,6 @@ ce:
       created from: 'Кхоьллина:'
       status: 'Статус:'
       spam score: 'Спаман маххадор:'
-      role:
-        administrator: ХӀара лелош верг администратор ву
-        moderator: ХӀара лелош верг модератор ву
-        importer: ХӀара лелош верг импортер ву
-        grant:
-          administrator: Администраторна бакъо ло
-          moderator: Модераторна бакъо ло
-          importer: Импортерна бакъо ло
-        revoke:
-          administrator: Администраторан бакъо йухаяккха
-          moderator: Модераторан бакъо йухайаккха
-          importer: Импортеран бакъо йухайаккха
       block_history: Жигара блокаш
       moderator_history: Кхоьллина блокаш
       revoke_all_blocks: Массо блокаш йухайаха
@@ -2880,6 +2868,23 @@ ce:
       option_2: |-
         Нагахь санна хьан хӀинцале а аккаунт елахь, хьайн аккаунте чувала йиш йу хьан
         хьайн лелоран цӀе а, пароль а лелош, тӀаккха хьайн ID-ца хьайн аккаунт лелоран настройкашкахь зIай йе.
+    role_icons:
+      title:
+        administrator: ХӀара лелош верг администратор ву
+        moderator: ХӀара лелош верг модератор ву
+        importer: ХӀара лелош верг импортер ву
+      grant:
+        administrator: Администраторна бакъо ло
+        moderator: Модераторна бакъо ло
+        importer: Импортерна бакъо ло
+        are_you_sure: Хьо тешна вуй хьайна `%{role}' роль дӀаяла лаьий, декъашхочунна
+          `%{name}'?
+      revoke:
+        administrator: Администраторан бакъо йухаяккха
+        moderator: Модераторан бакъо йухайаккха
+        importer: Импортеран бакъо йухайаккха
+        are_you_sure: Хьо тешна вуй хьайна `%{role}' роль дӀаяккха лаьий `%{name}'
+          декъашхочуьнгара?
   user_role:
     filter:
       not_a_role: '`%{role}'' могӀа нийса роль йац.'
@@ -2887,11 +2892,6 @@ ce:
       doesnt_have_role: Декъашхочун роль йац %{role}.
       not_revoke_admin_current_user: Карарчу хенахь декъашхочунгара администраторан
         роль йухаяккха йиш яц.
-    grant:
-      are_you_sure: Хьо тешна вуй хьайна `%{role}' роль дӀаяла лаьий, декъашхочунна
-        `%{name}'?
-    revoke:
-      are_you_sure: Хьо тешна вуй хьайна `%{role}' роль дӀаяккха лаьий `%{name}' декъашхочуьнгара?
   user_blocks:
     model:
       non_moderator_update: Блок кхолла йа карлайаккха модератор хила веза.
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index c8ea87de7..4f493f306 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -58,6 +58,9 @@
 # Author: Zbycz
 ---
 cs:
+  date:
+    formats:
+      heatmap: '%-d. %-m.'
   time:
     formats:
       friendly: '%e. %m. %Y v %H:%M'
@@ -199,6 +202,7 @@ cs:
         company: Firma
         home_lat: Zeměpisná šířka
         home_lon: Zeměpisná délka
+        home_location_name: Název polohy domova
         languages: Preferované jazyky
         preferred_editor: Preferovaný editor
         pass_crypt: Heslo
@@ -521,6 +525,11 @@ cs:
         key: Stránka s popisem značky %{key} na wiki
         tag: Stránka s popisem značky %{key}=%{value} na wiki
       wikidata_link: Položka %{page} na Wikidatech
+      wikidata_preview:
+        one: Náhled položky Wikidat
+        few: Náhled položek Wikidat
+        many: Náhled položek Wikidat
+        other: Náhled položek Wikidat
       wikipedia_link: Článek %{page} na Wikipedii
       wikimedia_commons_link: Položka %{page} na Wikimedia Commons
       telephone_link: Volat %{phone_number}
@@ -605,6 +614,21 @@ cs:
         few: '%{count} změny'
         many: '%{count} změny'
         other: '%{count} změn'
+      n_elements_created:
+        one: Založen %{count} prvek
+        few: Založeny %{count} prvky
+        many: Založeno %{count} prvku
+        other: Založeno %{count} prvků
+      n_elements_modified:
+        one: Změněn %{count} prvek
+        few: Změněny %{count} prvky
+        many: Změněno %{count} prvku
+        other: Změněno %{count} prvků
+      n_elements_deleted:
+        one: Smazán %{count} prvek
+        few: Smazány %{count} prvky
+        many: Smazáno %{count} prvku
+        other: Smazáno %{count} prvků
     index:
       title: Sady změn
       title_user: Sady změn uživatele %{user}
@@ -2211,6 +2235,9 @@ cs:
         show: Zobrazit
         delete: Smazat
         undelete: Vrátit smazání
+      update:
+        success: Profilová poloha byla aktualizována.
+        failure: Nepodařilo se aktualizovat profilovou polohu.
   sessions:
     new:
       tab_title: Přihlášení
@@ -2277,6 +2304,8 @@ cs:
       issues:
         older: Starší problémy
         newer: Novější problémy
+        oldest: Nejstarší problémy
+        newest: Nejnovější problémy
       traces:
         older: Starší stopy
         newer: Novější stopy
@@ -2349,17 +2378,65 @@ cs:
         native_link: českou verzi
         mapping_link: začít mapovat
       legal_babble:
+        lead_1_html: |-
+          OpenStreetMap poskytuje mapová data pro tisíce webových stránek, mobilních aplikací a hardwarových zařízení.
+          OpenStreetMap tvoří komunita lidí jako vy, kteří přidávají a udržují data o silnicích, cestách, kavárnách, železničních stanicích a mnohém dalším po celém světě.
+        lead_2_html: |-
+          %{learn_more_about_osm_link} a %{get_started_mapping_link}!
+          Více informací se dozvíte na %{osm_blog_link} a můžete se přihlásit k odběru %{weeklyosm_link}.
+          Ostatní mappery můžete najít ve vaší místní %{osm_community_link}.
+          Podpořte projekt tím, že vstoupíte do %{osm_foundation_link} či %{making_donation_link}.
+        lead_2_learn_more_about_osm: Zjistěte více o OpenStreetMap
+        lead_2_learn_more_about_osm_url: https://wiki.openstreetmap.org/wiki/Cs:Co_je_OpenStreetMap
+        lead_2_get_started_mapping: začněte mapovat
+        lead_2_osm_blog: blogu OpenStreetMap
+        lead_2_weeklyosm_url: https://weeklyosm.eu/cz/
+        lead_2_osm_community: komunitě OSM
+        lead_2_osm_foundation: Nadace OSM
+        lead_2_making_donation: poskytnete příspěvek
+        licensing_title: Licencování OpenStreetMap
+        licensing_1_html: 'OpenStreetMap jsou %{open} data, která za podmínek %{odc_odbl_link}
+          (ODbL) nabízí %{osm_foundation_link} (OSMF). Stručně řečeno:'
+        licensing_1_open: otevřená
         licensing_1_odc_odbl: Open Data Commons Open Database License
         licensing_1_osm_foundation: Nadace OpenStreetMap
+        licensing_2_html: Smíte kopírovat, distribuovat, sdělovat veřejnosti a upravovat
+          naše data, pokud jako zdroj uvedete OpenStreetMap a jeho přispěvatele. Pokud
+          naše data budete upravovat nebo je použijete ve svém díle, musíte výsledek
+          šířit pod stejnou licencí. Vaše práva a povinnosti jsou vysvětleny v %{legal_code_link}.
+        licensing_2_legal_code: plném licenčním ujednání na Open Data Commons
+        licensing_3_html: Naše dokumentace je licencována pod licencí %{creative_commons_license_link}
+          (CC BY-SA 2.0).
+        licensing_3_creative_commons_license: Creative Commons Uveďte autora-Zachovejte
+          licenci 2.0
         licensing_3_creative_commons_license_url: https://creativecommons.org/licenses/by-sa/2.0/deed.cs
+        licensing_4_html: O používání našich dat se můžete dočíst více na %{osmf_license_page_link}.
         licensing_4_osmf_license_page: licenční stránce OSMF
         credit_title_html: Jak uvádět OpenStreetMap
         credit_1_html: 'Pokud používáte data OpenStreetMap, máte povinnost učinit
           následující dvě věci:'
+        credit_2_attribution: Uvést jako zdroj OpenStreetMap zobrazením naší informace
+          o autorských právech.
         credit_2_license: Jasně uvést, že data jsou dostupná za podmínek Open Database
           License.
-        credit_3_v2025_attribution_guidelines: Pokynech pro uvádění původu
+        credit_3_v2025_html: |-
+          Co se týká uvedení autorských práv, liší se %{requirements_on_how_displayed_link} podle toho, jak naše data používáte.
+          Různá pravidla zobrazení informací o autorských právech například platí, když tvoříte interaktivní mapu, tištěnou mapu nebo statický obrázek.
+          Podrobné informace naleznete v části %{attribution_guidelines_link} našich %{licensing_requirements_link}.
+        credit_3_v2025_requirements_on_how_displayed: naše požadavky na jejich uvádění
+        credit_3_v2025_attribution_guidelines: Pokyny pro uvádění původu
+        credit_3_v2025_licensing_requirements: licenčních požadavků
+        credit_4_v2025_html: |-
+          Obecně řečeno,
+          aby bylo zřejmé, že jsou data dostupná za podmínek Open
+          Database License, můžete odkázat na %{this_copyright_page_link}.
+          Pokud OSM šíříte v datové podobě,
+          uveďte a odkažte přímo na licenci. Ve formě,
+          ve které odkazování není možné (např. v tištěných dílech),
+          vložte na stránku plné URL, např. %{copyright_page_url}.
         credit_4_v2025_this_copyright_page: tuto stránku k autorským právům
+        credit_5_v2025_html: 'V tomto příkladu se informace o zdroji objevuje v rohu
+          mapy:'
         attribution_example:
           alt: Příklad, jak uvádět autorství OpenStreetMap na webové stránce
           title: Příklad uvedení autorství
@@ -2378,6 +2455,11 @@ cs:
           zapsané ochranné známky OpenStreetMap Foundation. Pokud máte dotazy ohledně
           vašeho používání těchto známek, vizte naše %{trademark_policy_link}.
         trademarks_1_1_trademark_policy: Pravidla k ochranným známkám
+        services_title_html: Další služby
+        services_1_html: |-
+          Přestože jsou OpenStreetMap otevřená data, nemůžeme třetím stranám poskytovat
+          bezplatné mapové API nebo mapové dlaždice.
+          Vizte naše %{api_usage_policy_link}, %{tile_usage_policy_link} a %{nominatim_usage_policy_link}.
         services_1_api_usage_policy: Pravidla použití API
         services_1_tile_usage_policy: Pravidla použití dlaždic
         services_1_nominatim_usage_policy: Pravidla použití Nominatimu
@@ -2589,6 +2671,8 @@ cs:
         bicycle: Na kole
         car: Autem
         foot: Pěšky
+      providers:
+        description: Služby výpočtu trasy
     welcome:
       title: Vítejte!
       introduction: Vítejte v OpenStreetMap, svobodné a editovatelné mapě světa. Teď,
@@ -2634,7 +2718,11 @@ cs:
       title: Nemáte čas editovat? Přidejte poznámku!
       para_1: Pokud chcete jen opravit nějakou drobnost a nemáte čas se registrovat
         a učit se editovat, můžete jednoduše přidat poznámku.
-      the_map: mapu
+      para_2_html: |-
+        Stačí kliknout na %{note_icon} nebo na stejnou ikonku na %{map_link}.
+        Tím do mapy přidáte značku, kterou můžete přesunout tažením myší.
+        Přidejte svou zprávu a klikněte na uložit a ostatní uživatelé se na to podívají.
+      the_map: mapě
     communities:
       title: Komunity
       lede_text: |-
@@ -2657,6 +2745,9 @@ cs:
           komunitní skupina. Kdokoli může založit takovou skupinu nebo se připojit.
           Více informací najdete na %{communities_wiki_link}.
         communities_wiki: wiki stránce pro komunity
+  social_links:
+    show:
+      website: webová stránka
   layers_panes:
     show:
       map_notes_zoom_in_tooltip: Pro zobrazení poznámek k mapě přejděte na větší měřítko.
@@ -2751,6 +2842,7 @@ cs:
         bicycle_parking: Parkoviště pro kola
         bicycle_parking_small: Malé parkoviště pro kola
         toilets: Záchody
+      see_external_legend: Zobrazit externí legendu mapy
   share_panes:
     show:
       link: Odkaz nebo HTML
@@ -3032,6 +3124,7 @@ cs:
       by_signing_up:
         html: Registrací souhlasíte s našimi %{tou_link}, %{privacy_policy_link} a
           %{contributor_terms_link}.
+        tou: podmínkami užití
         privacy_policy: pravidly ochrany osobních údajů
         privacy_policy_title: Pravidla ochrany osobních údajů OSMF, včetně části o
           e-mailových adresách
@@ -3084,18 +3177,6 @@ cs:
       created from: 'Vytvořeno od:'
       status: 'Stav:'
       spam score: 'Spam skóre:'
-      role:
-        administrator: Tento uživatel je správce
-        moderator: Tento uživatel je moderátor
-        importer: Tento uživatel je importér
-        grant:
-          administrator: Přidělit práva správce
-          moderator: Přidělit práva moderátora
-          importer: Udělit přístup importérům
-        revoke:
-          administrator: Odebrat práva správce
-          moderator: Odebrat práva moderátora
-          importer: Zrušit přístup importéra
       block_history: Účinná zablokování
       moderator_history: Udělená zablokování
       revoke_all_blocks: Zrušit všechny bloky
@@ -3116,6 +3197,11 @@ cs:
       change_image: Změnit obrázek
       edit_company: Upravit firmu
       edit_location: Upravit polohu
+      contributions:
+        one: '%{count} příspěvek za poslední rok'
+        few: '%{count} příspěvky za poslední rok'
+        many: '%{count} příspěvku za poslední rok'
+        other: '%{count} příspěvků za poslední rok'
     sidebar_section:
       home_location: Poloha domova
       company: Firma
@@ -3215,6 +3301,21 @@ cs:
         níže zobrazeného formuláře.
       option_2: Pokud již účet máte, můžete se k němu přihlásit pomocí svého uživatelského
         jména a hesla a poté v uživatelském nastavení účet propojit s vaším ID.
+    role_icons:
+      title:
+        administrator: Tento uživatel je správce
+        moderator: Tento uživatel je moderátor
+        importer: Tento uživatel je importér
+      grant:
+        administrator: Přidělit práva správce
+        moderator: Přidělit práva moderátora
+        importer: Udělit přístup importérům
+        are_you_sure: Opravdu chcete přidělit roli „%{role}“ uživateli „%{name}“?
+      revoke:
+        administrator: Odebrat práva správce
+        moderator: Odebrat práva moderátora
+        importer: Zrušit přístup importéra
+        are_you_sure: Opravdu chcete odebrat roli „%{role}“ uživateli „%{name}“?
   user_role:
     filter:
       not_a_role: Řetězec „%{role}“ neoznačuje platnou roli.
@@ -3222,10 +3323,6 @@ cs:
       doesnt_have_role: Uživatel nemá roli %{role}.
       not_revoke_admin_current_user: Správcovskou roli nelze odebrat aktuálně přihlášenému
         uživateli.
-    grant:
-      are_you_sure: Opravdu chcete přidělit roli „%{role}“ uživateli „%{name}“?
-    revoke:
-      are_you_sure: Opravdu chcete odebrat roli „%{role}“ uživateli „%{name}“?
   user_blocks:
     model:
       non_moderator_update: K vytvoření nebo aktualizaci bloku musíte být moderátorem.
@@ -3489,6 +3586,7 @@ cs:
       tracestrack_credit: Dlaždice laskavostí %{tracestrack_link}
       hotosm_credit: Styl dlaždic od %{hotosm_link} hostuje %{osm_france_link}
       hotosm_name: Humanitárního týmu OpenStreetMap
+      openmaptiles_credit: Vektorové dlaždice z %{openmaptiles_link} hostuje %{maptiler_link}
     site:
       edit_tooltip: Upravit mapu
       edit_disabled_tooltip: Pro editaci mapy přejděte na větší měřítko
@@ -3506,6 +3604,7 @@ cs:
         m: '%{distance} m'
         km: '%{distance} km'
         ft: '%{distance} ft'
+        yd: '%{distance} yd'
         mi: '%{distance} mi'
       errors:
         no_route: Nepodařilo se nalézt trasu mezi zadanými místy.
@@ -3601,6 +3700,7 @@ cs:
       show_address: Zobrazit adresu
       query_features: Průzkum prvků
       centre_map: Zde vycentrovat mapu
+      scroll_to_changeset: Najít sadu změn
     home:
       marker_title: Poloha mého domova
       not_set: Ve vašem účtu není nastavena poloha domova
@@ -3608,10 +3708,10 @@ cs:
       tooltip:
         no_contributions: Dne %{date} žádné úpravy
         contributions:
-          one: Dne %{date} %{count} úprava
-          few: Dne %{date} %{count} úpravy
-          many: Dne %{date} %{count} úpravy
-          other: Dne %{date} %{count} úprav
+          one: '%{count} úprava dne %{date}'
+          few: '%{count} úpravy dne %{date}'
+          many: '%{count} úpravy dne %{date}'
+          other: '%{count} úprav dne %{date}'
   redactions:
     edit:
       heading: Upravit redakci
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 15492da9d..01560cd2c 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -357,6 +357,8 @@ cy:
           yn cael eu cadw.
         retain_traces: Cedwir unrhyw olion rydych chi wedi uwchlwytho os ydynt yn
           bodoli.
+        retain_diary_entries: Bydd eich cofnodion a sylwadau dyddiadur, os ydynt yn
+          bodoli, yn cael eu cadw ond wedi'u cuddio o'r cyhoedd.
         retain_notes: Bydd eich nodiadau map a'ch sylwadau nodyn, os ydynt yn bodoli,
           yn cael eu cadw ond wedi'u cuddio o'r cyhoedd.
         retain_changeset_discussions: Bydd eich trafodaethau grwpiau newid, os ydynt
@@ -581,6 +583,27 @@ cy:
         few: '%{count} newid'
         many: '%{count} newid'
         other: '%{count} newid'
+      n_elements_created:
+        zero: '%{count} elfen wedi''i chreu'
+        one: '%{count} elfen wedi''i chreu'
+        two: '%{count} elfen wedi''i chreu'
+        few: '%{count} elfen wedi''i chreu'
+        many: '%{count} elfen wedi''i chreu'
+        other: '%{count} elfen wedi''i chreu'
+      n_elements_modified:
+        zero: '%{count} elfen wedi''i haddasu'
+        one: '%{count} elfen wedi''i haddasu'
+        two: '%{count} elfen wedi''i haddasu'
+        few: '%{count} elfen wedi''i haddasu'
+        many: '%{count} elfen wedi''i haddasu'
+        other: '%{count} elfen wedi''i haddasu'
+      n_elements_deleted:
+        zero: '%{count} elfen wedi''i dileu'
+        one: '%{count} elfen wedi''i dileu'
+        two: '%{count} elfen wedi''i dileu'
+        few: '%{count} elfen wedi''i dileu'
+        many: '%{count} elfen wedi''i dileu'
+        other: '%{count} elfen wedi''i dileu'
     index:
       title: Grwpiau newid
       title_user: Grwpiau newid gan %{user}
@@ -752,7 +775,7 @@ cy:
       heading: Dad-danysgrifio o'r drafodaeth cofnod dyddiadur ganlynol?
       button: Dad-danysgrifio o'r drafodaeth
     navigation:
-      in_language: Cofnodion Dyddiadur %{language}
+      in_language: Cofnodion Dyddiadur (%{language})
       my_diary: Fy Nyddiadur
       new: Cofnod Dyddiadur Newydd
       new_title: Creu cofnod newydd yn fy nyddiadur defnyddiwr
@@ -840,7 +863,7 @@ cy:
           magic_carpet: Lifft Carped Hud
           platter: Lifft Plater
           pylon: Peilon
-          station: Gorsaf Awyr
+          station: Gorsaf Awyrffordd
           t-bar: Lifft T-Bar
           "yes": Awyrffordd
         aeroway:
@@ -1749,6 +1772,10 @@ cy:
         diary_comment: '%{entry_title}, sylw #%{comment_id}'
         note: 'Nodyn #%{note_id}'
       reportable_heading:
+        diary_comment_html: Sylw Dyddiadur %{title} a grëwyd ar %{datetime_created}
+          ac wedi'i ddiweddaru ar %{datetime_updated}
+        diary_entry_html: Cofnod Dyddiadur %{title} a grëwyd ar %{datetime_created}
+          ac wedi'i ddiweddaru ar %{datetime_updated}
         user_html: Defnyddiwr %{title} a grëwyd ar %{datetime_created}
     reporters:
       index:
@@ -1771,8 +1798,8 @@ cy:
           defnyddiwr dan sylw
       categories:
         diary_entry:
-          spam_label: Mae'r cofnod dyddiadur hwn yn / yn cynnwys sbam
-          offensive_label: Mae'r cofnod dyddiadur hwn yn anweddus / sarhaus
+          spam_label: Mae'r cofnod dyddiadur hwn yn/yn cynnwys sbam
+          offensive_label: Mae'r cofnod dyddiadur hwn yn anweddus/sarhaus
           threat_label: Mae'r cofnod dyddiadur hwn yn cynnwys bygythiad
           other_label: Arall
         diary_comment:
@@ -2155,6 +2182,7 @@ cy:
         save: Diweddaru Proffil
         cancel: Canslo
       update:
+        success: Cwmni proffil wedi'i ddiweddaru.
         failure: Methwyd â diweddaru cwmni'r proffil.
     locations:
       show:
@@ -2273,13 +2301,11 @@ cy:
       community_driven_community_blogs: blogiau cymunedol
       community_driven_osm_foundation: OSM Foundation
       open_data_title: Data Agored
-      open_data_1_html: |-
-        Mae OpenStreetMap yn %{open_data}: mae modd i'w ddefnyddio at unrhyw ddiben
-        ond mae rhaid rhoi cydnabyddiaeth i OpenStreetMap a'i gyfranwyr. Os
-        ydych chi'n newid neu
-        adeiladu ar y ddata mewn rhai ffyrdd, gallwch chi
-        ddosbarthu'r canlyniad
-        o dan yr un drwydded yn unig. Gweler y %{copyright_license_link} am fanylion.
+      open_data_1_html: 'Mae OpenStreetMap yn %{open_data}: mae modd i''w ddefnyddio
+        at unrhyw ddiben oni bai eich bod yn rhoi cydnabyddiaeth i OpenStreetMap a''i
+        gyfranwyr. Os byddwch chi''n addasu neu''n adeiladu ar y ddata mewn ffyrdd
+        penodol, dim ond o dan yr un drwydded y cewch ddosbarthu''r canlyniad. Gweler
+        y %{copyright_license_link} am fanylion.'
       open_data_open_data: ddata agored
       open_data_copyright_license: dudalen Hawlfraint a Thrwydded
       legal_title: Cyfreithiol
@@ -2299,45 +2325,57 @@ cy:
       foreign:
         title: Ynglŷn â'r cyfieithiad hwn
         html: Mewn achos o wrthdaro rhwng y dudalen hon a gyfieithwyd a%{english_original_link},
-          bydd y dudalen Saesneg yn cael blaenoriaeth
+          bydd y dudalen Saesneg yn cael blaenoriaeth.
         english_link: '''r gwreiddiol yn Saesneg'
       native:
         title: Ynglŷn â'r dudalen hon
         html: Rydych chi'n darllen fersiwn Saesneg y dudalen hawlfraint. Gallwch fynd
           yn ôl i %{native_link} y dudalen hon, neu allwch stopio darllen am hawlfraint
           a %{mapping_link}.
-        native_link: fersiwn Cymraeg
+        native_link: fersiwn Gymraeg
         mapping_link: dechrau mapio
       legal_babble:
-        lead_2_learn_more_about_osm: Dysgu mwy am OpenStreetMap
+        lead_1_html: Mae OpenStreetMap yn darparu data map agored ar gyfer miloedd
+          o wefannau, apiau symudol, a dyfeisiau caledwedd. Mae OpenStreetMap wedi'i
+          adeiladu gan gymuned o bobl fel chi sy'n cyfrannu ac yn cynnal data mapio
+          am ffyrdd, llwybrau, caffis, gorsafoedd trenau, a llawer mwy, ym mhob cwr
+          o'r byd.
+        lead_2_html: |-
+          %{learn_more_about_osm_link} a %{get_started_mapping_link}! Gallwch ddarllen mwy ar %{osm_blog_link}, a thanysgrifio i %{weeklyosm_link}.
+          Dewch o hyd i fapwyr eraill yn eich %{osm_community_link} leol. Cefnogwch y prosiect drwy ymuno â %{osm_foundation_link} a %{making_donation_link}.
+        lead_2_learn_more_about_osm: Dysgwch fwy am OpenStreetMap
         lead_2_learn_more_about_osm_url: https://wiki.openstreetmap.org/wiki/About_OpenStreetMap
         lead_2_get_started_mapping: dechrau mapio
-        lead_2_osm_blog: Blog OpenStreetMap
+        lead_2_osm_blog: Flog OpenStreetMap
         lead_2_osm_blog_url: https://blog.openstreetmap.org/
         lead_2_weeklyosm: weeklyOSM
         lead_2_weeklyosm_url: https://weeklyosm.eu/
-        lead_2_osm_community: Cymuned OSM
+        lead_2_osm_community: cymuned OSM
         lead_2_osm_foundation: Sefydliad OSM
         lead_2_osm_foundation_url: https://osmfoundation.org/
         lead_2_making_donation: gwneud rhodd
         lead_2_making_donation_url: https://supporting.openstreetmap.org/
-        licensing_title: Trwyddedu OpenStreetMap
+        licensing_title: Trwydded OpenStreetMap
+        licensing_1_html: 'Mae OpenStreetMap yn data %{open}, sydd wedi''u trwyddedu
+          o dan y %{odc_odbl_link} (ODbL0 gan %{osm_foundation_link} (OSMF). Yn gryno:'
         licensing_1_open: agored
-        licensing_1_odc_odbl: Open Data Commons Open Database License
+        licensing_1_odc_odbl: Drwydded Cronfa Ddata Agored Open Data Commons
         licensing_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/
         licensing_1_osm_foundation: Sefydliad OpenStreetMap
         licensing_1_osm_foundation_url: https://osmfoundation.org/
         licensing_2_html: Rydych yn rhydd i gopïo, dosbarthu, trosglwyddo ac addasu
-          ein data, cyn belled â'ch bod yn cydnabod OpenStreetMap a'i gyfranwyr. Os
-          ydych yn newid neu'n adeiladu ar ein data, dim ond o dan yr un drwydded
-          y cewch ddosbarthu eich canlyniad. Mae'r %{legal_code_link} llawn yn esbonio
-          eich hawliau a'ch cyfrifoldebau.
+          ein data, ar yr amod eich bod yn cydnabod OpenStreetMap a'i gyfranwyr. Os
+          byddwch yn newid neu'n adeiladu ar ein data, dim ond o dan yr un drwydded
+          y cewch ddosbarthu eich canlyniad. Mae'r %{legal_code_link} yn esbonio eich
+          hawliau a'ch cyfrifoldebau.
+        licensing_2_legal_code: cod cyfreithiol llawn ar Open Data Commons
+        licensing_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1-0/
         licensing_3_html: Trwyddedir ein dogfennaeth o dan %{creative_commons_license_link}
           (CC BY-SA 2.0).
         licensing_3_creative_commons_license: Trwydded Creative Commons Attribution-ShareAlike
           2.0
         licensing_3_creative_commons_license_url: https://creativecommons.org/licenses/by-sa/2.0/
-        licensing_4_html: Dysgu mwy am ddefnyddio ein data yn y %{osmf_license_page_link}.
+        licensing_4_html: Darllenwch fwy am ddefnyddio ein data ar %{osmf_license_page_link}.
         licensing_4_osmf_license_page: dudalen Drwydded yr OSMF
         credit_title_html: Sut i gydnabod OpenStreetMap
         credit_1_html: 'Pan fyddwch yn defnyddio data OpenStreetMap, mae rhaid i chi
@@ -2357,7 +2395,12 @@ cy:
         credit_3_v2025_attribution_guidelines_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines
         credit_3_v2025_licensing_requirements: gofynion trwyddedu
         credit_3_v2025_licensing_requirements_url: https://wiki.osmfoundation.org/wiki/Licence
+        credit_4_v2025_html: |-
+          Yn gyffredinol, er mwyn egluro bod y data ar gael o dan y Drwydded Cronfa Ddata Agored, gallwch roi dolen i'r %{this_copyright_page_link}. Os byddwch chi'n dosbarthu OSM ar ffurf data, dylech enwi'r drwydded(au) a chysylltu'n uniongyrchol â nhw. Mewn cyfryngau
+          lle nad yw cysylltiadau'n bosibl (e.e. gweithiau printiedig), cofiwch gynnwys yr URL llawn ar y dudalen, e.e. %{copyright_page_url}.
         credit_4_v2025_this_copyright_page: dudalen hawlfraint hon
+        credit_5_v2025_html: 'Yn yr enghraifft hon, mae''r cydnabyddiaeth yn ymddangos
+          yng nghornel y map:'
         attribution_example:
           alt: Enghraifft o sut i briodoli OpenStreetMap ar dudalen we
           title: Enghraifft o briodoli
@@ -2377,6 +2420,9 @@ cy:
           %{trademark_policy_link}.
         trademarks_1_1_trademark_policy: Polisi Nod Masnach
         services_title_html: Gwasanaethau ychwanegol
+        services_1_html: Er bod OpenStreetMap yn ddata agored, ni allwn ddarparu API
+          map na theils map am ddim ar gyfer trydydd partïon. Gweler ein %{api_usage_policy_link},
+          ein %{tile_usage_policy_link} a'n %{nominatim_usage_policy_link}.
         services_1_api_usage_policy: Polisi Defnydd API
         services_1_tile_usage_policy: Polisi Defnydd Teils
         services_1_nominatim_usage_policy: Polisi Defnydd Nominatim
@@ -2423,7 +2469,7 @@ cy:
         contributors_hr_open_data_portal: Phorth Data Agored Cenedlaethol
         contributors_nl_credit_html: '%{netherlands}: Yn cynnwys data &copy; AND,
           2007 (%{and_link})'
-        contributors_nl_netherlands: Iseldiroedd
+        contributors_nl_netherlands: Yr Iseldiroedd
         contributors_nz_credit_html: '%{new_zealand}: Yn cynnwys data o ffynhonnell
           %{linz_data_service_link} wedi''i drwyddedu i''w hailddefnyddio o dan %{cc_by_link}.'
         contributors_nz_new_zealand: Seland Newydd
@@ -2476,9 +2522,9 @@ cy:
       manually_select: Dewiswch ardal wahanol â llaw
       licence: Trwydded
       licence_details_html: Trwyddedir data OpenStreetMap o dan y %{odbl_link} (ODbL).
-      odbl: Open Data Commons Open Database License
+      odbl: Drwydded Cronfa Ddata Agored Open Data Commons
       too_large:
-        advice: 'Os yw''r allforio''n methu, ystyriwch un o''r canlynol:'
+        advice: 'Os bydd yr allforiad yn methu, ystyriwch ddefnyddio un o''r canlynol:'
         body: Mae'r ardal hon yn rhy fawr i'w hallforio fel Data XML OpenStreetMap.
           Chwyddwch i mewn neu ddewiswch ardal lai, neu defnyddiwch un o'r ffynonellau
           a restrir isod ar gyfer lawrlwythiadau data swmp.
@@ -2488,8 +2534,11 @@ cy:
             rheolaidd
         overpass:
           title: Overpass API
+          description: Lawrlwythwch y blwch ffiniol hwn o ddrych o gronfa ddata OpenStreetMap
         geofabrik:
           title: Lawrlwythiadau Geofabrik
+          description: Rhannau o gyfandiroedd, gwledydd a dinasoedd dethol sy'n cael
+            eu diweddaru'n rheolaidd
         other:
           title: Ffynonellau Eraill
           description: Nodir ffynonellau ychwanegol ar Wici OpenStreetMap
@@ -2552,7 +2601,7 @@ cy:
         cwestiynau, a thrafod ac ysgrifennu dogfennaeth ar bynciau mapio.
         %{help_link}. Ydych chi'n gweithio gyda sefydliad sy'n gwneud cynlluniau ar gyfer OpenStreetMap? %{welcome_mat_link}.
       get_help_here: Cewch gymorth yma
-      welcome_mat: Dyma'r Mat Croeso
+      welcome_mat: Edrychwch ar y Mat Croeso
     sidebar:
       search_results: Canlyniadau Chwilio
     search:
@@ -2573,24 +2622,25 @@ cy:
         description: Gwasanaethau cyfarwyddiadau
     welcome:
       title: Croeso!
-      introduction: Croeso i OpenStreetMap, map y byd rhydd ac agored. Nawr eich bod
-        wedi cofrestru, rydych chi'n barod i ddechrau mapio. Dyma ganllaw gyflym gyda'r
-        hyn pwysicaf i wybod cyn ichi ddechrau arni.
+      introduction: Croeso i OpenStreetMap, map y byd rhydd y gellir ei olygu. Nawr
+        eich bod wedi cofrestru, rydych chi'n barod i ddechrau mapio. Dyma ganllaw
+        gyflym gyda'r pethau pwysicaf y mae angen i chi eu gwybod.
       whats_on_the_map:
         title: Beth sydd ar y Map
-        on_the_map_html: Mae OpenStreetMap yn addas i fapio pethau sy'n %{real_and_current}
-          - mae'n cynnwys miliynau o adeiladau, strydoedd, a manylion eraill am lefydd.
-          Gallwch chi fapio unrhyw beth sydd o ddiddordeb ichi.
+        on_the_map_html: Mae OpenStreetMap yn lle i fapio pethau sy'n %{real_and_current}
+          - mae'n cynnwys miliynau o adeiladau, ffyrdd, a manylion eraill am lefydd.
+          Gallwch chi fapio unrhyw nodweddion yn y byd go iawn sydd o ddiddordeb i
+          chi.
         real_and_current: bodoli'n go iawn ac yn gyfoes
         off_the_map_html: '%{doesnt} cynnwys barn defnyddwyr fel sgoriau, nodweddion
           hanesyddol neu dybiedig, a data o ffynonellau o dan hawlfraint. Oni bai
           bod gennych chi ganiatâd arbennig, peidiwch â chopio o fapiau ar-lein neu
           ar bapur.'
-        doesnt: Nad yw'n
+        doesnt: Nid yw'n
       basic_terms:
         title: Termau Syml ar gyfer Mapio
-        paragraph_1: Mae gan OpenStreetMap rywfaint o dafodiaith ei hun. Dyma ychydig
-          o eiriau allweddol a fydd yn ddefnyddiol ichi.
+        paragraph_1: Mae gan OpenStreetMap rywfaint o dafodiaith ei hun. Dyma rai
+          geiriau allweddol a fydd yn ddefnyddiol.
         an_editor_html: Mae %{editor} yn rhaglen neu wefan y gallwch chi ei defnyddio
           i olygu'r map.
         a_node_html: Mae %{node} yn bwynt ar y map, fel bwyty neu goeden.
@@ -2602,7 +2652,7 @@ cy:
         way: llwybr
         tag: tag
       rules:
-        title: Rheolau!
+        title: Y rheolau!
         para_1_html: Nid oes llawer o reolau safonol ar OpenStreetMap ond rydym yn
           disgwyl i bawb gydweithio a chyfathrebu â'r gymuned. Os ydych chi'n bwriadu
           gwneud unrhyw weithgareddau yn wahanol i olygu â llaw, darllenwch a dilynwch
@@ -2610,11 +2660,14 @@ cy:
         imports: Fewnforio
         automated_edits: Golygiadau Awtomatig
       start_mapping: Dechrau Mapio
-      continue_authorization: Parhau Awdurdodi
+      continue_authorization: Parhau i Awdurdodi
     add_a_note:
       title: Dim amser i olygu? Ychwanegwch nodyn!
       para_1: Os ydych chi eisiau trwsio rhywbeth bach ond nad oes amser i gofrestru
         a dysgu sut i olygu, mae'n mor hawdd ychwanegu nodyn.
+      para_2_html: |-
+        Cliciwch ar y %{note_icon} neu'r un eicon ar y %{map_link}. Bydd hyn yn ychwanegu marciwr at y map, y gallwch ei symud drwy lusgo.
+        Ysgrifennwch eich neges a chliciwch 'Cadw', a bydd mapwyr eraill yn gweithio arni.
       the_map: map
     communities:
       title: Cymunedau
@@ -2639,6 +2692,9 @@ cy:
           Nid oes rhaid sefydlu grŵp ffurfiol yn yr un modd â'r Siapteri Lleol.
           Mae llawer o grwpiau llwyddiannus yn bodoli fel grwpiau anffurfiol neu fel grŵp cymunedol. Gall unrhyw un ddechrau neu ymuno â grwp. Darllenwch fwy ar y %{communities_wiki_link}.
         communities_wiki: dudalen wici Cymunedau
+  social_links:
+    show:
+      website: gwefan
   layers_panes:
     show:
       map_notes_zoom_in_tooltip: Chwyddwch mewn i weld nodiadau'r map
@@ -3049,18 +3105,6 @@ cy:
       created from: 'Crëwyd o:'
       status: 'Statws:'
       spam score: 'Sgôr Sbam:'
-      role:
-        administrator: Mae'r defnyddiwr hwn yn weinyddwr.
-        moderator: Mae'r defnyddiwr hwn yn gymedrolwr.
-        importer: Mae'r defnyddiwr hwn yn fewnforiwr
-        grant:
-          administrator: Rhoi statws gweinyddwr
-          moderator: Rhoi statws cymedrolwr
-          importer: Rhoi statws mewnforiwr
-        revoke:
-          administrator: Tynnu statws gweinyddwr
-          moderator: Tynnu statws cymedrolwr
-          importer: Tynnu statws mewnforiwr
       block_history: Blociau Gweithredol
       moderator_history: Blociau a roddwyd
       revoke_all_blocks: Dirymu pob bloc
@@ -3154,7 +3198,7 @@ cy:
         summary_no_ip_html: '%{name} wedi''i greu ar %{date}'
     comments:
       index:
-        heading_html: Sylwadau %{user}
+        heading_html: Sylwadau gan %{user}
         changesets: Grwpiau newid
         diary_entries: Cofnodion Dyddiadur
         no_comments: Dim sylwadau
@@ -3188,10 +3232,21 @@ cy:
       heading: Nid yw eich ID yn gysylltiedig â chyfrif OpenStreetMap eto.
       option_1: "Os ydych yn newydd i OpenStreetMap, crëwch \ngyfrif newydd\ngan ddefnyddio'r
         ffurflen isod."
-  user_role:
-    grant:
-      are_you_sure: Ydych chi'n siŵr eich bod am roi'r rôl '%{role}' i'r defnyddiwr
-        '%{name}'?
+    role_icons:
+      title:
+        administrator: Mae'r defnyddiwr hwn yn weinyddwr.
+        moderator: Mae'r defnyddiwr hwn yn gymedrolwr.
+        importer: Mae'r defnyddiwr hwn yn fewnforiwr
+      grant:
+        administrator: Rhoi statws gweinyddwr
+        moderator: Rhoi statws cymedrolwr
+        importer: Rhoi statws mewnforiwr
+        are_you_sure: Ydych chi'n siŵr eich bod am roi'r rôl '%{role}' i'r defnyddiwr
+          '%{name}'?
+      revoke:
+        administrator: Tynnu statws gweinyddwr
+        moderator: Tynnu statws cymedrolwr
+        importer: Tynnu statws mewnforiwr
   user_blocks:
     model:
       non_moderator_update: Rhaid bod yn gymedrolwr i greu neu ddiweddaru bloc.
@@ -3209,6 +3264,8 @@ cy:
       flash: Wedi creu bloc ar ddefnyddiwr %{name}.
     update:
       only_creator_can_edit: Dim ond y cymedrolwr a grëodd y bloc hwn all ei olygu.
+      only_creator_or_revoker_can_edit: Dim ond y cymedrolwyr a greodd neu a dynodd
+        y bloc hwn all ei olygu.
       inactive_block_cannot_be_reactivated: Mae'r bloc hwn yn anweithredol ac ni ellir
         ei ail-weithredu.
       success: Bloc wedi'i ddiweddaru.
@@ -3447,6 +3504,8 @@ cy:
         transport_map: Map Trafnidiaeth
         tracestracktop_topo: Tracestrack Topo
         hot: Dyngarol
+        shortbread: Shortbread
+        openmaptiles_osm: MapTiler OMT
       layers:
         header: Haenau Map
         notes: Nodiadau Map
@@ -3464,6 +3523,9 @@ cy:
       tracestrack_credit: Teils trwy garedigrwydd %{tracestrack_link}
       hotosm_credit: Arddull teils gan %{hotosm_link} a gynhelir gan %{osm_france_link}
       hotosm_name: Tîm Dyngarol OpenStreetMap
+      openmaptiles_credit: Teils fector o %{openmaptiles_link} wedi'u cynnal gan %{maptiler_link}
+      openmaptiles_name: OpenMapTiles
+      maptiler_name: MapTiler
     site:
       edit_tooltip: Golygu'r map
       edit_disabled_tooltip: Chwyddwch mewn i olygu'r map
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 79e30e85f..90441c5a1 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -3144,18 +3144,6 @@ da:
       created from: 'Oprettet fra:'
       status: 'Status:'
       spam score: 'Spambedømmelse:'
-      role:
-        administrator: Denne bruger er en administrator
-        moderator: Denne bruger er en moderator
-        importer: Denne bruger er en importør
-        grant:
-          administrator: Giv administrator-adgang
-          moderator: Giv moderator-adgang
-          importer: Tildel adgang til at importere
-        revoke:
-          administrator: Fjern administrator-adgang
-          moderator: Fjern moderator-adgang
-          importer: Tilbagetræk adgang til at importere
       block_history: Aktive blokeringer
       moderator_history: Uddelte blokeringer
       revoke_all_blocks: Træk blokering tilbage
@@ -3279,6 +3267,23 @@ da:
         Hvis du allerede har en konto, kan du logge på din konto
         ved hjælp af dit brugernavn og adgangskode og derefter knytte den konto
         med dit ID i dine brugerindstillinger.
+    role_icons:
+      title:
+        administrator: Denne bruger er en administrator
+        moderator: Denne bruger er en moderator
+        importer: Denne bruger er en importør
+      grant:
+        administrator: Giv administrator-adgang
+        moderator: Giv moderator-adgang
+        importer: Tildel adgang til at importere
+        are_you_sure: Er du sikker på, du vil tildele rollen '%{role}' til brugeren
+          '%{name}'?
+      revoke:
+        administrator: Fjern administrator-adgang
+        moderator: Fjern moderator-adgang
+        importer: Tilbagetræk adgang til at importere
+        are_you_sure: Er du sikker på, du vil fratage rollen "%{role}" fra brugeren
+          "%{name}"?
   user_role:
     filter:
       not_a_role: Strengen "%{role}" er ikke en gyldig rolle.
@@ -3286,12 +3291,6 @@ da:
       doesnt_have_role: Brugeren har ikke rollen %{role}.
       not_revoke_admin_current_user: Kan ikke trække administratorrollen tilbage fra
         nuværende bruger.
-    grant:
-      are_you_sure: Er du sikker på, du vil tildele rollen '%{role}' til brugeren
-        '%{name}'?
-    revoke:
-      are_you_sure: Er du sikker på, du vil fratage rollen "%{role}" fra brugeren
-        "%{name}"?
   user_blocks:
     model:
       non_moderator_update: Skal være en moderator for at oprette eller opdatere en
@@ -3544,6 +3543,7 @@ da:
       tracestrack_credit: Kortfliser stillet til rådighed af %{tracestrack_link}
       hotosm_credit: Kortflise-stil af %{hotosm_link} hostet af %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team
+      openmaptiles_credit: Vektorfliser fra %{openmaptiles_link} hostet af %{maptiler_link}
     site:
       edit_tooltip: Rediger kortet
       edit_disabled_tooltip: Zoom ind for at redigere kortet
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 17851e9f1..ca2bc87c9 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3305,18 +3305,6 @@ de:
       created from: 'erstellt aus:'
       status: 'Status:'
       spam score: 'Spam-Bewertung:'
-      role:
-        administrator: Dieser Benutzer ist ein Administrator
-        moderator: Dieser Benutzer ist ein Moderator
-        importer: Dieser Benutzer ist ein Importeur
-        grant:
-          administrator: Administrator-Rechte vergeben
-          moderator: Moderator-Rechte vergeben
-          importer: Importeurzugriff genehmigne
-        revoke:
-          administrator: Administrator-Rechte entziehen
-          moderator: Moderator-Rechte entziehen
-          importer: Importeurzugriff aufheben
       block_history: Aktive Sperren
       moderator_history: Vergebene Sperren
       revoke_all_blocks: Alle Sperren aufheben
@@ -3441,6 +3429,23 @@ de:
         Falls du bereits ein Benutzerkonto hast, kannst du dich bei deinem Konto
         mithilfe deines Benutzernamens und Passwortes anmelden und dann das Benutzerkonto
         mit deiner ID in deinen Benutzereinstellungen verknüpfen.
+    role_icons:
+      title:
+        administrator: Dieser Benutzer ist ein Administrator
+        moderator: Dieser Benutzer ist ein Moderator
+        importer: Dieser Benutzer ist ein Importeur
+      grant:
+        administrator: Administrator-Rechte vergeben
+        moderator: Moderator-Rechte vergeben
+        importer: Importeurzugriff genehmigne
+        are_you_sure: Bist du sicher, dass du Benutzer „%{name}“ der Rolle „%{role}“
+          zuordnen möchtest?
+      revoke:
+        administrator: Administrator-Rechte entziehen
+        moderator: Moderator-Rechte entziehen
+        importer: Importeurzugriff aufheben
+        are_you_sure: Bist du sicher, dass du die Zuordnung von Benutzer „%{name}“
+          zur Rolle „%{role}“ aufheben willst?
   user_role:
     filter:
       not_a_role: Der String „%{role}“ bezeichnet keine gültige Rolle.
@@ -3448,12 +3453,6 @@ de:
       doesnt_have_role: Der Nutzer gehört nicht der Rolle %{role} an.
       not_revoke_admin_current_user: Die Administratorrolle kann nicht dem aktuellen
         Benutzer entzogen werden.
-    grant:
-      are_you_sure: Bist du sicher, dass du Benutzer „%{name}“ der Rolle „%{role}“
-        zuordnen möchtest?
-    revoke:
-      are_you_sure: Bist du sicher, dass du die Zuordnung von Benutzer „%{name}“ zur
-        Rolle „%{role}“ aufheben willst?
   user_blocks:
     model:
       non_moderator_update: Du musst Moderator sein, um eine Sperre einzurichten oder
@@ -3708,6 +3707,7 @@ de:
       tracestrack_credit: Kacheln mit freundlicher Genehmigung von %{tracestrack_link}
       hotosm_credit: Kachelstil von %{hotosm_link}, gehostet von %{osm_france_link}
       hotosm_name: Humanitäres OpenStreetMap Team
+      openmaptiles_credit: Vektorkacheln von %{openmaptiles_link}, gehostet von %{maptiler_link}
     site:
       edit_tooltip: Karte bearbeiten
       edit_disabled_tooltip: Zum Bearbeiten muss eine höhere Zoomstufe gewählt werden
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index fa6f79316..bf19b2832 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -1023,15 +1023,6 @@ diq:
       email address: 'Adresa e-postey:'
       created from: 'Vıraşten ra:'
       status: 'Weziyet:'
-      role:
-        administrator: No karber idarekaro
-        moderator: No karber yew moderatoro
-        grant:
-          administrator: Hesabê adminisrator de gırdi
-          moderator: Hesabê moderator de gırdi
-        revoke:
-          administrator: Hesabê adminisratori terkne
-          moderator: Hesabê moderatori terkne
       block_history: kılitkerdışê gırewtey
       moderator_history: Bloqanê cı bıgi re
       comments: Mışewreyi
@@ -1076,6 +1067,16 @@ diq:
     suspended:
       title: Hesab Darideyo
       heading: Hesab Darideyo
+    role_icons:
+      title:
+        administrator: No karber idarekaro
+        moderator: No karber yew moderatoro
+      grant:
+        administrator: Hesabê adminisrator de gırdi
+        moderator: Hesabê moderator de gırdi
+      revoke:
+        administrator: Hesabê adminisratori terkne
+        moderator: Hesabê moderatori terkne
   user_blocks:
     new:
       title: '%{name}i rê blok vırazeno.'
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index b7049288f..573cbcdb4 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1426,15 +1426,6 @@ dsb:
       created from: 'Napórany z:'
       status: 'Status:'
       spam score: 'Spamowe gódnośenje:'
-      role:
-        administrator: Toś ten wužywaŕ jo administrator
-        moderator: Toś ten wužywaŕ jo moderator
-        grant:
-          administrator: Pšawo administratora rozdaś
-          moderator: Pšawo moderatora rozdaś
-        revoke:
-          administrator: Pšawo administratora zajmjeś
-          moderator: Pšawo moderatora zajmjeś
       block_history: dostane blokěrowanja
       moderator_history: Rozdane blokěrowanja
       comments: Komentary
@@ -1478,15 +1469,23 @@ dsb:
     suspended:
       title: Konto wupowěźone
       heading: Konto wupowěźone
+    role_icons:
+      title:
+        administrator: Toś ten wužywaŕ jo administrator
+        moderator: Toś ten wužywaŕ jo moderator
+      grant:
+        administrator: Pšawo administratora rozdaś
+        moderator: Pšawo moderatora rozdaś
+        are_you_sure: Coš napšawdu wužywarjeju "%{name}" rolu "%{role}" daś?
+      revoke:
+        administrator: Pšawo administratora zajmjeś
+        moderator: Pšawo moderatora zajmjeś
+        are_you_sure: Coš napšawdu wužywarjeju "%{name}" rolu "%{role}" zajmjeś?
   user_role:
     filter:
       not_a_role: Znamuškowy rjeśazk "%{role}" njejo płaśiwa rola.
       already_has_role: Wužywaŕ ma južo rolu %{role}.
       doesnt_have_role: Wužywaŕ njama rolu %{role}.
-    grant:
-      are_you_sure: Coš napšawdu wužywarjeju "%{name}" rolu "%{role}" daś?
-    revoke:
-      are_you_sure: Coš napšawdu wužywarjeju "%{name}" rolu "%{role}" zajmjeś?
   user_blocks:
     model:
       non_moderator_update: Musy moderator byś, aby blokěrowanje wuźělił abo aktualizěrował.
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 3cada1b3f..f2f3f7df6 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2361,9 +2361,12 @@ el:
         και πολλά άλλα.
         Για να μάθετε περισσότερα σχετικά με την κοινότητα, δείτε στο %{osm_blog_link}, %{user_diaries_link}, %{community_blogs_link} και στο %{osm_foundation_link}.
       community_driven_osm_blog: Ιστολόγιο OpenStreetMap
+      community_driven_osm_blog_url: https://blog.openstreetmap.org
       community_driven_user_diaries: ημερολόγια χρηστών
       community_driven_community_blogs: ιστολόγια κοινότητας
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
       community_driven_osm_foundation: Ίδρυμα OSM
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
       open_data_title: Ανοικτά Δεδομένα
       open_data_1_html: 'Το OpenStreetMap είναι %{open_data}: είστε ελεύθεροι να τα
         χρησιμοποιήστε για οποιονδήποτε σκοπό, εφόσον μνημονεύετε το OpenStreetMap
@@ -2378,16 +2381,22 @@ el:
         Η χρήση όλων των υπηρεσιών που διαχειρίζεται το OSMF υπόκειται στους %{terms_of_use_link}
         μας, στις %{aup_link} και στην %{privacy_policy_link} μας.
       legal_1_1_openstreetmap_foundation: Ίδρυμα OpenStreetMap
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
       legal_1_1_terms_of_use: Όρους Χρήσης
+      legal_1_1_terms_of_use_url: https://osmfoundation.org/wiki/Terms_of_Use
       legal_1_1_aup: Πολιτικές Αποδεκτής Χρήσης
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
       legal_1_1_privacy_policy: Πολιτική Απορρήτου
+      legal_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
       legal_2_1_html: |-
         Παρακαλούμε %{contact_the_osmf_link}
         εάν έχετε ερωτήσεις για αδειοδότηση, πνευματικά δικαιώματα ή άλλα νομικά.
       legal_2_1_contact_the_osmf: επικοινωνήστε με το OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
       legal_2_2_html: Το OpenStreetMap, το λογότυπο με τον μεγεθυντικό φακό και το
         State of the Map είναι %{registered_trademarks_link}.
       legal_2_2_registered_trademarks: εγγεγραμμένα εμπορικά σήματα του OSMF
+      legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
       partners_title: Συνεργάτες
     copyright:
       title: Πνευματικά δικαιώματα και άδεια χρήσης
@@ -3245,18 +3254,6 @@ el:
       created from: 'Δημιουργήθηκε από:'
       status: 'Κατάσταση:'
       spam score: 'Σκορ Spam:'
-      role:
-        administrator: Αυτός ο χρήστης είναι διαχειριστής
-        moderator: Αυτός ο χρήστης είναι συντονιστής
-        importer: Αυτός ο χρήστης είναι εισαγωγέας
-        grant:
-          administrator: Χορήγηση πρόσβασης διαχειριστή
-          moderator: Χορήγηση πρόσβασης συντονιστή
-          importer: Χορήγηση πρόσβασης εισαγωγέα
-        revoke:
-          administrator: Ανακαλέστε την πρόσβαση διαχειριστή
-          moderator: Ανάκληση πρόσβασης συντονιστή
-          importer: Ανάκληση πρόσβασης εισαγωγέα
       block_history: Ενεργές φραγές
       moderator_history: Φραγές που επιβλήθηκαν
       revoke_all_blocks: Ανάκληση όλων των φραγών
@@ -3379,6 +3376,22 @@ el:
       option_2: Αν έχετε ήδη λογαριασμό, μπορείτε να συνδεθείτε στον λογαριασμό σας
         χρησιμοποιώντας το όνομα χρήστη και τον κωδικό πρόσβασης και, στη συνέχεια,
         να συσχετίσετε τον λογαριασμό με το ID σας στις ρυθμίσεις χρήστη.
+    role_icons:
+      title:
+        administrator: Αυτός ο χρήστης είναι διαχειριστής
+        moderator: Αυτός ο χρήστης είναι συντονιστής
+        importer: Αυτός ο χρήστης είναι εισαγωγέας
+      grant:
+        administrator: Χορήγηση πρόσβασης διαχειριστή
+        moderator: Χορήγηση πρόσβασης συντονιστή
+        importer: Χορήγηση πρόσβασης εισαγωγέα
+        are_you_sure: Σίγουρα θέλετε να εκχωρήσετε το ρόλο «%{role}» στον χρήστη «%{name}»;
+      revoke:
+        administrator: Ανακαλέστε την πρόσβαση διαχειριστή
+        moderator: Ανάκληση πρόσβασης συντονιστή
+        importer: Ανάκληση πρόσβασης εισαγωγέα
+        are_you_sure: Σίγουρα θέλετε να ανακαλέστε τον ρόλο «%{role}» από τον χρήστη
+          «%{name}»;
   user_role:
     filter:
       not_a_role: Η συμβολοσειρά '%{role}' δεν είναι ένας έγκυρος ρόλος.
@@ -3386,11 +3399,6 @@ el:
       doesnt_have_role: Ο χρήστης δεν έχει ρόλο %{role}.
       not_revoke_admin_current_user: Ο διαχειριστικός ρόλος δεν μπορεί να αναιρεθεί
         από τον τρέχοντα χρήστη.
-    grant:
-      are_you_sure: Σίγουρα θέλετε να εκχωρήσετε το ρόλο «%{role}» στον χρήστη «%{name}»;
-    revoke:
-      are_you_sure: Σίγουρα θέλετε να ανακαλέστε τον ρόλο «%{role}» από τον χρήστη
-        «%{name}»;
   user_blocks:
     model:
       non_moderator_update: Πρέπει να είστε συντονιστής για να δημιουργήσετε ή να
@@ -3628,6 +3636,8 @@ el:
         transport_map: Συγκοινωνία
         tracestracktop_topo: Tracetrack Topo
         hot: Ανθρωπιστικό
+        shortbread: Shortbread
+        openmaptiles_osm: MapTiler OMT
       layers:
         header: Επίπεδα χάρτη
         notes: Σημειώσεις χάρτη
@@ -3645,6 +3655,10 @@ el:
       tracestrack_credit: Πλακίδια ευγενική προσφορά του %{tracestrack_link}
       hotosm_credit: Στυλ πλακιδίων από %{hotosm_link} φιλοξενημένο από %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team
+      openmaptiles_credit: Διανυσματικά πλακίδια από %{openmaptiles_link} που φιλοξενούνται
+        από %{maptiler_link}
+      openmaptiles_name: OpenMapTiles
+      maptiler_name: MapTiler
     site:
       edit_tooltip: Επεξεργασία του χάρτη
       edit_disabled_tooltip: Κάντε μεγέθυνση για να επεξεργαστείτε το χάρτη
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 07cf8efb8..11509784c 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1650,15 +1650,6 @@ en-GB:
       created from: 'Created from:'
       status: 'Status:'
       spam score: 'Spam Score:'
-      role:
-        administrator: This user is an administrator
-        moderator: This user is a moderator
-        grant:
-          administrator: Grant administrator access
-          moderator: Grant moderator access
-        revoke:
-          administrator: Revoke administrator access
-          moderator: Revoke moderator access
       block_history: Active Blocks
       moderator_history: Blocks Given
       comments: Comments
@@ -1710,6 +1701,16 @@ en-GB:
       option_1: |-
         If you are new to OpenStreetMap, please create a new account
         using the form below.
+    role_icons:
+      title:
+        administrator: This user is an administrator
+        moderator: This user is a moderator
+      grant:
+        administrator: Grant administrator access
+        moderator: Grant moderator access
+      revoke:
+        administrator: Revoke administrator access
+        moderator: Revoke moderator access
   user_role:
     filter:
       already_has_role: The user already has role %{role}.
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 6a95e9246..406c27e3c 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -3107,18 +3107,6 @@ eo:
       created from: 'Kreita de:'
       status: 'Stato:'
       spam score: 'Trudmesaĝa poentaro:'
-      role:
-        administrator: Ĉi tiu uzanto estas administranto
-        moderator: Ĉi tiu uzanto estas kontrolanto
-        importer: Tiu ĉi uzanto estas enportisto
-        grant:
-          administrator: Permesi aliron de administranto
-          moderator: Permesi aliron de kontrolanto
-          importer: Permesi aliron de enportisto
-        revoke:
-          administrator: Nuligi aliron de administranto
-          moderator: Nuligi aliron de kontrolanto
-          importer: Nuligi aliron de enportisto
       block_history: Blokadoj aktivaj
       moderator_history: Blokadoj eldonitaj
       revoke_all_blocks: Nuligi ĉiujn blokadojn
@@ -3235,6 +3223,21 @@ eo:
         la jena formularo.
       option_2: Se vi jam havas konton, vi povas ensaluti per viaj uzantnomo kaj pasvorto,
         kaj poste kunligi la konton kun via identigilo en agordoj de uzanto.
+    role_icons:
+      title:
+        administrator: Ĉi tiu uzanto estas administranto
+        moderator: Ĉi tiu uzanto estas kontrolanto
+        importer: Tiu ĉi uzanto estas enportisto
+      grant:
+        administrator: Permesi aliron de administranto
+        moderator: Permesi aliron de kontrolanto
+        importer: Permesi aliron de enportisto
+        are_you_sure: Ĉu vi certe volas doni la rolon '%{role}' al la uzanto '%{name}'?
+      revoke:
+        administrator: Nuligi aliron de administranto
+        moderator: Nuligi aliron de kontrolanto
+        importer: Nuligi aliron de enportisto
+        are_you_sure: Ĉu vi certe volas nuligi la rolon '%{role}' de la uzanto '%{name}'?
   user_role:
     filter:
       not_a_role: La ĉeno '%{role}' ne estas ĝusta rolo.
@@ -3242,10 +3245,6 @@ eo:
       doesnt_have_role: La uzanto ne rolas %{role}.
       not_revoke_admin_current_user: Ne povas nuligi rolon de administranto de nuna
         uzanto.
-    grant:
-      are_you_sure: Ĉu vi certe volas doni la rolon '%{role}' al la uzanto '%{name}'?
-    revoke:
-      are_you_sure: Ĉu vi certe volas nuligi la rolon '%{role}' de la uzanto '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Vi devas esti kontrolanto por doni aŭ ĝisdatigi blokadon.
@@ -3493,6 +3492,7 @@ eo:
       tracestrack_credit: Kaheloj danke al %{tracestrack_link}
       hotosm_credit: 'Stilo de kaheloj: %{hotosm_link}, retgastigo: %{osm_france_link}'
       hotosm_name: HOTOSM
+      openmaptiles_credit: Vektoraj kaheloj %{openmaptiles_link} gastigataj de %{maptiler_link}
     site:
       edit_tooltip: Redakti la mapon
       edit_disabled_tooltip: Pligrandigu por redakti la mapon
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a62894383..ef989d049 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -3231,18 +3231,6 @@ es:
       created from: 'Creado a partir de:'
       status: 'Estado:'
       spam score: 'Puntuación de spam:'
-      role:
-        administrator: Este usuario es un administrador
-        moderator: Este usuario es un moderador
-        importer: Este usuario es un importador
-        grant:
-          administrator: Otorgar acceso de administrador
-          moderator: Adjudicar acceso de moderador
-          importer: Otorgar acceso importador
-        revoke:
-          administrator: Revocar acceso de administrador
-          moderator: Revocar acceso de moderador
-          importer: Revocar el acceso importador
       block_history: Bloqueos activos
       moderator_history: Bloqueos impuestos
       revoke_all_blocks: Revocar todos los bloqueos
@@ -3358,6 +3346,23 @@ es:
         Si ya tienes una cuenta, puedes iniciar sesión con tu cuenta
         usando tu nombre de usuario y contraseña y luego asociar la cuenta
         con tu identificador en tus configuraciones de usuario.
+    role_icons:
+      title:
+        administrator: Este usuario es un administrador
+        moderator: Este usuario es un moderador
+        importer: Este usuario es un importador
+      grant:
+        administrator: Otorgar acceso de administrador
+        moderator: Adjudicar acceso de moderador
+        importer: Otorgar acceso importador
+        are_you_sure: ¿Estás seguro de que deseas otorgar el rol '%{role}' al usuario
+          '%{name}'?
+      revoke:
+        administrator: Revocar acceso de administrador
+        moderator: Revocar acceso de moderador
+        importer: Revocar el acceso importador
+        are_you_sure: ¿Estás seguro de que quieres revocar el papel '%{role}' del
+          usuario '%{name}'?
   user_role:
     filter:
       not_a_role: La cadena '%{role}' no es un rol válido.
@@ -3365,12 +3370,6 @@ es:
       doesnt_have_role: El usuario no tiene el rol %{role}.
       not_revoke_admin_current_user: No se pudo revocar el rol de administrador del
         usuario actual.
-    grant:
-      are_you_sure: ¿Estás seguro de que deseas otorgar el rol '%{role}' al usuario
-        '%{name}'?
-    revoke:
-      are_you_sure: ¿Estás seguro de que quieres revocar el papel '%{role}' del usuario
-        '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Debes ser un moderador para poder crear o actualizar un
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 4fa809025..49e527f81 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -2807,16 +2807,6 @@ et:
       created from: 'Loodud:'
       status: 'Staatus:'
       spam score: 'Rämpsposti tulemus:'
-      role:
-        administrator: See kasutaja on administraator
-        moderator: See kasutaja on moderaator
-        importer: See kasutaja on importija
-        grant:
-          administrator: Määra administraatori õigused
-          moderator: Määra moderaatori õigused
-        revoke:
-          administrator: Eemalda administraatori õigused
-          moderator: Eemalda moderaatori õigused
       block_history: Aktiivsed blokeeringud
       moderator_history: Seatud blokeeringud
       comments: Kommentaarid
@@ -2902,16 +2892,25 @@ et:
         täites allpool oleva vormi.
       option_2: Kui sul juba on kasutajakonto, saad sisse logida, kasutades oma kasutajanime
         ja parooli ning siduda seejärel kasutajasätetes konto oma ID-ga.
+    role_icons:
+      title:
+        administrator: See kasutaja on administraator
+        moderator: See kasutaja on moderaator
+        importer: See kasutaja on importija
+      grant:
+        administrator: Määra administraatori õigused
+        moderator: Määra moderaatori õigused
+        are_you_sure: Kas oled kindel, et soovid anda rolli '%{role}' kasutajale '%{name}'?
+      revoke:
+        administrator: Eemalda administraatori õigused
+        moderator: Eemalda moderaatori õigused
+        are_you_sure: Kas oled kindel, et soovid tühistada kasutaja '%{name}' rolli
+          '%{role}'?
   user_role:
     filter:
       not_a_role: String '%{role}' ei ole kehtiv roll.
       already_has_role: Kasutajal on juba roll %{role}.
       doesnt_have_role: Kasutajal ei ole rolli %{role}.
-    grant:
-      are_you_sure: Kas oled kindel, et soovid anda rolli '%{role}' kasutajale '%{name}'?
-    revoke:
-      are_you_sure: Kas oled kindel, et soovid tühistada kasutaja '%{name}' rolli
-        '%{role}'?
   user_blocks:
     model:
       non_moderator_update: Blokeeringu loomiseks või uuendamiseks pead olema moderaator.
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index c9c5392f7..4a6168dc5 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2535,15 +2535,6 @@ eu:
       created from: 'Hemendik sortua:'
       status: 'Egoera:'
       spam score: 'Spam Puntuazioa:'
-      role:
-        administrator: Lankide hau administratzailea da
-        moderator: Lankide hau moderatzailea da
-        grant:
-          administrator: Eman administratzaile sarbidea
-          moderator: Eman moderadorearen sarbidea
-        revoke:
-          administrator: Kendu administratzaile sarbidea
-          moderator: Kendu moderatzaile sarbidea
       block_history: Blokeo Aktiboak
       moderator_history: Emandako Blokeoak
       comments: Iruzkinak
@@ -2614,6 +2605,18 @@ eu:
         Kontua baduzu dagoeneko, zure kontuan saioa has dezakezu
         zure erabiltzaile-izena eta pasahitza erabiliz eta kontua lotu
         zure IDarekin zure erabiltzaileen ezarpenekin.
+    role_icons:
+      title:
+        administrator: Lankide hau administratzailea da
+        moderator: Lankide hau moderatzailea da
+      grant:
+        administrator: Eman administratzaile sarbidea
+        moderator: Eman moderadorearen sarbidea
+        are_you_sure: Ziur zaude `%{role}' rola eman nahi diozula`%{name}' erabiltzaileari?
+      revoke:
+        administrator: Kendu administratzaile sarbidea
+        moderator: Kendu moderatzaile sarbidea
+        are_you_sure: Ziur zaude `%{role}' rola kendu nahi diozula`%{name}' erabiltzaileari?
   user_role:
     filter:
       not_a_role: '''%{role}'' katea ez da baliozko rola.'
@@ -2621,10 +2624,6 @@ eu:
       doesnt_have_role: Erabiltzaileak ez dauka %{role} rolik.
       not_revoke_admin_current_user: Ezin da administratzaile rola uneko erabiltzaileari
         errebokatu.
-    grant:
-      are_you_sure: Ziur zaude `%{role}' rola eman nahi diozula`%{name}' erabiltzaileari?
-    revoke:
-      are_you_sure: Ziur zaude `%{role}' rola kendu nahi diozula`%{name}' erabiltzaileari?
   user_blocks:
     model:
       non_moderator_update: Moderatzailea izan behar du blokeo bat sortu edo eguneratzeko.
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index cdaebd361..f1ae13dc5 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -2332,15 +2332,6 @@ fa:
       created from: 'ایجادشده از:'
       status: 'وضعیت:'
       spam score: 'رتبهٔ هرزنگاری:'
-      role:
-        administrator: این کاربر مدیر است
-        moderator: این کاربر ناظم است
-        grant:
-          administrator: اعطای دسترسی مدیر
-          moderator: اعطای دسترسی ناظم
-        revoke:
-          administrator: ابطال دسترسی مدیر
-          moderator: ابطال دسترسی ناظم
       block_history: مسدودی‌های فعال
       moderator_history: مسدودسازی‌ها
       comments: نظرات
@@ -2418,18 +2409,26 @@ fa:
       option_2: اگر از قبل حسابی دارید، شما می‌توانید با استفاده از نام کاربری و رمز
         عبورتان وارد شوید و سپس در قسمت تنظیمات کاربریتان، حساب خود را به شناسهٔ خود
         متصل کنید.
+    role_icons:
+      title:
+        administrator: این کاربر مدیر است
+        moderator: این کاربر ناظم است
+      grant:
+        administrator: اعطای دسترسی مدیر
+        moderator: اعطای دسترسی ناظم
+        are_you_sure: آیا اطمینان دارید که می‌خواهید نقش '%{role}' را به کاربر '%{name}'
+          اعطا  کنید؟
+      revoke:
+        administrator: ابطال دسترسی مدیر
+        moderator: ابطال دسترسی ناظم
+        are_you_sure: آیا اطمینان دارید که می‌خواهید نقش `%{role}' را برای کاربر '%{name}'
+          باطل نمایید؟
   user_role:
     filter:
       not_a_role: رشتهٔ '%{role}' نقش معتبری نیست.
       already_has_role: کاربر در حال حاضر نقش %{role} دارد.
       doesnt_have_role: کاربر نقش %{role} را ندارد.
       not_revoke_admin_current_user: امکان ابطال نقش مدیر برای کاربر جاری وجود ندارد.
-    grant:
-      are_you_sure: آیا اطمینان دارید که می‌خواهید نقش '%{role}' را به کاربر '%{name}'
-        اعطا  کنید؟
-    revoke:
-      are_you_sure: آیا اطمینان دارید که می‌خواهید نقش `%{role}' را برای کاربر '%{name}'
-        باطل نمایید؟
   user_blocks:
     model:
       non_moderator_update: برای ایجاد یا روزآمدسازیِ یک مسدودی باید ناظم باشید.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index da1d5e5e0..f1474b6ae 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2814,15 +2814,6 @@ fi:
       created from: 'Tekijä:'
       status: 'Tila:'
       spam score: 'Spam-pisteet:'
-      role:
-        administrator: Tämä käyttäjä on ylläpitäjä.
-        moderator: Tämä käyttäjä on moderaattori.
-        grant:
-          administrator: Myönnä ylläpitäjän oikeudet
-          moderator: Myönnä moderaattorin oikeudet
-        revoke:
-          administrator: Poista ylläpitäjän oikeudet
-          moderator: Poista moderaattorin oikeudet
       block_history: Saadut estot
       moderator_history: Tehdyt estot
       comments: Kommentit
@@ -2920,6 +2911,18 @@ fi:
       option_1: 'Uusi OpenStreetMapin käyttäjä: luo käyttäjätunnus tällä lomakkeella.'
       option_2: 'Nykyinen OpenStreetMapin käyttäjä: kirjaudu sisään käyttäjätunnuksella
         ja salasanalla ja yhdistä tili käyttäjäasetuksissa.'
+    role_icons:
+      title:
+        administrator: Tämä käyttäjä on ylläpitäjä.
+        moderator: Tämä käyttäjä on moderaattori.
+      grant:
+        administrator: Myönnä ylläpitäjän oikeudet
+        moderator: Myönnä moderaattorin oikeudet
+        are_you_sure: Haluatko varmasti lisätä käyttäjän ”%{name}” ryhmään ”%{role}”?
+      revoke:
+        administrator: Poista ylläpitäjän oikeudet
+        moderator: Poista moderaattorin oikeudet
+        are_you_sure: Haluatko varmasti poistaa käyttäjän ”%{name}” ryhmästä ”%{role}”?
   user_role:
     filter:
       not_a_role: Merkkijono '%{role}' ei ole kelvollinen rooli.
@@ -2927,10 +2930,6 @@ fi:
       doesnt_have_role: Käyttäjällä ei ole roolia %{role}.
       not_revoke_admin_current_user: Ei voida perua järjestelmänvalvojan roolia nykyiseltä
         käyttäjältä.
-    grant:
-      are_you_sure: Haluatko varmasti lisätä käyttäjän ”%{name}” ryhmään ”%{role}”?
-    revoke:
-      are_you_sure: Haluatko varmasti poistaa käyttäjän ”%{name}” ryhmästä ”%{role}”?
   user_blocks:
     model:
       non_moderator_update: Sinun on oltava moderaattori luodaksesi tai muokataksesi
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 469a83c6f..8ae86d24d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2451,9 +2451,12 @@ fr:
         La communauté d’OpenStreetMap est diverse, passionnée et grossit chaque jour. Nos contributeurs incluent des cartographes enthousiastes, des professionnels du SIG, des ingénieurs qui font fonctionner les serveurs d’OSM, des humanitaires cartographiant les zones dévastées par une catastrophe et beaucoup d’autres.
         Pour en savoir plus sur la communauté, consultez le %{osm_blog_link}, les %{user_diaries_link}, les %{community_blogs_link} et le site web de la %{osm_foundation_link}.
       community_driven_osm_blog: blogue d’OpenStreetMap
+      community_driven_osm_blog_url: https://blog.openstreetmap.org/?lang=fr
       community_driven_user_diaries: journaux d’utilisateurs
       community_driven_community_blogs: blogues de la communauté
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
       community_driven_osm_foundation: Fondation OSM
+      community_driven_osm_foundation_url: https://osmfoundation.org/
       open_data_title: Données libres
       open_data_1_html: 'OpenStreetMap est en %{open_data} : vous êtes libre de l’utiliser
         dans n’importe quel but tant que vous créditez OpenStreetMap et ses contributeurs.
@@ -2469,16 +2472,22 @@ fr:
         au nom de la communauté. L’utilisation de tous les services offerts par l’OSMF est sujette
         à nos %{terms_of_use_link}, à notre %{aup_link} et à notre %{privacy_policy_link}.
       legal_1_1_openstreetmap_foundation: Fondation OpenStreetMap
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
       legal_1_1_terms_of_use: Conditions d’utilisation
+      legal_1_1_terms_of_use_url: https://osmfoundation.org/wiki/Terms_of_Use
       legal_1_1_aup: Politique des usages acceptés
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
       legal_1_1_privacy_policy: Politique de confidentialité
+      legal_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
       legal_2_1_html: |-
         Veuillez %{contact_the_osmf_link}
         si vous avez des questions sur les conditions de licence, les droits d’auteur ou d’autres questions juridiques.
       legal_2_1_contact_the_osmf: contacter l’OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
       legal_2_2_html: OpenStreetMap, le logo avec la loupe, ainsi que State of the
         Map sont des %{registered_trademarks_link}.
       legal_2_2_registered_trademarks: marques commerciales enregistrées de l’OSMF
+      legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
       partners_title: Partenaires
     copyright:
       title: Droits d’auteur et licence
@@ -3353,18 +3362,6 @@ fr:
       created from: 'Créé depuis :'
       status: 'État :'
       spam score: 'Indice de pollution :'
-      role:
-        administrator: C’est un administrateur ou une administratrice
-        moderator: C’est un modérateur ou une modératrice
-        importer: C’est un importateur
-        grant:
-          administrator: Octroyer l’accès administrateur
-          moderator: Octroyer l’accès modérateur
-          importer: Octroyer le droit d’importation
-        revoke:
-          administrator: Révoquer l’accès administrateur
-          moderator: Révoquer l’accès modérateur
-          importer: Révoquer le droit d’importation
       block_history: Blocages actifs
       moderator_history: Blocages donnés
       revoke_all_blocks: Révoquer tous les blocages
@@ -3485,6 +3482,23 @@ fr:
       option_2: Si vous avez déjà un compte, vous pouvez vous y connecter avec en
         utilisant votre nom d’utilisateur et votre mot de passe, puis associer le
         compte avec votre identifiant dans vos préférences utilisateur.
+    role_icons:
+      title:
+        administrator: C’est un administrateur ou une administratrice
+        moderator: C’est un modérateur ou une modératrice
+        importer: C’est un importateur
+      grant:
+        administrator: Octroyer l’accès administrateur
+        moderator: Octroyer l’accès modérateur
+        importer: Octroyer le droit d’importation
+        are_you_sure: Êtes-vous sûr de vouloir octroyer le rôle « %{role} » à l’utilisateur
+          « %{name} » ?
+      revoke:
+        administrator: Révoquer l’accès administrateur
+        moderator: Révoquer l’accès modérateur
+        importer: Révoquer le droit d’importation
+        are_you_sure: Êtes-vous sûr de vouloir révoquer le rôle « %{role} » de l’utilisateur
+          « %{name} » ?
   user_role:
     filter:
       not_a_role: La chaîne « %{role} » n’est pas un rôle valide.
@@ -3492,12 +3506,6 @@ fr:
       doesnt_have_role: L’utilisateur n’a pas le rôle « %{role} ».
       not_revoke_admin_current_user: Impossible de retirer les droits d’administrateur
         pour l’utilisateur actuel.
-    grant:
-      are_you_sure: Êtes-vous sûr de vouloir octroyer le rôle « %{role} » à l’utilisateur
-        « %{name} » ?
-    revoke:
-      are_you_sure: Êtes-vous sûr de vouloir révoquer le rôle « %{role} » de l’utilisateur
-        « %{name} » ?
   user_blocks:
     model:
       non_moderator_update: Vous devez être modérateur pour créer ou modifier un blocage.
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index dd5407f98..e21099049 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1462,11 +1462,6 @@ fur:
       created from: 'Creât di:'
       status: 'Stât:'
       spam score: 'Ponts di spam:'
-      role:
-        administrator: Chest utent al è un aministradôr
-        moderator: Chest utent al è un moderatôr
-        revoke:
-          administrator: Revoche l'acès come aministradôr
       block_history: blocs ricevûts
       moderator_history: blocs aplicâts
       comments: Coments
@@ -1514,6 +1509,12 @@ fur:
       support: assistence
     auth_failure:
       unknown_error: Autenticazion falide
+    role_icons:
+      title:
+        administrator: Chest utent al è un aministradôr
+        moderator: Chest utent al è un moderatôr
+      revoke:
+        administrator: Revoche l'acès come aministradôr
   user_blocks:
     not_found:
       back: Torne al somari
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index e821c5640..82250fb4a 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -2233,15 +2233,6 @@ fy:
       created from: 'Oanmakke fan:'
       status: 'Status:'
       spam score: 'Spamskoare:'
-      role:
-        administrator: Dizze meidogger is behearder
-        moderator: Dizze meidogger is tafersjochhâlder
-        grant:
-          administrator: Behearder meitsje
-          moderator: Tafersjochhâlder meitsje
-        revoke:
-          administrator: Behearderskip ynlûke
-          moderator: Tafersjochhâlderskip ynlûke
       block_history: Rinnende útslutings
       moderator_history: Utslutings útdield
       comments: Reäksjes
@@ -2307,6 +2298,20 @@ fy:
         At jo al in akkount hawwe, kinne jo jo oanmelde op jo akkount
         mei jo meidochnamme en wachtwurd, en dan it akkount ferbine
         oan jo ID yn jo meidoggerynstellings.
+    role_icons:
+      title:
+        administrator: Dizze meidogger is behearder
+        moderator: Dizze meidogger is tafersjochhâlder
+      grant:
+        administrator: Behearder meitsje
+        moderator: Tafersjochhâlder meitsje
+        are_you_sure: Witte jo seker dat jo de rol fan '%{role}' oan 'e meidogger
+          '%{name}' takenne wolle?
+      revoke:
+        administrator: Behearderskip ynlûke
+        moderator: Tafersjochhâlderskip ynlûke
+        are_you_sure: Witte jo seker dat jo de rol fan '%{role}' fan 'e meidogger
+          '%{name}' ynlûke wolle?
   user_role:
     filter:
       not_a_role: De tekenrige '%{role}' is net in jildige rol.
@@ -2314,12 +2319,6 @@ fy:
       doesnt_have_role: De meidogger hat net de rol fan %{role}.
       not_revoke_admin_current_user: Kin de beheardersrol fan dizze meidogger net
         ynlûke.
-    grant:
-      are_you_sure: Witte jo seker dat jo de rol fan '%{role}' oan 'e meidogger '%{name}'
-        takenne wolle?
-    revoke:
-      are_you_sure: Witte jo seker dat jo de rol fan '%{role}' fan 'e meidogger '%{name}'
-        ynlûke wolle?
   user_blocks:
     model:
       non_moderator_update: Moat tafersjochhâlder wêze om in útsluting oanmeitsje
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 10e712970..980f11e35 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1663,9 +1663,6 @@ ga:
       created from: 'Cruthaithe ó:'
       status: 'Stádas:'
       spam score: 'Scór Turscair:'
-      role:
-        administrator: Is riarthóir é an t-úsáideoir seo
-        moderator: Is áisitheoir é an t-úsáideoir seo
       block_history: Baic Ghníomhacha
       moderator_history: Baic a Tugadh
       comments: 'Nótaí tráchta:'
@@ -1685,6 +1682,10 @@ ga:
     diary_comments:
       page:
         post: Postáil
+    role_icons:
+      title:
+        administrator: Is riarthóir é an t-úsáideoir seo
+        moderator: Is áisitheoir é an t-úsáideoir seo
   user_blocks:
     helper:
       block_duration:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index fb2d3f348..24cc0c21f 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1772,15 +1772,6 @@ gd:
       created from: 'Air a chruthachadh o:'
       status: 'Staid:'
       spam score: 'Sgòr spama:'
-      role:
-        administrator: '''S e rianaire a tha sa chleachdaiche seo'
-        moderator: '''S e maor a tha sa chleachdaiche seo'
-        grant:
-          administrator: Thoir seachad inntrigeadh rianaire
-          moderator: Thoir seachad inntrigeadh maoir
-        revoke:
-          administrator: Cùl-ghairm inntrigeadh rianaire
-          moderator: Cùl-ghairm inntrigeadh maoir
       block_history: Bacaidhean gnìomhach
       moderator_history: Bacaidhean air an toirt seachad
       comments: Beachdan
@@ -1828,17 +1819,25 @@ gd:
     auth_failure:
       connection_failed: Cha deach leinn ceangal ri solaraiche an dearbhaidh
       invalid_credentials: Tha an dàta-dearbhaidh mì-dhligheach
+    role_icons:
+      title:
+        administrator: '''S e rianaire a tha sa chleachdaiche seo'
+        moderator: '''S e maor a tha sa chleachdaiche seo'
+      grant:
+        administrator: Thoir seachad inntrigeadh rianaire
+        moderator: Thoir seachad inntrigeadh maoir
+        are_you_sure: A bheil thu cinnteach gu bheil thu airson an dreuchd "%{role}"
+          a thoirt dhan chleachdaiche "%{name}"?
+      revoke:
+        administrator: Cùl-ghairm inntrigeadh rianaire
+        moderator: Cùl-ghairm inntrigeadh maoir
+        are_you_sure: A bheil thu cinnteach gu bheil thu airson an dreuchd "%{role}"
+          a thoirt air falbh on chleachdaiche "%{name}"?
   user_role:
     filter:
       not_a_role: Chan eil an dreuchd "%{role}" 'na dreuchd dhligheach.
       already_has_role: Tha an dreuchd "%{role}" aig a' chleachdaiche mar-thà.
       doesnt_have_role: Chan eil an dreuchd "%{role}" aig a' chleachdaiche.
-    grant:
-      are_you_sure: A bheil thu cinnteach gu bheil thu airson an dreuchd "%{role}"
-        a thoirt dhan chleachdaiche "%{name}"?
-    revoke:
-      are_you_sure: A bheil thu cinnteach gu bheil thu airson an dreuchd "%{role}"
-        a thoirt air falbh on chleachdaiche "%{name}"?
   user_blocks:
     model:
       non_moderator_update: Feumaidh tu bhith 'nad mhaoir mus urrainn dhut bacadh
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 99f18cbdd..12fa57ce8 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2318,9 +2318,12 @@ gl:
         os %{user_diaries_link}, os %{community_blogs_link} e o
         sitio web da %{osm_foundation_link}.
       community_driven_osm_blog: blog do OpenStreetMap
+      community_driven_osm_blog_url: https://blog.openstreetmap.org/?lang=gl
       community_driven_user_diaries: diarios de usuario
       community_driven_community_blogs: blogs da comunidade
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
       community_driven_osm_foundation: Fundación OSM
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
       open_data_title: Datos libres
       open_data_1_html: |-
         Os datos do OpenStreetMap son %{open_data}: podes empregalos libremente e para calquera finalidade
@@ -2336,15 +2339,21 @@ gl:
         en nome da comunidade. O uso de todos os servizos operados pola OSMF está suxeito
         aos nosos %{terms_of_use_link}, ás nosas %{aup_link} e á nosa %{privacy_policy_link}.
       legal_1_1_openstreetmap_foundation: Fundación OpenStreetMap
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
       legal_1_1_terms_of_use: termos de uso
+      legal_1_1_terms_of_use_url: https://osmfoundation.org/wiki/Terms_of_Use
       legal_1_1_aup: políticas de uso aceptable
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
       legal_1_1_privacy_policy: política de protección de datos
+      legal_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
       legal_2_1_html: |-
         Por favor, %{contact_the_osmf_link}
         se tes dúbidas sobre as licenzas, os dereitos de autoría ou outras cuestións legais.
       legal_2_1_contact_the_osmf: contacta coa OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
       legal_2_2_html: OpenStreetMap, o logotipo da lupa e State of the Map son %{registered_trademarks_link}.
       legal_2_2_registered_trademarks: marcas rexistradas da OSMF
+      legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
       partners_title: Socios
     copyright:
       title: Dereitos de autoría e licenza
@@ -3194,18 +3203,6 @@ gl:
       created from: 'Creado a partir de:'
       status: 'Estado:'
       spam score: 'Puntuación do spam:'
-      role:
-        administrator: Este usuario é administrador
-        moderator: Este usuario é moderador
-        importer: Este usuario é importador
-        grant:
-          administrator: Conceder o acceso de administrador
-          moderator: Conceder o acceso de moderador
-          importer: Conceder o acceso de importador
-        revoke:
-          administrator: Revogar o acceso de administrador
-          moderator: Revogar o acceso de moderador
-          importer: Revogar o acceso de importador
       block_history: Bloqueos activos
       moderator_history: Bloqueos impostos
       revoke_all_blocks: Revogar todos os bloqueos
@@ -3326,6 +3323,21 @@ gl:
       option_2: Se xa tes unha conta, podes conectarte á túa conta empregando o teu
         nome de usuario e contrasinal, e despois asociar a conta co teu identificador
         nas túas preferencias de usuario.
+    role_icons:
+      title:
+        administrator: Este usuario é administrador
+        moderator: Este usuario é moderador
+        importer: Este usuario é importador
+      grant:
+        administrator: Conceder o acceso de administrador
+        moderator: Conceder o acceso de moderador
+        importer: Conceder o acceso de importador
+        are_you_sure: Queres concederlle o rol "%{role}" ó usuario "%{name}"?
+      revoke:
+        administrator: Revogar o acceso de administrador
+        moderator: Revogar o acceso de moderador
+        importer: Revogar o acceso de importador
+        are_you_sure: Queres quitarlle o rol "%{role}" ó usuario "%{name}"?
   user_role:
     filter:
       not_a_role: A cadea "%{role}" non é un rol correcto.
@@ -3333,10 +3345,6 @@ gl:
       doesnt_have_role: O usuario non ten o rol %{role}.
       not_revoke_admin_current_user: Non se puido revogar os dereitos de administrador
         do usuario actual.
-    grant:
-      are_you_sure: Queres concederlle o rol "%{role}" ó usuario "%{name}"?
-    revoke:
-      are_you_sure: Queres quitarlle o rol "%{role}" ó usuario "%{name}"?
   user_blocks:
     model:
       non_moderator_update: Cómpre ser moderador para crear ou actualizar un bloqueo.
@@ -3587,6 +3595,10 @@ gl:
       tracestrack_credit: Mosaicos cortesía de %{tracestrack_link}
       hotosm_credit: Estilo de mosaicos do %{hotosm_link} aloxado por %{osm_france_link}
       hotosm_name: equipo humanitario do OpenStreetMap
+      openmaptiles_credit: Mosaicos vectoriais de %{openmaptiles_link} aloxados por
+        %{maptiler_link}
+      openmaptiles_name: OpenMapTiles
+      maptiler_name: MapTiler
     site:
       edit_tooltip: Editar o mapa
       edit_disabled_tooltip: Achegue para editar o mapa
diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index 9e2de1614..965b9193d 100644
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -4,6 +4,7 @@
 # Author: Als-Chlämens
 # Author: Als-Holder
 # Author: Doktorpixel14
+# Author: Johannes 11
 ---
 gsw:
   helpers:
@@ -238,18 +239,26 @@ gsw:
     destroy:
       scheduled_for_deletion: Track, wu zum Lesche vorgsäh isch
   users:
+    show:
+      edits: Bearbeitige
+      notes: Charte Notize
     go_public:
       flash success: Alli Dyyni Bearbeitige sion jetz effetlig, un Du derfsch jetz
         Bearbeitige mache.
+    role_icons:
+      grant:
+        are_you_sure: Bisch sicher, ass Du dr Benutzer „%{name}“ dr Rolle „%{role}“
+          witt zueordne?
+      revoke:
+        are_you_sure: Bisch sicher, ass Du d Zueornig vum Benutzer „%{name}“ zue dr
+          Rolle „%{role}“ witt ufhebe?
   user_role:
     filter:
       not_a_role: D Zeichechette „%{role}“ bezeichnet kei giltigi Rolle.
       already_has_role: Dr Nutzer ghert scho zue dr Rolle %{role}.
       doesnt_have_role: Dr Nutzer het kei Roll %{role}.
-    grant:
-      are_you_sure: Bisch sicher, ass Du dr Benutzer „%{name}“ dr Rolle „%{role}“
-        witt zueordne?
-    revoke:
-      are_you_sure: Bisch sicher, ass Du d Zueornig vum Benutzer „%{name}“ zue dr
-        Rolle „%{role}“ witt ufhebe?
+  javascripts:
+    map:
+      layers:
+        notes: Charte Notize
 ...
diff --git a/config/locales/gu.yml b/config/locales/gu.yml
index ccfd7dba5..a043f3d6e 100644
--- a/config/locales/gu.yml
+++ b/config/locales/gu.yml
@@ -759,9 +759,6 @@ gu:
       uid: 'વપરાશકર્તા id:'
       email address: 'ઇમેઇલ સરનામું:'
       status: 'સ્થિતિ:'
-      role:
-        administrator: આ વપરાશકર્તા સંચાલક છે
-        moderator: આ વપરાશકર્તા ચોકીદાર છે
       create_block: આ વપરાશકર્તાને અવરોધિત કરો
       activate_user: આ વપરાશકર્તાને સક્રિય કરો
       confirm_user: આ વપરાશકર્તાની ખાતરી કરો
@@ -789,6 +786,10 @@ gu:
     suspended:
       title: ખાતું નિલંબિત
       heading: ખાતું નિલંબિત
+    role_icons:
+      title:
+        administrator: આ વપરાશકર્તા સંચાલક છે
+        moderator: આ વપરાશકર્તા ચોકીદાર છે
   user_blocks:
     index:
       title: વપરાશકર્તા અવરોધો
diff --git a/config/locales/he.yml b/config/locales/he.yml
index fc14f5e63..8c63a9767 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2948,18 +2948,6 @@ he:
       created from: 'נוצר מתוך:'
       status: 'מצב:'
       spam score: 'דירוג זיבול:'
-      role:
-        administrator: לחשבון הזה יש הרשאות מנהל
-        moderator: זהו חשבון מפקח
-        importer: זהו חשבון מייבא
-        grant:
-          administrator: הענקת הרשאות מנהל
-          moderator: הענקת הרשאות מפקח
-          importer: הענקת הרשאות מייבא
-        revoke:
-          administrator: שלילת הרשאות מנהל
-          moderator: שלילת הרשאות מפקח
-          importer: שלילת הרשאות מייבא
       block_history: חסימות פעילות
       moderator_history: חסימות שניתנו
       revoke_all_blocks: ביטול כל החסימות
@@ -3068,16 +3056,27 @@ he:
         להלן.
       option_2: אם כבר יש לך חשבון, אפשר להיכנס לחשבון שלך באמצעות שם המשתמש והסיסמה
         שלך ואז לשייך את החשבון שלך למזהה מהגדרות המשתמש שלך.
+    role_icons:
+      title:
+        administrator: לחשבון הזה יש הרשאות מנהל
+        moderator: זהו חשבון מפקח
+        importer: זהו חשבון מייבא
+      grant:
+        administrator: הענקת הרשאות מנהל
+        moderator: הענקת הרשאות מפקח
+        importer: הענקת הרשאות מייבא
+        are_you_sure: באמת להעניק את התפקיד „%{role}” למשתמש „%{name}”?
+      revoke:
+        administrator: שלילת הרשאות מנהל
+        moderator: שלילת הרשאות מפקח
+        importer: שלילת הרשאות מייבא
+        are_you_sure: באמת לשלול את התפקיד „%{role}” מהמשתמש „%{name}”?
   user_role:
     filter:
       not_a_role: המחרוזת „%{role}” אינה תפקיד תקין.
       already_has_role: למשתמש כבר יש תפקיד %{role}.
       doesnt_have_role: למשתמש אין תפקיד %{role}.
       not_revoke_admin_current_user: לא ניתן לשלול הרשאות מנהל מהמשתמש הנוכחי.
-    grant:
-      are_you_sure: באמת להעניק את התפקיד „%{role}” למשתמש „%{name}”?
-    revoke:
-      are_you_sure: באמת לשלול את התפקיד „%{role}” מהמשתמש „%{name}”?
   user_blocks:
     model:
       non_moderator_update: צריך להיות מפקח כדי ליצור או לעדכן חסימה.
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index e68fe8321..97a3a471a 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -10,6 +10,7 @@
 # Author: Contrapunctus
 # Author: Danieldegroot2
 # Author: Innocentbunny
+# Author: Johannes 11
 # Author: McDutchie
 # Author: Nitin1485
 # Author: Prong$31
@@ -1015,6 +1016,9 @@ hi:
       tab_title: साइन अप करें
       support: सहायता
       or: या
+    show:
+      edits: संपादन
+      notes: मानचित्र नोट्स
     lists:
       show:
         title: सदस्य
@@ -1084,6 +1088,9 @@ hi:
       next: अगला
       previous: पिछला
   javascripts:
+    map:
+      layers:
+        notes: मानचित्र नोट्स
     site:
       createnote_disabled_tooltip: नोट जोड़ने के लिए जूम इन करें
     directions:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index bc8e618fe..922888757 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1786,15 +1786,6 @@ hr:
       created from: 'Napravljeno iz:'
       status: 'Stanje:'
       spam score: 'Spam ocjena:'
-      role:
-        administrator: Ovaj korisnik je administrator
-        moderator: Ovaj korisnik je moderator
-        grant:
-          administrator: Dodjeli pristup administratoru
-          moderator: Dodjeli pristup moderatoru
-        revoke:
-          administrator: Opozovi pristup administatora
-          moderator: Opozovi pristup moderatora
       block_history: Aktivne blokade
       moderator_history: Prikaži dane blokade
       comments: Komentari
@@ -1839,17 +1830,25 @@ hr:
     suspended:
       title: Račun suspendiran
       heading: Račun suspendiran
+    role_icons:
+      title:
+        administrator: Ovaj korisnik je administrator
+        moderator: Ovaj korisnik je moderator
+      grant:
+        administrator: Dodjeli pristup administratoru
+        moderator: Dodjeli pristup moderatoru
+        are_you_sure: Jeste li sigurni da želite dodjeliti ulogu '%{role}' korisniku
+          '%{name}'?
+      revoke:
+        administrator: Opozovi pristup administatora
+        moderator: Opozovi pristup moderatora
+        are_you_sure: Jeste li sigurni da želite opozvati ulogu '%{role}' od korisnika
+          '%{name}'?
   user_role:
     filter:
       not_a_role: Niz '%{role}' nije valjana uloga.
       already_has_role: Korisnik već ima ulogu %{role}.
       doesnt_have_role: Korisnik nema ulogu %{role}.
-    grant:
-      are_you_sure: Jeste li sigurni da želite dodjeliti ulogu '%{role}' korisniku
-        '%{name}'?
-    revoke:
-      are_you_sure: Jeste li sigurni da želite opozvati ulogu '%{role}' od korisnika
-        '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Morate biti moderator da stvorite ili ažurirate  blokadu.
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 127b99345..32fd5efa3 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2351,16 +2351,6 @@ hsb:
       created from: 'Wutworjeny z:'
       status: 'Status:'
       spam score: 'Spamowe hódnoćenje:'
-      role:
-        administrator: Tutón wužiwar je administrator
-        moderator: Tutón wužiwar je moderator.
-        importer: Tutón wužiwar je importer
-        grant:
-          administrator: Prawa administratora dać
-          moderator: Prawa moderatora dać
-        revoke:
-          administrator: Prawa administratora preč wzać
-          moderator: Prawa moderatora preč wzać
       block_history: Aktiwne blokowanja
       moderator_history: Date blokowanja
       comments: Komentary
@@ -2431,6 +2421,19 @@ hsb:
       option_2: Jeli konto hižo maš, móžeš so pola swojeho konta z pomocu swojeho
         wužiwarskeho mjena a hesła přizjewić a potom konto ze swojim ID w swojich
         wužiwarskich nastajenjach zwjazać.
+    role_icons:
+      title:
+        administrator: Tutón wužiwar je administrator
+        moderator: Tutón wužiwar je moderator.
+        importer: Tutón wužiwar je importer
+      grant:
+        administrator: Prawa administratora dać
+        moderator: Prawa moderatora dać
+        are_you_sure: Chceš woprawdźe wužiwarjej '%{name}' rólu '%{role}' dać?
+      revoke:
+        administrator: Prawa administratora preč wzać
+        moderator: Prawa moderatora preč wzać
+        are_you_sure: Chceš woprawdźe wužiwarjej '%{name}' rólu '%{role}' preč wzać?
   user_role:
     filter:
       not_a_role: Znamješkowy rjećazk '%{role}' płaćiwa róla njeje.
@@ -2438,10 +2441,6 @@ hsb:
       doesnt_have_role: Wužiwar nima rólu %{role}.
       not_revoke_admin_current_user: Administratorowa róla njeda so aktualnemu wužiwarjej
         prěč wzać.
-    grant:
-      are_you_sure: Chceš woprawdźe wužiwarjej '%{name}' rólu '%{role}' dać?
-    revoke:
-      are_you_sure: Chceš woprawdźe wužiwarjej '%{name}' rólu '%{role}' preč wzać?
   user_blocks:
     model:
       non_moderator_update: Dyrbiš moderator być, zo by blokowanje wudźělił abo aktualizował.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e43d8a780..1aa486d7c 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -3137,18 +3137,6 @@ hu:
       created from: 'Készítve innen:'
       status: 'Állapot:'
       spam score: 'Spam pontszám:'
-      role:
-        administrator: Ez a felhasználó adminisztrátor
-        moderator: Ez a felhasználó moderátor
-        importer: Ez a felhasználó importálhat
-        grant:
-          administrator: Adminisztrátori hozzáférés megadása
-          moderator: Moderátori hozzáférés megadása
-          importer: Importálási jog megadása
-        revoke:
-          administrator: Adminisztrátori hozzáférés visszavonása
-          moderator: Moderátori hozzáférés viszzavonása
-          importer: Importálási hozzáférés visszavonása
       block_history: Aktív blokkolások
       moderator_history: Kiosztott blokkolások
       revoke_all_blocks: Minden blokkolás visszavonása
@@ -3268,6 +3256,21 @@ hu:
         a lenti űrlap segítségével.
       option_2: Ha már van fiókod, bejelentkezhetsz a felhasználóneveddel és jelszavaddal,
         majd összekapcsolhatod az azonosítóddal a beállításaidban.
+    role_icons:
+      title:
+        administrator: Ez a felhasználó adminisztrátor
+        moderator: Ez a felhasználó moderátor
+        importer: Ez a felhasználó importálhat
+      grant:
+        administrator: Adminisztrátori hozzáférés megadása
+        moderator: Moderátori hozzáférés megadása
+        importer: Importálási jog megadása
+        are_you_sure: Biztosan kiosztod '%{name}' felhasználónak a '%{role}' szerepet?
+      revoke:
+        administrator: Adminisztrátori hozzáférés visszavonása
+        moderator: Moderátori hozzáférés viszzavonása
+        importer: Importálási hozzáférés visszavonása
+        are_you_sure: Biztosan megfosztod '%{name}' felhasználót '%{role}' szerepétől?
   user_role:
     filter:
       not_a_role: A '%{role}' kifejezés nem érvényes szerep.
@@ -3275,10 +3278,6 @@ hu:
       doesnt_have_role: A felhasználó szerepe nem %{role}.
       not_revoke_admin_current_user: Nem lehet visszavonni az aktuális felhasználó
         adminisztrátorjogát.
-    grant:
-      are_you_sure: Biztosan kiosztod '%{name}' felhasználónak a '%{role}' szerepet?
-    revoke:
-      are_you_sure: Biztosan megfosztod '%{name}' felhasználót '%{role}' szerepétől?
   user_blocks:
     model:
       non_moderator_update: Blokkolás kiosztásához vagy frissítéséhez moderátornak
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 5867f6075..dcbc7454c 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -3142,18 +3142,6 @@ ia:
       created from: 'Create ex:'
       status: 'Stato:'
       spam score: 'Punctos de spam:'
-      role:
-        administrator: Iste usator es un administrator
-        moderator: Iste usator es un moderator
-        importer: Iste usator es un importator
-        grant:
-          administrator: Conceder accesso de administrator
-          moderator: Conceder accesso de moderator
-          importer: Conceder le accesso de importator
-        revoke:
-          administrator: Revocar accesso de administrator
-          moderator: Revocar accesso de moderator
-          importer: Revocar le accesso de importator
       block_history: Blocadas active
       moderator_history: Blocadas imponite
       revoke_all_blocks: Revocar tote le blocadas
@@ -3273,6 +3261,21 @@ ia:
         del formulario sequente.
       option_2: Si tu jam ha un conto, tu pote aperir session con tu nomine de usator
         e contrasigno e postea associar le conto a tu ID in tu parametros de usator.
+    role_icons:
+      title:
+        administrator: Iste usator es un administrator
+        moderator: Iste usator es un moderator
+        importer: Iste usator es un importator
+      grant:
+        administrator: Conceder accesso de administrator
+        moderator: Conceder accesso de moderator
+        importer: Conceder le accesso de importator
+        are_you_sure: Es tu secur de voler conceder le rolo ‘%{role}’ al usator ‘%{name}’?
+      revoke:
+        administrator: Revocar accesso de administrator
+        moderator: Revocar accesso de moderator
+        importer: Revocar le accesso de importator
+        are_you_sure: Es tu secur de voler revocar le rolo ‘%{role}’ del usator ‘%{name}’?
   user_role:
     filter:
       not_a_role: Le catena ‘%{role}’ non es un rolo valide.
@@ -3280,10 +3283,6 @@ ia:
       doesnt_have_role: Le usator non ha le rolo %{role}.
       not_revoke_admin_current_user: Impossibile revocar le rolo de administrator
         del usator actual.
-    grant:
-      are_you_sure: Es tu secur de voler conceder le rolo ‘%{role}’ al usator ‘%{name}’?
-    revoke:
-      are_you_sure: Es tu secur de voler revocar le rolo ‘%{role}’ del usator ‘%{name}’?
   user_blocks:
     model:
       non_moderator_update: Debe esser moderator pro crear o actualisar un blocada.
diff --git a/config/locales/id.yml b/config/locales/id.yml
index e893dd373..dc56b7db4 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2663,18 +2663,6 @@ id:
       created from: 'Dibuat pada:'
       status: 'Status:'
       spam score: 'Jumlah Spam:'
-      role:
-        administrator: Pengguna ini merupakan administrator
-        moderator: Pengguna ini adalah moderator
-        importer: Pengguna ini adalah seorang importir
-        grant:
-          administrator: Memberikan akses administrator
-          moderator: Memberikan akses moderator
-          importer: Berikan izin importir
-        revoke:
-          administrator: Mencabut akses administrator
-          moderator: Mencabut akses moderator
-          importer: Cabut izin importir
       block_history: Blok Aktif
       moderator_history: Blok yang Diberikan
       revoke_all_blocks: Cabut semua pemblokiran
@@ -2753,6 +2741,23 @@ id:
       option_2: Jika Anda sudah memiliki akun, Anda dapat masuk log ke akun Anda menggunakan
         nama pengguna dan kata sandi Anda dan lalu asosiasikan akunnya dengan ID Anda
         di pengaturan pengguna Anda.
+    role_icons:
+      title:
+        administrator: Pengguna ini merupakan administrator
+        moderator: Pengguna ini adalah moderator
+        importer: Pengguna ini adalah seorang importir
+      grant:
+        administrator: Memberikan akses administrator
+        moderator: Memberikan akses moderator
+        importer: Berikan izin importir
+        are_you_sure: Apakah Anda yakin ingin memberikan peran '%{role}' kepada pengguna
+          '%{name}'?
+      revoke:
+        administrator: Mencabut akses administrator
+        moderator: Mencabut akses moderator
+        importer: Cabut izin importir
+        are_you_sure: Apakah Anda yakin Anda ingin mencabut peran '%{role}' dari pengguna
+          '%{name}'?
   user_role:
     filter:
       not_a_role: String '%{role}' bukan merupakan peran yang valid.
@@ -2760,12 +2765,6 @@ id:
       doesnt_have_role: Pengguna tidak memiliki peran %{role}.
       not_revoke_admin_current_user: Tidak bisa mencabut peran administrator dari
         pengguna ini.
-    grant:
-      are_you_sure: Apakah Anda yakin ingin memberikan peran '%{role}' kepada pengguna
-        '%{name}'?
-    revoke:
-      are_you_sure: Apakah Anda yakin Anda ingin mencabut peran '%{role}' dari pengguna
-        '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Harus merupakan moderator untuk membuat atau memperbarui
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 35bd87528..224634451 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -3003,18 +3003,6 @@ is:
       created from: 'Búin til frá:'
       status: 'Staða:'
       spam score: 'Ruslpóst-einkunn:'
-      role:
-        administrator: Þessi notandi er möppudýr
-        moderator: Þessi notandi er prófarkalesari
-        importer: Þessi notandi hefur heimild til innflutnings
-        grant:
-          administrator: Veita möppudýrsréttindi
-          moderator: Veita stjórnandaréttindi
-          importer: Veita aðgang að innflutningi
-        revoke:
-          administrator: Svifta möppudýrsréttindum
-          moderator: Svifta stjórnandaréttindum
-          importer: Afturkalla aðgang að innflutningi
       block_history: Virk bönn
       moderator_history: Úthlutuð bönn (eftir notandann)
       revoke_all_blocks: Aflétta öllum bönnum
@@ -3115,16 +3103,27 @@ is:
         Ef þú ert þegar með aðgang, geturðu skráð þig inn á aðganginn
         með notandanafni og lykilorði og síðan tengt aðganginn
         við auðkennið þitt í notandastillingunum.
+    role_icons:
+      title:
+        administrator: Þessi notandi er möppudýr
+        moderator: Þessi notandi er prófarkalesari
+        importer: Þessi notandi hefur heimild til innflutnings
+      grant:
+        administrator: Veita möppudýrsréttindi
+        moderator: Veita stjórnandaréttindi
+        importer: Veita aðgang að innflutningi
+        are_you_sure: Staðfestu að þú viljir veita notandanum „%{name}“ leyfið „%{role}“
+      revoke:
+        administrator: Svifta möppudýrsréttindum
+        moderator: Svifta stjórnandaréttindum
+        importer: Afturkalla aðgang að innflutningi
+        are_you_sure: Staðfestu að þú viljir svifta notandann „%{name}“ leyfinu „%{role}“
   user_role:
     filter:
       not_a_role: Strengurinn '%{role}' er ekki gilt leyfi.
       already_has_role: Notandinn hefur þegar „%{role}“ leyfi
       doesnt_have_role: Notandinn er ekki með „%{role}“ leyfi.
       not_revoke_admin_current_user: Get ekki svift þennan notanda möppudýrsréttindum.
-    grant:
-      are_you_sure: Staðfestu að þú viljir veita notandanum „%{name}“ leyfið „%{role}“
-    revoke:
-      are_you_sure: Staðfestu að þú viljir svifta notandann „%{name}“ leyfinu „%{role}“
   user_blocks:
     model:
       non_moderator_update: Þú verður að vera stjórnandi til að búa til eða breyta
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 59e707530..03764ded4 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -610,6 +610,9 @@ it:
       n_elements_modified:
         one: '%{count} elemento modificato'
         other: '%{count} elementi modificati'
+      n_elements_deleted:
+        one: '%{count} elemento eliminato'
+        other: '%{count} elementi eliminati'
     index:
       title: Gruppi di modifiche
       title_user: Gruppi di modifiche di %{user}
@@ -3222,18 +3225,6 @@ it:
       created from: 'Creato da:'
       status: 'Stato:'
       spam score: 'Punteggio Spam:'
-      role:
-        administrator: Quest'utente è un amministratore
-        moderator: Quest'utente è un moderatore
-        importer: Quest'utente è un importatore
-        grant:
-          administrator: Assegna l'accesso come amministratore
-          moderator: Assegna l'accesso come moderatore
-          importer: Concedi l'accesso come importatore
-        revoke:
-          administrator: Revoca l'accesso come amministratore
-          moderator: Revoca l'accesso come moderatore
-          importer: Revoca l'accesso come importatore
       block_history: Blocchi attivi
       moderator_history: Blocchi applicati
       revoke_all_blocks: Revoca tutti i blocchi
@@ -3354,6 +3345,22 @@ it:
       option_2: Se disponi già di un'utenza, puoi accedere ad essa utilizzando il
         tuo nome utente e la password e quindi associare l'utenza con il tuo ID nelle
         impostazioni.
+    role_icons:
+      title:
+        administrator: Quest'utente è un amministratore
+        moderator: Quest'utente è un moderatore
+        importer: Quest'utente è un importatore
+      grant:
+        administrator: Assegna l'accesso come amministratore
+        moderator: Assegna l'accesso come moderatore
+        importer: Concedi l'accesso come importatore
+        are_you_sure: Sei sicuro di voler assegnare il ruolo '%{role}' all'utente
+          '%{name}'?
+      revoke:
+        administrator: Revoca l'accesso come amministratore
+        moderator: Revoca l'accesso come moderatore
+        importer: Revoca l'accesso come importatore
+        are_you_sure: Sei sicuro di voler revocare il ruolo '%{role}' all'utente '%{name}'?
   user_role:
     filter:
       not_a_role: La stringa '%{role}' non è un ruolo valido.
@@ -3361,10 +3368,6 @@ it:
       doesnt_have_role: L'utente non possiede il ruolo %{role}.
       not_revoke_admin_current_user: Impossibile rimuovere i privilegi di amministratore
         all'utente corrente.
-    grant:
-      are_you_sure: Sei sicuro di voler assegnare il ruolo '%{role}' all'utente '%{name}'?
-    revoke:
-      are_you_sure: Sei sicuro di voler revocare il ruolo '%{role}' all'utente '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Devi essere un moderatore per creare o aggiornare un blocco.
@@ -3616,6 +3619,8 @@ it:
       tracestrack_credit: Tasselli per gentile concessione di %{tracestrack_link}
       hotosm_credit: Stile tasselli di %{hotosm_link} ospitato da %{osm_france_link}
       hotosm_name: La squadra di OpenStreetMap Humanitarian
+      openmaptiles_credit: Tasselli vettoriali di %{openmaptiles_link} ospitati da
+        %{maptiler_link}
     site:
       edit_tooltip: Modifica la mappa
       edit_disabled_tooltip: Zooma per modificare la mappa
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d4dce3dc9..7885fb7ea 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2590,17 +2590,6 @@ ja:
       created from: '作成日:'
       status: '状態:'
       spam score: 'スパム評価:'
-      role:
-        administrator: この利用者は管理者です
-        moderator: この利用者はモデレーターです
-        importer: この利用者はインポーターです
-        grant:
-          administrator: 管理者権限を許可
-          moderator: モデレーター権限を許可
-          importer: importerアクセス権を付与する
-        revoke:
-          administrator: 管理者権限を剥奪
-          moderator: モデレーター権限を剥奪
       block_history: 有効なブロック
       moderator_history: 実行したブロック
       comments: コメント
@@ -2664,16 +2653,26 @@ ja:
       heading: あなたのIDはまだOpenStreetMapアカウントと関連付けが済んでいません。
       option_1: OpenStreetMapを初めてお使いの方は、以下のフォームを使用して新しいアカウントを作成してください。
       option_2: 既にアカウントをお持ちの場合は、利用者名とパスワードを使用してあなたの利用者設定でIDと関連付け、アカウントにログインできます。
+    role_icons:
+      title:
+        administrator: この利用者は管理者です
+        moderator: この利用者はモデレーターです
+        importer: この利用者はインポーターです
+      grant:
+        administrator: 管理者権限を許可
+        moderator: モデレーター権限を許可
+        importer: importerアクセス権を付与する
+        are_you_sure: 利用者「%{name}」に「%{role}」権限を本当に与えますか?
+      revoke:
+        administrator: 管理者権限を剥奪
+        moderator: モデレーター権限を剥奪
+        are_you_sure: 利用者「%{name}」の「%{role}」権限を本当に取り消しますか?
   user_role:
     filter:
       not_a_role: 文字列「%{role}」は、有効な権限ではありません。
       already_has_role: 利用者は既に %{role} 権限を付与されています。
       doesnt_have_role: 利用者に %{role} 権限が付与されていません。
       not_revoke_admin_current_user: 現在の利用者から管理者権限を剥奪することはできません。
-    grant:
-      are_you_sure: 利用者「%{name}」に「%{role}」権限を本当に与えますか?
-    revoke:
-      are_you_sure: 利用者「%{name}」の「%{role}」権限を本当に取り消しますか?
   user_blocks:
     model:
       non_moderator_update: ブロックの作成/更新にはモデレーター権限が必要です。
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 098bc7fef..1cbd49efc 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -944,8 +944,6 @@ ka:
       created from: 'შექმნილია:'
       status: 'სტატუსი:'
       spam score: 'სპამის შეფასება:'
-      role:
-        administrator: ეს მომხმარებელი ადმინისტრატორია
       comments: კომენტარები
       create_block: ამ მომხმარებლის დაბლოკვა
       activate_user: ამ მომხმარებლის აქტივაცია
@@ -975,6 +973,9 @@ ka:
     diary_comments:
       page:
         post: პოსტი
+    role_icons:
+      title:
+        administrator: ეს მომხმარებელი ადმინისტრატორია
   user_blocks:
     new:
       title: მომხმარებელ %{name} ბლოკირების შექმნა
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index bb138572a..0e291e3c4 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1159,12 +1159,6 @@ kab:
       created from: 'Yettwarna seg:'
       status: 'Addad:'
       spam score: 'Amatar n uspam:'
-      role:
-        administrator: Aseqdac-agi d anedbal
-        grant:
-          administrator: Mudd izerfan n unedbal
-        revoke:
-          administrator: Kkes izerfan n unedbal
       block_history: Asewḥel urmid
       moderator_history: Asewḥel yettunefken
       comments: Iwenniten
@@ -1210,6 +1204,13 @@ kab:
     auth_association:
       option_1: Ma yella d amaynut i d-tusiḍ ɣer OpenStreetMap, ttxil-ek(m) seɣnew
         amiḍan amaynut s tallalt n tferkit adda-ya.
+    role_icons:
+      title:
+        administrator: Aseqdac-agi d anedbal
+      grant:
+        administrator: Mudd izerfan n unedbal
+      revoke:
+        administrator: Kkes izerfan n unedbal
   user_blocks:
     helper:
       time_future_html: Ad ifak di %{time}.
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index a722489ec..b913eef75 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2784,18 +2784,6 @@ ko:
       created from: '만든 위치:'
       status: '상태:'
       spam score: '스팸 점수:'
-      role:
-        administrator: 이 사용자는 관리자입니다
-        moderator: 이 사용자는 운영자입니다
-        importer: 이 사용자는 임포터입니다
-        grant:
-          administrator: 관리자 권한 부여
-          moderator: 운영자 권한 부여
-          importer: 임포터 접근 권한 부여
-        revoke:
-          administrator: 관리자 권한 해제
-          moderator: 운영자 권한 해제
-          importer: 임포터 접근 권한 취소
       block_history: 활성화된 차단
       moderator_history: 실행된 차단
       revoke_all_blocks: 모든 블록 취소
@@ -2890,16 +2878,27 @@ ko:
       option_1: 만약 당신이 OpenStreetMap에 처음이시면, 아래 양식을 사용해 새 계정을 만들어 주세요.
       option_2: 만약 당신이 이미 계정을 가지고 있다면, 당신은 당신의 사용자 이름과 비밀번호를 사용해 로그인할 수 있고 당신의 아이디를
         사용자 설정에서 등록할 수 있습니다.
+    role_icons:
+      title:
+        administrator: 이 사용자는 관리자입니다
+        moderator: 이 사용자는 운영자입니다
+        importer: 이 사용자는 임포터입니다
+      grant:
+        administrator: 관리자 권한 부여
+        moderator: 운영자 권한 부여
+        importer: 임포터 접근 권한 부여
+        are_you_sure: '''%{name}'' 사용자에게 ''%{role}'' 역할을 부여하시겠습니까?'
+      revoke:
+        administrator: 관리자 권한 해제
+        moderator: 운영자 권한 해제
+        importer: 임포터 접근 권한 취소
+        are_you_sure: '''%{name}'' 사용자로부터 ''%{role}'' 역할을 해제하시겠습니까?'
   user_role:
     filter:
       not_a_role: '''%{role}'' 문자열은 올바른 역할이 아닙니다.'
       already_has_role: 사용자는 이미 %{role} 역할이 있습니다.
       doesnt_have_role: 사용자는 %{role} 역할이 없습니다.
       not_revoke_admin_current_user: 현재 사용자로부터 관리자 역할을 철회할 수 없습니다.
-    grant:
-      are_you_sure: '''%{name}'' 사용자에게 ''%{role}'' 역할을 부여하시겠습니까?'
-    revoke:
-      are_you_sure: '''%{name}'' 사용자로부터 ''%{role}'' 역할을 해제하시겠습니까?'
   user_blocks:
     model:
       non_moderator_update: 차단을 만들거나 바꾸려면 운영자여야 합니다.
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index b80a961ed..c0bb26844 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -2361,15 +2361,6 @@ ku-Latn:
       created from: Ji van hate çêkirinː
       status: 'Rewş:'
       spam score: Skora spamêː
-      role:
-        administrator: Ev bikarhêner rêvebirek e
-        moderator: Ev bikarhêner moderatorek e
-        grant:
-          administrator: Heqê gihînê yê rêvebirê
-          moderator: Heqê gihînê yê moderatorê
-        revoke:
-          administrator: Heqê gihînê yê rêvebirê betal bike
-          moderator: Heqê gihînê yê moderatorê betal bike
       block_history: Astengiyên aktîv
       moderator_history: Astengiyên dayî
       comments: Şîrove
@@ -2439,6 +2430,19 @@ ku-Latn:
       option_2: Heke jixwe hesabekî te hebe, tu dikarî navê xwe yê bikarhêneriyê û
         şîfreya xwe binivîsî û têkevî, û piştre jî ji mîhengên bikarhênerê nasnameya
         (IDya) xwe bi hesabê xwe ve girê bidî.
+    role_icons:
+      title:
+        administrator: Ev bikarhêner rêvebirek e
+        moderator: Ev bikarhêner moderatorek e
+      grant:
+        administrator: Heqê gihînê yê rêvebirê
+        moderator: Heqê gihînê yê moderatorê
+        are_you_sure: Tu piştrast î ku tu dixwazî rola '%{role}' bidî bikarhêner '%{name}'?
+      revoke:
+        administrator: Heqê gihînê yê rêvebirê betal bike
+        moderator: Heqê gihînê yê moderatorê betal bike
+        are_you_sure: Tu piştrast î ku tu dixwazî rola '%{role}' ji bikarhêner '%{name}'
+          rabikî?
   user_role:
     filter:
       not_a_role: '''%{role}'' ne rolek muteber e.'
@@ -2446,11 +2450,6 @@ ku-Latn:
       doesnt_have_role: Bikahêner ne xwediyê rola %{role} ye.
       not_revoke_admin_current_user: Rola rêvebiriyê ji vê bikarhênerê nikare were
         rakirin.
-    grant:
-      are_you_sure: Tu piştrast î ku tu dixwazî rola '%{role}' bidî bikarhêner '%{name}'?
-    revoke:
-      are_you_sure: Tu piştrast î ku tu dixwazî rola '%{role}' ji bikarhêner '%{name}'
-        rabikî?
   user_blocks:
     model:
       non_moderator_update: Ji bo ku astengiyek çêbikî an jî nû bikî, divê tu moderatorek
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 18599be60..aabdb125a 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -2486,15 +2486,6 @@ lb:
       uid: 'Benotzer-ID:'
       email address: 'E-Mail-Adress:'
       status: 'Status:'
-      role:
-        administrator: Dëse Benotzer ass en Administrateur
-        moderator: Dëse Benotzer ass e Moderateur
-        grant:
-          administrator: Administrateur-Zougang accordéieren
-          moderator: Moderateursrechter ginn
-        revoke:
-          administrator: Administrateur-Zougang ofhuelen
-          moderator: Moderateursrechter ewechhuelen
       block_history: Aktiv Spären
       moderator_history: Vergi Spären
       comments: Bemierkungen
@@ -2569,6 +2560,20 @@ lb:
     auth_association:
       option_1: Wann Dir nei sidd bei OpenSrreetMap da leet wgl. e Benotzerkont un
         andeem Dir de Formulaire hei drënner benotzt.
+    role_icons:
+      title:
+        administrator: Dëse Benotzer ass en Administrateur
+        moderator: Dëse Benotzer ass e Moderateur
+      grant:
+        administrator: Administrateur-Zougang accordéieren
+        moderator: Moderateursrechter ginn
+        are_you_sure: Sidd Dir sécher, datt Dir dem Benotzer '%{name}' d'Roll '%{role}'
+          zoudeele wëllt?
+      revoke:
+        administrator: Administrateur-Zougang ofhuelen
+        moderator: Moderateursrechter ewechhuelen
+        are_you_sure: Sidd Dir sécher, datt Dir dem Benotzer '%{name}' d'Roll '%{role}'
+          ofhuele wëllt?
   user_role:
     filter:
       not_a_role: D'Zeecheketten '%{role}' ass keng gülteg Roll.
@@ -2576,12 +2581,6 @@ lb:
       doesnt_have_role: De Benotzer huet d'Roll %{role} net.
       not_revoke_admin_current_user: Et ass net méiglech dem Aktuelle Benotzer d'Administrateursrechter
         ewechzehuelen.
-    grant:
-      are_you_sure: Sidd Dir sécher, datt Dir dem Benotzer '%{name}' d'Roll '%{role}'
-        zoudeele wëllt?
-    revoke:
-      are_you_sure: Sidd Dir sécher, datt Dir dem Benotzer '%{name}' d'Roll '%{role}'
-        ofhuele wëllt?
   user_blocks:
     not_found:
       back: Zréck op d'Iwwersiicht
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 66f22bd4a..9033a50e3 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -2692,18 +2692,6 @@ lt:
       created from: 'Sukurta iš:'
       status: 'BÅ«sena:'
       spam score: 'Šlamšto įvertis:'
-      role:
-        administrator: Å is naudotojas yra administratorius
-        moderator: Å is naudotojas yra moderatorius
-        importer: Å is naudotojas yra importuotojas
-        grant:
-          administrator: Suteikti administratoriaus teises
-          moderator: Suteikti moderatoriaus teises
-          importer: Suteikti importuotojui prieigą
-        revoke:
-          administrator: Atšaukti administratoriaus teises
-          moderator: Atšaukti moderatoriaus teises
-          importer: Atšaukti importuotojo prieigą
       block_history: Aktyvūs blokavimai
       moderator_history: Gauti užblokavimai
       revoke_all_blocks: Atšaukti visus blokavimus
@@ -2782,6 +2770,21 @@ lt:
         Jei jau turite paskyrą, galite prisijungti prie savo paskyros
         naudodami savo naudotojo vardą ir slaptažodį, ir tada susieti paskyrą
         su savo ID, savo naudotojo nustatymuose.
+    role_icons:
+      title:
+        administrator: Å is naudotojas yra administratorius
+        moderator: Å is naudotojas yra moderatorius
+        importer: Å is naudotojas yra importuotojas
+      grant:
+        administrator: Suteikti administratoriaus teises
+        moderator: Suteikti moderatoriaus teises
+        importer: Suteikti importuotojui prieigą
+        are_you_sure: Ar tikrai norite naudotojui `%{name}' suteikti rolę `%{role}'?
+      revoke:
+        administrator: Atšaukti administratoriaus teises
+        moderator: Atšaukti moderatoriaus teises
+        importer: Atšaukti importuotojo prieigą
+        are_you_sure: Ar tikrai norite atšaukti `%{role}' nuo naudotojo „%{name}“?
   user_role:
     filter:
       not_a_role: Eilutė „%{role}“ nėra tinkama rolė.
@@ -2789,10 +2792,6 @@ lt:
       doesnt_have_role: Naudotojas neturi rolės „%{role}“.
       not_revoke_admin_current_user: Negalima atimti administratoriaus rolės iš dabartinio
         naudotojo.
-    grant:
-      are_you_sure: Ar tikrai norite naudotojui `%{name}' suteikti rolę `%{role}'?
-    revoke:
-      are_you_sure: Ar tikrai norite atšaukti `%{role}' nuo naudotojo „%{name}“?
   user_blocks:
     model:
       non_moderator_update: Norėdami sukurti ar atnaujinti blokavimą turite būti moderatoriumi.
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 87969f552..6773734ba 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1859,15 +1859,6 @@ lv:
       created from: 'Izveidota no:'
       status: 'Statuss:'
       spam score: 'Surogātpasta rādītājs:'
-      role:
-        administrator: Šis lietotājs ir administrators
-        moderator: Šis lietotājs ir moderators
-        grant:
-          administrator: Piešķirt administratora tiesības
-          moderator: Piešķirt moderatora tiesības
-        revoke:
-          administrator: Atņemt administratora tiesības
-          moderator: Atņemt moderatora tiesības
       block_history: Aktīvie bloki
       moderator_history: dotie bloķējumi
       comments: Komentāri
@@ -1924,17 +1915,25 @@ lv:
         kontu izmantojot zemāk esošo formu.
       option_2: Ja jums jau ir konts, jūs varat ieiet savā kontā izmantojot jūsu lietotājvārdu
         un paroli un tad sasaistīt savu kontu ar jūsu ID lietotāja iestatījumos.
+    role_icons:
+      title:
+        administrator: Šis lietotājs ir administrators
+        moderator: Šis lietotājs ir moderators
+      grant:
+        administrator: Piešķirt administratora tiesības
+        moderator: Piešķirt moderatora tiesības
+        are_you_sure: Vai tu esi pārliecināts, ka vēlies piešķirt lomu `%{role}' lietotājam
+          `%{name}'?
+      revoke:
+        administrator: Atņemt administratora tiesības
+        moderator: Atņemt moderatora tiesības
+        are_you_sure: Vai tu esi drošs, ka vēlies atsaukt lomu `%{role}' no lietotāja
+          `%{name}'?
   user_role:
     filter:
       not_a_role: Virkne `%{role}' nav derīga kā loma.
       already_has_role: Lietotājam jau ir loma %{role}.
       doesnt_have_role: Lietotājam nav loma %{role}.
-    grant:
-      are_you_sure: Vai tu esi pārliecināts, ka vēlies piešķirt lomu `%{role}' lietotājam
-        `%{name}'?
-    revoke:
-      are_you_sure: Vai tu esi drošs, ka vēlies atsaukt lomu `%{role}' no lietotāja
-        `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Jābūt moderatoram, lai veidotu vai atjaunotu liegumu.
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 6e941794f..e37b1b7d1 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2281,9 +2281,12 @@ mk:
         заедницата ќе дознаете на %{osm_blog_link},\n%{user_diaries_link}, %{community_blogs_link}
         и мрежното место\n%{osm_foundation_link}."
       community_driven_osm_blog: Блог на OpenStreetMap
+      community_driven_osm_blog_url: https://blog.openstreetmap.org
       community_driven_user_diaries: кориснички дневници
       community_driven_community_blogs: блогови на заедницата
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
       community_driven_osm_foundation: Фондација OSM
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
       open_data_title: Отворени податоци
       open_data_1_html: |-
         OpenStreetMap е проект со %{open_data}: можете слободно да го користите за било која цел
@@ -2297,15 +2300,21 @@ mk:
         на сите услуги што ги нуди OSMF подлежи на нашите %{terms_of_use_link}, %{aup_link}
         и our %{privacy_policy_link}."
       legal_1_1_openstreetmap_foundation: Фондацијата OpenStreetMap
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
       legal_1_1_terms_of_use: Услови на употреба
+      legal_1_1_terms_of_use_url: https://osmfoundation.org/wiki/Terms_of_Use
       legal_1_1_aup: Правила за прифатлива употреба
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
       legal_1_1_privacy_policy: Правила за личните податоци
+      legal_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
       legal_2_1_html: |-
         %{contact_the_osmf_link}
         ако имате прашања во врска со лиценцирање, авторски права или други правни работи.
       legal_2_1_contact_the_osmf: Контактирајте ја OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
       legal_2_2_html: OpenStreetMap, логото со лупа и Сотстојбата на картата се %{registered_trademarks_link}.
       legal_2_2_registered_trademarks: заштитни знаци на OSMF
+      legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
       partners_title: Партнери
     copyright:
       title: Авторски права и лиценца
@@ -3135,18 +3144,6 @@ mk:
       created from: 'Создадено од:'
       status: 'Статус:'
       spam score: 'Оцена за спам:'
-      role:
-        administrator: Овој корисник е администратор
-        moderator: Овој корисник е модератор
-        importer: Овој корисник е увозник
-        grant:
-          administrator: Додели администраторски пристап
-          moderator: Додели модераторски пристап
-          importer: Дај увознички пристап
-        revoke:
-          administrator: Лиши од администраторски пристап
-          moderator: Лиши од модераторски пристап
-          importer: Одземи увознички пристап
       block_history: Активни блокови
       moderator_history: Зададени блокови
       revoke_all_blocks: Отповикај ги сите блокови
@@ -3267,6 +3264,23 @@ mk:
       option_2: Ако веќе имате сметка, можете да се најавите на неа користејќи го
         вашето презиме и лозинка, па во корисничките нагодувања да ја здружите сметката
         со вашата назнака.
+    role_icons:
+      title:
+        administrator: Овој корисник е администратор
+        moderator: Овој корисник е модератор
+        importer: Овој корисник е увозник
+      grant:
+        administrator: Додели администраторски пристап
+        moderator: Додели модераторски пристап
+        importer: Дај увознички пристап
+        are_you_sure: Дали сигурно сакае да му ја доделите улогата „%{role}“ на корисникот
+          „%{name}“?
+      revoke:
+        administrator: Лиши од администраторски пристап
+        moderator: Лиши од модераторски пристап
+        importer: Одземи увознички пристап
+        are_you_sure: Дали сигурно сакате да го лишите корисникот „%{name}“ од улогата
+          „%{role}“?
   user_role:
     filter:
       not_a_role: Низата „%{role}“ не претставува важечка улога.
@@ -3274,12 +3288,6 @@ mk:
       doesnt_have_role: Корисникот ја нема улогата %{role}.
       not_revoke_admin_current_user: Не можам да му ја одземам администраторската
         улога на тековниот корисник.
-    grant:
-      are_you_sure: Дали сигурно сакае да му ја доделите улогата „%{role}“ на корисникот
-        „%{name}“?
-    revoke:
-      are_you_sure: Дали сигурно сакате да го лишите корисникот „%{name}“ од улогата
-        „%{role}“?
   user_blocks:
     model:
       non_moderator_update: Морате да бидете модератор за да правите или подновувате
@@ -3511,6 +3519,8 @@ mk:
         transport_map: Сообраќајна
         tracestracktop_topo: Tracestrack Топо
         hot: Хуманитарна
+        shortbread: Shortbread
+        openmaptiles_osm: MapTiler OMT
       layers:
         header: Слоеви на картата
         notes: Белешки на картата
@@ -3528,6 +3538,9 @@ mk:
       tracestrack_credit: Полињата се доставени од %{tracestrack_link}
       hotosm_credit: Стилот на полињата е од %{hotosm_link} вдомен од %{osm_france_link}
       hotosm_name: Екипа на Хуманитарната OpenStreetMap
+      openmaptiles_credit: Векторски полиња од %{openmaptiles_link} вдомени од %{maptiler_link}
+      openmaptiles_name: OpenMapTiles
+      maptiler_name: MapTiler
     site:
       edit_tooltip: Уредување на картата
       edit_disabled_tooltip: Приближете за да ја уредите картата
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index a217fe9a2..202815227 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1888,15 +1888,6 @@ ms:
       created from: 'Dibuat daripada:'
       status: 'Status:'
       spam score: 'Markah Spam:'
-      role:
-        administrator: Pengguna ini seorang pentadbir
-        moderator: Pengguna ini seorang penyelia
-        grant:
-          administrator: Berikan akses pentadbir
-          moderator: Berikan akses penyelia
-        revoke:
-          administrator: Tarik balik akses pentadbir
-          moderator: Tarik balik akses penyelia
       block_history: sekatan yang diterima
       moderator_history: sekatan yang dikenakan
       comments: Komen
@@ -1943,17 +1934,25 @@ ms:
       title: Akaun Digantung
       heading: Akaun Digantung
       support: sokongan
+    role_icons:
+      title:
+        administrator: Pengguna ini seorang pentadbir
+        moderator: Pengguna ini seorang penyelia
+      grant:
+        administrator: Berikan akses pentadbir
+        moderator: Berikan akses penyelia
+        are_you_sure: Adakah anda benar-benar ingin memberikan peranan '%{role}' kepada
+          pengguna '%{name}'?
+      revoke:
+        administrator: Tarik balik akses pentadbir
+        moderator: Tarik balik akses penyelia
+        are_you_sure: Adakah anda benar-benar ingin menarik balik peranan '%{role}'
+          daripada pengguna '%{name}'?
   user_role:
     filter:
       not_a_role: Rentetan '%{role}' bukan peranan yang sah.
       already_has_role: Pengguna ini sudah pun memegang peranan %{role}.
       doesnt_have_role: Pengguna ini tidak memegang peranan %{role}.
-    grant:
-      are_you_sure: Adakah anda benar-benar ingin memberikan peranan '%{role}' kepada
-        pengguna '%{name}'?
-    revoke:
-      are_you_sure: Adakah anda benar-benar ingin menarik balik peranan '%{role}'
-        daripada pengguna '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Anda mesti menjadi penyelia untuk membuat atau mengemaskinikan
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 19842c1cc..4c410eb3f 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -780,8 +780,6 @@ my:
       notes: မြေပုံ မှတ်စုများ
       email address: 'အီးမေးလ် လိပ်စာ:'
       status: 'အခြေအနေ:'
-      role:
-        administrator: ဤအသုံးပြုသူသည် အက်ဒမိန်တစ်ဦးဖြစ်သည်
       comments: မှတ်ချက်များ
       create_block: ဤအသုံးပြုသူကို ပိတ်ပင်ရန်
       confirm: အတည်ပြု
@@ -800,6 +798,9 @@ my:
     changeset_comments:
       page:
         comment: မှတ်ချက်
+    role_icons:
+      title:
+        administrator: ဤအသုံးပြုသူသည် အက်ဒမိန်တစ်ဦးဖြစ်သည်
   user_blocks:
     helper:
       block_duration:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index a007ffe8c..51a563af2 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -2105,15 +2105,6 @@ nb:
       created from: 'Opprettet fra:'
       status: 'Status:'
       spam score: 'Spamresultat:'
-      role:
-        administrator: Denne brukeren er en administrator
-        moderator: Denne brukeren er en moderator
-        grant:
-          administrator: Gi administrator-tilgang
-          moderator: Gi moderator-tilgang
-        revoke:
-          administrator: Fjern administrator-tilgang
-          moderator: Fjern moderator-tilgang
       block_history: Aktive Blokkeringer
       moderator_history: Tildelte Blokkeringer
       comments: Kommentarer
@@ -2169,6 +2160,19 @@ nb:
       option_1: Opprett konto i skjemaet nedenfor.
       option_2: Logg inn med brukernavn og passord, du kan tilknytte kontoen til din
         ID i brukerinnstillingene.
+    role_icons:
+      title:
+        administrator: Denne brukeren er en administrator
+        moderator: Denne brukeren er en moderator
+      grant:
+        administrator: Gi administrator-tilgang
+        moderator: Gi moderator-tilgang
+        are_you_sure: Er du sikker på at du vil gi rollen `%{role}' til brukeren `%{name}'?
+      revoke:
+        administrator: Fjern administrator-tilgang
+        moderator: Fjern moderator-tilgang
+        are_you_sure: Er du sikker på at du vil fjerne rollen "%{role}" fra brukeren
+          "%{name}"?
   user_role:
     filter:
       not_a_role: Strengen "%{role}" er ikke en gyldig rolle.
@@ -2176,11 +2180,6 @@ nb:
       doesnt_have_role: Brukeren har ikke rollen %{role}.
       not_revoke_admin_current_user: Kan ikke fjerne administratorrollen fra gjeldende
         bruker.
-    grant:
-      are_you_sure: Er du sikker på at du vil gi rollen `%{role}' til brukeren `%{name}'?
-    revoke:
-      are_you_sure: Er du sikker på at du vil fjerne rollen "%{role}" fra brukeren
-        "%{name}"?
   user_blocks:
     model:
       non_moderator_update: Må være en moderator for å opprette eller oppdatere en
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 9e15c8a4d..57fe26891 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -1419,8 +1419,6 @@ ne:
       traces: ट्रेसहरू
       notes: म्याप टिप्पणीहरू
       status: 'स्थिति:'
-      role:
-        administrator: यी प्रयोगकर्ता प्रबन्धक हुनुहुन्छ
       comments: टिप्पणी
       confirm: निश्चित गर्नुहोस्
     go_public:
@@ -1437,17 +1435,20 @@ ne:
     diary_comments:
       page:
         post: पोष्ट
+    role_icons:
+      title:
+        administrator: यी प्रयोगकर्ता प्रबन्धक हुनुहुन्छ
+      grant:
+        are_you_sure: भूमिका `%{role}' प्रयोगकर्ता `%{name}'लाई प्रदान गर्न निश्चित
+          हुनुहुन्छ?
+      revoke:
+        are_you_sure: तपाईँ भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने
+          कुरामा निश्चित हुनुहुन्छ'?
   user_role:
     filter:
       not_a_role: '`%{role}''  मान्य भूमिका हैन ।'
       already_has_role: प्रयोगकर्ता सँग %{role} भूमिका पहिले देखि नै छ।
       doesnt_have_role: प्रयोगर्ताको %{role}को भूमिका छैन
-    grant:
-      are_you_sure: भूमिका `%{role}' प्रयोगकर्ता `%{name}'लाई प्रदान गर्न निश्चित
-        हुनुहुन्छ?
-    revoke:
-      are_you_sure: तपाईँ भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा
-        निश्चित हुनुहुन्छ'?
   user_blocks:
     show:
       created: सृजना गरिएको
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f18409f45..627b17c99 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -325,10 +325,20 @@ nl:
       contributor_terms:
         heading: Bijdragersvoorwaarden
         agreed: U bent op %{date} akkoord gegaan met de Bijdragersovereenkomst.
+        not_agreed: U hebt nog niet ingestemd met de Bijdragersovereenkomst.
         agreed_with_pd: U hebt ook verklaard dat uw bijdragen onderdeel zijn van het
           Publieke domein.
         not_agreed_with_pd: U hebt niet aangegeven dat u uw bewerkingen als publiek
           domein beschouwt.
+        review: De voorwaarden doorlezen
+        review_and_accept: De voorwaarden lezen en accepteren
+        consider_pd: Als geheel rechtenvrij (Public Domain) beschouwen
+      terms_of_use:
+        heading: Gebruiksvoorwaarden
+        agreed: U bent op %{date} akkoord gegaan met de Gebruiksvoorwaarden.
+        not_agreed: U bent nog niet akkoord gegaan met de Gebruiksvoorwaarden.
+        review: De voorwaarden doorlezen
+        review_and_accept: De voorwaarden lezen en accepteren
       save changes button: Wijzigingen opslaan
       delete_account: Account verwijderen...
     go_public:
@@ -504,6 +514,9 @@ nl:
         key: De wikipagina die het label %{key} beschrijft
         tag: De wikipagina die het label %{key}=%{value} beschrijft
       wikidata_link: Het item %{page} op Wikidata
+      wikidata_preview:
+        one: Voorvertoning van Wikidata-item
+        other: Voorvertoning van Wikidata-items
       wikipedia_link: De pagina %{page} op Wikipedia
       wikimedia_commons_link: Het element %{page} op Wikimedia Commons
       telephone_link: Bel %{phone_number}
@@ -588,6 +601,15 @@ nl:
       changes:
         one: '%{count} wijziging'
         other: '%{count} wijzigingen'
+      n_elements_created:
+        one: '%{count} element aangemaakt'
+        other: '%{count} elementen aangemaakt'
+      n_elements_modified:
+        one: '%{count} element gewijzigd'
+        other: '%{count} elementen gewijzigd'
+      n_elements_deleted:
+        one: '%{count} element verwijderd'
+        other: '%{count} elementen verwijderd'
     index:
       title: Wijzigingensets
       title_user: Wijzigingensets door %{user}
@@ -3208,18 +3230,6 @@ nl:
       created from: 'Aangemaakt door:'
       status: 'Status:'
       spam score: 'Spamscore:'
-      role:
-        administrator: Deze gebruiker is beheerder
-        moderator: Deze gebruiker is moderator
-        importer: Deze gebruiker is een importeur
-        grant:
-          administrator: Beheerdersrechten toekennen
-          moderator: Moderatorrechten toekennen
-          importer: Importeurstoegang verlenen
-        revoke:
-          administrator: Beheerdersrechten intrekken
-          moderator: Moderatorrechten intrekken
-          importer: Importeurstoegang intrekken
       block_history: Actieve blokkades
       moderator_history: Uitgevoerde blokkades
       revoke_all_blocks: Alle blokkades opheffen
@@ -3340,6 +3350,23 @@ nl:
         formulier een account aanmaken.
       option_2: Als u al een account hebt, kunt u hieronder met uw gebruikersnaam
         en wachtwoord aanmelden en daarna uw ID aan uw account koppelen in uw instellingen.
+    role_icons:
+      title:
+        administrator: Deze gebruiker is beheerder
+        moderator: Deze gebruiker is moderator
+        importer: Deze gebruiker is een importeur
+      grant:
+        administrator: Beheerdersrechten toekennen
+        moderator: Moderatorrechten toekennen
+        importer: Importeurstoegang verlenen
+        are_you_sure: Weet u zeker dat u de rol "%{role}" aan gebruiker "%{name}"
+          wilt toekennen?
+      revoke:
+        administrator: Beheerdersrechten intrekken
+        moderator: Moderatorrechten intrekken
+        importer: Importeurstoegang intrekken
+        are_you_sure: Weet u zeker dat u de rol "%{role}" van gebruiker "%{name}"
+          wilt intrekken?
   user_role:
     filter:
       not_a_role: '"%{role}" is geen geldige rol.'
@@ -3347,12 +3374,6 @@ nl:
       doesnt_have_role: De gebruiker heeft de rol %{role} niet.
       not_revoke_admin_current_user: Kan administratorrol van de huidige gebruiker
         niet laten vallen.
-    grant:
-      are_you_sure: Weet u zeker dat u de rol "%{role}" aan gebruiker "%{name}" wilt
-        toekennen?
-    revoke:
-      are_you_sure: Weet u zeker dat u de rol "%{role}" van gebruiker "%{name}" wilt
-        intrekken?
   user_blocks:
     model:
       non_moderator_update: U moet moderator zijn om een blokkade te kunnen instellen
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 8c7a59321..859370f5c 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -2223,15 +2223,6 @@ nn:
       created from: 'Oppretta frå:'
       status: 'Status:'
       spam score: 'Spamresultat:'
-      role:
-        administrator: Denne brukaren er ein administrator
-        moderator: Denne brukaren er ein moderator
-        grant:
-          administrator: Gje administrator-tilgjenge
-          moderator: Gje moderator-tilgjenge
-        revoke:
-          administrator: Fjern administrator-tilgjenge
-          moderator: fjern moderator-tilgjenge
       block_history: Aktive blokeringar
       moderator_history: Tildelte blokkeringar
       comments: Kommentarar
@@ -2281,16 +2272,25 @@ nn:
       heading: Konto stengt
     auth_failure:
       invalid_scope: Ugyldig avgrensning
+    role_icons:
+      title:
+        administrator: Denne brukaren er ein administrator
+        moderator: Denne brukaren er ein moderator
+      grant:
+        administrator: Gje administrator-tilgjenge
+        moderator: Gje moderator-tilgjenge
+        are_you_sure: Er du sikker på at du vil gje rollen `%{role}' til brukaren
+          `%{name}'?
+      revoke:
+        administrator: Fjern administrator-tilgjenge
+        moderator: fjern moderator-tilgjenge
+        are_you_sure: Er du sikker på at du vil fjerne rollen "%{role}" frå brukaren
+          "%{name}"?
   user_role:
     filter:
       not_a_role: Strengen "%{role}" er ikkje ei gyldig rolle.
       already_has_role: Brukaren har allereie rollen %{role}.
       doesnt_have_role: Brukaren har ikkje rollen %{role}.
-    grant:
-      are_you_sure: Er du sikker på at du vil gje rollen `%{role}' til brukaren `%{name}'?
-    revoke:
-      are_you_sure: Er du sikker på at du vil fjerne rollen "%{role}" frå brukaren
-        "%{name}"?
   user_blocks:
     model:
       non_moderator_update: Må vere ein moderator for å opprette eller oppdatere ei
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 58040cf89..1a2687eb1 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1643,8 +1643,6 @@ nqo:
       ct status: 'ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬:'
       email address: 'ߢߎߡߍߙߋ߲߫ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
       created from: 'ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߞߊ߬ ߝߘߊ߫:'
-      role:
-        administrator: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߦߋ߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ ߟߋ߬ ߘߌ߫
       create_block: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߊ߬ߟߌ߬
       activate_user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߠߊߢߣߊߡߦߊ߫
       confirm_user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߠߊߛߙߋߦߊ߫
@@ -1679,6 +1677,9 @@ nqo:
       support: ߘߍ߬ߡߍ߲߬ߠߌ߲
     auth_failure:
       unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫
+    role_icons:
+      title:
+        administrator: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߦߋ߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ ߟߋ߬ ߘߌ߫
   user_blocks:
     helper:
       time_future_html: ߘߌ߫ ߓߊ߲߫ %{time} ߟߊ߫.
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 50f253c31..9b89a80c3 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2127,15 +2127,6 @@ oc:
       created from: 'Creat dempuèi :'
       status: 'Estatut :'
       spam score: 'Nòta pel spam :'
-      role:
-        administrator: Aqueste utilizaire es un administrator
-        moderator: Aqueste utilizaire es un moderator
-        grant:
-          administrator: Autrejar l'accès administrator
-          moderator: Autrejar l'accès moderator
-        revoke:
-          administrator: Revocar l'accès administrator
-          moderator: Revocar l'accès moderador
       block_history: Blocatges actius
       moderator_history: Blocatges donats
       comments: Comentaris
@@ -2188,14 +2179,23 @@ oc:
       invalid_scope: Espandida invalida
     auth_association:
       heading: Vòstre ID es pas encara associat a un compte OpenStreetMap.
+    role_icons:
+      title:
+        administrator: Aqueste utilizaire es un administrator
+        moderator: Aqueste utilizaire es un moderator
+      grant:
+        administrator: Autrejar l'accès administrator
+        moderator: Autrejar l'accès moderator
+        are_you_sure: Sètz segur que volètz atribuir lo ròtle `%{role}' a l'utilizaire
+          `%{name}'?
+      revoke:
+        administrator: Revocar l'accès administrator
+        moderator: Revocar l'accès moderador
   user_role:
     filter:
       not_a_role: La cadena « %{role} » es un ròtle valid.
       already_has_role: L'utilizaire possedís ja lo ròtle %{role}.
       doesnt_have_role: L'utilizaire a pas lo ròtle %{role}.
-    grant:
-      are_you_sure: Sètz segur que volètz atribuir lo ròtle `%{role}' a l'utilizaire
-        `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Vos cal èsser moderator per crear o modificar un blocatge.
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 9901b11ba..97904d12b 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -2019,17 +2019,6 @@ pa:
       email address: 'ਈਮੇਲ ਪਤਾ:'
       created from: 'ਕਿੱਥੋਂ ਉਸਾਰਿਆ:'
       status: 'ਦਰਜਾ:'
-      role:
-        administrator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਪ੍ਰਬੰਧਕ ਹੈ।
-        moderator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਵਿਚੋਲਾ ਹੈ।
-        importer: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਦਰਾਮਦਕਾਰ ਹੈ
-        grant:
-          administrator: ਪ੍ਰਬੰਧਕੀ ਹੱਕ ਦਿਓ
-          moderator: ਵਿਚੋਲਗੀ ਦੇ ਹੱਕ ਦਿਉ
-          importer: ਦਰਾਮਦਕਾਰ ਪਹੁੰਚ ਪ੍ਰਦਾਨ ਕਰੋ
-        revoke:
-          administrator: ਪ੍ਰਬੰਧਕੀ ਪਹੁੰਚ ਰੱਦ ਕਰੋ
-          importer: ਦਰਾਮਦਕਾਰ ਪਹੁੰਚ ਰੱਦ ਕਰੋ
       block_history: ਸਰਗਰਮ ਪਾਬੰਦੀਆਂ
       moderator_history: ਪਾਬੰਦੀਆਂ ਦਿੱਤਿਆ ਹਨ
       comments: ਟਿੱਪਣੀਆਂ
@@ -2116,6 +2105,22 @@ pa:
       option_2: ਜੇਕਰ ਤੁਹਾਡੇ ਕੋਲ ਪਹਿਲਾਂ ਹੀ ਖਾਤਾ ਹੈ, ਤਾਂ ਤੁਸੀਂ ਆਪਣੇ ਵਰਤੋਂਕਾਰ ਨਾਂ ਅਤੇ
         ਪਛਾਣ-ਸ਼ਬਦ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਆਪਣੇ ਖਾਤੇ ਵਿੱਚ ਦਾਖ਼ਲ ਹੋ ਸਕਦੇ ਹੋ ਅਤੇ ਫਿਰ ਆਪਣਿਆਂ ਵਰਤੋਂਕਾਰ
         ਤਰਜੀਹਾਂ ਵਿੱਚ ਖਾਤੇ ਨੂੰ  ਆਪਣੀ ID ਨਾਲ ਜੋੜੋ।
+    role_icons:
+      title:
+        administrator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਪ੍ਰਬੰਧਕ ਹੈ।
+        moderator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਵਿਚੋਲਾ ਹੈ।
+        importer: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਦਰਾਮਦਕਾਰ ਹੈ
+      grant:
+        administrator: ਪ੍ਰਬੰਧਕੀ ਹੱਕ ਦਿਓ
+        moderator: ਵਿਚੋਲਗੀ ਦੇ ਹੱਕ ਦਿਉ
+        importer: ਦਰਾਮਦਕਾਰ ਪਹੁੰਚ ਪ੍ਰਦਾਨ ਕਰੋ
+        are_you_sure: ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ 'ਤੇ ਵਰਤੋਂਕਾਰ '%{name}' ਨੂੰ '%{role}' ਜ਼ੁੰਮੇਵਾਰੀ
+          ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?
+      revoke:
+        administrator: ਪ੍ਰਬੰਧਕੀ ਪਹੁੰਚ ਰੱਦ ਕਰੋ
+        importer: ਦਰਾਮਦਕਾਰ ਪਹੁੰਚ ਰੱਦ ਕਰੋ
+        are_you_sure: ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ 'ਤੇ ਵਰਤੋਂਕਾਰ '%{name}' ਤੋਂ ਜ਼ੁੰਮੇਵਾਰੀ '%{role}'
+          ਨੂੰ ਰੱਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?
   user_role:
     filter:
       not_a_role: ਤੰਦ %{role} ਇੱਕ ਜਾਇਜ਼ ਜ਼ੁੰਮੇਵਾਰੀ ਨਹੀਂ ਏ।
@@ -2123,12 +2128,6 @@ pa:
       doesnt_have_role: ਵਰਤੋਂਕਾਰ ਕੋਲ ਜ਼ੁੰਮੇਵਾਰੀ %{role} ਨਹੀਂ ਏ।
       not_revoke_admin_current_user: ਮੌਜੂਦਾ ਵਰਤੋਂਕਾਰ ਤੋਂ ਪ੍ਰਬੰਧਕ ਦੀ ਜ਼ੁੰਮੇਵਾਰੀ ਨੂੰ
         ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਏ।
-    grant:
-      are_you_sure: ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ 'ਤੇ ਵਰਤੋਂਕਾਰ '%{name}' ਨੂੰ '%{role}' ਜ਼ੁੰਮੇਵਾਰੀ
-        ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?
-    revoke:
-      are_you_sure: ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ 'ਤੇ ਵਰਤੋਂਕਾਰ '%{name}' ਤੋਂ ਜ਼ੁੰਮੇਵਾਰੀ '%{role}'
-        ਨੂੰ ਰੱਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?
   user_blocks:
     model:
       non_moderator_update: ਇੱਕ ਪਾਬੰਦੀ ਬਣਾਉਣ ਜਾਂ ਨਵਿਆਓਣ ਲਈ ਇੱਕ ਪ੍ਰਬੰਧਕ ਹੋਣਾ ਲਾਜ਼ਮੀ
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 45ab54861..11f0f9089 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -3290,18 +3290,6 @@ pl:
       created from: 'Stworzony z:'
       status: 'Stan:'
       spam score: 'Punktacja spamu:'
-      role:
-        administrator: Ten użytkownik jest administratorem
-        moderator: Ten użytkownik jest moderatorem
-        importer: Ten użytkownik jest importerem
-        grant:
-          administrator: Przyznaj dostęp administratora
-          moderator: Przyznaj dostęp moderatora
-          importer: Przyznaj rolę importera
-        revoke:
-          administrator: Cofnij dostęp administratora
-          moderator: Cofnij dostęp moderatora
-          importer: Odwołaj rolę importera
       block_history: aktywne blokady
       moderator_history: nałożone blokady
       revoke_all_blocks: Odwołaj wszystkie blokady
@@ -3421,6 +3409,21 @@ pl:
         pomocą formularza poniżej.
       option_2: Jeśli masz już konto, możesz zalogować się, podając swoją nazwę użytkownika
         i hasło, a następnie powiązać konto z twoim ID w ustawieniach użytkownika.
+    role_icons:
+      title:
+        administrator: Ten użytkownik jest administratorem
+        moderator: Ten użytkownik jest moderatorem
+        importer: Ten użytkownik jest importerem
+      grant:
+        administrator: Przyznaj dostęp administratora
+        moderator: Przyznaj dostęp moderatora
+        importer: Przyznaj rolę importera
+        are_you_sure: Czy na pewno chcesz przyznać rolę „%{role}” użytkownikowi %{name}?
+      revoke:
+        administrator: Cofnij dostęp administratora
+        moderator: Cofnij dostęp moderatora
+        importer: Odwołaj rolę importera
+        are_you_sure: Czy na pewno chcesz odwołać rolę „%{role}” użytkownikowi %{name}?
   user_role:
     filter:
       not_a_role: Napis „%{role}” nie jest ważną rolą.
@@ -3428,10 +3431,6 @@ pl:
       doesnt_have_role: Użytkownik nie ma roli %{role}.
       not_revoke_admin_current_user: Nie można odwołać roli administratora z bieżącego
         użytkownika.
-    grant:
-      are_you_sure: Czy na pewno chcesz przyznać rolę „%{role}” użytkownikowi %{name}?
-    revoke:
-      are_you_sure: Czy na pewno chcesz odwołać rolę „%{role}” użytkownikowi %{name}?
   user_blocks:
     model:
       non_moderator_update: Musisz być moderatorem, by ustanowić lub edytować blokadę.
diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index a19e2a284..0f1a58151 100644
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1786,12 +1786,6 @@ pnb:
       created from: 'کتھوں اُساریا:'
       status: حالت
       spam score: 'سپیم سکور:'
-      role:
-        administrator: ایہہ ورتنوالا اِکّ پرشاسک اے۔
-        moderator: ایہہ ورتنوالا اِکّ وچولا اے۔
-        grant:
-          administrator: پرشاسکی حق دیق
-          moderator: وچولگی دے حق دیو
       block_history: حالیہ روک
       moderator_history: روک دیݨے
       comments: ٹپݨیاں
@@ -1832,6 +1826,13 @@ pnb:
       unknown_error: اِجازت لے نہیں سکی گئی
     auth_association:
       heading: حالاں تہاڈے شناختی نال کجھ کھاتہ نہیں جوڑدے اے۔
+    role_icons:
+      title:
+        administrator: ایہہ ورتنوالا اِکّ پرشاسک اے۔
+        moderator: ایہہ ورتنوالا اِکّ وچولا اے۔
+      grant:
+        administrator: پرشاسکی حق دیق
+        moderator: وچولگی دے حق دیو
   user_blocks:
     not_found:
       back: تتکرے ول واپس
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index eeb2e9f13..1adbd1811 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -315,7 +315,7 @@ pt-PT:
       terms_of_use:
         heading: Termos de Utilização
         agreed: Aceitou os 'Termos de Utilização' em %{date}.
-        not_agreed: Ainda não aceitou os 'Termos de Utilização'.
+        not_agreed: Ainda não aceitaste os Termos de Utilização.
         review: Rever os Termos
         review_and_accept: Rever e aceitar os Termos
       save changes button: Gravar alterações
@@ -2176,7 +2176,7 @@ pt-PT:
     profile_sections:
       navigation:
         description: Descrição
-        links: Hiperligações
+        links: Ligações
         image: Imagem
         company: Empresa
         location: Localização
@@ -2196,9 +2196,9 @@ pt-PT:
         social_links:
           title: Ligações para Perfis Sociais
           remove: Remover
-          add: Adicionar Hiperligação Social
+          add: Adicionar Ligação Social
       update:
-        success: Hiperligações de perfil atualizadas.
+        success: Ligações de perfil atualizadas.
         failure: Não foi possível atualizar as ligações de perfil.
     images:
       show:
@@ -2237,8 +2237,8 @@ pt-PT:
         delete: Eliminar
         undelete: Desfazer eliminação
       update:
-        success: Localização do perfil atualizada.
-        failure: Não foi possível atualizar a localização do perfil.
+        success: Localização atualizada.
+        failure: Não foi possível atualizar a localização.
   sessions:
     new:
       tab_title: Iniciar sessão
@@ -2340,9 +2340,12 @@ pt-PT:
         Para saber mais sobre a nossa comunidade, consulte:
         %{osm_blog_link}, %{user_diaries_link}, %{community_blogs_link} e o sítio da %{osm_foundation_link}.
       community_driven_osm_blog: Blogue do OpenStreetMap
+      community_driven_osm_blog_url: https://blog.openstreetmap.org
       community_driven_user_diaries: diários dos utilizadores
       community_driven_community_blogs: blogues da comunidade
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
       community_driven_osm_foundation: Fundação OSM
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
       open_data_title: Dados Abertos
       open_data_1_html: |-
         O OpenStreetMap é constituído por %{open_data}: qualquer pessoa tem a liberdade de usar os dados para qualquer fim desde que dê os devidos créditos ao OpenStreetMap e aos seus contribuidores.
@@ -2355,15 +2358,21 @@ pt-PT:
         A utilização de todos os serviços operados pela OSMF estão sujeitos aos nossos
         %{terms_of_use_link}, às %{aup_link} e à nossa %{privacy_policy_link}.
       legal_1_1_openstreetmap_foundation: Fundação OpenStreetMap
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
       legal_1_1_terms_of_use: Termos de Utilização
+      legal_1_1_terms_of_use_url: https://osmfoundation.org/wiki/Terms_of_Use
       legal_1_1_aup: Políticas de Uso Aceitável
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
       legal_1_1_privacy_policy: Política de Privacidade
+      legal_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
       legal_2_1_html: Por favor, %{contact_the_osmf_link} se tiver dúvidas de licenciamento,
         direitos de autor ou de outro teor.
       legal_2_1_contact_the_osmf: contacte a OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
       legal_2_2_html: O OpenStreetMap, o logótipo da lupa e o State of the Map são
         %{registered_trademarks_link}.
       legal_2_2_registered_trademarks: marcas registadas da OSMF
+      legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
       partners_title: Parceiros
     copyright:
       title: Licença e Direitos de Autor
@@ -3193,18 +3202,6 @@ pt-PT:
       created from: 'Criado de:'
       status: 'Estado:'
       spam score: 'Contagem de Spam:'
-      role:
-        administrator: Este utilizador é um administrador
-        moderator: Este utilizador é um moderador
-        importer: Este utilizador é importador
-        grant:
-          administrator: Dar acesso de administrador
-          moderator: Dar acesso de moderador
-          importer: Conceder acesso de importador
-        revoke:
-          administrator: Retirar acesso de administrador
-          moderator: Retirar acesso de moderador
-          importer: Revogar acesso de importador
       block_history: Bloqueios ativos
       moderator_history: Bloqueios aplicados
       revoke_all_blocks: Revogar todos os bloqueios
@@ -3221,10 +3218,10 @@ pt-PT:
       report: Denunciar este utilizador
       edit_profile_details: Editar detalhes do perfil
       edit_description: Editar descrição
-      edit_links: Editar Hiperligações
+      edit_links: Editar ligações
       change_image: Alterar imagem
-      edit_company: Editar Empresa
-      edit_location: Editar Localização
+      edit_company: Editar empresa
+      edit_location: Editar localização
       contributions:
         one: '%{count} contribuição no ano passado'
         other: '%{count} contribuições no ano passado'
@@ -3325,6 +3322,23 @@ pt-PT:
       option_2: Se já tiveres uma conta, podes iniciar sessão na tua conta usando
         o teu nome de utilizador e a palavra-passe e, em seguida, associar a conta
         ao teu ID nas tuas definições de utilizador.
+    role_icons:
+      title:
+        administrator: Este utilizador é um administrador
+        moderator: Este utilizador é um moderador
+        importer: Este utilizador é importador
+      grant:
+        administrator: Dar acesso de administrador
+        moderator: Dar acesso de moderador
+        importer: Conceder acesso de importador
+        are_you_sure: Tens a certeza de que pretendes atribuir o cargo `%{role}' ao
+          utilizador `%{name}'?
+      revoke:
+        administrator: Retirar acesso de administrador
+        moderator: Retirar acesso de moderador
+        importer: Revogar acesso de importador
+        are_you_sure: Tens a certeza de que pretendes retirar o cargo `%{role}' ao
+          utilizador `%{name}'?
   user_role:
     filter:
       not_a_role: O texto `%{role}' não corresponde a um cargo válido.
@@ -3332,12 +3346,6 @@ pt-PT:
       doesnt_have_role: O utilizador não tem o cargo %{role}.
       not_revoke_admin_current_user: Não foi possível retirar os direitos de administrador
         do atual utilizador.
-    grant:
-      are_you_sure: Tens a certeza de que pretendes atribuir o cargo `%{role}' ao
-        utilizador `%{name}'?
-    revoke:
-      are_you_sure: Tens a certeza de que pretendes retirar o cargo `%{role}' ao utilizador
-        `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Tens de ser um moderador para criar ou atualizar um bloqueio.
@@ -3575,6 +3583,8 @@ pt-PT:
         transport_map: Transportes Públicos
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitário
+        shortbread: Shortbread
+        openmaptiles_osm: MapTiler OMT
       layers:
         header: Camadas do mapa
         notes: Notas no mapa
@@ -3592,6 +3602,10 @@ pt-PT:
       tracestrack_credit: Mosaicos cortesia de %{tracestrack_link}
       hotosm_credit: Estilo de mosaicos por %{hotosm_link} hospedado por %{osm_france_link}
       hotosm_name: Equipa Humanitária do OpenStreetMap
+      openmaptiles_credit: Mosaicos vetoriais de %{openmaptiles_link} alojados por
+        %{maptiler_link}
+      openmaptiles_name: OpenMapTiles
+      maptiler_name: MapTiler
     site:
       edit_tooltip: Editar o mapa
       edit_disabled_tooltip: Amplia o mapa para poderes editar
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 488738498..f8e834f59 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -339,6 +339,7 @@ pt:
         consider_pd: Considerar domínio público
       terms_of_use:
         heading: Termos de uso
+        not_agreed: Você ainda não concordou com os termos de uso.
         review: Rever os termos
         review_and_accept: Rever e aceitar os termos
       save changes button: Salvar alterações
@@ -513,6 +514,9 @@ pt:
         key: A página wiki com a descrição da etiqueta %{key}
         tag: A página wiki com a descrição da etiqueta %{key}=%{value}
       wikidata_link: O item %{page} no Wikidata
+      wikidata_preview:
+        one: Pré-visualização de itens da Wikidata
+        other: Pré-visualização de itens da Wikidata
       wikipedia_link: O artigo %{page} na Wikipédia
       wikimedia_commons_link: A %{page} de item mo Wikimedia Commons
       telephone_link: Ligar para %{phone_number}
@@ -598,6 +602,15 @@ pt:
       changes:
         one: '%{count} alteração'
         other: '%{count} alterações'
+      n_elements_created:
+        one: '%{count} elemento criado'
+        other: '%{count} elements created'
+      n_elements_modified:
+        one: '%{count} elemento modificado'
+        other: '%{count} elements modified'
+      n_elements_deleted:
+        one: '%{count} elemento removido'
+        other: '%{count} elements deleted'
     index:
       title: Conjuntos de alterações
       title_user: Conjuntos de alterações de %{user}
@@ -2344,9 +2357,12 @@ pt:
         Para saber mais sobre a nossa comunidade, consulte:
         %{osm_blog_link}, %{user_diaries_link}, %{community_blogs_link} e o site da %{osm_foundation_link}.
       community_driven_osm_blog: blog do OpenStreetMap
+      community_driven_osm_blog_url: https://blog.openstreetmap.org
       community_driven_user_diaries: diários de usuário
       community_driven_community_blogs: blogs da comunidade
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
       community_driven_osm_foundation: Fundação OSM
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
       open_data_title: Dados abertos
       open_data_1_html: |-
         O OpenStreetMap é constituído por %{open_data}: qualquer
@@ -2362,15 +2378,21 @@ pt:
         A utilização de todos os serviços operados pela OSMF estão sujeitos aos nossos
         %{terms_of_use_link}, às %{aup_link} e à nossa %{privacy_policy_link}.
       legal_1_1_openstreetmap_foundation: Fundação OpenStreetMap
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
       legal_1_1_terms_of_use: Termos de uso
+      legal_1_1_terms_of_use_url: https://osmfoundation.org/wiki/Terms_of_Use
       legal_1_1_aup: Políticas de uso aceitável
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
       legal_1_1_privacy_policy: Politica de privacidade
+      legal_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
       legal_2_1_html: Por favor, %{contact_the_osmf_link} se tiver dúvidas de licenciamento,
         direitos de autor ou de outro teor.
       legal_2_1_contact_the_osmf: contate a OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
       legal_2_2_html: O OpenStreetMap, o logotipo da lupa e o State of the Map são
         %{registered_trademarks_link}.
       legal_2_2_registered_trademarks: marcas registradas da OSMF
+      legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
       partners_title: Parceiros
     copyright:
       title: Direitos autorais e licença
@@ -3218,18 +3240,6 @@ pt:
       created from: 'Criado de:'
       status: 'Estado:'
       spam score: 'Contagem de Spam:'
-      role:
-        administrator: Este usuário é um administrador
-        moderator: Este usuário é um moderador
-        importer: Este usuário é importador
-        grant:
-          administrator: Conceder acesso de administrador
-          moderator: Conceder acesso de moderador
-          importer: Conceder o acesso de importador
-        revoke:
-          administrator: Revogar acesso de administrador
-          moderator: Revogar acesso de moderador
-          importer: Revogar o acesso de importador
       block_history: Bloqueios ativos
       moderator_history: Bloqueios aplicados
       revoke_all_blocks: Revogar todos os bloqueios
@@ -3352,6 +3362,21 @@ pt:
         Se você já tem uma conta, você pode entrar na sua conta
         usando seu nome de usuário e senha e, em seguida, associar a conta
         com o seu ID em suas configurações de usuário.
+    role_icons:
+      title:
+        administrator: Este usuário é um administrador
+        moderator: Este usuário é um moderador
+        importer: Este usuário é importador
+      grant:
+        administrator: Conceder acesso de administrador
+        moderator: Conceder acesso de moderador
+        importer: Conceder o acesso de importador
+        are_you_sure: Deseja mesmo dar o papel '%{role}' ao usuário '%{name}'?
+      revoke:
+        administrator: Revogar acesso de administrador
+        moderator: Revogar acesso de moderador
+        importer: Revogar o acesso de importador
+        are_you_sure: Deseja mesmo retirar o papel "%{role}" do usuário "%{name}"?
   user_role:
     filter:
       not_a_role: O texto '%{role}' não é um papel válido.
@@ -3359,10 +3384,6 @@ pt:
       doesnt_have_role: O usuário não tem o papel %{role}.
       not_revoke_admin_current_user: Não foi possível retirar os direitos de administrador
         do atual usuário.
-    grant:
-      are_you_sure: Deseja mesmo dar o papel '%{role}' ao usuário '%{name}'?
-    revoke:
-      are_you_sure: Deseja mesmo retirar o papel "%{role}" do usuário "%{name}"?
   user_blocks:
     model:
       non_moderator_update: É necessário ser um moderador para criar ou atualizar
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index d967dd9ae..6c0ac8c49 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -2766,18 +2766,6 @@ ro:
       created from: 'Creat de la:'
       status: 'Statut:'
       spam score: 'Scorul spam:'
-      role:
-        administrator: Acest utilizator este un administrator
-        moderator: Acest utilizator este un moderator
-        importer: Acest utilizator este un importator
-        grant:
-          administrator: Acordați permisiunile de administrator
-          moderator: Acordați accesul de moderator
-          importer: Acordați acces de importator
-        revoke:
-          administrator: Revocă accesul de administrator
-          moderator: Revocă accesul de moderator
-          importer: Revocați accesul de importator
       block_history: Blocări active
       moderator_history: Blocări acordate
       revoke_all_blocks: Revocați toate blocările
@@ -2877,6 +2865,22 @@ ro:
         Dacă aveți deja un cont, vă puteți conecta la contul dvs.
         folosind numele de utilizator și parola și apoi puteți asocia contul
         cu ID-ul dvs. în setările utilizatorului.
+    role_icons:
+      title:
+        administrator: Acest utilizator este un administrator
+        moderator: Acest utilizator este un moderator
+        importer: Acest utilizator este un importator
+      grant:
+        administrator: Acordați permisiunile de administrator
+        moderator: Acordați accesul de moderator
+        importer: Acordați acces de importator
+        are_you_sure: Sigur doriți să acordați rolul `%{role}' utilizatorului `%{name}'?
+      revoke:
+        administrator: Revocă accesul de administrator
+        moderator: Revocă accesul de moderator
+        importer: Revocați accesul de importator
+        are_you_sure: Sigur doriți să revocați rolul `%{role}' de la utilizatorul
+          `%{name}'?
   user_role:
     filter:
       not_a_role: Șirul `%{role}' nu este un rol valid.
@@ -2884,10 +2888,6 @@ ro:
       doesnt_have_role: Utilizatorul nu are rolul %{role}.
       not_revoke_admin_current_user: Nu se poate revoca rolul de administrator de
         la utilizatorul curent.
-    grant:
-      are_you_sure: Sigur doriți să acordați rolul `%{role}' utilizatorului `%{name}'?
-    revoke:
-      are_you_sure: Sigur doriți să revocați rolul `%{role}' de la utilizatorul `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Trebuie să fiți moderator pentru a crea sau actualiza
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 624068a2d..bcacdceee 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -2963,18 +2963,6 @@ ru:
       created from: 'Создано из:'
       status: 'Статус:'
       spam score: 'Оценка спама:'
-      role:
-        administrator: Этот пользователь является администратором
-        moderator: Этот пользователь является модератором
-        importer: Этот пользователь является импортёром
-        grant:
-          administrator: Присвоить права администратора
-          moderator: Присвоить права модератора
-          importer: Присвоить права импортёра
-        revoke:
-          administrator: Отозвать права администратора
-          moderator: Отозвать права модератора
-          importer: Отозвать права импортёра
       block_history: Активные блокировки
       moderator_history: Созданные блокировки
       comments: Комментарии
@@ -3064,6 +3052,23 @@ ru:
       option_2: Если у вас уже есть учётная запись, вы можете войти в неё, используя
         свой логин и пароль, а затем связать учётную запись с вашем ID в пользовательских
         настройках.
+    role_icons:
+      title:
+        administrator: Этот пользователь является администратором
+        moderator: Этот пользователь является модератором
+        importer: Этот пользователь является импортёром
+      grant:
+        administrator: Присвоить права администратора
+        moderator: Присвоить права модератора
+        importer: Присвоить права импортёра
+        are_you_sure: Вы уверены, что хотите присвоить роль '%{role}' пользователю
+          '%{name}'?
+      revoke:
+        administrator: Отозвать права администратора
+        moderator: Отозвать права модератора
+        importer: Отозвать права импортёра
+        are_you_sure: Вы уверены, что хотите отозвать роль '%{role}' у пользователя
+          '%{name}'?
   user_role:
     filter:
       not_a_role: Строка '%{role}' не является допустимой ролью.
@@ -3071,11 +3076,6 @@ ru:
       doesnt_have_role: У пользователя нет роли %{role}.
       not_revoke_admin_current_user: Невозможно отозвать роль отозвать администратора
         у текущего пользователя.
-    grant:
-      are_you_sure: Вы уверены, что хотите присвоить роль '%{role}' пользователю '%{name}'?
-    revoke:
-      are_you_sure: Вы уверены, что хотите отозвать роль '%{role}' у пользователя
-        '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Нужно быть модератором, чтобы создать или изменить блокировку.
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 203916a8b..4b875a25f 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -2622,18 +2622,6 @@ sc:
       created from: 'Creadu dae:'
       status: 'Istadu:'
       spam score: 'Puntègiu de arga:'
-      role:
-        administrator: Custu utente est un'amministradore
-        moderator: Custu utente est unu moderadore
-        importer: Custu impitadore est un'importadore
-        grant:
-          administrator: Cuntzede s'atzessu comente amministradore
-          moderator: Cuntzede s'atzessu comente moderadore
-          importer: Cuntzede s'atzessu comente importadore
-        revoke:
-          administrator: Rèvoca s'atzessu comente amministradore
-          moderator: Rèvoca s'atzessu comente moderadore
-          importer: Rèvoca s'atzessu comente importadore
       block_history: Blocos ativos
       moderator_history: Blocos fatos
       comments: Cummentos
@@ -2704,6 +2692,23 @@ sc:
         Si tenes giai unu contu bi podes intrare
         impreende su nùmene utente tuo e sa crae tua e a pustis assotziende su contu
         cun s'ID tuo in sas impostatziones de utente tuas.
+    role_icons:
+      title:
+        administrator: Custu utente est un'amministradore
+        moderator: Custu utente est unu moderadore
+        importer: Custu impitadore est un'importadore
+      grant:
+        administrator: Cuntzede s'atzessu comente amministradore
+        moderator: Cuntzede s'atzessu comente moderadore
+        importer: Cuntzede s'atzessu comente importadore
+        are_you_sure: Ses seguru de bòlere cuntzèdere su ruolu '%{role}' a s'utente
+          '%{name}'?
+      revoke:
+        administrator: Rèvoca s'atzessu comente amministradore
+        moderator: Rèvoca s'atzessu comente moderadore
+        importer: Rèvoca s'atzessu comente importadore
+        are_you_sure: Ses seguru de bòlere revocare su ruolu '%{role}' de s'utente
+          '%{name}'?
   user_role:
     filter:
       not_a_role: S'istringa '%{role}' no est unu ruolu vàlidu.
@@ -2711,11 +2716,6 @@ sc:
       doesnt_have_role: S'utente non tenet su ruolu %{role}.
       not_revoke_admin_current_user: Non faghet a revocare su ruolu de amministradore
         dae s'utente atuale.
-    grant:
-      are_you_sure: Ses seguru de bòlere cuntzèdere su ruolu '%{role}' a s'utente
-        '%{name}'?
-    revoke:
-      are_you_sure: Ses seguru de bòlere revocare su ruolu '%{role}' de s'utente '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Depes èssere unu moderadore pro creare o atualizare unu
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 711ab8b00..854d01d4f 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1698,15 +1698,6 @@ scn:
       created from: 'Criatu di:'
       status: 'Statu:'
       spam score: 'Punteggiu di Spam:'
-      role:
-        administrator: St'utenti è n'amministraturi
-        moderator: St'utenti è nu mudiraturi
-        grant:
-          administrator: Cuncedi l’accessu comu amministraturi
-          moderator: Cuncedi l’accessu comu mudiraturi
-        revoke:
-          administrator: Arrèvuca l'accessu comu amministraturi
-          moderator: Arrèvuca l'accessu comu mudiraturi
       block_history: blocchi arricivuti
       moderator_history: blocchi dati
       comments: Cummenti
@@ -1758,15 +1749,23 @@ scn:
       no_authorization_code: Nuḍḍu còdici d'auturizzazzioni
       unknown_signature_algorithm: Alguritmu di firma scanusciutu
       invalid_scope: Àmmitu nun vàlidu
+    role_icons:
+      title:
+        administrator: St'utenti è n'amministraturi
+        moderator: St'utenti è nu mudiraturi
+      grant:
+        administrator: Cuncedi l’accessu comu amministraturi
+        moderator: Cuncedi l’accessu comu mudiraturi
+        are_you_sure: Sî sicuru chi voi cuncèdiri lu rolu «%{role}» a l'utenti «%{name}»?
+      revoke:
+        administrator: Arrèvuca l'accessu comu amministraturi
+        moderator: Arrèvuca l'accessu comu mudiraturi
+        are_you_sure: Sî sicuru chi voi arrivucari lu rolu «%{role}» a l'utenti «%{name}»?
   user_role:
     filter:
       not_a_role: La stringa «%{role}» nun è un rolu vàlidu.
       already_has_role: L'utenti già havi lu rolu %{role}.
       doesnt_have_role: L'utenti nun havi lu rolu %{role}.
-    grant:
-      are_you_sure: Sî sicuru chi voi cuncèdiri lu rolu «%{role}» a l'utenti «%{name}»?
-    revoke:
-      are_you_sure: Sî sicuru chi voi arrivucari lu rolu «%{role}» a l'utenti «%{name}»?
   user_blocks:
     model:
       non_moderator_update: Hai a èssiri nu mudiraturi pi criari o canciari un bloccu.
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 5945dcc53..e6e8c6ead 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2336,9 +2336,12 @@ sk:
         sa chcete o komunite dozvedieť viac, prelistujte si %{osm_blog_link}, %{user_diaries_link},
         %{community_blogs_link} a webovú stránku %{osm_foundation_link}."
       community_driven_osm_blog: OpenStreetMap Blog
+      community_driven_osm_blog_url: https://blog.openstreetmap.org/?lang=cs
       community_driven_user_diaries: denníky používateľov
       community_driven_community_blogs: komunitné blogy
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
       community_driven_osm_foundation: Nadácia OSM
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
       open_data_title: Otvorené dáta
       open_data_1_html: 'OpenStreetMap znamenajú %{open_data}: môžete ich používať
         na ľubovoľný účel, pokiaľ uvediete ako autora OpenStreetMap a jeho prispievateľov.
@@ -2352,15 +2355,21 @@ sk:
         prevádzkovaných OSMF podlieha našim %{terms_of_use_link}, %{aup_link} a našim
         %{privacy_policy_link}.
       legal_1_1_openstreetmap_foundation: Nadácia OpenStreetMap
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
       legal_1_1_terms_of_use: Podmienkam použitia
+      legal_1_1_terms_of_use_url: https://osmfoundation.org/wiki/Terms_of_Use
       legal_1_1_aup: Pravidlám prijateľného používania
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
       legal_1_1_privacy_policy: Pravidlám ochrany osobných údajov
+      legal_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
       legal_2_1_html: |-
         Prosím, %{contact_the_osmf_link}
         ak máte otázky týkajúce sa licencií, autorských práv alebo iné právne otázky.
       legal_2_1_contact_the_osmf: kontaktujte OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
       legal_2_2_html: OpenStreetMap, logo s lupou a "State of the Map" sú %{registered_trademarks_link}.
       legal_2_2_registered_trademarks: registrované ochranné známky OSMF
+      legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
       partners_title: Partneri
     copyright:
       title: Autorské práva a licencia
@@ -3194,18 +3203,6 @@ sk:
       created from: 'Vytvorené od:'
       status: 'Stav:'
       spam score: 'Spam skóre:'
-      role:
-        administrator: Tento používateľ je administrátor
-        moderator: Tento používateľ je moderátor
-        importer: Tento používateľ je importér
-        grant:
-          administrator: Povoliť prístup administrátora
-          moderator: Povoliť prístup moderátora
-          importer: Udeliť prístup importéra
-        revoke:
-          administrator: Zrušiť prístup administrátora
-          moderator: Zrušiť prístup moderátora
-          importer: Odobrať prístup importéra
       block_history: Aktívne blokácie
       moderator_history: Udelené blokácie
       revoke_all_blocks: Odvolať všetky blokácie
@@ -3335,6 +3332,21 @@ sk:
         Ak už máte účet, môžete sa prihlásiť do svojho účtu
         pomocou svojho používateľského mena a hesla a potom priradiť účet
         k svojmu ID v používateľských nastaveniach.
+    role_icons:
+      title:
+        administrator: Tento používateľ je administrátor
+        moderator: Tento používateľ je moderátor
+        importer: Tento používateľ je importér
+      grant:
+        administrator: Povoliť prístup administrátora
+        moderator: Povoliť prístup moderátora
+        importer: Udeliť prístup importéra
+        are_you_sure: Naozaj chcete prideliť rolu „%{role}“ používateľovi „%{name}“?
+      revoke:
+        administrator: Zrušiť prístup administrátora
+        moderator: Zrušiť prístup moderátora
+        importer: Odobrať prístup importéra
+        are_you_sure: Naozaj chcete odobrať rolu „%{role}“ používateľovi „%{name}“?
   user_role:
     filter:
       not_a_role: Reťazec „%{role}“ nie je platnou rolou.
@@ -3342,10 +3354,6 @@ sk:
       doesnt_have_role: Požívateľ nemá úlohu %{role}.
       not_revoke_admin_current_user: Rolu administrátora nie je možné odobrať aktuálne
         prihlásenému používateľovi.
-    grant:
-      are_you_sure: Naozaj chcete prideliť rolu „%{role}“ používateľovi „%{name}“?
-    revoke:
-      are_you_sure: Naozaj chcete odobrať rolu „%{role}“ používateľovi „%{name}“?
   user_blocks:
     model:
       non_moderator_update: Musíte byť moderátorom na vytvorenie alebo aktualizáciu
@@ -3598,6 +3606,8 @@ sk:
         transport_map: Dopravná mapa
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitárna
+        shortbread: Shortbread
+        openmaptiles_osm: MapTiler OMT
       layers:
         header: Mapové vrstvy
         notes: Poznámky k mape
@@ -3615,6 +3625,10 @@ sk:
       tracestrack_credit: Dlaždice s láskavým dovolením %{tracestrack_link}
       hotosm_credit: Štýl dlaždíc od %{hotosm_link} poskytuje %{osm_france_link}
       hotosm_name: Humanitárneho tímu OpenStreetMap
+      openmaptiles_credit: Vektorové dlaždice z %{openmaptiles_link} hostované na
+        %{maptiler_link}
+      openmaptiles_name: OpenMapTiles
+      maptiler_name: MapTiler
     site:
       edit_tooltip: Upraviť mapu
       edit_disabled_tooltip: Pre editáciu priblížte mapu
diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 8fafccf0e..34f3fe0c7 100644
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -1443,6 +1443,8 @@ skr-arab:
           eighth: ٨واں
           ninth: ٩واں
           tenth: ١٠واں
+    element:
+      wikipedia: وکیپیڈیا
   redactions:
     show:
       confirm: بھلا تہاکوں پک ہے؟
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index c8b931c1a..f1aebb71a 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2719,18 +2719,6 @@ sl:
       created from: 'Ustvarjen iz:'
       status: 'Stanje:'
       spam score: 'Ocena smetja:'
-      role:
-        administrator: Ta uporabnik je administrator
-        moderator: Ta uporabnik je moderator
-        importer: Ta uporabnik je uvoznik
-        grant:
-          administrator: Podeli administratorski dostop
-          moderator: Podeli moderatorski dostop
-          importer: Podeli dostop uvoznika
-        revoke:
-          administrator: Odvzemi administratorski dostop
-          moderator: Odvzemi moderatorski dostop
-          importer: Odvzemi dostop uvoznika
       block_history: Aktivna blokiranja
       moderator_history: Izvedena blokiranja
       revoke_all_blocks: Prekliči vsa blokiranja
@@ -2810,6 +2798,21 @@ sl:
         spodnjega obrazca.
       option_2: Če že imate račun, se lahko prijavite s svojim uporabniškim imenom
         in geslom ter račun v nastavitvah povežete s svojim ID-jem.
+    role_icons:
+      title:
+        administrator: Ta uporabnik je administrator
+        moderator: Ta uporabnik je moderator
+        importer: Ta uporabnik je uvoznik
+      grant:
+        administrator: Podeli administratorski dostop
+        moderator: Podeli moderatorski dostop
+        importer: Podeli dostop uvoznika
+        are_you_sure: Ali res želite podeliti vlogo »%{role}« uporabniku »%{name}«?
+      revoke:
+        administrator: Odvzemi administratorski dostop
+        moderator: Odvzemi moderatorski dostop
+        importer: Odvzemi dostop uvoznika
+        are_you_sure: Ali res želite preklicati vlogo '%{role}' uporabnika '%{name}'?
   user_role:
     filter:
       not_a_role: Besedilo `%{role}' ni pravilna vloga.
@@ -2817,10 +2820,6 @@ sl:
       doesnt_have_role: Uporabnik nima vloge %{role}.
       not_revoke_admin_current_user: Trenutnemu uporabniku ni mogoče odvzeti vloge
         administratorja.
-    grant:
-      are_you_sure: Ali res želite podeliti vlogo »%{role}« uporabniku »%{name}«?
-    revoke:
-      are_you_sure: Ali res želite preklicati vlogo '%{role}' uporabnika '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Da ustvarite ali spremenite blokiranje, morate biti moderator.
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 7622f0881..22b3f57f2 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1227,15 +1227,6 @@ sq:
       created from: 'Krijuar nga:'
       status: 'Statusi:'
       spam score: 'Rezultati me Spam:'
-      role:
-        administrator: Ky përdorues është një administrator
-        moderator: Ky përdorues është një moderator
-        grant:
-          administrator: Mundëso qasje administratori
-          moderator: Mundëso qasje moderatori
-        revoke:
-          administrator: Revoko qasjen e administratorit
-          moderator: Revoko qasjen e moderatorit
       block_history: bllokimet e pranuara
       moderator_history: bllokimet e dhëna
       create_block: blloko këtë përdorues
@@ -1267,17 +1258,25 @@ sq:
     diary_comments:
       page:
         post: Posto
+    role_icons:
+      title:
+        administrator: Ky përdorues është një administrator
+        moderator: Ky përdorues është një moderator
+      grant:
+        administrator: Mundëso qasje administratori
+        moderator: Mundëso qasje moderatori
+        are_you_sure: A jeni i sigurt që ju doni t'i jepni rolin `%{role}' përdoruesit
+          `%{name}'?
+      revoke:
+        administrator: Revoko qasjen e administratorit
+        moderator: Revoko qasjen e moderatorit
+        are_you_sure: A je i sigurt që do ta revokosh rolin `%{role}' prej perdoruesit
+          `%{name}'?
   user_role:
     filter:
       not_a_role: Vargu `%{role}' nuk është një rol i vlefshëm.
       already_has_role: Përdoruesi tashmë e ka rolin %{role}.
       doesnt_have_role: Përdoruesi nuk e ka rolin %{role}.
-    grant:
-      are_you_sure: A jeni i sigurt që ju doni t'i jepni rolin `%{role}' përdoruesit
-        `%{name}'?
-    revoke:
-      are_you_sure: A je i sigurt që do ta revokosh rolin `%{role}' prej perdoruesit
-        `%{name}'?
   user_blocks:
     block:
       show: Shfaq
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 55a1f6bf5..07fa9b9c9 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1095,15 +1095,6 @@ sr-Latn:
       created from: 'Napravljeno iz:'
       status: 'Stanje:'
       spam score: 'Ocena spama:'
-      role:
-        administrator: Ovaj korisnik je administrator
-        moderator: Ovaj korisnik je urednik
-        grant:
-          administrator: Dodeli ovlašćenja administratora
-          moderator: Dodeli ovlašćenja urednika
-        revoke:
-          administrator: Opozovi ovlašćenja administratora
-          moderator: Opozovi ovlašćenja urednika
       block_history: dobijene blokade
       moderator_history: date blokade
       comments: komentari
@@ -1147,15 +1138,23 @@ sr-Latn:
     suspended:
       title: Suspendovan nalog
       heading: Suspendovan nalog
+    role_icons:
+      title:
+        administrator: Ovaj korisnik je administrator
+        moderator: Ovaj korisnik je urednik
+      grant:
+        administrator: Dodeli ovlašćenja administratora
+        moderator: Dodeli ovlašćenja urednika
+        are_you_sure: Želite li da dodelite ulogu „%{role}“ korisniku %{name}?
+      revoke:
+        administrator: Opozovi ovlašćenja administratora
+        moderator: Opozovi ovlašćenja urednika
+        are_you_sure: Želite li da oduzmete ulogu „%{role}“ od korisnika %{name}?
   user_role:
     filter:
       not_a_role: „%{role}“ nije ispravna uloga.
       already_has_role: Korisnik već ima ulogu %{role}.
       doesnt_have_role: Korisnik nema ulogu %{role}.
-    grant:
-      are_you_sure: Želite li da dodelite ulogu „%{role}“ korisniku %{name}?
-    revoke:
-      are_you_sure: Želite li da oduzmete ulogu „%{role}“ od korisnika %{name}?
   user_blocks:
     model:
       non_moderator_update: Morate biti urednik da biste postavljali ili ažurirali
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 7714ea548..969dd50f3 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -2255,15 +2255,6 @@ sr:
       created from: 'Направљено из:'
       status: 'Стање:'
       spam score: 'Оцена спама:'
-      role:
-        administrator: Овај корисник је администратор
-        moderator: Овај корисник је уредник
-        grant:
-          administrator: Додели овлашћења администратора
-          moderator: Додели овлашћења уредника
-        revoke:
-          administrator: Опозови овлашћења администратора
-          moderator: Опозови овлашћења уредника
       block_history: Активне блокаде
       moderator_history: Извршене блокаде
       revoke_all_blocks: Опозови све блокаде
@@ -2344,15 +2335,23 @@ sr:
         Ако већ имате налог, можете да се пријавите на свој налог
         коришћењем свог корисничког имена и лозинке, а потом да га повежете
         са својим ID-ом у корисничким подешавањима.
+    role_icons:
+      title:
+        administrator: Овај корисник је администратор
+        moderator: Овај корисник је уредник
+      grant:
+        administrator: Додели овлашћења администратора
+        moderator: Додели овлашћења уредника
+        are_you_sure: Желите ли да доделите улогу „%{role}“ кориснику %{name}?
+      revoke:
+        administrator: Опозови овлашћења администратора
+        moderator: Опозови овлашћења уредника
+        are_you_sure: Желите ли да одузмете улогу „%{role}“ од корисника %{name}?
   user_role:
     filter:
       not_a_role: „%{role}“ није исправна улога.
       already_has_role: Корисник већ има улогу %{role}.
       doesnt_have_role: Корисник нема улогу %{role}.
-    grant:
-      are_you_sure: Желите ли да доделите улогу „%{role}“ кориснику %{name}?
-    revoke:
-      are_you_sure: Желите ли да одузмете улогу „%{role}“ од корисника %{name}?
   user_blocks:
     model:
       non_moderator_update: Морате бити уредник да бисте постављали или ажурирали
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index aef25485e..60255e9c1 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2973,18 +2973,6 @@ sv:
       created from: 'Skapad från:'
       status: 'Status:'
       spam score: 'Spam-poäng:'
-      role:
-        administrator: Den här användaren är en administratör
-        moderator: Den här användaren är en moderator
-        importer: Denna användare är en importör
-        grant:
-          administrator: Tilldela administratörsrättigheter
-          moderator: Tilldela moderatorrättigheter
-          importer: Ge importåtkomst
-        revoke:
-          administrator: Återkalla administratörsrättigheter
-          moderator: Återkalla moderatorrättigheter
-          importer: Återkalla importåtkomst
       block_history: Aktiva blockeringar
       moderator_history: Utdelade blockeringar
       revoke_all_blocks: Återkalla alla blockeringar
@@ -3099,6 +3087,23 @@ sv:
         Om du redan har ett konto, kan du logga in på ditt konto
         med hjälp av ditt användarnamn och lösenord och sedan koppla kontot
         med ditt ID i dina användarinställningar.
+    role_icons:
+      title:
+        administrator: Den här användaren är en administratör
+        moderator: Den här användaren är en moderator
+        importer: Denna användare är en importör
+      grant:
+        administrator: Tilldela administratörsrättigheter
+        moderator: Tilldela moderatorrättigheter
+        importer: Ge importåtkomst
+        are_you_sure: Är du säker på att du vill ge rollen '%{role}' till användaren
+          '%{name}'?
+      revoke:
+        administrator: Återkalla administratörsrättigheter
+        moderator: Återkalla moderatorrättigheter
+        importer: Återkalla importåtkomst
+        are_you_sure: Är du säker på att du vill återkalla rollen '%{role}' från användaren
+          '%{name}'?
   user_role:
     filter:
       not_a_role: Strängen '%{role}' är inte en giltig roll.
@@ -3106,12 +3111,6 @@ sv:
       doesnt_have_role: Användaren har inte rollen %{role}.
       not_revoke_admin_current_user: Kan inte återkalla administratörsroll från nuvarande
         användare.
-    grant:
-      are_you_sure: Är du säker på att du vill ge rollen '%{role}' till användaren
-        '%{name}'?
-    revoke:
-      are_you_sure: Är du säker på att du vill återkalla rollen '%{role}' från användaren
-        '%{name}'?
   user_blocks:
     model:
       non_moderator_update: Måste vara en moderator för att skapa eller uppdatera
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 051bf105f..15367a94a 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -789,15 +789,6 @@ ta:
       ct declined: நிராகரிக்கப்பட்டது
       email address: 'மின்னஞ்சல் முகவரி:'
       status: 'நிலை:'
-      role:
-        administrator: இந்த பயனர் ஒரு நிர்வாகி
-        moderator: இந்த பயனர் ஒரு நடுவர்
-        grant:
-          administrator: நிர்வாகி அனுமதியை அளிக்கவும்
-          moderator: நடுவர் அனுமதி அளிக்கவும்
-        revoke:
-          administrator: நிர்வாகி அனுமதியை திரும்பபெறவும்
-          moderator: நடுவர் அனுமதியை திரும்பபெறவும்
       block_history: பெறப்பட்ட தடுப்புகளை காண்
       moderator_history: கொடுக்கப்பட்ட தடைகளை காண்
       comments: கருத்துரைகள்
@@ -822,6 +813,16 @@ ta:
     suspended:
       title: கணக்கு இடைநீக்கம் செய்யப்பட்டுள்ளது
       heading: கணக்கு இடைநீக்கம் செய்யப்பட்டுள்ளது
+    role_icons:
+      title:
+        administrator: இந்த பயனர் ஒரு நிர்வாகி
+        moderator: இந்த பயனர் ஒரு நடுவர்
+      grant:
+        administrator: நிர்வாகி அனுமதியை அளிக்கவும்
+        moderator: நடுவர் அனுமதி அளிக்கவும்
+      revoke:
+        administrator: நிர்வாகி அனுமதியை திரும்பபெறவும்
+        moderator: நடுவர் அனுமதியை திரும்பபெறவும்
   user_blocks:
     show:
       status: நிலை
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 2f31bd9e8..0bb3ff718 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -2114,15 +2114,6 @@ te:
       email address: 'ఈమెయిలు చిరునామా:'
       status: 'స్థితి:'
       spam score: 'స్పామ్ స్కోరు:'
-      role:
-        administrator: ఈ వాడుకరి ఒక నిర్వాహకులు
-        moderator: ఈ వాడుకరి ఒక మోడరేటరు
-        grant:
-          administrator: నిర్వాహక హోదాను ఇవ్వండి
-          moderator: నిర్వాహక హోదాను ఇవ్వండి
-        revoke:
-          administrator: నిర్వాహక హోదాను తీసెయ్యండి
-          moderator: నిర్వాహక హోదాను తీసెయ్యండి
       block_history: క్రియాశీల నిరోధాలు
       comments: వ్యాఖ్యలు
       create_block: ఈ వాడుకరిని నిరోధించు
@@ -2183,6 +2174,18 @@ te:
       option_1: మీరు OpenStreetMap కు కొత్తైతే, కింది ఫారమును వాడి కొత్త ఖాతాను సృష్టించుకోండి.
       option_2: మీకి ఈసరికే ఖాతా ఉంటే, మీ వాడుకరిపేరు, సంకేతపదాలను వాడి దాన్లోకి లాగినవండి.
         ఆ తరువాత ఆ ఖాతాను మీ ID తో అనుబంధించండి.
+    role_icons:
+      title:
+        administrator: ఈ వాడుకరి ఒక నిర్వాహకులు
+        moderator: ఈ వాడుకరి ఒక మోడరేటరు
+      grant:
+        administrator: నిర్వాహక హోదాను ఇవ్వండి
+        moderator: నిర్వాహక హోదాను ఇవ్వండి
+        are_you_sure: వాడుకరి `%{name}' కి `%{role}' పాత్ర ఇవ్వాలని మీరు నిశ్చయించుకున్నారా?
+      revoke:
+        administrator: నిర్వాహక హోదాను తీసెయ్యండి
+        moderator: నిర్వాహక హోదాను తీసెయ్యండి
+        are_you_sure: వాడుకరి `%{name}' నుండి `%{role}' ను ఉపసంహరించాలని మీరు నిశ్చయించుకున్నారా?
   user_role:
     filter:
       not_a_role: '`%{role}'' అనేది సరైన పాత్ర కాదు.'
@@ -2190,10 +2193,6 @@ te:
       doesnt_have_role: ఈ వాడుకరికి %{role} అనే పాత్ర లేదు.
       not_revoke_admin_current_user: ప్రస్తుత వాడుకరి నుండి నిర్వాహక హోదాను తీసెయ్యడం
         విఫలమైంది.
-    grant:
-      are_you_sure: వాడుకరి `%{name}' కి `%{role}' పాత్ర ఇవ్వాలని మీరు నిశ్చయించుకున్నారా?
-    revoke:
-      are_you_sure: వాడుకరి `%{name}' నుండి `%{role}' ను ఉపసంహరించాలని మీరు నిశ్చయించుకున్నారా?
   user_blocks:
     model:
       non_moderator_update: నిరోధాన్ని విధించాలన్నా, తాజాకరించాలన్నా మోడరేటరై ఉండాలి.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 901c2174a..41e551a36 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -2169,15 +2169,6 @@ th:
       created from: 'สร้างจาก:'
       status: 'สถานะ:'
       spam score: 'คะแนนสแปม:'
-      role:
-        administrator: คนนี้เป็นผู้ดูแลระบบ
-        moderator: ผู้ใช้นี้เป็นผู้ดูแล
-        grant:
-          administrator: ให้สิทธิ์ผู้ดูแลระบบ
-          moderator: ให้สิทธิ์ผู้ควบคุม
-        revoke:
-          administrator: เพิกถอนสิทธิ์ผู้ดูแลระบบ
-          moderator: เพิกถอนสิทธิ์ผู้ควบคุม
       block_history: การถูกระงับใช้งานในปัจจุบัน
       comments: ความเห็นที่เขียน
       create_block: ระงับผู้ใช้นี้
@@ -2228,17 +2219,26 @@ th:
       option_1: ถ้าท่านเป็นผู้ใช้ OpenStreetMap ใหม่ โปรดใช้แบบฟอร์มข้างล่างสร้างบัญชีผู้ใช้
       option_2: "ถ้าท่านมีบัญชีผู้ใช้แล้ว สามารถเข้าสู่ระบบโดยใช้ชื่อผู้ใช้ รหัสผ่าน
         \nแล้วผูกโยงบัญชีกับบัญชีภายนอกในหน้าการตั้งค่าา"
+    role_icons:
+      title:
+        administrator: คนนี้เป็นผู้ดูแลระบบ
+        moderator: ผู้ใช้นี้เป็นผู้ดูแล
+      grant:
+        administrator: ให้สิทธิ์ผู้ดูแลระบบ
+        moderator: ให้สิทธิ์ผู้ควบคุม
+        are_you_sure: ท่านแน่ใจว่าต้องการแต่งตั้งสถานะ `%{role}' แก่ผู้ใช้ `%{name}'
+          หรือไม่?
+      revoke:
+        administrator: เพิกถอนสิทธิ์ผู้ดูแลระบบ
+        moderator: เพิกถอนสิทธิ์ผู้ควบคุม
+        are_you_sure: ท่านแน่ใจว่าต้องการถอดถอนสถานะ `%{role}' จากผู้ใช้ `%{name}'
+          หรือไม่?
   user_role:
     filter:
       not_a_role: ข้อความ `%{role}' ไม่ใช่สถานะผู้ใช้งานที่ถูกต้อง
       already_has_role: ผู้ใช้มีสถานะเป็น %{role} อยู่แล้ว
       doesnt_have_role: ผู้ใช้ไม่ได้มีสถานะ %{role}
       not_revoke_admin_current_user: ไม่สามารถเพิกถอนสิทธิ์ดูแลระบบจากผู้ใช้คนปัจจุบัน
-    grant:
-      are_you_sure: ท่านแน่ใจว่าต้องการแต่งตั้งสถานะ `%{role}' แก่ผู้ใช้ `%{name}'
-        หรือไม่?
-    revoke:
-      are_you_sure: ท่านแน่ใจว่าต้องการถอดถอนสถานะ `%{role}' จากผู้ใช้ `%{name}' หรือไม่?
   user_blocks:
     model:
       non_moderator_update: จะต้องเป็นผู้ดูแลระบบจึงจะสามารถระงับ หรือแก้ไขการระงับผู้ใช้ได้
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index a6b57ff28..f4abbd797 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1825,15 +1825,6 @@ tl:
       created from: 'Nilikha magmula sa:'
       status: 'Katayuan:'
       spam score: 'Puntos ng Basurang Liham:'
-      role:
-        administrator: Isang tagapangasiwa ang tagagamit na ito
-        moderator: Isang tagapamagitan ang tagagamit na ito
-        grant:
-          administrator: Bigyan ng pagpapapuntang pangtagapangasiwa
-          moderator: Bigyan ng pagpapapuntang pangtagapamagitan
-        revoke:
-          administrator: Bawiin ang pagpapapuntang pangtagapangasiwa
-          moderator: Bawiin ang pagpapapuntang pangtagapamagitan
       block_history: Mga masiglang paghahadlang
       moderator_history: Mga ibinigay na paghahadlang
       comments: Mga puna
@@ -1880,17 +1871,25 @@ tl:
     suspended:
       title: Naantalang Akawnt
       heading: Inantala ang Akawnt
+    role_icons:
+      title:
+        administrator: Isang tagapangasiwa ang tagagamit na ito
+        moderator: Isang tagapamagitan ang tagagamit na ito
+      grant:
+        administrator: Bigyan ng pagpapapuntang pangtagapangasiwa
+        moderator: Bigyan ng pagpapapuntang pangtagapamagitan
+        are_you_sure: Nakatitiyak kang nais mong ibigay ang gampaning `%{role}' sa
+          tagagamit na si `%{name}'?
+      revoke:
+        administrator: Bawiin ang pagpapapuntang pangtagapangasiwa
+        moderator: Bawiin ang pagpapapuntang pangtagapamagitan
+        are_you_sure: Nakatitiyak ka bang nais mong bawiin ang gampaning `%{role}'
+          mula sa tagagamit na si `%{name}'?
   user_role:
     filter:
       not_a_role: Ang bagting na `%{role}' ay hindi isang tanggap na gampanin.
       already_has_role: Ang tagagamit ay may gampanin nang %{role}.
       doesnt_have_role: Ang tagagamit ay walang gampaning %{role}.
-    grant:
-      are_you_sure: Nakatitiyak kang nais mong ibigay ang gampaning `%{role}' sa tagagamit
-        na si `%{name}'?
-    revoke:
-      are_you_sure: Nakatitiyak ka bang nais mong bawiin ang gampaning `%{role}' mula
-        sa tagagamit na si `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Kailangang isang tagapangasiwa upang makalikha o magsapanahon
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 54aab8f25..b6cda12da 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -3066,18 +3066,6 @@ tr:
       created from: 'Kullanıldı yazılım:'
       status: 'Durum:'
       spam score: 'Spam puanı:'
-      role:
-        administrator: Bu kullanıcı, bir yöneticidir.
-        moderator: Bu kullanıcı, bir moderatördür.
-        importer: Bu kullanıcı bir içe aktarıcıdır
-        grant:
-          administrator: Yönetici erişim hakkı
-          moderator: Moderatör erişim izni
-          importer: İçe aktarım erişim izni ver
-        revoke:
-          administrator: Yönetici erişimini iptal etme
-          moderator: Moderatör erişimini iptal etme
-          importer: İçe aktarıcı erişimini iptal et
       block_history: Etkin Engellemeler
       moderator_history: Verilen Engellemeler
       revoke_all_blocks: Tüm engellemeleri iptal et
@@ -3186,6 +3174,23 @@ tr:
       option_2: Hâlihazırda bir hesabınız varsa kullanıcı adınız ve şifrenizi kullanarak
         hesabınıza giriş yapabilir ve ardından hesaplarınızı kullanıcı ayarlarınızda
         kimliğinizle ilişkilendirebilirsiniz.
+    role_icons:
+      title:
+        administrator: Bu kullanıcı, bir yöneticidir.
+        moderator: Bu kullanıcı, bir moderatördür.
+        importer: Bu kullanıcı bir içe aktarıcıdır
+      grant:
+        administrator: Yönetici erişim hakkı
+        moderator: Moderatör erişim izni
+        importer: İçe aktarım erişim izni ver
+        are_you_sure: '''%{name}'' kullanıcısına ''%{role}'' rolünü vermek istediğinizden
+          emin misiniz?'
+      revoke:
+        administrator: Yönetici erişimini iptal etme
+        moderator: Moderatör erişimini iptal etme
+        importer: İçe aktarıcı erişimini iptal et
+        are_you_sure: '''%{name}'' kullanıcısından ''%{role}'' rolünü iptal etmek
+          istediğinizden emin misiniz?'
   user_role:
     filter:
       not_a_role: '''%{role}'' dizgisi geçerli bir rol değil.'
@@ -3193,12 +3198,6 @@ tr:
       doesnt_have_role: Kullanıcının görevi %{role} değil.
       not_revoke_admin_current_user: Geçerli kullanıcıdan yönetici görevini iptal
         edemezsiniz.
-    grant:
-      are_you_sure: '''%{name}'' kullanıcısına ''%{role}'' rolünü vermek istediğinizden
-        emin misiniz?'
-    revoke:
-      are_you_sure: '''%{name}'' kullanıcısından ''%{role}'' rolünü iptal etmek istediğinizden
-        emin misiniz?'
   user_blocks:
     model:
       non_moderator_update: Engelleme yapmak ya da engellemeyi güncellemek için bir
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 1ce18a20a..75f5388cc 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -3274,18 +3274,6 @@ uk:
       created from: 'Створено з:'
       status: 'Статус:'
       spam score: 'Оцінка Спаму:'
-      role:
-        administrator: Цей учасник є адміністратором
-        moderator: Цей учасник є модератором
-        importer: Цей користувач виконує імпорт
-        grant:
-          administrator: Надати права адміністратора
-          moderator: Надати права модератора
-          importer: Надати дозвіл на імпорт
-        revoke:
-          administrator: Відкликати права адміністратора
-          moderator: Відкликати права модератора
-          importer: Відкликати доступ на імпорт
       block_history: Активні блокування
       moderator_history: Створені блокування
       revoke_all_blocks: Скасувати всі блокування
@@ -3412,6 +3400,22 @@ uk:
       option_2: Якщо у вас вже є обліковий запис, то ви можете увійти до нього, використовуючи
         своє прізвисько та пароль, а потім звʼязати обліковий запис із вашим ID у
         налаштуваннях.
+    role_icons:
+      title:
+        administrator: Цей учасник є адміністратором
+        moderator: Цей учасник є модератором
+        importer: Цей користувач виконує імпорт
+      grant:
+        administrator: Надати права адміністратора
+        moderator: Надати права модератора
+        importer: Надати дозвіл на імпорт
+        are_you_sure: Ви впевнені, що бажаєте надати роль «%{role}» учаснику «%{name}»?
+      revoke:
+        administrator: Відкликати права адміністратора
+        moderator: Відкликати права модератора
+        importer: Відкликати доступ на імпорт
+        are_you_sure: Ви впевнені, що хочете відкликати роль «%{role})» в учасника
+          «%{name}»?
   user_role:
     filter:
       not_a_role: Рядок «%{role}» не є припустимою роллю.
@@ -3419,10 +3423,6 @@ uk:
       doesnt_have_role: Учасник не має ролі %{role}.
       not_revoke_admin_current_user: Неможливо відкликати права адміністратора у поточного
         учасника.
-    grant:
-      are_you_sure: Ви впевнені, що бажаєте надати роль «%{role}» учаснику «%{name}»?
-    revoke:
-      are_you_sure: Ви впевнені, що хочете відкликати роль «%{role})» в учасника «%{name}»?
   user_blocks:
     model:
       non_moderator_update: Потрібно бути модератором, щоб створити або змінити блокування.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 490baa05d..9c6fa8410 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2850,18 +2850,6 @@ vi:
       created from: 'Địa chỉ IP khi mở:'
       status: 'Trạng thái:'
       spam score: 'Điểm số Spam:'
-      role:
-        administrator: Người dùng này là quản lý viên
-        moderator: Người dùng này là điều hành viên
-        importer: Người dùng này là người nhập dữ liệu
-        grant:
-          administrator: Cấp quyền quản lý viên
-          moderator: Cấp quyền điều hành viên
-          importer: Cấp quyền truy cập cho người nhập dữ liệu
-        revoke:
-          administrator: Rút quyền quản lý viên
-          moderator: Rút quyền điều hành viên
-          importer: Rút quyền truy cập của người nhập dữ liệu
       block_history: Tác vụ Cấm Người Này
       moderator_history: Tác vụ Cấm bởi Người Này
       revoke_all_blocks: Bỏ cấm toàn bộ
@@ -2973,6 +2961,21 @@ vi:
       option_2: Nếu bạn đã có tài khoản, bạn có thể đăng nhập vào tài khoản của bạn
         dùng tên người dùng và mật khẩu của bạn rồi liên kết tài khoản với ID của
         bạn trong tùy chọn.
+    role_icons:
+      title:
+        administrator: Người dùng này là quản lý viên
+        moderator: Người dùng này là điều hành viên
+        importer: Người dùng này là người nhập dữ liệu
+      grant:
+        administrator: Cấp quyền quản lý viên
+        moderator: Cấp quyền điều hành viên
+        importer: Cấp quyền truy cập cho người nhập dữ liệu
+        are_you_sure: Bạn có chắc muốn cấp vai trò “%{role}” cho người dùng “%{name}”?
+      revoke:
+        administrator: Rút quyền quản lý viên
+        moderator: Rút quyền điều hành viên
+        importer: Rút quyền truy cập của người nhập dữ liệu
+        are_you_sure: Bạn có chắc muốn rút vai trò “%{role}” của người dùng “%{name}”?
   user_role:
     filter:
       not_a_role: Chuỗi “%{role}” không phải là vai trò hợp lệ.
@@ -2980,10 +2983,6 @@ vi:
       doesnt_have_role: Người dùng không có vai trò %{role}.
       not_revoke_admin_current_user: Không thể rút quyền quản lý viên từ người dùng
         hiện tại.
-    grant:
-      are_you_sure: Bạn có chắc muốn cấp vai trò “%{role}” cho người dùng “%{name}”?
-    revoke:
-      are_you_sure: Bạn có chắc muốn rút vai trò “%{role}” của người dùng “%{name}”?
   user_blocks:
     model:
       non_moderator_update: Chỉ có các điều hành viên được phép cấm hay cập nhật tác
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d5334ade9..80cc4ac7e 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -10,6 +10,7 @@
 # Author: Anterdc99
 # Author: Assoc
 # Author: Boyuan Yang
+# Author: By H
 # Author: C933103
 # Author: Chimes
 # Author: David S. Hwang
@@ -349,9 +350,15 @@ zh-CN:
       external auth: 外部身份验证
       contributor_terms:
         heading: 贡献者条款
-        agreed: 您已同意新的贡献者条款。
+        agreed: 您于%{date}同意贡献者条款。
+        not_agreed: 您尚未同意贡献者条款。
         agreed_with_pd: 您也将您的编辑释于公有领域。
         not_agreed_with_pd: 你仍未宣称您的编辑将在公有领域发布。
+        consider_pd: 考虑公有领域
+      terms_of_use:
+        heading: 使用条款
+        agreed: 您于 %{date} 同意使用条款。
+        not_agreed: 您尚未同意使用条款。
       save changes button: 保存更改
       delete_account: 删除账户
     go_public:
@@ -491,6 +498,7 @@ zh-CN:
         key: '%{key} 标签的 wiki 说明页面'
         tag: '%{key}=%{value} 标签的 wiki 说明页面'
       wikidata_link: 维基数据上的%{page}项
+      wikidata_preview: 维基数据项目预览
       wikipedia_link: 维基百科上的 %{page} 条目
       wikimedia_commons_link: 在维基共享资源上的%{page}项目
       telephone_link: 请拨打 %{phone_number}
@@ -570,6 +578,9 @@ zh-CN:
       changes:
         one: '%{count}个更改'
         other: '%{count}个更改'
+      n_elements_created: 已创建%{count}个元素
+      n_elements_modified: 已修改%{count}个元素
+      n_elements_deleted: 已删除%{count}个元素
     index:
       title: 变更集
       title_user: '%{user}的变更集'
@@ -2225,9 +2236,12 @@ zh-CN:
       community_driven_1_html: OpenStreetMap 是一个多元化的社区，它充满激情，并且每天都在成长。我们的参与者包括地图制作爱好者，地理信息系统(GIS)从业人员，维护
         OSM 服务器的工程师，标注灾害区域的人道主义自愿者，已经其他很多各界人士。想更多的了解社区请参见%{osm_blog_link}、%{user_diaries_link}、%{community_blogs_link}，以及%{osm_foundation_link}网站。
       community_driven_osm_blog: OpenStreetMap 博客
+      community_driven_osm_blog_url: https://blog.openstreetmap.org
       community_driven_user_diaries: 用户日记
       community_driven_community_blogs: 社区博客
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
       community_driven_osm_foundation: OSM基金会
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
       open_data_title: 开放数据
       open_data_1_html: OpenStreetMap 是%{open_data}:只要您表明使用了 OpenStreetMap 并承认其贡献者的工作，您就可以使用
         OpenStreetMap。如果您改变或者使用这些数据，您必须按照相同的版权协议发布结果。详情请参见%{copyright_license_link}。
@@ -2236,13 +2250,18 @@ zh-CN:
       legal_title: 法律
       legal_1_1_html: 此网站和很多其他相关服务已由%{openstreetmap_foundation_link}（OSMF）正式代表社群运营。使用所有由OSMF运营的服务均需符合我们的%{terms_of_use_link}、%{aup_link}和我们的%{privacy_policy_link}。
       legal_1_1_openstreetmap_foundation: OpenStreetMap 基金会
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
       legal_1_1_terms_of_use: 使用条款
+      legal_1_1_terms_of_use_url: https://osmfoundation.org/wiki/Terms_of_Use
       legal_1_1_aup: 可接受的使用政策
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
       legal_1_1_privacy_policy: 隐私政策
+      legal_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
       legal_2_1_html: |-
         若您有许可证、著作权或其他法律上的问题，请%{contact_the_osmf_link}
         。
       legal_2_1_contact_the_osmf: 联系 OSM 基金会
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
       legal_2_2_html: OpenStreetMap、放大镜标志和SotM是%{registered_trademarks_link}。
       legal_2_2_registered_trademarks: OSMF 的注册商标
       partners_title: 合作伙伴
@@ -2949,18 +2968,6 @@ zh-CN:
       created from: 创建于：
       status: 状态：
       spam score: 垃圾邮件评分：
-      role:
-        administrator: 此用户是管理员
-        moderator: 此用户是仲裁员
-        importer: 此用户是导入者
-        grant:
-          administrator: 授予管理员权限
-          moderator: 授予仲裁员权限
-          importer: 授予导入者权限
-        revoke:
-          administrator: 撤销管理员权限
-          moderator: 撤销仲裁员权限
-          importer: 撤销导入者权限
       block_history: 激活的封禁
       moderator_history: 给予封禁
       revoke_all_blocks: 撤销所有封禁
@@ -3071,16 +3078,27 @@ zh-CN:
       heading: 您的ID尚未与OpenStreetMap账户相关联。
       option_1: 如果您是OpenStreetMap的新手，请使用下面的表单创建一个新账户。
       option_2: 如果您已拥有一个账户，您可以使用您的用户名和密码登录您的账户，然后在您的用户设置中将账户与您的ID相关联。
+    role_icons:
+      title:
+        administrator: 此用户是管理员
+        moderator: 此用户是仲裁员
+        importer: 此用户是导入者
+      grant:
+        administrator: 授予管理员权限
+        moderator: 授予仲裁员权限
+        importer: 授予导入者权限
+        are_you_sure: 您确定要赋予用户 '%{name}' 角色 '%{role}' 吗?
+      revoke:
+        administrator: 撤销管理员权限
+        moderator: 撤销仲裁员权限
+        importer: 撤销导入者权限
+        are_you_sure: 您确定要吊销用户 '%{name}' 角色 '%{role}' 吗?
   user_role:
     filter:
       not_a_role: 字串 '%{role}' 不是有效的角色。
       already_has_role: 这个用户已经有角色 %{role}。
       doesnt_have_role: 这个用户没有角色 %{role}。
       not_revoke_admin_current_user: 不能撤销当前用户的管理员角色。
-    grant:
-      are_you_sure: 您确定要赋予用户 '%{name}' 角色 '%{role}' 吗?
-    revoke:
-      are_you_sure: 您确定要吊销用户 '%{name}' 角色 '%{role}' 吗?
   user_blocks:
     model:
       non_moderator_update: 必须为仲裁员才能创建或更新一个封禁。
@@ -3404,6 +3422,8 @@ zh-CN:
       nothing_found: 未找到要素
       error: 连接 %{server} 时出错：%{error}
       timeout: 连接 %{server} 超时
+    element:
+      wikipedia: 维基百科
     context:
       directions_from: 从此处出发
       directions_to: 到此处的路线
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 095c6dc0a..be9bccfcd 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -451,8 +451,8 @@ zh-TW:
         tag: '%{key}=%{value} 標籤的 Wiki 說明頁面'
       wikidata_link: 維基數據上的 %{page} 項目
       wikidata_preview:
-        one: 維基數據項目預覽}
-        other: 維基數據項目預覽}
+        one: 維基數據項目預覽
+        other: 維基數據項目預覽
       wikipedia_link: 維基百科上的 %{page} 條目
       wikimedia_commons_link: 在維基共享資源上的%{page}項目
       telephone_link: 致電 %{phone_number}
@@ -2197,9 +2197,12 @@ zh-TW:
         想進一步了解這個社群，請參閱%{osm_blog_link}、%{user_diaries_link}、
         %{community_blogs_link}，以及%{osm_foundation_link}網站。
       community_driven_osm_blog: 開放街圖部落格
+      community_driven_osm_blog_url: https://blog.openstreetmap.org
       community_driven_user_diaries: 使用者日記
       community_driven_community_blogs: 社群部落格
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
       community_driven_osm_foundation: OSM 基金會
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
       open_data_title: 開放資料
       open_data_1_html: 開放街圖是%{open_data}的：你可以自由地使用作任何用途，前提是必須標明作者為 OpenStreetMap
         及其貢獻者。若你在我們的資料上作修改或以之透過某些方式衍生其他資料，則只可依相同授權條款散佈有關成果。詳情請參閱%{copyright_license_link}。
@@ -2209,13 +2212,19 @@ zh-TW:
       legal_1_1_html: 本站以及許多相關的服務正式由%{openstreetmap_foundation_link} (OSMF) 代表社群所營運。所有使用的
         OSMF 運行服務皆符合我們的%{terms_of_use_link}、%{aup_link}、和%{privacy_policy_link}。
       legal_1_1_openstreetmap_foundation: 開放街圖基金會
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
       legal_1_1_terms_of_use: 使用條款
+      legal_1_1_terms_of_use_url: https://osmfoundation.org/wiki/Terms_of_Use
       legal_1_1_aup: 可接受使用方針
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
       legal_1_1_privacy_policy: 隱私權政策
+      legal_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
       legal_2_1_html: 若你有授權、版權、或其他法律上的問題，請%{contact_the_osmf_link}。
       legal_2_1_contact_the_osmf: 聯絡 OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
       legal_2_2_html: 開放街圖、放大鏡標誌與 State of the Map 是%{registered_trademarks_link}。
       legal_2_2_registered_trademarks: OSMF 的註冊商標
+      legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
       partners_title: 合作夥伴
     copyright:
       title: 版權與授權條款
@@ -2924,18 +2933,6 @@ zh-TW:
       created from: 建立於：
       status: 狀態：
       spam score: 垃圾郵件分數：
-      role:
-        administrator: 這個使用者是一個管理員
-        moderator: 這個使用者是一個仲裁員
-        importer: 此名使用者是匯入者
-        grant:
-          administrator: 授予管理員權限
-          moderator: 授予仲裁員權限
-          importer: 授予匯入權限
-        revoke:
-          administrator: 撤銷管理員權限
-          moderator: 撤銷仲裁員權限
-          importer: 撤銷匯入權限
       block_history: 生效封鎖
       moderator_history: 給予封鎖
       revoke_all_blocks: 撤銷所有封鎖
@@ -3048,16 +3045,27 @@ zh-TW:
       heading: 你的 ID 尚未與開放街圖帳號關聯。
       option_1: 如果你是新來到開放街圖，請使用下方表單建立一個帳號。
       option_2: 如果你已擁有一個帳號，可以用你的使用者名稱與密碼登入你的帳號，並在使用者設定中關連你的 ID。
+    role_icons:
+      title:
+        administrator: 這個使用者是一個管理員
+        moderator: 這個使用者是一個仲裁員
+        importer: 此名使用者是匯入者
+      grant:
+        administrator: 授予管理員權限
+        moderator: 授予仲裁員權限
+        importer: 授予匯入權限
+        are_you_sure: 你確定要授予使用者 '%{name}' '%{role}' 的身份？
+      revoke:
+        administrator: 撤銷管理員權限
+        moderator: 撤銷仲裁員權限
+        importer: 撤銷匯入權限
+        are_you_sure: 你確定要撤銷使用者 '%{name}' '%{role}' 的身份？
   user_role:
     filter:
       not_a_role: 字串 '%{role}' 不是有效的身份。
       already_has_role: 這個使用者已經有 %{role} 身份。
       doesnt_have_role: 這個使用者沒有 %{role} 身份。
       not_revoke_admin_current_user: 無法撤銷目前使用者的管理員身份。
-    grant:
-      are_you_sure: 你確定要授予使用者 '%{name}' '%{role}' 的身份？
-    revoke:
-      are_you_sure: 你確定要撤銷使用者 '%{name}' '%{role}' 的身份？
   user_blocks:
     model:
       non_moderator_update: 只有仲裁員才可作出或更新封鎖。
@@ -3270,6 +3278,8 @@ zh-TW:
         transport_map: 交通運輸地圖
         tracestracktop_topo: 蹤跡地圖地形
         hot: 人道救援
+        shortbread: 奶油酥餅
+        openmaptiles_osm: MapTiler OMT
       layers:
         header: 地圖圖層
         notes: 地圖註記
@@ -3288,6 +3298,9 @@ zh-TW:
       tracestrack: 蹤跡地圖
       hotosm_credit: 由 %{osm_france_link} 代管的 %{hotosm_link} 所提供圖磚樣式
       hotosm_name: 開放街圖人道主義團隊
+      openmaptiles_credit: 來自%{openmaptiles_link}的向量圖磚由%{maptiler_link}提供
+      openmaptiles_name: 開放地圖圖磚
+      maptiler_name: MapTiler
     site:
       edit_tooltip: 編輯地圖
       edit_disabled_tooltip: 放大以編輯地圖
-- 
2.39.5