From: translatewiki.net <l10n-bot@translatewiki.net>
Date: Mon, 20 Sep 2021 11:10:19 +0000 (+0200)
Subject: Localisation updates from https://translatewiki.net.
X-Git-Tag: live~1992
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/47a216d0518f4ca1004411dc2d8767af7f1e4d2e?hp=4492e94a45ae5d140d12b4a086f7c85abfb7ee8e

Localisation updates from https://translatewiki.net.
---

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 8a3f9d09c..718607c17 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -417,6 +417,19 @@ af:
     timeout:
       sorry: Jammer, die lys met opmerkings wat u versoek het, het te lank geneem
         om op te spoor.
+  dashboards:
+    contact:
+      km away: '%{count}km vêr'
+      m away: '%{count}m vêr'
+    popup:
+      your location: U ligging
+      nearby mapper: Nabygeleë karteerder
+      friend: Vriend
+    show:
+      no friends: U het nog geen vriende bygevoeg nie.
+      nearby users: Ander nabygeleë gebruikers
+      no nearby users: Daar is nog geen ander gebruikers wat sê dat hulle in die nabye
+        omgewing karteer nie.
   diary_entries:
     new:
       title: Nuwe dagboekinskrywing
@@ -1877,12 +1890,6 @@ af:
       spam score: 'SPAM-telling:'
       description: Beskrywing
       user location: Ligging van gebruiker
-      no friends: U het nog geen vriende bygevoeg nie.
-      km away: '%{count}km vêr'
-      m away: '%{count}m vêr'
-      nearby users: Ander nabygeleë gebruikers
-      no nearby users: Daar is nog geen ander gebruikers wat sê dat hulle in die nabye
-        omgewing karteer nie.
       role:
         administrator: Hierdie gebruiker is 'n administrateur
         moderator: Hierdie gebruiker is 'n moderator
@@ -1902,10 +1909,6 @@ af:
       unhide_user: Wys hierdie gebruiker
       delete_user: Skrap dié Gebruiker
       confirm: Bevestig
-    popup:
-      your location: U ligging
-      nearby mapper: Nabygeleë karteerder
-      friend: Vriend
     account:
       title: Redigeer rekening
       my settings: My instellings
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index eb0e0132f..7606ac259 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -177,6 +177,18 @@ aln:
     index:
       title: Changesets
       title_user: Changesets nga %{user}
+  dashboards:
+    contact:
+      km away: '%{count}km larg'
+      m away: '%{count}m larg'
+    popup:
+      your location: Vendi juej
+      nearby mapper: Hartues i aftërt
+      friend: Shoq
+    show:
+      no friends: Hala nuk ke shtue asni shoq.
+      nearby users: Shfrytëzuesit e tjer që jan afër
+      no nearby users: Hala nuk ka shfrytëzues që pranon hartimin e aftërt.
   diary_entries:
     new:
       title: Hyrja e re Ditari
@@ -1169,11 +1181,6 @@ aln:
       spam score: 'Piket e Badihavgjive:'
       description: Përshkrimi
       user location: Veni i shfrytëzuesit
-      no friends: Hala nuk ke shtue asni shoq.
-      km away: '%{count}km larg'
-      m away: '%{count}m larg'
-      nearby users: Shfrytëzuesit e tjer që jan afër
-      no nearby users: Hala nuk ka shfrytëzues që pranon hartimin e aftërt.
       role:
         administrator: Ky shfrytëzues asht aministrator
         moderator: Ky shfrytëzues asht moderator
@@ -1193,10 +1200,6 @@ aln:
       unhide_user: shfaqe kët shfrytzues
       delete_user: fshije kët shfrytzues
       confirm: Konfirmo
-    popup:
-      your location: Vendi juej
-      nearby mapper: Hartues i aftërt
-      friend: Shoq
     account:
       title: Ndrysho akountin
       my settings: Preferencat e mia
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 4b884df37..bbdeac735 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -433,6 +433,23 @@ ar:
     timeout:
       sorry: عذرا، لقد استغرقت قائمة تعليقات مجموعة التغييرات اللتي طلبتها وقتا طويلا
         لاستردادها.
+  dashboards:
+    contact:
+      km away: على بعد %{count}كم
+      m away: على بعد %{count}متر
+    popup:
+      your location: مكانك
+      nearby mapper: مخطط بالجوار
+      friend: صديق
+    show:
+      my friends: أصدقائي
+      no friends: لم تقم بإضافة أي أصدقاء بعد.
+      nearby users: مستخدمون آخرون قريبون
+      no nearby users: لا يوجد بعد المزيد من المستخدمين أفصحوا عن تخطيطهم بالجوار.
+      friends_changesets: مجموعات تغييرات الأصدقاء
+      friends_diaries: مدخلات مدونات الأصدقاء
+      nearby_changesets: حزم تغييرات المستخدمين القريبين
+      nearby_diaries: إدخالات يوميات المستخدمين القريبين
   diary_entries:
     new:
       title: مدخلة يومية جديدة
@@ -2269,12 +2286,6 @@ ar:
       spam score: 'نتيجة السخام:'
       description: الوصف
       user location: موقع المستخدم
-      my friends: أصدقائي
-      no friends: لم تقم بإضافة أي أصدقاء بعد.
-      km away: على بعد %{count}كم
-      m away: على بعد %{count}متر
-      nearby users: مستخدمون آخرون قريبون
-      no nearby users: لا يوجد بعد المزيد من المستخدمين أفصحوا عن تخطيطهم بالجوار.
       role:
         administrator: هذا المستخدم إداري
         moderator: هذا المستخدم مشرف
@@ -2295,15 +2306,7 @@ ar:
       unhide_user: أظهر هذا المستخدم
       delete_user: احذف هذا المستخدم
       confirm: تأكيد
-      friends_changesets: مجموعات تغييرات الأصدقاء
-      friends_diaries: مدخلات مدونات الأصدقاء
-      nearby_changesets: حزم تغييرات المستخدمين القريبين
-      nearby_diaries: إدخالات يوميات المستخدمين القريبين
       report: أبلغ عن هذا المستخدم
-    popup:
-      your location: مكانك
-      nearby mapper: مخطط بالجوار
-      friend: صديق
     account:
       title: عدل الحساب
       my settings: إعداداتي
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index cf5bad49c..9a54b84f2 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -150,6 +150,17 @@ arz:
     index:
       title: حزم التغييرات
       title_user: حزم التغييرات بواسطه %{user}
+  dashboards:
+    contact:
+      km away: على بعد %{count}كم
+      m away: على بعد %{count}متر
+    popup:
+      your location: موقعك
+      nearby mapper: مخطط بالجوار
+    show:
+      no friends: لم تقم بإضافه أى أصدقاء بعد.
+      nearby users: 'مستخدمين بالجوار:'
+      no nearby users: لا يوجد بعد مستخدمين أفصحوا عن تخطيطهم بالجوار.
   diary_entries:
     new:
       title: مدخله يوميه جديدة
@@ -964,11 +975,6 @@ arz:
       created from: 'أُنشىء من:'
       description: الوصف
       user location: الموقع
-      no friends: لم تقم بإضافه أى أصدقاء بعد.
-      km away: على بعد %{count}كم
-      m away: على بعد %{count}متر
-      nearby users: 'مستخدمين بالجوار:'
-      no nearby users: لا يوجد بعد مستخدمين أفصحوا عن تخطيطهم بالجوار.
       role:
         administrator: هذا المستخدم إداري
         moderator: هذا المستخدم وسيط
@@ -987,9 +993,6 @@ arz:
       unhide_user: أظهر هذا المستخدم
       delete_user: احذف هذا المستخدم
       confirm: أكّد
-    popup:
-      your location: موقعك
-      nearby mapper: مخطط بالجوار
     account:
       title: عدّل الحساب
       my settings: إعداداتي
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index ab34d740f..d9d02bc25 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -378,6 +378,23 @@ ast:
     timeout:
       sorry: Llevó demasiao tiempu baxar la llista de comentarios del conxuntu de
         cambeos que pidisti.
+  dashboards:
+    contact:
+      km away: a %{count}km de distancia
+      m away: a %{count}m de distancia
+    popup:
+      your location: El to allugamientu
+      nearby mapper: Mapeador próximu
+      friend: Amigu
+    show:
+      my friends: Los mios amigos
+      no friends: Entá nun amestasti dengún amigu.
+      nearby users: Otros usuarios próximos
+      no nearby users: Entá nun hai otros usuarios que tean mapeando cerca de ti.
+      friends_changesets: conxuntos de cambios de los amigos
+      friends_diaries: entraes de diariu de los amigos
+      nearby_changesets: conxuntos de cambios d'usuarios cercanos
+      nearby_diaries: entraes de diariu d'usuarios cercanos
   diary_entries:
     new:
       title: Nueva entrada del diariu
@@ -2194,12 +2211,6 @@ ast:
       spam score: 'Puntuación de corréu puxarra:'
       description: Descripción
       user location: Allugamientu del usuariu
-      my friends: Los mios amigos
-      no friends: Entá nun amestasti dengún amigu.
-      km away: a %{count}km de distancia
-      m away: a %{count}m de distancia
-      nearby users: Otros usuarios próximos
-      no nearby users: Entá nun hai otros usuarios que tean mapeando cerca de ti.
       role:
         administrator: Esti usuariu ye alministrador
         moderator: Esti usuariu ye moderador
@@ -2220,15 +2231,7 @@ ast:
       unhide_user: Amosar esti usuariu
       delete_user: Desaniciar esti usuariu
       confirm: Confirmar
-      friends_changesets: conxuntos de cambios de los amigos
-      friends_diaries: entraes de diariu de los amigos
-      nearby_changesets: conxuntos de cambios d'usuarios cercanos
-      nearby_diaries: entraes de diariu d'usuarios cercanos
       report: Informar d'esti usuariu
-    popup:
-      your location: El to allugamientu
-      nearby mapper: Mapeador próximu
-      friend: Amigu
     account:
       title: Editar la cuenta
       my settings: Les mios preferencies
diff --git a/config/locales/az.yml b/config/locales/az.yml
index feb24acf6..0e9ebe37a 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -254,6 +254,10 @@ az:
     timeout:
       sorry: Bağışlayın, tələb etdiyiniz dəyişikliklər dəstinin siyahısı, çıxarıla
         bilmək üçün cox böyükdür.
+  dashboards:
+    popup:
+      your location: Yerləşdiyin yer
+      friend: Dost
   diary_entries:
     new:
       title: Yeni Gündəlik Yazısı
@@ -1100,9 +1104,6 @@ az:
       hide_user: Bu istifadəçini gizlət
       delete_user: bu istifadəçini sil
       confirm: Təsdiq et
-    popup:
-      your location: Yerləşdiyin yer
-      friend: Dost
     account:
       current email address: 'Hazırki E-Poçt Ünvanı:'
       openid:
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 08524a67e..d8296618b 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -359,6 +359,23 @@ be-Tarask:
     timeout:
       sorry: Прабачце, сьпіс набораў зьменаў, які Вы запыталі, занадта вялікі для
         атрыманьня.
+  dashboards:
+    contact:
+      km away: '%{count}км ад Вас'
+      m away: '%{count}м ад Вас'
+    popup:
+      your location: Вашае месцазнаходжаньне
+      nearby mapper: Бліжэйшы стваральнік мапаў
+      friend: Сябар
+    show:
+      no friends: Пакуль што Вы не дадалі нікога ў сябры.
+      nearby users: Іншыя бліжэйшыя карыстальнікі
+      no nearby users: Няма іншых карыстальнікаў, якія прызнаюць, што займаюцца складаньнем
+        мапы каля Вас.
+      friends_changesets: наборы зьменаў сяброў
+      friends_diaries: запісы сяброўскіх дзёньнікаў
+      nearby_changesets: наборы зьменаў суседніх удзельнікаў
+      nearby_diaries: запісы дзёньнікаў суседніх удзельнікаў
   diary_entries:
     new:
       title: Новы запіс у дзёньніку
@@ -1454,12 +1471,6 @@ be-Tarask:
       spam score: 'Адзнака спаму:'
       description: Апісаньне
       user location: Меcцазнаходжаньне ўдзельніка
-      no friends: Пакуль што Вы не дадалі нікога ў сябры.
-      km away: '%{count}км ад Вас'
-      m away: '%{count}м ад Вас'
-      nearby users: Іншыя бліжэйшыя карыстальнікі
-      no nearby users: Няма іншых карыстальнікаў, якія прызнаюць, што займаюцца складаньнем
-        мапы каля Вас.
       role:
         administrator: Гэты карыстальнік зьяўляецца адміністратарам
         moderator: Гэты карыстальнік зьяўляецца мадэратарам
@@ -1479,14 +1490,6 @@ be-Tarask:
       unhide_user: Паказаць гэтага ўдзельніка
       delete_user: Выдаліць гэтага ўдзельніка
       confirm: Пацьвердзіць
-      friends_changesets: наборы зьменаў сяброў
-      friends_diaries: запісы сяброўскіх дзёньнікаў
-      nearby_changesets: наборы зьменаў суседніх удзельнікаў
-      nearby_diaries: запісы дзёньнікаў суседніх удзельнікаў
-    popup:
-      your location: Вашае месцазнаходжаньне
-      nearby mapper: Бліжэйшы стваральнік мапаў
-      friend: Сябар
     account:
       title: Рэдагаваньне рахунку
       my settings: Мае налады
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 332d13249..ea12eb8f4 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -414,6 +414,24 @@ be:
       title_particular: 'Абмеркаванне пакета правак OpenStreetMap #%{changeset_id}'
     timeout:
       sorry: Прабачце, спіс пакетаў правак, што Вы запыталі, занадта вялікі для сцягвання.
+  dashboards:
+    contact:
+      km away: '%{count} км ад вас'
+      m away: '%{count} м ад Вас'
+    popup:
+      your location: Ваша месцазнаходжанне
+      nearby mapper: Карыстальнік
+      friend: Сябар
+    show:
+      my friends: Мае сябры
+      no friends: Вы пакуль не дадалі нікога ў сябры.
+      nearby users: 'Карыстальнікі паблізу:'
+      no nearby users: Пакуль што няма карыстальнікаў, якія пазначылі сваё месцазнаходжанне
+        паблізу.
+      friends_changesets: наборы зменаў сяброў
+      friends_diaries: запісы дзёньнікаў сяброў
+      nearby_changesets: наборы зменаў удзельнікаў паблізу
+      nearby_diaries: запісы дзённікаў карыстальнікаў паблізу
   diary_entries:
     new:
       title: Новы запіс дзённіку
@@ -2216,13 +2234,6 @@ be:
       spam score: 'Адзнака спаму:'
       description: Апісанне
       user location: Месцазнаходжанне
-      my friends: Мае сябры
-      no friends: Вы пакуль не дадалі нікога ў сябры.
-      km away: '%{count} км ад вас'
-      m away: '%{count} м ад Вас'
-      nearby users: 'Карыстальнікі паблізу:'
-      no nearby users: Пакуль што няма карыстальнікаў, якія пазначылі сваё месцазнаходжанне
-        паблізу.
       role:
         administrator: Гэты карыстальнік з'яўляецца адміністратарам
         moderator: Гэты карыстальнік з'яўляецца мадэратарам
@@ -2243,15 +2254,7 @@ be:
       unhide_user: Паказаць гэтага карыстальніка
       delete_user: Выдаліць гэтага карыстальніка
       confirm: Пацвердзіць
-      friends_changesets: наборы зменаў сяброў
-      friends_diaries: запісы дзёньнікаў сяброў
-      nearby_changesets: наборы зменаў удзельнікаў паблізу
-      nearby_diaries: запісы дзённікаў карыстальнікаў паблізу
       report: Паскардзіцца на гэтага карыстальніка
-    popup:
-      your location: Ваша месцазнаходжанне
-      nearby mapper: Карыстальнік
-      friend: Сябар
     account:
       title: Правіць рахунак
       my settings: Мае настройкі
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index a6f3e359e..8dc45282b 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -391,6 +391,19 @@ bg:
     timeout:
       sorry: Съжаляваме, но списъка с коментарит по промените който заявихте се зарежда
         твърде дълго.
+  dashboards:
+    contact:
+      km away: '%{count} км от вас'
+      m away: '%{count} м от вас'
+    popup:
+      your location: Моето местоположение
+      nearby mapper: Картографи в близост
+      friend: Приятел
+    show:
+      my friends: Моите приятели
+      no friends: Все още нямате добавени приятели.
+      nearby users: Други потребители в близост
+      no nearby users: Все още няма други потребители, които картографират в близост.
   diary_entries:
     new:
       title: Нова публикация в дневника
@@ -1806,12 +1819,6 @@ bg:
       spam score: 'Оценка за спам:'
       description: Описание
       user location: Местоположение
-      my friends: Моите приятели
-      no friends: Все още нямате добавени приятели.
-      km away: '%{count} км от вас'
-      m away: '%{count} м от вас'
-      nearby users: Други потребители в близост
-      no nearby users: Все още няма други потребители, които картографират в близост.
       role:
         administrator: Този потребител е администратор
         moderator: Този потребител е модератор
@@ -1827,10 +1834,6 @@ bg:
       delete_user: Изтриване на този потребител
       confirm: Потвърдете
       report: Докладване на потребителя
-    popup:
-      your location: Моето местоположение
-      nearby mapper: Картографи в близост
-      friend: Приятел
     account:
       title: Промяна на профил
       my settings: Моите настройки
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 6c2579579..edde5f7c6 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -415,6 +415,14 @@ bn:
     index:
       title_all: ওপেনস্ট্রিটম্যাপ পরিবর্তনধার্যের আলোচনা
       title_particular: 'ওপেনস্ট্রিটম্যাপ পরিবর্তনধার্য #%{changeset_id} আলোচনা'
+  dashboards:
+    popup:
+      your location: আপনার অবস্থান
+      friend: বন্ধু
+    show:
+      my friends: আমার বন্ধুগণ
+      no friends: আপনি বন্ধুতালিকায় কাউকে যুক্ত করেননি।
+      nearby users: কাছাকাছি অন্য ব্যবহারকারী
   diary_entries:
     new:
       title: নতুন দিনলিপির ভুক্তি
@@ -1628,9 +1636,6 @@ bn:
       email address: 'ই-মেইল ঠিকানা:'
       description: বিবরণ
       user location: ব্যবহারকারীর অবস্থান
-      my friends: আমার বন্ধুগণ
-      no friends: আপনি বন্ধুতালিকায় কাউকে যুক্ত করেননি।
-      nearby users: কাছাকাছি অন্য ব্যবহারকারী
       block_history: সক্রিয় বাধাসমূহ
       moderator_history: প্রদত্ত বাধাগুলি
       comments: মন্তব্যসমূহ
@@ -1642,9 +1647,6 @@ bn:
       unhide_user: এই ব্যবহাকারীকে দেখান
       delete_user: এই ব্যবহাকারীকে অপসারণ করুন
       confirm: নিশ্চিত করুন
-    popup:
-      your location: আপনার অবস্থান
-      friend: বন্ধু
     account:
       title: অ্যাকাউন্ট সম্পাদনা করুন
       my settings: আমার সেটিংস
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 3b32f8dbc..34f9b23a0 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -450,6 +450,24 @@ br:
       title_particular: 'Kaozeadenn hollad cheñchamantoù #%{changeset_id} OpenStreetMap'
     timeout:
       sorry: Ho tigarez, re hir eo adtapout ar roll evezhiadennoù ho peus goulennet.
+  dashboards:
+    contact:
+      km away: war-hed %{count} km
+      m away: war-hed %{count} m
+    popup:
+      your location: Ho lec'hiadur
+      nearby mapper: Kartennour en ardremez
+      friend: Mignon
+    show:
+      edit_your_profile: Aozañ ho profil
+      my friends: Ma mignoned
+      no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh.
+      nearby users: 'Implijerien all tost deoc''h :'
+      no nearby users: N'eus implijer ebet all en ardremez c'hoazh.
+      friends_changesets: Strolladoù kemmoù graet gant mignoned
+      friends_diaries: Enmonedoù deizlevr ar vignoned
+      nearby_changesets: Strolladoù kemmoù an implijer tro-war-dro
+      nearby_diaries: Enmonedoù deizlevr an implijerien tro-war-dro
   diary_entries:
     new:
       title: Enmoned nevez en deizlevr
@@ -2443,13 +2461,6 @@ br:
       spam score: 'Notenn evit ar strob :'
       description: Deskrivadur
       user location: Lec'hiadur an implijer
-      edit_your_profile: Aozañ ho profil
-      my friends: Ma mignoned
-      no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh.
-      km away: war-hed %{count} km
-      m away: war-hed %{count} m
-      nearby users: 'Implijerien all tost deoc''h :'
-      no nearby users: N'eus implijer ebet all en ardremez c'hoazh.
       role:
         administrator: Ur merour eo an implijer-mañ
         moderator: Un habaskaer eo an implijer-mañ
@@ -2470,15 +2481,7 @@ br:
       unhide_user: Diguzhat an implijer-mañ
       delete_user: Dilemel an implijer-mañ
       confirm: Kadarnaat
-      friends_changesets: Strolladoù kemmoù graet gant mignoned
-      friends_diaries: Enmonedoù deizlevr ar vignoned
-      nearby_changesets: Strolladoù kemmoù an implijer tro-war-dro
-      nearby_diaries: Enmonedoù deizlevr an implijerien tro-war-dro
       report: Disklêriañ an implijer-mañ
-    popup:
-      your location: Ho lec'hiadur
-      nearby mapper: Kartennour en ardremez
-      friend: Mignon
     account:
       title: Aozañ ar gont
       my settings: Ma arventennoù
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index c02030fe7..dac8de0e7 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -250,6 +250,23 @@ bs:
     timeout:
       sorry: Žao nam je, listi seta promjena koju ste tražili je predugo trajalo za
         preuzimanje.
+  dashboards:
+    contact:
+      km away: korisnik udaljen %{count}km
+      m away: '%{count}m daleko'
+    popup:
+      your location: Vaša lokacija
+      nearby mapper: Obližnji maper
+      friend: Prijatelj
+    show:
+      no friends: Niste dodali nijednog prijatelja.
+      nearby users: Drugi obližnji korisnici
+      no nearby users: Još uvijek nema drugih korisnika koji ucrtavaju na kartu u
+        blizini.
+      friends_changesets: promjena spiska prijatelja
+      friends_diaries: unosi u dnevnik prijatelja
+      nearby_changesets: promjene spiska obližnjih korisnika
+      nearby_diaries: unosi u dnevnik obližnjih korisnika
   diary_entries:
     new:
       title: Novi unos u dnevnik
@@ -1502,12 +1519,6 @@ bs:
       spam score: 'Spam ocjena:'
       description: Opis
       user location: Lokacija boravišta korisnika
-      no friends: Niste dodali nijednog prijatelja.
-      km away: korisnik udaljen %{count}km
-      m away: '%{count}m daleko'
-      nearby users: Drugi obližnji korisnici
-      no nearby users: Još uvijek nema drugih korisnika koji ucrtavaju na kartu u
-        blizini.
       role:
         administrator: Ovaj korisnik je administrator
         moderator: Ovaj korisnik je moderator
@@ -1528,14 +1539,6 @@ bs:
       unhide_user: Otkrij ovog korisnika
       delete_user: Obriši ovog korisnika
       confirm: Potvrditi
-      friends_changesets: promjena spiska prijatelja
-      friends_diaries: unosi u dnevnik prijatelja
-      nearby_changesets: promjene spiska obližnjih korisnika
-      nearby_diaries: unosi u dnevnik obližnjih korisnika
-    popup:
-      your location: Vaša lokacija
-      nearby mapper: Obližnji maper
-      friend: Prijatelj
     account:
       title: Urediti korisnički račun
       my settings: Moja podešavanja
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1e26093e4..8c964cf39 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -468,6 +468,26 @@ ca:
     timeout:
       sorry: La llista de comentaris de conjunts de canvis que heu sol·licitat ha
         trigat massa a recuperar-se.
+  dashboards:
+    contact:
+      km away: '%{count}km de distància'
+      m away: '%{count}m de distància'
+    popup:
+      your location: La vostra ubicació
+      nearby mapper: Cartògraf proper
+      friend: Amic
+    show:
+      no_home_location_html: '%{edit_profile_link} i establiu la ubicació de casa
+        vostra per veure usuaris propers.'
+      edit_your_profile: Editeu el vostre perfil
+      my friends: Les meves amistats
+      no friends: Encara no has afegit cap amic.
+      nearby users: Altres usuaris propers
+      no nearby users: Cap usuari manifesta cartografiar a prop.
+      friends_changesets: conjunts de canvis dels vostres amics
+      friends_diaries: entrades de diari dels vostres amics
+      nearby_changesets: conjunts de canvis d'usuaris propers
+      nearby_diaries: entrades de diari d'usuaris propers
   diary_entries:
     new:
       title: Entrada de diari nova
@@ -2624,15 +2644,6 @@ ca:
       spam score: 'Puntuació de contingut brossa:'
       description: Descripció
       user location: Ubicació de l'usuari
-      no_home_location_html: '%{edit_profile_link} i establiu la ubicació de casa
-        vostra per veure usuaris propers.'
-      edit_your_profile: Editeu el vostre perfil
-      my friends: Les meves amistats
-      no friends: Encara no has afegit cap amic.
-      km away: '%{count}km de distància'
-      m away: '%{count}m de distància'
-      nearby users: Altres usuaris propers
-      no nearby users: Cap usuari manifesta cartografiar a prop.
       role:
         administrator: Aquest usuari és administrador
         moderator: Aquest usuari és moderador
@@ -2653,15 +2664,7 @@ ca:
       unhide_user: No amaguis aquest usuari
       delete_user: Suprimeix aquest usuari
       confirm: Confirma
-      friends_changesets: conjunts de canvis dels vostres amics
-      friends_diaries: entrades de diari dels vostres amics
-      nearby_changesets: conjunts de canvis d'usuaris propers
-      nearby_diaries: entrades de diari d'usuaris propers
       report: Denuncieu aquest usuari
-    popup:
-      your location: La vostra ubicació
-      nearby mapper: Cartògraf proper
-      friend: Amic
     account:
       title: Edita el compte
       my settings: Preferències
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index e272a6f3c..d32c4a4ab 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -341,6 +341,11 @@ ce:
     index:
       title_all: OpenStreetMap тӀехь дина нисдарийн дийцар
       title_particular: 'OpenStreetMap #%{changeset_id} тӀехь дина нисдарийн дийцар'
+  dashboards:
+    popup:
+      friend: ДоттагӀ
+    show:
+      my friends: ДоттагӀий
   diary_entries:
     new:
       title: Керла дӀайаздар дневник чохь
@@ -955,10 +960,7 @@ ce:
       spam score: 'Спаман маххадор:'
       description: Цуьнах лаьцна
       user location: Декъашхо волу/йолу меттиг
-      my friends: ДоттагӀий
       report: Хаамбе хӀокху декъашхох
-    popup:
-      friend: ДоттагӀ
     account:
       current email address: 'Карара электронан поштан адрес:'
       openid:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 443307aa1..0e99dfd89 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1,6 +1,7 @@
 # Messages for Czech (čeština)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: AlesFiala2002
 # Author: Bilbo
 # Author: Bilykralik16
 # Author: Chmee2
@@ -479,6 +480,28 @@ cs:
     timeout:
       sorry: Omlouváme se, ale vámi požadované komentáře k sadě změn se načítaly příliš
         dlouho.
+  dashboards:
+    contact:
+      km away: '%{count} km'
+      m away: '%{count} m'
+    popup:
+      your location: Vaše poloha
+      nearby mapper: Nedaleký uživatel
+      friend: Přítel
+    show:
+      title: Moje nástěnka
+      no_home_location_html: '%{edit_profile_link} a nastavte si domovskou lokaci,
+        abyste viděli uživatele ve vašem okolí.'
+      edit_your_profile: Upravte si profil
+      my friends: Moji přátelé
+      no friends: Zatím jste nepřidali žádné přátele.
+      nearby users: Další uživatelé poblíž
+      no nearby users: Nejsou známi žádní uživatelé, kteří by uvedli domov blízko
+        vás.
+      friends_changesets: sady změn přátel
+      friends_diaries: záznamy v denících přátel
+      nearby_changesets: sady změn uživatelů poblíž
+      nearby_diaries: záznamy v denících uživatelů poblíž
   diary_entries:
     new:
       title: Nový záznam do deníku
@@ -2613,6 +2636,7 @@ cs:
       my settings: Moje nastavení
       my comments: Moje komentáře
       my_preferences: Moje preference
+      my_dashboard: Moje nástěnka
       blocks on me: Moje zablokování
       blocks by me: Zablokování mnou
       edit_profile: Upravit profil
@@ -2634,16 +2658,6 @@ cs:
       spam score: 'Spam skóre:'
       description: Popis
       user location: Poloha uživatele
-      no_home_location_html: '%{edit_profile_link} a nastavte si domovskou lokaci,
-        abyste viděli uživatele ve vašem okolí.'
-      edit_your_profile: Upravte si profil
-      my friends: Moji přátelé
-      no friends: Zatím jste nepřidali žádné přátele.
-      km away: '%{count} km'
-      m away: '%{count} m'
-      nearby users: Další uživatelé poblíž
-      no nearby users: Nejsou známi žádní uživatelé, kteří by uvedli domov blízko
-        vás.
       role:
         administrator: Tento uživatel je správce
         moderator: Tento uživatel je moderátor
@@ -2664,15 +2678,7 @@ cs:
       unhide_user: Zobrazit tohoto uživatele
       delete_user: Odstranit tohoto uživatele
       confirm: Potvrdit
-      friends_changesets: sady změn přátel
-      friends_diaries: záznamy v denících přátel
-      nearby_changesets: sady změn uživatelů poblíž
-      nearby_diaries: záznamy v denících uživatelů poblíž
       report: Nahlásit tohoto uživatele
-    popup:
-      your location: Vaše poloha
-      nearby mapper: Nedaleký uživatel
-      friend: Přítel
     account:
       title: Upravit účet
       my settings: Moje nastavení
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 496926d72..963ec0bf0 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -308,6 +308,22 @@ cy:
     index:
       title_all: Trafodaeth OpenStreetMa o'r setiau-newid
       title_particular: 'Trafodaeth OpenStreetMap set-newid #%{changeset_id}'
+  dashboards:
+    contact:
+      km away: '%{count}km i ffwrdd'
+      m away: '%{count}m i ffwrdd'
+    popup:
+      your location: Eich lleoliad
+      nearby mapper: Mapiwr gerllaw
+      friend: Cyfaill
+    show:
+      no friends: Nid ydych wedi ychwanegu cyfaill eto.
+      nearby users: Defnyddwyr eraill gerllaw
+      no nearby users: Nid oes defnyddwyr gerllaw sy'n datgelu eu bod yn mapio eto.
+      friends_changesets: setiau-newid eich cyfeillion
+      friends_diaries: cofnodion dyddiaduron cyfeillion
+      nearby_changesets: setiau-newid gerllaw
+      nearby_diaries: cofnodion dyddiaduron defnyddwyr gerllaw
   diary_entries:
     new:
       title: Cofnod Dyddiadur Newydd
@@ -1455,11 +1471,6 @@ cy:
       status: 'Statws:'
       description: Disgrifiad
       user location: Lleoliad defnyddiwr
-      no friends: Nid ydych wedi ychwanegu cyfaill eto.
-      km away: '%{count}km i ffwrdd'
-      m away: '%{count}m i ffwrdd'
-      nearby users: Defnyddwyr eraill gerllaw
-      no nearby users: Nid oes defnyddwyr gerllaw sy'n datgelu eu bod yn mapio eto.
       role:
         administrator: Mae'r defnyddiwr hwn yn weinyddwr.
         moderator: Mae'r defnyddiwr hwn yn gymedrolwr.
@@ -1472,14 +1483,6 @@ cy:
       unhide_user: Datguddio'r Defnyddiwr
       delete_user: Dileu'r Defnyddiwr
       confirm: Cadarnhau
-      friends_changesets: setiau-newid eich cyfeillion
-      friends_diaries: cofnodion dyddiaduron cyfeillion
-      nearby_changesets: setiau-newid gerllaw
-      nearby_diaries: cofnodion dyddiaduron defnyddwyr gerllaw
-    popup:
-      your location: Eich lleoliad
-      nearby mapper: Mapiwr gerllaw
-      friend: Cyfaill
     account:
       title: Golygu'r cyfrif
       my settings: Fy ngosodiadau
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 977b42c0f..7f7e537c1 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -446,6 +446,24 @@ da:
     timeout:
       sorry: Desværre tog det for lang tid at indlæse kommentarerne til ændringssættet
         du har bedt om.
+  dashboards:
+    contact:
+      km away: '%{count}km væk'
+      m away: '%{count}m væk'
+    popup:
+      your location: Din position
+      nearby mapper: Bruger i nærheden
+      friend: Ven
+    show:
+      my friends: Mine venner
+      no friends: Du har ikke tilføjet nogle venner endnu.
+      nearby users: 'Andre brugere i nærheden:'
+      no nearby users: Der er ingen andre brugere der har angivet at de kortlægger
+        i nærheden.
+      friends_changesets: venners ændringssæt
+      friends_diaries: venners blogindlæg
+      nearby_changesets: ændringssæt af brugere i nærheden
+      nearby_diaries: blogindlæg af brugere i nærheden
   diary_entries:
     new:
       title: Nyt blogindlæg
@@ -2539,13 +2557,6 @@ da:
       spam score: 'Spambedømmelse:'
       description: Beskrivelse
       user location: Brugerposition
-      my friends: Mine venner
-      no friends: Du har ikke tilføjet nogle venner endnu.
-      km away: '%{count}km væk'
-      m away: '%{count}m væk'
-      nearby users: 'Andre brugere i nærheden:'
-      no nearby users: Der er ingen andre brugere der har angivet at de kortlægger
-        i nærheden.
       role:
         administrator: Denne bruger er en administrator
         moderator: Denne bruger er en moderator
@@ -2566,15 +2577,7 @@ da:
       unhide_user: Skjul ikke længere denne bruger
       delete_user: Slet denne bruger
       confirm: Bekræft
-      friends_changesets: venners ændringssæt
-      friends_diaries: venners blogindlæg
-      nearby_changesets: ændringssæt af brugere i nærheden
-      nearby_diaries: blogindlæg af brugere i nærheden
       report: Rapporter denne bruger
-    popup:
-      your location: Din position
-      nearby mapper: Bruger i nærheden
-      friend: Ven
     account:
       title: Rediger konto
       my settings: Mine indstillinger
diff --git a/config/locales/de.yml b/config/locales/de.yml
index fd7247a51..366c14e2d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -509,6 +509,28 @@ de:
     timeout:
       sorry: Leider ist die Liste der Kommentare der Änderungssätze, die du angefordert
         hast, für den Abruf zu lang.
+  dashboards:
+    contact:
+      km away: '%{count} km entfernt'
+      m away: '%{count} m entfernt'
+    popup:
+      your location: Standort
+      nearby mapper: Mapper in der Nähe
+      friend: Freund
+    show:
+      title: Meine Übersichtsseite
+      no_home_location_html: '%{edit_profile_link} und leg deine Heimatort fest, um
+        Benutzer in der Nähe zu sehen.'
+      edit_your_profile: Bearbeite dein Profil
+      my friends: Meine Freunde
+      no friends: Du hast noch keine Freunde hinzugefügt.
+      nearby users: Mapper in der Nähe
+      no nearby users: Es gibt bisher keine Benutzer, die einen Standort in deiner
+        Nähe angegeben haben.
+      friends_changesets: Änderungssätze deiner Freunde
+      friends_diaries: Blogs deiner Freunde
+      nearby_changesets: Änderungssätze von Benutzern in der Nähe
+      nearby_diaries: Blogs von Benutzern in der Nähe
   diary_entries:
     new:
       title: Neuer Blogeintrag
@@ -843,6 +865,7 @@ de:
           window_construction: Fensterbauer
           winery: Weingut
           "yes": Handwerksgeschäft
+        crossing: Überquerung
         emergency:
           access_point: Zugangspunkt
           ambulance_station: Rettungswache
@@ -1098,6 +1121,7 @@ de:
           hill: Hügel
           hot_spring: Heiße Quelle
           island: Insel
+          isthmus: Isthmus
           land: Land
           marsh: Marsch
           moor: Moor
@@ -1112,10 +1136,13 @@ de:
           sand: Sand
           scree: Geröll
           scrub: Buschland
+          shingle: Geröll
           spring: Quelle
           stone: Findling
           strait: Meerenge
           tree: Baum
+          tree_row: Baumreihe
+          tundra: Tundra
           valley: Tal
           volcano: Vulkan
           water: Wasser
@@ -1518,9 +1545,10 @@ de:
     intro_text: OpenStreetMap ist eine Karte der Welt, erstellt von Menschen wie dir
       und frei verwendbar unter einer offenen Lizenz.
     intro_2_create_account: Erstelle ein Benutzerkonto
-    hosting_partners_html: Das Hosting wird von %{ucl}, %{bytemark} und anderen %{partners}
-      unterstützt.
+    hosting_partners_html: Das Hosting wird von %{ucl}, %{fastly}, %{bytemark} und
+      anderen %{partners} unterstützt.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: Partnern
     tou: Nutzungsbedingungen
@@ -2043,8 +2071,11 @@ de:
           BY AT</a>), des <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Landes
           Vorarlberg</a> und des Landes Tirol (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">lizenziert
           gemäß CC BY AT samt Erweiterungen zur Lizenz</a>).'
-        contributors_au_html: '<strong>Australien</strong>: Enthält Daten zu Siedlungen,
-          die auf Daten des <i>Australian Bureau of Statistics</i> basieren.'
+        contributors_au_html: |-
+          <strong>Australien</strong>: Eingebunden oder entwickelt unter Verwendung von administrativen Grenzen &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
+          lizenziert durch den Commonwealth of Australia unter
+          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International Lizenz (CC BY 4.0)</a>.
         contributors_ca_html: '<strong>Kanada</strong>: Enthält Daten von GeoBase&reg;,
           GeoGratis (&copy; <i>Department of Natural Resources Canada</i>), CanVec
           (&copy; <i>Department of Natural Resources Canada</i>) und StatCan (<i>Geography
@@ -2708,6 +2739,7 @@ de:
       my settings: Einstellungen
       my comments: Meine Kommentare
       my_preferences: Meine Benutzereinstellungen
+      my_dashboard: Meine Übersichtsseite
       blocks on me: Erhaltene Sperren
       blocks by me: Vergebene Sperren
       edit_profile: Profil bearbeiten
@@ -2729,16 +2761,6 @@ de:
       spam score: 'Spam-Bewertung:'
       description: Beschreibung
       user location: Standort des Benutzers
-      no_home_location_html: '%{edit_profile_link} und leg deine Heimatort fest, um
-        Benutzer in der Nähe zu sehen.'
-      edit_your_profile: Bearbeite dein Profil
-      my friends: Meine Freunde
-      no friends: Du hast noch keine Freunde hinzugefügt.
-      km away: '%{count} km entfernt'
-      m away: '%{count} m entfernt'
-      nearby users: Mapper in der Nähe
-      no nearby users: Es gibt bisher keine Benutzer, die einen Standort in deiner
-        Nähe angegeben haben.
       role:
         administrator: Dieser Benutzer ist ein Administrator
         moderator: Dieser Benutzer ist ein Moderator
@@ -2759,15 +2781,7 @@ de:
       unhide_user: Benutzer nicht mehr verstecken
       delete_user: Benutzer löschen
       confirm: Bestätigen
-      friends_changesets: Änderungssätze deiner Freunde
-      friends_diaries: Blogs deiner Freunde
-      nearby_changesets: Änderungssätze von Benutzern in der Nähe
-      nearby_diaries: Blogs von Benutzern in der Nähe
       report: Diesen Benutzer melden
-    popup:
-      your location: Standort
-      nearby mapper: Mapper in der Nähe
-      friend: Freund
     account:
       title: Benutzerkonto bearbeiten
       my settings: Einstellungen
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 1c416e268..e5d2db786 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -288,6 +288,14 @@ diq:
       title_friend: Qeydê vurnayışê embazan
       title_nearby: Nezdıra vurriyayışê setê karberi
       load_more: Tayêna bar ke
+  dashboards:
+    contact:
+      km away: '%{count} km duriyo'
+      m away: '%{count} metre nezdiyo'
+    popup:
+      your location: Heruna mı
+      nearby mapper: Xeritoğo emıryan
+      friend: Embaz
   diary_entries:
     new:
       title: Roceko newe definayış
@@ -1023,8 +1031,6 @@ diq:
       status: 'Weziyet:'
       description: Şınasnayış
       user location: Heruna karberi
-      km away: '%{count} km duriyo'
-      m away: '%{count} metre nezdiyo'
       role:
         administrator: |-
           Na karber administratora<br>
@@ -1049,10 +1055,6 @@ diq:
       unhide_user: nê karberi menımnê
       delete_user: nê karberi esternê
       confirm: Tesdiq ke
-    popup:
-      your location: Heruna mı
-      nearby mapper: Xeritoğo emıryan
-      friend: Embaz
     account:
       title: Hesabi bıvurne
       my settings: Eyarê mı
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 5ae56f531..ee290903f 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -288,6 +288,22 @@ dsb:
       load_more: Wěcej zacytaś
     timeout:
       sorry: Bóžko jo pśedłujko trało, kupki změnow, kótarež  sy póžedał, wótwołaś.
+  dashboards:
+    contact:
+      km away: '%{count} km zdalony'
+      m away: '%{count} m zdalony'
+    popup:
+      your location: Twójo městno
+      nearby mapper: Kartěrowaŕ w bliskosći
+      friend: Pśijaśel
+    show:
+      no friends: Hyšći njejsy žednych pśijaśelow pśidał.
+      nearby users: Druge wužywarje w bliskosći
+      no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći.
+      friends_changesets: Sajźby změnow twójich pśijaśelow
+      friends_diaries: dnjownikowe zapiski pśijaśelow
+      nearby_changesets: sajźby změnow wužywarjow w bliskosći
+      nearby_diaries: dnjownikowe zapiski wužywarjow w bliskosći
   diary_entries:
     new:
       title: Nowy zapisk dnjownika
@@ -1693,11 +1709,6 @@ dsb:
       spam score: 'Spamowe gódnośenje:'
       description: Wopisanje
       user location: Wužywarske městno
-      no friends: Hyšći njejsy žednych pśijaśelow pśidał.
-      km away: '%{count} km zdalony'
-      m away: '%{count} m zdalony'
-      nearby users: Druge wužywarje w bliskosći
-      no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći.
       role:
         administrator: Toś ten wužywaŕ jo administrator
         moderator: Toś ten wužywaŕ jo moderator
@@ -1718,14 +1729,6 @@ dsb:
       unhide_user: toś togo wužiwarja pokazaś
       delete_user: toś togo wužywarja lašowaś
       confirm: Wobkšuśiś
-      friends_changesets: Sajźby změnow twójich pśijaśelow
-      friends_diaries: dnjownikowe zapiski pśijaśelow
-      nearby_changesets: sajźby změnow wužywarjow w bliskosći
-      nearby_diaries: dnjownikowe zapiski wužywarjow w bliskosći
-    popup:
-      your location: Twójo městno
-      nearby mapper: Kartěrowaŕ w bliskosći
-      friend: Pśijaśel
     account:
       title: Konto wobźěłaś
       my settings: Móje nastajenja
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 534676fd1..682e1d818 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -55,6 +55,9 @@ el:
       client_application:
         create: Εγγραφή
         update: Ενημέρωση
+      doorkeeper_application:
+        create: Εγγραφή
+        update: Ενημέρωση
       redaction:
         create: Δημιουργία παράλειψης
         update: Αποθήκευση παράλειψης
@@ -68,7 +71,7 @@ el:
     errors:
       messages:
         invalid_email_address: δεν φαίνεται να είναι έγκυρη διεύθυνση ηλ. ταχυδρομείου
-        email_address_not_routable: Δεν είναι δρομολογητέο
+        email_address_not_routable: δεν είναι δρομολογητέο
     models:
       acl: Λίστα ελέγχου πρόσβασης
       changeset: Ομάδα αλλαγών
@@ -107,9 +110,18 @@ el:
       way_tag: Ετικέτα διαδρομής
     attributes:
       client_application:
-        name: Όνομα (Υποχρεωτικό)
+        name: Όνομα (απαιτείται)
+        url: URL κύριας εφαρμογής (απαιτείται)
         callback_url: URL Επανάκλησης
         support_url: URL Υποστήριξης
+        allow_read_prefs: ανάγνωση των προτιμήσεων χρήστη
+        allow_write_prefs: τροποποίηση των προτιμήσεων χρήστη
+        allow_write_diary: δημιουργία καταχωρήσεων ημερολογίου, σχόλια και δημιουργία
+          φίλων
+        allow_write_api: τροποποίηση του χάρτη
+        allow_read_gpx: ανάγνωση των προσωπικών ιχνών GPS
+        allow_write_gpx: μεταφόρτωση ιχνών GPS
+        allow_write_notes: τροποποίηση σημειώσεων
       diary_comment:
         body: Κύριο μέρος
       diary_entry:
@@ -118,6 +130,11 @@ el:
         latitude: Γεωγραφικό πλάτος
         longitude: Γεωγραφικό μήκος
         language: Γλώσσα
+      doorkeeper/application:
+        name: Όνομα
+        redirect_uri: Ανακατεύθυνση URIs
+        confidential: Έμπιστη εφαρμογή;
+        scopes: Άδειες
       friend:
         user: Χρήστης
         friend: Φίλος
@@ -136,27 +153,36 @@ el:
       message:
         sender: Αποστολέας
         title: Θέμα
-        body: Κύριο μέρος
+        body: Κύριο σώμα
         recipient: Παραλήπτης
       redaction:
+        title: Τίτλος
         description: Περιγραφή
       report:
+        category: Επιλέξτε μια αιτία για την αναφορά σας
         details: Παρακαλούμε παράσχετε περισσότερες λεπτομέρειες σχετικά με το πρόβλημα
           (απαιτείται).
       user:
+        auth_provider: Πάροχος αυθεντικοποίησης
+        auth_uid: UID αυθεντικοποίησης
         email: Ηλεκτρονικό ταχυδρομείο
-        email_confirmation: Επιβεβαίωση διεύθυνσης ηλεκτρονικού ταχυδρομείου
-        new_email: Νέα διεύθυνση ηλεκτρονικού ταχυδρομείου
+        email_confirmation: Επιβεβαίωση διεύθυνσης email
+        new_email: Νέα διεύθυνση email
         active: Ενεργό
         display_name: Εμφάνιση ονόματος
         description: Περιγραφή προφίλ
         home_lat: Γεωγραφικό πλάτος
         home_lon: Γεωγραφικό μήκος
         languages: Προτιμώμενες γλώσσες
-        preferred_editor: Προτιμώμενο πρόγραμμα επεξεργασίας
+        preferred_editor: Προτιμώμενος επεξεργαστής
         pass_crypt: Κωδικός
         pass_crypt_confirmation: Επιβεβαίωση κωδικού
     help:
+      doorkeeper/application:
+        confidential: Η εφαρμογή θα χρησιμοποιηθεί όπου το μυστικό πελάτη μπορεί να
+          κρατηθεί έμπιστο (οι εγγενείς εφαρμογές κινητών και οι εφαρμογές μονής σελίδας
+          δεν είναι έμπιστες)
+        redirect_uri: Χρήση μίας σειράς ανά URI
       trace:
         tagstring: διαχωρισμένο με κόμμα
       user_block:
@@ -167,6 +193,10 @@ el:
           γι' αυτό προσπαθήστε να χρησιμοποιήσετε απλούς και κατανοητούς όρους.
         needs_view: Πρέπει ο χρήστης να συνδεθεί προτού εκκαθαριστεί αυτή η φραγή;
       user:
+        email_confirmation: Η διεύθυνση σας δεν προβάλλεται δημόσια,  για περισσότερες
+          πληροφορίες δείτε την <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
+          title="OSMF privacy policy including section on email addresses">πολιτική
+          ιδιωτικότητας</a> μας.
         new_email: (να μην εμφανίζεται ποτέ δημόσια)
   datetime:
     distance_in_words_ago:
@@ -182,7 +212,7 @@ el:
       almost_x_years:
         one: σχεδόν ένα χρόνο πριν
         other: σχεδόν %{count} χρόνια πριν
-      half_a_minute: μισό λεπτό πριν
+      half_a_minute: πριν μισό λεπτό
       less_than_x_seconds:
         one: λιγότερο από ένα δευτερόλεπτο πριν
         other: λιγότερο από %{count} δευτερόλεπτα πριν
@@ -213,7 +243,7 @@ el:
     default: Προεπιλογή (τώρα είναι %{name})
     id:
       name: iD
-      description: iD (επεξεργαστής εντός του περιηγητή)
+      description: iD (επεξεργαστής εντός περιηγητή)
     remote:
       name: Απομακρυσμένος έλεγχος
       description: Απομακρυσμένος έλεγχος (JOSM, Potlatch, Merkaartor)
@@ -301,6 +331,9 @@ el:
       title_html: 'Διαδρομή: %{name}'
       history_title_html: 'Ιστορικό διαδρομής: %{name}'
       nodes: Κόμβοι
+      nodes_count:
+        one: '%{count} κόμβος'
+        other: '%{count} κόμβοι'
       also_part_of_html:
         one: τμήμα της διαδρομής %{related_ways}
         other: τμήμα των διαδρομών %{related_ways}
@@ -331,6 +364,7 @@ el:
         changeset: ομάδα αλλαγών
         note: σημείωση
     timeout:
+      title: Σφάλμα λήξης χρόνου
       sorry: Λυπάμαι, τα δεδομένα για το %{type} με αναγνωριστικό %{id}, χρειάστηκαν
         πολύ χρόνο για να ανακτηθούν.
       type:
@@ -395,7 +429,7 @@ el:
       no_edits: (χωρίς επεξεργασίες)
       view_changeset_details: Προβολή λεπτομερειών αλλαγών
     changesets:
-      id: Αναγνωριστικό
+      id: ID
       saved_at: Αποθηκεύτηκε στις
       user: Χρήστης
       comment: Σχόλιο
@@ -406,8 +440,8 @@ el:
       title_friend: Αλλαγές από τους φίλους μου
       title_nearby: Αλλαγές από κοντινούς χρήστες
       empty: Δε βρέθηκαν αλλαγές.
-      empty_area: Δε βρέθηκαν αλλαγές σε αυτήν την περιοχή.
-      empty_user: Δεν υπάρχουν αλλαγές από αυτόν τον χρήστη.
+      empty_area: Χωρίς αλλαγές σε αυτήν την περιοχή.
+      empty_user: Χωρίς αλλαγές από αυτόν τον χρήστη.
       no_more: Δεν βρέθηκαν άλλες αλλαγές.
       no_more_area: Δεν υπάρχουν άλλες αλλαγές για αυτήν την περιοχή.
       no_more_user: Δεν υπάρχουν άλλες αλλαγές από αυτόν τον χρήστη.
@@ -427,6 +461,28 @@ el:
     timeout:
       sorry: Μας συγχωρείτε, η λίστα των σχολίων της ομάδας αλλαγών που ζητήσατε,
         χρειάστηκε πολύ χρόνο για να ανακτηθεί.
+  dashboards:
+    contact:
+      km away: '%{count}km μακριά'
+      m away: '%{count}m μακριά'
+    popup:
+      your location: Η τοποθεσία σας
+      nearby mapper: Κοντινός χαρτογράφος
+      friend: Φίλος
+    show:
+      title: Το ταμπλό μου
+      no_home_location_html: '%{edit_profile_link} και βάλτε την τοποθεσία σας για
+        να δείτε κοντινούς χρήστες.'
+      edit_your_profile: Επεξεργαστείτε το προφίλ σας
+      my friends: Οι φίλοι μου
+      no friends: Δεν έχετε προσθέσει φίλους ακόμα.
+      nearby users: Άλλοι κοντινοί χρήστες
+      no nearby users: Δεν υπάρχουν άλλοι χρήστες που δήλωσαν ότι χαρτογραφούν κοντά
+        σας προς το παρόν.
+      friends_changesets: ομάδες αλλαγών φίλων
+      friends_diaries: καταχωρήσεις ημερολογίου φίλων
+      nearby_changesets: ομάδες αλλαγών από κοντινούς χρήστες
+      nearby_diaries: καταχωρήσεις ημερολογίου από κοντινούς χρήστες
   diary_entries:
     new:
       title: Νέα καταχώρηση ημερολογίου
@@ -442,7 +498,7 @@ el:
       new: Νέα καταχώρηση ημερολογίου
       new_title: Σύνταξη νέας καταχώρησης στο ημερολόγιό μου
       my_diary: Το ημερολόγιό μου
-      no_entries: Δε βρέθηκαν καταχωρήσεις στο ημερολόγιο
+      no_entries: Χωρίς καταχωρήσεις ημερολογίου
       recent_entries: Πρόσφατες καταχωρήσεις ημερολογίου
       older_entries: Παλιότερες καταχωρήσεις
       newer_entries: Νεότερες καταχωρήσεις
@@ -499,11 +555,17 @@ el:
     comments:
       has_commented_on: Ο %{display_name} έχει σχολιάσει στις ακόλουθες καταχωρήσεις
         ημερολογίου
+      no_comments: Χωρίς σχόλια ημερολογίου
       post: Καταχώρηση
       when: Πότε
       comment: Σχόλιο
       newer_comments: Νεότερα σχόλια
       older_comments: Παλαιότερα σχόλια
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Η εφαρμογή καταχωρήθηκε.
   friendships:
     make_friend:
       heading: Προσθήκη του %{user} ως φίλου;
@@ -511,6 +573,8 @@ el:
       success: Ο %{name} είναι τώρα φίλος σου!
       failed: Λυπούμαστε, απέτυχε η προσθήκη του χρήστη %{name} ως φίλου.
       already_a_friend: Είστε ήδη φίλοι με τον χρήστη %{name}.
+      limit_exceeded: Έκανες πολλούς φίλους τελευταία. Παρακαλώ περίμενε λίγο πριν
+        προσπαθήσεις να κάνεις περισσότερους φίλους.
     remove_friend:
       heading: Αφαίρεση φίλου %{user};
       button: Αφαίρεση φίλου
@@ -563,6 +627,7 @@ el:
           bench: Πάγκος
           bicycle_parking: Στάθμευση ποδηλάτων
           bicycle_rental: Ενοικίαση ποδηλάτων
+          bicycle_repair_station: Σταθμός επισκευής ποδηλάτου
           biergarten: Υπαίθρια μπυραρία
           blood_bank: Τράπεζα αίματος
           boat_rental: Ενοικίαση σκαφών
@@ -581,6 +646,7 @@ el:
           clock: Ρολόι
           college: Κολέγιο
           community_centre: Κοινοτικό κέντρο
+          conference_centre: Συνεδριακό κέντρο
           courthouse: Δικαστήριο
           crematorium: Κρεματόριο
           dentist: Οδοντίατρος
@@ -600,11 +666,13 @@ el:
           hospital: Νοσοκομείο
           hunting_stand: Κυνηγητικό κιόσκι
           ice_cream: Παγωτό
+          internet_cafe: Ίντερνετ καφέ
           kindergarten: Νηπιαγωγείο
           language_school: Φροντιστήριο ξένων γλωσσών
           library: Βιβλιοθήκη
           marketplace: Αγορά
           monastery: Μοναστήρι
+          money_transfer: Μεταφορά χρημάτων
           motorcycle_parking: Χώρος στάθμευσης μοτοσικλετών
           music_school: Ωδείο
           nightclub: Νυχτερινό κέντρο
@@ -612,6 +680,7 @@ el:
           parking: Χώρος στάθμευσης
           parking_entrance: Είσοδος χώρου στάθμευσης
           parking_space: Χώρος στάθμευσης
+          payment_terminal: Τερματικό πληρωμών
           pharmacy: Φαρμακείο
           place_of_worship: Τόπος λατρείας
           police: Αστυνομία
@@ -620,6 +689,7 @@ el:
           prison: Φυλακή
           pub: Παμπ
           public_bath: Δημόσιο λουτρό
+          public_bookcase: Δημόσια βιβλιοθήκη
           public_building: Δημόσιο κτίριο
           recycling: Σημείο ανακύκλωσης
           restaurant: Εστιατόριο
@@ -636,11 +706,13 @@ el:
           toilets: Τουαλέτες
           townhall: Δημαρχείο
           university: Πανεπιστήμιο
+          vehicle_inspection: Επιθεώρηση οχήματος
           vending_machine: Μηχάνημα αυτόματης πώλησης
           veterinary: Κτηνιατρική Χειρουργική
           village_hall: Αίθουσα χωριού
           waste_basket: Καλάθι απορριμμάτων
           waste_disposal: Διάθεση αποβλήτων
+          waste_dump_site: Χώρος απόρριψης απορριμάτων
           water_point: Σημείο ανεφοδιασμού νερού
         boundary:
           administrative: Διοικητικό όριο
@@ -655,35 +727,50 @@ el:
           viaduct: Κοιλαδογέφυρα
           "yes": Γέφυρα
         building:
+          apartment: Διαμέρισμα
           apartments: Διαμερίσματα
+          barn: Σταύλος
+          bungalow: Μπάνγκαλοου
+          cabin: Καμπίνα
           chapel: Παρεκκλήσι
           church: Εκκλησία
+          civic: Πολιτικό κτήριο
+          college: Πανεπιστημιακό κτήριο
           commercial: Εμπορικό κτίριο
           construction: Κτίριο υπό κατασκευή
           dormitory: Κοιτώνας
           farm: Αγροικία
           farm_auxiliary: Βοηθητική αγροικία
           garage: Γκαράζ
+          garages: Γκαράζ
           greenhouse: Θερμοκήπιο
+          hangar: Υπόστεγο αεροσκαφών
           hospital: Κτήριο Νοσοκομείου
           hotel: Ξενοδοχείο
           house: Σπίτι
+          hut: Καλύβα
           industrial: Βιομηχανικό Κτήριο
           kindergarten: Κτίριο νηπιαγωγείου
           office: Κτήριο Γραφείων
           public: Δημόσιο κτήριο
           residential: Πολυκατοικία
+          retail: Κτήριο λιανικής
           school: Σχολικό Κτήριο
+          static_caravan: Τροχόσπιτο
+          temple: Κτήριο ναού
           train_station: Κτίριο Σιδηροδρομικού Σταθμού
           university: Κτήριο Πανεπιστημίου
           warehouse: Αποθήκη
           "yes": Κτίριο
+        club:
+          sport: Αθλητικός σύλλογος
         craft:
           beekeeper: Μελισσοκόμος
           blacksmith: Σιδηρουργός
           brewery: Ζυθοποιείο
           carpenter: Ξυλουργός
           electrician: Ηλεκτρολόγος
+          electronics_repair: Επισκευή ηλεκτρονικών
           gardener: Κηπουρός
           handicraft: Χειροκατασκευές
           painter: Ζωγράφος
@@ -691,8 +778,10 @@ el:
           plumber: Υδραυλικός
           shoemaker: Τσαγκάρης
           tailor: Ράφτης
+          winery: Οινοποιείο
           "yes": Κατάστημα τεχνών
         emergency:
+          access_point: Σημείο Πρόσβασης
           ambulance_station: Σταθμός ασθενοφόρων
           assembly_point: Σημείο συγκέντρωσης
           defibrillator: Απινιδωτής
@@ -741,6 +830,7 @@ el:
           tertiary: Τριτεύων δρόμος
           tertiary_link: Τριτεύων δρόμος
           track: Χωματόδρομος
+          traffic_mirror: Καθρέφτης κυκλοφορίας
           traffic_signals: Σήματα κυκλοφορίας
           trunk: Εθνική οδός
           trunk_link: Εθνική οδός
@@ -748,11 +838,14 @@ el:
           unclassified: Αταξινόμητη οδός
           "yes": Δρόμος
         historic:
+          aircraft: Ιστορικό αεροσκάφος
           archaeological_site: Αρχαιολογικός χώρος
+          bomb_crater: Ιστορικός κρατήρας βόμβας
           battlefield: Πεδίο μάχης
           boundary_stone: Συνοριακή στήλη
           building: Ιστορικό κτίριο
           bunker: Οχυρό
+          cannon: Ιστορικό κανόνι
           castle: Κάστρο
           church: Εκκλησία
           city_gate: Είσοδος της πόλης
@@ -800,6 +893,7 @@ el:
           quarry: Λατομείο
           railway: Σιδηρόδρομος
           recreation_ground: Χώρος αναψυχής
+          religious: Θρησκευτικό έδαφος
           reservoir: Ταμιευτήρας
           reservoir_watershed: Δεξαμενή απορροής υδάτων
           residential: Κατοικημένη περιοχή
@@ -811,6 +905,7 @@ el:
           beach_resort: Παραθαλάσσιο θέρετρο
           bird_hide: Καταφύγιο πουλιών
           common: Κοινόχρηστη γη
+          dance: Αίθουσα χωρού
           dog_park: Πάρκο σκύλων
           firepit: Λάκκος Φωτιάς
           fishing: Αλιευτική περιοχή
@@ -824,6 +919,7 @@ el:
           miniature_golf: Μίνι γκολφ
           nature_reserve: Καταφύγιο της φύσης
           park: Πάρκο
+          picnic_table: Τραπέζι πικνικ
           pitch: Γήπεδο αθλητισμού
           playground: Παιδική χαρά
           recreation_ground: Χώρος αναψυχής
@@ -838,7 +934,9 @@ el:
           "yes": Ψυχαγωγία
         man_made:
           adit: Οριζόντια είσοδος σε ορυχείο
+          advertising: Διαφήμιση
           antenna: Κεραία
+          avalanche_protection: Προστασία χιονοστιβάδας
           beacon: φάρος
           beehive: Κυψέλη
           breakwater: Κυματοθραύστης
@@ -854,6 +952,7 @@ el:
           groyne: Φράγμα
           kiln: Καμίνι
           lighthouse: Φάρος
+          manhole: Ανθρωποθυρίδα
           mast: Κατάρτι
           mine: Ορυχείο
           mineshaft: Φρεάτιο ορυχείου
@@ -861,13 +960,17 @@ el:
           petroleum_well: Γεώτρηση Πετρελαίου
           pier: Αποβάθρα
           pipeline: Αγωγός
+          pumping_station: Αντλιοστάσιο
           silo: Σιλό
+          snow_cannon: Κανόνι χιονιού
+          snow_fence: Χιονοφράχτης
           storage_tank: Δεξαμενή αποθήκευσης
           surveillance: Επιτήρηση
           telescope: Τηλεσκόπιο
           tower: Πύργος
           wastewater_plant: Μονάδα επεξεργασίας λυμάτων
           watermill: Νερόμυλος
+          water_tap: Βρύση
           water_tower: Πύργος νερού
           water_well: Πηγάδι
           water_works: Έργα Υδάτων
@@ -900,6 +1003,7 @@ el:
           heath: Ακαλλιέργητη γη
           hill: Λόφος
           island: Νησί
+          isthmus: Ισθμός
           land: Ξηρά
           marsh: Βάλτος
           moor: Δέστρα
@@ -918,6 +1022,8 @@ el:
           stone: Πέτρα
           strait: Πορθμός
           tree: Δέντρο
+          tree_row: Σειρά δέντρων
+          tundra: Τούνδρα
           valley: Κοιλάδα
           volcano: Ηφαίστειο
           water: Νερό
@@ -941,6 +1047,10 @@ el:
           lawyer: Δικηγόρος
           logistics: Λογιστικό γραφείο
           ngo: Γραφείο ΜΚΟ
+          notary: Συμβολαιογράφος
+          religion: Θρησκευτικό γραφείο
+          research: Ερευνητικό γραφείο
+          tax_advisor: Φορολογικός σύμβουλος
           telecommunication: Γραφείο τηλεπικοινωνιών
           travel_agent: Ταξιδιωτικό πρακτορείο
           "yes": Γραφείο
@@ -1024,6 +1134,8 @@ el:
           convenience: Παντοπωλείο
           copyshop: Κατάστημα φωτοαντιγράφων
           cosmetics: Κατάστημα καλλυντικών
+          curtain: Κατάστημα κουρτίνων
+          dairy: Κατάστημα γαλακτοκομικών
           deli: Ντελικατέσεν
           department_store: Πολυκατάστημα
           discount: Εκπτωτικό κατάστημα
@@ -1031,7 +1143,9 @@ el:
           dry_cleaning: Στεγνό καθάρισμα
           e-cigarette: Κατάστημα ηλεκτρονικών τσιγάρων
           electronics: Κατάστημα ηλεκτρονικών
+          erotic: Κατάστημα ερωτικών ειδών
           estate_agent: Κτηματομεσίτης
+          fabric: Κατάστημα υφασμάτων
           farm: Γεωργικά εφόδια
           fashion: Κατάστημα μόδας
           fishing: Κατάστημα ειδών αλιείας
@@ -1059,14 +1173,19 @@ el:
           lottery: Λοταρία
           mall: Εμπορικό κέντρο
           massage: Μασάζ
+          medical_supply: Κατάστημα ιατρικών προμηθειών
           mobile_phone: Κατάστημα κινητής τηλεφωνίας
           motorcycle: Κατάστημα μοτοσικλετών
+          motorcycle_repair: Κατάστημα επισκευής μοτοσυκλετών
           music: Κατάστημα μουσικής
+          musical_instrument: Μουσικά όργανα
           newsagent: Πρακτορείο εφημερίδων
+          nutrition_supplements: Συμπληρώματα διατροφής
           optician: Οπτικός
           organic: Κατάστημα οργανικών τροφίμων
           outdoor: Υπαίθριο κατάστημα
           paint: Χρωματοπωλείο
+          pastry: Ζαχαροπλαστείο
           pawnbroker: Ενεχυροδανειστής
           perfumery: Αρωματοπωλείο
           pet: Κατάστημα κατοικίδιων
@@ -1086,6 +1205,7 @@ el:
           vacant: Κενό κατάστημα
           variety_store: Κατάστημα ποικιλιών
           video: Κατάστημα βίντεο
+          wholesale: Κατάστημα χονδρικής
           wine: Κατάστημα κρασιών
           "yes": Κατάστημα
         tourism:
@@ -1134,12 +1254,15 @@ el:
           "yes": Κανάλι
       admin_levels:
         level2: Σύνορα χώρας
+        level3: Σύνορο περιοχής
         level4: Σύνορο πολιτείας
         level5: Σύνορο περιοχής
         level6: Σύνορο κομητείας
+        level7: Σύνορο δήμου
         level8: Σύνορο πόλης
         level9: Σύνορο χωριού
         level10: Σύνορο προαστίου
+        level11: Σύνορο γειτονιάς
       types:
         cities: Πόλεις
         towns: Κωμοπόλεις
@@ -1279,9 +1402,10 @@ el:
     intro_text: Το OpenStreetMap είναι χάρτης του κόσμου, που δημιουργήθηκε από ανθρώπους
       σαν κι εσάς και είναι δωρεάν, υπό άδεια ελεύθερης χρήσης.
     intro_2_create_account: Δημιουργήστε ένα λογαριασμό χρήστη
-    hosting_partners_html: Η λειτουργία υποστηρίζεται από %{ucl}, %{bytemark}, και
-      άλλους %{partners}.
+    hosting_partners_html: Η φιλοξενία υποστηρίζεται από %{ucl}, %{fastly}, %{bytemark},
+      και άλλους %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: συνεργάτες
     tou: Όροι χρήσης
@@ -1309,12 +1433,21 @@ el:
       hi: Γεια σας %{to_user},
       header: 'Ο %{from_user} έχει σχολιάσει την καταχώριση ημερολογίου στο OpenStreetMap
         με θέμα %{subject}:'
+      header_html: 'Ο %{from_user} έχει σχολιάσει την καταχώριση ημερολογίου στο OpenStreetMap
+        με θέμα %{subject}:'
       footer: Μπορείτε επίσης να διαβάσετε το σχόλιο στο %{readurl} και μπορείτε να
         σχολιάσετε στο %{commenturl} ή να στείλετε μήνυμα στον συγγραφέα στο %{replyurl}
+      footer_html: Μπορείτε επίσης να διαβάσετε το σχόλιο στο %{readurl} και μπορείτε
+        να σχολιάσετε στο %{commenturl} ή να στείλετε μήνυμα στον συγγραφέα στο %{replyurl}
     message_notification:
+      subject: '[OpenStreetMap] %{message_title}'
       hi: Γεια σας %{to_user},
       header: 'Ο χρήστης %{from_user} σάς έχει στείλει ένα μήνυμα μέσω του OpenStreetMap
         με θέμα %{subject}:'
+      header_html: 'Ο χρήστης %{from_user} σάς έχει στείλει ένα μήνυμα μέσω του OpenStreetMap
+        με θέμα %{subject}:'
+      footer: Μπορείτε επίσης να διαβάσετε το μήνυμα στο %{readurl} και να στείλετε
+        μήνυμα στον συγγραφέα στο %{replyurl}
       footer_html: Μπορείτε επίσης να διαβάσετε το μήνυμα στο %{readurl} και να στείλετε
         μήνυμα στον συγγραφέα στο %{replyurl}
     friendship_notification:
@@ -1322,7 +1455,9 @@ el:
       subject: '[OpenStreetMap] Ο χρήστης %{user} σας πρόσθεσε ως φίλο'
       had_added_you: Ο χρήστης %{user} σας πρόσθεσε ως φίλο στο OpenStreetMap.
       see_their_profile: Μπορείτε να δείτε το προφίλ του στο %{userurl}.
+      see_their_profile_html: Μπορείτε να δείτε το προφίλ του στο %{userurl}.
       befriend_them: Μπορείτε επίσης να τους προσθέσετε ως φίλους στο %{befriendurl}.
+      befriend_them_html: Μπορείτε επίσης να τους προσθέσετε ως φίλους στο %{befriendurl}.
     gpx_failure:
       hi: Γεια σας %{to_user},
       failed_to_import: 'Απέτυχε η εισαγωγή. Το σφάλμα είναι:'
@@ -1435,6 +1570,7 @@ el:
     inbox:
       title: Εισερχόμενα
       my_inbox: Τα εισερχόμενα μου
+      my_outbox: Τα εξερχόμενα μου
       messages: Έχετε %{new_messages} και %{old_messages}
       new_messages:
         one: '%{count} νέο μήνυμα'
@@ -1469,6 +1605,8 @@ el:
       body: Λυπάμαι δεν υπάρχει μήνυμα με αυτό το αναγνωριστικό.
     outbox:
       title: Εξερχόμενα
+      my_inbox: Τα εισερχόμενα μου
+      my_outbox: Τα εξερχόμενα μου
       messages:
         one: Έχετε %{count} απεσταλμένο μήνυμα
         other: Έχετε %{count} απεσταλμένα μηνύματα
@@ -1521,12 +1659,30 @@ el:
       reset: Επαναφορά συνθηματικού
       flash changed: Το συνθηματικό σας άλλαξε!
       flash token bad: Δεν βρήκατε αυτό το κομμάτι, μήπως πρέπει να ελέγξετε το URL;
+  preferences:
+    show:
+      title: Οι προτιμήσεις μου
+      preferred_editor: Προτιμώμενος επεξεργαστής
+      preferred_languages: Προτιμώμενες γλώσσες
+      edit_preferences: Επεξεργασία προτιμήσεων
+    edit:
+      title: Επεξεργασία προτιμίσεων
+      save: Ενημέρωση προτιμήσεων
+      cancel: Ακύρωση
+    update:
+      failure: Δεν μπόρεσαν να ενημερωθούν οι προτιμήσεις.
+    update_success_flash:
+      message: Οι προτιμήσεις ενημερώθηκαν.
   profiles:
     edit:
+      title: Επεξεργασία προφίλ
+      save: Ενημέρωση προφίλ
+      cancel: Ακύρωση
       image: Εικόνα
       gravatar:
         gravatar: Χρήση Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Τί είναι το Gravatar;
         disabled: 'Το Gravatar έχει απενεργοποιηθεί:'
         enabled: Έχει ενεργοποιηθεί η εμφάνιση του Gravatar σας.
       new image: Προσθήκη εικόνας
@@ -1538,6 +1694,9 @@ el:
       no home location: Δεν έχετε εισάγει την τοποθεσία του σπιτιού σας.
       update home location on click: Ενημέρωση τοποθεσίας σπιτιού όταν κάνω κλικ στον
         χάρτη;
+    update:
+      success: Το προφίλ ενημερώθηκε.
+      failure: Δεν μπόρεσε να ενημερωθεί το προφίλ.
   sessions:
     new:
       title: Είσοδος
@@ -1594,6 +1753,20 @@ el:
       title: Αποσύνδεση
       heading: Αποσύνδεση από το OpenStreetMap
       logout_button: Αποσύνδεση
+  shared:
+    markdown_help:
+      unordered: Αταξινόμητη λίστα
+      ordered: Ταξινομημένη λίστα
+      first: Πρώτο στοιχείο
+      second: Δεύτερο στοιχείο
+      link: Σύνδεσμος
+      text: Κείμενο
+      image: Εικόνα
+      alt: Εναλ. κείμενο
+      url: URL
+    richtext_field:
+      edit: Επεξεργασία
+      preview: Προεπισκόπηση
   site:
     about:
       next: Επόμενη
@@ -2116,6 +2289,7 @@ el:
         ή μάθετε περισσότερα για την καταγραφή ιχνών με GPS στη <a href='https://wiki.openstreetmap.org/wiki/El:Beginners_Guide_1.2'>σελίδα
         wiki</a>.
       upload_trace: Αποστολή ίχνους
+      all_traces: Όλα τα ίχνη
     destroy:
       scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή
     make_public:
@@ -2180,6 +2354,11 @@ el:
       flash: Ανακαλέσατε την αδειοδότηση για το %{application}.
     permissions:
       missing: Δεν έχετε επιτρέψει την πρόσβαση εφαρμογής σε αυτήν την λειτουργία
+    scopes:
+      write_api: Τροποποίηση του χάρτη
+      read_gpx: Ανάγνωση προσωπικών ιχνών GPS
+      write_gpx: Μεταφόρτωση ιχνών GPS
+      write_notes: Τροποποίηση σημειώσεων
   oauth_clients:
     new:
       title: Καταχώρηση νέας εφαρμογής
@@ -2221,6 +2400,28 @@ el:
       flash: Οι πληροφορίες του πελάτη ενημερώθηκαν με επιτυχία
     destroy:
       flash: Η εγγραφή της εφαρμογής πελάτη καταστράφηκε
+  oauth2_applications:
+    index:
+      new: Καταχώρηση νέας εφαρμογής
+      name: Όνομα
+      permissions: Άδειες
+    application:
+      edit: Επεξεργασία
+      delete: Διαγραφή
+      confirm_delete: Διαγραφή αυτής της εφαρμογής;
+    new:
+      title: Καταχώρηση νέας εφαρμογής
+    edit:
+      title: Επεξεργασία της εφαρμογής σας
+    show:
+      edit: Επεξεργασία
+      delete: Διαγραφή
+      confirm_delete: Διαγραφή αυτής της εφαρμογής;
+      client_id: ID πελάτη
+      client_secret: Μυστικό πελάτη
+      client_secret_warning: Σιγουρευτείτε ότι θα αποθηκεύσετε αυτό το μυστικό - δεν
+        θα είναι προσβάσιμο ξανά
+      permissions: Άδειες
   users:
     new:
       title: Εγγραφή
@@ -2296,8 +2497,11 @@ el:
       my profile: Το Προφίλ Μου
       my settings: Οι Ρυθμίσεις Μου
       my comments: Τα Σχόλιά Μου
+      my_preferences: Οι προτιμήσεις μου
+      my_dashboard: Το ταμπλό μου
       blocks on me: Φραγές σε Εμένα
       blocks by me: Φραγές από Εμένα
+      edit_profile: Επεξεργασία προφίλ
       send message: Αποστολή Μηνύματος
       diary: Ημερολόγιο
       edits: Επεξεργασίες
@@ -2316,13 +2520,6 @@ el:
       spam score: 'Σκορ Spam:'
       description: Περιγραφή
       user location: Τοποθεσία χρήστη
-      my friends: Οι φίλοι μου
-      no friends: Δεν έχετε προσθέσει φίλους ακόμα.
-      km away: '%{count}χλμ μακριά'
-      m away: '%{count}μ μακριά'
-      nearby users: Άλλοι κοντινοί χρήστες
-      no nearby users: Δεν υπάρχουν άλλοι χρήστες που δήλωσαν ότι χαρτογραφούν κοντά
-        σας προς το παρόν.
       role:
         administrator: Αυτός ο χρήστης είναι διαχειριστής
         moderator: Αυτός ο χρήστης είναι συντονιστής
@@ -2343,15 +2540,7 @@ el:
       unhide_user: Επανεμφάνιση αυτού του λογαριασμού Χρήστη
       delete_user: Διαγραφή αυτού του Χρήστη
       confirm: Επιβεβαίωση
-      friends_changesets: ομάδες αλλαγών φίλων
-      friends_diaries: καταχωρήσεις ημερολογίου φίλων
-      nearby_changesets: ομάδες αλλαγών από κοντινούς χρήστες
-      nearby_diaries: καταχωρήσεις ημερολογίου από κοντινούς χρήστες
       report: Αναφορά αυτού του χρήστη
-    popup:
-      your location: Η τοποθεσία σας
-      nearby mapper: Κοντινός χαρτογράφος
-      friend: Φίλος
     account:
       title: Επεξεργασία λογαριασμού
       my settings: Οι ρυθμίσεις μου
@@ -2416,6 +2605,7 @@ el:
     suspended:
       title: Ο Λογαριασμός έχει Ανασταλεί
       heading: Ο Λογαριασμός έχει Ανασταλεί
+      support: υποστήριξη
       body_html: |-
         <p>
         Λυπάμαι, ο λογαριασμός σας έχει αυτόματα ανασταλεί λόγω
@@ -2572,6 +2762,7 @@ el:
       title: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user}
       heading: σημειώσεις του %{user}
       subheading_html: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user}
+      no_notes: Χωρίς σημειώσεις
       id: Αναγνωριστικό
       creator: Δημιουργός
       description: Περιγραφή
@@ -2678,12 +2869,12 @@ el:
     directions:
       ascend: Ανάβαση
       engines:
-        fossgis_osrm_bike: Με ποδήλατο (OSRM)
+        fossgis_osrm_bike: Ποδήλατο (OSRM)
         fossgis_osrm_car: Αυτοκίνητο (OSRM)
-        fossgis_osrm_foot: Με τα πόδια (OSRM)
+        fossgis_osrm_foot: Πόδια (OSRM)
         graphhopper_bicycle: Ποδήλατο (GraphHopper)
-        graphhopper_car: Με τα πόδια (GraphHopper)
-        graphhopper_foot: Με τα πόδια (GraphHopper)
+        graphhopper_car: Αυτοκίνητο (GraphHopper)
+        graphhopper_foot: Πόδια (GraphHopper)
       descend: Κατάβαση
       directions: Οδηγίες
       distance: Απόσταση
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 4be9b4510..c29c3be4e 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -422,6 +422,22 @@ en-GB:
     timeout:
       sorry: Sorry, the list of changeset comments you requested took too long to
         retrieve.
+  dashboards:
+    contact:
+      km away: '%{count}km away'
+      m away: '%{count}m away'
+    popup:
+      your location: Your location
+      nearby mapper: Nearby mapper
+      friend: Friend
+    show:
+      no friends: You have not added any friends yet.
+      nearby users: Other nearby users
+      no nearby users: There are no other users who admit to mapping nearby yet.
+      friends_changesets: friends' changesets
+      friends_diaries: friends' diary entries
+      nearby_changesets: nearby user changesets
+      nearby_diaries: nearby user diary entries
   diary_entries:
     new:
       title: New Diary Entry
@@ -2112,11 +2128,6 @@ en-GB:
       spam score: 'Spam Score:'
       description: Description
       user location: User location
-      no friends: You have not added any friends yet.
-      km away: '%{count}km away'
-      m away: '%{count}m away'
-      nearby users: Other nearby users
-      no nearby users: There are no other users who admit to mapping nearby yet.
       role:
         administrator: This user is an administrator
         moderator: This user is a moderator
@@ -2137,14 +2148,6 @@ en-GB:
       unhide_user: Unhide this User
       delete_user: Delete this User
       confirm: Confirm
-      friends_changesets: friends' changesets
-      friends_diaries: friends' diary entries
-      nearby_changesets: nearby user changesets
-      nearby_diaries: nearby user diary entries
-    popup:
-      your location: Your location
-      nearby mapper: Nearby mapper
-      friend: Friend
     account:
       title: Edit account
       my settings: My settings
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 37e31eb19..8660d9222 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -444,6 +444,27 @@ eo:
     timeout:
       sorry: BedaÅ­rinde daÅ­ris tro longe por akiri la petitan liston de komentoj pri
         ŝanĝaro.
+  dashboards:
+    contact:
+      km away: '%{count} km for'
+      m away: '%{count} m for'
+    popup:
+      your location: Via loko
+      nearby mapper: Proksima uzanto
+      friend: Amiko
+    show:
+      title: Mia panelo
+      no_home_location_html: '%{edit_profile_link} kaj agordu vian hejmlokon por vidi
+        proksimajn uzantojn.'
+      edit_your_profile: Redaktu vian profilon
+      my friends: Miaj amikoj
+      no friends: Vi ne aldonis iun amikon ankoraÅ­.
+      nearby users: Plej proksimaj uzantoj
+      no nearby users: Neniu alia uzanto, kiu deklaris mapigadon en tiu ĉi areo.
+      friends_changesets: ŝanĝaroj de amikoj
+      friends_diaries: afiŝoj en taglibroj de amikoj
+      nearby_changesets: ŝanĝaroj de proksimuloj
+      nearby_diaries: afiŝoj en taglibroj de proksimuloj
   diary_entries:
     new:
       title: Nova taglibra afiŝo
@@ -778,6 +799,7 @@ eo:
           window_construction: Laborejo de fenestr-faristo
           winery: Vinejo
           "yes": Metiejo
+        crossing: Trapasejo
         emergency:
           access_point: Vivsava rekonebla signo
           ambulance_station: Ambulanca stacio
@@ -1033,6 +1055,7 @@ eo:
           hill: Monteto
           hot_spring: Tervarma akvofonto
           island: Insulo
+          isthmus: Istmo
           land: Tero
           marsh: Aluvia grundo
           moor: Arbustetaro
@@ -1047,10 +1070,13 @@ eo:
           sand: Sabla tereno
           scree: Rokfalaĵo
           scrub: Arbustaro
+          shingle: Sablega tereno
           spring: Akvofonto
           stone: Roko
           strait: Markolo
           tree: Arbo
+          tree_row: Arb-vico
+          tundra: Tundro
           valley: Valo
           volcano: Vulkano
           water: Akvejo
@@ -1445,9 +1471,10 @@ eo:
     intro_text: OpenStreetMap estas mapo de la mondo, kreata de homoj kiel vi, kaj
       libere uzebla laÅ­ malferma permesilo.
     intro_2_create_account: Krei konton
-    hosting_partners_html: Retgastigo estas subtenata de %{ucl}, %{bytemark} kaj aliaj
-      %{partners}.
+    hosting_partners_html: Retgastigo estas subtenata de %{ucl}, %{fastly}, %{bytemark}
+      kaj aliaj %{partners}.
     partners_ucl: University College London
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: kunlaborantoj
     tou: Uzkondiĉoj
@@ -1923,10 +1950,11 @@ eo:
           <strong>AÅ­strujo</strong>: enhavas datumojn el <a href="https://data.wien.gv.at/">Stadt Wien</a> (laÅ­ <a href="https://creativecommons.org/licenses/by/3.0/at/deed.eo">CC BY</a>),
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> kaj
           Land Tirol (laŭ <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT kun postaj ŝanĝoj</a>).
-        contributors_au_html: '<strong>AÅ­stralio</strong>: enhavas datumojn el <a
-          href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia
-          Limited</a> kunhavigataj de Komunejo de AÅ­stralio laÅ­ la permesilo <a href="https://creativecommons.org/licenses/by/4.0/deed.eo">CC
-          BY 4.0</a>.'
+        contributors_au_html: '<strong>AÅ­stralio</strong>: enhavas datumojn pri administraj
+          limoj liveritaj de <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
+          Australia</a> rajtigitaj de la Komunejo de AÅ­stralio laÅ­ la permesilo <a
+          href="https://creativecommons.org/licenses/by/4.0/deed.eo">Krea Komunaĵo
+          Atribuite 4.0 Tutmonda (CC BY 4.0)</a>.'
         contributors_ca_html: |-
           <strong>Kanado</strong>: enhavas datumojn el
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -2569,7 +2597,8 @@ eo:
       my profile: Profilo
       my settings: Agordoj
       my comments: Miaj komentoj
-      my_preferences: Miaj preferoj
+      my_preferences: Preferoj
+      my_dashboard: Panelo
       blocks on me: Blokas min
       blocks by me: Blokitaj de mi
       edit_profile: Redakti profilon
@@ -2591,15 +2620,6 @@ eo:
       spam score: 'Trudmesaĝa poentaro:'
       description: Priskribo
       user location: Loko de uzanto
-      no_home_location_html: '%{edit_profile_link} kaj agordu vian hejmlokon por vidi
-        proksimajn uzantojn.'
-      edit_your_profile: Redaktu vian profilon
-      my friends: Miaj amikoj
-      no friends: Vi ne aldonis iun amikon ankoraÅ­.
-      km away: '%{count} km for'
-      m away: '%{count} m for'
-      nearby users: Plej proksimaj uzantoj
-      no nearby users: Neniu alia uzanto, kiu deklaris mapigadon en tiu ĉi areo.
       role:
         administrator: Ĉi tiu uzanto estas administranto
         moderator: Ĉi tiu uzanto estas kontrolanto
@@ -2620,18 +2640,10 @@ eo:
       unhide_user: Malkaŝi ĉi tiun uzanton
       delete_user: Forigi ĉi tiun uzanton
       confirm: Konfirmi
-      friends_changesets: ŝanĝaroj de amikoj
-      friends_diaries: afiŝoj en taglibroj de amikoj
-      nearby_changesets: ŝanĝaroj de proksimuloj
-      nearby_diaries: afiŝoj en taglibroj de proksimuloj
       report: Raporti tiun ĉi uzanton
-    popup:
-      your location: Via loko
-      nearby mapper: Proksima uzanto
-      friend: Amiko
     account:
       title: Redakti konton
-      my settings: Agordoj
+      my settings: Miaj agordoj
       current email address: Aktuala retpoŝta adreso
       external auth: Ekstera aÅ­tentigo
       openid:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 86046a88c..ad747bccf 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -61,6 +61,7 @@
 # Author: Peter17
 # Author: Pompilos
 # Author: Remux
+# Author: Reverse88
 # Author: Rodhos
 # Author: Rodm23
 # Author: Rodney Araujo
@@ -502,6 +503,27 @@ es:
     timeout:
       sorry: Lo sentimos, la lista de comentarios del conjunto de cambios que solicitó
         tardó demasiado en recuperarse.
+  dashboards:
+    contact:
+      km away: '%{count} km de distancia'
+      m away: '%{count} m de distancia'
+    popup:
+      your location: Su ubicación
+      nearby mapper: Mapeadores cercanos
+      friend: Amigo
+    show:
+      title: Mi tablero
+      no_home_location_html: '%{edit_profile_link} y establece tu ubicación de origen
+        para ver los usuarios cercanos.'
+      edit_your_profile: Edita tu perfil
+      my friends: Mis amigos
+      no friends: No has añadido ningún amigo aún.
+      nearby users: Otros usuarios cercanos
+      no nearby users: Todavía no hay usuarios que se hayan ubicado en su proximidad.
+      friends_changesets: conjuntos de cambios realizados por amigos
+      friends_diaries: entradas de diarios de amigos
+      nearby_changesets: conjuntos de cambios de los usuarios cercanos
+      nearby_diaries: entradas de diarios de usuarios cercanos
   diary_entries:
     new:
       title: Nueva entrada en el diario
@@ -2670,6 +2692,7 @@ es:
       my settings: Mi configuración
       my comments: Mis comentarios
       my_preferences: Mis preferencias
+      my_dashboard: Mi tablero
       blocks on me: Bloqueos sobre mí
       blocks by me: Bloqueados por mí
       edit_profile: Editar perfil
@@ -2691,15 +2714,6 @@ es:
       spam score: 'Puntuación de spam:'
       description: Descripción
       user location: Ubicación del usuario
-      no_home_location_html: '%{edit_profile_link} y establece tu ubicación de origen
-        para ver los usuarios cercanos.'
-      edit_your_profile: Edita tu perfil
-      my friends: Mis amigos
-      no friends: No has añadido ningún amigo aún.
-      km away: '%{count} km de distancia'
-      m away: '%{count} m de distancia'
-      nearby users: Otros usuarios cercanos
-      no nearby users: Todavía no hay usuarios que se hayan ubicado en su proximidad.
       role:
         administrator: Este usuario es un administrador
         moderator: Este usuario es un moderador
@@ -2720,15 +2734,7 @@ es:
       unhide_user: Mostrar este usuario
       delete_user: Eliminar este usuario
       confirm: Confirmar
-      friends_changesets: conjuntos de cambios realizados por amigos
-      friends_diaries: entradas de diarios de amigos
-      nearby_changesets: conjuntos de cambios de los usuarios cercanos
-      nearby_diaries: entradas de diarios de usuarios cercanos
       report: Denunciar a este usuario
-    popup:
-      your location: Su ubicación
-      nearby mapper: Mapeadores cercanos
-      friend: Amigo
     account:
       title: Editar cuenta
       my settings: Mis preferencias
diff --git a/config/locales/et.yml b/config/locales/et.yml
index d05d982aa..fa10ff5f6 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -398,6 +398,27 @@ et:
     index:
       title_all: OpenStreetMapi muudatuskogumi arutelu
       title_particular: 'OpenStreetMapi muudatuskogumi #%{changeset_id} arutelu'
+  dashboards:
+    contact:
+      km away: '%{count} kilomeetri kaugusel'
+      m away: '%{count} meetri kaugusel'
+    popup:
+      your location: Sinu asukoht
+      nearby mapper: Lähedaloevad kaardistajad
+      friend: Sõber
+    show:
+      no_home_location_html: '%{edit_profile_link} ja määra enda asukoht, et näha
+        ümberkaudseid kasutajaid.'
+      edit_your_profile: Muuda profiili
+      my friends: Minu sõbrad
+      no friends: Sa ei ole lisanud veel ühtegi sõpra.
+      nearby users: Teised lähedal asuvad kasutajad
+      no nearby users: Puuduvad teised kasutajad, kes tunnistavad, et kaardistavad
+        läheduses.
+      friends_changesets: sõprade muudatuskogumid
+      friends_diaries: sõprade päevikusissekanded
+      nearby_changesets: lähedalasuvate kasutajate muudatuskogumid
+      nearby_diaries: lähedalasuvate kasutajate päevikusissekanded
   diary_entries:
     new:
       title: Uus päeviku sissekanne
@@ -2024,16 +2045,6 @@ et:
       spam score: 'Rämpsposti tulemus:'
       description: Kirjeldus
       user location: Kasutaja asukoht
-      no_home_location_html: '%{edit_profile_link} ja määra enda asukoht, et näha
-        ümberkaudseid kasutajaid.'
-      edit_your_profile: Muuda profiili
-      my friends: Minu sõbrad
-      no friends: Sa ei ole lisanud veel ühtegi sõpra.
-      km away: '%{count} kilomeetri kaugusel'
-      m away: '%{count} meetri kaugusel'
-      nearby users: Teised lähedal asuvad kasutajad
-      no nearby users: Puuduvad teised kasutajad, kes tunnistavad, et kaardistavad
-        läheduses.
       role:
         administrator: See kasutaja on administraator
         moderator: See kasutaja on moderaator
@@ -2054,15 +2065,7 @@ et:
       unhide_user: Muuda see kasutaja nähtavaks
       delete_user: Kustuta see kasutaja
       confirm: Kinnita
-      friends_changesets: sõprade muudatuskogumid
-      friends_diaries: sõprade päevikusissekanded
-      nearby_changesets: lähedalasuvate kasutajate muudatuskogumid
-      nearby_diaries: lähedalasuvate kasutajate päevikusissekanded
       report: Teata sellest kasutajast
-    popup:
-      your location: Sinu asukoht
-      nearby mapper: Lähedaloevad kaardistajad
-      friend: Sõber
     account:
       title: Konto muutmine
       my settings: Minu sätted
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 4a115e68b..65187c697 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -387,6 +387,23 @@ eu:
     timeout:
       sorry: Barkatu, zuk eskatutako aldaketen zerrenda berreskuratzeko denbora gehiegi
         behar izan da.
+  dashboards:
+    contact:
+      km away: '%{count} km-tara'
+      m away: '%{count} m-tara'
+    popup:
+      your location: Zure kokapena
+      nearby mapper: Hurbileko mapeatzaileak
+      friend: Laguna
+    show:
+      my friends: Nire lagunak
+      no friends: Oraindik ez duzu lagunik gehitu.
+      nearby users: Gertuko beste erabiltzaile batzuk
+      no nearby users: Ez dago oraindik hurbileko mapa editatzea onartzen duen erabiltzailerik.
+      friends_changesets: Lagunen aldaketak
+      friends_diaries: Lagunen eguneroko sarrerak
+      nearby_changesets: inguruko erabiltzaileen aldaketak
+      nearby_diaries: inguruko erabiltzaileen eguneroko sarrerak
   diary_entries:
     new:
       title: Eguneroko Sarrera Berria
@@ -2277,12 +2294,6 @@ eu:
       spam score: 'Spam Puntuazioa:'
       description: Deskribapen
       user location: Lankidearen kokapena
-      my friends: Nire lagunak
-      no friends: Oraindik ez duzu lagunik gehitu.
-      km away: '%{count} km-tara'
-      m away: '%{count} m-tara'
-      nearby users: Gertuko beste erabiltzaile batzuk
-      no nearby users: Ez dago oraindik hurbileko mapa editatzea onartzen duen erabiltzailerik.
       role:
         administrator: Lankide hau administratzailea da
         moderator: Lankide hau moderatzailea da
@@ -2303,15 +2314,7 @@ eu:
       unhide_user: Erabiltzaile honen ezkutaketa kendu
       delete_user: Erabiltzaile hau ezabatu
       confirm: Berretsi
-      friends_changesets: Lagunen aldaketak
-      friends_diaries: Lagunen eguneroko sarrerak
-      nearby_changesets: inguruko erabiltzaileen aldaketak
-      nearby_diaries: inguruko erabiltzaileen eguneroko sarrerak
       report: Salatu erabiltzaile hau
-    popup:
-      your location: Zure kokapena
-      nearby mapper: Hurbileko mapeatzaileak
-      friend: Laguna
     account:
       title: Kontua aldatu
       my settings: Nire aukerak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 09642aa19..15bf37db8 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -464,6 +464,27 @@ fa:
     timeout:
       sorry: شوربختانه بازیابی نظرات بستهٔ تغییر که درخواست نموده‌اید، خیلی طولانی
         شد.
+  dashboards:
+    contact:
+      km away: ‏%{count} کیلومتر فاصله
+      m away: ‏%{count} متر فاصله
+    popup:
+      your location: مکان شما
+      nearby mapper: نقشه‌کش نزدیک
+      friend: دوست
+    show:
+      title: پیشخوان من
+      no_home_location_html: '%{edit_profile_link} و موقعیت خانهٔ خود را تنظیم کنید
+        تا کاربران نزدیک را ببینید.'
+      edit_your_profile: ویرایش پروفایل
+      my friends: دوستان من
+      no friends: هنوز هیچ دوستی اضافه نکرده‌اید
+      nearby users: دیگر کاربران نزدیک
+      no nearby users: در این حوالی هیچ کاربری  نقشه  ترسیم نکرده است
+      friends_changesets: بسته‌های تغییر دوستان
+      friends_diaries: روزنوشت‌های دوستان
+      nearby_changesets: ویرایش‌های کاربران نزدیک
+      nearby_diaries: روزنوشت‌های کاربران نزدیک
   diary_entries:
     new:
       title: روزنوشت تازه
@@ -1405,8 +1426,8 @@ fa:
     intro_text: OpenStreetMap نقشه‌ای از جهان است که افرادی مانند شما آن را ساخته‌اند
       و آزادید آن را تحت پروانه‌ای آزاد استفاده کنید.
     intro_2_create_account: ساخت حساب کاربری
-    hosting_partners_html: میزبانی وب را %{ucl}،‏ %{bytemark} و سایر %{partners} پشتیبانی
-      می‌کنند.
+    hosting_partners_html: میزبانی وب را %{ucl}،‏ %{fastly}،‏ %{bytemark} و سایر %{partners}
+      پشتیبانی می‌کنند.
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: شرکای تجاری
@@ -2547,6 +2568,7 @@ fa:
       my settings: تنظیمات من
       my comments: نظرات من
       my_preferences: ترجیحات من
+      my_dashboard: پیشخوان من
       blocks on me: مسدودی‌های من
       blocks by me: مسدودی‌های به دست من
       edit_profile: ویرایش نمایه
@@ -2568,13 +2590,6 @@ fa:
       spam score: 'رتبهٔ هرزنگاری:'
       description: شرح
       user location: موقعبت کاربر
-      edit_your_profile: ویرایش پروفایل
-      my friends: دوستان من
-      no friends: هنوز هیچ دوستی اضافه نکرده‌اید
-      km away: ‏%{count} کیلومتر فاصله
-      m away: ‏%{count} متر فاصله
-      nearby users: دیگر کاربران نزدیک
-      no nearby users: در این حوالی هیچ کاربری  نقشه  ترسیم نکرده است
       role:
         administrator: این کاربر مدیر است
         moderator: این کاربر ناظم است
@@ -2595,15 +2610,7 @@ fa:
       unhide_user: آشکارکردن این کاربر
       delete_user: حذف این کاربر
       confirm: تأیید
-      friends_changesets: ویرایش‌های دوستان
-      friends_diaries: روزنوشت‌های دوستان
-      nearby_changesets: ویرایش‌های کاربران نزدیک
-      nearby_diaries: روزنوشت‌های کاربران نزدیک
       report: گزارش این کاربر
-    popup:
-      your location: مکان شما
-      nearby mapper: نقشه‌کش نزدیک
-      friend: دوست
     account:
       title: ویرایش حساب
       my settings: تنظیمات من
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 10ba4bdc6..79c3e361c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -454,6 +454,25 @@ fi:
     timeout:
       sorry: Valitettavasti pyytämäsi muutoskokoelmien kommenttien hakeminen kesti
         liian kauan.
+  dashboards:
+    contact:
+      km away: '%{count} kilometrin päässä'
+      m away: '%{count} metrin päässä'
+    popup:
+      your location: Oma sijaintisi
+      nearby mapper: Lähellä oleva kartoittaja
+      friend: Kaveri
+    show:
+      title: Minun kojelauta
+      edit_your_profile: Muokkaa profiiliasi
+      my friends: Kaverit
+      no friends: Sinulla ei ole vielä kavereita.
+      nearby users: Muut lähialueen käyttäjät
+      no nearby users: Valitun sijainnin lähellä ei ole tiedossa muita käyttäjiä.
+      friends_changesets: kaverien muutoskokoelmat
+      friends_diaries: kaverien päiväkirjamerkinnät
+      nearby_changesets: lähialueen käyttäjien muutoskokoelmat
+      nearby_diaries: lähialueen käyttäjien päiväkirjamerkinnät
   diary_entries:
     new:
       title: Uusi päiväkirjamerkintä
@@ -1366,6 +1385,7 @@ fi:
     hosting_partners_html: Palvelinkapasiteettia meille tarjoaa %{ucl}, %{bytemark},
       ja muut %{partners}.
     partners_ucl: UCL
+    partners_fastly: Nopeasti
     partners_bytemark: Bytemark Hosting
     partners_partners: kumppanimme
     tou: Käyttöehdot
@@ -2430,6 +2450,7 @@ fi:
       my settings: Asetukset
       my comments: Omat kommentit
       my_preferences: Asetukseni
+      my_dashboard: Minun kojelauta
       blocks on me: Saadut estot
       blocks by me: Tekemäni estot
       edit_profile: Muokkaa profiilia
@@ -2451,13 +2472,6 @@ fi:
       spam score: 'Spam-pisteet:'
       description: Kuvaus
       user location: Käyttäjän sijainti
-      edit_your_profile: Muokkaa profiiliasi
-      my friends: Kaverit
-      no friends: Sinulla ei ole vielä kavereita.
-      km away: '%{count} kilometrin päässä'
-      m away: '%{count} metrin päässä'
-      nearby users: Muut lähialueen käyttäjät
-      no nearby users: Valitun sijainnin lähellä ei ole tiedossa muita käyttäjiä.
       role:
         administrator: Tämä käyttäjä on ylläpitäjä.
         moderator: Tämä käyttäjä on moderaattori.
@@ -2478,15 +2492,7 @@ fi:
       unhide_user: Poista käyttäjän piilottaminen
       delete_user: Poista tämä käyttäjä
       confirm: Vahvista
-      friends_changesets: kaverien muutoskokoelmat
-      friends_diaries: kaverien päiväkirjamerkinnät
-      nearby_changesets: lähialueen käyttäjien muutoskokoelmat
-      nearby_diaries: lähialueen käyttäjien päiväkirjamerkinnät
       report: Ilmianna käyttäjä
-    popup:
-      your location: Oma sijaintisi
-      nearby mapper: Lähellä oleva kartoittaja
-      friend: Kaveri
     account:
       title: Asetusten muokkaus
       my settings: Käyttäjäasetukset
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 445a5a45f..6bc4bcdd4 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -353,6 +353,14 @@ fit:
     timeout:
       sorry: Valitettavasti pyytämäsi muutoskokoelmien kommenttien hakeminen kesti
         liian kauan.
+  dashboards:
+    contact:
+      km away: '%{count} kilometrin päässä'
+    popup:
+      your location: Sinun paikka
+      friend: Kaveri
+    show:
+      my friends: Minun ystävät
   diary_entries:
     new:
       title: Uusi päiväkirjamerkintä
@@ -974,11 +982,6 @@ fit:
       add as friend: Lissää ystäväksi
       latest edit: 'Viimeisin muutos (%{ago}):'
       email address: 'E-postiatressi:'
-      my friends: Minun ystävät
-      km away: '%{count} kilometrin päässä'
-    popup:
-      your location: Sinun paikka
-      friend: Kaveri
     account:
       title: Mookkaa konttua
       my settings: Minun inställninkit
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 56ed4331e..818446669 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -516,6 +516,28 @@ fr:
     timeout:
       sorry: Désolé, la liste des commentaires d’ensembles de modifications que vous
         avez demandée est trop longue à récupérer.
+  dashboards:
+    contact:
+      km away: à %{count} km
+      m away: à %{count} m
+    popup:
+      your location: Votre emplacement
+      nearby mapper: Cartographe à proximité
+      friend: Ami(e)
+    show:
+      title: Mon tableau de bord
+      no_home_location_html: '%{edit_profile_link} et définissez l’emplacement de
+        votre domicile pour voir les utilisateurs à proximité.'
+      edit_your_profile: Modifier votre profil
+      my friends: Mes amis
+      no friends: Vous n’avez pas encore ajouté d’ami.
+      nearby users: Autres utilisateurs à proximité
+      no nearby users: Aucun utilisateur n’a encore signalé qu’il cartographiait à
+        proximité.
+      friends_changesets: groupes de modifications des amis
+      friends_diaries: entrées de journal des amis
+      nearby_changesets: groupes de modifications des utilisateurs à proximité
+      nearby_diaries: entrées de journal des utilisateurs à proximité
   diary_entries:
     new:
       title: Nouvelle entrée du journal
@@ -2721,6 +2743,7 @@ fr:
       my settings: Mes options
       my comments: Mes commentaires
       my_preferences: Mes préférences
+      my_dashboard: Mon tableau de bord
       blocks on me: Blocages me concernant
       blocks by me: Blocages de ma part
       edit_profile: Modifier le profil
@@ -2742,16 +2765,6 @@ fr:
       spam score: 'Indice de pollution :'
       description: Description
       user location: Emplacement de l’utilisateur
-      no_home_location_html: '%{edit_profile_link} et définissez l’emplacement de
-        votre domicile pour voir les utilisateurs à proximité.'
-      edit_your_profile: Modifier votre profil
-      my friends: Mes amis
-      no friends: Vous n’avez pas encore ajouté d’ami.
-      km away: à %{count} km
-      m away: à %{count} m
-      nearby users: Autres utilisateurs à proximité
-      no nearby users: Aucun utilisateur n’a encore signalé qu’il cartographiait à
-        proximité.
       role:
         administrator: C’est un administrateur ou une administratrice
         moderator: C’est un modérateur ou une modératrice
@@ -2772,15 +2785,7 @@ fr:
       unhide_user: Réafficher cet utilisateur ou cette utilisatrice
       delete_user: Supprimer cet utilisateur ou cette utilisatrice
       confirm: Confirmer
-      friends_changesets: groupes de modifications des amis
-      friends_diaries: entrées de journal des amis
-      nearby_changesets: groupes de modifications des utilisateurs à proximité
-      nearby_diaries: entrées de journal des utilisateurs à proximité
       report: Signaler cet utilisateur ou cette utilisatrice
-    popup:
-      your location: Votre emplacement
-      nearby mapper: Cartographe à proximité
-      friend: Ami(e)
     account:
       title: Modifier le compte
       my settings: Mes options
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 71e653ead..38aab3e61 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -377,6 +377,24 @@ fur:
     index:
       title_all: Discussion sul grup di cambiaments di OpenStreetMap
       title_particular: 'Discussion sul grup di cambiaments #%{changeset_id} di OpenStreetMap'
+  dashboards:
+    contact:
+      km away: '%{count}km di distance'
+      m away: '%{count}m di distance'
+    popup:
+      your location: La tô posizion
+      nearby mapper: Mapadôr dongje
+      friend: Amì
+    show:
+      my friends: I miei amîs
+      no friends: No tu âs ancjemò nissun amì.
+      nearby users: Altris utents dongje
+      no nearby users: Nol è ancjemò nissun utent che al declare di mapâ dongje di
+        te.
+      friends_changesets: grups di cambiaments dai amîs
+      friends_diaries: vôs di diari dai amîs
+      nearby_changesets: grups di cambiaments dai utents dongje
+      nearby_diaries: vôs di diari dai utents dongje
   diary_entries:
     new:
       title: Gnove vôs dal diari
@@ -1340,13 +1358,6 @@ fur:
       spam score: 'Ponts di spam:'
       description: Descrizion
       user location: Lûc dal utent
-      my friends: I miei amîs
-      no friends: No tu âs ancjemò nissun amì.
-      km away: '%{count}km di distance'
-      m away: '%{count}m di distance'
-      nearby users: Altris utents dongje
-      no nearby users: Nol è ancjemò nissun utent che al declare di mapâ dongje di
-        te.
       role:
         administrator: Chest utent al è un aministradôr
         moderator: Chest utent al è un moderatôr
@@ -1361,15 +1372,7 @@ fur:
       unhide_user: mostre chest utent
       delete_user: elimine chest utent
       confirm: Conferme
-      friends_changesets: grups di cambiaments dai amîs
-      friends_diaries: vôs di diari dai amîs
-      nearby_changesets: grups di cambiaments dai utents dongje
-      nearby_diaries: vôs di diari dai utents dongje
       report: Segnale chest utent
-    popup:
-      your location: La tô posizion
-      nearby mapper: Mapadôr dongje
-      friend: Amì
     account:
       title: Modifiche profîl
       my settings: Mês impostazions
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 7ac987b05..5239bfff9 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -118,6 +118,9 @@ fy:
       area: Gebiet
     index:
       load_more: Mear laden
+  dashboards:
+    popup:
+      friend: Freon
   diary_entries:
     form:
       location: 'Lokaasje:'
@@ -537,8 +540,6 @@ fy:
       email address: 'E-mailadres:'
       status: 'Status:'
       description: Beskriuwing
-    popup:
-      friend: Freon
     account:
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 2cc1c15c5..5f17e6901 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -356,6 +356,16 @@ ga:
     timeout:
       sorry: Ár leithscéil, thóg sé rófhada an liosta de na tacair athruithe a d'iarr
         tú a aisghabháil.
+  dashboards:
+    contact:
+      km away: '%{count} km uait'
+      m away: '%{count} m uait'
+    popup:
+      nearby mapper: Léarscálaí in aice láimhe
+      friend: Cara
+    show:
+      nearby users: Úsáideoirí eile in aice láimhe
+      friends_diaries: iontrálacha dialainne do chairde
   diary_entries:
     new:
       title: Iontráil Nua Dialainne
@@ -1970,9 +1980,6 @@ ga:
       spam score: 'Scór Turscair:'
       description: Cur síos
       user location: Suíomh an úsáideora
-      km away: '%{count} km uait'
-      m away: '%{count} m uait'
-      nearby users: Úsáideoirí eile in aice láimhe
       role:
         administrator: Is riarthóir é an t-úsáideoir seo
         moderator: Is áisitheoir é an t-úsáideoir seo
@@ -1984,10 +1991,6 @@ ga:
       unhide_user: Taispeáin an tÚsáideoir seo
       delete_user: Scrios an tÚsáideoir seo
       confirm: Deimhnigh
-      friends_diaries: iontrálacha dialainne do chairde
-    popup:
-      nearby mapper: Léarscálaí in aice láimhe
-      friend: Cara
     account:
       title: Cuir an cuntas in eagar
       my settings: Mo chuid socruithe
diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index cfb10e051..23d3f04a7 100644
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -24,6 +24,16 @@ gcf:
     start_rjs:
       load_data: Chajé sé doné la
       loading: Y ka chajé...
+  dashboards:
+    contact:
+      km away: '%{count} km'
+    popup:
+      your location: Koté ou yé
+      nearby mapper: Arpantè owa aw
+    show:
+      no friends: Ou poko ni pon zanmi
+      nearby users: 'Itilizatè owa aw :'
+      no nearby users: Ou poko ni itilizatè owa aw.
   diary_entries:
     new:
       title: Nouvel nèf an jounal la
@@ -144,13 +154,6 @@ gcf:
       mapper since: 'Arpantè dèpi:'
       description: Deskription
       user location: Ola itilizatè yé
-      no friends: Ou poko ni pon zanmi
-      km away: '%{count} km'
-      nearby users: 'Itilizatè owa aw :'
-      no nearby users: Ou poko ni itilizatè owa aw.
-    popup:
-      your location: Koté ou yé
-      nearby mapper: Arpantè owa aw
     account:
       my settings: Mes options
       public editing:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 801839756..034eaad19 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -325,6 +325,23 @@ gd:
     index:
       title_all: Deasbaireachd air seataichean atharraichean OpenStreetMap
       title_particular: Deasbaireachd air seata atharraichean OpenStreetMap %{changeset_id}
+  dashboards:
+    contact:
+      km away: '%{count}km air falbh'
+      m away: '%{count}m air falbh'
+    popup:
+      your location: Far a bheil thu
+      nearby mapper: Neach-mapachaidh am fagas
+      friend: Caraid
+    show:
+      no friends: Cha do chuir thu caraid ris fhathast.
+      nearby users: Cleachdaichean am fagas eile
+      no nearby users: Chan eil cleachdaiche sam bith eile ann a dh'innis gu bheil
+        iad ris an obair-mhapa am fagas.
+      friends_changesets: seata atharraichean nan caraidean
+      friends_diaries: clàran leabhair-latha nan caraidean
+      nearby_changesets: seata atharraichean nan cleachdaichean am fagas
+      nearby_diaries: clàran leabhair-latha am fagas
   diary_entries:
     new:
       title: Clàr ùr an leabhair-latha
@@ -1901,12 +1918,6 @@ gd:
       spam score: 'Sgòr spama:'
       description: Tuairisgeul
       user location: Far a bheil an cleachdaiche
-      no friends: Cha do chuir thu caraid ris fhathast.
-      km away: '%{count}km air falbh'
-      m away: '%{count}m air falbh'
-      nearby users: Cleachdaichean am fagas eile
-      no nearby users: Chan eil cleachdaiche sam bith eile ann a dh'innis gu bheil
-        iad ris an obair-mhapa am fagas.
       role:
         administrator: '''S e rianaire a tha sa chleachdaiche seo'
         moderator: '''S e maor a tha sa chleachdaiche seo'
@@ -1927,14 +1938,6 @@ gd:
       unhide_user: Neo-fhalaich an cleachdaiche seo
       delete_user: Sguab às an cleachdaiche seo
       confirm: Dearbhaich
-      friends_changesets: seata atharraichean nan caraidean
-      friends_diaries: clàran leabhair-latha nan caraidean
-      nearby_changesets: seata atharraichean nan cleachdaichean am fagas
-      nearby_diaries: clàran leabhair-latha am fagas
-    popup:
-      your location: Far a bheil thu
-      nearby mapper: Neach-mapachaidh am fagas
-      friend: Caraid
     account:
       title: Deasaich an cunntas
       my settings: Na roghainnean agam
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 40c29e343..dac06f669 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -444,6 +444,28 @@ gl:
     timeout:
       sorry: Sentímolo, a listaxe dos comentarios do conxuntos de modificacións que
         solicitaches tardou moito en obterse.
+  dashboards:
+    contact:
+      km away: a %{count}km de distancia
+      m away: a %{count}m de distancia
+    popup:
+      your location: A súa localización
+      nearby mapper: Cartógrafo preto de ti
+      friend: Amizade
+    show:
+      title: O meu panel de control
+      no_home_location_html: '%{edit_profile_link} e define a localización da túa
+        casa para ver usuarios preto de ti.'
+      edit_your_profile: Editar o teu perfil
+      my friends: As miñas amizades
+      no friends: Aínda non engadiu ningunha amizade.
+      nearby users: Outros usuarios preto de ti
+      no nearby users: Aínda non hai usuarios que estean situados preto de ti.
+      friends_changesets: conxuntos de modificacións das amizades
+      friends_diaries: entradas de diario das amizades
+      nearby_changesets: conxuntos de modificacións dos usuarios de lugares preto
+        de ti
+      nearby_diaries: entradas de diario dos usuarios de lugares preto de ti
   diary_entries:
     new:
       title: Nova entrada no diario
@@ -779,6 +801,7 @@ gl:
           window_construction: Construtor de xanelas
           winery: Adega
           "yes": Tenda de artesanía
+        crossing: Paso
         emergency:
           access_point: Punto de acceso
           ambulance_station: Base de ambulancias
@@ -869,6 +892,7 @@ gl:
           railway: Vía férrea histórica
           roman_road: Estrada romana
           ruins: Ruínas
+          rune_stone: Pedra rúnica
           stone: Pedra
           tomb: Sepulcro
           tower: Torre
@@ -1033,6 +1057,7 @@ gl:
           hill: Outeiro
           hot_spring: Manancial quente
           island: Illa
+          isthmus: Istmo
           land: Terra
           marsh: Marisma
           moor: Páramo
@@ -1047,10 +1072,13 @@ gl:
           sand: Area
           scree: Pedregal
           scrub: Matogueira
+          shingle: Seixos
           spring: Manancial
           stone: Pedra
           strait: Estreito
           tree: Árbore
+          tree_row: Ringleira de árbores
+          tundra: Tundra
           valley: Val
           volcano: Volcán
           water: Auga
@@ -1453,6 +1481,7 @@ gl:
     hosting_partners_html: O aloxamento é fornecido por %{ucl}, %{bytemark} e outros
       %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: socios
     tou: Termos de uso
@@ -2616,6 +2645,7 @@ gl:
       my settings: Os meus axustes
       my comments: Os meus comentarios
       my_preferences: As miñas preferencias
+      my_dashboard: O meu panel de control
       blocks on me: Os meus bloqueos
       blocks by me: Bloqueos efectuados
       edit_profile: Editar perfil
@@ -2637,13 +2667,6 @@ gl:
       spam score: 'Puntuación do spam:'
       description: Descrición
       user location: Localización do usuario
-      edit_your_profile: Editar o teu perfil
-      my friends: As miñas amizades
-      no friends: Aínda non engadiu ningunha amizade.
-      km away: a %{count}km de distancia
-      m away: a %{count}m de distancia
-      nearby users: Outros usuarios preto de ti
-      no nearby users: Aínda non hai usuarios que estean situados preto de ti.
       role:
         administrator: Este usuario é administrador
         moderator: Este usuario é moderador
@@ -2664,16 +2687,7 @@ gl:
       unhide_user: Descobrir este usuario
       delete_user: Eliminar este usuario
       confirm: Confirmar
-      friends_changesets: conxuntos de modificacións das amizades
-      friends_diaries: entradas de diario das amizades
-      nearby_changesets: conxuntos de modificacións dos usuarios de lugares preto
-        de ti
-      nearby_diaries: entradas de diario dos usuarios de lugares preto de ti
       report: Denunciar este usuario
-    popup:
-      your location: A súa localización
-      nearby mapper: Cartógrafo preto de ti
-      friend: Amizade
     account:
       title: Editar a conta
       my settings: Os meus axustes
diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index 7535996d4..c1b916223 100644
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -178,6 +178,10 @@ gsw:
       loading: Am Lade ...
     tag_details:
       tags: 'Tags:'
+  dashboards:
+    popup:
+      your location: Dyy Standort
+      nearby mapper: Mapper in dr Nechi
   friendships:
     make_friend:
       success: '%{name} isch jetz Dyy Frynd.'
@@ -262,9 +266,6 @@ gsw:
     make_public:
       made_public: Track, wu vereffetligt isch
   users:
-    popup:
-      your location: Dyy Standort
-      nearby mapper: Mapper in dr Nechi
     go_public:
       flash success: Alli Dyyni Bearbeitige sion jetz effetlig, un Du derfsch jetz
         Bearbeitige mache.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 1ee266ad3..be51dbc5b 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -485,6 +485,26 @@ he:
     timeout:
       sorry: הזמן שלקח לרשימת ההערות על ערכת השינויים שביקשת להתקבל ארוך מדי, עמך
         הסליחה.
+  dashboards:
+    contact:
+      km away: במרחק %{count} ק״מ
+      m away: במרחק %{count} מ׳
+    popup:
+      your location: מיקומך
+      nearby mapper: ממפה סמוך
+      friend: חבר
+    show:
+      no_home_location_html: '%{edit_profile_link} והגדרת מיקום הבית שלך לצפייה במשתמשים
+        קרובים.'
+      edit_your_profile: עריכת הפרופיל שלך
+      my friends: החברים שלי
+      no friends: עדיין לא הוספת חברים.
+      nearby users: עוד משתמשים בסביבה
+      no nearby users: אין עדיין עוד משתמשים שמודים שהם מיפו בסביבה.
+      friends_changesets: ערכות שינויים של חברים
+      friends_diaries: רשומות יומן של חברים
+      nearby_changesets: ערכות השינויים של משתמשים בסביבה
+      nearby_diaries: רשומות יומן של משתמשים בסביבה
   diary_entries:
     new:
       title: רשומת יומן חדשה
@@ -2612,15 +2632,6 @@ he:
       spam score: 'דירוג זיבול:'
       description: תיאור
       user location: מיקום המשתמש
-      no_home_location_html: '%{edit_profile_link} והגדרת מיקום הבית שלך לצפייה במשתמשים
-        קרובים.'
-      edit_your_profile: עריכת הפרופיל שלך
-      my friends: החברים שלי
-      no friends: עדיין לא הוספת חברים.
-      km away: במרחק %{count} ק״מ
-      m away: במרחק %{count} מ׳
-      nearby users: עוד משתמשים בסביבה
-      no nearby users: אין עדיין עוד משתמשים שמודים שהם מיפו בסביבה.
       role:
         administrator: לחשבון הזה יש הרשאות מפעיל
         moderator: זהו חשבון מנהל
@@ -2641,15 +2652,7 @@ he:
       unhide_user: ביטול הסתרת משתמש זה
       delete_user: מחיקת משתמש זה
       confirm: אישור
-      friends_changesets: ערכות שינויים של חברים
-      friends_diaries: רשומות יומן של חברים
-      nearby_changesets: ערכות השינויים של משתמשים בסביבה
-      nearby_diaries: רשומות יומן של משתמשים בסביבה
       report: דיווח על המשתמש
-    popup:
-      your location: מיקומך
-      nearby mapper: ממפה סמוך
-      friend: חבר
     account:
       title: עריכת חשבון
       my settings: ההגדרות שלי
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 3dd619d72..7cfea09e7 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -422,6 +422,9 @@ hi:
     timeout:
       sorry: माफ़ कीजिए, जिन चेंजसेट कमेंटों की आपने अनुरोध की थी उन्हें लाने में
         कुछ ज़्यादा ही वक्त लग गया।
+  dashboards:
+    show:
+      my friends: मेरे मित्र
   diary_entries:
     new:
       title: नई डायरी प्रवेश
@@ -1010,8 +1013,6 @@ hi:
     new:
       deny: मना
   users:
-    show:
-      my friends: मेरे मित्र
     account:
       public editing:
         enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index d3abdcf14..03c0c46fb 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -413,6 +413,21 @@ hr:
     index:
       title_all: Rasprava o OpenStreetMap setu promjena
       title_particular: 'Rasprava o OpenStreetMap setu promjena #%{changeset_id}'
+  dashboards:
+    contact:
+      km away: udaljen %{count}km
+      m away: '%{count}m daleko'
+    popup:
+      your location: Vaša lokacija
+      nearby mapper: Obližnji maper
+      friend: Prijatelj
+    show:
+      my friends: Moji prijatelji
+      no friends: Nisi dodao niti jednog prijatelja.
+      nearby users: Drugi korisnici u blizini
+      no nearby users: Još uvijek nema drugih korisnika koji kartiraju-mapiraju u
+        blizini.
+      friends_changesets: changesetovi prijatelja
   diary_entries:
     new:
       title: Novi zapis u dnevnik
@@ -1770,13 +1785,6 @@ hr:
       spam score: 'Spam ocjena:'
       description: Opis
       user location: Lokacija boravišta korisnika
-      my friends: Moji prijatelji
-      no friends: Nisi dodao niti jednog prijatelja.
-      km away: udaljen %{count}km
-      m away: '%{count}m daleko'
-      nearby users: Drugi korisnici u blizini
-      no nearby users: Još uvijek nema drugih korisnika koji kartiraju-mapiraju u
-        blizini.
       role:
         administrator: Ovaj korisnik je administrator
         moderator: Ovaj korisnik je moderator
@@ -1797,12 +1805,7 @@ hr:
       unhide_user: Otkrij ovog korisnika
       delete_user: Obriši ovog korisnika
       confirm: Potvrdi
-      friends_changesets: changesetovi prijatelja
       report: Prijavi ovog korisnika
-    popup:
-      your location: Vaša lokacija
-      nearby mapper: Obližnji maper
-      friend: Prijatelj
     account:
       title: Uredi korisnički račun
       my settings: Moje postavke
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index fc8e66ab9..53c2fcfa0 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -420,6 +420,26 @@ hsb:
       title_particular: Diskusija wo sadźbje změnow čo. %{changeset_id} OpenStreetMap
     timeout:
       sorry: Bohužel je předołho trało, wot tebje požadanu lisćinu komentarow wotwołać.
+  dashboards:
+    contact:
+      km away: '%{count} km zdaleny'
+      m away: '%{count} m zdaleny'
+    popup:
+      your location: Twoje městno
+      nearby mapper: Kartěrowar w bliskosći
+      friend: Přećel
+    show:
+      no_home_location_html: '%{edit_profile_link} a nastaj swoje ródne město, zo
+        by wužiwarjow w bliskosći widźał.'
+      edit_your_profile: Wobdźěłaj swój profil
+      my friends: Moji přećeljo
+      no friends: Hišće njejsy přećelow přidał.
+      nearby users: Druzy wužiwarjo w bliskosći
+      no nearby users: Njejsu druzy wužiwarjo, kotřiž w bliskosći kartěruja.
+      friends_changesets: Sadźby změnow twojich přećelow
+      friends_diaries: Dźenikowe zapiski přećelow
+      nearby_changesets: sadźby změnow wužiwarjow w bliskosći
+      nearby_diaries: dźenikowe zapiski wužiwarjow w bliskosći
   diary_entries:
     new:
       title: Nowy zapisk do dźenika
@@ -2521,15 +2541,6 @@ hsb:
       spam score: 'Spamowe hódnoćenje:'
       description: Wopisanje
       user location: Wužiwarske stejnišćo
-      no_home_location_html: '%{edit_profile_link} a nastaj swoje ródne město, zo
-        by wužiwarjow w bliskosći widźał.'
-      edit_your_profile: Wobdźěłaj swój profil
-      my friends: Moji přećeljo
-      no friends: Hišće njejsy přećelow přidał.
-      km away: '%{count} km zdaleny'
-      m away: '%{count} m zdaleny'
-      nearby users: Druzy wužiwarjo w bliskosći
-      no nearby users: Njejsu druzy wužiwarjo, kotřiž w bliskosći kartěruja.
       role:
         administrator: Tutón wužiwar je administrator
         moderator: Tutón wužiwar je moderator.
@@ -2550,15 +2561,7 @@ hsb:
       unhide_user: Tutoho wužiwarja pokazaś
       delete_user: Tutoho wužiwarja zhašeć
       confirm: Wobkrućić
-      friends_changesets: Sadźby změnow twojich přećelow
-      friends_diaries: Dźenikowe zapiski přećelow
-      nearby_changesets: sadźby změnow wužiwarjow w bliskosći
-      nearby_diaries: dźenikowe zapiski wužiwarjow w bliskosći
       report: Tutoho wužiwarja zdźělić
-    popup:
-      your location: Twoje městno
-      nearby mapper: Kartěrowar w bliskosći
-      friend: Přećel
     account:
       title: Konto wobdźěłać
       my settings: Moje nastajenja
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e7da92eb9..8a8f62ad4 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -428,7 +428,7 @@ hu:
     index:
       title: Módosításcsomagok
       title_user: '%{user} módosításcsomagjai'
-      title_friend: Ismerőseim módosításcsomagjai
+      title_friend: Ismerősök módosításcsomagjai
       title_nearby: Közeli felhasználók módosításcsomagjai
       empty: Nem található módosításcsomag
       empty_area: Nincs módosításcsomag erre a területre.
@@ -453,6 +453,28 @@ hu:
     timeout:
       sorry: Sajnáljuk, túl sokáig tartott az általad kért módosításcsomag-hozzászólások
         listájának lekérése.
+  dashboards:
+    contact:
+      km away: '%{count} km távolságra'
+      m away: '%{count} m távolságra'
+    popup:
+      your location: Helyed
+      nearby mapper: Közeli térképszerkesztő
+      friend: Ismerős
+    show:
+      title: Irányítópult
+      no_home_location_html: '%{edit_profile_link}, és add meg az otthoni tartózkodási
+        helyed, hogy lásd a közeli felhasználókat.'
+      edit_your_profile: Szerkeszd a profilodat
+      my friends: Ismerősök
+      no friends: Még nem adtál meg egyetlen ismerőst sem.
+      nearby users: További közeli felhasználók
+      no nearby users: Még nincsenek más felhasználók, akik megadták, hogy a közelben
+        szerkesztenek.
+      friends_changesets: ismerősök módosításcsomagjai
+      friends_diaries: ismerősök naplóbejegyzései
+      nearby_changesets: közeli felhasználók módosításcsomagjai
+      nearby_diaries: közeli felhasználók naplóbejegyzései
   diary_entries:
     new:
       title: Új naplóbejegyzés
@@ -788,6 +810,7 @@ hu:
           window_construction: Ablakkészítő
           winery: Borászat
           "yes": Kézműves bolt
+        crossing: Gyalogosátkelő
         emergency:
           access_point: Mentési pont
           ambulance_station: Mentőállomás
@@ -1043,6 +1066,7 @@ hu:
           hill: Domb
           hot_spring: Hőforrás
           island: Sziget
+          isthmus: Földszoros
           land: Szárazföld
           marsh: Mocsár
           moor: Mocsár
@@ -1057,10 +1081,13 @@ hu:
           sand: Homok
           scree: Törmeléklejtő
           scrub: Bozót
+          shingle: Kavicsos tengerpart vagy folyómeder
           spring: Forrás
           stone: Kő
           strait: Tengerszoros
           tree: Fa
+          tree_row: Fasor
+          tundra: Tundra
           valley: Völgy
           volcano: Vulkán
           water: Víz
@@ -1457,9 +1484,10 @@ hu:
     intro_text: Az OpenStreetMap egy világtérkép, amelyet hozzád hasonló emberek készítenek
       és szabad licenc alatt elérhető.
     intro_2_create_account: Felhasználói fiók létrehozása
-    hosting_partners_html: 'Az üzemeltetés támogatói: %{ucl}, %{bytemark}, és további
-      %{partners}.'
+    hosting_partners_html: 'Az üzemeltetés támogatói: %{ucl}, %{fastly}, %{bytemark},
+      és további %{partners}.'
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: partnerek
     tou: Felhasználási feltételek
@@ -1646,8 +1674,8 @@ hu:
   messages:
     inbox:
       title: Beérkezett üzenetek
-      my_inbox: Beérkezett üzeneteim
-      my_outbox: Elküldött üzeneteim
+      my_inbox: Beérkezett üzenetek
+      my_outbox: Elküldött üzenetek
       messages: '%{new_messages} és %{old_messages} van'
       new_messages:
         one: 1 új üzeneted
@@ -1682,8 +1710,8 @@ hu:
       body: Sajnáljuk, nincs ilyen azonosítójú üzenet.
     outbox:
       title: Elküldött üzenetek
-      my_inbox: Beérkezett üzeneteim
-      my_outbox: Elküldött üzeneteim
+      my_inbox: Beérkezett üzenetek
+      my_outbox: Elküldött üzenetek
       messages:
         one: Egy elküldött üzeneted van
         other: '%{count} elküldött üzeneted van'
@@ -1736,7 +1764,7 @@ hu:
       flash token bad: Nem találtad meg a tokent? Esetleg ellenőrizd az URL-t.
   preferences:
     show:
-      title: Beállításaim
+      title: Megjelenési beállítások
       preferred_editor: Előnyben részesített szerkesztő
       preferred_languages: Előnyben részesített nyelvek
       edit_preferences: Beállítások szerkesztése
@@ -1953,9 +1981,11 @@ hu:
           <strong>Ausztria</strong>: adatokat tartalmaz a következő forrásból:
              <a href="https://data.wien.gv.at/">Bécs városa</a>
              <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> licenc alatt.
-        contributors_au_html: |-
-          <strong>Ausztrália</strong>: tartalmaz külvárosi adatokat az
-             Ausztrál Statisztikai Hivatal adatain alapulva.
+        contributors_au_html: 'Ausztrália: A Commonwealth of Australia által a <a
+          href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution
+          4.0 International licenc (CC BY 4.0)</a> alapján engedélyezett <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
+          Australia</a> Administrative Boundaries &copy; (közigazgatási határok) felhasználásával
+          készült vagy azt tartalmazza.'
         contributors_ca_html: |-
           <strong>Kanada</strong>: adatokat tartalmaz a következő forrásokból:
              GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -2592,16 +2622,17 @@ hu:
         is lehet, hogy rossz linkre kattintottál.
       deleted: törölve
     show:
-      my diary: Naplóm
+      my diary: Saját napló
       new diary entry: új naplóbejegyzés
-      my edits: Szerkesztéseim
+      my edits: Saját szerkesztések
       my traces: Nyomvonalaim
-      my notes: Jegyzeteim
-      my messages: Üzeneteim
-      my profile: Profilom
-      my settings: Beállításaim
-      my comments: Hozzászólásaim
-      my_preferences: Beállításaim
+      my notes: Saját jegyzetek
+      my messages: Üzenetek
+      my profile: Profil
+      my settings: Személyes beállítások
+      my comments: Saját hozzászólások
+      my_preferences: Megjelenési beállítások
+      my_dashboard: Irányítópult
       blocks on me: Engem sújtó blokkolások
       blocks by me: Általam kiosztott blokkolások
       edit_profile: Profil szerkesztése
@@ -2623,16 +2654,6 @@ hu:
       spam score: 'Spam pontszám:'
       description: Leírás
       user location: Felhasználó helye
-      no_home_location_html: '%{edit_profile_link}, és add meg az otthoni tartózkodási
-        helyed, hogy lásd a közeli felhasználókat.'
-      edit_your_profile: Szerkeszd a profilodat
-      my friends: Ismerőseim
-      no friends: Még nem adtál meg egyetlen ismerőst sem.
-      km away: '%{count} km távolságra'
-      m away: '%{count} m távolságra'
-      nearby users: További közeli felhasználók
-      no nearby users: Még nincsenek más felhasználók, akik megadták, hogy a közelben
-        szerkesztenek.
       role:
         administrator: Ez a felhasználó adminisztrátor
         moderator: Ez a felhasználó moderátor
@@ -2653,18 +2674,10 @@ hu:
       unhide_user: felhasználó elrejtésének megszüntetése
       delete_user: felhasználó törlése
       confirm: Megerősítés
-      friends_changesets: ismerősök módosításcsomagjai
-      friends_diaries: ismerősök naplóbejegyzései
-      nearby_changesets: közeli felhasználók módosításcsomagjai
-      nearby_diaries: közeli felhasználók naplóbejegyzései
       report: Felhasználó bejelentése
-    popup:
-      your location: Helyed
-      nearby mapper: Közeli térképszerkesztő
-      friend: Ismerős
     account:
       title: Fiók szerkesztése
-      my settings: Beállításaim
+      my settings: Személyes beállítások
       current email address: Jelenlegi e-mail-cím
       external auth: Külső hitelesítés
       openid:
@@ -2699,7 +2712,7 @@ hu:
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: mi ez?
       save changes button: Módosítások mentése
-      make edits public button: Szerkesztéseim nyilvánossá tétele
+      make edits public button: Az összes szerkesztésem nyilvánossá tétele
       flash update success confirm needed: Felhasználói információk sikeresen frissítve.
         Nézd meg az e-mailjeidet az új e-mail címedet megerősítő levélhez.
       flash update success: Felhasználói információk sikeresen frissítve.
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index a38d3c273..ea97dc65c 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -431,6 +431,27 @@ ia:
     timeout:
       sorry: Le lista de commentos sur gruppos de modificationes que tu requestava
         tardava troppo de tempore pro esser recuperate.
+  dashboards:
+    contact:
+      km away: a %{count} km de distantia
+      m away: a %{count} m de distantia
+    popup:
+      your location: Tu position
+      nearby mapper: Cartographo vicin
+      friend: Amico
+    show:
+      title: Mi pannello
+      no_home_location_html: '%{edit_profile_link} e defini tu loco de domicilio pro
+        vider le usatores a proximitate.'
+      edit_your_profile: Modifica tu profilo
+      my friends: Mi amicos
+      no friends: Tu non ha ancora addite alcun amico.
+      nearby users: Altere usatores vicin
+      no nearby users: Il non ha ancora altere cartographos in le vicinitate.
+      friends_changesets: gruppos de modificationes de tu amicos
+      friends_diaries: articulos de diario de tu amicos
+      nearby_changesets: gruppos de modificationes de usatores a proximitate
+      nearby_diaries: articulos de diario per usatores a proximitate
   diary_entries:
     new:
       title: Nove entrata de diario
@@ -764,6 +785,7 @@ ia:
           window_construction: Construction de fenestras
           winery: Vinia
           "yes": Boteca de artisanato
+        crossing: Transversamento
         emergency:
           access_point: Puncto de accesso
           ambulance_station: Station de ambulantias
@@ -1019,6 +1041,7 @@ ia:
           hill: Collina
           hot_spring: Fonte thermal
           island: Insula
+          isthmus: Isthmo
           land: Terra
           marsh: Palude
           moor: Landa
@@ -1033,10 +1056,13 @@ ia:
           sand: Sablo
           scree: Detrito cadite
           scrub: Arbusto
+          shingle: Silice
           spring: Fontana
           stone: Petra
           strait: Stricto
           tree: Arbore
+          tree_row: Fila de arbores
+          tundra: Tundra
           valley: Vallea
           volcano: Vulcano
           water: Aqua
@@ -1438,6 +1464,7 @@ ia:
     hosting_partners_html: Le allogiamento web es supportate per %{ucl}, %{fastly},
       %{bytemark} e altere %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     tou: Conditiones de uso
@@ -1930,10 +1957,11 @@ ia:
           BY</a>, <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
           Vorarlberg</a> e Land Tirol (sub <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
           BY AT con emendamentos</a>).'
-        contributors_au_html: '<strong>Australia</strong>: Contine datos obtenite
-          ab <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA
-          Australia Limited</a> licentiate per le Commonwealth de Australia sub <a
-          href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.'
+        contributors_au_html: '<strong>Australia</strong>: Incorpora o disveloppate
+          usante Limites Administrative &copy; <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
+          Australia</a> publicate per le Commonwealth de Australia sub licentia <a
+          href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution
+          4.0 International (CC BY 4.0)</a>.'
         contributors_ca_html: |-
           <strong>Canada</strong>: Contine datos ab
              GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -2595,6 +2623,7 @@ ia:
       my settings: Mi preferentias
       my comments: Mi commentos
       my_preferences: Mi preferentias
+      my_dashboard: Mi pannello
       blocks on me: Blocadas concernente me
       blocks by me: Blocadas facite per me
       edit_profile: Modificar profilo
@@ -2616,15 +2645,6 @@ ia:
       spam score: 'Punctos de spam:'
       description: Description
       user location: Position del usator
-      no_home_location_html: '%{edit_profile_link} e defini tu loco de domicilio pro
-        vider le usatores a proximitate.'
-      edit_your_profile: Modifica tu profilo
-      my friends: Mi amicos
-      no friends: Tu non ha ancora addite alcun amico.
-      km away: a %{count} km de distantia
-      m away: a %{count} m de distantia
-      nearby users: Altere usatores vicin
-      no nearby users: Il non ha ancora altere cartographos in le vicinitate.
       role:
         administrator: Iste usator es un administrator
         moderator: Iste usator es un moderator
@@ -2645,15 +2665,7 @@ ia:
       unhide_user: Revelar iste usator
       delete_user: Deler iste usator
       confirm: Confirmar
-      friends_changesets: gruppos de modificationes de tu amicos
-      friends_diaries: articulos de diario de tu amicos
-      nearby_changesets: gruppos de modificationes de usatores a proximitate
-      nearby_diaries: articulos de diario per usatores a proximitate
       report: Signalar iste usator
-    popup:
-      your location: Tu position
-      nearby mapper: Cartographo vicin
-      friend: Amico
     account:
       title: Modificar conto
       my settings: Mi configurationes
diff --git a/config/locales/id.yml b/config/locales/id.yml
index aa59629c9..5bd0be633 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -446,6 +446,24 @@ id:
     timeout:
       sorry: Maaf, daftar komentar set perubahan yang Anda minta butuh waktu lama
         untuk ditampilkan.
+  dashboards:
+    contact:
+      km away: sejauh %{count}km
+      m away: sejauh %{count} meter
+    popup:
+      your location: Lokasi Anda
+      nearby mapper: Pembuat peta disekitar Anda
+      friend: Teman
+    show:
+      my friends: Teman saya
+      no friends: Anda belum menambahkan teman.
+      nearby users: Pengguna lain terdekat
+      no nearby users: Tidak ada pengguna lain yang mengaku untuk melakukan pemetaan
+        terdekat.
+      friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman
+      friends_diaries: Telusuri seluruh entri catatan harian oleh teman-teman
+      nearby_changesets: Telusuri seluruh set perubahan oleh pengguna terdekat
+      nearby_diaries: Telurusi seluruh entri catatan harian oleh pengguna terdekat
   diary_entries:
     new:
       title: Entri Baru Catatan Harian
@@ -2393,13 +2411,6 @@ id:
       spam score: 'Jumlah Spam:'
       description: Deskripsi
       user location: Lokasi pengguna
-      my friends: Teman saya
-      no friends: Anda belum menambahkan teman.
-      km away: sejauh %{count}km
-      m away: sejauh %{count} meter
-      nearby users: Pengguna lain terdekat
-      no nearby users: Tidak ada pengguna lain yang mengaku untuk melakukan pemetaan
-        terdekat.
       role:
         administrator: Pengguna ini merupakan administrator
         moderator: Pengguna ini adalah moderator
@@ -2420,15 +2431,7 @@ id:
       unhide_user: Munculkan Kembali Pengguna Ini
       delete_user: Hapus Pengguna Ini
       confirm: Konfirmasi
-      friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman
-      friends_diaries: Telusuri seluruh entri catatan harian oleh teman-teman
-      nearby_changesets: Telusuri seluruh set perubahan oleh pengguna terdekat
-      nearby_diaries: Telurusi seluruh entri catatan harian oleh pengguna terdekat
       report: Laporkan Pengguna Ini
-    popup:
-      your location: Lokasi Anda
-      nearby mapper: Pembuat peta disekitar Anda
-      friend: Teman
     account:
       title: Edit akun
       my settings: Pengaturan saya
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 57a381441..122316109 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -421,6 +421,24 @@ is:
     timeout:
       sorry: Því miður, það tók of langan tíma að ná í listann yfir þær athugasemdir
         við breytingasett sem þú baðst um.
+  dashboards:
+    contact:
+      km away: í %{count} km fjarlægð
+      m away: í %{count} m fjarlægð
+    popup:
+      your location: Staðsetning þín
+      nearby mapper: Nálægur notandi
+      friend: Vinur
+    show:
+      my friends: Vinir mínir
+      no friends: Þú átt enga vini
+      nearby users: Aðrir nálægir notendur
+      no nearby users: Engir notendur hafa stillt staðsetningu sína á korti nálægt
+        þér.
+      friends_changesets: breytingasett vina
+      friends_diaries: bloggfærslur vina
+      nearby_changesets: breytingasett vina í næsta nágrenni
+      nearby_diaries: bloggfærslur vina í næsta nágrenni
   diary_entries:
     new:
       title: Ný bloggfærsla
@@ -2477,13 +2495,6 @@ is:
       spam score: 'Ruslpóst-einkunn:'
       description: Lýsing
       user location: Staðsetning
-      my friends: Vinir mínir
-      no friends: Þú átt enga vini
-      km away: í %{count} km fjarlægð
-      m away: í %{count} m fjarlægð
-      nearby users: Aðrir nálægir notendur
-      no nearby users: Engir notendur hafa stillt staðsetningu sína á korti nálægt
-        þér.
       role:
         administrator: Þessi notandi er möppudýr
         moderator: Þessi notandi er prófarkalesari
@@ -2504,15 +2515,7 @@ is:
       unhide_user: Af-fela þennan notanda
       delete_user: Eyða þessum notanda
       confirm: Staðfesta
-      friends_changesets: breytingasett vina
-      friends_diaries: bloggfærslur vina
-      nearby_changesets: breytingasett vina í næsta nágrenni
-      nearby_diaries: bloggfærslur vina í næsta nágrenni
       report: Tilkynna þennan notanda
-    popup:
-      your location: Staðsetning þín
-      nearby mapper: Nálægur notandi
-      friend: Vinur
     account:
       title: Stillingar
       my settings: Mínar stillingar
diff --git a/config/locales/it.yml b/config/locales/it.yml
index c14aa239b..f91581d9a 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -482,6 +482,27 @@ it:
     timeout:
       sorry: Spiacenti, l'elenco richiesto di commenti al changeset ha impiegato troppo
         tempo per poter essere recuperato.
+  dashboards:
+    contact:
+      km away: distante %{count} km
+      m away: '%{count}m di distanza'
+    popup:
+      your location: Propria posizione
+      nearby mapper: Mappatore vicino
+      friend: Amico
+    show:
+      no_home_location_html: '%{edit_profile_link} e imposta la posizione di casa
+        per vedere gli utenti vicini.'
+      edit_your_profile: Modifica il tuo profilo
+      my friends: I miei amici
+      no friends: Non ci sono ancora amici.
+      nearby users: Altri utenti nelle vicinanze
+      no nearby users: Non ci sono ancora altri utenti che ammettono di mappare nelle
+        vicinanze.
+      friends_changesets: gruppi di modifiche degli amici
+      friends_diaries: note dei diari degli amici
+      nearby_changesets: gruppi di modifiche da parte degli utenti nelle vicinanze
+      nearby_diaries: note dei diari degli utenti nelle vicinanze
   diary_entries:
     new:
       title: Nuova voce del diario
@@ -817,6 +838,7 @@ it:
           window_construction: Costruttore di finestre
           winery: Cantina vinicola
           "yes": Negozio di Artigianato
+        crossing: Attraversamento
         emergency:
           access_point: Punto d'accesso
           ambulance_station: Stazione delle ambulanze
@@ -1072,6 +1094,7 @@ it:
           hill: Collina
           hot_spring: Sorgente termale
           island: Isola
+          isthmus: Istmo
           land: Terra
           marsh: Palude alluvionale
           moor: Molo
@@ -1086,10 +1109,13 @@ it:
           sand: Sabbia
           scree: Ghiaione
           scrub: Boscaglia
+          shingle: Greto
           spring: Sorgente
           stone: Pietra
           strait: Stretto
           tree: Albero
+          tree_row: Filare di alberi
+          tundra: Tundra
           valley: Valle
           volcano: Vulcano
           water: Acqua
@@ -1491,6 +1517,7 @@ it:
     hosting_partners_html: L'hosting è supportato da %{ucl}, %{fastly}, %{bytemark},
       e da altri %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: partner
     tou: Condizioni d'uso
@@ -1989,9 +2016,11 @@ it:
           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
           Land Tirol (sotto <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con emendamenti</a>).
-        contributors_au_html: |-
-          <strong>Australia</strong>: contiene i dati della periferia basati
-          sui dati dell'Australian Bureau of Statistics.
+        contributors_au_html: '<strong>Australia</strong>: contiene o è sviluppato
+          sfruttando i confini amministrativi &copy; <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
+          Australia</a> rilasciati dal Commonwealth dell''Australia con licenza <a
+          href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribuzione
+          4.0 Internazionale (CC BY 4.0)</a>.'
         contributors_ca_html: |-
           <strong>Canada</strong>: contiene i dati della
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -2679,16 +2708,6 @@ it:
       spam score: 'Punteggio Spam:'
       description: Descrizione
       user location: Luogo dell'utente
-      no_home_location_html: '%{edit_profile_link} e imposta la posizione di casa
-        per vedere gli utenti vicini.'
-      edit_your_profile: Modifica il tuo profilo
-      my friends: I miei amici
-      no friends: Non ci sono ancora amici.
-      km away: distante %{count} km
-      m away: '%{count}m di distanza'
-      nearby users: Altri utenti nelle vicinanze
-      no nearby users: Non ci sono ancora altri utenti che ammettono di mappare nelle
-        vicinanze.
       role:
         administrator: Questo utente è un amministratore
         moderator: Questo utente è un moderatore
@@ -2709,15 +2728,7 @@ it:
       unhide_user: Mostra questo utente
       delete_user: Cancella questo utente
       confirm: Conferma
-      friends_changesets: gruppi di modifiche degli amici
-      friends_diaries: note dei diari degli amici
-      nearby_changesets: gruppi di modifiche da parte degli utenti nelle vicinanze
-      nearby_diaries: note dei diari degli utenti nelle vicinanze
       report: Segnala questo utente
-    popup:
-      your location: Propria posizione
-      nearby mapper: Mappatore vicino
-      friend: Amico
     account:
       title: Modifica profilo
       my settings: Impostazioni
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c4487e0f3..0ad3f14a2 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -28,6 +28,7 @@
 # Author: Oinary
 # Author: Omotecho
 # Author: Otokoume
+# Author: RYOUMA1117
 # Author: Ruila
 # Author: Rxy
 # Author: Schu
@@ -461,6 +462,25 @@ ja:
       title_particular: OpenStreetMap変更セット#%{changeset_id}の議論
     timeout:
       sorry: 申し訳ありませんが、要求した変更セットのコメントの一覧は時間がかかりすぎたため取得できませんでした。
+  dashboards:
+    contact:
+      km away: 距離 %{count} km
+      m away: 距離 %{count} m
+    popup:
+      your location: 自分の位置
+      nearby mapper: 周辺のマッパー
+      friend: 友達
+    show:
+      no_home_location_html: '%{edit_profile_link}そして、近くのユーザーが表示されるように自宅の場所を設定します。'
+      edit_your_profile: プロフィールの編集
+      my friends: 友だち
+      no friends: あなたはまだ誰も友達として登録していません。
+      nearby users: 周辺にいるその他の利用者
+      no nearby users: あなたの活動地域周辺に他のマッパーはいないようです。
+      friends_changesets: 友達による変更セット
+      friends_diaries: 友達の日記エントリ
+      nearby_changesets: 周辺の利用者のメモ
+      nearby_diaries: 周辺のユーザーの日記エントリ
   diary_entries:
     new:
       title: 日記エントリの新規作成
@@ -792,6 +812,7 @@ ja:
           window_construction: サッシ施工業
           winery: ワイン醸造所
           "yes": 手芸店
+        crossing: 交差点
         emergency:
           access_point: アクセスポイント
           ambulance_station: 消防署
@@ -882,6 +903,7 @@ ja:
           railway: 廃線
           roman_road: ローマ街道
           ruins: 廃墟
+          rune_stone: ルーン石碑
           stone: 岩石
           tomb: 墓地
           tower: 塔
@@ -1046,6 +1068,7 @@ ja:
           hill: 丘陵
           hot_spring: 温泉
           island: 島
+          isthmus: 地峡
           land: 陸地
           marsh: 沼地
           moor: 沼地
@@ -1060,10 +1083,13 @@ ja:
           sand: 砂
           scree: がれ場
           scrub: 低木林
+          shingle: 帯状疱疹
           spring: 泉
           stone: 岩石
           strait: 海峡
           tree: 木
+          tree_row: 並木
+          tundra: ツンドラ
           valley: è°·
           volcano: 噴火口
           water: 湖水
@@ -1460,8 +1486,9 @@ ja:
     intro_header: OpenStreetMap へようこそ!
     intro_text: OpenStreetMap は、あなたのような人々が作成した世界地図であり、オープン ライセンスの下で自由に利用できます。
     intro_2_create_account: 新しい利用者アカウントを作成
-    hosting_partners_html: 'ホスティング支援者: %{ucl}、%{bytemark}及びその他の%{partners}'
+    hosting_partners_html: ホスティングは、%{ucl}、%{fastly}、%{bytemark}、およびその他の%{partners}によってサポートされています。
     partners_ucl: UCL
+    partners_fastly: すばやく
     partners_bytemark: バイトマーク ホスティング
     partners_partners: パートナー
     tou: 利用規約
@@ -1682,6 +1709,7 @@ ja:
   preferences:
     show:
       title: 個人設定
+      preferred_editor: 優先エディター
       preferred_languages: 優先言語
       edit_preferences: 設定の編集
     edit:
@@ -2234,6 +2262,7 @@ ja:
       blocked: APIへのアクセスがブロックされました。Web インターフェイスからログインし直して詳細を確認してください。
       need_to_see_terms: あなたは一時的にAPIの利用を停止されています。ウェブインターフェイスにログインして協力者規約をご覧ください。同意しなくてもかまいませんが、必ずご覧ください。
     settings_menu:
+      account_settings: アカウント設定
       oauth1_settings: OAuth 1 設定
       oauth2_applications: OAuth 2 アプリケーション
       oauth2_authorizations: OAuth 2 認証
@@ -2439,12 +2468,6 @@ ja:
       spam score: 'スパム評価:'
       description: 説明
       user location: 利用者の位置
-      my friends: 友だち
-      no friends: あなたはまだ誰も友達として登録していません。
-      km away: 距離 %{count} km
-      m away: 距離 %{count} m
-      nearby users: 周辺にいるその他の利用者
-      no nearby users: あなたの活動地域周辺に他のマッパーはいないようです。
       role:
         administrator: このユーザーは管理者です
         moderator: このユーザーはモデレーターです
@@ -2465,15 +2488,7 @@ ja:
       unhide_user: このユーザーを再表示
       delete_user: この利用者を削除
       confirm: 確認
-      friends_changesets: 友達による変更セット
-      friends_diaries: 友達の日記エントリ
-      nearby_changesets: 周辺の利用者のメモ
-      nearby_diaries: 周辺のユーザーの日記エントリ
       report: この利用者を通報
-    popup:
-      your location: 自分の位置
-      nearby mapper: 周辺のマッパー
-      friend: 友達
     account:
       title: アカウントの編集
       my settings: 設定
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index a5697bd0b..b00886d57 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -236,6 +236,13 @@ ka:
   changeset_comments:
     comment:
       commented_at_by_html: განაახლა %{when} წინ მომხმარებელმა %{user}
+  dashboards:
+    contact:
+      km away: '%{count}კმ თქვენგან'
+      m away: '%{count}მ თქვენგან'
+    popup:
+      your location: თქვენი ადგილმდებარეობა
+      friend: მეგობარი
   diary_entries:
     new:
       title: დღიურში ახალი ჩანაწერის გაკეთება
@@ -1064,8 +1071,6 @@ ka:
       spam score: 'სპამის შეფასება:'
       description: აღწერა
       user location: მომხმარებლის ადგილმდებარეობა
-      km away: '%{count}კმ თქვენგან'
-      m away: '%{count}მ თქვენგან'
       role:
         administrator: ეს მომხმარებელი ადმინისტრატორია
       comments: კომენტარები
@@ -1077,9 +1082,6 @@ ka:
       unhide_user: ამ მომხმარებლის გამოჩენა
       delete_user: ამ მომხმარებლის წაშლა
       confirm: დადასტურება
-    popup:
-      your location: თქვენი ადგილმდებარეობა
-      friend: მეგობარი
     account:
       title: ანგარიშის რედაქტირება
       my settings: ჩემი პარამეტრები
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index b0b95f55b..126124394 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -375,6 +375,19 @@ kab:
     timeout:
       sorry: Suref-aɣ, tabdart n iygrawen n usnifel i d-tessutreḍ tettawi ddeqs n
         wakud akken ad d-tali.
+  dashboards:
+    contact:
+      km away: '%{count} km'
+      m away: yebɛed s %{count} m
+    popup:
+      your location: Adig-ik
+      friend: Amdakkel
+    show:
+      nearby users: Iseqdacen-nniḍen iqeṛben
+      friends_changesets: Igrawen n usnifel n yidukkal
+      friends_diaries: Inekcam n uɣmis n yimdukkal
+      nearby_changesets: Ihrawen n usnifel n iseqdacen iqeṛben
+      nearby_diaries: Inekcam n uɣmis n iseqdacen iqeṛben
   diary_entries:
     new:
       title: Anekcam amaynut n uɣmis
@@ -1336,9 +1349,6 @@ kab:
       spam score: 'Amatar n uspam:'
       description: Aglam
       user location: Adig n useqdac
-      km away: '%{count} km'
-      m away: yebɛed s %{count} m
-      nearby users: Iseqdacen-nniḍen iqeṛben
       role:
         administrator: Aseqdac-agi d anedbal
         grant:
@@ -1356,13 +1366,6 @@ kab:
       unhide_user: Sken aseqdac-agi
       delete_user: Kkes aseqdac-agi
       confirm: Sentem
-      friends_changesets: Igrawen n usnifel n yidukkal
-      friends_diaries: Inekcam n uɣmis n yimdukkal
-      nearby_changesets: Ihrawen n usnifel n iseqdacen iqeṛben
-      nearby_diaries: Inekcam n uɣmis n iseqdacen iqeṛben
-    popup:
-      your location: Adig-ik
-      friend: Amdakkel
     account:
       title: Ẓreg amiḍan
       my settings: Iɣewwaṛen-iw
diff --git a/config/locales/km.yml b/config/locales/km.yml
index 5cd23b1d6..90c9392fa 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -198,6 +198,12 @@ km:
       no_more_area: គ្មានសំណុំបន្លាស់ប្ដូរថែមទៀតទេក្នុងតំបន់នេះ។
       no_more_user: គ្មានសំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់នេះថែមទៀតទេ។
       load_more: ផ្ទុកបន្ថែម
+  dashboards:
+    contact:
+      km away: ចម្ងាយ %{count} គ.ម.
+      m away: ចម្ងាយ %{count} ម.
+    show:
+      no friends: អ្នកមិនទាន់បានបន្ថែមមិត្តណាមួយនៅឡើយទេ​។
   diary_entries:
     new:
       title: ប្រកាសកំណត់ហេតុថ្មី
@@ -787,9 +793,6 @@ km:
       remove as friend: ដកចេញជាមិត្ត​
       add as friend: បន្ថែមជាមិត្ត​
       description: បរិយាយ​
-      no friends: អ្នកមិនទាន់បានបន្ថែមមិត្តណាមួយនៅឡើយទេ​។
-      km away: ចម្ងាយ %{count} គ.ម.
-      m away: ចម្ងាយ %{count} ម.
     account:
       title: កែប្រែគណនី​
       public editing:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5b4357554..a7f3f1582 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -424,6 +424,24 @@ ko:
       title_particular: 'OpenStreetMap 변경 집합 #%{changeset_id} 토론'
     timeout:
       sorry: 죄송합니다, 요청하는 변경 집합 댓글을 불러오는데 너무 오래 걸렸습니다.
+  dashboards:
+    contact:
+      km away: '%{count}km 거리'
+      m away: '%{count}m 거리'
+    popup:
+      your location: 내 위치
+      nearby mapper: 근처 매퍼
+      friend: 친구
+    show:
+      edit_your_profile: 내 프로파일 편집
+      my friends: 내 친구
+      no friends: 아직 어떠한 친구도 추가하지 않았습니다.
+      nearby users: 기타 근처 사용자
+      no nearby users: 아직 근처에 매핑을 인정하는 다른 사용자가 없습니다.
+      friends_changesets: 친구의 바뀜집합
+      friends_diaries: 친구의 일기 항목
+      nearby_changesets: 근처 사용자의 바뀜집합
+      nearby_diaries: 근처 사용자의 일기 항목
   diary_entries:
     new:
       title: 새 일기 항목
@@ -2367,13 +2385,6 @@ ko:
       spam score: '스팸 점수:'
       description: 설명
       user location: 사용자 위치
-      edit_your_profile: 내 프로파일 편집
-      my friends: 내 친구
-      no friends: 아직 어떠한 친구도 추가하지 않았습니다.
-      km away: '%{count}km 거리'
-      m away: '%{count}m 거리'
-      nearby users: 기타 근처 사용자
-      no nearby users: 아직 근처에 매핑을 인정하는 다른 사용자가 없습니다.
       role:
         administrator: 이 사용자는 관리자입니다
         moderator: 이 사용자는 운영자입니다
@@ -2394,15 +2405,7 @@ ko:
       unhide_user: 이 사용자를 숨기기 취소
       delete_user: 이 사용자를 삭제
       confirm: 확인
-      friends_changesets: 친구의 바뀜집합
-      friends_diaries: 친구의 일기 항목
-      nearby_changesets: 근처 사용자의 바뀜집합
-      nearby_diaries: 근처 사용자의 일기 항목
       report: 이 사용자 보고
-    popup:
-      your location: 내 위치
-      nearby mapper: 근처 매퍼
-      friend: 친구
     account:
       title: 계정 편집
       my settings: 프로필 설정
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index cd4f27f66..188a57172 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -442,6 +442,24 @@ ku-Latn:
     timeout:
       sorry: Bibore, bidestxistina lîsteya şîroveyên desteya guhertinan ê ku te xwest
         demeke dirêj girt.
+  dashboards:
+    contact:
+      km away: '%{count} km dûr e'
+      m away: '%{count} m dûr e'
+    popup:
+      your location: Cihê te
+      nearby mapper: Nexşesazên nêz
+      friend: Heval
+    show:
+      my friends: Hevalên min
+      no friends: Te hêj ji xwe re hevalek çênekiriye.
+      nearby users: Bikarhênerên din ên nêz
+      no nearby users: Li nêzî te bikarhênerekî din yê ku cihê xwe diyar kiribe tine
+        ye.
+      friends_changesets: desteyên guhertinan yên hevalan
+      friends_diaries: nivîsên rojane yên hevalan
+      nearby_changesets: desteyên guhertinan yên bikarhênerên nêz
+      nearby_diaries: nivîsên rojane yên bikarhênerên nêz
   diary_entries:
     new:
       title: Nivîsa nû yê rojane
@@ -2588,13 +2606,6 @@ ku-Latn:
       spam score: Skora spamêː
       description: Danasîn
       user location: Cihê bikarhênerê
-      my friends: Hevalên min
-      no friends: Te hêj ji xwe re hevalek çênekiriye.
-      km away: '%{count} km dûr e'
-      m away: '%{count} m dûr e'
-      nearby users: Bikarhênerên din ên nêz
-      no nearby users: Li nêzî te bikarhênerekî din yê ku cihê xwe diyar kiribe tine
-        ye.
       role:
         administrator: Ev bikarhêner rêvebirek e
         moderator: Ev bikarhêner moderatorek e
@@ -2615,15 +2626,7 @@ ku-Latn:
       unhide_user: Vi bikarhênerî nîşan bide
       delete_user: Vî/ê bikarhênerî/ê jê bibe
       confirm: Pesend bike
-      friends_changesets: desteyên guhertinan yên hevalan
-      friends_diaries: nivîsên rojane yên hevalan
-      nearby_changesets: desteyên guhertinan yên bikarhênerên nêz
-      nearby_diaries: nivîsên rojane yên bikarhênerên nêz
       report: Vî/Vê bikarhênerî/ê gilî bike
-    popup:
-      your location: Cihê te
-      nearby mapper: Nexşesazên nêz
-      friend: Heval
     account:
       title: Hesabê biguherîne
       my settings: Hevyazên min
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 80800d7e1..489ee84a2 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -425,6 +425,21 @@ lb:
     timeout:
       sorry: Leider ass d'Lëscht mat de Commentairë vun den Ännerungssätz, déis du
         ugefuerdert hues, fir den Ofruff ze laang.
+  dashboards:
+    contact:
+      km away: '%{count} km ewech'
+      m away: '%{count} m ewech'
+    popup:
+      friend: Frënn
+    show:
+      no_home_location_html: '%{edit_profile_link} a lee deng Heemecht fest, fir Benotzer
+        an der Noperschaft ze gesinn.'
+      edit_your_profile: Äre Profil änneren
+      my friends: Meng Frënn
+      no friends: Dir hutt nach keng Frënn derbäigesat.
+      nearby users: Aner Benotzer nobäi
+      friends_changesets: Ännerungssätz vun dénge Frënn
+      nearby_changesets: Ännerungssätz vu Benotzer an der Noperschaft
   diary_entries:
     new:
       title: Neie Blogantrag
@@ -757,6 +772,7 @@ lb:
           window_construction: Fënsterbauer
           winery: Wäigutt
           "yes": Handwierksgeschäft
+        crossing: Kräizung
         emergency:
           access_point: Zougangspunkt
           ambulance_station: Rettungswaach
@@ -834,6 +850,7 @@ lb:
           church: Kierch
           city_gate: Stadpaart
           citywalls: Stadmaueren
+          fort: Fort
           heritage: Denkmal
           hollow_way: Huelwee
           house: Haus
@@ -895,10 +912,11 @@ lb:
           adult_gaming_centre: Automatecasino
           amusement_arcade: Spillhal
           bandstand: Musekspavillon
+          beach_resort: Strandbad
           bird_hide: Vullebeobachtungsplaz
           bleachers: Sëtzreien
           bowling_alley: Bowlingbunn
-          common: ëfffentlech Gréngfläch
+          common: ëffentlech Gréngfläch
           dance: Danzsall
           dog_park: Hondspark
           firepit: Feierplaz
@@ -1007,6 +1025,7 @@ lb:
           hill: Hiwwel
           hot_spring: Gliddeg Quell
           island: Insel
+          isthmus: Isthmus
           land: Land
           marsh: Mouer
           moor: Mouer
@@ -1021,10 +1040,13 @@ lb:
           sand: Sand
           scree: Gestengs
           scrub: Buschland
+          shingle: Gestengs
           spring: Quell
           stone: Steen
           strait: Mierengt
           tree: Bam
+          tree_row: Bamrei
+          tundra: Tundra
           valley: Dall
           volcano: Vulkan
           water: Waasser
@@ -1368,6 +1390,8 @@ lb:
           sécher, datt:'
         not_just_mistake: Du bass dir sécher, datt däi Problem net nëmmen e Feeler
           ass.
+        unable_to_fix: Du kanns dëse Problem selwer oder mat Hëllef vun eise Communautéitsmemberen
+          net léisen
         resolve_with_user: Du hues ewell versicht, de Problem mam zoustännege Benotzer
           ze léisen.
       categories:
@@ -1421,11 +1445,12 @@ lb:
     intro_text: OpenStreetMap ass eng Kaart vun der Welt, déi vu Leit wéi Iech gemaach
       gouf an déi fräi ënner enger oppener Lizenz benotzt ka ginn.
     intro_2_create_account: E Benotzerkont uleeën
-    hosting_partners_html: Den Hosting gëtt vun %{ucl}, %{bytemark} an aneren %{partners}
-      ënnerstëtzt.
+    hosting_partners_html: Den Hosting gëtt vun %{ucl}, %{fastly}, %{bytemark} an
+      anere(n) %{partners} ënnerstëtzt.
     partners_ucl: '''''University College'''' zu London'
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
-    partners_partners: Partner
+    partners_partners: Partneren
     tou: Benotzungs-Bedéngungen
     osm_offline: D'OpenStreetMap Datebank ass elo net disponibel well dru geschafft
       muss ginn.
@@ -1556,6 +1581,10 @@ lb:
           vu(n) %{place} geléist.'
         your_note_html: '%{commenter} huet ee vun Iech gemellten Hiweis an der Noperschaft
           vu(n) %{place} kommentéiert.'
+        commented_note: '%{commenter} huet en Hiweis an der Noperschaft vu(n) %{place},
+          deens du kommentéiert has, reaktivéiert.'
+        commented_note_html: '%{commenter} huet en Hiweis an der Noperschaft vu(n)
+          %{place}, deens du kommentéiert has, reaktivéiert.'
       details: Méi Detailer iwwer d'Notiz fannt Dir op %{url}.
       details_html: Méi Detailer iwwer d'Notiz fannt Dir op %{url}.
     changeset_comment_notification:
@@ -1568,35 +1597,70 @@ lb:
           un deems du interesséiert bass'
         your_changeset: '%{commenter} huet e Commentaire um %{time} zu engem vun dengen
           Ännerungssätz hannerlooss'
+        your_changeset_html: '%{commenter} huet um %{time} zu engem vun dengen Ännerungssätz
+          en Diskussiounsbäitrag hannerlooss'
+        commented_changeset: '%{commenter} huet en Diskussiounsbäitrag um %{time}
+          zu engem Kaartenännerungssaz hannerlooss, deens du observéiert hues, erstallt
+          vu(m) %{changeset_author}'
+        commented_changeset_html: '%{commenter} huet um %{time} en Diskussiounsbäitrag
+          zu engem vun dir observéierten Ännerungssaz vu(m) %{changeset_author} hannerlooss'
+        partial_changeset_with_comment: mat der Bemierkung „%{changeset_comment}“
+        partial_changeset_with_comment_html: mat der Bemierkung „%{changeset_comment}“
         partial_changeset_without_comment: ouni Kommentar
       details: Méi Detailer iwwer den Ännerungssaz kënnen ënner %{url} fonnt ginn.
+      details_html: Méi Detailer iwwer den Ännerungssaz kënnen ënner %{url} fonnt
+        ginn.
       unsubscribe: Fir d'Aktualiséierungen un dësem Ännerungssaz ofzebestellen, besich
         %{url} a klick op „Ofmellen“.
+      unsubscribe_html: Fir d'Aktualiséierungen un dësem Ännerungssaz ofzebestellen,
+        besich %{url} a klick op „Ofmellen“.
   confirmations:
     confirm:
       heading: Iwwerpréift Är E-Mail!
       introduction_1: Mir hunn Iech eng Confirmatiouns-E-Mail geschéckt.
+      introduction_2: Wannechgelift bestäteg däi Benotzerkont, an deems du de Link
+        an der Bestätegungs-E-Mail uklicks. Da kanns du domat ufänken, bei OpenStreetMap
+        matzeschaffen.
       press confirm button: Klickt wgl. op de Knäppchen confirméieren fir Äre Benotzerkont
         z'aktivéieren.
       button: Confirméieren
+      success: Däi Benotzerkont gouf bestätegt, Merci fir d'Registréieren!
       already active: Dëse Kont gouf scho confirméiert.
       unknown token: Dee Confirmatiouns-Code ass ofgelaf oder et gëtt en net.
+      reconfirm_html: Fir d'Bestätegungs-E-Mail erëm ze senden, <a href="%{reconfirm}">klick
+        hei</a>.
     confirm_resend:
       failure: Benotzer %{name} gouf net fonnt.
     confirm_email:
       heading: Eng Ännerung vun enger E-Mailadress confirméieren
+      press confirm button: Fir d'Bestätegung vun der neier E-Mail-Adress, klick wannechgelift
+        ënnen op „Bestätegen“.
       button: Confirméieren
       success: D'Ännerung vun denger E-Mail-Adress gouf bestätegt!
+      failure: Eng E-Mail-Adress gouf ewell mat dësem Link bestätegt.
       unknown_token: Dee Confirmatiouns-Code ass ofgelaf oder et gëtt en net.
+    resend_success_flash:
+      whitelist: Wanns du en Antispam-System verwenns, dee Bestätegungsufroe sent,
+        stell wannechgelift sécher, dass du %{sender} op eng Erlaabnislëscht setz,
+        well mir keng Bestätegungsufroë beäntwere kënnen.
   messages:
     inbox:
+      title: Postagang
+      my_inbox: Postagang
+      my_outbox: Mäi Postausgang
       messages: Dir hutt %{new_messages} a(n) %{old_messages}
       new_messages:
         one: '%{count} neie mMssage'
         other: '%{count} nei Messagen'
+      old_messages:
+        one: '%{count} ale Message'
+        other: '%{count} al Messagen'
       from: Vu(n)
       subject: Sujet
       date: Datum
+      no_messages_yet_html: Du hues nach keng Noriichte versent. Wëlls de mat %{people_mapping_nearby_link}
+        Kontakt ophuelen?
+      people_mapping_nearby: Mapperen an der Noperschaft
     message_summary:
       unread_button: Als net gelies markéieren
       read_button: Als gelies markéieren
@@ -1606,12 +1670,16 @@ lb:
       title: Noriicht schécken
       send_message_to_html: Dem %{name} en neie Message schécken
       subject: Sujet
+      body: Text
+      back_to_inbox: Zréck an de Postagang
     create:
       message_sent: Message geschéckt
     no_such_message:
       title: Kee sou ee Message
       heading: Kee sou ee Message
     outbox:
+      my_inbox: Postagang
+      my_outbox: Mäi Postausgang
       messages:
         one: Du hues %{count} Noriicht gesent
         other: Du hues %{count} Noriichte gesent
@@ -1718,6 +1786,9 @@ lb:
         muss Du e Benotzerkont hunn.
       create account minute: Maacht e Benotzerkont. Et dauert nëmmen eng Minutt.
       no account: Hutt Dir kee Benotzerkont?
+      account is suspended: Däi Benotzerkont gouf opgrond vu verdächtegen Aktivitéite
+        gespaart.<br />Wannechgelift kontaktéier de <a href="%{webmaster}">Support</a>,
+        falls du dëst kläre wëlls.
       openid_logo_alt: Alogge mat enger OpenID
       auth_providers:
         openid:
@@ -1767,32 +1838,85 @@ lb:
   site:
     about:
       next: Weider
+      copyright_html: <span>&copy;</span>OpenStreetMap<br>Matwierkend
+      used_by_html: '%{name} stellt Kaartendonnéeë fir dausende vu Websäiten, Appen
+        an anere Geräter zur Verfügung'
+      lede_text: OpenStreetMap gëtt vun enger Panoplie vu Mapperen erstallt, déi Donnéeën
+        zu Weeër, Gebaier an allerlee Weiderem weltwäit erfaassen a fleegen.
       local_knowledge_title: Lokaalt Wëssen
+      local_knowledge_html: OpenStreetMap leet Wäert op lokaalt Wëssen. Auteure benotze
+        Loftbiller, GPS-Geräter a Feldkaarte fir d'Verifizéierung, sou dass OSM korrekt
+        an aktuell ass.
+      community_driven_title: Communautéitsbedriwwen
       community_driven_html: |-
         D'OpenStreetMap-Communautéit ass villfälteg, leidenschaftlech a wiisst deeglech. Eis Matwierkend si begeeschtert Mapper, GIS-Profien, Ingenieuren, déi d'OSM-Servere bedreiwen a vill méi.
         Fir méi iwwer d'Communautéit z'erfueren, lies eisen <a href='https://blog.openstreetmap.org'>OpenStreetMap-Blog</a>,
         d'<a href='%{diary_path}'>Benotzertagebicher</a>,
-        <a href='https://blogs.openstreetmap.org/'>Community-Bloggen</a> an d'Websäit vun der <a href='https://www.osmfoundation.org/'>OSM-Fondatioun</a>.
+        <a href='https://blogs.openstreetmap.org/'>Community-Bloggen</a> an d'Websäit vun der <a href='https://www.osmfoundation.org/'>OSM-Foundatioun</a>.
       open_data_title: Open Data
-      legal_title: Legal
-      partners_title: Partner
+      open_data_html: 'OpenStreetMap ass „<i>Open Data</i>“: Du kanns et fir jiddwer Zweck
+        verwenden, soulaangs du OpenStreetMap a seng Matwierkend erwääns. Falls du
+        déi Donnéeën ofänners oder op bestëmmt Aart abaus, däerfs du d''Ergebnis nëmmen
+        ënner der nämmlechter Lizenz verbreeden. Kuck d''<a href=''%{copyright_path}''>Auteursrechts-
+        a Lizenzsäit</a> fir Eenzelheeten.'
+      legal_title: Rechtlech Hiweiser
+      legal_1_html: |-
+        Dës Websäit a vill domat an Zesummenhang stoend Déngschter gi vun der <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) fir d'OSM-Communautéit bedriwwen. D'Verwendung vun allen OSMF-bedriwwenen Déngschter gëtt duerch eis „<a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Acceptable Use Policies</a>“
+        an eis <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Dateschutzrichtlinn</a> gereegelt.
+      partners_title: Partneren
     copyright:
       foreign:
         title: Iwwer dës Iwwersetzung
+        html: Fir de Fall vun enger Ofwäichung tëscht der virleiender Iwwersetzung
+          an %{english_original_link}, ass déi engleschsproocheg Säit maßgebend.
         english_link: den engleschen Original
       native:
         title: Iwwer dës Säit
         native_link: lëtzebuergesch Versioun
+        mapping_link: mat dem Kaartéieren ufänken
       legal_babble:
         title_html: Copyright a Lizenz
+        credit_title_html: Wéi et op d'Urhiewerschaft vun OpenStreetMap hinzeweise
+          gëllt
+        credit_1_html: Mir verlaangen d'Verwendung vum Hiweis „&copy; OpenStreetMap-Matwierkend“.
         more_title_html: Fir méi ze wëssen
+        more_2_html: |-
+          Obwuel OpenStreetMap „Open Data“ ass, kënne mir keng onentgeltlech Kaarten-API fir Drëttparteie bereetstellen.
+          Kuck eis <a href="https://operations.osmfoundation.org/policies/api/">API-Verwendungsrichtlinn</a>, d'<a href="https://operations.osmfoundation.org/policies/tiles/">Kachelverwendungsrichtlinn</a> an d'<a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim-Verwendungsrichtlinn</a>.
+        contributors_title_html: Eis Matwierkend
+        contributors_intro_html: 'Eis Matwierkend sinn dausende vun eenzele Mënschen.
+          Mir bezéien och oppe lizenzéiert Donnéeë vu nationale Kaartenagenturen an
+          anere Quellen an, dorënner:'
+        contributors_at_html: |-
+          <strong>Éisträich</strong>: Enthält Donnéeë vun der <a href="https://data.wien.gv.at/">Stad Wien</a> (ënner <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> a Land Tirol (ënner <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT mat Amendementer</a>).
+        contributors_ca_html: |-
+          <strong>Kanada</strong>: Enthält Donnéeë vu GeoBase&reg;, GeoGratis (&copy; Department of Natural
+          Resources Canada), CanVec (&copy; Department of Natural
+          Resources Canada), a StatCan (Geography Division,
+          Statistics Canada).
+        contributors_fr_html: '<strong>Frankräich</strong>: Enthält Donnéeë vun der
+          <i>Direction Générale des Impôts</i>.'
+        contributors_nz_html: '<strong>Neiséiland</strong>: Enthält Donnéeë vum <i>Land
+          Information New Zealand Data Service</i> an ass fir d''Rëmbenotzen ënner
+          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> lizenzéiert.'
+        contributors_es_html: |-
+          <strong>Spunien</strong>: Enthält Donnéeë vum spuenesche nationale geographeschen Institut (<a href="http://www.ign.es/">IGN</a>) an nationale kartographesche System (<a href="http://www.scne.es/">SCNE</a>)
+          fir d'Rëmbenotzen ënner <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> lizenzéiert.
         infringement_title_html: Copyright-Verletzung
+        trademarks_title_html: <span id="trademarks"></span>Markenzeechen
+        trademarks_1_html: OpenStreetMap, de Luppelogo a „State of the Map“ sinn agedroe
+          Wouerzeeche vun der OpenStreetMap Foundation. Falls du Froen iwwer d'Verwendung
+          vu Marken hues, lies wannechgelift eis <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy"><Markerichtlinn</a>.
     index:
       js_1: Dir hutt entweder e Browser dee JavaScript net ënnerstëtzt oder Dir hutt
         JavaScript desaktivéiert.
+      js_2: OpenStreetMap benotzt JavaScript fir d'Kaartenduerstellung
       permalink: Permanentlink
       shortlink: Kuerze Link
       createnote: Eng Notiz derbäisetzen
+      license:
+        copyright: Copyright OpenStreetMap a Matwierkend, ënner enger oppener Lizenz
     edit:
       not_public: Dir hutt net agestallt datt Är Ännerungen ëffentlech sinn.
       user_page_link: Benotzersäit
@@ -1803,11 +1927,18 @@ lb:
       manually_select: Sicht manuell eng aner Géigend eraus
       format_to_export: Format fir z'exportéieren
       osm_xml_data: OpenStreetMap-XML-Daten
+      embeddable_html: HTML fir anzebannen
       licence: Lizenz
       too_large:
+        body: Dëse Beräich ass ze grouss, fir als OpenStreetMap-XML-Donnéeën exportéiert
+          ze ginn. Wannechgelift vergréisseren, e méi klenge Beräich wielen oder eng
+          vun de folgende Quelle fir Massendonnéeëndownloade benotzen.
         planet:
+          title: Planéit OSM
           description: Regelméisseg aktualiséiert Kopie vun der kompletter OpenStreetMap
             Datebank
+        overpass:
+          title: Overpass API
         other:
           title: Aner Quellen
           description: Zousätzlech Quelle stinn an der OpenStreetMap Wiki
@@ -1817,9 +1948,11 @@ lb:
       max: max
       image_size: Gréisst vum Bild
       zoom: Zoom
+      add_marker: Eng Markéierung zu der Kaart bäifügen
       latitude: 'Geographesch Breet:'
       longitude: 'Geographesch Längt:'
       output: Resultat
+      paste_html: HTML-Code kopéieren, fir en an eng Websäit anzefügen
       export_button: Exportéieren
     fixthemap:
       title: E Probleem mellen / D'Kaart verbesseren
@@ -1872,6 +2005,7 @@ lb:
           main_road: Haaptstrooss
           secondary: Niewestrooss
           unclassified: Net klasséiert Strooss
+          track: Spuer
           bridleway: Wee fir Päerd
           cycleway: Vëlospiste
           cycleway_national: Nationale Vëloswee
@@ -1882,25 +2016,44 @@ lb:
           subway: Metro
           tram:
             1: Tram
+          cable:
+          - Seelbunn
+          - Sessellift
+          runway:
+          - Start- a Landebunn
+          - Rullbunn
           apron:
             1: Terminal
+          admin: Verwaltungsgrenz
           forest: Bësch
           wood: Bësch
           golf: Golfterrain
           park: Park
+          common:
+          - ëffentlech Gréngfläch (brit.)
+          - Wiss
+          retail: Akaafszentrum
           industrial: Industriezone
+          commercial: Commercëgebitt
+          heathland: Heed
           lake:
           - Séi
           farm: Bauerenhaff
+          brownfield: Broochland
           cemetery: Kierfecht
+          allotments: Klenggäert
+          pitch: Sportsterrain
+          centre: Sportszenter
           reserve: Naturschutzgebitt
           military: Militärgebitt
           school:
           - Schoul
           - Universitéit
+          station: Gare (Eisebunn)
           summit:
           - Spëtzt
           private: Privaten Terrain
+          destination: Nëmme fir Leit mat Uleies
           construction: Stroossen am Bau
           bicycle_shop: Vëlosgeschäft
           bicycle_parking: Vëlosparking
@@ -1916,13 +2069,30 @@ lb:
       add_a_note:
         title: Keng Zäit fir z'änneren? Setzt eng Notiz derbäi!
   traces:
+    visibility:
+      public: Ëffentlech (gëtt an der Spuerlëscht ugewisen, allerdéngs nëmmen als
+        anonym, onsortéiert Punktfolleg)
+      trackable: Verfollegbar (gëtt an der Spuerlëscht als anonym, sortéiert Punktefolleg
+        mat Zäitstempelen ugewisen)
+      identifiable: Identifizéierbar (gëtt an der Spuerlëscht als identifizéierbar,
+        sortéiert Punktfolleg mat Zäitstempel ugewisen)
     new:
       visibility_help: wat heescht dat?
       help: Hëllef
+    create:
+      upload_trace: GPS-Spuer eroplueden
+      traces_waiting:
+        one: Du hues momentan %{count} Spuer an der Waardeschleef. Wannechgelift waart,
+          bis e fäerdeg ass, fir d'Veraarbechtung net fir aner Benotzer ze blockéieren.
+        other: Du hues momentan %{count} Spueren an der Waardeschleef. Wannechgelift
+          waart, bis dës fäerdeg sinn, fir d'Veraarbechtung net fir aner Benotzer
+          ze blockéieren.
     edit:
       cancel: Ofbriechen
+      heading: Spuer %{name} beaarbechten
       visibility_help: wat heescht dat?
     show:
+      title: Spuer %{name} ukucken
       pending: AM SUSPENS
       filename: 'Numm vum Fichier:'
       download: eroflueden
@@ -1935,25 +2105,42 @@ lb:
       description: 'Beschreiwung:'
       tags: 'Markéierungen:'
       none: Keen
+      edit_trace: Dës Spuer beaarbechten
+      trace_not_found: Spuer net fonnt!
       visibility: 'Visibilitéit:'
+      confirm_delete: Dës Spuer läschen?
     trace_paging_nav:
       showing_page: Säit %{page}
+      older: Eeler Spueren
+      newer: Méi nei Spueren
     trace:
       count_points:
         one: 1 Punkt
         other: '%{count} Punkten'
       more: méi
+      trace_details: Detailer vun de Spueren uweisen
       view_map: Kaart weisen
       edit_map: Kaart änneren
       public: ËFFENTLECH
       private: PRIVAT
+      trackable: VERFOLLEGBAR
       by: vum
       in: an
     index:
+      public_traces: Ëffentlech GPS Spueren
       my_traces: Meng Spueren
+      public_traces_from: Ëffentlech GPS-Spuere vu(n) %{user}
+      description: Lescht GPS-Spuer-Uploads duerchsichen
+      empty_html: Nach keng GPS-Spueren existéierend. <a href='%{upload_link}'>Lued
+        eng nei Spuer héich</a> oder informéier dech op folgender <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>Wikisäit</a>
+        iwwer d'Opzeechne vun GPS-Spueren.
       all_traces: All Spuren
       traces_from: Ëffentlech Spuere vum %{user}
       remove_tag_filter: Tag-Filter ewechhuelen
+    destroy:
+      scheduled_for_deletion: Fir d'Läsche bestëmmt Spuer
+    georss:
+      title: OpenStreetMap-GPS-Spueren
     description:
       description_without_count: GPX-Fichier vum %{user}
   application:
@@ -1967,12 +2154,15 @@ lb:
       allow_write_prefs: Är Benotzerastellungen änneren.
       allow_write_diary: Bloganträg a Commentairë schreiwen a Frënn fannen
       allow_write_api: d'Kaart änneren.
+      allow_read_gpx: Deng privat GPS-Spueren ausliesen
+      allow_write_gpx: GPS-Spueren héichlueden
       allow_write_notes: Notizen änneren.
     scopes:
       read_prefs: Benotzerastellunge liesen
       write_prefs: Benotzerastellungen änneren
       write_diary: Bloganträg a Commentairë schreiwen a Frënn fannen
       write_api: D'Kaart änneren
+      read_gpx: Privat GPS-Spuere liesen
       write_gpx: GPS-Tracks eroplueden
       write_notes: Notizzen änneren
   oauth_clients:
@@ -1983,10 +2173,13 @@ lb:
       confirm: Sidd Dir sécher?
     index:
       title: Meng OAuth Detailer
+      my_tokens: Meng autoriséiert Applikatiounen
       revoke: Ophiewen!
+      my_apps: Meng Clients-Applikatiounen
       oauth: OAuth
   oauth2_applications:
     index:
+      title: Meng Clients-Applikatiounen
       oauth_2: OAuth 2
       new: Nei Applikatioun registréieren
       name: Numm
@@ -2024,6 +2217,8 @@ lb:
       title: Mellt Iech un
       no_auto_account_create: Leider kënne mir den Ament kee Benotzerkont automatesch
         fir Iech opmaachen.
+      contact_support_html: Wannechgelift kontaktéier de <a href="%{support}">Support</a>
+        fir e Benotzerkont ze kréien. – Mir wäerten deng Ufro méiglechst séier beaarbechten.
       about:
         header: Fäi a verännerbar
       email address: 'E-Mail-Adress:'
@@ -2034,6 +2229,8 @@ lb:
       continue: Mellt Iech un
     terms:
       heading: Bedingungen
+      consider_pd: Zousätzlech zu den uewe genannte Konditioune betruechten ech meng
+        Bäiträg als gemengfräi (domaine public).
       consider_pd_why: wat ass dat?
       legale_select: 'Sicht wgl. d''Land eraus wou Dir wunnt:'
       legale_names:
@@ -2050,6 +2247,7 @@ lb:
       my diary: Mäi Blog
       new diary entry: Neie Blogantrag
       my edits: Meng Ännerungen
+      my traces: Meng Spueren
       my notes: Meng Notizen
       my messages: Meng Messagen
       my profile: Mäi Profil
@@ -2059,6 +2257,7 @@ lb:
       send message: Message schécken
       diary: Blog
       edits: Ännerungen
+      traces: Spueren
       notes: Notizen op der Kaart
       remove as friend: Frënd ewechhuelen
       add as friend: Frënd derbäisetzen
@@ -2066,12 +2265,6 @@ lb:
       email address: 'E-Mail-Adress:'
       status: 'Status:'
       description: Beschreiwung
-      edit_your_profile: Äre Profil änneren
-      my friends: Meng Frënn
-      no friends: Dir hutt nach keng Frënn derbäigesat.
-      km away: '%{count} km ewech'
-      m away: '%{count} m ewech'
-      nearby users: Aner Benotzer nobäi
       role:
         administrator: Dëse Benotzer ass en Administrateur
         moderator: Dëse Benotzer ass e Moderateur
@@ -2082,6 +2275,7 @@ lb:
           administrator: Administrateur-Zougang ofhuelen
           moderator: Moderateursrechter ewechhuelen
       block_history: Aktiv Spären
+      moderator_history: Vergi Spueren
       comments: Bemierkungen
       create_block: Dëse Benotzer spären
       activate_user: Dëse Benotzer aktivéieren
@@ -2091,11 +2285,7 @@ lb:
       unhide_user: Dëse Benotzer net méi verstoppen
       delete_user: Dëse Benotzer läschen
       confirm: Confirméieren
-      friends_changesets: Ännerungssätz vun dénge Frënn
-      nearby_changesets: Ännerungssätz vu Benotzer an der Noperschaft
       report: Dëse Benotzer mellen
-    popup:
-      friend: Frënn
     account:
       title: Benotzerkont änneren
       my settings: Meng Astellungen
@@ -2223,7 +2413,13 @@ lb:
       view_larger_map: Méi grouss Kaart weisen
     embed:
       report_problem: E Probleem mellen
+    key:
+      title: Legend
+      tooltip_disabled: D'Legend ass net fir dëse Niveau verfügbar
     map:
+      zoom:
+        in: Vergréisseren
+        out: Verklengeren
       locate:
         title: Weise wou ech sinn
         metersPopup:
@@ -2239,15 +2435,24 @@ lb:
         hot: Humanitär
         opnvkarte: Bus-Zuch-Kaart
       layers:
+        header: Kaartenniveauen
         notes: Hiweiser/Feelermeldungen
         data: Kaartendonnéeën
         gps: Ëffentlech GPS Spueren
         overlays: Overlayë fir d’Feelersich aktivéieren
+        title: Niveauen
+      copyright: © <a href='%{copyright_url}'>OpenStreetMap-Matwierkend</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Maacht een Don</a>
+      terms: <a href='%{terms_url}' target='_blank'>Notzungskonditioune vun der Websäit
+        an der API</a>
     site:
       edit_tooltip: Kaart änneren
-      edit_disabled_tooltip: Erazoomen fir d'Kaart z'änneren
+      edit_disabled_tooltip: Vergréissere fir d'Kaart z'änneren
+      createnote_tooltip: En Hiweis/Feeler zu de Kaartendonnéeë mellen
+      createnote_disabled_tooltip: Zum Erstelle vun Hiweiser muss vergréissert ginn
+      map_data_zoom_in_tooltip: Vergréisser d'Kaart, fir 'Donnéeën ze gesinn
       queryfeature_tooltip: Objetsoffro
+      queryfeature_disabled_tooltip: Fir Objetsoffro vergréisseren
     changesets:
       show:
         comment: Bemierkung
@@ -2263,12 +2468,15 @@ lb:
         resolve: Léisen
         reactivate: Reaktivéieren
         comment: Bemierkung
+    edit_help: Vergréisser a verschib d'Kaart un en Uert, deens du beaarbechte wëlls,
+      a klick hei
     directions:
       ascend: Vu kleng op grouss
       engines:
         fossgis_osrm_bike: Mam Vëlo (OSRM)
         fossgis_osrm_car: Auto (OSRM)
         fossgis_osrm_foot: Zu Fouss (OSRM)
+        graphhopper_car: Auto (GraphHopper)
       descend: Vu grouss op kleng
       directions: Richtungen
       distance: Distanz
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index a1d9bf0ca..7567e5cb0 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -396,6 +396,24 @@ lt:
     timeout:
       sorry: Atsiprašome, jūsų paprašytų pakeitimo komentarų ištraukimas užtruko per
         ilgai.
+  dashboards:
+    contact:
+      km away: Nutolęs %{count}km
+      m away: nutolęs %{count}m
+    popup:
+      your location: Jūsų pozicija
+      nearby mapper: Šalia esantis žemėlapių kūrėjas
+      friend: Draugas
+    show:
+      my friends: Mano draugai
+      no friends: Jūs dar nepridėjote nei vieno draugo.
+      nearby users: Kiti greta esantys naudotojai
+      no nearby users: Dar nėra jokių kitų naudotojų, kurie būtų pakviesti į žemėlapio
+        pildymus.
+      friends_changesets: draugų keitimai
+      friends_diaries: draugų dienoraščių įrašai
+      nearby_changesets: greta esančių naudotojų keitimai
+      nearby_diaries: greta esančių naudotojų dienoraščių įrašai
   diary_entries:
     new:
       title: Naujas dienoraščio įrašas
@@ -2170,13 +2188,6 @@ lt:
       spam score: 'Šlamšto įvertis:'
       description: Aprašymas
       user location: Naudotojo pozicija
-      my friends: Mano draugai
-      no friends: Jūs dar nepridėjote nei vieno draugo.
-      km away: Nutolęs %{count}km
-      m away: nutolęs %{count}m
-      nearby users: Kiti greta esantys naudotojai
-      no nearby users: Dar nėra jokių kitų naudotojų, kurie būtų pakviesti į žemėlapio
-        pildymus.
       role:
         administrator: Å is naudotojas yra administratorius
         moderator: Å is naudotojas yra moderatorius
@@ -2197,15 +2208,7 @@ lt:
       unhide_user: Nebeslėpti šio naudotojo
       delete_user: Pašalinti šį naudotoją
       confirm: Patvirtinti
-      friends_changesets: draugų keitimai
-      friends_diaries: draugų dienoraščių įrašai
-      nearby_changesets: greta esančių naudotojų keitimai
-      nearby_diaries: greta esančių naudotojų dienoraščių įrašai
       report: Pranešti apie šį naudotoją
-    popup:
-      your location: Jūsų pozicija
-      nearby mapper: Šalia esantis žemėlapių kūrėjas
-      friend: Draugas
     account:
       title: Keisti paskyrą
       my settings: Mano nustatymai
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index a3e659691..e7bc2853b 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -338,6 +338,23 @@ lv:
     index:
       title_all: Diskusija par izmaiņām OpenStreetMap
       title_particular: 'Diskusija par OpenStreetMap izmaiņām #%{changeset_id}'
+  dashboards:
+    contact:
+      km away: '%{count} km attālumā'
+      m away: '%{count} m attālumā'
+    popup:
+      your location: Jūsu atrašanās vieta
+      nearby mapper: Kartētājs tuvējā apkārtnē
+      friend: Draugs
+    show:
+      my friends: Mani draugi
+      no friends: Tu  vēl neesi pievienojis draugus.
+      nearby users: Citi tuvumā esoši lietotāji
+      no nearby users: Nav citu lietotāju kas tuvumā kartētu.
+      friends_changesets: Skatīt visas draugu izmaiņu kopas
+      friends_diaries: Skatīt visus draugu dienasgrāmatu ierakstus
+      nearby_changesets: Skatīt visas tuvējo lietotāju izmaiņu kopas
+      nearby_diaries: Skatīt visus tuvējo lietotāju dienasgrāmatu ierakstus
   diary_entries:
     new:
       title: Jauns dienasgrāmatas ieraksts
@@ -1967,12 +1984,6 @@ lv:
       spam score: 'Surogātpasta rādītājs:'
       description: Apraksts
       user location: Lietotāja atrašanās vieta
-      my friends: Mani draugi
-      no friends: Tu  vēl neesi pievienojis draugus.
-      km away: '%{count} km attālumā'
-      m away: '%{count} m attālumā'
-      nearby users: Citi tuvumā esoši lietotāji
-      no nearby users: Nav citu lietotāju kas tuvumā kartētu.
       role:
         administrator: Šis lietotājs ir administrators
         moderator: Šis lietotājs ir moderators
@@ -1993,15 +2004,7 @@ lv:
       unhide_user: Parādīt šo dalībnieku
       delete_user: Dzēst šo dalībnieku
       confirm: Apstiprināt
-      friends_changesets: Skatīt visas draugu izmaiņu kopas
-      friends_diaries: Skatīt visus draugu dienasgrāmatu ierakstus
-      nearby_changesets: Skatīt visas tuvējo lietotāju izmaiņu kopas
-      nearby_diaries: Skatīt visus tuvējo lietotāju dienasgrāmatu ierakstus
       report: Ziņot par šo lietotāju
-    popup:
-      your location: Jūsu atrašanās vieta
-      nearby mapper: Kartētājs tuvējā apkārtnē
-      friend: Draugs
     account:
       title: Rediģēt kontu
       my settings: Mani iestatījumi
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 878fed644..f1453e31e 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -435,6 +435,28 @@ mk:
     timeout:
       sorry: За жал, на списокот на измени што го побаравте му требаше предолго за
         да се преземе.
+  dashboards:
+    contact:
+      km away: '%{count} км од вас'
+      m away: '%{count} м од вас'
+    popup:
+      your location: Ваша местоположба
+      nearby mapper: Соседен картограф
+      friend: Пријател
+    show:
+      title: Моја управувачница
+      no_home_location_html: '%{edit_profile_link} и задајте ја вашата матична местоположба
+        за да гледате корисници во близина.'
+      edit_your_profile: Уредете си го профилот
+      my friends: Мои пријатели
+      no friends: Сè уште немате додадено пријатели.
+      nearby users: Други соседни корисници
+      no nearby users: Сè уште нема други корисници во вашата околина што признаваат
+        дека работат на карти.
+      friends_changesets: измени на пријателите
+      friends_diaries: дневнички ставки на пријателите
+      nearby_changesets: измени на соседните корисници
+      nearby_diaries: дневнички ставки на сосед. корисн.
   diary_entries:
     new:
       title: Нова дневничка ставка
@@ -770,6 +792,7 @@ mk:
           window_construction: Изработка на прозорци
           winery: Винарија
           "yes": Занаетчиски дуќан
+        crossing: Премин
         emergency:
           access_point: Пристапна точка
           ambulance_station: Итна помош
@@ -1025,6 +1048,7 @@ mk:
           hill: Рид
           hot_spring: Топол извор
           island: Остров
+          isthmus: Превлака
           land: Земја
           marsh: Бара
           moor: Пустара
@@ -1039,10 +1063,13 @@ mk:
           sand: Песок
           scree: Сип
           scrub: Честак
+          shingle: Чакал
           spring: Извор
           stone: Камен
           strait: Проток
           tree: Дрво
+          tree_row: Дрворед
+          tundra: Тундра
           valley: Долина
           volcano: Вулкан
           water: Вода
@@ -1439,9 +1466,10 @@ mk:
     intro_text: OpenStreetMap е карта на светот создадена од луѓе како вас и се нуди
       за слободна употреба под отворена лиценца.
     intro_2_create_account: Создајте корисничка сметка
-    hosting_partners_html: Вдомувањето е поддржано од %{ucl}, %{bytemark} и други
-      %{partners}.
+    hosting_partners_html: Вдомувањето е поддржано од %{ucl}, %{fastly}, %{bytemark}
+      и други %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: вдомителот „Bytemark“
     partners_partners: партнери
     tou: Услови на употреба
@@ -1944,10 +1972,9 @@ mk:
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Покраина Предарлска</a> и
           Покраина Тирол (под <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT со исправки</a>).
         contributors_au_html: |-
-          <strong>Австралија</strong>: Содржи податоци преземени од
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">Општествените картографски заводи на Австралија (PSMA)</a>
-          ставени на располагање од австралиската држава под лиценцата
-          <a href="https://creativecommons.org/licenses/by/4.0/deed.mk">CC BY 4.0</a>.
+          <strong>Австралија</strong>: Содржи податоци преземени од или разработени врз основа на
+          &copy; <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Австралија</a>
+          ставени на располагање од австралиската држава под лиценцата <a href="https://creativecommons.org/licenses/by/4.0/deed.mk">Криејтив Комонс Наведи извор 4.0 Меѓународна (CC BY 4.0)</a>.
         contributors_ca_html: |-
           <strong>Canada</strong>: Содржи податоци од
           GeoBase&reg;, GeoGratis (&copy; Министерство за природни ресурси на Канада), CanVec (&copy; Министерство за природни ресурси на Канада), and StatCan (Географско одделение,
@@ -2599,6 +2626,7 @@ mk:
       my settings: Мои нагодувања
       my comments: Мои коментари
       my_preferences: Мои нагодувања
+      my_dashboard: Моја управувачница
       blocks on me: Добиени блокови
       blocks by me: Извршени болокови
       edit_profile: Уреди профил
@@ -2620,16 +2648,6 @@ mk:
       spam score: 'Оцена за спам:'
       description: Опис
       user location: Местоположба на корисникот
-      no_home_location_html: '%{edit_profile_link} и задајте ја вашата матична местоположба
-        за да гледате корисници во близина.'
-      edit_your_profile: Уредете си го профилот
-      my friends: Мои пријатели
-      no friends: Сè уште немате додадено пријатели.
-      km away: '%{count} км од вас'
-      m away: '%{count} м од вас'
-      nearby users: Други соседни корисници
-      no nearby users: Сè уште нема други корисници во вашата околина што признаваат
-        дека работат на карти.
       role:
         administrator: Овој корисник е администратор
         moderator: Овој корисник е модератор
@@ -2650,15 +2668,7 @@ mk:
       unhide_user: Покажи го корисников
       delete_user: Избриши го корисников
       confirm: Потврди
-      friends_changesets: измени на пријателите
-      friends_diaries: дневнички ставки на пријателите
-      nearby_changesets: измени на соседните корисници
-      nearby_diaries: дневнички ставки на сосед. корисн.
       report: Пријави го корисников
-    popup:
-      your location: Ваша местоположба
-      nearby mapper: Соседен картограф
-      friend: Пријател
     account:
       title: Уреди сметка
       my settings: Мои прилагодувања
diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 5e89833b7..0f57e08de 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -180,6 +180,9 @@ mo:
     changesets:
       user: Утилизатор
       comment: Коментариу
+  dashboards:
+    show:
+      my friends: Приетений мей
   diary_entries:
     form:
       location: 'Ситуаре:'
@@ -637,7 +640,6 @@ mo:
       my profile: Профилул меу
       my settings: Реглажеле меле
       my comments: Коментарииле меле
-      my friends: Приетений мей
     account:
       my settings: Реглажеле меле
       current email address: 'Адреса де поштэ електроникэ курентэ:'
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 575c07ea0..0aa9b4d09 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -254,6 +254,20 @@ mr:
       load_more: अधिक प्रभारण करा
     timeout:
       sorry: क्षमा असावी, आपण मागितलेली बदलसंचाची यादी मिळविण्यास फार वेळ लागला.
+  dashboards:
+    contact:
+      km away: '%{count} कि.मी. दूर'
+      m away: '%{count} मी. दूर'
+    popup:
+      your location: आपले ठिकाण
+      nearby mapper: जवळपासचे नकाशाकार
+      friend: मित्र
+    show:
+      nearby users: जवळपासचे इतर सदस्य
+      friends_changesets: मित्रांचे बदलसंच
+      friends_diaries: मित्रांच्या अनुदिनीतील नोंदी
+      nearby_changesets: जवळपासच्या सदस्यांचे बदलसंच
+      nearby_diaries: जवळपासच्या सदस्यांच्या अनुदिनीतील नोंदी
   diary_entries:
     new:
       title: अनुदिनीत नवी नोंद
@@ -1257,17 +1271,6 @@ mr:
       latest edit: 'नवीनतम संपादन %{ago}:'
       status: 'स्थिती:'
       description: वर्णन
-      km away: '%{count} कि.मी. दूर'
-      m away: '%{count} मी. दूर'
-      nearby users: जवळपासचे इतर सदस्य
-      friends_changesets: मित्रांचे बदलसंच
-      friends_diaries: मित्रांच्या अनुदिनीतील नोंदी
-      nearby_changesets: जवळपासच्या सदस्यांचे बदलसंच
-      nearby_diaries: जवळपासच्या सदस्यांच्या अनुदिनीतील नोंदी
-    popup:
-      your location: आपले ठिकाण
-      nearby mapper: जवळपासचे नकाशाकार
-      friend: मित्र
     account:
       title: खाते संपादा
       my settings: माझ्या मांडण्या
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index f6f1f5601..4d032f3dd 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -350,6 +350,23 @@ ms:
     comment:
       comment: 'Komen baru pada set prubahan #%{changeset_id} oleh %{author}'
       commented_at_by_html: Dikemaskini %{when} oleh %{user}
+  dashboards:
+    contact:
+      km away: '%{count}km jauhnya'
+      m away: '%{count}m jauhnya'
+    popup:
+      your location: Lokasi anda
+      nearby mapper: Pemeta berdekatan
+      friend: Kawan
+    show:
+      my friends: Kawan saya
+      no friends: Anda belum mencari kawan lagi.
+      nearby users: Pengguna lain yang berdekatan
+      no nearby users: Belum ada pengguna lain yang mengaku memetakan kawasan berdekatan.
+      friends_changesets: set ubah kawan-kawan
+      friends_diaries: catatan diari kawan-kawan
+      nearby_changesets: set ubah pengguna berdekatan
+      nearby_diaries: catatan diari pengguna berdekatan
   diary_entries:
     new:
       title: Catatan Diari Baru
@@ -1986,12 +2003,6 @@ ms:
       spam score: 'Markah Spam:'
       description: Keterangan
       user location: Lokasi pengguna
-      my friends: Kawan saya
-      no friends: Anda belum mencari kawan lagi.
-      km away: '%{count}km jauhnya'
-      m away: '%{count}m jauhnya'
-      nearby users: Pengguna lain yang berdekatan
-      no nearby users: Belum ada pengguna lain yang mengaku memetakan kawasan berdekatan.
       role:
         administrator: Pengguna ini seorang pentadbir
         moderator: Pengguna ini seorang penyelia
@@ -2012,14 +2023,6 @@ ms:
       unhide_user: tunjukkan pengguna ini
       delete_user: hapuskan pengguna ini
       confirm: Sahkan
-      friends_changesets: set ubah kawan-kawan
-      friends_diaries: catatan diari kawan-kawan
-      nearby_changesets: set ubah pengguna berdekatan
-      nearby_diaries: catatan diari pengguna berdekatan
-    popup:
-      your location: Lokasi anda
-      nearby mapper: Pemeta berdekatan
-      friend: Kawan
     account:
       title: Sunting akaun
       my settings: Tetapan saya
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 09cf68e63..6391a1b74 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -172,6 +172,13 @@ my:
   changeset_comments:
     comment:
       commented_at_by_html: '%{user} က %{when} အကြာက မွမ်းမံခဲ့သည်'
+  dashboards:
+    contact:
+      km away: '%{count}ကီလိုမီတာ အကွာ'
+      m away: '%{count}မိုင် အကွာ'
+    popup:
+      your location: သင်၏ တည်နေရာ
+      friend: သူငယ်ချင်း
   diary_entries:
     form:
       location: တည်နေရာ
@@ -760,16 +767,11 @@ my:
       status: 'အခြေအနေ:'
       description: ဖော်ပြချက်
       user location: အသုံးပြုသူ တည်နေရာ
-      km away: '%{count}ကီလိုမီတာ အကွာ'
-      m away: '%{count}မိုင် အကွာ'
       role:
         administrator: ဤအသုံးပြုသူသည် အက်ဒမိန်တစ်ဦးဖြစ်သည်
       comments: မှတ်ချက်များ
       create_block: ဤအသုံးပြုသူကို ပိတ်ပင်ရန်
       confirm: အတည်ပြု
-    popup:
-      your location: သင်၏ တည်နေရာ
-      friend: သူငယ်ချင်း
     account:
       current email address: လက်ရှိ အီးမေးလ်လိပ်စာ
       save changes button: ပြောင်းလဲမှုများကို သိမ်းရန်
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index bb8687c66..734022a12 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -435,6 +435,24 @@ nb:
       title_particular: 'OpenStreetMap-endringssettsdiskusjon #%{changeset_id}'
     timeout:
       sorry: Listen over endringssett du ba om tok for lang tid å hente.
+  dashboards:
+    contact:
+      km away: '%{count}km unna'
+      m away: '%{count}m unna'
+    popup:
+      your location: Din posisjon
+      nearby mapper: Bruker i nærheten
+      friend: Venn
+    show:
+      my friends: Vennene mine
+      no friends: Du har ikke lagt til noen venner ennå.
+      nearby users: Andre nærliggende brukere
+      no nearby users: Det er ingen andre brukere som innrømmer kartlegging i ditt
+        område ennå.
+      friends_changesets: venners endringssett
+      friends_diaries: venners dagbokoppføringer
+      nearby_changesets: endringssett av brukere i nærheten
+      nearby_diaries: dagbokoppføringer av brukere i nærheten
   diary_entries:
     new:
       title: Ny dagboksoppføring
@@ -2324,13 +2342,6 @@ nb:
       spam score: 'Spamresultat:'
       description: Beskrivelse
       user location: Brukerens posisjon
-      my friends: Vennene mine
-      no friends: Du har ikke lagt til noen venner ennå.
-      km away: '%{count}km unna'
-      m away: '%{count}m unna'
-      nearby users: Andre nærliggende brukere
-      no nearby users: Det er ingen andre brukere som innrømmer kartlegging i ditt
-        område ennå.
       role:
         administrator: Denne brukeren er en administrator
         moderator: Denne brukeren er en moderator
@@ -2351,15 +2362,7 @@ nb:
       unhide_user: Slutt å skjule denne brukeren
       delete_user: Slett denne brukeren
       confirm: Bekreft
-      friends_changesets: venners endringssett
-      friends_diaries: venners dagbokoppføringer
-      nearby_changesets: endringssett av brukere i nærheten
-      nearby_diaries: dagbokoppføringer av brukere i nærheten
       report: Rapporter denne brukeren
-    popup:
-      your location: Din posisjon
-      nearby mapper: Bruker i nærheten
-      friend: Venn
     account:
       title: Rediger konto
       my settings: Mine innstillinger
diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index fe05d8cd1..812c30e35 100644
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -91,6 +91,16 @@ nds:
       user: Bruker
       comment: Kommentar
       area: Rebeed
+  dashboards:
+    contact:
+      km away: '%{count} km weg'
+      m away: '%{count} m weg'
+    popup:
+      your location: Dien Standoort
+      nearby mapper: Koortenmaker in de Neegd
+      friend: Fründ
+    show:
+      nearby users: Annere Brukers in de Neegd
   diary_entries:
     new:
       title: Ne’en Dagbook-Indrag
@@ -589,13 +599,6 @@ nds:
       mapper since: 'Koortenmaker sied:'
       email address: 'E-Mail-Adress:'
       description: Beschrieven
-      km away: '%{count} km weg'
-      m away: '%{count} m weg'
-      nearby users: Annere Brukers in de Neegd
-    popup:
-      your location: Dien Standoort
-      nearby mapper: Koortenmaker in de Neegd
-      friend: Fründ
     account:
       title: Brukerkonto ännern
       public editing:
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index a291e67a2..e2303cc67 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -301,6 +301,17 @@ ne:
     index:
       title_all: OpenStreetMap परिवर्वतन सूची छलफल
       title_particular: 'OpenStreetMap परिवर्तन सूची #%{changeset_id} छलफल'
+  dashboards:
+    contact:
+      km away: '%{count}किमि टाढा'
+      m away: '%{count} मि टाढा'
+    popup:
+      your location: तपाईँको स्थान
+      nearby mapper: नजिकको मानचित्रकर्मी
+      friend: साथी
+    show:
+      my friends: मेरा साथीहरू
+      no friends: तपाईं कुनै साथीहरूलाई जोड्नु भएको छैन
   diary_entries:
     new:
       title: नयाँ दैनिकी प्रविष्टी
@@ -1144,18 +1155,10 @@ ne:
       add as friend: साथी जोड्नुहोस्
       status: 'स्थिति:'
       description: वर्णन
-      my friends: मेरा साथीहरू
-      no friends: तपाईं कुनै साथीहरूलाई जोड्नु भएको छैन
-      km away: '%{count}किमि टाढा'
-      m away: '%{count} मि टाढा'
       role:
         administrator: यी प्रयोगकर्ता प्रबन्धक हुनुहुन्छ
       comments: टिप्पणी
       confirm: निश्चित गर्ने
-    popup:
-      your location: तपाईँको स्थान
-      nearby mapper: नजिकको मानचित्रकर्मी
-      friend: साथी
     account:
       my settings: मेरो अनुकुलताहरु
       openid:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d6f35db2d..2c1d037d4 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -486,6 +486,28 @@ nl:
     timeout:
       sorry: Sorry, het oproepen van de lijst met wijzigingensets die u hebt opgevraagd
         duurde te lang.
+  dashboards:
+    contact:
+      km away: '%{count} km verwijderd'
+      m away: '%{count} m verwijderd'
+    popup:
+      your location: Uw locatie
+      nearby mapper: Dichtbijzijnde mapper
+      friend: Vriend
+    show:
+      title: Mijn Dashboard
+      no_home_location_html: '%{edit_profile_link} en stel uw thuislocatie in om gebruikers
+        in de buurt te zien.'
+      edit_your_profile: Pas uw profiel aan
+      my friends: Mijn vrienden
+      no friends: U hebt nog geen vrienden toegevoegd.
+      nearby users: Andere dichtbijzijnde gebruikers
+      no nearby users: Er zijn geen andere gebruikers die hebben opgegeven in de buurt
+        te mappen.
+      friends_changesets: wijzigingensets van vrienden
+      friends_diaries: dagboekberichten van vrienden
+      nearby_changesets: wijzigingensets van gebruikers in de buurt
+      nearby_diaries: dagboekberichten van gebruikers in de buurt
   diary_entries:
     new:
       title: Nieuw dagboekbericht
@@ -820,6 +842,7 @@ nl:
           window_construction: Raamconstructie
           winery: Wijnboer
           "yes": Ambachtswinkel
+        crossing: Oversteekplaats
         emergency:
           access_point: Rendez-vouspunt voor reddingsdiensten
           ambulance_station: Ambulancepost
@@ -1075,6 +1098,7 @@ nl:
           hill: Heuvel
           hot_spring: Warmwaterbron
           island: Eiland
+          isthmus: Landengte
           land: Land
           marsh: Moeras
           moor: Veen
@@ -1089,10 +1113,13 @@ nl:
           sand: Zand
           scree: Puin
           scrub: Struikgewas
+          shingle: Kiezel
           spring: Bron
           stone: Steen
           strait: Zeeëngte
           tree: Boom
+          tree_row: Bomenrij
+          tundra: Toendra
           valley: Vallei
           volcano: Vulkaan
           water: Water
@@ -1489,9 +1516,10 @@ nl:
     intro_text: OpenStreetMap is een kaart van de wereld, gemaakt door mensen zoals
       u en vrij te gebruiken onder een open licentie.
     intro_2_create_account: Maak een gebruiker aan
-    hosting_partners_html: Hosting wordt ondersteund door %{ucl}, %{bytemark}, en
-      andere %{partners}.
+    hosting_partners_html: Hosting wordt ondersteund door %{ucl}, %{fastly}, %{bytemark},
+      en andere %{partners}.
     partners_ucl: het UCL VR Centre
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     tou: Gebruiksvoorwaarden
@@ -2003,8 +2031,10 @@ nl:
           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> en
           Land Tirol (onder <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY-AT met aanvullingen</a>).
         contributors_au_html: |-
-          <strong>Australië</strong>: Bevat wijkgegevens
-          gebaseerd op gegevens van het Australian Bureau of Statistics.
+          <strong>Australië</strong>: Bevat of is ontwikkeld met behulp van administratieve grenzen &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australië</a>
+          vrijgegeven door het Gemenebest van Australië onder de licentie
+          <a href="https://creativecommons.org/licenses/by/4.0/deed.nl">Creative Commons Naamsvermelding 4.0 Internationaal (CC BY 4.0)</a>.
         contributors_ca_html: |-
           <strong>Canada</strong>: Bevat gegevens van
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -2665,6 +2695,7 @@ nl:
       my settings: Instellingen
       my comments: Mijn reacties
       my_preferences: Mijn voorkeuren
+      my_dashboard: Mijn Dashboard
       blocks on me: Blokkades voor u
       blocks by me: Blokkades door u
       edit_profile: Profiel wijzigen
@@ -2686,16 +2717,6 @@ nl:
       spam score: 'Spamscore:'
       description: Beschrijving
       user location: Gebruikerslocatie
-      no_home_location_html: '%{edit_profile_link} en stel uw thuislocatie in om gebruikers
-        in de buurt te zien.'
-      edit_your_profile: Pas uw profiel aan
-      my friends: Mijn vrienden
-      no friends: U hebt nog geen vrienden toegevoegd.
-      km away: '%{count} km verwijderd'
-      m away: '%{count} m verwijderd'
-      nearby users: Andere dichtbijzijnde gebruikers
-      no nearby users: Er zijn geen andere gebruikers die hebben opgegeven in de buurt
-        te mappen.
       role:
         administrator: Deze gebruiker is beheerder
         moderator: Deze gebruiker is moderator
@@ -2716,15 +2737,7 @@ nl:
       unhide_user: Gebruiker zichtbaar maken
       delete_user: Deze gebruiker verwijderen
       confirm: Bevestigen
-      friends_changesets: wijzigingensets van vrienden
-      friends_diaries: dagboekberichten van vrienden
-      nearby_changesets: wijzigingensets van gebruikers in de buurt
-      nearby_diaries: dagboekberichten van gebruikers in de buurt
       report: Rapporteer deze Gebruiker
-    popup:
-      your location: Uw locatie
-      nearby mapper: Dichtbijzijnde mapper
-      friend: Vriend
     account:
       title: Account bewerken
       my settings: Mijn instellingen
@@ -2987,7 +3000,7 @@ nl:
         cyclosm: CyclOSM
         cycle_map: Fietskaart
         transport_map: Transportkaart
-        hot: Humanitarian
+        hot: Humanitair
         opnvkarte: ÖPNVKarte
       layers:
         header: Kaartlagen
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index a84c9c769..6b3a83c18 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -355,6 +355,24 @@ nn:
   changeset_comments:
     comment:
       commented_at_by_html: Oppdatert for %{when} sidan av %{user}
+  dashboards:
+    contact:
+      km away: '%{count}km unna'
+      m away: '%{count}m unna'
+    popup:
+      your location: Posisjonen din
+      nearby mapper: Brukarar i nærleiken
+      friend: Ven
+    show:
+      my friends: Mine vener
+      no friends: Du har ikkje lagt til nokon venner enno.
+      nearby users: Andre brukarar i nærleiken
+      no nearby users: Det er ingen andre brukarar som innrømmer kartlegging i området
+        ditt enno.
+      friends_changesets: endringssett av vener
+      friends_diaries: dagbokoppføringar av vener
+      nearby_changesets: endringssett av naboar
+      nearby_diaries: dagbokoppføringar av naboar
   diary_entries:
     new:
       title: Ny dagbokoppføring
@@ -1774,13 +1792,6 @@ nn:
       spam score: 'Spamresultat:'
       description: Skildring
       user location: Posisjonen til brukaren
-      my friends: Mine vener
-      no friends: Du har ikkje lagt til nokon venner enno.
-      km away: '%{count}km unna'
-      m away: '%{count}m unna'
-      nearby users: Andre brukarar i nærleiken
-      no nearby users: Det er ingen andre brukarar som innrømmer kartlegging i området
-        ditt enno.
       role:
         administrator: Denne brukaren er ein administrator
         moderator: Denne brukaren er ein moderator
@@ -1801,15 +1812,7 @@ nn:
       unhide_user: Gøym ikkje lenger denne brukaren
       delete_user: Slett denne brukaren
       confirm: Stadfest
-      friends_changesets: endringssett av vener
-      friends_diaries: dagbokoppføringar av vener
-      nearby_changesets: endringssett av naboar
-      nearby_diaries: dagbokoppføringar av naboar
       report: Rapporter denne brukaren
-    popup:
-      your location: Posisjonen din
-      nearby mapper: Brukarar i nærleiken
-      friend: Ven
     account:
       title: Rediger konto
       my settings: Innstellingane mine
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 30765f3ee..d596ccdfa 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -383,6 +383,25 @@ oc:
     timeout:
       sorry: O planhèm, la lista deis grops de modificacions qu'avètz demandada met
         tròp de temps per èsser recuperada.
+  dashboards:
+    contact:
+      km away: '%{count} km'
+      m away: distant de %{count} m
+    popup:
+      your location: Vòstre emplaçament
+      nearby mapper: Mapaire dins los environs
+      friend: Amic
+    show:
+      my friends: los mens amics
+      no friends: Avètz pas encara apondut cap d'amic
+      nearby users: Autres utilizaires a proximitat
+      no nearby users: Cap d'utilizaire a pas encara senhalat que cartografiava a
+        proximitat.
+      friends_changesets: Percórrer totes los gropes de modificacions dels amics
+      friends_diaries: Entradas de jornal dels amics
+      nearby_changesets: Percórrer totes los gropes de modificacions dels utilizaires
+        a proximitat
+      nearby_diaries: Entradas de jornal dels utilizaires a proximitat
   diary_entries:
     new:
       title: Novèla entrada de jornau
@@ -2050,13 +2069,6 @@ oc:
       spam score: 'Nòta pel spam :'
       description: Descripcion
       user location: Emplaçament de l'utilizaire
-      my friends: los mens amics
-      no friends: Avètz pas encara apondut cap d'amic
-      km away: '%{count} km'
-      m away: distant de %{count} m
-      nearby users: Autres utilizaires a proximitat
-      no nearby users: Cap d'utilizaire a pas encara senhalat que cartografiava a
-        proximitat.
       role:
         administrator: Aqueste utilizaire es un administrator
         moderator: Aqueste utilizaire es un moderator
@@ -2077,16 +2089,7 @@ oc:
       unhide_user: Reafichar aqueste utilizaire
       delete_user: Suprimir aqueste utilizaire
       confirm: Confirmar
-      friends_changesets: Percórrer totes los gropes de modificacions dels amics
-      friends_diaries: Entradas de jornal dels amics
-      nearby_changesets: Percórrer totes los gropes de modificacions dels utilizaires
-        a proximitat
-      nearby_diaries: Entradas de jornal dels utilizaires a proximitat
       report: Denonciatz aquel usatgièr
-    popup:
-      your location: Vòstre emplaçament
-      nearby mapper: Mapaire dins los environs
-      friend: Amic
     account:
       title: Modificar lo compte
       my settings: Meis opcions
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index d9af330f0..5ce9af455 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -211,6 +211,16 @@ pa:
     index:
       title: ਤਬਦੀਲੀਆਂ
       load_more: ਹੋਰ ਲੋਡ ਕਰੋ
+  dashboards:
+    contact:
+      km away: '%{count}ਕਿ.ਮੀ. ਪਰ੍ਹਾਂ'
+      m away: '%{count}ਮੀਟਰ ਪਰ੍ਹਾਂ'
+    popup:
+      your location: ਤੁਹਾਡੀ ਸਥਿਤੀ
+      friend: ਦੋਸਤ
+    show:
+      no friends: ਤੁਸੀਂ ਅਜੇ ਕੋਈ ਮਿੱਤਰ ਨਹੀਂ ਜੋੜਿਆ।
+      nearby users: ਨੇੜੇ-ਤੇੜੇ ਦੇ ਹੋਰ ਵਰਤੋਂਕਾਰ
   diary_entries:
     form:
       location: 'ਸਥਿਤੀ:'
@@ -1085,10 +1095,6 @@ pa:
       status: 'ਦਰਜਾ:'
       description: ਵੇਰਵਾ
       user location: ਵਰਤੋਂਕਾਰ ਦੀ ਸਥਿਤੀ
-      no friends: ਤੁਸੀਂ ਅਜੇ ਕੋਈ ਮਿੱਤਰ ਨਹੀਂ ਜੋੜਿਆ।
-      km away: '%{count}ਕਿ.ਮੀ. ਪਰ੍ਹਾਂ'
-      m away: '%{count}ਮੀਟਰ ਪਰ੍ਹਾਂ'
-      nearby users: ਨੇੜੇ-ਤੇੜੇ ਦੇ ਹੋਰ ਵਰਤੋਂਕਾਰ
       role:
         administrator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਪ੍ਰਸ਼ਾਸਕ ਹੈ।
         moderator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਵਿਚੋਲਾ ਹੈ।
@@ -1104,9 +1110,6 @@ pa:
       unhide_user: ਇਸ ਵਰਤੋਂਕਾਰ ਦਾ ਉਹਲਾ ਹਟਾਉ
       delete_user: ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਉ
       confirm: ਤਸਦੀਕ ਕਰੋ
-    popup:
-      your location: ਤੁਹਾਡੀ ਸਥਿਤੀ
-      friend: ਦੋਸਤ
     account:
       title: ਖਾਤਾ ਸੋਧੋ
       my settings: ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 17e507d58..d1a7f37ef 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -519,6 +519,27 @@ pl:
       title_particular: 'Dyskusja na temat zestawu zmian #%{changeset_id}'
     timeout:
       sorry: Niestety, pobieranie listy żądanych zestawów zmian trwało zbyt długo.
+  dashboards:
+    contact:
+      km away: '%{count} km stąd'
+      m away: '%{count} m stąd'
+    popup:
+      your location: Twoje położenie
+      nearby mapper: Mapujący z okolicy
+      friend: Znajomy
+    show:
+      no_home_location_html: '%{edit_profile_link} i podaj swoją lokalizację, aby
+        zobaczyć użytkowników w pobliżu.'
+      edit_your_profile: Edytuj swój profil
+      my friends: Moi znajomi
+      no friends: Nie dodano jeszcze żadnych znajomych.
+      nearby users: Najbliżsi użytkownicy
+      no nearby users: Nie ma innych użytkowników, którzy przyznają się do mapowania
+        w tej okolicy.
+      friends_changesets: zestawy zmian znajomych
+      friends_diaries: wpisy w dziennikach znajomych
+      nearby_changesets: pobliskie zestawy zmian
+      nearby_diaries: pobliskie wpisy w dziennikach
   diary_entries:
     new:
       title: Nowy wpis do dziennika
@@ -855,6 +876,7 @@ pl:
           window_construction: Montaż okien
           winery: Winiarnia
           "yes": Warsztat
+        crossing: Przejście
         emergency:
           access_point: Punkt dla służb ratowniczych
           ambulance_station: Stacja pogotowia ratunkowego
@@ -1110,6 +1132,7 @@ pl:
           hill: Wzgórze
           hot_spring: Źródło termalne
           island: Wyspa
+          isthmus: Przesmyk
           land: Ląd
           marsh: Bagno
           moor: Wrzosowisko
@@ -1124,10 +1147,13 @@ pl:
           sand: Piaski
           scree: Rumowisko skalne
           scrub: Zarośla
+          shingle: Plaża kamienista
           spring: Źródło wodne
           stone: Głaz
           strait: Cieśnina
           tree: Drzewo
+          tree_row: Rząd drzew
+          tundra: Tundra
           valley: Dolina
           volcano: Wulkan
           water: Woda
@@ -1530,8 +1556,10 @@ pl:
     intro_text: OpenStreetMap to mapa świata, stworzona przez ludzi, takich jak ty,
       i z możliwością użycia pod otwartą licencją.
     intro_2_create_account: Utwórz konto
-    hosting_partners_html: Hosting obsługuje %{ucl}, %{bytemark}, a także %{partners}.
+    hosting_partners_html: Hosting obsługuje %{ucl}, %{fastly}, %{bytemark}, a także
+      %{partners}.
     partners_ucl: University College London
+    partners_fastly: Fastly
     partners_bytemark: Hosting Bytemark
     partners_partners: partnerzy
     tou: Warunki użytkowania
@@ -2025,9 +2053,10 @@ pl:
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> oraz
           Land Tyrol (na licencji <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT z późniejszymi zmianami</a>).
         contributors_au_html: '<strong>Australia</strong>: Zawiera dane oparte na
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA
-          Australia Limited</a>, licencjonowane przez Związek Australijski na podstawie
-          licencji <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.'
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
+          Australia</a>, licencjonowane przez Związek Australijski na podstawie licencji
+          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons
+          Attribution 4.0 International licence (CC BY 4.0)</a>.'
         contributors_ca_html: '<strong>Kanada</strong>: Zawiera dane z GeoBase&reg;,
           GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
           Department of Natural Resources Canada) i StatCan (Geography Division, Statistics
@@ -2703,16 +2732,6 @@ pl:
       spam score: 'Punktacja spamu:'
       description: Opis
       user location: Położenie użytkownika
-      no_home_location_html: '%{edit_profile_link} i podaj swoją lokalizację, aby
-        zobaczyć użytkowników w pobliżu.'
-      edit_your_profile: Edytuj swój profil
-      my friends: Moi znajomi
-      no friends: Nie dodano jeszcze żadnych znajomych.
-      km away: '%{count} km stąd'
-      m away: '%{count} m stąd'
-      nearby users: Najbliżsi użytkownicy
-      no nearby users: Nie ma innych użytkowników, którzy przyznają się do mapowania
-        w tej okolicy.
       role:
         administrator: Ten użytkownik jest administratorem
         moderator: Ten użytkownik jest moderatorem
@@ -2733,15 +2752,7 @@ pl:
       unhide_user: Odkryj tego użytkownika
       delete_user: Usuń tego użytkownika
       confirm: Potwierdź
-      friends_changesets: zestawy zmian znajomych
-      friends_diaries: wpisy w dziennikach znajomych
-      nearby_changesets: pobliskie zestawy zmian
-      nearby_diaries: pobliskie wpisy w dziennikach
       report: zgłoś tego użytkownika
-    popup:
-      your location: Twoje położenie
-      nearby mapper: Mapujący z okolicy
-      friend: Znajomy
     account:
       title: Zmiana ustawień konta
       my settings: Ustawienia
diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index fa452a564..db445f17e 100644
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -96,6 +96,9 @@ ps:
       user: کارن
       comment: تبصره
       area: سيمه
+  dashboards:
+    popup:
+      friend: ملگری
   diary_entries:
     form:
       location: 'ځای:'
@@ -413,8 +416,6 @@ ps:
       unhide_user: دا کارن ښکاره کول
       delete_user: دا کارن ړنگول
       confirm: تاييد
-    popup:
-      friend: ملگری
     account:
       my settings: زما امستنې
       openid:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index bd60b878d..ade21556f 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -479,6 +479,27 @@ pt-BR:
     timeout:
       sorry: Desculpe, a lista de comentários do conjunto de alterações que você solicitou
         demorou muito para ser recuperada.
+  dashboards:
+    contact:
+      km away: '%{count}km de distância'
+      m away: '%{count}m de distância'
+    popup:
+      your location: Sua localização
+      nearby mapper: Mapeador próximo
+      friend: Amigo
+    show:
+      title: Meu painel
+      no_home_location_html: '%{edit_profile_link} e defina seu local de origem para
+        ver usuários próximos.'
+      edit_your_profile: Editar seu perfil
+      my friends: Meus amigos
+      no friends: Você ainda não adicionou amigos.
+      nearby users: Outros usuários próximos
+      no nearby users: Ainda não há outros usuários mapeando por perto.
+      friends_changesets: conjuntos de alterações dos amigos
+      friends_diaries: publicações no diário dos amigos
+      nearby_changesets: conjuntos de alterações de usuários próximos
+      nearby_diaries: publicações no diário dos usuários próximos
   diary_entries:
     new:
       title: Nova publicação no diário
@@ -815,6 +836,7 @@ pt-BR:
           window_construction: Construção de janela
           winery: Adega
           "yes": Loja de Artesanato
+        crossing: Cruzando
         emergency:
           access_point: Ponto de acesso
           ambulance_station: Posto de Ambulâncias
@@ -1070,6 +1092,7 @@ pt-BR:
           hill: Colina
           hot_spring: Primavera quente
           island: Ilha
+          isthmus: Istmo
           land: Ilha
           marsh: Pântano
           moor: Brejo
@@ -1084,10 +1107,13 @@ pt-BR:
           sand: Areia
           scree: Pedregulhos
           scrub: Matagal
+          shingle: Telha
           spring: Nascente
           stone: Pedra
           strait: Estreito
           tree: Árvore
+          tree_row: Linha de árvores
+          tundra: Tundra
           valley: Vale
           volcano: Vulcão
           water: Água
@@ -1488,9 +1514,10 @@ pt-BR:
     intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como você e
       de uso livre sob uma licença aberta.
     intro_2_create_account: Criar uma conta de usuário
-    hosting_partners_html: A hospedagem é suportada por %{ucl}, %{bytemark} e outros
-      %{partners}.
+    hosting_partners_html: O hospedagem é suportada por %{ucl}, %{fastly}, %{bytemark}
+      e outros %{partners}.
     partners_ucl: UCL
+    partners_fastly: Rapidamente
     partners_bytemark: Hospedagem Bytemark
     partners_partners: parceiros
     tou: Termo de uso
@@ -1996,9 +2023,11 @@ pt-BR:
           BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
           Vorarlberg</a> e Land Tirol (sob a licença <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
           AT com emendas</a>).'
-        contributors_au_html: |-
-          <strong>Austrália</strong>: Contém dados do subúrbio baseado
-             nos dados do Australian Bureau of Statistics.
+        contributors_au_html: "<strong>Austrália</strong>: contém ou foi desenvolvido
+          usando fronteiras administrativas &copy; \n<a href=\"https://geoscape.com.au/legal/data-copyright-and-disclaimer/\">PSMA
+          Australia Limited</a>\nlicenciada pela Commonwealth of Australia sob uma
+          licença\n<a href=\"https://creativecommons.org/licenses/by/4.0/\">Creative
+          Commons Attribuição 4.0 Licença Internacional (CC BY 4.0)</a>."
         contributors_ca_html: "<strong>Canadá</strong>: Contém dados do\n   GeoBase&reg;,
           GeoGratis (&copy; Departamento de Recursos\n   Naturais do Canadá), CanVec
           (&copy; Departamento de Recursos\n   Naturais do Canadá), and StatCan (Divisão
@@ -2653,6 +2682,7 @@ pt-BR:
       my settings: Minhas configurações
       my comments: Meus comentários
       my_preferences: Minhas preferências
+      my_dashboard: Meu painel
       blocks on me: Bloqueios sobre mim
       blocks by me: Bloqueios por mim
       edit_profile: Editar perfil
@@ -2674,15 +2704,6 @@ pt-BR:
       spam score: 'Contagem de Spam:'
       description: Descrição
       user location: Local do usuário
-      no_home_location_html: '%{edit_profile_link} e defina seu local de origem para
-        ver usuários próximos.'
-      edit_your_profile: Editar seu perfil
-      my friends: Meus amigos
-      no friends: Você ainda não adicionou amigos.
-      km away: '%{count}km de distância'
-      m away: '%{count}m de distância'
-      nearby users: Outros usuários próximos
-      no nearby users: Ainda não há outros usuários mapeando por perto.
       role:
         administrator: Este usuário é um administrador
         moderator: Este usuário é um moderador
@@ -2703,15 +2724,7 @@ pt-BR:
       unhide_user: Exibir esse usuário
       delete_user: Excluir este usuário
       confirm: Confirmar
-      friends_changesets: conjuntos de alterações dos amigos
-      friends_diaries: publicações no diário dos amigos
-      nearby_changesets: conjuntos de alterações de usuários próximos
-      nearby_diaries: publicações no diário dos usuários próximos
       report: Denunciar este usuário
-    popup:
-      your location: Sua localização
-      nearby mapper: Mapeador próximo
-      friend: Amigo
     account:
       title: Editar conta
       my settings: Minhas configurações
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 4651907c3..193a29fbe 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -242,6 +242,9 @@ pt-PT:
       x_years:
         one: há 1 ano
         other: há %{count} anos
+  printable_name:
+    with_version: '%{id}, v%{version}'
+    with_name_html: '%{name} (%{id})'
   editor:
     default: Padrão (atualmente %{name})
     id:
@@ -471,6 +474,28 @@ pt-PT:
     timeout:
       sorry: Lamentamos, a lista de comentários sobre conjuntos de alterações que
         pediste demorou demasiado tempo a ser obtida.
+  dashboards:
+    contact:
+      km away: '%{count} km de distância'
+      m away: '%{count} m de distância'
+    popup:
+      your location: A tua localização
+      nearby mapper: Mapeador próximo de ti
+      friend: Amigo
+    show:
+      title: Painel de Controlo
+      no_home_location_html: '%{edit_profile_link} e define a localização da tua morada
+        para veres utilizadores próximos.'
+      edit_your_profile: Editar perfil
+      my friends: Os meus amigos
+      no friends: Ainda não adicionaste nenhum amigo.
+      nearby users: Outros mapeadores nas redondezas
+      no nearby users: Não há outros mapeadores que admitam estar a editar o mapa
+        nas redondezas.
+      friends_changesets: conjuntos de alterações dos amigos
+      friends_diaries: publicações nos diários dos amigos
+      nearby_changesets: conjuntos de alterações de utilizadores próximos
+      nearby_diaries: publicações no diário de utilizadores próximos
   diary_entries:
     new:
       title: Criar nova publicação no diário
@@ -807,6 +832,7 @@ pt-PT:
           window_construction: Caixilharia
           winery: Adega
           "yes": Loja de artesanato
+        crossing: Passadeira
         emergency:
           access_point: Ponto de acesso
           ambulance_station: Estação de ambulâncias
@@ -1062,6 +1088,7 @@ pt-PT:
           hill: Colina
           hot_spring: Nascente geotérmica
           island: Ilha
+          isthmus: Istmo
           land: Terra
           marsh: Pântano
           moor: Paul
@@ -1076,10 +1103,13 @@ pt-PT:
           sand: Areia
           scree: Detritos de talude
           scrub: Matagal
+          shingle: Seixos
           spring: Nascente
           stone: Pedra
           strait: Estreito
           tree: Árvore
+          tree_row: Linha de árvores
+          tundra: Tundra
           valley: Vale
           volcano: Vulcão
           water: Água
@@ -1477,9 +1507,10 @@ pt-PT:
     intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como tu e de
       uso livre sob uma licença aberta.
     intro_2_create_account: Cria uma conta de utilizador
-    hosting_partners_html: O alojamento é suportado por %{ucl}, %{bytemark} e outros
-      %{partners}.
+    hosting_partners_html: O alojamento é suportado por %{ucl}, %{fastly}, %{bytemark}
+      e outros %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: parceiros
     tou: Condições de utilização
@@ -1981,11 +2012,11 @@ pt-PT:
           BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
           Vorarlberg</a> e Land Tirol (sob a licença <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
           AT com emendas</a>).'
-        contributors_au_html: |-
-          <strong>Austrália</strong>: contém dados provenientes da
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
-          licenciada pela Commonwealth of Australia sob uma licença
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
+        contributors_au_html: "<strong>Austrália</strong>: contém ou foi desenvolvido
+          usando fronteiras administrativas &copy; \n<a href=\"https://geoscape.com.au/legal/data-copyright-and-disclaimer/\">PSMA
+          Australia Limited</a>\nlicenciada pela Commonwealth of Australia sob uma
+          licença\n<a href=\"https://creativecommons.org/licenses/by/4.0/\">Creative
+          Commons Attribuição 4.0 Licença Internacional (CC BY 4.0)</a>."
         contributors_ca_html: '<strong>Canadá</strong>: contém dados de GeoBase&reg;,
           GeoGratis (&copy; Departmento de Recursos Naturais do Canadá), CanVec (&copy;
           Departmento de Recursos Naturais do Canadá) e StatCan (Divisão de Geografia,
@@ -2174,7 +2205,7 @@ pt-PT:
         a aplicação desktop para Mac e Windows</a>.
       id_html: Alternativamente, podes definir o teu editor padrão para o iD, que
         é executado no teu navegador de Internet tal como o Potlatch fazia. <a href="%{settings_url}">Altera
-        as tuas definições de utilizador aqui</a>.
+        as tuas definições aqui</a>.
     sidebar:
       search_results: Resultados da Pesquisa
       close: Fechar
@@ -2342,6 +2373,7 @@ pt-PT:
       title: A editar a rota %{name}
       heading: A editar a rota %{name}
       visibility_help: o que significa isto?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
       updated: Rota atualizada
     trace_optionals:
@@ -2431,6 +2463,7 @@ pt-PT:
         inicia sessão na página web do OpenStreetMap para veres os Termos de Contribuidor.
         Não precisas de aceitar os termos, mas tens de os ver.
     settings_menu:
+      account_settings: Definições
       oauth1_settings: Definições OAuth 1
       oauth2_applications: Aplicações OAuth 2
       oauth2_authorizations: Autorizações OAuth 2
@@ -2640,6 +2673,7 @@ pt-PT:
       my settings: Definições
       my comments: Comentários
       my_preferences: Preferências
+      my_dashboard: Painel de Controlo
       blocks on me: Quem me bloqueou
       blocks by me: Os meus bloqueios
       edit_profile: Editar Perfil
@@ -2661,13 +2695,6 @@ pt-PT:
       spam score: 'Contagem de Spam:'
       description: Descrição
       user location: Localização do utilizador
-      my friends: Os meus amigos
-      no friends: Ainda não adicionaste nenhum amigo.
-      km away: '%{count} km de distância'
-      m away: '%{count} m de distância'
-      nearby users: Outros mapeadores nas redondezas
-      no nearby users: Não há outros mapeadores que admitam estar a editar o mapa
-        nas redondezas.
       role:
         administrator: Este utilizador é um administrador
         moderator: Este utilizador é um moderador
@@ -2688,15 +2715,7 @@ pt-PT:
       unhide_user: Mostrar este utilizador
       delete_user: Eliminar este utilizador
       confirm: Confirmar
-      friends_changesets: conjuntos de alterações dos amigos
-      friends_diaries: publicações nos diários dos amigos
-      nearby_changesets: conjuntos de alterações de utilizadores próximos
-      nearby_diaries: publicações no diário de utilizadores próximos
       report: Denunciar este utilizador
-    popup:
-      your location: A tua localização
-      nearby mapper: Mapeador próximo de ti
-      friend: Amigo
     account:
       title: Editar conta
       my settings: Definições
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 92938703d..70dea87af 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -15,6 +15,7 @@
 # Author: Popetedenis
 # Author: Ruila
 # Author: Strainu
+# Author: WebSourceContentRO
 # Author: Wintereu
 ---
 ro:
@@ -40,6 +41,9 @@ ro:
       client_application:
         create: Înregistrează
         update: Actualizează
+      doorkeeper_application:
+        create: Înregistrare
+        update: Actualizează
       redaction:
         create: Creați redacție
         update: Salvați redacția
@@ -113,6 +117,9 @@ ro:
         language: Limbă
       doorkeeper/application:
         name: Nume
+        redirect_uri: Redirectează URI-uri
+        confidential: Aplicație confidențială?
+        scopes: Permisiuni
       friend:
         user: Utilizator
         friend: Prieten
@@ -155,6 +162,11 @@ ro:
         pass_crypt: Parolă
         pass_crypt_confirmation: Confirmă Parola
     help:
+      doorkeeper/application:
+        confidential: Aplicația va fi utilizată acolo unde cheia secretă a clientului
+          poate fi păstrată confidențial (aplicațiile mobile native și aplicațiile
+          cu o singură pagină nu sunt confidențiale)
+        redirect_uri: Folosiți o linie pentru fiecare URI
       trace:
         tagstring: utilizează virgule
       user_block:
@@ -442,6 +454,24 @@ ro:
     timeout:
       sorry: Ne pare rău, lista de comenzi modificate pe care le-ați solicitat a durat
         prea mult timp pentru a fi preluate.
+  dashboards:
+    contact:
+      km away: '%{count} km depărtare'
+      m away: '%{count} m depărtare'
+    popup:
+      your location: Locația utilizatorului
+      nearby mapper: Cartograful din apropiere
+      friend: Prieten
+    show:
+      my friends: Prietenii mei
+      no friends: Nu ați adăugat încă niciun prieten.
+      nearby users: Alți utilizatori din apropriere
+      no nearby users: Nu există alți utilizatori care să admită cartografiere în
+        apropiere.
+      friends_changesets: changeset prieteni
+      friends_diaries: intrările prietenilor în jurnal
+      nearby_changesets: schimbări de setări ale utilizatorilor
+      nearby_diaries: intrările în jurnalul utilizatorului din apropiere
   diary_entries:
     new:
       title: O nouă înregistrare în jurnal
@@ -515,11 +545,17 @@ ro:
     comments:
       has_commented_on: '%{display_name} a comentat pe următoarele înregistrări din
         jurnal'
+      no_comments: Fără comentarii din jurnal
       post: Postează
       when: Când
       comment: Comentariu
       newer_comments: Comentarii mai noi
       older_comments: Comentarii mai vechi
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Aplicație înregistrată.
   friendships:
     make_friend:
       heading: Adăugați %{user} ca prieten?
@@ -527,6 +563,8 @@ ro:
       success: '%{name} este acum prietenul tău!'
       failed: Ne pare rău, nu a reușit să adăugați %{name} ca prieten.
       already_a_friend: Sunteți deja prieteni cu %{name}
+      limit_exceeded: V-ați împrietenit cu mulți utilizatori recent. Vă rugăm să așteptați
+        puțin înainte de a încerca să vă mai împrieteniți.
     remove_friend:
       heading: Scoate de la prieteni pe %{user}?
       button: Scoate din lista de prieteni
@@ -1434,9 +1472,10 @@ ro:
     intro_text: OpenStreetMap este o hartă a lumii, creată de oameni ca tine și liberă
       pentru utilizare sub o licență deschisă.
     intro_2_create_account: Creează un cont de utilizator
-    hosting_partners_html: Gazduirea este susținută de %{ucl}, %{bytemark} și alți
-      %{partners}.
+    hosting_partners_html: Gazduirea este susținută de %{ucl}, %{fastly}, %{bytemark}
+      și alți %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Găzduire Bytemark
     partners_partners: parteneri
     tou: Termeni de Utilizare
@@ -1468,10 +1507,15 @@ ro:
         %{subject}:'
       footer: De asemenea, puteți citi comentariul la %{readurl} și puteți să comentați
         la %{commenturl} sau să răspundeți la %{replyurl}
+      footer_html: De asemenea, puteți citi comentariul la %{readurl} și puteți comenta
+        la %{commenturl} sau să trimiteți un mesaj autorului la %{replyurl}
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
       hi: Salut, %{to_user},
       header: '%{from_user} v-a trimis un mesaj prin OpenStreetMap cu subiectul %{subject}:'
+      header_html: '%{from_user} v-a trimis un mesaj OpenStreetMap cu subiectul %{subject}:'
+      footer: De asemenea, puteți citi mesajul la %{readurl} și trimite unul autorului
+        la %{replyurl}
       footer_html: De asemenea, puteți citi mesajul la %{readurl} și puteți răspunde
         la %{replyurl}
     friendship_notification:
@@ -1481,6 +1525,7 @@ ro:
       see_their_profile: Puteți vedea profilul lor la %{userurl}.
       see_their_profile_html: Puteți vedea profilul respectiv la %{userurl}.
       befriend_them: De asemenea, îi puteți adăuga ca prieten la %{befriendurl}
+      befriend_them_html: Le puteți adăuga și ca prieten la %{befriendurl}.
     gpx_failure:
       hi: Salut %{to_user},
       failed_to_import: 'nu a reușit să importe. Iată eroarea:'
@@ -2477,13 +2522,6 @@ ro:
       spam score: 'Scorul spam:'
       description: Descriere
       user location: Locația utilizatorului
-      my friends: Prietenii mei
-      no friends: Nu ați adăugat încă niciun prieten.
-      km away: '%{count} km depărtare'
-      m away: '%{count} m depărtare'
-      nearby users: Alți utilizatori din apropriere
-      no nearby users: Nu există alți utilizatori care să admită cartografiere în
-        apropiere.
       role:
         administrator: Acest utilizator este un administrator
         moderator: Acest utilizator este un moderator
@@ -2504,15 +2542,7 @@ ro:
       unhide_user: Descoperă acest utilizator
       delete_user: Șterge acest utilizator
       confirm: Confirmă
-      friends_changesets: changeset prieteni
-      friends_diaries: intrările prietenilor în jurnal
-      nearby_changesets: schimbări de setări ale utilizatorilor
-      nearby_diaries: intrările în jurnalul utilizatorului din apropiere
       report: Reclamă acest utilizator
-    popup:
-      your location: Locația utilizatorului
-      nearby mapper: Cartograful din apropiere
-      friend: Prieten
     account:
       title: Modificare cont
       my settings: Setările mele
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6557d4fcc..59385975c 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -538,6 +538,24 @@ ru:
     timeout:
       sorry: К сожалению, список пакетов правок, который вы запросили, требует слишком
         много времени для извлечения.
+  dashboards:
+    contact:
+      km away: '%{count} км от вас'
+      m away: '%{count} м от вас'
+    popup:
+      your location: Ваше местоположение
+      nearby mapper: Ближайший картограф
+      friend: Друг
+    show:
+      my friends: Друзья
+      no friends: Вы не добавили ещё ни одного друга.
+      nearby users: Другие ближайшие пользователи
+      no nearby users: Пока нет других пользователей, признающих, что занимающихся
+        составлением карты поблизости.
+      friends_changesets: наборы правок друзей
+      friends_diaries: дневники друзей
+      nearby_changesets: правки соседей
+      nearby_diaries: дневники соседей
   diary_entries:
     new:
       title: Новая запись в дневнике
@@ -2655,13 +2673,6 @@ ru:
       spam score: 'Оценка спама:'
       description: Описание
       user location: Местонахождение пользователя
-      my friends: Друзья
-      no friends: Вы не добавили ещё ни одного друга.
-      km away: '%{count} км от вас'
-      m away: '%{count} м от вас'
-      nearby users: Другие ближайшие пользователи
-      no nearby users: Пока нет других пользователей, признающих, что занимающихся
-        составлением карты поблизости.
       role:
         administrator: Этот пользователь является администратором
         moderator: Этот пользователь является модератором
@@ -2682,15 +2693,7 @@ ru:
       unhide_user: Отобразить этого пользователя
       delete_user: Удалить этого пользователя
       confirm: Подтвердить
-      friends_changesets: наборы правок друзей
-      friends_diaries: дневники друзей
-      nearby_changesets: правки соседей
-      nearby_diaries: дневники соседей
       report: Сообщить об этом пользователе
-    popup:
-      your location: Ваше местоположение
-      nearby mapper: Ближайший картограф
-      friend: Друг
     account:
       title: Изменить учетную запись
       my settings: Мои настройки
diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index d169e3e66..65647a814 100644
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -207,6 +207,13 @@ sat:
       area: ᱡᱟᱭᱜᱟ
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
+  dashboards:
+    popup:
+      your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
+      friend: ᱜᱟᱛᱮ
+    show:
+      my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ
+      no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾
   diary_entries:
     new:
       title: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
@@ -651,13 +658,8 @@ sat:
       status: 'ᱫᱚᱥᱟ:'
       description: ᱵᱤᱵᱨᱚᱱ
       user location: ᱵᱮᱵᱷᱟᱨᱤᱡ-ᱟ ᱡᱟᱭᱜᱟ
-      my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ
-      no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾
       comments: ᱚᱠᱛᱟᱠᱚ
       confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
-    popup:
-      your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
-      friend: ᱜᱟᱛᱮ
     account:
       title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 91449ff85..1f99a4726 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -201,6 +201,9 @@ sc:
       id: ID
       user: Impitadore
       comment: Cummentu
+  dashboards:
+    popup:
+      friend: Amigu
   diary_entries:
     form:
       location: Logu
@@ -929,8 +932,6 @@ sc:
       edits: Modìficas
       description: Descritzione
       confirm: Cunfirma
-    popup:
-      friend: Amigu
     account:
       save changes button: Sarva sas modìficas
   user_role:
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 801cff130..53be14a81 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -88,14 +88,14 @@ scn:
       trace:
         user: Utenti
         visible: Visìbbili
-        name: Nomu
+        name: Nomu dû file
         size: Grannizza
         latitude: Latitùdini
         longitude: Loncitùdini
         public: Pùbblicu
         description: Discrizzioni
-        gpx_file: 'Carricari lu file GPX:'
-        visibility: 'Visibbilità:'
+        gpx_file: Carricari file GPX
+        visibility: Visibbilità
         tagstring: Etichetti
       message:
         sender: Mittenti
@@ -324,11 +324,28 @@ scn:
       title_all: Discussioni supra ô gruppu di canciamenti d'OpenStreetMap
       title_particular: 'Discussioni supra ô gruppu di canciamenti d''OpenStreetMap
         #%{changeset_id}'
+  dashboards:
+    contact:
+      km away: luntanu %{count} km
+      m away: luntanu %{count} m
+    popup:
+      your location: La tò pusizzioni
+      nearby mapper: Mappaturi vicinu
+      friend: Amicu
+    show:
+      no friends: Ancora nun agghiuncisti nuddu amicu.
+      nearby users: Àutri utenti vicinu
+      no nearby users: Ancora nun ci sunnu àutri utenti chi si dichiàranu mappatura
+        ccà vicinu.
+      friends_changesets: gruppa di canciamenti di l'amici
+      friends_diaries: vuci dî diarî di l'amici
+      nearby_changesets: gruppa di canciamenti di l'utenti vicini
+      nearby_diaries: vuci dî diarî di l'utenti vicini
   diary_entries:
     new:
       title: Vuci nova dû diariu
     form:
-      location: 'Locu:'
+      location: Locu
       use_map_link: adòpira la cartina
     index:
       title: Diarî di l'utenti
@@ -935,7 +952,7 @@ scn:
     intro_text: OpenStreetMap è na cartina dû munnu, criata di genti comu a tìa e
       lìbbira a adupirari secunnu na licenza graputa.
     intro_2_create_account: Crea un cuntu d'utenti
-    partners_ucl: the UCL VR Centre
+    partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: cullabburatura
     osm_offline: La basi di dati d'OpenStreetMap comu a ora nun è n lìnia pirchì si
@@ -1229,6 +1246,13 @@ scn:
       title: Nesci
       heading: Nesci d'OpenStreetMap
       logout_button: Nesci
+  shared:
+    markdown_help:
+      text: Testu
+      image: Mmàggini
+    richtext_field:
+      edit: Cancia
+      preview: Antiprima
   site:
     about:
       next: Appressu
@@ -1786,6 +1810,7 @@ scn:
       no_apps_html: Hai n'applicazzzioni chi vulissi riggistrari p'usàrila cu nuàutri
         adupirannu lu standard %{oauth}? La tò applicazzioni web s'havi a riggistrari
         prima chi poi fari addumannati OAuth unni stu sirvizziu.
+      oauth: OAuth
       registered_apps: 'Hai riggistrati st''applicazzioni clienti:'
       register_new: Riggistra la tò applicazzioni
     form:
@@ -1878,19 +1903,13 @@ scn:
       ct status: 'Cunnizzioni di cuntribbuzzioni:'
       ct undecided: Nun dicisi
       ct declined: Rifiutati
-      latest edit: 'Ùrtimu canciamentu %{ago}:'
+      latest edit: 'Ùrtimu canciamentu (%{ago}):'
       email address: 'Nnirizzu di posta elittrònica:'
       created from: 'Criatu di:'
       status: 'Statu:'
       spam score: 'Punteggiu di Spam:'
       description: Discrizzioni
       user location: Pusizzioni di l'utenti
-      no friends: Ancora nun agghiuncisti nuddu amicu.
-      km away: luntanu %{count} km
-      m away: luntanu %{count} m
-      nearby users: Àutri utenti vicinu
-      no nearby users: Ancora nun ci sunnu àutri utenti chi si dichiàranu mappatura
-        ccà vicinu.
       role:
         administrator: St'utenti è n'amministraturi
         moderator: St'utenti è nu mudiraturi
@@ -1911,24 +1930,16 @@ scn:
       unhide_user: Ammustra a st'utenti
       delete_user: Cancella a st'utenti
       confirm: Cunferma
-      friends_changesets: gruppa di canciamenti di l'amici
-      friends_diaries: vuci dî diarî di l'amici
-      nearby_changesets: gruppa di canciamenti di l'utenti vicini
-      nearby_diaries: vuci dî diarî di l'utenti vicini
-    popup:
-      your location: La tò pusizzioni
-      nearby mapper: Mappaturi vicinu
-      friend: Amicu
     account:
       title: Cancia lu cuntu
       my settings: Li mè mpustazzioni
-      current email address: 'Nnirizzu di posta elittrònica attuali:'
-      external auth: 'Autinticazzioni esterna:'
+      current email address: Nnirizzu email attuali
+      external auth: Autinticazzioni esterna
       openid:
         link: http://wiki.openstreetmap.org/wiki/IT:OpenID
         link text: chi voli diri?
       public editing:
-        heading: 'Canciamenti pùbblici:'
+        heading: Canciamenti pùbblici
         enabled: Attivati. Nun sî anònimu e poi canciari li dati.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: chi voli diri?
@@ -1946,13 +1957,14 @@ scn:
           è pùbblicatu.</li><li>Sta dicisioni nun si pò annullari, e a accuminzari
           d'ora tutti l'utenti novi sù pùbblici comu mpustazzioni pridifinuta.</li></ul>
       contributor terms:
-        heading: 'Cunnizzioni di cuntribbuzzioni:'
+        heading: Cunnizzioni di cuntribbuzzioni
         agreed: Accittasti li cunnizzioni di cuntribbuzzioni novi.
         not yet agreed: Ancora nun accittasti li cunnizzioni di cuntribbuzzioni novi.
         review link text: Quannu voi tu vai nta stu link pi lèggiri e accittari li
           cunnizzioni di cuntribbuzzioni novi.
         agreed_with_pd: Dichiarasti macari chi cunzìddiri li tò canciamenti ntô Duminiu
           Pùbblicu.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: chi voli diri?
       save changes button: Sarva li canciamenti
       make edits public button: Arrenni tutti li mè canciamenti pùbblici
@@ -1979,6 +1991,7 @@ scn:
     suspended:
       title: Cuntu suspinnutu
       heading: Cuntu suspinnutu
+      support: supportu
       body_html: |-
         <p>
           Purtroppu, lu tò cuntu fu suspinnutu di manera autumàtica pi attività suspetti.
@@ -2053,7 +2066,7 @@ scn:
       title: Rèvuca dû bloccu di %{block_on}
       heading_html: Rèvuca dû bloccu di %{block_on} fattu di %{block_by}
       time_future: Stu bloccu finisci tra %{time}.
-      past: Stu bloccu finìu %{time} fa e ora nun si pò arrivucari cchiù.
+      past: Stu bloccu finìu %{time} e ora nun si pò arrivucari cchiù.
       confirm: Sî sicuru chi voi arrivucari stu bloccu?
       revoke: Rèvuca!
       flash: Stu bloccu fu arrivucatu.
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index e7e9a5039..d410f2b8e 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -327,6 +327,23 @@ sk:
       load_more: Načítať ďalšie
     timeout:
       sorry: Ľutujeme, ale vami požadovaný zoznam sád zmien sa načítaval príliš dlho.
+  dashboards:
+    contact:
+      km away: vzdialený %{count}km
+      m away: vzdialený %{count}m
+    popup:
+      your location: Vaša poloha
+      nearby mapper: Používateľ v okolí
+      friend: Priateľ
+    show:
+      my friends: Moji priatelia
+      no friends: Ešte nemáte pridaných žiadnych priateľov.
+      nearby users: Ďalší používatelia v okolí
+      no nearby users: Nie je tu iný používateľ, ktorý priznáva mapovanie v okolí.
+      friends_changesets: Prechádzať všetky sady zmien priateľov
+      friends_diaries: Prechádzať všetky denníkové záznamy priateľov
+      nearby_changesets: Prechádzať všetky sady zmien používateľov v okolí
+      nearby_diaries: Prechádzať všetky denníkové záznamy používateľov v okolí
   diary_entries:
     new:
       title: Nový záznam denníka
@@ -1840,12 +1857,6 @@ sk:
       spam score: 'Spam skóre:'
       description: Popis
       user location: Poloha používateľa
-      my friends: Moji priatelia
-      no friends: Ešte nemáte pridaných žiadnych priateľov.
-      km away: vzdialený %{count}km
-      m away: vzdialený %{count}m
-      nearby users: Ďalší používatelia v okolí
-      no nearby users: Nie je tu iný používateľ, ktorý priznáva mapovanie v okolí.
       role:
         administrator: Tento používateľ je administrátor
         moderator: Tento používateľ je moderátor
@@ -1866,15 +1877,7 @@ sk:
       unhide_user: Zobraziť tohoto používateľa
       delete_user: Odstrániť tohoto používateľa
       confirm: Potvrdiť
-      friends_changesets: Prechádzať všetky sady zmien priateľov
-      friends_diaries: Prechádzať všetky denníkové záznamy priateľov
-      nearby_changesets: Prechádzať všetky sady zmien používateľov v okolí
-      nearby_diaries: Prechádzať všetky denníkové záznamy používateľov v okolí
       report: Nahlásiť tohto používateľa
-    popup:
-      your location: Vaša poloha
-      nearby mapper: Používateľ v okolí
-      friend: Priateľ
     account:
       title: Upraviť účet
       my settings: Moje nastavenia
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 4946a8ccc..d94a38d44 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -414,6 +414,24 @@ sl:
     index:
       title_all: Razprava o paketu sprememb OpenStreetMap
       title_particular: 'Razprava o paketu sprememb OpenStreetMap #%{changeset_id}'
+  dashboards:
+    contact:
+      km away: oddaljen %{count} km
+      m away: oddaljen %{count} m
+    popup:
+      your location: Vaša lokacija
+      nearby mapper: Bližnji kartograf
+      friend: Prijatelj
+    show:
+      my friends: Moji prijatelji
+      no friends: Niste Å¡e dodali nobenih prijateljev.
+      nearby users: Drugi bližnji uporabniki
+      no nearby users: Ni še drugih uporabnikov, ki bi priznali, da kartirajo v vaši
+        bližini.
+      friends_changesets: paketi sprememb prijateljev
+      friends_diaries: dnevniki prijateljev
+      nearby_changesets: paketi sprememb bližnjih uporabnikov
+      nearby_diaries: dnevniški vnosi bližnjih uporabnikov
   diary_entries:
     new:
       title: Nov zapis v dnevnik
@@ -2048,13 +2066,6 @@ sl:
       spam score: 'Rezultat spama:'
       description: Opis
       user location: Lokacija uporabnika
-      my friends: Moji prijatelji
-      no friends: Niste Å¡e dodali nobenih prijateljev.
-      km away: oddaljen %{count} km
-      m away: oddaljen %{count} m
-      nearby users: Drugi bližnji uporabniki
-      no nearby users: Ni še drugih uporabnikov, ki bi priznali, da kartirajo v vaši
-        bližini.
       role:
         administrator: Ta uporabnik je administrator
         moderator: Ta uporabnik je moderator
@@ -2075,15 +2086,7 @@ sl:
       unhide_user: Prikaži uporabnika
       delete_user: Izbriši uporabnika
       confirm: Potrdi
-      friends_changesets: paketi sprememb prijateljev
-      friends_diaries: dnevniki prijateljev
-      nearby_changesets: paketi sprememb bližnjih uporabnikov
-      nearby_diaries: dnevniški vnosi bližnjih uporabnikov
       report: Prijavi tega uporabnika
-    popup:
-      your location: Vaša lokacija
-      nearby mapper: Bližnji kartograf
-      friend: Prijatelj
     account:
       title: Urejanje uporabniškega računa
       my settings: Moje nastavitve
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index d429ad468..eb334ac49 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -294,6 +294,18 @@ sq:
     index:
       title_all: Diskutimi mbi ndryshimet në OpenStreetMap
       title_particular: 'Diskutimi mbi grupin e ndryshimeve #%{changeset_id} të OpenStreetMap'
+  dashboards:
+    contact:
+      km away: '%{count}km larg'
+      m away: '%{count}m larg'
+    popup:
+      your location: Vendndodhja e jote
+      nearby mapper: Hartuesi aty pranë
+      friend: Mik
+    show:
+      no friends: Akoma nuk ke shtuar ndonjë mik.
+      nearby users: Përdoruesit e tjerë aty pranë
+      no nearby users: Nuk ka përdorues tjerë aty pranë, të cilët pranojnë të hartografojnë.
   diary_entries:
     new:
       title: Shënim i ri në Ditar
@@ -1452,11 +1464,6 @@ sq:
       spam score: 'Rezultati me Spam:'
       description: Përshkrimi
       user location: Vendi i përdoruesit
-      no friends: Akoma nuk ke shtuar ndonjë mik.
-      km away: '%{count}km larg'
-      m away: '%{count}m larg'
-      nearby users: Përdoruesit e tjerë aty pranë
-      no nearby users: Nuk ka përdorues tjerë aty pranë, të cilët pranojnë të hartografojnë.
       role:
         administrator: Ky përdorues është një administrator
         moderator: Ky përdorues është një moderator
@@ -1477,10 +1484,6 @@ sq:
       delete_user: fshi këtë përdorues
       confirm: Konfirmo
       report: Raporto ķëtë përdorues
-    popup:
-      your location: Vendndodhja e jote
-      nearby mapper: Hartuesi aty pranë
-      friend: Mik
     account:
       title: Redakto llogarinë
       my settings: Preferencat e mia
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 2239e88db..9ee920c02 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -196,6 +196,22 @@ sr-Latn:
       title_nearby: Izmene od okolnih korisnika
     timeout:
       sorry: Žao nam je, ali spisak izmena koji ste zahtevali je predugačak.
+  dashboards:
+    contact:
+      km away: udaljeno %{count} km
+      m away: udaljeno %{count} m
+    popup:
+      your location: Vaša lokacija
+      nearby mapper: Obližnji kartograf
+      friend: Prijatelj
+    show:
+      no friends: Niste dodali nijednog prijatelja.
+      nearby users: 'Ostali obližnji korisnici:'
+      no nearby users: Još uvek nema obližnjih korisnika koji mapiraju.
+      friends_changesets: Sve izmene prijatelja
+      friends_diaries: Pregled svih zapisa u dnevniku prijatelja
+      nearby_changesets: Pregled svih izmena okolnih korisnika
+      nearby_diaries: Pregled svih zapisa u dnevniku okolnih korisnika
   diary_entries:
     new:
       title: Novi unos u dnevniku
@@ -1342,11 +1358,6 @@ sr-Latn:
       spam score: 'Ocena spama:'
       description: Opis
       user location: Boravište korisnika
-      no friends: Niste dodali nijednog prijatelja.
-      km away: udaljeno %{count} km
-      m away: udaljeno %{count} m
-      nearby users: 'Ostali obližnji korisnici:'
-      no nearby users: Još uvek nema obližnjih korisnika koji mapiraju.
       role:
         administrator: Ovaj korisnik je administrator
         moderator: Ovaj korisnik je urednik
@@ -1367,14 +1378,6 @@ sr-Latn:
       unhide_user: otkrij ovog korisnika
       delete_user: obriši ovog korisnika
       confirm: Potvrdi
-      friends_changesets: Sve izmene prijatelja
-      friends_diaries: Pregled svih zapisa u dnevniku prijatelja
-      nearby_changesets: Pregled svih izmena okolnih korisnika
-      nearby_diaries: Pregled svih zapisa u dnevniku okolnih korisnika
-    popup:
-      your location: Vaša lokacija
-      nearby mapper: Obližnji kartograf
-      friend: Prijatelj
     account:
       title: Uredi nalog
       my settings: Postavke
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6eec7481c..9d7c24b65 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -371,6 +371,23 @@ sr:
     timeout:
       sorry: Преузимање списка коментара за скупове промена који сте тражили трајало
         је предуго.
+  dashboards:
+    contact:
+      km away: удаљено %{count} км
+      m away: удаљено %{count} м
+    popup:
+      your location: Ваша локација
+      nearby mapper: Оближњи картограф
+      friend: Пријатељ
+    show:
+      my friends: Моји пријатељи
+      no friends: Нисте додали ниједног пријатеља.
+      nearby users: 'Остали оближњи корисници:'
+      no nearby users: Још увек нема оближњих корисника који мапирају.
+      friends_changesets: Спискови промена пријатеља
+      friends_diaries: Дневник пријатеља
+      nearby_changesets: Спискови промена корисника у околини
+      nearby_diaries: Дневници корисника у околини
   diary_entries:
     new:
       title: Нови унос у дневнику
@@ -2163,12 +2180,6 @@ sr:
       spam score: 'Оцена спама:'
       description: Опис
       user location: Боравиште корисника
-      my friends: Моји пријатељи
-      no friends: Нисте додали ниједног пријатеља.
-      km away: удаљено %{count} км
-      m away: удаљено %{count} м
-      nearby users: 'Остали оближњи корисници:'
-      no nearby users: Још увек нема оближњих корисника који мапирају.
       role:
         administrator: Овај корисник је администратор
         moderator: Овај корисник је уредник
@@ -2189,15 +2200,7 @@ sr:
       unhide_user: Откриј корисника
       delete_user: Избриши корисника
       confirm: Потврди
-      friends_changesets: Спискови промена пријатеља
-      friends_diaries: Дневник пријатеља
-      nearby_changesets: Спискови промена корисника у околини
-      nearby_diaries: Дневници корисника у околини
       report: Пријави овог корисника
-    popup:
-      your location: Ваша локација
-      nearby mapper: Оближњи картограф
-      friend: Пријатељ
     account:
       title: Уреди налог
       my settings: Поставке
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 199b810ed..c60f375a5 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -470,6 +470,24 @@ sv:
     timeout:
       sorry: Tyvärr, listan med ändringssetskommentar du begärde kunde inte hämtas
         då begäran tog för lång tid.
+  dashboards:
+    contact:
+      km away: '%{count}km bort'
+      m away: '%{count}m bort'
+    popup:
+      your location: Din position
+      nearby mapper: Användare i närheten
+      friend: Vän
+    show:
+      my friends: Mina vänner
+      no friends: Du har inte lagt till några vänner ännu.
+      nearby users: Andra användare nära dig
+      no nearby users: Det är ännu inga andra användare som uppgett att de kartlägger
+        nära dig.
+      friends_changesets: vänners ändringsset
+      friends_diaries: vänners dagboksinlägg
+      nearby_changesets: närbelägna användares ändringsset
+      nearby_diaries: närbelägna användares dagboksinlägg
   diary_entries:
     new:
       title: Nytt dagboksinlägg
@@ -1392,8 +1410,9 @@ sv:
     intro_text: OpenStreetMap är en karta över världen, skapad av människor som du
       och fri att använda under en öppen licens.
     intro_2_create_account: Skapa ett användarkonto
-    hosting_partners_html: Drivs via %{ucl}, %{bytemark} och andra %{partners}.
+    hosting_partners_html: Drivs via %{ucl}, %{fastly}, %{bytemark} och andra %{partners}.
     partners_ucl: University College London
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     tou: Användarvillkor
@@ -2499,13 +2518,6 @@ sv:
       spam score: 'Spam-poäng:'
       description: Beskrivning
       user location: Användarposition
-      my friends: Mina vänner
-      no friends: Du har inte lagt till några vänner ännu.
-      km away: '%{count}km bort'
-      m away: '%{count}m bort'
-      nearby users: Andra användare nära dig
-      no nearby users: Det är ännu inga andra användare som uppgett att de kartlägger
-        nära dig.
       role:
         administrator: Den här användaren är en administratör
         moderator: Den här användaren är en moderator
@@ -2526,15 +2538,7 @@ sv:
       unhide_user: Sluta dölja användare
       delete_user: Radera denna användare
       confirm: Bekräfta
-      friends_changesets: vänners ändringsset
-      friends_diaries: vänners dagboksinlägg
-      nearby_changesets: närbelägna användares ändringsset
-      nearby_diaries: närbelägna användares dagboksinlägg
       report: Rapportera denna användare
-    popup:
-      your location: Din position
-      nearby mapper: Användare i närheten
-      friend: Vän
     account:
       title: Redigera konto
       my settings: Mina inställningar
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index a8e354142..4362d0200 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -237,6 +237,17 @@ ta:
     index:
       title: மாற்றங்கள்
       load_more: மேலும் படிக்க
+  dashboards:
+    contact:
+      km away: '%{count}கிமீ தாண்டி'
+      m away: '%{count}மீ தாண்டி'
+    popup:
+      your location: உங்களது இருப்பிடம்
+      friend: நண்பர்
+    show:
+      my friends: எனது நண்பர்கள்
+      no friends: நீங்கள் இதுவரை எந்த நண்பர்களையும் சேர்க்கவில்லை
+      nearby users: மற்ற அருகிலுள்ள பயனர்கள்
   diary_entries:
     new:
       title: புதிய டைரி உள்ளீடு
@@ -778,11 +789,6 @@ ta:
       status: 'நிலை:'
       description: விளக்கம்
       user location: பயனர் அமைவிடம்
-      my friends: எனது நண்பர்கள்
-      no friends: நீங்கள் இதுவரை எந்த நண்பர்களையும் சேர்க்கவில்லை
-      km away: '%{count}கிமீ தாண்டி'
-      m away: '%{count}மீ தாண்டி'
-      nearby users: மற்ற அருகிலுள்ள பயனர்கள்
       role:
         administrator: இந்த பயனர் ஒரு நிர்வாகி
         moderator: இந்த பயனர் ஒரு நடுவர்
@@ -803,9 +809,6 @@ ta:
       unhide_user: இந்த பயனரை மறைத்ததை நீக்கு
       delete_user: இப்பயனரை நீக்கவும்
       confirm: உறுதிசெய்
-    popup:
-      your location: உங்களது இருப்பிடம்
-      friend: நண்பர்
     account:
       title: கணக்கை திருத்து
       my settings: என் அமைப்புகள்
diff --git a/config/locales/te.yml b/config/locales/te.yml
index f86b105eb..4de30371a 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -180,6 +180,15 @@ te:
       title: మార్పుల సమితులు
       title_user: '%{user} చేసిన మార్పులసమితులు'
       load_more: మరిన్ని చూపించు
+  dashboards:
+    contact:
+      km away: '%{count}కిమీ దూరంలో'
+      m away: '%{count}మీ దూరంలో'
+    popup:
+      your location: మీ ప్రాంతం
+    show:
+      no friends: మీరు ఇంకా స్నేహితులెవరినీ చేర్చలేదు.
+      nearby users: 'దగ్గరలోని వాడుకరులు:'
   diary_entries:
     new:
       title: కొత్త దినచర్య పద్దు
@@ -759,18 +768,12 @@ te:
       status: 'స్థితి:'
       description: వివరణ
       user location: వాడుకరి ప్రాంతం
-      no friends: మీరు ఇంకా స్నేహితులెవరినీ చేర్చలేదు.
-      km away: '%{count}కిమీ దూరంలో'
-      m away: '%{count}మీ దూరంలో'
-      nearby users: 'దగ్గరలోని వాడుకరులు:'
       role:
         administrator: ఈ వాడుకరి ఒక నిర్వాహకులు
       comments: వ్యాఖ్యలు
       create_block: ఈ వాడుకరిని నిరోధించు
       delete_user: ఈ వాడుకరిని తొలగించు
       confirm: నిర్ధారించు
-    popup:
-      your location: మీ ప్రాంతం
     account:
       title: ఖాతా మార్పు
       my settings: నా అమరికలు
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2c0f788e8..f5326403b 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -398,6 +398,21 @@ th:
       title_particular: 'การอภิปรายชุดการเปลี่ยนแปลง OpenStreetMap #%{changeset_id}'
     timeout:
       sorry: ขออภัย รายการชุดการเปลี่ยนแปลงที่ท่านร้องขอใช้เวลานานเกินสมควรในการสืบค้น
+  dashboards:
+    contact:
+      km away: ห่างออกไป %{count}km
+      m away: ห่างออกไป %{count}m
+    popup:
+      your location: ตำแหน่งของคุณ
+      nearby mapper: คนทำแผนที่ ที่อยู่ใกล้เคียง
+      friend: เพื่อน
+    show:
+      my friends: รายการเพื่อน
+      no friends: ท่านยังไม่ได้เพิ่มเพื่อนใด ๆ
+      nearby users: ผู้ใช้ท่านอื่นที่ใกล้เคียง
+      no nearby users: ไม่ได้มีผู้ใดแสดงตัวว่าทำแผนที่อยู่ใกล้เคียง
+      friends_diaries: บันทึกของเพื่อน
+      nearby_diaries: บันทึกของผู้ใช้ข้างเคียง
   diary_entries:
     new:
       title: สร้างรายการบันทึกใหม่
@@ -2067,12 +2082,6 @@ th:
       spam score: 'คะแนนสแปม:'
       description: คำอธิบาย
       user location: ตำแหน่งผู้ใช้
-      my friends: รายการเพื่อน
-      no friends: ท่านยังไม่ได้เพิ่มเพื่อนใด ๆ
-      km away: ห่างออกไป %{count}km
-      m away: ห่างออกไป %{count}m
-      nearby users: ผู้ใช้ท่านอื่นที่ใกล้เคียง
-      no nearby users: ไม่ได้มีผู้ใดแสดงตัวว่าทำแผนที่อยู่ใกล้เคียง
       role:
         administrator: คนนี้เป็นผู้ดูแลระบบ
         moderator: ผู้ใช้นี้เป็นผู้ดูแล
@@ -2088,13 +2097,7 @@ th:
       activate_user: เปิดใช้งานผู้ใช้นี้
       deactivate_user: ปิดใช้งานผู้ใช้นี้
       confirm: ยืนยัน
-      friends_diaries: บันทึกของเพื่อน
-      nearby_diaries: บันทึกของผู้ใช้ข้างเคียง
       report: แจ้งปัญหาเกี่ยวกับผู้ใช้คนนี้
-    popup:
-      your location: ตำแหน่งของคุณ
-      nearby mapper: คนทำแผนที่ ที่อยู่ใกล้เคียง
-      friend: เพื่อน
     account:
       title: แก้ไขบัญชี
       my settings: การตั้งค่าของฉัน
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 7b1a3dc80..3b86fd4ef 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -295,6 +295,23 @@ tl:
   changeset_comments:
     comment:
       comment: 'Bagong puna sa pangkat ng pagbabago #%{changeset_id} ni %{author}'
+  dashboards:
+    contact:
+      km away: '%{count}km ang layo'
+      m away: '%{count}m ang layo'
+    popup:
+      your location: Kinalalagyan mo
+      nearby mapper: Malapit na tagapagmapa
+      friend: Kaibigan
+    show:
+      my friends: Aking mga kaibigan
+      no friends: Hindi ka pa nagdaragdag ng sinumang mga kaibigan.
+      nearby users: Iba pang kalapit na mga tagagamit
+      no nearby users: Wala pang ibang mga tagagamit na umaamin sa pagmamapa ng malapitan.
+      friends_changesets: mga pagbabago ng mga kaibigan
+      friends_diaries: mga lahok ng mga kaibigan
+      nearby_changesets: mga pagtatakda ng pagbabago mula sa kalapit na mga tagagamit
+      nearby_diaries: mga inilahok sa talaarawan ng kalapit na mga tagagamit
   diary_entries:
     new:
       title: Bagong Pagpapasok sa Talaarawan
@@ -1748,12 +1765,6 @@ tl:
       spam score: 'Puntos ng Basurang Liham:'
       description: Paglalarawan
       user location: Kinalalagyan ng tagagamit
-      my friends: Aking mga kaibigan
-      no friends: Hindi ka pa nagdaragdag ng sinumang mga kaibigan.
-      km away: '%{count}km ang layo'
-      m away: '%{count}m ang layo'
-      nearby users: Iba pang kalapit na mga tagagamit
-      no nearby users: Wala pang ibang mga tagagamit na umaamin sa pagmamapa ng malapitan.
       role:
         administrator: Isang tagapangasiwa ang tagagamit na ito
         moderator: Isang tagapamagitan ang tagagamit na ito
@@ -1774,14 +1785,6 @@ tl:
       unhide_user: Huwag itago ang Tagagamit na ito
       delete_user: Burahin ang Tagagamit na ito
       confirm: Tiyakin
-      friends_changesets: mga pagbabago ng mga kaibigan
-      friends_diaries: mga lahok ng mga kaibigan
-      nearby_changesets: mga pagtatakda ng pagbabago mula sa kalapit na mga tagagamit
-      nearby_diaries: mga inilahok sa talaarawan ng kalapit na mga tagagamit
-    popup:
-      your location: Kinalalagyan mo
-      nearby mapper: Malapit na tagapagmapa
-      friend: Kaibigan
     account:
       title: Baguhin ang akawnt
       my settings: Mga pagtatakda ko
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7677b0a56..817fc82ff 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -485,6 +485,27 @@ tr:
     timeout:
       sorry: Üzgünüz, talep ettiğiniz değişiklik kaydı yorumlarının alınması çok uzun
         sürdü.
+  dashboards:
+    contact:
+      km away: '%{count} km uzak'
+      m away: '%{count} metre yakın'
+    popup:
+      your location: Konumum
+      nearby mapper: Komşu haritacı
+      friend: Arkadaş
+    show:
+      title: Gösterge Panelim
+      no_home_location_html: '%{edit_profile_link} ve yakındaki kullanıcıları görmek
+        için ev konumunuzu ayarlayın.'
+      edit_your_profile: Profilinizi düzenleyin
+      my friends: Arkadaşlarım
+      no friends: Henüz herhangi bir arkadaş eklemediniz.
+      nearby users: Yakın çevrede bulunan kullanıcılar
+      no nearby users: Yakın çevrede herhangi başka kullanıcı henüz yok.
+      friends_changesets: arkadaşların değişiklik kayıtları
+      friends_diaries: arkadaşların günlük girdileri
+      nearby_changesets: yakınlarındaki kullanıcıların bütün değişiklik kayıtları
+      nearby_diaries: yakınlarındaki kullanıcıların günlük girdileri
   diary_entries:
     new:
       title: Yeni Günlük Girdisi
@@ -822,6 +843,7 @@ tr:
           window_construction: Pencere Üreticisi
           winery: Şaraphane
           "yes": El Sanatları Mağazası
+        crossing: Geçit
         emergency:
           access_point: Erişim Noktası
           ambulance_station: Ambulans Ä°stasyonu
@@ -1077,6 +1099,7 @@ tr:
           hill: Tepe
           hot_spring: Kaplıca
           island: Ada
+          isthmus: Kıstak
           land: Kara
           marsh: Bataklık
           moor: Bataklık
@@ -1091,10 +1114,13 @@ tr:
           sand: Kum
           scree: Kayşat
           scrub: Çalılık
+          shingle: Çakıl tabanlı sahil plaj
           spring: Ä°lkbahar
           stone: Taş
           strait: Boğaz
           tree: Ağaç
+          tree_row: Ağaç Sırası
+          tundra: Tundra
           valley: Dere/vadi
           volcano: Yanardağ
           water: Su
@@ -1493,9 +1519,10 @@ tr:
     intro_text: OpenStreetMap; senin gibi kişiler tarafından oluşturulan, kullanımı
       serbest ve açık lisans altında olan bir dünya haritasıdır.
     intro_2_create_account: hesap oluşturunuz
-    hosting_partners_html: Barındırma hizmeti; %{ucl}, %{bytemark} ve diğer %{partners}
-      tarafından desteklenmektedir.
+    hosting_partners_html: Barındırma hizmeti; %{ucl}, %{fastly}, %{bytemark} ve diğer
+      %{partners} tarafından desteklenmektedir.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: ortaklar
     tou: Kullanım Şartları
@@ -2006,10 +2033,11 @@ tr:
           <strong>Avusturya</strong>: <a href="https://data.wien.gv.at/">Stadt Wien</a> (<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> lisansı altında),
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> ve
           Land Tirol'dan (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">değişiklikleriyle CC BY AT lisansı altında</a>) veriler içermektedir.
-        contributors_au_html: '<strong>Avustralya</strong>: <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a> kapsamında Commonwealth of Australia tarafından lisanslanan <a
-          href="https://creativecommons.org/licenses/by/4.0/">PSMA Australia Limited</a>''ten
-          alınan verileri içerir.'
+        contributors_au_html: |-
+          <strong>Avustralya</strong>: İdari Sınırlar kullanılarak birleştirilir veya geliştirilir &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Avustralya</a>,
+          Avustralya Topluluğu tarafından
+          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Atıf 4.0 Uluslararası lisansı (CC BY 4.0)</a> ile lisanslanmıştır.
         contributors_ca_html: "<strong>Kanada</strong>: GeoBase&reg;, GeoGratis \n(&copy;
           Department of Natural\nResources Canada), CanVec (&copy; Department of Natural\nResources
           Canada) ve StatCan'den (Geography Division,\nStatistics Canada) veriler
@@ -2668,6 +2696,7 @@ tr:
       my settings: Ayarlarım
       my comments: Yorumlarım
       my_preferences: Tercihlerim
+      my_dashboard: Gösterge Panelim
       blocks on me: Engellendiklerim
       blocks by me: Engellediklerim
       edit_profile: Profili Düzenle
@@ -2689,15 +2718,6 @@ tr:
       spam score: 'Spam puanı:'
       description: Açıklama
       user location: Kullanıcının konumu
-      no_home_location_html: '%{edit_profile_link} ve yakındaki kullanıcıları görmek
-        için ev konumunuzu ayarlayın.'
-      edit_your_profile: Profilinizi düzenleyin
-      my friends: Arkadaşlarım
-      no friends: Henüz herhangi bir arkadaş eklemediniz.
-      km away: '%{count} km uzak'
-      m away: '%{count} metre yakın'
-      nearby users: Yakın çevrede bulunan kullanıcılar
-      no nearby users: Yakın çevrede herhangi başka kullanıcı henüz yok.
       role:
         administrator: Bu kullanıcı, bir yöneticidir.
         moderator: Bu kullanıcı, bir moderatördür.
@@ -2718,15 +2738,7 @@ tr:
       unhide_user: Bu Kullanıcıyı Göster
       delete_user: Bu Kullanıcıyı Sil
       confirm: Onayla
-      friends_changesets: arkadaşların değişiklik kayıtları
-      friends_diaries: arkadaşların günlük girdileri
-      nearby_changesets: yakınlarındaki kullanıcıların bütün değişiklik kayıtları
-      nearby_diaries: yakınlarındaki kullanıcıların günlük girdileri
       report: Bu kullanıcıyı rapor et
-    popup:
-      your location: Konumum
-      nearby mapper: Komşu haritacı
-      friend: Arkadaş
     account:
       title: Hesabı düzenle
       my settings: Ayarlarım
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 3af5ba1d5..a4bdb86ee 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -201,6 +201,11 @@ tt:
     index:
       title: Үзгәрешләр пакетлары
       load_more: Күбрәк төяү
+  dashboards:
+    popup:
+      friend: Дус
+    show:
+      my friends: Дусларым
   diary_entries:
     form:
       location: 'Урын:'
@@ -707,10 +712,7 @@ tt:
       latest edit: 'Соңгы төзәтмә (%{ago}):'
       email address: 'Электрон почта адресы:'
       status: 'Халәт:'
-      my friends: Дусларым
       confirm: Раслау
-    popup:
-      friend: Дус
     account:
       public editing:
         enabled link text: бу нәрсә?
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 2dd513994..485abf6e4 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -508,6 +508,28 @@ uk:
     timeout:
       sorry: На жаль, перелік наборів змін, який ви запросили, потребує забагато часу
         для завантаження.
+  dashboards:
+    contact:
+      km away: '%{count} км від вас'
+      m away: '%{count} м від вас'
+    popup:
+      your location: Ваше місце розташування
+      nearby mapper: Користувач поруч з вами
+      friend: Друг
+    show:
+      title: Моя панель
+      no_home_location_html: '%{edit_profile_link} і встановіть своє місце розташування,
+        щоб бачити користувачів поблизу.'
+      edit_your_profile: Редагувати ваш профіль
+      my friends: Друзі
+      no friends: Ви не додали ще жодного друга.
+      nearby users: Інші користувачі поруч
+      no nearby users: Поблизу поки немає користувачів, які займаються складанням
+        мапи.
+      friends_changesets: набори змін друзів
+      friends_diaries: записи в щоденниках друзів
+      nearby_changesets: набори змін користувачів, що знаходяться поруч з вами
+      nearby_diaries: записи в щоденниках користувачів, що знаходяться поруч з вами
   diary_entries:
     new:
       title: Створити новий запис у щоденнику
@@ -842,6 +864,7 @@ uk:
           window_construction: Майстер віконних конструкцій
           winery: Виноробня
           "yes": Товари для рукоділля
+        crossing: Переправа
         emergency:
           access_point: Точка доступу
           ambulance_station: Станція швидкої медичної допомоги
@@ -1097,6 +1120,7 @@ uk:
           hill: Пагорб
           hot_spring: Гаряче джерело
           island: Острів
+          isthmus: Перешийок
           land: Суша
           marsh: Болото
           moor: Якірна стоянка
@@ -1111,10 +1135,13 @@ uk:
           sand: Пісок
           scree: Щебінь
           scrub: Чагарник
+          shingle: Черепиця
           spring: Джерело
           stone: Камінь
           strait: Протока
           tree: Дерево
+          tree_row: Дерево ряду
+          tundra: Тундра
           valley: Долина
           volcano: Вулкан
           water: Вода
@@ -1518,8 +1545,10 @@ uk:
     intro_text: OpenStreetMap — мапа світу, створена такими ж людьми, як і ви, для
       вільного використання під відкритою ліцензією.
     intro_2_create_account: Створіть обліковий запис
-    hosting_partners_html: Хостинг підтримується %{ucl}, %{bytemark} та іншими %{partners}.
+    hosting_partners_html: Хостинг підтримується %{ucl}, %{fastly}, %{bytemark} та
+      іншими %{partners}.
     partners_ucl: UCL
+    partners_fastly: Швидко
     partners_bytemark: Bytemark Hosting
     partners_partners: партнерами
     tou: Умови використання
@@ -2020,10 +2049,9 @@ uk:
              <a href="https://data.wien.gv.at/">Stadt Wien</a> (на умовах ліцензії
              <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> та Земля Тіроль (на умовах <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT з виправленнями</a>).
         contributors_au_html: |-
-          <strong>Австралія</strong>: Містить дані, отримані з
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
-          за ліцензією Австралійської Співдружності за
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
+          <strong>Австралія</strong>: Включено або розроблено за допомогою адміністративних кордонів &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>, ліцензованих Австралійською Співдружністю за міжнародною
+          <a href="https://creativecommons.org/licenses/by/4.0/">ліцензією Creative Commons Attribution 4.0 (CC BY 4.0)</a>.
         contributors_ca_html: '<strong>Канада</strong>: дані від GeoBase&reg;, GeoGratis
           (&copy; Департамент природних ресурсів Канади), CanVec (&copy; Департамент
           природних ресурсів Канади), та StatCan (Відділ Географії, Статистичне відомство
@@ -2682,6 +2710,7 @@ uk:
       my settings: Налаштування
       my comments: Мої коментарі
       my_preferences: Налаштування
+      my_dashboard: Моя панель
       blocks on me: Мої блокування
       blocks by me: Заблоковано мною
       edit_profile: Редагування профілю
@@ -2703,16 +2732,6 @@ uk:
       spam score: 'Оцінка Спаму:'
       description: Опис
       user location: Місце знаходження користувача
-      no_home_location_html: '%{edit_profile_link} і встановіть своє місце розташування,
-        щоб бачити користувачів поблизу.'
-      edit_your_profile: Редагувати ваш профіль
-      my friends: Друзі
-      no friends: Ви не додали ще жодного друга.
-      km away: '%{count} км від вас'
-      m away: '%{count} м від вас'
-      nearby users: Інші користувачі поруч
-      no nearby users: Поблизу поки немає користувачів, які займаються складанням
-        мапи.
       role:
         administrator: Цей користувач є адміністратором
         moderator: Цей користувач є модератором
@@ -2733,15 +2752,7 @@ uk:
       unhide_user: Показати цього користувача
       delete_user: Вилучити цього користувача
       confirm: Підтвердити
-      friends_changesets: набори змін друзів
-      friends_diaries: записи в щоденниках друзів
-      nearby_changesets: набори змін користувачів, що знаходяться поруч з вами
-      nearby_diaries: записи в щоденниках користувачів, що знаходяться поруч з вами
       report: Поскаржитись на цього користувача
-    popup:
-      your location: Ваше місце розташування
-      nearby mapper: Користувач поруч з вами
-      friend: Друг
     account:
       title: Редагувати обліковий запис
       my settings: Налаштування
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index e7b13d6f3..48cfc6747 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -441,6 +441,23 @@ vi:
     timeout:
       sorry: Rất tiếc, việc lấy danh sách lời tóm lược bộ thay đổi tốn quá nhiều thì
         giờ.
+  dashboards:
+    contact:
+      km away: cách %{count} km
+      m away: cách %{count} m
+    popup:
+      your location: Vị trí của bạn
+      nearby mapper: Người vẽ bản đồ ở gần
+      friend: Người bạn
+    show:
+      my friends: Bạn bè của tôi
+      no friends: Bạn chưa thêm bạn bè.
+      nearby users: Người dùng khác ở gần
+      no nearby users: Không có người dùng nào nhận rằng họ ở gần.
+      friends_changesets: bộ thay đổi của bạn bè
+      friends_diaries: mục nhật ký của bạn bè
+      nearby_changesets: bộ thay đổi của người dùng ở gần
+      nearby_diaries: mục nhật ký của người dùng ở gần
   diary_entries:
     new:
       title: Mục nhật ký mới
@@ -2505,12 +2522,6 @@ vi:
       spam score: 'Điểm số Spam:'
       description: Miêu tả
       user location: Vị trí của người dùng
-      my friends: Bạn bè của tôi
-      no friends: Bạn chưa thêm bạn bè.
-      km away: cách %{count} km
-      m away: cách %{count} m
-      nearby users: Người dùng khác ở gần
-      no nearby users: Không có người dùng nào nhận rằng họ ở gần.
       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
@@ -2531,15 +2542,7 @@ vi:
       unhide_user: Hiện Tài khoản Này
       delete_user: Xóa Tài khoản Này
       confirm: Xác nhận
-      friends_changesets: bộ thay đổi của bạn bè
-      friends_diaries: mục nhật ký của bạn bè
-      nearby_changesets: bộ thay đổi của người dùng ở gần
-      nearby_diaries: mục nhật ký của người dùng ở gần
       report: Báo cáo Người dùng này
-    popup:
-      your location: Vị trí của bạn
-      nearby mapper: Người vẽ bản đồ ở gần
-      friend: Người bạn
     account:
       title: Chỉnh sửa tài khoản
       my settings: Tùy chọn
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 4c17e8d87..5a093b378 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -48,6 +48,7 @@
 # Author: SkyEye FAST
 # Author: StephDC
 # Author: TianyinLee
+# Author: TsuyaMarisa
 # Author: Vikarna
 # Author: VulpesVulpes825
 # Author: WQL
@@ -485,6 +486,26 @@ zh-CN:
       title_particular: 'OpenStreetMap 变更集 #%{changeset_id} 讨论'
     timeout:
       sorry: 抱歉，您所请求的变更集评论时间区间过长。
+  dashboards:
+    contact:
+      km away: '%{count}千米外'
+      m away: '%{count}米外'
+    popup:
+      your location: 您的位置
+      nearby mapper: 附近绘图者
+      friend: 朋友
+    show:
+      title: 我的综合面板
+      no_home_location_html: '%{edit_profile_link}并设定你的家庭地址来查看附近的用户。'
+      edit_your_profile: 编辑你的档案
+      my friends: 我的朋友
+      no friends: 您还没有添加任何好友。
+      nearby users: 其他附近的用户
+      no nearby users: 附近没有在进行制图的用户。
+      friends_changesets: 朋友的变更集
+      friends_diaries: 朋友的日记文章
+      nearby_changesets: 附近用户的变更集
+      nearby_diaries: 附近用户的日记文章
   diary_entries:
     new:
       title: 新日记文章
@@ -521,7 +542,7 @@ zh-CN:
       posted_by_html: '%{link_user}在%{created}用%{language_link}发布'
       updated_at_html: 最后一次更新于%{updated}。
       comment_link: 评论该文章
-      reply_link: 向作者发送信息
+      reply_link: 向作者发送消息
       comment_count:
         zero: 没有评论
         one: '%{count} 个评论'
@@ -677,6 +698,7 @@ zh-CN:
           loading_dock: 装卸码头
           love_hotel: 爱情旅馆
           marketplace: 商场
+          mobile_money_agent: 移动货币代理
           monastery: 修道院
           money_transfer: 汇款处
           motorcycle_parking: 摩托车停车场
@@ -1070,6 +1092,7 @@ zh-CN:
           hill: 希尔地貌
           hot_spring: 温泉
           island: 岛
+          isthmus: 地峡
           land: 陆地
           marsh: 沼泽
           moor: 停泊区
@@ -1088,6 +1111,8 @@ zh-CN:
           stone: 石
           strait: 海峡
           tree: 树
+          tree_row: 树列
+          tundra: 苔原
           valley: 山谷
           volcano: 火山
           water: æ°´
@@ -1486,6 +1511,7 @@ zh-CN:
     intro_2_create_account: 创建用户账户
     hosting_partners_html: 主机由%{ucl}、%{fastly}、%{bytemark}，以及其他%{partners}所支持。
     partners_ucl: 伦敦大学学院
+    partners_fastly: 快速的
     partners_bytemark: Bytemark主机
     partners_partners: 合作伙伴
     tou: 使用条款
@@ -1516,7 +1542,7 @@ zh-CN:
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
       hi: 您好，%{to_user}：
-      header: '%{from_user} 已经通过 OpenStreetMap 给您发送了一条主题为 %{subject} 的信息：'
+      header: '%{from_user} 已经通过 OpenStreetMap 给您发送了一条主题为 %{subject} 的私信：'
       header_html: '%{from_user} 已经通过 OpenStreetMap 给您发送了一条主题为 %{subject} 的信息：'
       footer: 您也可以在%{readurl}阅读此消息并在%{replyurl}向作者发送信息
       footer_html: 您还可以在%{readurl}阅读这条信息并在%{replyurl}向作者发送信息
@@ -1595,6 +1621,7 @@ zh-CN:
         commented_changeset: '%{commenter}在%{time}对你监视的%{changeset_author}创建的变更集留下评论'
         commented_changeset_html: '%{commenter}于%{time}在您监视的由%{changeset_author}创建的一个地图变更集中留下评论'
         partial_changeset_with_comment: 带评论“%{changeset_comment}”
+        partial_changeset_with_comment_html: 带有评论“%{changeset_comment}”
         partial_changeset_without_comment: 没有评论
       details: 更多关于变更集的详细信息可以在 %{url} 找到。
       details_html: 更多有关变更集的详细信息，请参见 %{url}。
@@ -1642,13 +1669,13 @@ zh-CN:
       reply_button: 回复
       destroy_button: 删除
     new:
-      title: 发信息
+      title: 发消息
       send_message_to_html: 发送新信息给%{name}
       subject: 主题
       body: 正文
       back_to_inbox: 返回收件箱
     create:
-      message_sent: 信息已发出
+      message_sent: 消息已发出
       limit_exceeded: 您刚发送了很多消息。在尝试发送其他消息之前，请稍等一会儿。
     no_such_message:
       title: 无此消息
@@ -2423,15 +2450,16 @@ zh-CN:
       my edits: 我的编辑
       my traces: 我的轨迹
       my notes: 我的注记
-      my messages: 我的信息
+      my messages: 我的消息
       my profile: 我的资料
       my settings: 我的设置
       my comments: 我的评论
       my_preferences: 我的偏好
+      my_dashboard: 我的综合面板
       blocks on me: 我的封禁
       blocks by me: 被我封禁
       edit_profile: 编辑个人资料
-      send message: 发送信息
+      send message: 发送消息
       diary: 日记
       edits: 编辑
       traces: 轨迹
@@ -2449,14 +2477,6 @@ zh-CN:
       spam score: 垃圾邮件评分：
       description: 描述
       user location: 用户位置
-      no_home_location_html: '%{edit_profile_link}并设定你的家庭地址来查看附近的用户。'
-      edit_your_profile: 编辑你的档案
-      my friends: 我的朋友
-      no friends: 您还没有添加任何好友。
-      km away: '%{count}千米外'
-      m away: '%{count}米外'
-      nearby users: 其他附近的用户
-      no nearby users: 附近没有在进行制图的用户。
       role:
         administrator: 此用户是管理员
         moderator: 此用户是版主
@@ -2477,15 +2497,7 @@ zh-CN:
       unhide_user: 取消隐藏此用户
       delete_user: 删除此用户
       confirm: 确认
-      friends_changesets: 朋友的变更集
-      friends_diaries: 朋友的日记文章
-      nearby_changesets: 附近用户的变更集
-      nearby_diaries: 附近用户的日记文章
       report: 举报此用户
-    popup:
-      your location: 您的位置
-      nearby mapper: 附近绘图者
-      friend: 朋友
     account:
       title: 编辑账户
       my settings: 我的设置
@@ -2694,10 +2706,10 @@ zh-CN:
       short_link: 短链接
       geo_uri: Geo URI
       embed: HTML
-      custom_dimensions: 设定自定义尺寸
+      custom_dimensions: 设定自定义区域
       format: 格式：
       scale: 比例：
-      image_dimensions: 图像将显示标准层为%{width} x %{height}
+      image_dimensions: 将以%{width} x %{height}的尺寸按标准图层输出图像
       download: 下载
       short_url: 短URL
       include_marker: 包含标记
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 8478c9b41..bfda4b5a8 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -456,6 +456,25 @@ zh-TW:
       title_particular: OpenStreetMap 變更集 %{changeset_id} 討論
     timeout:
       sorry: 很抱歉，您請求的變更集評論過長無法讀取
+  dashboards:
+    contact:
+      km away: '%{count} 公里遠'
+      m away: '%{count} 公尺遠'
+    popup:
+      your location: 您的位置
+      nearby mapper: 附近的製圖者
+      friend: 好友
+    show:
+      no_home_location_html: '%{edit_profile_link}並編輯您的家位置，來查看附近的使用者。'
+      edit_your_profile: 編輯您的個人檔案
+      my friends: 我的好友
+      no friends: 您尚未加入任何好友。
+      nearby users: 其他附近的使用者
+      no nearby users: 附近沒有已加入製圖的使用者。
+      friends_changesets: 好友的變更集
+      friends_diaries: 好友的日記項目
+      nearby_changesets: 附近使用者的變更集
+      nearby_diaries: 附近使用者的日記項目
   diary_entries:
     new:
       title: 新日記項目
@@ -789,6 +808,7 @@ zh-TW:
           window_construction: 窗戶建設
           winery: 酒廠
           "yes": 工藝品店
+        crossing: 路口
         emergency:
           access_point: 進入點
           ambulance_station: 急救站
@@ -1044,6 +1064,7 @@ zh-TW:
           hill: 小山
           hot_spring: 溫泉
           island: 島嶼
+          isthmus: 地峽
           land: 陸地
           marsh: 河川濕地
           moor: 停泊處
@@ -1058,10 +1079,13 @@ zh-TW:
           sand: 沙地
           scree: 碎石堆
           scrub: 灌木
+          shingle: 礫石
           spring: 泉
           stone: 巨石
           strait: 海峡
           tree: 樹木
+          tree_row: 行列樹木
+          tundra: 苔原
           valley: 谷地
           volcano: 火山
           water: æ°´
@@ -1459,8 +1483,9 @@ zh-TW:
     intro_header: 歡迎來到 OpenStreetMap！
     intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。
     intro_2_create_account: 建立使用者帳號
-    hosting_partners_html: 主機由%{ucl}、%{bytemark}，和其他%{partners}所支援。
+    hosting_partners_html: 由%{ucl}、%{fastly}、%{bytemark}，和其他%{partners}支援託管。
     partners_ucl: 倫敦大學學院
+    partners_fastly: Fastly
     partners_bytemark: Bytemark 主機代管
     partners_partners: 合作夥伴
     tou: 使用條款
@@ -1872,8 +1897,8 @@ zh-TW:
           Vorarlberg</a>及 Land Tirol (修訂的<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
           AT</a>授權) 的資料。
         contributors_au_html: |-
-          <strong>澳大利亞</strong>：包含來自
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA 澳大利亞有限公司</a>的資料來源，並依據<a href="https://creativecommons.org/licenses/by/4.0/deed.zh_TW">姓名標示 4.0 國際</a>澳大利亞聯邦條款授權。
+          <strong>澳大利亞</strong>：使用行政區劃納入或開發&copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape 澳大利亞</a>是依據<a href="https://creativecommons.org/licenses/by/4.0/deed.zh_TW">姓名標示 4.0 國際（CC BY 4.0）</a>澳大利亞聯邦條款授權。
         contributors_ca_html: |-
           <strong>加拿大</strong>：包含來自 GeoBase&reg;，GeoGratis (&copy; Department of Natural
           Resources Canada) ，CanVec (&copy; Department of Natural
@@ -2464,14 +2489,6 @@ zh-TW:
       spam score: 垃圾郵件分數：
       description: 說明
       user location: 使用者位置
-      no_home_location_html: '%{edit_profile_link}並編輯您的家位置，來查看附近的使用者。'
-      edit_your_profile: 編輯您的個人檔案
-      my friends: 我的好友
-      no friends: 您尚未加入任何好友。
-      km away: '%{count} 公里遠'
-      m away: '%{count} 公尺遠'
-      nearby users: 其他附近的使用者
-      no nearby users: 附近沒有已加入製圖的使用者。
       role:
         administrator: 這個使用者是一個管理員
         moderator: 這個使用者是一個仲裁員
@@ -2492,15 +2509,7 @@ zh-TW:
       unhide_user: 取消隱藏這位使用者
       delete_user: 刪除這位使用者
       confirm: 確認
-      friends_changesets: 好友的變更集
-      friends_diaries: 好友的日記項目
-      nearby_changesets: 附近使用者的變更集
-      nearby_diaries: 附近使用者的日記項目
       report: 回報此使用者
-    popup:
-      your location: 您的位置
-      nearby mapper: 附近的製圖者
-      friend: 好友
     account:
       title: 編輯帳號
       my settings: 我的設定值
diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml
index a30d03c8d..62458cf09 100644
--- a/config/locales/zh-hk.yml
+++ b/config/locales/zh-hk.yml
@@ -239,6 +239,10 @@ zh-hk:
       no_more_area: 此區域沒有更多變更集。
       no_more_user: 此用戶沒有更多變更集。
       load_more: 載入更多
+  dashboards:
+    show:
+      nearby users: 其他附近的用戶
+      no nearby users: 附近還沒有已加入製圖的用戶。
   diary_entries:
     form:
       location: 位置：
@@ -815,8 +819,6 @@ zh-hk:
     show:
       my settings: 我的設定
       user location: 用戶位置
-      nearby users: 其他附近的用戶
-      no nearby users: 附近還沒有已加入製圖的用戶。
       report: 舉報此用戶
     account:
       my settings: 我的設定