From: translatewiki.net <l10n-bot@translatewiki.net>
Date: Thu, 22 Jul 2021 11:10:55 +0000 (+0200)
Subject: Localisation updates from https://translatewiki.net.
X-Git-Tag: live~2055
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b5eda32c103148b729ac7143d724d1d2b6a296a7

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index bfae39508..e6e3f9326 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -718,7 +718,7 @@ af:
           sport: Sportklub
           "yes": Klub
         craft:
-          beekeper: Byeboer
+          beekeeper: Byeboer
           blacksmith: Smid
           brewery: Brouery
           carpenter: Skrynwerker
@@ -748,7 +748,7 @@ af:
           ambulance_station: Ambulansstasie
           assembly_point: Vergaderingspunt
           defibrillator: Defibrillator
-          fire_xtinguisher: Brandblusser
+          fire_extinguisher: Brandblusser
           fire_water_pond: Bluswaterdam
           landing_site: Noodlandingsarea
           life_ring: Reddingsboei
@@ -1508,6 +1508,15 @@ af:
       heading: Herstel wagwoord vir %{user}
       reset: Herstel wagwoord
       flash changed: U wagwoord is verander.
+  profiles:
+    edit:
+      image: 'Beeld:'
+      new image: Voeg 'n beeld by
+      keep image: Hou die huidige beeld
+      replace image: Vervang die huidige beeld
+      home location: 'Tuisligging:'
+      no home location: U het nog geen tuisligging ingelees nie.
+      update home location on click: Werk tuisligging by wanneer ek op die kaart klik?
   sessions:
     new:
       title: Meld aan
@@ -1911,13 +1920,6 @@ af:
         disabled link text: hoekom kan ek nie redigeer nie?
       contributor terms:
         link text: wat is dié?
-      image: 'Beeld:'
-      new image: Voeg 'n beeld by
-      keep image: Hou die huidige beeld
-      replace image: Vervang die huidige beeld
-      home location: 'Tuisligging:'
-      no home location: U het nog geen tuisligging ingelees nie.
-      update home location on click: Werk tuisligging by wanneer ek op die kaart klik?
       save changes button: Stoor Wysigings
       make edits public button: Stel al my redigerings openbaar
       return to profile: Terug na profiel
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 9851a1825..bb3687681 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -769,6 +769,17 @@ aln:
       reset: Ricakto Fjalëkalimin
       flash changed: Fjalëkalimi juaj u ndryshua.
       flash token bad: Sun e gjetëm qat token, kontrolloje URL?
+  profiles:
+    edit:
+      image: 'Imazhi:'
+      new image: Shto ni imazh
+      keep image: Maje imazhin e tanishëm
+      delete image: Heke imazhin e tanishëm
+      replace image: Ndryshoje imazhin e tanishëm
+      image size hint: (imazhet katrore s'paku me madhsi 100x100px doken ma mir)
+      home location: 'Veni juej:'
+      no home location: Ju se keni caktu venin e juj.
+      update home location on click: Ndryshoma venin kur të klikoj në hart?
   sessions:
     new:
       title: Kyçu
@@ -1211,15 +1222,6 @@ aln:
           gjeni se pse </ a>). <ul> <li> Adresa juaj e emailit nuk do të zbulohet
           duke u bërë publik. </ Li > <li> Ky veprim nuk mund të kthehet dhe të gjithë
           përdoruesit e rinj janë tashmë publik nga default. </ li> </ ul>
-      image: 'Imazhi:'
-      new image: Shto ni imazh
-      keep image: Maje imazhin e tanishëm
-      delete image: Heke imazhin e tanishëm
-      replace image: Ndryshoje imazhin e tanishëm
-      image size hint: (imazhet katrore s'paku me madhsi 100x100px doken ma mir)
-      home location: 'Veni juej:'
-      no home location: Ju se keni caktu venin e juj.
-      update home location on click: Ndryshoma venin kur të klikoj në hart?
       save changes button: Ruaj Ndryshimet
       make edits public button: Boni gjith ndryshimet e mija publike
       return to profile: Kthehu te profili
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index d63b440a1..38168f3ba 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1484,6 +1484,22 @@ ar:
       reset: أعد ضبط كلمة السر
       flash changed: كلمة مرورك قد تغيرت.
       flash token bad: لم نجد هذا النموذج، تحقق من المسار ربما؟
+  profiles:
+    edit:
+      image: "\uFEFFالصورة:"
+      gravatar:
+        gravatar: استخدام Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        disabled: تم تعطيل Gravatar .
+        enabled: تم تمكين عرض Gravatar الخاص بك.
+      new image: أضف صورة
+      keep image: احتفظ بالصورة الحالية
+      delete image: أزل الصورة الحالية
+      replace image: "\uFEFFاستبدل الصورة الحالية"
+      image size hint: "\uFEFF(صورة مربعة على الأقل 100 × 100 تعمل بشكل أفضل)"
+      home location: 'موقع المنزل:'
+      no home location: لم تدخل موقع منزلك.
+      update home location on click: تحديث موقع المنزل عندما أنقر على الخريطة؟
   sessions:
     new:
       title: تسجيل الدخول
@@ -2316,20 +2332,6 @@ ar:
         agreed_with_pd: وقد أعلنت أيضًا أنك تعتبر تعديلاتك ملكية عامة.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: ما هذا؟
-      image: "\uFEFFالصورة:"
-      gravatar:
-        gravatar: استخدام Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        disabled: تم تعطيل Gravatar .
-        enabled: تم تمكين عرض Gravatar الخاص بك.
-      new image: أضف صورة
-      keep image: احتفظ بالصورة الحالية
-      delete image: أزل الصورة الحالية
-      replace image: "\uFEFFاستبدل الصورة الحالية"
-      image size hint: "\uFEFF(صورة مربعة على الأقل 100 × 100 تعمل بشكل أفضل)"
-      home location: 'موقع المنزل:'
-      no home location: لم تدخل موقع منزلك.
-      update home location on click: تحديث موقع المنزل عندما أنقر على الخريطة؟
       save changes button: حفظ التغييرات
       make edits public button: اجعل جميع تعديلاتي عامة
       return to profile: العودة إلى الملف الشخصي
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 686e36055..fee77ebf5 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -698,6 +698,11 @@ arz:
       reset: إعاده ضبط كلمه المرور
       flash changed: كلمه المرور الخاصه بك قد تغيرت.
       flash token bad: لم تجد تلك المعلومات، تحقق من الرابط ربما؟
+  profiles:
+    edit:
+      home location: 'موقع المنزل:'
+      no home location: لم تدخل موقع منزلك.
+      update home location on click: حدّث موقع المنزل عندما أنقر على الخريطة؟
   sessions:
     new:
       title: ولوج
@@ -1006,9 +1011,6 @@ arz:
           يمكنه تحرير بيانات الخريطة</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">لمعرفه
           السبب</a>). <ul><li>عنوانك البريدى لن يكشف به علنّا.</li><li>هذا الإجراء
           لا يمكن عكسه وجميع المستخدمين الجديد علنيين بشكل افتراضى.</li></ul>
-      home location: 'موقع المنزل:'
-      no home location: لم تدخل موقع منزلك.
-      update home location on click: حدّث موقع المنزل عندما أنقر على الخريطة؟
       save changes button: حفظ التغييرات
       make edits public button: اجعل جميع تعديلاتى عامة
       return to profile: العوده إلى الملف الشخصي
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 6b4bf635b..8baa5a933 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1412,6 +1412,22 @@ ast:
       reset: Reaniciar contraseña
       flash changed: Cambióse la contraseña
       flash token bad: Nun s'alcontró esi token, ¿tendríes de comprobar la URL, seique?
+  profiles:
+    edit:
+      image: Imaxe
+      gravatar:
+        gravatar: Usar Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        disabled: Desactivóse Gravatar.
+        enabled: Activóse la vista del to Gravatar.
+      new image: Amestar una imaxe
+      keep image: Mantener la imaxe actual
+      delete image: Desaniciar la imaxe actual
+      replace image: Sustituir la imaxe actual
+      image size hint: (les imaxes cuadraes de polo menos 100x100 funcionen meyor)
+      home location: 'Llugar d''orixe:'
+      no home location: Nun conseñasti el to llugar d'orixe.
+      update home location on click: ¿Anovar el llugar d'orixe calcando nel mapa?
   sessions:
     new:
       title: Entrar
@@ -2245,20 +2261,6 @@ ast:
           al Dominiu Públicu.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: ¿qué ye esto?
-      image: Imaxe
-      gravatar:
-        gravatar: Usar Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-        disabled: Desactivóse Gravatar.
-        enabled: Activóse la vista del to Gravatar.
-      new image: Amestar una imaxe
-      keep image: Mantener la imaxe actual
-      delete image: Desaniciar la imaxe actual
-      replace image: Sustituir la imaxe actual
-      image size hint: (les imaxes cuadraes de polo menos 100x100 funcionen meyor)
-      home location: 'Llugar d''orixe:'
-      no home location: Nun conseñasti el to llugar d'orixe.
-      update home location on click: ¿Anovar el llugar d'orixe calcando nel mapa?
       save changes button: Guardar los cambios
       make edits public button: Facer públiques toles mios ediciones
       return to profile: Volver al perfil
diff --git a/config/locales/az.yml b/config/locales/az.yml
index d80671585..84ea3f360 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -918,6 +918,12 @@ az:
       heading: '%{user} üçün parolu yenilə'
       reset: Parolu Yenilə
       flash changed: Parolun indi dəyişildi.
+  profiles:
+    edit:
+      image: 'Şəkil:'
+      new image: Şəkil kimi əlavə et
+      delete image: Hazırki şəkili sil
+      replace image: Hazırki şəkili əvəzlə
   sessions:
     new:
       title: Daxil olun
@@ -1106,10 +1112,6 @@ az:
         disabled link text: Niyə mən redaktə edə bilmirəm?
       contributor terms:
         link text: bu nədir?
-      image: 'Şəkil:'
-      new image: Şəkil kimi əlavə et
-      delete image: Hazırki şəkili sil
-      replace image: Hazırki şəkili əvəzlə
       save changes button: Dəyişiklikləri yadda saxla
       return to profile: Profilə geri qayıt
     index:
diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index 1b7255e49..9b25a8c5f 100644
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -735,7 +735,7 @@ ba:
           sport: Спортклуб
           "yes": Клуб
         craft:
-          beekeper: Умартасы
+          beekeeper: Умартасы
           blacksmith: Тимерсе
           brewery: Һыра заводы
           carpenter: Балта оҫтаһы
@@ -765,7 +765,7 @@ ba:
           ambulance_station: Тиҙ ярҙам станцияһы
           assembly_point: Йыйыу урыны
           defibrillator: Дефибриллятор
-          fire_xtinguisher: Ут һүндергес
+          fire_extinguisher: Ут һүндергес
           fire_water_pond: Янғын һыу ятҡылығы
           landing_site: Авария мәлендә ултырыу урыны
           life_ring: Авария ҡотҡарыу түңәрәге
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index c1d8051c6..026465158 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1007,6 +1007,18 @@ be-Tarask:
       reset: Ачысьціць пароль
       flash changed: Ваш пароль быў зьменены.
       flash token bad: Немагчыма знайсьці такі ключ, можа праверце URL-адрас?
+  profiles:
+    edit:
+      image: Выява
+      new image: Дадаць выяву
+      keep image: Пакінуць цяперашнюю выяву
+      delete image: Выдаліць цяперашнюю выяву
+      replace image: Замяніць цяперашнюю выяву
+      image size hint: (найлепей пасуюць квадратныя выявы памерам 100×100)
+      home location: Асноўнае месцазнаходжаньне
+      no home location: Вы не падалі Вашае месцазнаходжаньне.
+      update home location on click: Абнаўляць маё месцазнаходжаньне, калі як націскаю
+        на мапу?
   sessions:
     new:
       title: Увайсьці
@@ -1507,16 +1519,6 @@ be-Tarask:
         agreed_with_pd: Вы таксама заяўляеце, што перадаеце Вашыя рэдагаваньні ў грамадзкі
           набытак.
         link text: што гэта?
-      image: Выява
-      new image: Дадаць выяву
-      keep image: Пакінуць цяперашнюю выяву
-      delete image: Выдаліць цяперашнюю выяву
-      replace image: Замяніць цяперашнюю выяву
-      image size hint: (найлепей пасуюць квадратныя выявы памерам 100×100)
-      home location: Асноўнае месцазнаходжаньне
-      no home location: Вы не падалі Вашае месцазнаходжаньне.
-      update home location on click: Абнаўляць маё месцазнаходжаньне, калі як націскаю
-        на мапу?
       save changes button: Захаваць зьмены
       make edits public button: Зрабіць усе мае рэдагаваньні публічнымі
       return to profile: Вярнуцца да рахунку
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 63d492903..262c7b682 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1436,6 +1436,22 @@ be:
       reset: 'Скінуць пароль:'
       flash changed: Ваш пароль быў зменены.
       flash token bad: Не знайшоў такі токен, можа, праверце URL?
+  profiles:
+    edit:
+      image: 'Выява:'
+      gravatar:
+        gravatar: Выкарыстоўваць Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        disabled: Граватар быў адключаны.
+        enabled: Паказ вашага Граватара быў уключаны.
+      new image: Дадаць выяву
+      keep image: Захаваць бягучую выяву
+      delete image: Выдаліць бягучую выяву
+      replace image: Замяніць бягучую выяву
+      image size hint: (найлепей пасуюць квадратныя выявы памерам 100×100)
+      home location: 'Ваша месцазнаходжанне:'
+      no home location: Вы не выбралі вашае асноўнае месцазнаходжанне.
+      update home location on click: Абнавіць каардэнаты, калі я пстрыкну па карце?
   sessions:
     new:
       title: Уваход
@@ -2274,20 +2290,6 @@ be:
           ў агульнай уласнасці.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: што гэта?
-      image: 'Выява:'
-      gravatar:
-        gravatar: Выкарыстоўваць Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        disabled: Граватар быў адключаны.
-        enabled: Паказ вашага Граватара быў уключаны.
-      new image: Дадаць выяву
-      keep image: Захаваць бягучую выяву
-      delete image: Выдаліць бягучую выяву
-      replace image: Замяніць бягучую выяву
-      image size hint: (найлепей пасуюць квадратныя выявы памерам 100×100)
-      home location: 'Ваша месцазнаходжанне:'
-      no home location: Вы не выбралі вашае асноўнае месцазнаходжанне.
-      update home location on click: Абнавіць каардэнаты, калі я пстрыкну па карце?
       save changes button: Запісаць змены
       make edits public button: Зрабіць усе мае змены публічнымі
       return to profile: Вярнуцца да профілю
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e6f1d9e7f..8373ea39a 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -13,6 +13,7 @@
 # Author: Tlubenov
 # Author: Vlad5250
 # Author: Vodnokon4e
+# Author: YavBav09
 # Author: АдмиралАнимЕ
 ---
 bg:
@@ -35,6 +36,8 @@ bg:
       client_application:
         create: Регистриране
         update: Обнови
+      doorkeeper_application:
+        create: Регистриране
       redaction:
         create: Създаване на поправка
         update: Запазване на поправка
@@ -102,6 +105,8 @@ bg:
         latitude: Географска ширина
         longitude: Географска дължина
         language: Език
+      doorkeeper/application:
+        name: Име
       friend:
         user: Потребител
         friend: Приятел
@@ -123,6 +128,7 @@ bg:
         body: Текст
         recipient: Получател
       redaction:
+        title: Заглавие
         description: Описание
       report:
         category: Посочете причина за доклада
@@ -1336,6 +1342,21 @@ bg:
       heading: Смени Парола за %{user}
       reset: Нулиране на парола
       flash changed: Паролата е променена успешно.
+  profiles:
+    edit:
+      image: Изображение
+      gravatar:
+        gravatar: Използване на Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+      new image: Добавяне на изображение
+      keep image: Запазване на текущото изображение
+      delete image: Премахване на текущото изображение
+      replace image: Заменяне на текущото изображение
+      image size hint: (най-подходящо е квадратно изображение с мин. размер 100×100)
+      home location: Моето местоположение
+      no home location: Не сте избрали своето местоположение.
+      update home location on click: Променяне на моето местоположение при избиране
+        от картата
   sessions:
     new:
       title: Влизане
@@ -1833,19 +1854,6 @@ bg:
         not yet agreed: Все още не сте приели новите Условия за участие.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Какво е това?
-      image: Изображение
-      gravatar:
-        gravatar: Използване на Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-      new image: Добавяне на изображение
-      keep image: Запазване на текущото изображение
-      delete image: Премахване на текущото изображение
-      replace image: Заменяне на текущото изображение
-      image size hint: (най-подходящо е квадратно изображение с мин. размер 100×100)
-      home location: Моето местоположение
-      no home location: Не сте избрали своето местоположение.
-      update home location on click: Променяне на моето местоположение при избиране
-        от картата
       save changes button: Съхраняване на промените
       make edits public button: Всички мои промени да са публично достъпни
       return to profile: Обратно към профила
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index a012ddad8..c387f81e6 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1219,6 +1219,12 @@ bn:
       title: পাসওয়ার্ড পুনঃনির্ধারণ
       reset: পাসওয়ার্ড পুনঃনির্ধারণ
       flash changed: আপনার পাসওয়ার্ড পরিবর্তন করা হয়েছে।
+  profiles:
+    edit:
+      image: চিত্র
+      new image: চিত্র যোগ করুন
+      delete image: বর্তমান ছবিটি অপসারণ করুন
+      home location: বাড়ির অবস্থান
   sessions:
     new:
       title: প্রবেশ
@@ -1616,10 +1622,6 @@ bn:
         agreed_with_pd: আপনি ঘোষণা করেছেন যে আপনি আপনার সম্পাদনাগুলো পাবলিক ডোমেইনের
           অধীনে প্রকাশ করছেন।
         link text: এটি কী?
-      image: চিত্র
-      new image: চিত্র যোগ করুন
-      delete image: বর্তমান ছবিটি অপসারণ করুন
-      home location: বাড়ির অবস্থান
       save changes button: পরিবর্তন সংরক্ষণ
       return to profile: প্রোফাইলে ফিরুন
     go_public:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 2521a8f93..74da993d3 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1469,6 +1469,24 @@ br:
       reset: Adderaouekaat ar ger-tremen
       flash changed: Cheñchet eo bet ho ker-tremen.
       flash token bad: N'eo ket bet kavet ar jedouer-se, gwiriañ an URL marteze ?
+  profiles:
+    edit:
+      image: 'Skeudenn :'
+      gravatar:
+        gravatar: Implijout Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        disabled: Diweredekaet eo bet Gravatar.
+        enabled: Gweredekaet eo bet diskwel ho Kravatar.
+      new image: Ouzhpennañ ur skeudenn
+      keep image: Derc'hel ar skeudenn a-vremañ
+      delete image: Dilemel ar skeudenn a-vremañ
+      replace image: Erlec'hiañ ar skeudenn a-vremañ
+      image size hint: (ar skeudennoù karrezenneg gant ar stumm 100×100 pixel a zo
+        ar re wellañ)
+      home location: 'Lec''hiadur ar gêr :'
+      no home location: N'hoc'h eus ket ebarzhet lec'hiadur ho kêr.
+      update home location on click: Hizivaat lec'hiadur ho kêr pa glikit war ar gartenn
+        ?
   sessions:
     new:
       title: Kevreañ
@@ -2276,22 +2294,6 @@ br:
         agreed_with_pd: Disklêriet hoc'h eus ivez emañ ho tegasadennoù en domani foran.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Petra eo se ?
-      image: 'Skeudenn :'
-      gravatar:
-        gravatar: Implijout Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-        disabled: Diweredekaet eo bet Gravatar.
-        enabled: Gweredekaet eo bet diskwel ho Kravatar.
-      new image: Ouzhpennañ ur skeudenn
-      keep image: Derc'hel ar skeudenn a-vremañ
-      delete image: Dilemel ar skeudenn a-vremañ
-      replace image: Erlec'hiañ ar skeudenn a-vremañ
-      image size hint: (ar skeudennoù karrezenneg gant ar stumm 100×100 pixel a zo
-        ar re wellañ)
-      home location: 'Lec''hiadur ar gêr :'
-      no home location: N'hoc'h eus ket ebarzhet lec'hiadur ho kêr.
-      update home location on click: Hizivaat lec'hiadur ho kêr pa glikit war ar gartenn
-        ?
       save changes button: Enrollañ ar c'hemmoù
       make edits public button: Lakaat ma holl aozadennoù da vezañ foran
       return to profile: Distreiñ d'ar profil
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index fa4fb8967..33f4b4811 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1002,6 +1002,19 @@ bs:
       reset: Ponovno postavljanje lozinke
       flash changed: Vaša lozinka je promjenjena.
       flash token bad: Niste pronašli tz značku, možda da provjerite URL?
+  profiles:
+    edit:
+      image: 'Slika:'
+      gravatar:
+        gravatar: Koristiti Gravatar
+      new image: Dodati sliku
+      keep image: Zadržati trenutnu sliku
+      delete image: Ukloniti trenutnu sliku
+      replace image: Zamijeniti trenutnu sliku
+      image size hint: (kvadratne slike od barem 100x100 piksela su najbolje)
+      home location: 'Matična lokacija:'
+      no home location: Niste unijeli Vašu matičnu lokaciju.
+      update home location on click: Osvježiti matičnu lokaciju kada kliknem na kartu?
   sessions:
     new:
       title: Prijava
@@ -1558,17 +1571,6 @@ bs:
           da pregledate i prihvatite nove uslove za doprinosioce.
         agreed_with_pd: Takođe ste proglasili da će vaše izmjene biti u javnom vlasništvu.
         link text: Å ta je ovo?
-      image: 'Slika:'
-      gravatar:
-        gravatar: Koristiti Gravatar
-      new image: Dodati sliku
-      keep image: Zadržati trenutnu sliku
-      delete image: Ukloniti trenutnu sliku
-      replace image: Zamijeniti trenutnu sliku
-      image size hint: (kvadratne slike od barem 100x100 piksela su najbolje)
-      home location: 'Matična lokacija:'
-      no home location: Niste unijeli Vašu matičnu lokaciju.
-      update home location on click: Osvježiti matičnu lokaciju kada kliknem na kartu?
       save changes button: Sačuvati promjene
       make edits public button: Napraviti sve moje promjene javnim
       return to profile: Vratiti se na profil
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 4a33e9947..afb672fec 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -65,6 +65,9 @@ ca:
       client_application:
         create: Registreu-vos
         update: Actualitza
+      doorkeeper_application:
+        create: Registreu-vos
+        update: Actualitza
       redaction:
         create: Crea una eliminació
         update: Desa una eliminació
@@ -139,6 +142,7 @@ ca:
       doorkeeper/application:
         name: Nom
         redirect_uri: Redirigeix URIs
+        confidential: Aplicació confidencial?
         scopes: Permisos
       friend:
         user: Usuari/a
@@ -759,7 +763,7 @@ ca:
           sport: Club esportiu
           "yes": Club
         craft:
-          beekeper: Apicultor
+          beekeeper: Apicultor
           blacksmith: Ferrer
           brewery: Fàbrica de cervesa
           carpenter: Fuster
@@ -785,7 +789,7 @@ ca:
           ambulance_station: Base d'ambulàncies
           assembly_point: Punt de reunió
           defibrillator: Desfibril·lador
-          fire_xtinguisher: Extintor de foc
+          fire_extinguisher: Extintor de foc
           fire_water_pond: Bassa d'Aigua Contra Incendis
           landing_site: Lloc d'aterratge d'emergència
           phone: Telèfon per a emergències
@@ -1087,6 +1091,7 @@ ca:
           locality: Localitat
           municipality: Municipi
           neighbourhood: Barri
+          plot: Parcel·la
           postcode: Codi postal
           quarter: Districte
           region: Regió
@@ -1708,6 +1713,44 @@ ca:
       reset: Restableix la contrasenya
       flash changed: S'ha canviat la contrasenya.
       flash token bad: No s'ha trobat el testimoni. Comproveu la URL.
+  preferences:
+    show:
+      title: Les meves preferències
+      preferred_editor: Editor preferit
+      preferred_languages: Idiomes preferits
+      edit_preferences: Edita les preferències
+    edit:
+      title: Edita les preferències
+      save: Actualitza les preferències
+      cancel: Cancel·la
+    update:
+      failure: No s'han pogut actualitzar les preferències.
+    update_success_flash:
+      message: S'han actualitzat les preferències.
+  profiles:
+    edit:
+      title: Edita el perfil
+      save: Actualitza el perfil
+      cancel: Cancel·la
+      image: Imatge
+      gravatar:
+        gravatar: Usa Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Què és Gravatar?
+        disabled: S'ha inhabilitat Gravatar.
+        enabled: S'ha habilitat que es mostri el vostre Gravatar.
+      new image: Afegeix una imatge
+      keep image: Conserva la imatge actual
+      delete image: Suprimeix la imatge actual
+      replace image: Reemplaça la imatge actual
+      image size hint: (val més usar imatges quadrades d'almenys 100x100)
+      home location: Ubicació inicial
+      no home location: No heu especificat la ubicació d'origen.
+      update home location on click: Voleu actualitzar la ubicació d'inici en fer
+        clic al mapa?
+    update:
+      success: S'ha actualitzat el perfil.
+      failure: No s'ha pogut actualitzar el perfil.
   sessions:
     new:
       title: Inicia la sessió
@@ -1730,9 +1773,8 @@ ca:
       account not active: El vostre compte encara no és actiu.<br />Utilitzeu l'enllaç
         al correu de confirmació per activar el vostre compte o <a href="%{reconfirm}">demaneu
         un nou correu electrònic de confirmació</a>.
-      account is suspended: S'ha suspès el vostre compte a causa d'activitat sospitosa.<br
-        />Contacteu amb el <a href="%{webmaster}">l'administrador del web</a> per
-        parlar-ne.
+      account is suspended: S'ha suspès el vostre compte a causa d'activitat sospitosa.<br/>Contacteu
+        amb <a href="%{webmaster}">assistència</a> per parlar-ne.
       auth failure: No podeu iniciar la sessió amb aquesta informació.
       openid_logo_alt: Inicia sessió amb un compte OpenID
       auth_providers:
@@ -2293,7 +2335,7 @@ ca:
       in: en
     index:
       public_traces: Traces GPS públiques
-      my_traces: Les meves traces de GPS
+      my_traces: Les meves traces
       public_traces_from: Traces GPS públiques de %{user}
       description: Navega per les traces pujades recentment
       tagged_with: etiquetat amb %{tags}
@@ -2301,6 +2343,9 @@ ca:
         traça</a> o apreneu més sobre les traces GPS a la <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pàgina
         wiki</a>.
       upload_trace: Puja una traça
+      all_traces: Totes les traces
+      traces_from: Traces públiques de %{user}
+      remove_tag_filter: Elimina el filtre d'etiquetes
     destroy:
       scheduled_for_deletion: Traça programada per a ser suprimida
     make_public:
@@ -2361,7 +2406,12 @@ ca:
     permissions:
       missing: No heu permès l'accés de l'aplicació a aquesta característica
     scopes:
+      read_prefs: Llegeix les preferències d'usuari
+      write_prefs: Modifica les preferències d'usuari
+      write_diary: Creeu entrades del diari, comentaris i feu amics
       write_api: Modifica el mapa
+      read_gpx: Llegiu traces de GPS privades
+      write_gpx: Carrega traces de GPS
       write_notes: Modifica les notes
   oauth_clients:
     new:
@@ -2428,7 +2478,7 @@ ca:
     new:
       title: Registreu-vos-hi
       no_auto_account_create: No us podem crear un compte automàticament.
-      contact_support_html: Contacteu amb el <a href="%{support}">webmestre</a> per
+      contact_support_html: Contacteu amb <a href="%{support}">assistència</a> per
         gestionar la creació d'un compte - intentarem tractar la sol·licitud tan aviat
         com sigui possible.
       about:
@@ -2587,22 +2637,6 @@ ca:
           són de domini públic.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: què és això?
-      image: Imatge
-      gravatar:
-        gravatar: Usa Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Què és Gravatar?
-        disabled: S'ha inhabilitat Gravatar.
-        enabled: S'ha habilitat que es mostri el vostre Gravatar.
-      new image: Afegeix una imatge
-      keep image: Conserva la imatge actual
-      delete image: Suprimeix la imatge actual
-      replace image: Reemplaça la imatge actual
-      image size hint: (val més usar imatges quadrades d'almenys 100x100)
-      home location: Ubicació inicial
-      no home location: No heu especificat la ubicació d'origen.
-      update home location on click: Voleu actualitzar la ubicació d'inici en fer
-        clic al mapa?
       save changes button: Desa els canvis
       make edits public button: Fes totes les meves modificacions públiques
       return to profile: Torna al perfil
@@ -2631,12 +2665,12 @@ ca:
       heading: Compte suspès
       body_html: |-
         <p>
-          El vostre compte ha estat automàticament suspès a causa de
-          l'activitat sospitosa.
+          El vostre compte ha estat suspès automàticament a causa
+          d'activitat sospitosa.
         </p>
         <p>
-          Aquesta decisió serà revisat per un administrador en breu, o
-          es pot contactar amb el %{webmaster} si desitgeu discutir això.
+          Aquesta decisió serà revisada per un administrador aviat, o
+          podeu contactar amb %{webmaster} si desitgeu discutir-ho.
         </p>
     auth_failure:
       connection_failed: La connexió al proveïdor d'autenticació ha fallat
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index d5573998c..21bb04f40 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -811,6 +811,11 @@ ce:
       heading: Йуха а йазйе пароль %{user}
       reset: ХӀоттае пароль
       flash changed: Хьан пароль хийцина.
+  profiles:
+    edit:
+      image: 'Сурт:'
+      gravatar:
+        disabled: Gravatar дӀаяйина.
   sessions:
     new:
       title: ЧугӀо
@@ -961,9 +966,6 @@ ce:
         link text: хӀун йу хӀара?
       contributor terms:
         link text: хӀун йу хӀара?
-      image: 'Сурт:'
-      gravatar:
-        disabled: Gravatar дӀаяйина.
       save changes button: Ӏалашбе хийцамаш
     index:
       title: Декъашхой
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 5226b977c..506773ead 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -770,7 +770,7 @@ cs:
           sport: Sportovní klub
           "yes": Klub
         craft:
-          beekeper: Včelař
+          beekeeper: Včelař
           blacksmith: Kovář
           brewery: Pivovar
           carpenter: Tesařství
@@ -800,7 +800,7 @@ cs:
           ambulance_station: Stanoviště záchranné služby
           assembly_point: Shromažďovací místo
           defibrillator: Defibrilátor
-          fire_xtinguisher: Hasicí přístroj
+          fire_extinguisher: Hasicí přístroj
           fire_water_pond: Požární nádrž
           landing_site: Přistávací plocha záchranky
           life_ring: Záchranný kruh
@@ -1740,6 +1740,23 @@ cs:
       reset: Resetovat heslo
       flash changed: Vaše heslo bylo změněno.
       flash token bad: Odpovídající kód nebyl nalezen, možná zkontrolujte URL?
+  profiles:
+    edit:
+      image: Obrázek
+      gravatar:
+        gravatar: Používat Gravatar
+        link: http://wiki.openstreetmap.org/wiki/CS:Gravatar
+        what_is_gravatar: Co je Gravatar?
+        disabled: Gravatar byl zakázán.
+        enabled: Zobrazování vašeho Gravataru bylo povoleno.
+      new image: Přidat obrázek
+      keep image: Zachovat stávající obrázek
+      delete image: Odstranit stávající obrázek
+      replace image: Nahradit stávající obrázek
+      image size hint: (nejlépe fungují čtvercové obrázky velikosti nejméně 100×100)
+      home location: Poloha domova
+      no home location: Nezadali jste polohu svého bydliště.
+      update home location on click: Upravit pozici domova při kliknutí na mapu?
   sessions:
     new:
       title: Přihlásit se
@@ -2576,21 +2593,6 @@ cs:
         agreed_with_pd: Také jste prohlásili, že své editace považujete za volné dílo.
         link: http://wiki.openstreetmap.org/wiki/CS:Open_Database_License/Contributor_Terms?uselang=cs
         link text: co to znamená?
-      image: Obrázek
-      gravatar:
-        gravatar: Používat Gravatar
-        link: http://wiki.openstreetmap.org/wiki/CS:Gravatar
-        what_is_gravatar: Co je Gravatar?
-        disabled: Gravatar byl zakázán.
-        enabled: Zobrazování vašeho Gravataru bylo povoleno.
-      new image: Přidat obrázek
-      keep image: Zachovat stávající obrázek
-      delete image: Odstranit stávající obrázek
-      replace image: Nahradit stávající obrázek
-      image size hint: (nejlépe fungují čtvercové obrázky velikosti nejméně 100×100)
-      home location: Poloha domova
-      no home location: Nezadali jste polohu svého bydliště.
-      update home location on click: Upravit pozici domova při kliknutí na mapu?
       save changes button: Uložit změny
       make edits public button: Zvěřejnit všechny moje úpravy
       return to profile: Zpět na profil
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 564842afd..cc212fefa 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1115,6 +1115,16 @@ cy:
       heading: Ailosod Cyfinair ar gyfer %{user}
       reset: Ailosod Cyfrinair
       flash changed: Mae'ch cyfrinair wedi'i newid.
+  profiles:
+    edit:
+      image: 'Delwedd:'
+      new image: Ychwanegu delwedd
+      keep image: Cadw'r ddelwedd bresennol
+      delete image: Tynnu'r ddelwedd bresennol
+      replace image: Newid y ddelwedd bresennol
+      image size hint: (delweddau sgwâr o leiaf 100x100 yw'r gorau)
+      home location: 'Lleoliad Cartref:'
+      no home location: Nid ydych wedi gosod eich lleoliad cartref.
   sessions:
     new:
       title: Mewngofnodi
@@ -1491,14 +1501,6 @@ cy:
         review link text: Dilynwch y ddolen hon i adolygu a derbyn y telerau cyfranwyr
           newydd.
         link text: beth yw hwn?
-      image: 'Delwedd:'
-      new image: Ychwanegu delwedd
-      keep image: Cadw'r ddelwedd bresennol
-      delete image: Tynnu'r ddelwedd bresennol
-      replace image: Newid y ddelwedd bresennol
-      image size hint: (delweddau sgwâr o leiaf 100x100 yw'r gorau)
-      home location: 'Lleoliad Cartref:'
-      no home location: Nid ydych wedi gosod eich lleoliad cartref.
       save changes button: Cadw'r Newidiadau
       make edits public button: Gwneud fy holl olygiadau yn gyhoeddus
       return to profile: Dychwelyd i'r proffil
diff --git a/config/locales/da.yml b/config/locales/da.yml
index d337f91c6..0e987f096 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -748,7 +748,7 @@ da:
           sport: Sportsklub
           "yes": Klub
         craft:
-          beekeper: Biavler
+          beekeeper: Biavler
           blacksmith: Grovsmed
           brewery: Bryggeri
           carpenter: Tømrer
@@ -778,7 +778,7 @@ da:
           ambulance_station: Ambulancestation
           assembly_point: Mødested
           defibrillator: Hjertestarter
-          fire_xtinguisher: Brandslukker
+          fire_extinguisher: Brandslukker
           fire_water_pond: Branddam
           landing_site: Nødlandingsplads
           life_ring: Redningskrans
@@ -863,6 +863,7 @@ da:
           railway: Historisk jernbane
           roman_road: Romersk vej
           ruins: Ruin
+          rune_stone: Runesten
           stone: Sten
           tomb: Grav
           tower: TÃ¥rn
@@ -1715,6 +1716,23 @@ da:
       reset: Nulstil adgangskode
       flash changed: Din adgangskode er ændret.
       flash token bad: Kunne ikke finde denne nøgle, prøv at kontrollere URL'en?
+  profiles:
+    edit:
+      image: Billede
+      gravatar:
+        gravatar: Brug Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Hvad er Gravatar?
+        disabled: Gravatar er blevet deaktiveret.
+        enabled: Visning af din Gravatar er blevet aktiveret.
+      new image: Tilføj et billede
+      keep image: Behold det nuværende billede
+      delete image: Fjern det nuværende billede
+      replace image: Erstat det aktuelle billede
+      image size hint: (kvadratiske billeder på mindst 100x100 fungerer bedst)
+      home location: Hjemmeposition
+      no home location: Du har ikke angivet din hjemmeposition.
+      update home location on click: Opdater hjemmeposition når jeg klikker på kortet?
   sessions:
     new:
       title: Log på
@@ -2594,21 +2612,6 @@ da:
           fælleseje/uden ophavsret.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: hvad er dette?
-      image: Billede
-      gravatar:
-        gravatar: Brug Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Hvad er Gravatar?
-        disabled: Gravatar er blevet deaktiveret.
-        enabled: Visning af din Gravatar er blevet aktiveret.
-      new image: Tilføj et billede
-      keep image: Behold det nuværende billede
-      delete image: Fjern det nuværende billede
-      replace image: Erstat det aktuelle billede
-      image size hint: (kvadratiske billeder på mindst 100x100 fungerer bedst)
-      home location: Hjemmeposition
-      no home location: Du har ikke angivet din hjemmeposition.
-      update home location on click: Opdater hjemmeposition når jeg klikker på kortet?
       save changes button: Gem ændringer
       make edits public button: Gør alle mine rettelser offentlige
       return to profile: Tilbage til profil
diff --git a/config/locales/de.yml b/config/locales/de.yml
index bd29adecd..5adc762c9 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -818,7 +818,7 @@ de:
           sport: Sportverein
           "yes": Verein
         craft:
-          beekeper: Imker
+          beekeeper: Imker
           blacksmith: Schmied
           brewery: Brauerei
           carpenter: Zimmermann
@@ -848,7 +848,7 @@ de:
           ambulance_station: Rettungswache
           assembly_point: Sammelplatz
           defibrillator: Defibrillator
-          fire_xtinguisher: Feuerlöscher
+          fire_extinguisher: Feuerlöscher
           fire_water_pond: Löschwasserteich
           landing_site: Notlandeplatz
           life_ring: Rettungsring
@@ -1811,6 +1811,24 @@ de:
       flash changed: Dein Passwort wurde geändert.
       flash token bad: Wir konnten dieses Kürzel leider nicht finden. Du hast dich
         möglicherweise vertippt oder du bist einem ungültigem Link gefolgt.
+  profiles:
+    edit:
+      image: Bild
+      gravatar:
+        gravatar: Gravatar verwenden
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Was ist Gravatar?
+        disabled: Gravatar wurde deaktiviert.
+        enabled: Die Anzeige deines Gravatars wurde aktiviert.
+      new image: Bild einfügen
+      keep image: Bild unverändert beibehalten
+      delete image: Bild löschen
+      replace image: Bild austauschen
+      image size hint: (quadratische Bilder mit zumindest 100x100 Pixel funktionieren
+        am besten)
+      home location: Heimatstandort
+      no home location: Du hast noch keinen Standort angegeben.
+      update home location on click: Standort beim Klick auf die Karte aktualisieren
   sessions:
     new:
       title: Anmelden
@@ -2760,22 +2778,6 @@ de:
           (unter Public Domain stellst).
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Worum handelt es sich?
-      image: Bild
-      gravatar:
-        gravatar: Gravatar verwenden
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Was ist Gravatar?
-        disabled: Gravatar wurde deaktiviert.
-        enabled: Die Anzeige deines Gravatars wurde aktiviert.
-      new image: Bild einfügen
-      keep image: Bild unverändert beibehalten
-      delete image: Bild löschen
-      replace image: Bild austauschen
-      image size hint: (quadratische Bilder mit zumindest 100x100 Pixel funktionieren
-        am besten)
-      home location: Heimatstandort
-      no home location: Du hast noch keinen Standort angegeben.
-      update home location on click: Standort beim Klick auf die Karte aktualisieren
       save changes button: Änderungen speichern
       make edits public button: Alle meine Bearbeitungen öffentlich machen
       return to profile: Zurück zum Profil
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 7792b3cbe..dc0c6135d 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -837,6 +837,11 @@ diq:
       title: Parola reset ke
       heading: Parolay %{user} reset ke
       reset: Parola reset ke
+  profiles:
+    edit:
+      image: 'Resım:'
+      new image: Yew resım cı ke
+      home location: 'Herune:'
   sessions:
     new:
       title: Cıkewtış
@@ -1062,9 +1067,6 @@ diq:
         heading: 'Pêron rê akerde vurnayış:'
       contributor terms:
         link text: no çıko?
-      image: 'Resım:'
-      new image: Yew resım cı ke
-      home location: 'Herune:'
       save changes button: Vurnayışan qeyd ke
       return to profile: Peyser şo profil
     index:
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 987271319..7efd2431f 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1075,6 +1075,19 @@ dsb:
       reset: Gronidło slědk stajiś
       flash changed: Twójo gronidło jo se změniło.
       flash token bad: Njejo móžno było ten token namakaś, pšosym pśekontrolěruj URL.
+  profiles:
+    edit:
+      image: 'Wobraz:'
+      gravatar:
+        gravatar: Gravatar wužywaś
+      new image: Wobraz pśidaś
+      keep image: Aktualny wobraz wobchowaś
+      delete image: Aktualny wobraz wótpóraś
+      replace image: Aktualny wobraz wuměniś
+      image size hint: (kwadratiske wobraze z nanejmjenjej 100x100 funkcioněruju nejlěpjej)
+      home location: 'Bydlišćo:'
+      no home location: Njejsy swóje bydlišćo zapódał.
+      update home location on click: Bydlišćo pśi kliknjenju na kórtu aktualizěrowaś?
   sessions:
     new:
       title: Pśizjawjenje
@@ -1743,17 +1756,6 @@ dsb:
           nowe wuměnjenja za sobuskutkajucych.
         agreed_with_pd: Sy teke deklarěrował, až twóje změny su zjawne.
         link text: Co to jo?
-      image: 'Wobraz:'
-      gravatar:
-        gravatar: Gravatar wužywaś
-      new image: Wobraz pśidaś
-      keep image: Aktualny wobraz wobchowaś
-      delete image: Aktualny wobraz wótpóraś
-      replace image: Aktualny wobraz wuměniś
-      image size hint: (kwadratiske wobraze z nanejmjenjej 100x100 funkcioněruju nejlěpjej)
-      home location: 'Bydlišćo:'
-      no home location: Njejsy swóje bydlišćo zapódał.
-      update home location on click: Bydlišćo pśi kliknjenju na kórtu aktualizěrowaś?
       save changes button: Změny składowaś
       make edits public button: Wše móje změny wózjawiś
       return to profile: Slědk k profiloju
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 71fc41904..8b47feda4 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -679,7 +679,7 @@ el:
           warehouse: Αποθήκη
           "yes": Κτίριο
         craft:
-          beekeper: Μελισσοκόμος
+          beekeeper: Μελισσοκόμος
           blacksmith: Σιδηρουργός
           brewery: Ζυθοποιείο
           carpenter: Ξυλουργός
@@ -696,7 +696,7 @@ el:
           ambulance_station: Σταθμός ασθενοφόρων
           assembly_point: Σημείο συγκέντρωσης
           defibrillator: Απινιδωτής
-          fire_xtinguisher: Πυροσβεστήρας
+          fire_extinguisher: Πυροσβεστήρας
           landing_site: Τοποθεσία έκτακτης προσγείωσης
           phone: Τηλέφωνο έκτακτης ανάγκης
           water_tank: Δεξαμενή νερού έκτακτης ανάγκης
@@ -1521,6 +1521,23 @@ el:
       reset: Επαναφορά συνθηματικού
       flash changed: Το συνθηματικό σας άλλαξε!
       flash token bad: Δεν βρήκατε αυτό το κομμάτι, μήπως πρέπει να ελέγξετε το URL;
+  profiles:
+    edit:
+      image: Εικόνα
+      gravatar:
+        gravatar: Χρήση Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        disabled: 'Το Gravatar έχει απενεργοποιηθεί:'
+        enabled: Έχει ενεργοποιηθεί η εμφάνιση του Gravatar σας.
+      new image: Προσθήκη εικόνας
+      keep image: Διατήρηση της τρέχουσας εικόνας
+      delete image: Αφαίρεση της τρέχουσας εικόνας
+      replace image: Αντικατάσταση της τρέχουσας εικόνας
+      image size hint: (τετράγωνες εικόνες τουλάχιστον 100 x 100 λειτουργούν καλύτερα)
+      home location: Τοποθεσία Σπιτιού
+      no home location: Δεν έχετε εισάγει την τοποθεσία του σπιτιού σας.
+      update home location on click: Ενημέρωση τοποθεσίας σπιτιού όταν κάνω κλικ στον
+        χάρτη;
   sessions:
     new:
       title: Είσοδος
@@ -2376,21 +2393,6 @@ el:
           στον δημόσιο τομέα.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: τι είναι αυτό;
-      image: Εικόνα
-      gravatar:
-        gravatar: Χρήση Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        disabled: 'Το Gravatar έχει απενεργοποιηθεί:'
-        enabled: Έχει ενεργοποιηθεί η εμφάνιση του Gravatar σας.
-      new image: Προσθήκη εικόνας
-      keep image: Διατήρηση της τρέχουσας εικόνας
-      delete image: Αφαίρεση της τρέχουσας εικόνας
-      replace image: Αντικατάσταση της τρέχουσας εικόνας
-      image size hint: (τετράγωνες εικόνες τουλάχιστον 100 x 100 λειτουργούν καλύτερα)
-      home location: Τοποθεσία Σπιτιού
-      no home location: Δεν έχετε εισάγει την τοποθεσία του σπιτιού σας.
-      update home location on click: Ενημέρωση τοποθεσίας σπιτιού όταν κάνω κλικ στον
-        χάρτη;
       save changes button: Αποθήκευση αλλαγών
       make edits public button: Να γίνουν όλες οι επεξεργασίες μου δημόσιες
       return to profile: Επιστροφή στο προφίλ
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 062486f2a..d788820e1 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1376,6 +1376,22 @@ en-GB:
       reset: Reset Password
       flash changed: Your password has been changed.
       flash token bad: Did not find that token, check the URL maybe?
+  profiles:
+    edit:
+      image: Image
+      gravatar:
+        gravatar: Use Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        disabled: Gravatar has been disabled.
+        enabled: Display of your Gravatar has been enabled.
+      new image: Add an image
+      keep image: Keep the current image
+      delete image: Remove the current image
+      replace image: Replace the current image
+      image size hint: (square images at least 100x100 work best)
+      home location: Home Location
+      no home location: You have not entered your home location.
+      update home location on click: Update home location when I click on the map?
   sessions:
     new:
       title: Login
@@ -2166,20 +2182,6 @@ en-GB:
           in the Public Domain.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: what is this?
-      image: Image
-      gravatar:
-        gravatar: Use Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        disabled: Gravatar has been disabled.
-        enabled: Display of your Gravatar has been enabled.
-      new image: Add an image
-      keep image: Keep the current image
-      delete image: Remove the current image
-      replace image: Replace the current image
-      image size hint: (square images at least 100x100 work best)
-      home location: Home Location
-      no home location: You have not entered your home location.
-      update home location on click: Update home location when I click on the map?
       save changes button: Save Changes
       make edits public button: Make all my edits public
       return to profile: Return to profile
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index b7d12ac99..852be3528 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -753,7 +753,7 @@ eo:
           sport: Sporta klubejo
           "yes": Klubejo
         craft:
-          beekeper: Abelejo
+          beekeeper: Abelejo
           blacksmith: Forĝejo
           brewery: Bierfarejo
           carpenter: Ĉarpentistejo
@@ -783,7 +783,7 @@ eo:
           ambulance_station: Ambulanca stacio
           assembly_point: Vivsava renkontiĝejo
           defibrillator: Defibrililo
-          fire_xtinguisher: Fajestingilo
+          fire_extinguisher: Fajestingilo
           fire_water_pond: Fajrobrigada akvorezervujo
           landing_site: Surteriĝejo en urĝo
           life_ring: Savoringo
@@ -868,6 +868,7 @@ eo:
           railway: Historia fervoja objekto
           roman_road: Romia ŝoseo
           ruins: Ruinoj historiaj
+          rune_stone: Runŝtono
           stone: Ŝtonego historia
           tomb: Tombo
           tower: Turo
@@ -1712,6 +1713,24 @@ eo:
       reset: Nuligi pasvorton
       flash changed: Via pasvorto estis ŝanĝita.
       flash token bad: Netrovebla ĵetono, bonvolu kontroli la URLon.
+  profiles:
+    edit:
+      image: Profilbildo
+      gravatar:
+        gravatar: Uzi “Gravataron”
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Kio estas Gravatar?
+        disabled: “Gravataro” estas malaktiva.
+        enabled: Montrado de via “Gravataro” estas aktiva.
+      new image: Aldoni bildon
+      keep image: Konservi la aktualan bildon
+      delete image: Forigi la aktualan bildon
+      replace image: AnstataÅ­igi la aktualan bildon
+      image size hint: (kvadrataj bildoj kun grando pli ol 100x100 taÅ­gas)
+      home location: Hejma pozicio
+      no home location: Vi ne enigis vian hejmlokon.
+      update home location on click: Ĉu freŝigi la hejmlokon kiam mi alklakas sur
+        la mapo?
   sessions:
     new:
       title: Ensaluti
@@ -2617,22 +2636,6 @@ eo:
           havaĵo.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: kio estas tio?
-      image: Profilbildo
-      gravatar:
-        gravatar: Uzi “Gravataron”
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Kio estas Gravatar?
-        disabled: “Gravataro” estas malaktiva.
-        enabled: Montrado de via “Gravataro” estas aktiva.
-      new image: Aldoni bildon
-      keep image: Konservi la aktualan bildon
-      delete image: Forigi la aktualan bildon
-      replace image: AnstataÅ­igi la aktualan bildon
-      image size hint: (kvadrataj bildoj kun grando pli ol 100x100 taÅ­gas)
-      home location: Hejma pozicio
-      no home location: Vi ne enigis vian hejmlokon.
-      update home location on click: Ĉu freŝigi la hejmlokon kiam mi alklakas sur
-        la mapo?
       save changes button: Konservi ŝanĝojn
       make edits public button: Publikigu ĉiujn miajn redaktojn.
       return to profile: Reen al profilo
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 64fa85664..37008a824 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -811,7 +811,7 @@ es:
           sport: Club deportivo
           "yes": Club
         craft:
-          beekeper: Apicultor
+          beekeeper: Apicultor
           blacksmith: Herrero
           brewery: Fábrica de cerveza
           carpenter: Carpintero
@@ -841,7 +841,7 @@ es:
           ambulance_station: Base de ambulancias
           assembly_point: Punto de reunión
           defibrillator: Desfibrilador
-          fire_xtinguisher: Extintor de incendios
+          fire_extinguisher: Extintor de incendios
           fire_water_pond: Estanque de agua para incendios
           landing_site: Lugar de aterrizaje de emergencia
           life_ring: Salvavidas de emergencia
@@ -1791,6 +1791,24 @@ es:
       flash changed: Su contraseña ha sido cambiada.
       flash token bad: No se ha encontrado este elemento, ¿Quizá debería comprobar
         la URL?
+  profiles:
+    edit:
+      image: Imagen
+      gravatar:
+        gravatar: Usa Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: ¿Qué es Gravatar?
+        disabled: Gravatar se ha deshabilitado.
+        enabled: Se ha habilitado la visualización de su Gravatar.
+      new image: Añadir una imagen
+      keep image: Mantener la imagen actual
+      delete image: Eliminar la imagen actual
+      replace image: Reemplazar la imagen actual
+      image size hint: (las imágenes cuadradas de al menos 100x100 funcionan mejor)
+      home location: Lugar de origen
+      no home location: No ha introducido su lugar de origen.
+      update home location on click: ¿Actualizar su lugar de origen cuando pulses
+        sobre el mapa?
   sessions:
     new:
       title: Iniciar sesión
@@ -2718,22 +2736,6 @@ es:
           Dominio Público.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: ¿Qué es esto?
-      image: Imagen
-      gravatar:
-        gravatar: Usa Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: ¿Qué es Gravatar?
-        disabled: Gravatar se ha deshabilitado.
-        enabled: Se ha habilitado la visualización de su Gravatar.
-      new image: Añadir una imagen
-      keep image: Mantener la imagen actual
-      delete image: Eliminar la imagen actual
-      replace image: Reemplazar la imagen actual
-      image size hint: (las imágenes cuadradas de al menos 100x100 funcionan mejor)
-      home location: Lugar de origen
-      no home location: No ha introducido su lugar de origen.
-      update home location on click: ¿Actualizar su lugar de origen cuando pulses
-        sobre el mapa?
       save changes button: Guardar cambios
       make edits public button: Hacer que todas mis ediciones sean públicas
       return to profile: Regresar al perfil
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 18f6ba240..815a78909 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -614,7 +614,7 @@ et:
         emergency:
           ambulance_station: Kiirabijaam
           defibrillator: Defibrillaator
-          fire_xtinguisher: Tulekustuti
+          fire_extinguisher: Tulekustuti
           phone: Hädaabi telefon
         highway:
           bridleway: Ratsatee
@@ -1212,6 +1212,20 @@ et:
       reset: Lähtesta parool
       flash changed: Sinu parool on muudetud.
       flash token bad: Ei leitud sellist kinnituskoodi. Kontrolli URL-i.
+  profiles:
+    edit:
+      image: Pilt
+      gravatar:
+        gravatar: Kasuta Gravatari
+        what_is_gravatar: Mis on Gravatar?
+      new image: Lisa pilt
+      keep image: Säilitada praegune pilt
+      delete image: Eemalda praegune pilt
+      replace image: Asenda praegune pilt
+      image size hint: (ruudukujuline pilt mõõtudega vähemalt 100x100 on sobiv)
+      home location: Kodu asukoht
+      no home location: Sa pole oma kodu asukohta märkinud.
+      update home location on click: Kas uuendan kodu asukohta, kui klõpsan kaardil?
   sessions:
     new:
       title: Sisselogimine
@@ -2053,18 +2067,6 @@ et:
         agreed_with_pd: Samuti oled deklareerinud oma kaastöö autoriõigustest vabaks
           (Public Domain).
         link text: mis see on?
-      image: Pilt
-      gravatar:
-        gravatar: Kasuta Gravatari
-        what_is_gravatar: Mis on Gravatar?
-      new image: Lisa pilt
-      keep image: Säilitada praegune pilt
-      delete image: Eemalda praegune pilt
-      replace image: Asenda praegune pilt
-      image size hint: (ruudukujuline pilt mõõtudega vähemalt 100x100 on sobiv)
-      home location: Kodu asukoht
-      no home location: Sa pole oma kodu asukohta märkinud.
-      update home location on click: Kas uuendan kodu asukohta, kui klõpsan kaardil?
       save changes button: Salvesta muudatused
       make edits public button: Tee kõik minu muudatused avalikuks
       return to profile: Tagasi profiili juurde
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 3d8b442e4..e842a4a68 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -654,7 +654,7 @@ eu:
           sport: Kirol kluba
           "yes": Kluba
         craft:
-          beekeper: Erlezain
+          beekeeper: Erlezain
           blacksmith: Errementaria
           brewery: Garagardotegia
           carpenter: Zurgina
@@ -679,7 +679,7 @@ eu:
           ambulance_station: Anbulantzia geralekua
           assembly_point: Bilera Puntua
           defibrillator: Desfibriladorea
-          fire_xtinguisher: Su itzailgailu
+          fire_extinguisher: Su itzailgailu
           landing_site: Larrialdi lurreratze-gunea
           life_ring: Salbamendu-jaka
           phone: Larrialdi telefonoa
@@ -1511,6 +1511,24 @@ eu:
       reset: Pasahitza berrezarri
       flash changed: Zure pasahitza aldatu da.
       flash token bad: Token hori ez da aurkitu, URL egiaztatu beharbada?
+  profiles:
+    edit:
+      image: Irudia
+      gravatar:
+        gravatar: Gravatar erabili
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Zer da Gravatar?
+        disabled: Gravatar desgaitu da.
+        enabled: Zure Gravatar bistaratzea gaitu da.
+      new image: Irudi bat gehitu
+      keep image: Oraingo irudia mantendu
+      delete image: Oraingo irudia kendu
+      replace image: Oraingo irudia ordezkatu
+      image size hint: (gutxienez 100x100ko irudi koadroak hobeto funtzionatzen dute)
+      home location: Etxeko Kokalekua
+      no home location: Zure etxe-helbidea ez duzu txertatu.
+      update home location on click: Eguneratu etxeko kokalekua mapan klik egiten
+        dudanean?
   sessions:
     new:
       title: Saio-hasiera
@@ -2332,22 +2350,6 @@ eu:
         agreed_with_pd: Zure aldaketak domeinu publikoan egongo direla adierazi duzu.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: zer da hau?
-      image: Irudia
-      gravatar:
-        gravatar: Gravatar erabili
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Zer da Gravatar?
-        disabled: Gravatar desgaitu da.
-        enabled: Zure Gravatar bistaratzea gaitu da.
-      new image: Irudi bat gehitu
-      keep image: Oraingo irudia mantendu
-      delete image: Oraingo irudia kendu
-      replace image: Oraingo irudia ordezkatu
-      image size hint: (gutxienez 100x100ko irudi koadroak hobeto funtzionatzen dute)
-      home location: Etxeko Kokalekua
-      no home location: Zure etxe-helbidea ez duzu txertatu.
-      update home location on click: Eguneratu etxeko kokalekua mapan klik egiten
-        dudanean?
       save changes button: Aldaketak gorde
       make edits public button: Nire aldaketa guztiak publikoak egin
       return to profile: Profilera itzuli
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 7acf6fe01..a647637ed 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -61,16 +61,16 @@ fa:
         create: ارسال
       client_application:
         create: ثبت نام
-        update: بروزرسانی
+        update: روزآمدسازی
       doorkeeper_application:
         create: ثبت‌نام
-        update: بروزرسانی
+        update: روزآمدسازی
       redaction:
         create: ایجاد پاک‌سازی
-        update: ذخیرهٔ پاک‌سازی
+        update: ذخیره‌کردن پاک‌سازی
       trace:
         create: بارگذاری
-        update: ذخیرهٔ تغییرات
+        update: ذخیره‌کردن تغییرات
       user_block:
         create: ایجاد مسدودی
         update: روزآمدسازی مسدودی
@@ -1696,6 +1696,44 @@ fa:
       reset: بازنشانی گذرواژه
       flash changed: گذرواژهٔ شما عوض شد.
       flash token bad: توکن را نیافتید؟ نشانی را بررسی کنید شاید بیابید.
+  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: گراواتار غیرفعال شد.
+        enabled: نمایش گراواتار شما فعال شد.
+      new image: افزودن تصویر
+      keep image: نگه‌داشتن تصویر فعلی
+      delete image: حذف تصویر فعلی
+      replace image: ' تصویر فعلی را عوض کنید'
+      image size hint: (عکس مربعی با ابعاد حداقل 100×100 بهترین کارایی را دارد)
+      home location: موقعیت خانه
+      no home location: شما محل خانهٔ خودتان را وارد نکرده‌اید.
+      update home location on click: وقتی روی نقشه کلیک می‌کنم موقعیت خانه روزآمد
+        شود.
+    update:
+      success: نمایه ذخیره شد.
+      failure: ذخیره‌سازی نمایه انجام نشد.
   sessions:
     new:
       title: ورود
@@ -2498,8 +2536,10 @@ fa:
       my profile: نمایهٔ من
       my settings: تنظیمات من
       my comments: نظرات من
+      my_preferences: ترجیحات من
       blocks on me: مسدودی‌های من
       blocks by me: مسدودی‌های به دست من
+      edit_profile: ویرایش نمایه
       send message: ارسال پیام
       diary: روزنوشت
       edits: ویرایش‌ها
@@ -2591,23 +2631,7 @@ fa:
           باشد.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: این چیست؟
-      image: تصویر
-      gravatar:
-        gravatar: استفاده از Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Gravatar چیست؟
-        disabled: گراواتار غیرفعال شد.
-        enabled: نمایش گراواتار شما فعال شد.
-      new image: افزودن تصویر
-      keep image: نگه‌داشتن تصویر فعلی
-      delete image: حذف تصویر فعلی
-      replace image: ' تصویر فعلی را عوض کنید'
-      image size hint: (عکس مربعی با ابعاد حداقل 100×100 بهترین کارایی را دارد)
-      home location: موقعیت خانه
-      no home location: شما محل خانهٔ خودتان را وارد نکرده‌اید.
-      update home location on click: وقتی روی نقشه کلیک می‌کنم موقعیت خانه روزآمد
-        شود.
-      save changes button: ذخیرهٔ تغییرات
+      save changes button: ذخیره‌کردن تغییرات
       make edits public button: همهٔ ویرایش‌های من را عمومی کن
       return to profile: بازگشت به نمایه
       oauth1 settings: تنظیمات OAuth 1
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index eb2621770..b27d6891b 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -741,7 +741,7 @@ fi:
           sport: Urheiluseura
           "yes": Klubi
         craft:
-          beekeper: Mehiläishoitaja
+          beekeeper: Mehiläishoitaja
           brewery: Panimo
           carpenter: Puuseppä
           caterer: Pitopalvelu
@@ -762,7 +762,7 @@ fi:
           ambulance_station: Ensihoitoasema
           assembly_point: kohtaamispaikka
           defibrillator: Defibrillaattori
-          fire_xtinguisher: Palosammutin
+          fire_extinguisher: Palosammutin
           landing_site: Hätälaskualue
           life_ring: Pelastusrengas
           phone: Hätäpuhelin
@@ -1620,6 +1620,24 @@ fi:
       reset: Vaihda salasana
       flash changed: Salasanasi on vaihdettu.
       flash token bad: Tuntematon tunniste. Tarkista että URL on sama kuin postissasi.
+  profiles:
+    edit:
+      image: Kuva
+      gravatar:
+        gravatar: Käytä Gravataria
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Mikä on Gravatar?
+        disabled: Gravatar on poistettu käytöstä.
+        enabled: Gravatarisi näyttäminen on otettu käyttöön.
+      new image: Lisää kuva
+      keep image: Säilytä nykyinen kuva
+      delete image: Poista nykyinen kuva
+      replace image: Korvaa nykyinen kuva
+      image size hint: (parhaat kuvat ovat neliönmuotoisia, joiden koko on vähintään
+        100x100)
+      home location: Kotipaikka
+      no home location: Kotipaikkaa ei ole vielä määritetty.
+      update home location on click: Päivitä kotipaikka karttaa napsauttaessa
   sessions:
     new:
       title: Kirjautumissivu
@@ -2487,22 +2505,6 @@ fi:
           vapaita (Public Domain).
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Mitä tämä tarkoittaa?
-      image: Kuva
-      gravatar:
-        gravatar: Käytä Gravataria
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Mikä on Gravatar?
-        disabled: Gravatar on poistettu käytöstä.
-        enabled: Gravatarisi näyttäminen on otettu käyttöön.
-      new image: Lisää kuva
-      keep image: Säilytä nykyinen kuva
-      delete image: Poista nykyinen kuva
-      replace image: Korvaa nykyinen kuva
-      image size hint: (parhaat kuvat ovat neliönmuotoisia, joiden koko on vähintään
-        100x100)
-      home location: Kotipaikka
-      no home location: Kotipaikkaa ei ole vielä määritetty.
-      update home location on click: Päivitä kotipaikka karttaa napsauttaessa
       save changes button: Tallenna muutokset
       make edits public button: Tee muokkauksistani julkisia
       return to profile: Palaa käyttäjäsivulle
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 7a0c8122f..6478c5113 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -729,6 +729,13 @@ fit:
       heading: Unohditko salasanasi?
       email address: 'E-postiatressi:'
       new password button: Lähätä salasanan palautusohjeet
+  profiles:
+    edit:
+      new image: Lissää kuva
+      keep image: Säilytä nykynen kuva
+      delete image: Ota poies nykynen kuva
+      home location: 'Kotopaikka:'
+      no home location: Kotopaikkaa ei ole vielä määritetty.
   sessions:
     new:
       title: Lokkaussivu
@@ -983,11 +990,6 @@ fit:
         disabled link text: miksi en voi mookata?
       public editing note:
         heading: Julkinen mookkaus
-      new image: Lissää kuva
-      keep image: Säilytä nykynen kuva
-      delete image: Ota poies nykynen kuva
-      home location: 'Kotopaikka:'
-      no home location: Kotopaikkaa ei ole vielä määritetty.
       save changes button: Säästä muutokset
       make edits public button: Tee mookkauksistani julkisia
     go_public:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4e89db375..b418e7c14 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -828,7 +828,7 @@ fr:
           sport: Club de sport
           "yes": Club
         craft:
-          beekeper: Apiculteur
+          beekeeper: Apiculteur
           blacksmith: Forgeron
           brewery: Brasserie
           carpenter: Charpentier
@@ -858,7 +858,7 @@ fr:
           ambulance_station: Dépôt d’ambulances
           assembly_point: Point de rassemblement
           defibrillator: Défibrillateur
-          fire_xtinguisher: Extincteur
+          fire_extinguisher: Extincteur
           fire_water_pond: Bassin d’eau contre les incendies
           landing_site: Terrain d’atterrissage d’urgence
           life_ring: Bouée de sauvetage d’urgence
@@ -1814,6 +1814,29 @@ fr:
       reset: Réinitialiser le mot de passe
       flash changed: Votre mot de passe a été modifié.
       flash token bad: Ce jeton est introuvable, veuillez vérifier l’URL.
+  preferences:
+    edit:
+      cancel: Annuler
+  profiles:
+    edit:
+      cancel: Annuler
+      image: Image
+      gravatar:
+        gravatar: Utiliser Gravatar
+        link: https://wiki.openstreetmap.org/wiki/FR:Gravatar
+        what_is_gravatar: Qu’est-ce que Gravatar ?
+        disabled: Gravatar a été désactivé.
+        enabled: L’affichage de votre Gravatar a été activé.
+      new image: Ajouter une image
+      keep image: Garder l’image actuelle
+      delete image: Supprimer l’image actuelle
+      replace image: Remplacer l’image actuelle
+      image size hint: (les images carrées d’au moins 100×100 pixels fonctionnent
+        le mieux)
+      home location: Lieu de domicile
+      no home location: Vous n’avez pas indiqué votre lieu de domicile.
+      update home location on click: Mettre à jour mon lieu de domicile quand je clique
+        sur la carte ?
   sessions:
     new:
       title: Se connecter
@@ -2768,23 +2791,6 @@ fr:
           comme relevant du domaine public.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: qu’est-ce que ceci ?
-      image: Image
-      gravatar:
-        gravatar: Utiliser Gravatar
-        link: https://wiki.openstreetmap.org/wiki/FR:Gravatar
-        what_is_gravatar: Qu’est-ce que Gravatar ?
-        disabled: Gravatar a été désactivé.
-        enabled: L’affichage de votre Gravatar a été activé.
-      new image: Ajouter une image
-      keep image: Garder l’image actuelle
-      delete image: Supprimer l’image actuelle
-      replace image: Remplacer l’image actuelle
-      image size hint: (les images carrées d’au moins 100×100 pixels fonctionnent
-        le mieux)
-      home location: Lieu de domicile
-      no home location: Vous n’avez pas indiqué votre lieu de domicile.
-      update home location on click: Mettre à jour mon lieu de domicile quand je clique
-        sur la carte ?
       save changes button: Enregistrer les modifications
       make edits public button: Rendre toutes mes modifications publiques
       return to profile: Retour au profil
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index d6e3ae25b..d88b479c8 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -943,6 +943,20 @@ fur:
       heading: Azere la password par %{user}
       reset: Azere la password
       flash changed: La tô password e je stade cambiade.
+  profiles:
+    edit:
+      image: Figure
+      gravatar:
+        gravatar: Dopre Gravatar
+      new image: Zonte une figure
+      keep image: Ten la figure di cumò
+      delete image: Gjave la figure di cumò
+      replace image: Sostituìs la figure atuâl
+      image size hint: (figuris cuadris di almancul 100x100 a van miôr)
+      home location: Lûc iniziâl
+      no home location: No tu âs configurât il lûc iniziâl.
+      update home location on click: Aio di inzornâ il lûc iniziâl cuant che o frachi
+        parsore la mape?
   sessions:
     new:
       title: Jentre
@@ -1386,18 +1400,6 @@ fur:
         agreed_with_pd: Tu âs ancje declarât di considerâ i tiei cambiaments intal
           Public Domini.
         link text: ce isal chest?
-      image: Figure
-      gravatar:
-        gravatar: Dopre Gravatar
-      new image: Zonte une figure
-      keep image: Ten la figure di cumò
-      delete image: Gjave la figure di cumò
-      replace image: Sostituìs la figure atuâl
-      image size hint: (figuris cuadris di almancul 100x100 a van miôr)
-      home location: Lûc iniziâl
-      no home location: No tu âs configurât il lûc iniziâl.
-      update home location on click: Aio di inzornâ il lûc iniziâl cuant che o frachi
-        parsore la mape?
       save changes button: Salve cambiaments
       make edits public button: Rint publics ducj i miei cambiaments
       return to profile: Torne al profîl
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 884990de0..738a6c398 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -440,6 +440,9 @@ fy:
   passwords:
     lost_password:
       email address: 'E-mailadres:'
+  profiles:
+    edit:
+      image: 'Ôfbylding:'
   sessions:
     new:
       password: 'Wachtwurd:'
@@ -542,7 +545,6 @@ fy:
         link: http://wiki.openstreetmap.org/wiki/OpenID
       public editing:
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-      image: 'Ôfbylding:'
     index:
       title: Meidoggers
       heading: Meidoggers
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 3a0814017..93cf48ce5 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1334,6 +1334,18 @@ ga:
       flash changed: Athraíodh d'fhocal faire.
       flash token bad: Níor aimsíodh an ceadchomhartha sin, seiceáil an bhfuil an
         URL cruinn?
+  profiles:
+    edit:
+      image: Íomhá
+      gravatar:
+        gravatar: Úsáid Gravatar
+        disabled: Díchumasaíodh Gravatar.
+      new image: Cuir íomhá leis
+      keep image: Coinnigh an íomhá reatha
+      delete image: Bain an íomhá reatha
+      replace image: Ionadaigh an íomhá reatha
+      image size hint: (íomhá chearnógach atá 100x100 ar a laghad is fearr)
+      home location: Suíomh Baile
   sessions:
     new:
       title: Logáil isteach
@@ -1994,16 +2006,6 @@ ga:
         not yet agreed: Níor aontaigh tú leis na Téarmaí nua do Rannchuiditheoirí
           fós.
         link text: céard é seo?
-      image: Íomhá
-      gravatar:
-        gravatar: Úsáid Gravatar
-        disabled: Díchumasaíodh Gravatar.
-      new image: Cuir íomhá leis
-      keep image: Coinnigh an íomhá reatha
-      delete image: Bain an íomhá reatha
-      replace image: Ionadaigh an íomhá reatha
-      image size hint: (íomhá chearnógach atá 100x100 ar a laghad is fearr)
-      home location: Suíomh Baile
       save changes button: Sábháil na hAthruithe
     index:
       title: Úsáideoirí
diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 5bf32adc2..40d51a59d 100644
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -86,6 +86,12 @@ gcf:
       heading: Ou pèd kòd aw?
       email address: 'Adres imél aw :'
       new password button: Voyé on nouvo kòd
+  profiles:
+    edit:
+      home location: 'La ou ka rété :'
+      no home location: Ou po ko mèt la ou ka rété.
+      update home location on click: Eskè y fo modifié la ou ka rété lè ou ka kliké
+        asi kat la?
   sessions:
     new:
       heading: Konekté
@@ -157,10 +163,6 @@ gcf:
         enabled link text: Ka sa yé?
         disabled: Inaktif y pé pa édité doné ; tout édision pasé anonim.
         disabled link text: Poukwa an pé pa édité?
-      home location: 'La ou ka rété :'
-      no home location: Ou po ko mèt la ou ka rété.
-      update home location on click: Eskè y fo modifié la ou ka rété lè ou ka kliké
-        asi kat la?
       save changes button: Enrèjisré tout chanjman
       make edits public button: Mèt tou sa an fè piblik
       return to profile: Rouvin' asi pwofil la
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index f765e37cc..0ea775a47 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1174,6 +1174,21 @@ gd:
       flash changed: Chaidh am facal-faire agad atharrachadh.
       flash token bad: Cha do rinn sinn lorg air an tòcan ud, an toir thu sùil air
         an URL?
+  profiles:
+    edit:
+      image: 'Dealbh:'
+      gravatar:
+        gravatar: Cleachd Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+      new image: Cuir dealbh ris
+      keep image: Cum an dealbh làithreach
+      delete image: Thoir an dealbh làithreach air falbh
+      replace image: Cuir dealbh an àite an fhir làithrich
+      image size hint: (bidh dealbhan ceàrnach a bhios 100x100 no nas motha as fhearr)
+      home location: 'Far a bheil thu a'' fuireach:'
+      no home location: Cha do dh'innis thu far a bheil thu a' fuireach.
+      update home location on click: A bheil thu airson ùrachadh far a bheil thu a'
+        fuireach le briogadh air a' mhapa?
   sessions:
     new:
       title: Clàraich a-steach
@@ -1961,19 +1976,6 @@ gd:
           chur ris a' Public Domain.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Dè th`ann?
-      image: 'Dealbh:'
-      gravatar:
-        gravatar: Cleachd Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-      new image: Cuir dealbh ris
-      keep image: Cum an dealbh làithreach
-      delete image: Thoir an dealbh làithreach air falbh
-      replace image: Cuir dealbh an àite an fhir làithrich
-      image size hint: (bidh dealbhan ceàrnach a bhios 100x100 no nas motha as fhearr)
-      home location: 'Far a bheil thu a'' fuireach:'
-      no home location: Cha do dh'innis thu far a bheil thu a' fuireach.
-      update home location on click: A bheil thu airson ùrachadh far a bheil thu a'
-        fuireach le briogadh air a' mhapa?
       save changes button: Sàbhail na dh'atharraich thu
       make edits public button: Dèan fear poblach de gach deasachadh a rinn mi
       return to profile: Till dhan phròifil
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 12027fc92..e044c137a 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -753,7 +753,7 @@ gl:
           sport: Clube deportivo
           "yes": Clube
         craft:
-          beekeper: Apicultor
+          beekeeper: Apicultor
           blacksmith: Ferreiro
           brewery: Fábrica de cervexa
           carpenter: Carpinteiro
@@ -783,7 +783,7 @@ gl:
           ambulance_station: Base de ambulancias
           assembly_point: Punto de reagrupamento
           defibrillator: Desfibrilador
-          fire_xtinguisher: Extintor de lume
+          fire_extinguisher: Extintor de lume
           fire_water_pond: Reserva de auga para incendios
           landing_site: Lugar de aterraxe de emerxencia
           life_ring: Boia salvavidas
@@ -1725,6 +1725,24 @@ gl:
       flash changed: Mudouse o teu contrasinal.
       flash token bad: Non se atopou o pase. Quizabes tería que comprobar o enderezo
         URL.
+  profiles:
+    edit:
+      image: Imaxe
+      gravatar:
+        gravatar: Empregar o Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Que é o Gravatar?
+        disabled: Gravatar foi desactivado.
+        enabled: A visualización do teu Gravatar foi activada.
+      new image: Engadir unha imaxe
+      keep image: Manter a imaxe actual
+      delete image: Eliminar a imaxe actual
+      replace image: Substituír a imaxe actual
+      image size hint: (as imaxes cadradas de, polo menos, 100x100 funcionan mellor)
+      home location: Lugar de orixe
+      no home location: Non inseriches o teu lugar de orixe.
+      update home location on click: Desexas actualizar a túa localización ó premer
+        sobre o mapa?
   sessions:
     new:
       title: Rexistrarse
@@ -2653,22 +2671,6 @@ gl:
           dominio público.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: que é isto?
-      image: Imaxe
-      gravatar:
-        gravatar: Empregar o Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Que é o Gravatar?
-        disabled: Gravatar foi desactivado.
-        enabled: A visualización do teu Gravatar foi activada.
-      new image: Engadir unha imaxe
-      keep image: Manter a imaxe actual
-      delete image: Eliminar a imaxe actual
-      replace image: Substituír a imaxe actual
-      image size hint: (as imaxes cadradas de, polo menos, 100x100 funcionan mellor)
-      home location: Lugar de orixe
-      no home location: Non inseriches o teu lugar de orixe.
-      update home location on click: Desexas actualizar a túa localización ó premer
-        sobre o mapa?
       save changes button: Gardar as modificacións
       make edits public button: Facer públicas tódalas miñas edicións
       return to profile: Voltar ó perfil
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 3dc59c4c7..e65f30de4 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -793,7 +793,7 @@ he:
           sport: מועדון ספורט
           "yes": מועדון
         craft:
-          beekeper: כוורן
+          beekeeper: כוורן
           blacksmith: נפח
           brewery: מבשלת בירה
           carpenter: נגר
@@ -823,7 +823,7 @@ he:
           ambulance_station: תחנת אמבולנסים
           assembly_point: נקודת התאספות
           defibrillator: מפעם (דפיברילטור)
-          fire_xtinguisher: מטפה
+          fire_extinguisher: מטפה
           fire_water_pond: מאגר מים לכיבוי אש
           landing_site: אתר נחיתה בחירום
           life_ring: גלגל הצלה
@@ -1745,6 +1745,23 @@ he:
       reset: איפוס הסיסמה
       flash changed: סיסמתך שונתה.
       flash token bad: לא מצאנו את האסימון ההוא, אולי בדיקת הכתובת תעזור?
+  profiles:
+    edit:
+      image: תמונה
+      gravatar:
+        gravatar: להשתמש ב־Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: מה זה Gravatar?
+        disabled: הגראווטר כובה.
+        enabled: הצגת הגראווטר שלך הופעלה.
+      new image: הוספת תמונה
+      keep image: לשמירה על התמונה הנוכחית
+      delete image: להסרת התמונה הנוכחית
+      replace image: להחלפת התמונה הנוכחית
+      image size hint: (תמונה מרובעת בגודל 100x100 לפחות עובדת הכי טוב)
+      home location: מיקום ראשי
+      no home location: לא הזנת את מיקומך הראשי.
+      update home location on click: עדכון המיקום הראשי שלך בעת לחיצה על המפה?
   sessions:
     new:
       title: כניסה
@@ -2638,21 +2655,6 @@ he:
         agreed_with_pd: הצהרת גם שמבחינתך העריכות שלך יהיו בנחלת הכלל.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: מה זה?
-      image: תמונה
-      gravatar:
-        gravatar: להשתמש ב־Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: מה זה Gravatar?
-        disabled: הגראווטר כובה.
-        enabled: הצגת הגראווטר שלך הופעלה.
-      new image: הוספת תמונה
-      keep image: לשמירה על התמונה הנוכחית
-      delete image: להסרת התמונה הנוכחית
-      replace image: להחלפת התמונה הנוכחית
-      image size hint: (תמונה מרובעת בגודל 100x100 לפחות עובדת הכי טוב)
-      home location: מיקום ראשי
-      no home location: לא הזנת את מיקומך הראשי.
-      update home location on click: עדכון המיקום הראשי שלך בעת לחיצה על המפה?
       save changes button: שמירת השינויים
       make edits public button: להפוך את כל עריכותיי לציבוריות
       return to profile: חזרה לפרופיל
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index d83209d5c..3dd619d72 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -921,6 +921,13 @@ hi:
       new password button: Send me a new password
     reset_password:
       title: reset password
+  profiles:
+    edit:
+      new image: कोई तस्वीर लगाएं
+      keep image: इसी तस्वीर को रखें
+      delete image: इस तस्वीर को हटाएं
+      replace image: इस तस्वीर की जगह दूसरी लगाएं
+      home location: घर का स्थान
   site:
     about:
       partners_title: हमारे साथी
@@ -1012,11 +1019,6 @@ hi:
         disabled link text: मैं नक्षे में बदलाव क्यों नहीं कर पा रहा हूँ?
       contributor terms:
         link text: यह क्या है?
-      new image: कोई तस्वीर लगाएं
-      keep image: इसी तस्वीर को रखें
-      delete image: इस तस्वीर को हटाएं
-      replace image: इस तस्वीर की जगह दूसरी लगाएं
-      home location: घर का स्थान
       save changes button: बदलाव सहेजें
     index:
       title: सदस्य
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 133306fd8..db31365aa 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1219,6 +1219,19 @@ hr:
       reset: Reset lozinke
       flash changed: Vaša lozinka je promjenjena.
       flash token bad: Nije pronađen takav token, provjeri URL?
+  profiles:
+    edit:
+      image: 'Slika:'
+      gravatar:
+        gravatar: Koristi Gravatar
+      new image: Dodajte sliku
+      keep image: Zadržite trenutnu sliku
+      delete image: Uklonite trenutnu sliku
+      replace image: Zamijenite trenutnu sliku
+      image size hint: (kvadratne slike od barem 100x100 pixela rade najbolje)
+      home location: 'Dom:'
+      no home location: Niste unjeli lokaciju vašeg doma.
+      update home location on click: Ažuriraj lokaciju doma kada kliknem na kartu?
   sessions:
     new:
       title: Prijava
@@ -1825,17 +1838,6 @@ hr:
           i prihvati nove Uvjete doprinositelja.
         agreed_with_pd: Također ste proglasili da će vaše izmjene biti u javnom vlasništvu.
         link text: Å¡to je ovo?
-      image: 'Slika:'
-      gravatar:
-        gravatar: Koristi Gravatar
-      new image: Dodajte sliku
-      keep image: Zadržite trenutnu sliku
-      delete image: Uklonite trenutnu sliku
-      replace image: Zamijenite trenutnu sliku
-      image size hint: (kvadratne slike od barem 100x100 pixela rade najbolje)
-      home location: 'Dom:'
-      no home location: Niste unjeli lokaciju vašeg doma.
-      update home location on click: Ažuriraj lokaciju doma kada kliknem na kartu?
       save changes button: Snimi promjene
       make edits public button: Napravi sve moje promjene javnim
       return to profile: Vrati se na profil
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 70fa16584..cf9b1eb5a 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -650,7 +650,7 @@ hsb:
           sport: sportowe towarstwo
           "yes": towarstwo
         craft:
-          beekeper: pčołar
+          beekeeper: pčołar
           blacksmith: kowar
           brewery: piwarnja
           carpenter: ćěsla
@@ -1479,6 +1479,21 @@ hsb:
       reset: Hesło wróćo stajić
       flash changed: Twoje hesło je so změniło.
       flash token bad: Njemóžachmy tutón kod namakać, prošu přepruwuj URL.
+  profiles:
+    edit:
+      image: 'Wobraz:'
+      gravatar:
+        gravatar: Gravatar wužiwać
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+      new image: Wobraz přidać
+      keep image: Aktualny wobraz wobchować
+      delete image: Aktualny wobraz wotstronić
+      replace image: Aktualny wobraz narunać
+      image size hint: (kwadratiske wobrazy z wulkosću wot znajmjeńša 100x100 najlěpje
+        funguja)
+      home location: 'Domjace stejnišćo:'
+      no home location: Njejsy swoje domjace stejnišćo zapodał.
+      update home location on click: Domjace stejnišćo při kliknjenju na kartu aktualizować?
   sessions:
     new:
       title: Přizjewjenje
@@ -2223,19 +2238,6 @@ hsb:
           za sobuskutkowarjow přehladał a akceptował.
         agreed_with_pd: Sy tež deklarował, zo twoje změny su zjawne.
         link text: Å¡to to je?
-      image: 'Wobraz:'
-      gravatar:
-        gravatar: Gravatar wužiwać
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-      new image: Wobraz přidać
-      keep image: Aktualny wobraz wobchować
-      delete image: Aktualny wobraz wotstronić
-      replace image: Aktualny wobraz narunać
-      image size hint: (kwadratiske wobrazy z wulkosću wot znajmjeńša 100x100 najlěpje
-        funguja)
-      home location: 'Domjace stejnišćo:'
-      no home location: Njejsy swoje domjace stejnišćo zapodał.
-      update home location on click: Domjace stejnišćo při kliknjenju na kartu aktualizować?
       save changes button: Změny składować
       make edits public button: Wšě moje změny zjawne činić
       return to profile: Wróćo k profilej
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 1cf14adad..14a78fd59 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -763,7 +763,7 @@ hu:
           sport: Sportegyesület
           "yes": Klub
         craft:
-          beekeper: Méhészet
+          beekeeper: Méhészet
           blacksmith: Kovácsműhely
           brewery: Sörfőzde
           carpenter: Ács
@@ -793,7 +793,7 @@ hu:
           ambulance_station: Mentőállomás
           assembly_point: Gyülekezési pont
           defibrillator: Defibrillátor
-          fire_xtinguisher: Tűzoltó készülék
+          fire_extinguisher: Tűzoltó készülék
           fire_water_pond: Tűzivíz-medence
           landing_site: Vészhelyzeti leszállóhely
           life_ring: Mentőöv
@@ -1731,6 +1731,24 @@ hu:
       reset: Jelszó alaphelyzetbe állítása
       flash changed: Jelszavad megváltozott.
       flash token bad: Nem találtad meg a tokent? Esetleg ellenőrizd az URL-t.
+  profiles:
+    edit:
+      image: Kép
+      gravatar:
+        gravatar: Gravatar használata
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Mi az a Gravatar?
+        disabled: A Gravatar le van tiltva.
+        enabled: A Gravatar kép kijelzését bekapcsoltad.
+      new image: Kép hozzáadása
+      keep image: Jelenlegi kép megtartása
+      delete image: Jelenlegi kép eltávolítása
+      replace image: Jelenlegi kép cseréje
+      image size hint: (legalább 100x100 pixel nagyságú négyzetes kép javasolt)
+      home location: Otthon
+      no home location: Nem adtad meg az otthonod helyét.
+      update home location on click: Frissüljön-e az otthonom helye, amikor a térképre
+        kattintok?
   sessions:
     new:
       title: Bejelentkezés
@@ -2650,22 +2668,6 @@ hu:
         agreed_with_pd: Azt is kijelentetted, hogy a szerkesztéseid közkincsnek tekinthetők.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: mi ez?
-      image: Kép
-      gravatar:
-        gravatar: Gravatar használata
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Mi az a Gravatar?
-        disabled: A Gravatar le van tiltva.
-        enabled: A Gravatar kép kijelzését bekapcsoltad.
-      new image: Kép hozzáadása
-      keep image: Jelenlegi kép megtartása
-      delete image: Jelenlegi kép eltávolítása
-      replace image: Jelenlegi kép cseréje
-      image size hint: (legalább 100x100 pixel nagyságú négyzetes kép javasolt)
-      home location: Otthon
-      no home location: Nem adtad meg az otthonod helyét.
-      update home location on click: Frissüljön-e az otthonom helye, amikor a térképre
-        kattintok?
       save changes button: Módosítások mentése
       make edits public button: Szerkesztéseim nyilvánossá tétele
       return to profile: Vissza a profilhoz
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 3159cbd8a..d384ccb52 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -739,7 +739,7 @@ ia:
           sport: Club de sport
           "yes": Club
         craft:
-          beekeper: Apicultor
+          beekeeper: Apicultor
           blacksmith: Ferrero
           brewery: Fabrica de bira
           carpenter: Carpentero
@@ -769,7 +769,7 @@ ia:
           ambulance_station: Station de ambulantias
           assembly_point: Puncto de incontro
           defibrillator: Defibrillator
-          fire_xtinguisher: Extinctor de incendios
+          fire_extinguisher: Extinctor de incendios
           fire_water_pond: Bassino de aqua contra incendios
           landing_site: Loco de atterrage de emergentia
           life_ring: Boia de salvamento
@@ -1719,6 +1719,23 @@ ia:
       reset: Reinitialisar contrasigno
       flash changed: Tu contrasigno ha essite cambiate.
       flash token bad: Token non trovate. Verifica le URL.
+  profiles:
+    edit:
+      image: Imagine
+      gravatar:
+        gravatar: Usar Gravatar
+        what_is_gravatar: Que es Gravatar?
+        disabled: Gravatar ha essite disactivate.
+        enabled: Tu Gravatar ha essite activate e essera monstrate desde ora.
+      new image: Adder un imagine
+      keep image: Retener le imagine actual
+      delete image: Remover le imagine actual
+      replace image: Reimplaciar le imagine actual
+      image size hint: (imagines quadrate de al minus 100×100 functiona melio)
+      home location: Position de origine
+      no home location: Tu non ha entrate tu position de origine.
+      update home location on click: Actualisar le position de origine quando io clicca
+        super le carta?
   sessions:
     new:
       title: Aperir session
@@ -2636,21 +2653,6 @@ ia:
         agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
           liberate al Dominio Public.
         link text: que es isto?
-      image: Imagine
-      gravatar:
-        gravatar: Usar Gravatar
-        what_is_gravatar: Que es Gravatar?
-        disabled: Gravatar ha essite disactivate.
-        enabled: Tu Gravatar ha essite activate e essera monstrate desde ora.
-      new image: Adder un imagine
-      keep image: Retener le imagine actual
-      delete image: Remover le imagine actual
-      replace image: Reimplaciar le imagine actual
-      image size hint: (imagines quadrate de al minus 100×100 functiona melio)
-      home location: Position de origine
-      no home location: Tu non ha entrate tu position de origine.
-      update home location on click: Actualisar le position de origine quando io clicca
-        super le carta?
       save changes button: Salveguardar modificationes
       make edits public button: Render tote mi modificationes public
       return to profile: Retornar al profilo
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 766d9c4c5..5c4c62cab 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -702,7 +702,7 @@ id:
         club:
           sport: Klub Olahraga
         craft:
-          beekeper: Peternak Lebah
+          beekeeper: Peternak Lebah
           blacksmith: Tukang Besi
           brewery: Pabrik Bir
           carpenter: Tukang Kayu
@@ -723,7 +723,7 @@ id:
           ambulance_station: Pos Ambulans
           assembly_point: Titik Kumpul
           defibrillator: Alat Pacu Jantung
-          fire_xtinguisher: Alat Pemadam Api
+          fire_extinguisher: Alat Pemadam Api
           landing_site: Pintu Masuk Darurat
           life_ring: Ban Pelampung Darurat
           phone: Telepon Darurat
@@ -1604,6 +1604,24 @@ id:
       reset: Setel Ulang Kata Sandi
       flash changed: Kata sandi Anda telah diubah.
       flash token bad: Tidak dapat menemukan token tersebut, cek URL nya mungkin?
+  profiles:
+    edit:
+      image: Gambar
+      gravatar:
+        gravatar: Gunakan Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        disabled: Gravatar telah dinonaktifkan.
+        enabled: Tampilan dari Gravatar Anda telah diaktifkan.
+      new image: Tambahkan gambar
+      keep image: Gunakan gambar saat ini
+      delete image: Hapus gambar saat ini
+      replace image: Ganti gambar saat ini
+      image size hint: (kotak gambar yang dapat bekerja terbaik paling tidak berukuran
+        100x100)
+      home location: Lokasi Beranda
+      no home location: Anda telah memasukkan lokasi rumah Anda.
+      update home location on click: Memperbarui lokasi rumah ketika saya klik pada
+        peta?
   sessions:
     new:
       title: Login
@@ -2448,22 +2466,6 @@ id:
           Anda berada dalam Domain publik.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Apa ini?
-      image: Gambar
-      gravatar:
-        gravatar: Gunakan Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        disabled: Gravatar telah dinonaktifkan.
-        enabled: Tampilan dari Gravatar Anda telah diaktifkan.
-      new image: Tambahkan gambar
-      keep image: Gunakan gambar saat ini
-      delete image: Hapus gambar saat ini
-      replace image: Ganti gambar saat ini
-      image size hint: (kotak gambar yang dapat bekerja terbaik paling tidak berukuran
-        100x100)
-      home location: Lokasi Beranda
-      no home location: Anda telah memasukkan lokasi rumah Anda.
-      update home location on click: Memperbarui lokasi rumah ketika saya klik pada
-        peta?
       save changes button: Simpan Perubahan
       make edits public button: Membuat seluruh suntingan saya menjadi publik
       return to profile: Kembali ke profil
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 755ecb9c7..b057df483 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -723,7 +723,7 @@ is:
           sport: Íþróttaklúbbur
           "yes": Klúbbur
         craft:
-          beekeper: Býflugnabóndi
+          beekeeper: Býflugnabóndi
           blacksmith: Járnsmiður
           brewery: Brugghús
           carpenter: Trésmiður
@@ -753,7 +753,7 @@ is:
           ambulance_station: Sjúkrabílastöð
           assembly_point: Safnsvæði
           defibrillator: Hjartastuðtæki
-          fire_xtinguisher: Slökkvitæki
+          fire_extinguisher: Slökkvitæki
           fire_water_pond: Slökkviliðsvatnsból
           landing_site: Neyðarlending
           life_ring: Björgunarhringur
@@ -1652,6 +1652,23 @@ is:
       reset: Endurstilla lykilorð
       flash changed: Lykilorðinu þínu hefur verið breytt
       flash token bad: Þessi leynistrengur fannst ekki, kannski er slóðin röng?
+  profiles:
+    edit:
+      image: Mynd
+      gravatar:
+        gravatar: Nota Gravatar-auðkennismynd
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Hvað er Gravatar?
+        disabled: Gravatar-auðkennismynd hefur verið gerð óvirk.
+        enabled: Birting Gravatar-auðkennismyndar hefur verið gerð virk.
+      new image: Bæta við mynd
+      keep image: Halda þessari mynd
+      delete image: Eyða þessari mynd
+      replace image: Skipta út núverandi mynd
+      image size hint: (ferningslaga myndir minnst 100x100 dílar virka best)
+      home location: Upphafsstaðsetning
+      no home location: Þú hefur ekki stillt staðsetningu þína.
+      update home location on click: Uppfæra staðsetninguna þegar ég smelli á kortið
   sessions:
     new:
       title: Innskrá
@@ -2537,21 +2554,6 @@ is:
           almenningseigu (Public Domain).
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Hvað er þetta?
-      image: Mynd
-      gravatar:
-        gravatar: Nota Gravatar-auðkennismynd
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Hvað er Gravatar?
-        disabled: Gravatar-auðkennismynd hefur verið gerð óvirk.
-        enabled: Birting Gravatar-auðkennismyndar hefur verið gerð virk.
-      new image: Bæta við mynd
-      keep image: Halda þessari mynd
-      delete image: Eyða þessari mynd
-      replace image: Skipta út núverandi mynd
-      image size hint: (ferningslaga myndir minnst 100x100 dílar virka best)
-      home location: Upphafsstaðsetning
-      no home location: Þú hefur ekki stillt staðsetningu þína.
-      update home location on click: Uppfæra staðsetninguna þegar ég smelli á kortið
       save changes button: Vista breytingar
       make edits public button: Gera allar breytingarnar mínar opinberar
       return to profile: Aftur á mína síðu
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 443620df4..80a9694c3 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -791,7 +791,7 @@ it:
           sport: Circolo sportivo
           "yes": Circolo
         craft:
-          beekeper: Apicoltore
+          beekeeper: Apicoltore
           blacksmith: Fabbro
           brewery: Birrificio
           carpenter: Carpentiere
@@ -821,7 +821,7 @@ it:
           ambulance_station: Stazione delle ambulanze
           assembly_point: Punto di ritrovo
           defibrillator: Defibrillatore
-          fire_xtinguisher: Estintore
+          fire_extinguisher: Estintore
           fire_water_pond: Serbatoio d'acqua anti-incendio
           landing_site: Luogo per l'atterraggio di emergenza
           life_ring: Salvagente
@@ -906,6 +906,7 @@ it:
           railway: Ferrovia antica
           roman_road: Strada romana
           ruins: Rovine
+          rune_stone: Pietra runica
           stone: Pietra
           tomb: Tomba
           tower: Torre
@@ -1772,6 +1773,43 @@ it:
       flash changed: La propria password è stata modificata.
       flash token bad: Non è stato possibile trovare il codice. Controllare l'indirizzo
         URL.
+  preferences:
+    show:
+      title: Preferenze
+      preferred_editor: Editor preferito
+      preferred_languages: Lingue preferite
+      edit_preferences: Modifica preferenze
+    edit:
+      title: Modifica preferenze
+      save: Aggiorna preferenze
+      cancel: Annulla
+    update:
+      failure: Impossibile aggiornare le preferenze.
+    update_success_flash:
+      message: Le preferenze sono state aggiornate.
+  profiles:
+    edit:
+      title: Modifica profilo
+      save: Aggiorna profilo
+      cancel: Annulla
+      image: Immagine
+      gravatar:
+        gravatar: Usa Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Che cosa è un Gravatar?
+        disabled: Gravatar è stato disattivato.
+        enabled: La visualizzazione del vostro Gravatar è stata attivata.
+      new image: Aggiungi un'immagine
+      keep image: Mantieni l'immagine attuale
+      delete image: Rimuovi l'immagine attuale
+      replace image: Sostituisci l'immagine attuale
+      image size hint: (immagini quadrate di almeno 100x100 funzionano meglio)
+      home location: Posizione
+      no home location: Non si è inserita la propria posizione.
+      update home location on click: Aggiorna la posizione quando clicco sulla mappa?
+    update:
+      success: Il profilo è stato aggiornato.
+      failure: Impossibile aggiornare il profilo.
   sessions:
     new:
       title: Entra
@@ -2613,8 +2651,10 @@ it:
       my profile: Il mio profilo
       my settings: Impostazioni
       my comments: Miei commenti
+      my_preferences: Preferenze
       blocks on me: Blocchi su di me
       blocks by me: Blocchi applicati da me
+      edit_profile: Modifica profilo
       send message: Invia messaggio
       diary: Diario
       edits: Modifiche
@@ -2708,21 +2748,6 @@ it:
           fossero di pubblico dominio.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: che cos'è questo?
-      image: Immagine
-      gravatar:
-        gravatar: Usa Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Che cosa è un Gravatar?
-        disabled: Gravatar è stato disattivato.
-        enabled: La visualizzazione del vostro Gravatar è stata attivata.
-      new image: Aggiungi un'immagine
-      keep image: Mantieni l'immagine attuale
-      delete image: Rimuovi l'immagine attuale
-      replace image: Sostituisci l'immagine attuale
-      image size hint: (immagini quadrate di almeno 100x100 funzionano meglio)
-      home location: Posizione
-      no home location: Non si è inserita la propria posizione.
-      update home location on click: Aggiorna la posizione quando clicco sulla mappa?
       save changes button: Salva modifiche
       make edits public button: Rendi pubbliche tutte le mie modifiche
       return to profile: Ritorna al profilo
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e0a558d88..fbf606c25 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -766,7 +766,7 @@ ja:
           sport: スポーツクラブ
           "yes": クラブ
         craft:
-          beekeper: 養蜂家
+          beekeeper: 養蜂家
           blacksmith: 金属加工
           brewery: 醸造所
           carpenter: 工務店
@@ -796,7 +796,7 @@ ja:
           ambulance_station: 消防署
           assembly_point: 集合場所
           defibrillator: 自動体外式除細動器
-          fire_xtinguisher: 消火器
+          fire_extinguisher: 消火器
           fire_water_pond: 防火水槽
           landing_site: 緊急着陸地点
           life_ring: 救命浮き輪
@@ -1678,6 +1678,23 @@ ja:
       reset: パスワードを初期化
       flash changed: あなたのパスワードは変更されました。
       flash token bad: キーワードが見つかりません。URL を確認してください。
+  profiles:
+    edit:
+      image: 画像
+      gravatar:
+        gravatar: Gravatar を使用
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Gravatarってなに?
+        disabled: Gravatarは無効です。
+        enabled: Gravatarの表示が有効になりました。
+      new image: 画像を追加
+      keep image: 現在の画像を保持
+      delete image: 現在の画像を削除
+      replace image: 現在の画像を置換
+      image size hint: (100x100 以下の正方形の画像が最適)
+      home location: ホーム地点
+      no home location: あなたはまだホーム地点を登録していません。
+      update home location on click: ホーム地点を、地図上のクリックした地点に変更
   sessions:
     new:
       title: ログイン
@@ -2461,21 +2478,6 @@ ja:
         agreed_with_pd: また、あなたは、自分の編集結果がパブリックドメインにあるべきだと考えているということも宣言しています。
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: これは何ですか?
-      image: 画像
-      gravatar:
-        gravatar: Gravatar を使用
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Gravatarってなに?
-        disabled: Gravatarは無効です。
-        enabled: Gravatarの表示が有効になりました。
-      new image: 画像を追加
-      keep image: 現在の画像を保持
-      delete image: 現在の画像を削除
-      replace image: 現在の画像を置換
-      image size hint: (100x100 以下の正方形の画像が最適)
-      home location: ホーム地点
-      no home location: あなたはまだホーム地点を登録していません。
-      update home location on click: ホーム地点を、地図上のクリックした地点に変更
       save changes button: 変更を保存
       make edits public button: 自分の編集をすべて公開する
       return to profile: プロフィールに戻る
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 3052a7fc9..cb553a2d9 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -874,6 +874,11 @@ ka:
       email address: 'ელ. ფოსტის მისამართი:'
     reset_password:
       flash changed: თქვენი პაროლი შეიცვალა.
+  profiles:
+    edit:
+      image: 'სურათი:'
+      new image: სურათის დამატება
+      home location: 'ჩემი ადგილსამყოფელი:'
   sessions:
     new:
       title: შესვლა
@@ -1088,9 +1093,6 @@ ka:
         disabled link text: რატომ არ შემიძლია რედაქტირება?
       contributor terms:
         link text: რა არის ეს?
-      image: 'სურათი:'
-      new image: სურათის დამატება
-      home location: 'ჩემი ადგილსამყოფელი:'
       save changes button: ცვლილებების შენახვა
       return to profile: პროფილში დაბრუნება
     index:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 84d97a4b0..626b5a292 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -963,6 +963,17 @@ kab:
       reset: Ales awennez n wawal uffir
       flash changed: Awal-ik uffir ibeddel.
       flash token bad: Ajiṭun-agi ulac-it, ahat tuccḍa di tansa URL?
+  profiles:
+    edit:
+      image: 'Tugna:'
+      gravatar:
+        gravatar: Seqdec Gravatar
+      new image: Rbu tugna
+      delete image: Kkes tugna tamirant
+      replace image: Semselsi tugna tamirant
+      home location: 'Adig n uxxam:'
+      no home location: Ur tsekcemeḍ ara adig n uxxam-ik.
+      update home location on click: Snifel adig n uxxam-ik ticki siteɣ ɣef tkarḍa?
   sessions:
     new:
       title: Qqen
@@ -1370,15 +1381,6 @@ kab:
       contributor terms:
         heading: 'Tiwtilin n iwiziw:'
         link text: what is this?
-      image: 'Tugna:'
-      gravatar:
-        gravatar: Seqdec Gravatar
-      new image: Rbu tugna
-      delete image: Kkes tugna tamirant
-      replace image: Semselsi tugna tamirant
-      home location: 'Adig n uxxam:'
-      no home location: Ur tsekcemeḍ ara adig n uxxam-ik.
-      update home location on click: Snifel adig n uxxam-ik ticki siteɣ ɣef tkarḍa?
       save changes button: Sekles asnifel
       make edits public button: Err akk tiẓrigin-iw s tizuyaz
       return to profile: Uɣal ar umaɣnu
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 219684522..94cb67bed 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -699,7 +699,7 @@ ko:
           sport: 스포츠 클럽
           "yes": 클럽
         craft:
-          beekeper: 양봉장
+          beekeeper: 양봉장
           blacksmith: 대장간
           brewery: 양조장
           carpenter: 목공
@@ -1553,6 +1553,23 @@ ko:
       reset: 비밀번호 재설정
       flash changed: 비밀번호가 바뀌었습니다.
       flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까?
+  profiles:
+    edit:
+      image: 이미지
+      gravatar:
+        gravatar: Gravatar 사용
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Gravatar는 무엇입니까?
+        disabled: 그라바타가 비활성화되었습니다.
+        enabled: 그라바타의 표시가 활성화되었습니다
+      new image: 그림 추가
+      keep image: 현재 그림 유지
+      delete image: 현재 그림 제거
+      replace image: 현재 그림 바꾸기
+      image size hint: (100x100 이하의 정사각형 그림이 최적)
+      home location: 집 위치
+      no home location: 집 위치를 입력하지 않았습니다.
+      update home location on click: 지도에서 클릭하면 집 위치로 업데이트할까요?
   sessions:
     new:
       title: 로그인
@@ -2368,21 +2385,6 @@ ko:
         agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: 무엇인가요?
-      image: 이미지
-      gravatar:
-        gravatar: Gravatar 사용
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Gravatar는 무엇입니까?
-        disabled: 그라바타가 비활성화되었습니다.
-        enabled: 그라바타의 표시가 활성화되었습니다
-      new image: 그림 추가
-      keep image: 현재 그림 유지
-      delete image: 현재 그림 제거
-      replace image: 현재 그림 바꾸기
-      image size hint: (100x100 이하의 정사각형 그림이 최적)
-      home location: 집 위치
-      no home location: 집 위치를 입력하지 않았습니다.
-      update home location on click: 지도에서 클릭하면 집 위치로 업데이트할까요?
       save changes button: 변경사항 저장
       make edits public button: 내 편집을 공개하기
       return to profile: 프로필로 돌아가기
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 36d33e7da..8a79a775e 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -738,7 +738,7 @@ ku-Latn:
           sport: Kluba Sporê
           "yes": Klub
         craft:
-          beekeper: Mêşvan
+          beekeeper: Mêşvan
           blacksmith: Hesinkar
           brewery: Febrîqayê Bîrayê
           carpenter: Xerat
@@ -768,7 +768,7 @@ ku-Latn:
           ambulance_station: Stasyona Ambûlansê
           assembly_point: Cihê Civînê
           defibrillator: Defîbrîllator
-          fire_xtinguisher: Agirkuj
+          fire_extinguisher: Agirkuj
           fire_water_pond: Hewza Ava Agirî
           landing_site: Cihê Daketinê yê ji bo Rewşa Acîl
           life_ring: Xeleka Cenxelaskirinê
@@ -1722,6 +1722,25 @@ ku-Latn:
       flash changed: Şîfreya te hate guhertin.
       flash token bad: Eger te vê sembolê nedîtibe, belkî jî divê tu URLyê kontrol
         bikî?
+  profiles:
+    edit:
+      image: Wêne
+      gravatar:
+        gravatar: Gravatarê bi kar bîne
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Gravatar çi ye?
+        disabled: Gravatar hate neçalakkirin.
+        enabled: Gravatarê te niha dikare were xuyan.
+      new image: Wêneyek lê zêde bike
+      keep image: Rismê ku lê ye bila bimîne
+      delete image: Rismê ku lê ye rabike
+      replace image: Rismê ku lê ye biguherîne
+      image size hint: (wêneyên ku herî kêm ji 100x100 kareyan pêk werin, çêtir têne
+        xuyan)
+      home location: Cihê malê te
+      no home location: Te cihê malê xwe diyar nekir.
+      update home location on click: Gava ku tu bitikînî ser nexşeyê bila cihê malê
+        te were rojanekirin?
   sessions:
     new:
       title: Têkeve
@@ -2599,23 +2618,6 @@ ku-Latn:
           Giştî were qebûlkirin.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Ev çi ye?
-      image: Wêne
-      gravatar:
-        gravatar: Gravatarê bi kar bîne
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Gravatar çi ye?
-        disabled: Gravatar hate neçalakkirin.
-        enabled: Gravatarê te niha dikare were xuyan.
-      new image: Wêneyek lê zêde bike
-      keep image: Rismê ku lê ye bila bimîne
-      delete image: Rismê ku lê ye rabike
-      replace image: Rismê ku lê ye biguherîne
-      image size hint: (wêneyên ku herî kêm ji 100x100 kareyan pêk werin, çêtir têne
-        xuyan)
-      home location: Cihê malê te
-      no home location: Te cihê malê xwe diyar nekir.
-      update home location on click: Gava ku tu bitikînî ser nexşeyê bila cihê malê
-        te were rojanekirin?
       save changes button: Guherandinan qeyd bike
       make edits public button: Hemû guherandinên min bila ji her kesê re vekirî be
       return to profile: Vegere profîlê
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index ce3e701df..7bf524a71 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -468,7 +468,7 @@ lb:
         club:
           sport: Sportsclub
         craft:
-          beekeper: Beiemann
+          beekeeper: Beiemann
           brewery: Brauerei
           carpenter: Zammermann
           electrician: Elektriker
@@ -481,7 +481,7 @@ lb:
         emergency:
           access_point: Zougangspunkt
           defibrillator: Defibrillator
-          fire_xtinguisher: Feierläscher
+          fire_extinguisher: Feierläscher
           phone: Noutruff-Telefon
           "yes": Urgence
         highway:
@@ -927,6 +927,16 @@ lb:
       heading: Passwuert fir %{user} zrécksetzen
       reset: Passwuert zrécksetzen
       flash changed: Äert Passwuert gouf geännert.
+  profiles:
+    edit:
+      image: Bild
+      gravatar:
+        disabled: Gravatar gouf desaktivéiert.
+        enabled: D'Weise vun Ärem Gravatar gouf aktivéiert.
+      new image: E Bild derbäisetzen
+      keep image: Dat aktuellt Bild behalen
+      delete image: Dat aktuellt Bild ewechhuelen
+      replace image: Dat aktuellt Bild ersetzen
   sessions:
     new:
       title: Umellen
@@ -1310,14 +1320,6 @@ lb:
         disabled link text: Firwat kann ech net änneren?
       contributor terms:
         link text: wat ass dëst?
-      image: Bild
-      gravatar:
-        disabled: Gravatar gouf desaktivéiert.
-        enabled: D'Weise vun Ärem Gravatar gouf aktivéiert.
-      new image: E Bild derbäisetzen
-      keep image: Dat aktuellt Bild behalen
-      delete image: Dat aktuellt Bild ewechhuelen
-      replace image: Dat aktuellt Bild ersetzen
       save changes button: Ännerunge späicheren
       make edits public button: All meng Ännerunge ëffentlech maachen
       return to profile: 'Zréck op de Profil:'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 0f8f782ff..255872da1 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1413,6 +1413,23 @@ lt:
       reset: Iš naujo nustatyti slaptažodį
       flash changed: Jūsų slaptažodis sėkmingai pakeistas.
       flash token bad: Ženklas nerastas, galbūt bloga nuoroda?
+  profiles:
+    edit:
+      image: 'Nuotrauka:'
+      gravatar:
+        gravatar: Naudoti Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        disabled: Gravatar buvo išjungtas.
+        enabled: Jūsų Gravatar rodymas įjungtas.
+      new image: Pridėti nuotrauką
+      keep image: Palikti dabartinę nuotrauką
+      delete image: Pašalintį dabartinę nuotrauką
+      replace image: Pakeisti dabartinę nuotrauką
+      image size hint: (geriausiai atrodo kvadratinės, ne mažesnės nei 100x100 taškų
+        dydžio nuotraukos)
+      home location: Namų pozicija
+      no home location: Jūs neįvedėte savo namų pozicijos
+      update home location on click: Atnaujinti namų poziciją paspaudus ant žemėlapio?
   sessions:
     new:
       title: Prisijungti
@@ -2228,21 +2245,6 @@ lt:
           naudojimo.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: kas tai?
-      image: 'Nuotrauka:'
-      gravatar:
-        gravatar: Naudoti Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        disabled: Gravatar buvo išjungtas.
-        enabled: Jūsų Gravatar rodymas įjungtas.
-      new image: Pridėti nuotrauką
-      keep image: Palikti dabartinę nuotrauką
-      delete image: Pašalintį dabartinę nuotrauką
-      replace image: Pakeisti dabartinę nuotrauką
-      image size hint: (geriausiai atrodo kvadratinės, ne mažesnės nei 100x100 taškų
-        dydžio nuotraukos)
-      home location: Namų pozicija
-      no home location: Jūs neįvedėte savo namų pozicijos
-      update home location on click: Atnaujinti namų poziciją paspaudus ant žemėlapio?
       save changes button: Įrašyti pakeitimus
       make edits public button: Padaryti visus mano pakeitimus viešais
       return to profile: Grįžti į profilį
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index f1384c043..08bede1ca 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1247,6 +1247,22 @@ lv:
       reset: Atcelt paroli
       flash changed: Jūsu parole ir nomainīta.
       flash token bad: Neatradu to pilnvaru, varbūt pārbaudi URL?
+  profiles:
+    edit:
+      image: 'Attēls:'
+      gravatar:
+        gravatar: Izmantot Gravatar
+        disabled: Gravatar ir atspējots.
+        enabled: Jūsu Gravatar apskate ir iespējota
+      new image: Pievienot attēlu
+      keep image: Paturēt pašreizējo attēlu
+      delete image: Novākt pašreizējo attēlu
+      replace image: Aizstāt pašreizējo attēlu
+      image size hint: (vislabāk der kvadrātveida attēli vismaz 100x100 izmērā)
+      home location: 'Māju atrašanās vieta:'
+      no home location: Jūs neesat norādījis mājas atrašanās vietu.
+      update home location on click: Atjaunināt māju atrašanās vietu, noklikšķinot
+        uz kartes?
   sessions:
     new:
       title: Pieslēgties
@@ -2021,20 +2037,6 @@ lv:
         agreed_with_pd: Tu arī esi paziņojis, ka tavi labojumi var būt Publiskajā
           Domēnā.
         link text: kas tas ir?
-      image: 'Attēls:'
-      gravatar:
-        gravatar: Izmantot Gravatar
-        disabled: Gravatar ir atspējots.
-        enabled: Jūsu Gravatar apskate ir iespējota
-      new image: Pievienot attēlu
-      keep image: Paturēt pašreizējo attēlu
-      delete image: Novākt pašreizējo attēlu
-      replace image: Aizstāt pašreizējo attēlu
-      image size hint: (vislabāk der kvadrātveida attēli vismaz 100x100 izmērā)
-      home location: 'Māju atrašanās vieta:'
-      no home location: Jūs neesat norādījis mājas atrašanās vietu.
-      update home location on click: Atjaunināt māju atrašanās vietu, noklikšķinot
-        uz kartes?
       save changes button: Saglabāt izmaiņas
       make edits public button: Padarīt visus manus labojumus publiskus
       return to profile: Atgriezties pie profila
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index e4e63c3b6..1ceca0a5b 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -745,7 +745,7 @@ mk:
           sport: Спортски клуб
           "yes": Клуб
         craft:
-          beekeper: Пчелар
+          beekeeper: Пчелар
           blacksmith: Ковач
           brewery: Пиварница
           carpenter: Столар
@@ -775,7 +775,7 @@ mk:
           ambulance_station: Итна помош
           assembly_point: Собиралиште
           defibrillator: Дефибрилатор
-          fire_xtinguisher: Противпожарен апарат
+          fire_extinguisher: Противпожарен апарат
           fire_water_pond: Езерце за гаснење пожари
           landing_site: Место за итно слетување
           life_ring: Спасителен појас
@@ -860,6 +860,7 @@ mk:
           railway: Историска железница
           roman_road: Римски пат
           ruins: Рушевини
+          rune_stone: Рунски камен
           stone: Камен
           tomb: Гроб
           tower: Кула
@@ -1715,6 +1716,24 @@ mk:
       reset: Смени лозинка
       flash changed: Лозинката ви е сменета.
       flash token bad: Не ја пронајдов таа шифра. Проверете ја URL-адресата.
+  profiles:
+    edit:
+      image: Слика
+      gravatar:
+        gravatar: Користи Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=mk
+        what_is_gravatar: Што е тоа Gravatar?
+        disabled: Граватарот е исклучен.
+        enabled: Вашиот граватар е вклучен.
+      new image: Додај слика
+      keep image: Задржи ја тековната слика
+      delete image: Отстрани тековна слика
+      replace image: Замени тековна слика
+      image size hint: (најдобро работат квадратни слики, барем 100x100)
+      home location: Матична местоположба
+      no home location: Немате внесено матична местоположба.
+      update home location on click: Подновувај ја матичната местоположба кога ќе
+        стиснам на картата
   sessions:
     new:
       title: Најава
@@ -1950,8 +1969,8 @@ mk:
           href="https://wiki.openstreetmap.org/wiki/Contributors">Учесници</a> на викито на OpenStreetMap.
         contributors_footer_2_html: |-
           Употребата на податоците на OpenStreetMap не подразбира дека добавувачот
-          на изворните податоци го застапува или рекламира OpenStreetMap, дава било каква гаранција, или
-          дека прифаќа било каква одговорност.
+          на изворните податоци го застапува или рекламира OpenStreetMap, дава каква било гаранција, или
+          дека прифаќа каква било одговорност.
         infringement_title_html: Прекршување на авторските права
         infringement_1_html: |-
           Би сакале да ги потсетиме учесниците на OSM дека никогаш не смеат да ставаат
@@ -2649,22 +2668,6 @@ mk:
           сопственост.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=mk
         link text: што е ова?
-      image: Слика
-      gravatar:
-        gravatar: Користи Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=mk
-        what_is_gravatar: Што е тоа Gravatar?
-        disabled: Граватарот е исклучен.
-        enabled: Вашиот граватар е вклучен.
-      new image: Додај слика
-      keep image: Задржи ја тековната слика
-      delete image: Отстрани тековна слика
-      replace image: Замени тековна слика
-      image size hint: (најдобро работат квадратни слики, барем 100x100)
-      home location: Матична местоположба
-      no home location: Немате внесено матична местоположба.
-      update home location on click: Подновувај ја матичната местоположба кога ќе
-        стиснам на картата
       save changes button: Зачувај ги промените
       make edits public button: Објавувај ми ги сите уредувања
       return to profile: Назад кон профилот
diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 6b392e7dd..5e89833b7 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -575,6 +575,13 @@ mo:
       heading: Аць уйтат парола?
       email address: 'Адреса де поштэ електроникэ:'
       new password button: Рестабилиря паролей
+  profiles:
+    edit:
+      image: 'Имаӂине:'
+      gravatar:
+        gravatar: Фолосиря Граватарулуй
+      new image: Адэугаря имаӂиний
+      home location: 'Локул де решединцэ:'
   sessions:
     new:
       title: Презентаци-вэ
@@ -642,10 +649,5 @@ mo:
         enabled link text: че май есте ши аста?
       contributor terms:
         link text: че май есте ши аста?
-      image: 'Имаӂине:'
-      gravatar:
-        gravatar: Фолосиря Граватарулуй
-      new image: Адэугаря имаӂиний
-      home location: 'Локул де решединцэ:'
       save changes button: Апликаря модификэрилор
 ...
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 73ec16fd9..4ece7ef62 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -920,6 +920,16 @@ mr:
       heading: '%{user}साठी परवलीचा शब्द पुनर्स्थापित करा'
       reset: परवलीचा शब्द पुनर्स्थापित करा
       flash changed: आपला परवलीचा शब्द बदलण्यात आला आहे.
+  profiles:
+    edit:
+      image: 'चित्र:'
+      gravatar:
+        gravatar: Gravatar वापरा
+      new image: चित्र जोडा
+      keep image: वर्तमान चित्र राखा
+      delete image: वर्तमान चित्र काढून टाका
+      replace image: वर्तमान चित्र बदला
+      image size hint: (किमान १००x१०० आकाराची चौरस चित्रे उत्तम)
   sessions:
     new:
       title: सनोंद प्रवेश करा
@@ -1271,14 +1281,6 @@ mr:
         disabled link text: मी संपादन कां करू शकत नाही?
       contributor terms:
         link text: हे काय आहे?
-      image: 'चित्र:'
-      gravatar:
-        gravatar: Gravatar वापरा
-      new image: चित्र जोडा
-      keep image: वर्तमान चित्र राखा
-      delete image: वर्तमान चित्र काढून टाका
-      replace image: वर्तमान चित्र बदला
-      image size hint: (किमान १००x१०० आकाराची चौरस चित्रे उत्तम)
       save changes button: बदल जतन करा
     index:
       title: सदस्य
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 58ac27d0a..2ccd6d6e4 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -597,7 +597,7 @@ ms:
         emergency:
           ambulance_station: Stesen Ambulan
           defibrillator: Defibrilator
-          fire_xtinguisher: Alat Pemadam Api
+          fire_extinguisher: Alat Pemadam Api
           landing_site: Tapak pendaratan kecemasan
           phone: Telefon Kecemasan
           "yes": Kecemasan
@@ -1291,6 +1291,22 @@ ms:
       reset: Set Semula Kata Laluan
       flash changed: Kata laluan anda telah ditukar.
       flash token bad: Token itu tidak dijumpai; sila semak URL-nya.
+  profiles:
+    edit:
+      image: 'Imej:'
+      gravatar:
+        gravatar: Gunakan Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+      new image: Tambahkan imej
+      keep image: Simpan imej semasa
+      delete image: Buang imej semasa
+      replace image: Ganti imej semasa
+      image size hint: (imej segi empat sama yang sekurang-kurangnya 100x100 adalah
+        paling bagus)
+      home location: 'Lokasi Rumah:'
+      no home location: Anda belum memasukkan lokasi rumah anda.
+      update home location on click: Adakah anda ingin mengemaskinikan lokasi rumah
+        dengan mengklik pada peta?
   sessions:
     new:
       title: Log masuk
@@ -2041,20 +2057,6 @@ ms:
         agreed_with_pd: Anda juga telah mengisytiharkan bahawa anda menganggap suntingan-suntingan
           anda sebagai berada dalam Domain Awam.
         link text: apakah ini?
-      image: 'Imej:'
-      gravatar:
-        gravatar: Gunakan Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-      new image: Tambahkan imej
-      keep image: Simpan imej semasa
-      delete image: Buang imej semasa
-      replace image: Ganti imej semasa
-      image size hint: (imej segi empat sama yang sekurang-kurangnya 100x100 adalah
-        paling bagus)
-      home location: 'Lokasi Rumah:'
-      no home location: Anda belum memasukkan lokasi rumah anda.
-      update home location on click: Adakah anda ingin mengemaskinikan lokasi rumah
-        dengan mengklik pada peta?
       save changes button: Simpan Perubahan
       make edits public button: Umumkan semua suntingan saya
       return to profile: Kembali ke profil
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index a877f8b70..83cf38fc0 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -706,7 +706,7 @@ nb:
           sport: Sportsklubb
           "yes": Klubb
         craft:
-          beekeper: Birøkter
+          beekeeper: Birøkter
           blacksmith: Smed
           brewery: Bryggeri
           carpenter: Tømrer
@@ -728,7 +728,7 @@ nb:
           ambulance_station: Ambulansestasjon
           assembly_point: Samlingsplass
           defibrillator: Hjertestarter
-          fire_xtinguisher: Brannslukker
+          fire_extinguisher: Brannslukker
           landing_site: Nødlandingsplass
           phone: Nødtelefon
           water_tank: Nødvanntank
@@ -1521,6 +1521,23 @@ nb:
       reset: Nullstill passord
       flash changed: Ditt passord er endret.
       flash token bad: Kunne ikke finne den nøkkelen. Sjekke URLen kanskje?
+  profiles:
+    edit:
+      image: Bilde
+      gravatar:
+        gravatar: Bruk Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Hva er Gravatar?
+        disabled: Gravatar har blitt slått av.
+        enabled: Visning av din Gravatar er slått på.
+      new image: Legg til et bilde
+      keep image: Behold gjeldende bilde
+      delete image: Fjern gjeldende bilde
+      replace image: Erstatt gjeldende bilde
+      image size hint: (kvadratiske bilder som er minst 100x100 fungerer best)
+      home location: Hjemmeposisjon
+      no home location: Du har ikke angitt din hjemmeposisjon.
+      update home location on click: Oppdater hjemmeposisjon når jeg klikker på kartet?
   sessions:
     new:
       title: Logg inn
@@ -2346,21 +2363,6 @@ nb:
           offentlig eiendom (Public Domain).
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: hva er dette?
-      image: Bilde
-      gravatar:
-        gravatar: Bruk Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Hva er Gravatar?
-        disabled: Gravatar har blitt slått av.
-        enabled: Visning av din Gravatar er slått på.
-      new image: Legg til et bilde
-      keep image: Behold gjeldende bilde
-      delete image: Fjern gjeldende bilde
-      replace image: Erstatt gjeldende bilde
-      image size hint: (kvadratiske bilder som er minst 100x100 fungerer best)
-      home location: Hjemmeposisjon
-      no home location: Du har ikke angitt din hjemmeposisjon.
-      update home location on click: Oppdater hjemmeposisjon når jeg klikker på kartet?
       save changes button: Lagre endringer
       make edits public button: Gjør alle mine redigeringer offentlig
       return to profile: Returner til profil
diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 46b31f834..6c96a64ff 100644
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -441,6 +441,11 @@ nds:
       heading: Passwoord för %{user} trüchsetten
       reset: Passwoord trüchsetten
       flash changed: Dien Passwoord is nu ännert.
+  profiles:
+    edit:
+      image: 'Bild:'
+      new image: Bild tofögen
+      no home location: Du hest dien Standoort nich angeven.
   sessions:
     new:
       title: Anmellen
@@ -596,9 +601,6 @@ nds:
       public editing:
         enabled link text: Wat is dat?
         disabled link text: Worüm kann ik nix ännern?
-      image: 'Bild:'
-      new image: Bild tofögen
-      no home location: Du hest dien Standoort nich angeven.
       save changes button: Ännern spiekern
       make edits public button: All mien Ännern apen wiesen
       return to profile: Trüch na’t Profil
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index c6d449842..5e2f66c15 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -895,6 +895,11 @@ ne:
       heading: '%{user}को लागि प्रवेस शब्द परिवर्तन गर्ने'
       reset: नयाँ प्रवेशशव्द
       flash changed: तपाईंको प्रवेश शब्द परिवर्तन गरिएको छ।
+  profiles:
+    edit:
+      image: 'चित्र:'
+      home location: 'गृह स्थान:'
+      no home location: तपाईंले आफ्नो गृहस्थान प्रविष्ठ गर्नुभएको छैन।
   sessions:
     new:
       title: प्रवेश
@@ -1164,9 +1169,6 @@ ne:
         heading: सार्वजनिक सम्पादन
       contributor terms:
         link text: यो के हो ?
-      image: 'चित्र:'
-      home location: 'गृह स्थान:'
-      no home location: तपाईंले आफ्नो गृहस्थान प्रविष्ठ गर्नुभएको छैन।
       save changes button: परिवर्तनहरू संग्रह गर्नुहोस्
       flash update success confirm needed: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक
         गरियो। Check your email for a note to confirm your new email address.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index bdbcb613a..7492649f6 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -795,7 +795,7 @@ nl:
           sport: Sportclub
           "yes": Club
         craft:
-          beekeper: Imker
+          beekeeper: Imker
           blacksmith: Smid
           brewery: Brouwerij
           carpenter: Timmerman
@@ -825,7 +825,7 @@ nl:
           ambulance_station: Ambulancepost
           assembly_point: Verzamelplaats
           defibrillator: Defibrillator
-          fire_xtinguisher: Brandblusser
+          fire_extinguisher: Brandblusser
           fire_water_pond: Bluswaterreservoir
           landing_site: Noodlandingsbaan
           life_ring: Reddingsboei
@@ -1774,6 +1774,24 @@ nl:
       reset: Wachtwoord opnieuw instellen
       flash changed: Uw wachtwoord is gewijzigd.
       flash token bad: Het token kon niet gevonden worden. Controleer de URL.
+  profiles:
+    edit:
+      image: Afbeelding
+      gravatar:
+        gravatar: Gravatar gebruiken
+        link: https://wiki.openstreetmap.org/wiki/NL:Gravatar
+        what_is_gravatar: Wat is Gravatar?
+        disabled: Gravatar is uitgeschakeld.
+        enabled: Het weergeven van uw Gravatar is ingeschakeld.
+      new image: Afbeelding toevoegen
+      keep image: Huidige afbeelding behouden
+      delete image: Huidige afbeelding verwijderen
+      replace image: Huidige afbeelding vervangen
+      image size hint: (vierkante afbeeldingen van minstens 100x100 pixels werken
+        het beste)
+      home location: Thuislocatie
+      no home location: Er is geen thuislocatie ingevoerd.
+      update home location on click: Thuislocatie aanpassen bij klikken op de kaart
   sessions:
     new:
       title: Aanmelden
@@ -2715,22 +2733,6 @@ nl:
           Publieke domein.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: wat is dit?
-      image: Afbeelding
-      gravatar:
-        gravatar: Gravatar gebruiken
-        link: https://wiki.openstreetmap.org/wiki/NL:Gravatar
-        what_is_gravatar: Wat is Gravatar?
-        disabled: Gravatar is uitgeschakeld.
-        enabled: Het weergeven van uw Gravatar is ingeschakeld.
-      new image: Afbeelding toevoegen
-      keep image: Huidige afbeelding behouden
-      delete image: Huidige afbeelding verwijderen
-      replace image: Huidige afbeelding vervangen
-      image size hint: (vierkante afbeeldingen van minstens 100x100 pixels werken
-        het beste)
-      home location: Thuislocatie
-      no home location: Er is geen thuislocatie ingevoerd.
-      update home location on click: Thuislocatie aanpassen bij klikken op de kaart
       save changes button: Wijzigingen opslaan
       make edits public button: Al mijn wijzigingen  openbaar maken
       return to profile: Terug naar profiel
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index c189ce3f7..b4aae8c3e 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1175,6 +1175,20 @@ nn:
       reset: Nullstill passord
       flash changed: Passordet ditt er endra.
       flash token bad: Kunne ikkje finne den nøkkelen. Sjekke URLen kanskje?
+  profiles:
+    edit:
+      image: 'Bilete:'
+      gravatar:
+        gravatar: Bruk Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+      new image: Legg til eit bilete
+      keep image: Hald på gjeldande bilete
+      delete image: Fjern gjeldande bilete
+      replace image: Erstatt gjeldande bilete
+      image size hint: (kvadratiske bilete som er minst 100x100 fungerer best)
+      home location: 'Heimeposisjon:'
+      no home location: Du har ikkje skrive inn din heimelokasjon.
+      update home location on click: Oppdatere heimeplassering når eg klikkar på kartet?
   sessions:
     new:
       title: Logg inn
@@ -1834,18 +1848,6 @@ nn:
           offentleg eigedom (Public Domain).
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: kva er dette?
-      image: 'Bilete:'
-      gravatar:
-        gravatar: Bruk Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-      new image: Legg til eit bilete
-      keep image: Hald på gjeldande bilete
-      delete image: Fjern gjeldande bilete
-      replace image: Erstatt gjeldande bilete
-      image size hint: (kvadratiske bilete som er minst 100x100 fungerer best)
-      home location: 'Heimeposisjon:'
-      no home location: Du har ikkje skrive inn din heimelokasjon.
-      update home location on click: Oppdatere heimeplassering når eg klikkar på kartet?
       save changes button: Lagre endringar
       make edits public button: Gjer alle redigeringane mine offentleg
       return to profile: Returner til profil
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 1e45d76c3..37d411c0e 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1394,6 +1394,22 @@ oc:
       reset: Reïnicializar lo senhal
       flash changed: Vòstre senhal es estat modificat.
       flash token bad: Avètz pas trobat aqueste geton, avètz verificat l'URL ?
+  profiles:
+    edit:
+      image: 'Imatge :'
+      gravatar:
+        gravatar: Utilizar Gravatar
+        disabled: Gravatar es estat desactivat.
+        enabled: L'afichatge de vòstre Gravatar es estat activat.
+      new image: Ajustar un imatge
+      keep image: Gardar l'imatge actual
+      delete image: Suprimir l'imatge actual
+      replace image: Remplaçar l'imatge actuala
+      image size hint: (los imatges carrats d'al mens 100×100 pixèls foncionan melhor)
+      home location: 'Emplaçament del domicili :'
+      no home location: Avètz pas indicat l'emplaçament de vòstre domicili.
+      update home location on click: Metre a jorn l'emplaçament de vòstre domicili
+        quand clicatz sus la mapa ?
   sessions:
     new:
       title: Se connectar
@@ -2095,20 +2111,6 @@ oc:
         agreed: Avètz acceptat los novèls tèrmes del contributor.
         not yet agreed: Avètz pas encara acceptat los novèls tèrmes del contributor.
         link text: qu’es aquò ?
-      image: 'Imatge :'
-      gravatar:
-        gravatar: Utilizar Gravatar
-        disabled: Gravatar es estat desactivat.
-        enabled: L'afichatge de vòstre Gravatar es estat activat.
-      new image: Ajustar un imatge
-      keep image: Gardar l'imatge actual
-      delete image: Suprimir l'imatge actual
-      replace image: Remplaçar l'imatge actuala
-      image size hint: (los imatges carrats d'al mens 100×100 pixèls foncionan melhor)
-      home location: 'Emplaçament del domicili :'
-      no home location: Avètz pas indicat l'emplaçament de vòstre domicili.
-      update home location on click: Metre a jorn l'emplaçament de vòstre domicili
-        quand clicatz sus la mapa ?
       save changes button: Enregistrar las modificacions
       make edits public button: Rendre totas mas modificacions publicas
       return to profile: Tornar al perfil
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index ab2796ef0..8c0ad3acd 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -799,6 +799,17 @@ pa:
       title: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ
       reset: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ
       flash changed: ਤੁਹਾਡਾ ਪਛਾਣ ਸ਼ਬਦ ਬਦਲਿਆ ਜਾ ਚੁੱਕਾ ਹੈ।
+  profiles:
+    edit:
+      image: 'ਤਸਵੀਰ:'
+      gravatar:
+        gravatar: ਗਰੈਵੇਤਾਰ ਵਰਤੋ
+      new image: ਇੱਕ ਤਸਵੀਰ ਜੋੜੋ
+      keep image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਰੱਖੋ
+      delete image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਹਟਾਉ
+      replace image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਵਟਾਉ
+      home location: 'ਘਰ ਦੀ ਸਥਿਤੀ:'
+      no home location: ਤੁਸੀਂ ਆਪਣੇ ਘਰ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਦੱਸੀ ਹੈ।
   sessions:
     new:
       title: ਦਾਖ਼ਲਾ
@@ -1114,15 +1125,6 @@ pa:
         agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਜਤਾਈ ਹੈ।
         not yet agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਨਹੀਂ ਜਤਾਈ।
         link text: ਇਹ ਕੀ ਹੈ?
-      image: 'ਤਸਵੀਰ:'
-      gravatar:
-        gravatar: ਗਰੈਵੇਤਾਰ ਵਰਤੋ
-      new image: ਇੱਕ ਤਸਵੀਰ ਜੋੜੋ
-      keep image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਰੱਖੋ
-      delete image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਹਟਾਉ
-      replace image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਵਟਾਉ
-      home location: 'ਘਰ ਦੀ ਸਥਿਤੀ:'
-      no home location: ਤੁਸੀਂ ਆਪਣੇ ਘਰ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਦੱਸੀ ਹੈ।
       save changes button: ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ
       make edits public button: ਮੇਰੀਆਂ ਸਾਰੀਆਂ ਸੋਧਾਂ ਜਨਤਕ ਕਰੋ
       return to profile: ਪ੍ਰੋਫ਼ਾਈਲ ਵੱਲ ਮੁੜੋ
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index bca39f216..7d78a05cb 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -812,7 +812,7 @@ pl:
           sport: Klub sportowy
           "yes": Klub
         craft:
-          beekeper: Pszczelarz
+          beekeeper: Pszczelarz
           blacksmith: Kowal
           brewery: Browar
           carpenter: Cieśla
@@ -842,7 +842,7 @@ pl:
           ambulance_station: Stacja pogotowia ratunkowego
           assembly_point: Miejsce zbiórki do ewakuacji
           defibrillator: Defibrylator
-          fire_xtinguisher: Gaśnica
+          fire_extinguisher: Gaśnica
           fire_water_pond: Staw pożarowy
           landing_site: Miejsce awaryjnego lądowania
           life_ring: Koło ratunkowe
@@ -1790,6 +1790,24 @@ pl:
       reset: Wyczyść hasło
       flash changed: Hasło zostało zmienione.
       flash token bad: Nie znaleziono tokenu, sprawdź URL
+  profiles:
+    edit:
+      image: 'Obraz:'
+      gravatar:
+        gravatar: Użyj Gravatara
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Co to jest Gravatar?
+        disabled: Wyłączono Gravatara.
+        enabled: Włączono wyświetlanie Gravatara.
+      new image: Dodanie obrazu
+      keep image: Pozostaw dotychczasowy obraz
+      delete image: Usuń aktualny obraz
+      replace image: Zmień aktualny obraz
+      image size hint: (najlepiej sprawdzają się kwadratowe obrazy o rozmiarach przynajmniej
+        100x100)
+      home location: 'Położenie domu:'
+      no home location: Nie wpisałeś swojej lokalizacji domowej.
+      update home location on click: Uaktualnianie położenia kliknięciem na mapie
   sessions:
     new:
       title: Logowanie
@@ -2647,22 +2665,6 @@ pl:
         agreed_with_pd: Zadeklarowałeś, że twoje edycje publikujesz w domenie publicznej.
         link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: co to jest?
-      image: 'Obraz:'
-      gravatar:
-        gravatar: Użyj Gravatara
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Co to jest Gravatar?
-        disabled: Wyłączono Gravatara.
-        enabled: Włączono wyświetlanie Gravatara.
-      new image: Dodanie obrazu
-      keep image: Pozostaw dotychczasowy obraz
-      delete image: Usuń aktualny obraz
-      replace image: Zmień aktualny obraz
-      image size hint: (najlepiej sprawdzają się kwadratowe obrazy o rozmiarach przynajmniej
-        100x100)
-      home location: 'Położenie domu:'
-      no home location: Nie wpisałeś swojej lokalizacji domowej.
-      update home location on click: Uaktualnianie położenia kliknięciem na mapie
       save changes button: Zapisz zmiany
       make edits public button: Niech wszystkie edycje będą publiczne.
       return to profile: Wróć do profilu
diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 82ca9bd50..705d90614 100644
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -304,6 +304,10 @@ ps:
     lost_password:
       heading: آيا پټنوم مو هېر شوی؟
       email address: 'برېښليک پته:'
+  profiles:
+    edit:
+      image: 'انځور:'
+      new image: يو انځور ورگډول
   sessions:
     new:
       title: ننوتل
@@ -420,8 +424,6 @@ ps:
         enabled link text: دا څه دی؟
       contributor terms:
         link text: دا څه دی؟
-      image: 'انځور:'
-      new image: يو انځور ورگډول
       save changes button: بدلونونه خوندي کول
     index:
       title: کارنان
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 78db8d9f4..7a8e29f44 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -790,7 +790,7 @@ pt-BR:
           sport: Clube de esportes
           "yes": Clube
         craft:
-          beekeper: Apicultor
+          beekeeper: Apicultor
           blacksmith: Ferreiro
           brewery: Cervejaria
           carpenter: Carpinteiro
@@ -820,7 +820,7 @@ pt-BR:
           ambulance_station: Posto de Ambulâncias
           assembly_point: Centro de agrupamento
           defibrillator: Desfibrilador
-          fire_xtinguisher: Extintor de incêndio
+          fire_extinguisher: Extintor de incêndio
           fire_water_pond: Lagoa de água de fogo
           landing_site: Local de Pouso de Emergência
           life_ring: Boia salva-vidas
@@ -1769,6 +1769,23 @@ pt-BR:
       reset: Redefinir Senha
       flash changed: Sua senha foi alterada.
       flash token bad: O código não confere, verifique a URL.
+  profiles:
+    edit:
+      image: Imagem
+      gravatar:
+        gravatar: Usar o Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=pt-br
+        what_is_gravatar: O que é o Gravatar?
+        disabled: O Gravatar foi desativado.
+        enabled: A exibição do seu Gravatar foi ativada.
+      new image: Adicionar uma imagem
+      keep image: Manter a imagem atual
+      delete image: Remover a imagem atual
+      replace image: Trocar a imagem atual
+      image size hint: (imagens quadradas, com pelo menos 100x100, funcionam melhor)
+      home location: Local principal
+      no home location: Você ainda não definiu o seu local principal.
+      update home location on click: Atualizar local principal ao clicar no mapa?
   sessions:
     new:
       title: Entrar
@@ -2703,21 +2720,6 @@ pt-BR:
           Público.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: o que é isso?
-      image: Imagem
-      gravatar:
-        gravatar: Usar o Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=pt-br
-        what_is_gravatar: O que é o Gravatar?
-        disabled: O Gravatar foi desativado.
-        enabled: A exibição do seu Gravatar foi ativada.
-      new image: Adicionar uma imagem
-      keep image: Manter a imagem atual
-      delete image: Remover a imagem atual
-      replace image: Trocar a imagem atual
-      image size hint: (imagens quadradas, com pelo menos 100x100, funcionam melhor)
-      home location: Local principal
-      no home location: Você ainda não definiu o seu local principal.
-      update home location on click: Atualizar local principal ao clicar no mapa?
       save changes button: Salvar alterações
       make edits public button: Tornar públicas todas as minhas edições
       return to profile: Retornar ao perfil
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index ba2003577..778fbbca0 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -782,7 +782,7 @@ pt-PT:
           sport: Clube desportivo
           "yes": Clube
         craft:
-          beekeper: Apicultor
+          beekeeper: Apicultor
           blacksmith: Ferreiro
           brewery: Cervejaria artesanal
           carpenter: Carpinteiro
@@ -812,7 +812,7 @@ pt-PT:
           ambulance_station: Estação de ambulâncias
           assembly_point: Centro de agrupamento
           defibrillator: Desfibrilador
-          fire_xtinguisher: Extintor de incêndios
+          fire_extinguisher: Extintor de incêndios
           fire_water_pond: Reservatório de água para combate a incêndios
           landing_site: Lugar de aterragem de emergência
           life_ring: Boia salva-vidas
@@ -897,6 +897,7 @@ pt-PT:
           railway: Via férrea histórica
           roman_road: Estrada romana
           ruins: Ruínas
+          rune_stone: Pedra Rúnica
           stone: Pedra
           tomb: Túmulo
           tower: Torre
@@ -1759,6 +1760,44 @@ pt-PT:
       reset: Repor palavra-passe
       flash changed: A tua palavra-passe foi alterada.
       flash token bad: Não encontrámos esse token. Confere o URL, por favor.
+  preferences:
+    show:
+      title: Preferências
+      preferred_editor: Editor Preferido
+      preferred_languages: Idiomas Preferidos
+      edit_preferences: Editar Preferências
+    edit:
+      title: Editar Preferências
+      save: Atualizar Preferências
+      cancel: Cancelar
+    update:
+      failure: Não foi possível atualizar as preferências.
+    update_success_flash:
+      message: Preferências atualizadas.
+  profiles:
+    edit:
+      title: Editar Perfil
+      save: Atualizar Perfil
+      cancel: Cancelar
+      image: Imagem
+      gravatar:
+        gravatar: Usar imagem Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: O que é o Gravatar?
+        disabled: O Gravatar foi desativado.
+        enabled: A exibição do teu Gravatar foi ativada.
+      new image: Adicionar uma imagem
+      keep image: Manter a imagem atual
+      delete image: Remover a imagem atual
+      replace image: Substituir a imagem atual
+      image size hint: (as imagens quadradas com pelo menos 100x100 píxeis, funcionam
+        melhor)
+      home location: Localização principal
+      no home location: Não definiste a tua localização principal.
+      update home location on click: Atualizar a localização ao clicar no mapa?
+    update:
+      success: Perfil atualizado.
+      failure: Não foi possível atualizar o perfil.
   sessions:
     new:
       title: Entrar
@@ -2596,8 +2635,10 @@ pt-PT:
       my profile: Perfil
       my settings: Definições
       my comments: Comentários
+      my_preferences: Preferências
       blocks on me: Quem me bloqueou
       blocks by me: Os meus bloqueios
+      edit_profile: Editar Perfil
       send message: Enviar mensagem
       diary: Diário
       edits: Edições
@@ -2691,22 +2732,6 @@ pt-PT:
           em Domínio Público.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: o que é isto?
-      image: Imagem
-      gravatar:
-        gravatar: Usar imagem Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: O que é o Gravatar?
-        disabled: O Gravatar foi desativado.
-        enabled: A exibição do teu Gravatar foi ativada.
-      new image: Adicionar uma imagem
-      keep image: Manter a imagem atual
-      delete image: Remover a imagem atual
-      replace image: Substituir a imagem atual
-      image size hint: (as imagens quadradas com pelo menos 100x100 píxeis, funcionam
-        melhor)
-      home location: Localização principal
-      no home location: Não definiste a tua localização principal.
-      update home location on click: Atualizar a localização ao clicar no mapa?
       save changes button: Gravar alterações
       make edits public button: Tornar todas as minhas edições públicas
       return to profile: Regressar ao perfil
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 54da16a1d..ef3581385 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -742,7 +742,7 @@ ro:
           sport: Club Sportiv
           "yes": Club
         craft:
-          beekeper: Apicultor
+          beekeeper: Apicultor
           blacksmith: Fierar
           brewery: Berărie
           carpenter: Tâmplar
@@ -772,7 +772,7 @@ ro:
           ambulance_station: Stație de ambulanță
           assembly_point: Punct de ansamblare
           defibrillator: Defibrilator
-          fire_xtinguisher: Extinctor
+          fire_extinguisher: Extinctor
           fire_water_pond: Bazinul cu apă pentru foc
           landing_site: Sit pentru aterizarea de urgență
           life_ring: Colac de salvare de urgență
@@ -1659,6 +1659,24 @@ ro:
       reset: Resetează parola
       flash changed: Parola dumneavoastră a fost schimbată.
       flash token bad: Nu ați găsit acel simbol, verificați adresa URL?
+  profiles:
+    edit:
+      image: Imagine
+      gravatar:
+        gravatar: Utilizați Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Ce este Gravatar?
+        disabled: Gravatar a fost dezactivat.
+        enabled: Afișarea Gravatarului dvs. a fost activată.
+      new image: Adaugă imagine nouă
+      keep image: Păstrați imaginea curentă
+      delete image: Eliminați imaginea curentă
+      replace image: Înlocuiți imaginea curentă
+      image size hint: (imagini pătrate cel puțin 100x100 merg cel mai bine)
+      home location: Locație Acasă
+      no home location: Nu ați introdus locația dvs. de domiciliu.
+      update home location on click: Actualizați locația locuinței dvs. când faceți
+        click pe hartă?
   sessions:
     new:
       title: Autentificare
@@ -2525,22 +2543,6 @@ ro:
           sunt în Domeniul Public.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Ce este aceasta?
-      image: Imagine
-      gravatar:
-        gravatar: Utilizați Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Ce este Gravatar?
-        disabled: Gravatar a fost dezactivat.
-        enabled: Afișarea Gravatarului dvs. a fost activată.
-      new image: Adaugă imagine nouă
-      keep image: Păstrați imaginea curentă
-      delete image: Eliminați imaginea curentă
-      replace image: Înlocuiți imaginea curentă
-      image size hint: (imagini pătrate cel puțin 100x100 merg cel mai bine)
-      home location: Locație Acasă
-      no home location: Nu ați introdus locația dvs. de domiciliu.
-      update home location on click: Actualizați locația locuinței dvs. când faceți
-        click pe hartă?
       save changes button: Salvează modificările
       make edits public button: Faceți toate editările mele publice
       return to profile: Reveniți la profil
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9caea1e3b..d45df7835 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -832,7 +832,7 @@ ru:
           sport: Спортивный клуб
           "yes": Клуб
         craft:
-          beekeper: Пчеловод
+          beekeeper: Пчеловод
           blacksmith: Кузнец
           brewery: Пивоварня
           carpenter: Плотник
@@ -927,6 +927,7 @@ ru:
           railway: Историческая железная дорога
           roman_road: Римская дорога
           ruins: Развалины
+          rune_stone: Рунический камень
           stone: Камень
           tomb: Могила
           tower: Башня
@@ -1731,6 +1732,45 @@ ru:
       reset: Установить пароль
       flash changed: Ваш пароль был изменён.
       flash token bad: Невозможно найти такой код подтверждения, проверьте ссылку.
+  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?uselang=ru
+        what_is_gravatar: Что такое Gravatar?
+        disabled: Gravatar отключён.
+        enabled: Отображение вашего Gravatar включено.
+      new image: Добавить изображение
+      keep image: Оставить текущее изображение
+      delete image: Удалить текущее изображение
+      replace image: Заменить текущее изображение
+      image size hint: (квадратные изображения, по крайней мере 100×100, работают
+        лучше)
+      home location: Моё местоположение
+      no home location: Вы не обозначили свое домашнее местоположение.
+      update home location on click: Обновлять моё местоположение, когда я нажимаю
+        на карту?
+    update:
+      success: Профиль обновлен.
+      failure: Не удалось обновить профиль.
   sessions:
     new:
       title: Представьтесь
@@ -2526,8 +2566,10 @@ ru:
       my profile: Мой профиль
       my settings: Мои настройки
       my comments: Мои комментарии
+      my_preferences: Мои настройки
       blocks on me: Мои блокировки
       blocks by me: Наложенные мною блокировки
+      edit_profile: Редактировать настройки
       send message: Отправить сообщение
       diary: Дневник
       edits: Правки
@@ -2621,23 +2663,6 @@ ru:
           в общественном достоянии.
         link: http://wiki.openstreetmap.org/wiki/RU:Open_Database_License/Contributor_Terms?uselang=ru
         link text: что это?
-      image: Изображение
-      gravatar:
-        gravatar: Использовать Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=ru
-        what_is_gravatar: Что такое Gravatar?
-        disabled: Gravatar отключён.
-        enabled: Отображение вашего Gravatar включено.
-      new image: Добавить изображение
-      keep image: Оставить текущее изображение
-      delete image: Удалить текущее изображение
-      replace image: Заменить текущее изображение
-      image size hint: (квадратные изображения, по крайней мере 100×100, работают
-        лучше)
-      home location: Моё местоположение
-      no home location: Вы не обозначили свое домашнее местоположение.
-      update home location on click: Обновлять моё местоположение, когда я нажимаю
-        на карту?
       save changes button: Сохранить изменения
       make edits public button: Сделать все мои правки доступными
       return to profile: Вернуться к профилю
diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 476164612..e8d0f6050 100644
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -515,6 +515,11 @@ sat:
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
     reset_password:
       flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
+  profiles:
+    edit:
+      image: ᱪᱤᱛᱟᱹᱨᱺ
+      new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
+      home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
   sessions:
     new:
       title: ᱵᱚᱞᱚᱜ ᱢᱮ
@@ -664,9 +669,6 @@ sat:
         enabled link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       contributor terms:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      image: ᱪᱤᱛᱟᱹᱨᱺ
-      new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
-      home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index c2e1ea280..c5abc1981 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1159,6 +1159,24 @@ scn:
       reset: Azzera la palora d'òrdini
       flash changed: La tò palora d'òrdini fu canciata.
       flash token bad: Stu còdici nun s'attrova, pirchì nun cuntrolli l'URL?
+  preferences:
+    edit:
+      cancel: Annulla
+  profiles:
+    edit:
+      cancel: Annulla
+      image: 'Mmàggini:'
+      gravatar:
+        gravatar: Adòpira Gravatar
+      new image: Agghiunci na mmàggini
+      keep image: Manteni la mmàggini attuali
+      delete image: Leva la mmàggini attuali
+      replace image: Rimpiazza la mmàggini attuali
+      image size hint: (sù megghiu li mmàggini quatrati 100x100 o chiù grossi)
+      home location: 'Pusizzioni basi:'
+      no home location: Ancora nun mpustasti la tò pusizzioni basi.
+      update home location on click: Aggiorna la pusizzioni basi quannu cliccu supra
+        â carta?
   sessions:
     new:
       title: Trasi
@@ -1937,18 +1955,6 @@ scn:
         agreed_with_pd: Dichiarasti macari chi cunzìddiri li tò canciamenti ntô Duminiu
           Pùbblicu.
         link text: chi voli diri?
-      image: 'Mmàggini:'
-      gravatar:
-        gravatar: Adòpira Gravatar
-      new image: Agghiunci na mmàggini
-      keep image: Manteni la mmàggini attuali
-      delete image: Leva la mmàggini attuali
-      replace image: Rimpiazza la mmàggini attuali
-      image size hint: (sù megghiu li mmàggini quatrati 100x100 o chiù grossi)
-      home location: 'Pusizzioni basi:'
-      no home location: Ancora nun mpustasti la tò pusizzioni basi.
-      update home location on click: Aggiorna la pusizzioni basi quannu cliccu supra
-        â carta?
       save changes button: Sarva li canciamenti
       make edits public button: Arrenni tutti li mè canciamenti pùbblici
       return to profile: Arritorna ô prufilu
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 3e9ebe41a..ade3c0042 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -582,7 +582,7 @@ sk:
           ambulance_station: Stanica záchrannej služby
           assembly_point: Miesto zhromaždenia
           defibrillator: Defibrilátor
-          fire_xtinguisher: Hasiaci prístroj
+          fire_extinguisher: Hasiaci prístroj
           phone: Núdzový telefón
         highway:
           abandoned: Zrušená cesta
@@ -1248,6 +1248,21 @@ sk:
       reset: Vynulovať heslo
       flash changed: Vaše heslo bolo zmenené.
       flash token bad: Zodpovedajúci kód nebol nájdený, skontrolujte prípadne URL.
+  profiles:
+    edit:
+      image: Obrázok
+      gravatar:
+        gravatar: Používať Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Čo je Gravatar?
+      new image: 'Pridať obrázok:'
+      keep image: Ponechať aktuálny obrázok
+      delete image: Odstrániť aktuálny obrázok
+      replace image: Nahradiť aktuálny obrázok
+      image size hint: (najvhodnejšie sú štvorcové obrázky s veľkosťou najmenej 100×100)
+      home location: 'Domovské miesto:'
+      no home location: Nezadali ste svoje domovské miesto.
+      update home location on click: Aktualizovať domovské miesto kliknutím na mapu?
   sessions:
     new:
       title: Prihlásiť sa
@@ -1895,19 +1910,6 @@ sk:
         agreed_with_pd: Deklarovali ste tiež, že svoje úpravy považujete za slobodné
           dielo.
         link text: čo to znamená?
-      image: Obrázok
-      gravatar:
-        gravatar: Používať Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Čo je Gravatar?
-      new image: 'Pridať obrázok:'
-      keep image: Ponechať aktuálny obrázok
-      delete image: Odstrániť aktuálny obrázok
-      replace image: Nahradiť aktuálny obrázok
-      image size hint: (najvhodnejšie sú štvorcové obrázky s veľkosťou najmenej 100×100)
-      home location: 'Domovské miesto:'
-      no home location: Nezadali ste svoje domovské miesto.
-      update home location on click: Aktualizovať domovské miesto kliknutím na mapu?
       save changes button: Uložiť zmeny
       make edits public button: Zverejniť všetky moje úpravy
       return to profile: Návrat do profilu
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 00a2766da..0e995b4c2 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -645,7 +645,7 @@ sl:
         club:
           "yes": Klub
         craft:
-          beekeper: Čebelar
+          beekeeper: Čebelar
           brewery: Pivovarna
           carpenter: Mizarstvo
           electrician: Elektrikar
@@ -1355,6 +1355,22 @@ sl:
       flash changed: Vaše geslo je bilo spremenjeno.
       flash token bad: Tega žetona ni bilo mogoče najti.  Predlagamo, da preverite
         naslov URL.
+  profiles:
+    edit:
+      image: Slika
+      gravatar:
+        gravatar: Uporabi Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Kaj je Gravatar?
+        disabled: Gravatar je onemogočen.
+      new image: Dodaj sliko
+      keep image: Obdrži trenutno sliko
+      delete image: Odstrani trenutno sliko
+      replace image: Zamenjaj trenutno sliko
+      image size hint: (najbolje delujejo kvadratne slike vsaj 100x100 točk)
+      home location: 'Domača lokacija:'
+      no home location: Niste nastavili vaše domače lokacije.
+      update home location on click: Posodobi domačo lokacijo ob kliku na zemljevid?
   sessions:
     new:
       title: Prijava
@@ -2021,20 +2037,6 @@ sl:
         agreed_with_pd: Prav tako ste izjavili, da so vaša urejanja v javni lasti.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Kaj je to?
-      image: Slika
-      gravatar:
-        gravatar: Uporabi Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Kaj je Gravatar?
-        disabled: Gravatar je onemogočen.
-      new image: Dodaj sliko
-      keep image: Obdrži trenutno sliko
-      delete image: Odstrani trenutno sliko
-      replace image: Zamenjaj trenutno sliko
-      image size hint: (najbolje delujejo kvadratne slike vsaj 100x100 točk)
-      home location: 'Domača lokacija:'
-      no home location: Niste nastavili vaše domače lokacije.
-      update home location on click: Posodobi domačo lokacijo ob kliku na zemljevid?
       save changes button: Shrani spremembe
       make edits public button: Naj bodo vsi moji prispevki javni
       return to profile: Nazaj na profil
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 516935c01..90cf99a21 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1046,6 +1046,20 @@ sq:
       reset: Rivendos fjalëkalimin
       flash changed: Fjalëkalimi yt është ndryshuar.
       flash token bad: Nuk e gjet atë shenjë, kontrollo URL-në?
+  profiles:
+    edit:
+      image: Imazhi
+      gravatar:
+        gravatar: Përdor Gravatar
+      new image: Shto një imazh
+      keep image: Mbaj imazhin e tanishëm
+      delete image: Heq imazhin e tanishëm
+      replace image: Zëvendëso imazhin e tanishëm
+      image size hint: (imazhet katror të paktën 100x100 duken më mirë)
+      home location: Vendndodhja e Shtëpisë
+      no home location: Nuk ke shëuar vendndodhjen e shtëpisë tënde.
+      update home location on click: Përditëso vendndodhjen e shtëpisë kur unë klikoj
+        në hartë!
   sessions:
     new:
       title: Identifikohu
@@ -1496,18 +1510,6 @@ sq:
           pronësi publike.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Çka është kjo?
-      image: Imazhi
-      gravatar:
-        gravatar: Përdor Gravatar
-      new image: Shto një imazh
-      keep image: Mbaj imazhin e tanishëm
-      delete image: Heq imazhin e tanishëm
-      replace image: Zëvendëso imazhin e tanishëm
-      image size hint: (imazhet katror të paktën 100x100 duken më mirë)
-      home location: Vendndodhja e Shtëpisë
-      no home location: Nuk ke shëuar vendndodhjen e shtëpisë tënde.
-      update home location on click: Përditëso vendndodhjen e shtëpisë kur unë klikoj
-        në hartë!
       save changes button: Ruaj ndryshimet
       make edits public button: Të gjitha redaktimet e mia bëjë publike
       return to profile: Mbrapa te profili
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 45b6e3362..2b56fe326 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -885,6 +885,17 @@ sr-Latn:
       reset: Poništi lozinku
       flash changed: Vaša lozinka je promenjena.
       flash token bad: Takav novčić nije pronađen. Proverite adresu.
+  profiles:
+    edit:
+      image: 'Slika:'
+      new image: Dodaj sliku
+      keep image: Zadrži trenutnu sliku
+      delete image: Ukloni trenutnu sliku
+      replace image: Zameni trenutnu sliku
+      image size hint: (kvadratne slike od barem 100×100 piksela rade najbolje)
+      home location: 'Mesto stanovanja:'
+      no home location: Niste uneli mesto stanovanja.
+      update home location on click: Ažurirati mesto stanovanja kada kliknem na mapu?
   sessions:
     new:
       title: Prijava
@@ -1400,15 +1411,6 @@ sr-Latn:
         agreed_with_pd: Takođe se slažete da vaše izmene budu u javnom vlasništvu.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=sr-ec
         link text: Å¡ta je ovo?
-      image: 'Slika:'
-      new image: Dodaj sliku
-      keep image: Zadrži trenutnu sliku
-      delete image: Ukloni trenutnu sliku
-      replace image: Zameni trenutnu sliku
-      image size hint: (kvadratne slike od barem 100×100 piksela rade najbolje)
-      home location: 'Mesto stanovanja:'
-      no home location: Niste uneli mesto stanovanja.
-      update home location on click: Ažurirati mesto stanovanja kada kliknem na mapu?
       save changes button: Sačuvaj izmene
       make edits public button: Neka sve moje izmene budu javne
       return to profile: Nazad na profil
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 1cda2b3c6..1fa63600e 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -644,7 +644,7 @@ sr:
           sport: Спортски клуб
           "yes": Клуб
         craft:
-          beekeper: Пчелар
+          beekeeper: Пчелар
           blacksmith: Ковач
           brewery: Пивара
           carpenter: Столар
@@ -1417,6 +1417,22 @@ sr:
       reset: Поништи лозинку
       flash changed: Ваша лозинка је промењена.
       flash token bad: Такав новчић није пронађен. Проверите адресу.
+  profiles:
+    edit:
+      image: Слика
+      gravatar:
+        gravatar: Користи Граватар
+        link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=sr
+        disabled: Граватар је онемогућен.
+        enabled: Приказ Вашег Граватара је омогућен.
+      new image: Додај слику
+      keep image: Задржи тренутну слику
+      delete image: Уклони тренутну слику
+      replace image: Замени тренутну слику
+      image size hint: (квадратне слике од барем 100×100 пиксела раде најбоље)
+      home location: Место становања
+      no home location: Нисте унели место становања.
+      update home location on click: Ажурирати место становања када кликнем на мапу?
   sessions:
     new:
       title: Пријава
@@ -2217,20 +2233,6 @@ sr:
         agreed_with_pd: Такође се слажете да ваше измене буду у јавном власништву.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=sr-ec
         link text: шта је ово?
-      image: Слика
-      gravatar:
-        gravatar: Користи Граватар
-        link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=sr
-        disabled: Граватар је онемогућен.
-        enabled: Приказ Вашег Граватара је омогућен.
-      new image: Додај слику
-      keep image: Задржи тренутну слику
-      delete image: Уклони тренутну слику
-      replace image: Замени тренутну слику
-      image size hint: (квадратне слике од барем 100×100 пиксела раде најбоље)
-      home location: Место становања
-      no home location: Нисте унели место становања.
-      update home location on click: Ажурирати место становања када кликнем на мапу?
       save changes button: Сачувај промене
       make edits public button: Нека све моје измене буду јавне
       return to profile: Назад на профил
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 106e55ca6..db5c39a3a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -758,7 +758,7 @@ sv:
           sport: Sportklubb
           "yes": Klubb
         craft:
-          beekeper: Biodlare
+          beekeeper: Biodlare
           blacksmith: Smed
           brewery: Bryggeri
           carpenter: Snickare
@@ -782,7 +782,7 @@ sv:
           ambulance_station: Ambulansstation
           assembly_point: Samlingsplats
           defibrillator: Defibrillator
-          fire_xtinguisher: Brandsläckare
+          fire_extinguisher: Brandsläckare
           landing_site: Nödlandningsplats
           life_ring: Livboj
           phone: Nödtelefon
@@ -1671,6 +1671,23 @@ sv:
       reset: Återställ lösenord
       flash changed: Ditt lösenord har ändrats.
       flash token bad: Hittade inte den nyckeln, kontrollera webbadressen.
+  profiles:
+    edit:
+      image: Bild
+      gravatar:
+        gravatar: Använd Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Vad är Gravatar?
+        disabled: Gravatar har inaktiverats.
+        enabled: Din Gravatar har aktiverats.
+      new image: Lägg till en bild
+      keep image: Behåll nuvarande bild
+      delete image: Ta bort nuvarande bild
+      replace image: Ersätt nuvarande bild
+      image size hint: (kvadratiska bilder på minst 100x100 fungerar bäst)
+      home location: Hemposition
+      no home location: Du har inte angivit någon hemposition.
+      update home location on click: Uppdatera hemposition när jag klickar på kartan?
   sessions:
     new:
       title: Logga in
@@ -2557,21 +2574,6 @@ sv:
           är inom Public Domain.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: vad är detta?
-      image: Bild
-      gravatar:
-        gravatar: Använd Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Vad är Gravatar?
-        disabled: Gravatar har inaktiverats.
-        enabled: Din Gravatar har aktiverats.
-      new image: Lägg till en bild
-      keep image: Behåll nuvarande bild
-      delete image: Ta bort nuvarande bild
-      replace image: Ersätt nuvarande bild
-      image size hint: (kvadratiska bilder på minst 100x100 fungerar bäst)
-      home location: Hemposition
-      no home location: Du har inte angivit någon hemposition.
-      update home location on click: Uppdatera hemposition när jag klickar på kartan?
       save changes button: Spara ändringar
       make edits public button: Gör alla mina redigeringar publika
       return to profile: Återvänd till profil
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 7d5586d76..12e320e64 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Aswn
 # Author: ElangoRamanujam
+# Author: Gurulenin
 # Author: Karthi.dr
 # Author: Krishnaprasaths
 # Author: Mahir78
@@ -18,20 +19,37 @@ ta:
     formats:
       friendly: '%e %B %Y, %H:%M'
   helpers:
+    file:
+      prompt: கோப்பை தேர்ந்தெடுக்கவும்
     submit:
       diary_comment:
         create: சேமி
       diary_entry:
         create: வெளியிடு
+        update: புதுப்பி
+      issue_comment:
+        create: கருத்தை சேர்
       message:
         create: அனுப்பு
       client_application:
         create: பதிவுசெய்
-        update: தொகு
+        update: புதுப்பி
+      doorkeeper_application:
+        create: பதிவுசெய்
+        update: புதுப்பி
+      redaction:
+        create: படித்திருத்தத்தை உருவாக்கவும்
+        update: படிதிருத்தத்தைச் சேமிக்கவும்
       trace:
         create: பதிவேற்று
         update: மாற்றங்களை சேமி
+      user_block:
+        create: தொகுதியை உருவாக்கு
+        update: தொகுதியைப் புதுப்பி
   activerecord:
+    errors:
+      messages:
+        invalid_email_address: செல்லுபடியாகும் மின்னஞ்சல் முகவரியாகத் தெரியவில்லை
     models:
       acl: அனுமதிக் கட்டுப்பாட்டுப் பட்டியல்
       changeset: மாற்றங்கள்
@@ -571,6 +589,12 @@ ta:
       heading: ' %{user}க்கு கடவுச்சொல் மீட்டமை'
       reset: கடவுச்சொல்லை மீட்டமை
       flash changed: உங்கள் கடவுச்சொல் மாற்றப்பட்டது.
+  profiles:
+    edit:
+      image: 'படம்:'
+      new image: ஒரு படத்தை சேர்
+      keep image: நடப்பு படத்தை வைத்திரு
+      delete image: நடப்பு படத்தை நீக்கு
   sessions:
     new:
       title: புகுபதிகை
@@ -758,10 +782,6 @@ ta:
         link text: இது என்ன?
       contributor terms:
         link text: இது என்ன?
-      image: 'படம்:'
-      new image: ஒரு படத்தை சேர்
-      keep image: நடப்பு படத்தை வைத்திரு
-      delete image: நடப்பு படத்தை நீக்கு
       save changes button: மாற்றங்களைச் சேமி
     index:
       title: பயனர்கள்
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 1627976f0..82b080f86 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -557,6 +557,17 @@ te:
       notice email cannot find: క్షమించండి, ఆ ఈమెయిలు చిరునామా దొరకలేదు.
     reset_password:
       flash changed: మీ సంకేతపదాన్ని మార్చాం.
+  profiles:
+    edit:
+      image: 'బొమ్మ:'
+      gravatar:
+        gravatar: గ్రావతార్‌ని వాడు
+      keep image: ప్రస్తుత చిత్రాన్ని ఉంచు
+      delete image: ప్రస్తుత చిత్రాన్ని తొలగించు
+      replace image: ప్రస్తుత చిత్రాన్ని మార్చు
+      image size hint: (కనీసం 100x100 ఉండే చదరపు చిత్రం అయితే మేలు)
+      home location: 'నివాస ప్రాంతం:'
+      no home location: మీరు మీ నివాస ప్రాంతాన్ని పేర్కొనలేదు.
   sessions:
     new:
       title: ప్రవేశం
@@ -774,15 +785,6 @@ te:
         disabled link text: నేను ఎందుకు మార్చలేను?
       contributor terms:
         link text: ఇది ఏమిటి?
-      image: 'బొమ్మ:'
-      gravatar:
-        gravatar: గ్రావతార్‌ని వాడు
-      keep image: ప్రస్తుత చిత్రాన్ని ఉంచు
-      delete image: ప్రస్తుత చిత్రాన్ని తొలగించు
-      replace image: ప్రస్తుత చిత్రాన్ని మార్చు
-      image size hint: (కనీసం 100x100 ఉండే చదరపు చిత్రం అయితే మేలు)
-      home location: 'నివాస ప్రాంతం:'
-      no home location: మీరు మీ నివాస ప్రాంతాన్ని పేర్కొనలేదు.
       save changes button: మార్పులను భద్రపరచు
       make edits public button: నా దిద్దుబాట్లన్నింటినీ బహిరంగం చేయి
       flash update success: వాడుకరి సమాచారం విజయవంతంగా తాజాకరించబడింది.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index b84cea47f..621c25ea3 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1412,6 +1412,21 @@ th:
       heading: 'ตั้วรหัสผ่านใหม่สำหรับ: %{user}'
       reset: ตั้งรหัสผ่านใหม่
       flash changed: เปลี่ยนรหัสผ่านของคุณแล้วเรียบร้อย
+  profiles:
+    edit:
+      image: 'รูปภาพ:'
+      gravatar:
+        gravatar: ใช้ Gravatar
+        disabled: Gravatar ถูกปิดใช้
+        enabled: การแสดง Gravatar ของท่านถูกเปิดใช้
+      new image: เพิ่มรูปภาพ
+      keep image: ใช้รูปภาพปัจจุบัน
+      delete image: ลบรูปภาพปัจจุบัน
+      replace image: เปลี่ยนรูปภาพปัจจุบัน
+      image size hint: (ภาพขนาดสี่เหลี่ยม 100x100 จะดีที่สุด)
+      home location: 'ที่อยู่บ้าน:'
+      no home location: ท่านยังไม่ได้ระบุที่อยู่บ้าน
+      update home location on click: แก้ไขที่อยู่บ้านถ้าคลิกแผนที่หรือไม่?
   sessions:
     new:
       title: ลงชื่อเข้าใช้
@@ -2098,19 +2113,6 @@ th:
         heading: แก้ไขโดยเปิดเผย
       contributor terms:
         link text: นี้คืออะไร?
-      image: 'รูปภาพ:'
-      gravatar:
-        gravatar: ใช้ Gravatar
-        disabled: Gravatar ถูกปิดใช้
-        enabled: การแสดง Gravatar ของท่านถูกเปิดใช้
-      new image: เพิ่มรูปภาพ
-      keep image: ใช้รูปภาพปัจจุบัน
-      delete image: ลบรูปภาพปัจจุบัน
-      replace image: เปลี่ยนรูปภาพปัจจุบัน
-      image size hint: (ภาพขนาดสี่เหลี่ยม 100x100 จะดีที่สุด)
-      home location: 'ที่อยู่บ้าน:'
-      no home location: ท่านยังไม่ได้ระบุที่อยู่บ้าน
-      update home location on click: แก้ไขที่อยู่บ้านถ้าคลิกแผนที่หรือไม่?
       save changes button: บันทึกการเปลี่ยนแปลง
       make edits public button: ทำให้การแก้ไขของข้าพเจ้าเป็นสาธารณะเห็นได้ทั่วไป
       return to profile: กลับไปหน้าประวัติผู้ใช้
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index efe34f09c..d9bd583fb 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1119,6 +1119,25 @@ tl:
       reset: Muling Itakda ang Hudyat
       flash changed: Napalitan na ang hudyat mo.
       flash token bad: Hindi natagpuan ang ganyang kahalip, suriin kaya ang URL?
+  profiles:
+    edit:
+      image: Larawan
+      gravatar:
+        gravatar: Gamitin ang Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Ano ang Gravatar?
+        disabled: Hindi na pinagana ang Gravatar.
+        enabled: Pinagana ang pagpapakita ng iyong Gravatar.
+      new image: Magdagdag ng isang larawan
+      keep image: Panatilihin ang kasalukuyang larawan
+      delete image: Tanggalin ang pangkasalukuyang larawan
+      replace image: Palitan ang pangkasalukuyang larawan
+      image size hint: (pinakamahusay ang parisukat na mga larawan na hindi bababa
+        sa 100x100)
+      home location: Kinalalagyan ng Tahanan
+      no home location: Hindi mo naipasok ang kinalalagyan ng tahanan mo.
+      update home location on click: Isapanahon ang kinalalagyan ng tahanan kapag
+        pinindot ko ang ibabaw ng mapa?
   sessions:
     new:
       title: Lumagda
@@ -1775,23 +1794,6 @@ tl:
           bilang nasa loob ng Nasasakupan ng Madla.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: ano ba ito?
-      image: Larawan
-      gravatar:
-        gravatar: Gamitin ang Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Ano ang Gravatar?
-        disabled: Hindi na pinagana ang Gravatar.
-        enabled: Pinagana ang pagpapakita ng iyong Gravatar.
-      new image: Magdagdag ng isang larawan
-      keep image: Panatilihin ang kasalukuyang larawan
-      delete image: Tanggalin ang pangkasalukuyang larawan
-      replace image: Palitan ang pangkasalukuyang larawan
-      image size hint: (pinakamahusay ang parisukat na mga larawan na hindi bababa
-        sa 100x100)
-      home location: Kinalalagyan ng Tahanan
-      no home location: Hindi mo naipasok ang kinalalagyan ng tahanan mo.
-      update home location on click: Isapanahon ang kinalalagyan ng tahanan kapag
-        pinindot ko ang ibabaw ng mapa?
       save changes button: Sagipin ang mga Pagbabago
       make edits public button: Gawing pangmadla ang lahat ng mga pamamatnugot ko
       return to profile: Bumalik sa balangkas
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index c4038977b..cbfe50e41 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -797,7 +797,7 @@ tr:
           sport: Spor Kulübü
           "yes": Kulüp
         craft:
-          beekeper: Arı Yetiştiricisi
+          beekeeper: Arı Yetiştiricisi
           blacksmith: Demirci
           brewery: Bira Fabrikası
           carpenter: Marangoz
@@ -827,7 +827,7 @@ tr:
           ambulance_station: Ambulans Ä°stasyonu
           assembly_point: Toplanma Noktası
           defibrillator: Defibrilatör
-          fire_xtinguisher: Yangın Söndürücü
+          fire_extinguisher: Yangın Söndürücü
           fire_water_pond: Ateş Suyu Göleti
           landing_site: Acil İniş Alanı
           life_ring: Can Yeleği
@@ -1778,6 +1778,24 @@ tr:
       reset: Parolayı Sıfırla
       flash changed: Parolanız değiştirildi.
       flash token bad: Bu simgeyi bulamadıysanız belki de bağlantıyı kontrol etmelisiniz?
+  profiles:
+    edit:
+      image: Resim
+      gravatar:
+        gravatar: Gravatar kullanın
+        link: https://wiki.openstreetmap.org/wiki/Tr:Gravatar
+        what_is_gravatar: Gravatar nedir?
+        disabled: Gravatar devre dışı bırakıldı.
+        enabled: Gravatarınızın görüntüsü etkinleştirildi.
+      new image: Resim ekle
+      keep image: Geçerli resim dursun
+      delete image: Geçerli resim kaldır
+      replace image: Geçerli resmi değiştir
+      image size hint: (100x100 olan kare resimler daha iyi görünür)
+      home location: Ev Konumu
+      no home location: Konumunu girmedin.
+      update home location on click: Haritada tıkladığımda konumum güncelleştirilsin
+        mi?
   sessions:
     new:
       title: Oturum aç
@@ -2717,22 +2735,6 @@ tr:
         agreed_with_pd: Ayrıca düzenlediklerin Kamu Malı olsun diye kabul ettin.
         link: https://wiki.openstreetmap.org/wiki/Tr:Open_Database_License/Contributor_Terms
         link text: bu nedir?
-      image: Resim
-      gravatar:
-        gravatar: Gravatar kullanın
-        link: https://wiki.openstreetmap.org/wiki/Tr:Gravatar
-        what_is_gravatar: Gravatar nedir?
-        disabled: Gravatar devre dışı bırakıldı.
-        enabled: Gravatarınızın görüntüsü etkinleştirildi.
-      new image: Resim ekle
-      keep image: Geçerli resim dursun
-      delete image: Geçerli resim kaldır
-      replace image: Geçerli resmi değiştir
-      image size hint: (100x100 olan kare resimler daha iyi görünür)
-      home location: Ev Konumu
-      no home location: Konumunu girmedin.
-      update home location on click: Haritada tıkladığımda konumum güncelleştirilsin
-        mi?
       save changes button: Değişiklikleri Kaydet
       make edits public button: Bütün girdiklerim herkese açık olsun
       return to profile: Profile dön
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index a3ad99ca8..f3cab5e74 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -601,6 +601,10 @@ tt:
   passwords:
     lost_password:
       email address: 'Электрон почта адресы:'
+  profiles:
+    edit:
+      image: 'Сурәт:'
+      new image: Сурәтне өстәү
   sessions:
     new:
       title: Керү
@@ -713,8 +717,6 @@ tt:
         enabled link text: бу нәрсә?
       contributor terms:
         link text: бу нәрсә?
-      image: 'Сурәт:'
-      new image: Сурәтне өстәү
       save changes button: Үзгәрешләрне саклау
     index:
       title: Кулланучылар
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index ce21b3de7..781cf5a58 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -812,7 +812,7 @@ uk:
           sport: Спортивний клуб
           "yes": Клуб
         craft:
-          beekeper: Пасіка
+          beekeeper: Пасіка
           blacksmith: Коваль
           brewery: Пивоварня
           carpenter: Столяр
@@ -842,7 +842,7 @@ uk:
           ambulance_station: Станція швидкої медичної допомоги
           assembly_point: Місце збору
           defibrillator: Дефібрилятор
-          fire_xtinguisher: Вогнегасник
+          fire_extinguisher: Вогнегасник
           fire_water_pond: Пожежний ставок
           landing_site: Місце аварійної посадки
           life_ring: Рятувальний круг
@@ -1775,6 +1775,24 @@ uk:
       reset: Скидання пароля
       flash changed: Ваш пароль було змінено.
       flash token bad: Неможливо знайти такий код підтвердження, перевірте посилання.
+  profiles:
+    edit:
+      image: Зображення
+      gravatar:
+        gravatar: Використовувати Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Про Gravatar.
+        disabled: Gravatar вимкнено.
+        enabled: Показ Вашого Gravatar'а увімкнено.
+      new image: Додати зображення
+      keep image: Залишити поточне зображення
+      delete image: Вилучити поточне зображення
+      replace image: Замінити поточне зображення
+      image size hint: (найкраще підходять квадратні зображення, принаймні 100х100)
+      home location: Основне місце розташування
+      no home location: Ви не позначили своє основне місце розташування.
+      update home location on click: Оновлювати моє місце розташування, коли я клацаю
+        на мапу?
   sessions:
     new:
       title: Ласкаво просимо
@@ -2699,22 +2717,6 @@ uk:
           Надбання.
         link: https://wiki.openstreetmap.org/wiki/Uk:Open_Database_License/Contributor_Terms
         link text: що це?
-      image: Зображення
-      gravatar:
-        gravatar: Використовувати Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: Про Gravatar.
-        disabled: Gravatar вимкнено.
-        enabled: Показ Вашого Gravatar'а увімкнено.
-      new image: Додати зображення
-      keep image: Залишити поточне зображення
-      delete image: Вилучити поточне зображення
-      replace image: Замінити поточне зображення
-      image size hint: (найкраще підходять квадратні зображення, принаймні 100х100)
-      home location: Основне місце розташування
-      no home location: Ви не позначили своє основне місце розташування.
-      update home location on click: Оновлювати моє місце розташування, коли я клацаю
-        на мапу?
       save changes button: Зберегти зміни
       make edits public button: Зробити всі мої редагування загальнодоступними
       return to profile: Повернення до профілю
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 8a1dddf93..40a3fadca 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1623,6 +1623,24 @@ vi:
       reset: Đặt lại Mật khẩu
       flash changed: Mật khẩu của bạn đã được thay đổi.
       flash token bad: Không tìm thấy dấu hiệu đó. Có lẽ kiểm tra URL?
+  profiles:
+    edit:
+      image: Hình
+      gravatar:
+        gravatar: Sử dụng Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=vi
+        what_is_gravatar: Gravatar là gì?
+        disabled: Hình Gravatar của bạn đã bị tắt.
+        enabled: Hình Gravatar của bạn đã bị kích hoạt.
+      new image: Thêm hình
+      keep image: Giữ hình hiện dùng
+      delete image: Xóa hình hiện dùng
+      replace image: Thay hình hiện dùng
+      image size hint: (hình vuông ít nhất 100×100 điểm ảnh là tốt nhất)
+      home location: Vị trí Nhà
+      no home location: Bạn chưa định vị trí nhà.
+      update home location on click: Cập nhật vị trí nhà khi tôi nhấn chuột vào bản
+        đồ?
   sessions:
     new:
       title: Đăng nhập
@@ -2528,22 +2546,6 @@ vi:
           phạm vi công cộng.
         link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms?uselang=vi
         link text: đây là gì?
-      image: Hình
-      gravatar:
-        gravatar: Sử dụng Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=vi
-        what_is_gravatar: Gravatar là gì?
-        disabled: Hình Gravatar của bạn đã bị tắt.
-        enabled: Hình Gravatar của bạn đã bị kích hoạt.
-      new image: Thêm hình
-      keep image: Giữ hình hiện dùng
-      delete image: Xóa hình hiện dùng
-      replace image: Thay hình hiện dùng
-      image size hint: (hình vuông ít nhất 100×100 điểm ảnh là tốt nhất)
-      home location: Vị trí Nhà
-      no home location: Bạn chưa định vị trí nhà.
-      update home location on click: Cập nhật vị trí nhà khi tôi nhấn chuột vào bản
-        đồ?
       save changes button: Lưu các Thay đổi
       make edits public button: Phát hành công khai các sửa đổi của tôi
       return to profile: Trở về trang cá nhân
diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 5e08b3ace..ed4089982 100644
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -585,7 +585,7 @@ xmf:
           sport: სპორტული კლუბი
           "yes": კლუბი
         craft:
-          beekeper: მესკალე
+          beekeeper: მესკალე
           brewery: ლუდოხაშუ
           carpenter: ხურო
           dressmaker: მაჭალი
@@ -603,7 +603,7 @@ xmf:
           access_point: მეჭირინაფაშ ჭურჭული
           ambulance_station: ბიწორი მოხვარაშ დგჷმილი
           defibrillator: დეფიბრილატორი
-          fire_xtinguisher: დაჩხირმაშქირიტალი
+          fire_extinguisher: დაჩხირმაშქირიტალი
           phone: ოგანაგე რსხუშ ტელეფონი
           siren: ავარიული სირენა
           water_tank: წყარიშ რეზერვუარი
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 47370855e..f83817cf5 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -55,6 +55,7 @@
 # Author: Xiaomingyan
 # Author: Yfdyh000
 # Author: Zazzzz
+# Author: Zhang8569
 # Author: 乌拉跨氪
 # Author: 予弦
 # Author: 列维劳德
@@ -789,7 +790,7 @@ zh-CN:
           sport: 体育俱乐部
           "yes": 俱乐部
         craft:
-          beekeper: 养蜂人工作室
+          beekeeper: 养蜂人工作室
           blacksmith: 铁匠铺
           brewery: 啤酒厂
           carpenter: 木匠工坊
@@ -818,7 +819,7 @@ zh-CN:
           ambulance_station: 救护站
           assembly_point: 集合地点
           defibrillator: 除颤仪
-          fire_xtinguisher: 灭火器
+          fire_extinguisher: 灭火器
           fire_water_pond: 消防水塘
           landing_site: 紧急着陆地点
           life_ring: 紧急救生圈
@@ -902,6 +903,7 @@ zh-CN:
           railway: 历史铁路
           roman_road: 罗马道路
           ruins: 遗迹
+          rune_stone: 符文石
           stone: 石头
           tomb: 墓
           tower: 塔
@@ -1697,6 +1699,43 @@ zh-CN:
       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: http://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: 什么是Gravatar？
+        disabled: Gravatar已禁用。
+        enabled: 您的Gravatar显示已启用。
+      new image: 添加图像
+      keep image: 保持当前图像
+      delete image: 删除当前图像
+      replace image: 替换当前图像
+      image size hint: (正方形图像，尺寸至少为100x100)
+      home location: 住所位置
+      no home location: 您还没有输入您的住所位置。
+      update home location on click: 点击地图时更新所在位置？
+    update:
+      success: 个人资料已更新。
+      failure: 无法更新个人资料。
   sessions:
     new:
       title: 登录
@@ -2378,8 +2417,10 @@ zh-CN:
       my profile: 我的资料
       my settings: 我的设置
       my comments: 我的评论
+      my_preferences: 我的偏好
       blocks on me: 我的封禁
       blocks by me: 被我封禁
+      edit_profile: 编辑个人资料
       send message: 发送信息
       diary: 日记
       edits: 编辑
@@ -2462,21 +2503,6 @@ zh-CN:
         agreed_with_pd: 您也将您的编辑释于公有领域。
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: 这是什么？
-      image: 图像
-      gravatar:
-        gravatar: 使用 Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: 什么是Gravatar？
-        disabled: Gravatar已禁用。
-        enabled: 您的Gravatar显示已启用。
-      new image: 添加图像
-      keep image: 保持当前图像
-      delete image: 删除当前图像
-      replace image: 替换当前图像
-      image size hint: (正方形图像，尺寸至少为100x100)
-      home location: 住所位置
-      no home location: 您还没有输入您的住所位置。
-      update home location on click: 点击地图时更新所在位置？
       save changes button: 保存更改
       make edits public button: 公开我所有的编辑
       return to profile: 返回基本信息
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 0ad44dc98..f3abc4374 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -764,7 +764,7 @@ zh-TW:
           sport: 體育會
           "yes": 俱樂部
         craft:
-          beekeper: 養蜂人家
+          beekeeper: 養蜂人家
           blacksmith: 鐵匠
           brewery: 釀酒廠
           carpenter: 木匠
@@ -794,7 +794,7 @@ zh-TW:
           ambulance_station: 急救站
           assembly_point: 集合處
           defibrillator: 除顫器
-          fire_xtinguisher: 滅火器
+          fire_extinguisher: 滅火器
           fire_water_pond: 消防水塘
           landing_site: 緊急降落點
           life_ring: 緊急救生圈
@@ -879,6 +879,7 @@ zh-TW:
           railway: 歷史鐵路
           roman_road: 羅馬道路
           ruins: 廢墟
+          rune_stone: 盧恩符文石
           stone: 石造史蹟
           tomb: 墳墓
           tower: 塔
@@ -1685,6 +1686,23 @@ zh-TW:
       reset: 重設密碼
       flash changed: 您的密碼已經變更。
       flash token bad: 找不到該密鑰，可能要檢查一下 URL？
+  profiles:
+    edit:
+      image: 圖片
+      gravatar:
+        gravatar: 使用 Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: 什麼是 Gravatar？
+        disabled: Gravatar已停用。
+        enabled: 您的Gravatar顯示功能已啟用。
+      new image: 加入圖片
+      keep image: 保持目前的圖片
+      delete image: 移除目前的圖片
+      replace image: 取代目前的圖片
+      image size hint: ' (方形圖片至少 100x100 的效果最好)'
+      home location: 家的位置
+      no home location: 您尚未輸入家的位置。
+      update home location on click: 當我點選地圖時更新家的位置？
   sessions:
     new:
       title: 登入
@@ -2484,21 +2502,6 @@ zh-TW:
         agreed_with_pd: 您亦同意將您的編輯放到公共領域
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: 這是什麼？
-      image: 圖片
-      gravatar:
-        gravatar: 使用 Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        what_is_gravatar: 什麼是 Gravatar？
-        disabled: Gravatar已停用。
-        enabled: 您的Gravatar顯示功能已啟用。
-      new image: 加入圖片
-      keep image: 保持目前的圖片
-      delete image: 移除目前的圖片
-      replace image: 取代目前的圖片
-      image size hint: ' (方形圖片至少 100x100 的效果最好)'
-      home location: 家的位置
-      no home location: 您尚未輸入家的位置。
-      update home location on click: 當我點選地圖時更新家的位置？
       save changes button: 儲存變更
       make edits public button: 將我所有的編輯設為公開
       return to profile: 返回基本資料