From: translatewiki.net <l10n-bot@translatewiki.net>
Date: Thu, 16 Dec 2021 12:11:53 +0000 (+0100)
Subject: Localisation updates from https://translatewiki.net.
X-Git-Tag: live~1404
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d4dadf1fe2e1930d4d9e0eba72ac15b7be572405

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index fa1e75329..f218ec1f8 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -242,6 +242,25 @@ af:
       entry:
         comment: Kommentaar
         full: Volle nota
+  accounts:
+    edit:
+      title: Redigeer rekening
+      my settings: My instellings
+      current email address: Huidige e-posadres
+      public editing:
+        heading: Openbare redigerings
+        enabled: Geaktiveer. Nie anoniem nie en kan data redigeer.
+        enabled link text: wat is dié?
+        disabled link text: hoekom kan ek nie redigeer nie?
+      public editing note:
+        heading: Openbare redigerings
+      contributor terms:
+        heading: Bydraervoorwaardes
+        link text: wat is dié?
+      save changes button: Stoor Wysigings
+      make edits public button: Stel al my wysigings openbaar
+    update:
+      success: Gebruikersbesonderhede suksesvol bygewerk.
   browse:
     created: Geskep
     closed: Gesluit
@@ -2045,23 +2064,6 @@ af:
       delete_user: Skrap dié Gebruiker
       confirm: Bevestig
       report: Rapporteer hierdie gebruiker
-    account:
-      title: Redigeer rekening
-      my settings: My instellings
-      current email address: Huidige e-posadres
-      public editing:
-        heading: Openbare redigerings
-        enabled: Geaktiveer. Nie anoniem nie en kan data redigeer.
-        enabled link text: wat is dié?
-        disabled link text: hoekom kan ek nie redigeer nie?
-      public editing note:
-        heading: Openbare redigerings
-      contributor terms:
-        heading: Bydraervoorwaardes
-        link text: wat is dié?
-      save changes button: Stoor Wysigings
-      make edits public button: Stel al my wysigings openbaar
-      flash update success: Gebruikersbesonderhede suksesvol bygewerk.
     set_home:
       flash success: U tuisligging is suksesvol gestoor
     index:
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index e89c80523..91b6c4021 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -124,6 +124,35 @@ aln:
     notes:
       entry:
         comment: Koment
+  accounts:
+    edit:
+      title: Ndrysho akountin
+      my settings: Preferencat e mia
+      current email address: 'Email adresa e tanishme:'
+      public editing:
+        heading: Duke ndryshue publikisht
+        enabled: E pranishme. Jo anonime dhe muni me i ndryshue t'dhanat.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: çka osht kjo?
+        disabled: E çkyckur dhe smuni me i ndryshu të dhanat, të gjitha ndryshimet
+          e ma hershme jan anonime.
+        disabled link text: pse spo muj me i ndryshue?
+      public editing note:
+        heading: 'Ndryshime publike:'
+        html: Niher për niher ndryshimet e juaja janë anonime dhe njerëzit nuk mund
+          të ju dërgojnë mesazhe apo shohin vendndodhjen tuaj. Për të treguar atë
+          që e keni edituar dhe lejojnë njerëzit të lidhen me ju nëpërmjet internetit,
+          kliko butonin më poshtë. <b> Që nga ndryshimi 0,6 API, vetëm përdoruesit
+          e publikut mund të redaktoni të dhënat hartë </ b>. (<a Href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">
+          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>
+      save changes button: Ruaj Ndryshimet
+      make edits public button: Boni gjith ndryshimet e mija publike
+    update:
+      success_confirm_needed: Informatat e shfyrtezuesit u ndryshan me sukses. Shihni
+        emailin per konfirmim.
+      success: Informatat e shfrytëzuesit u ndryshuan me sukses.
   browse:
     changeset:
       title: Ndryshim
@@ -1211,33 +1240,6 @@ aln:
       unhide_user: shfaqe kët shfrytzues
       delete_user: fshije kët shfrytzues
       confirm: Konfirmo
-    account:
-      title: Ndrysho akountin
-      my settings: Preferencat e mia
-      current email address: 'Email adresa e tanishme:'
-      public editing:
-        heading: 'Ndryshime publike:'
-        enabled: E pranishme. Jo anonime dhe muni me i ndryshue t'dhanat.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: çka osht kjo?
-        disabled: E çkyckur dhe smuni me i ndryshu të dhanat, të gjitha ndryshimet
-          e ma hershme jan anonime.
-        disabled link text: pse spo muj me i ndryshue?
-      public editing note:
-        heading: Duke ndryshue publikisht
-        html: Niher për niher ndryshimet e juaja janë anonime dhe njerëzit nuk mund
-          të ju dërgojnë mesazhe apo shohin vendndodhjen tuaj. Për të treguar atë
-          që e keni edituar dhe lejojnë njerëzit të lidhen me ju nëpërmjet internetit,
-          kliko butonin më poshtë. <b> Që nga ndryshimi 0,6 API, vetëm përdoruesit
-          e publikut mund të redaktoni të dhënat hartë </ b>. (<a Href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">
-          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>
-      save changes button: Ruaj Ndryshimet
-      make edits public button: Boni gjith ndryshimet e mija publike
-      flash update success confirm needed: Informatat e shfyrtezuesit u ndryshan me
-        sukses. Shihni emailin per konfirmim.
-      flash update success: Informatat e shfrytëzuesit u ndryshuan me sukses.
     set_home:
       flash success: Veni i shpis u ruajt me sukses
     go_public:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 81a4fde6e..270a116b8 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -270,6 +270,45 @@ ar:
       entry:
         comment: التعليق
         full: ملاحظة كاملة
+  accounts:
+    edit:
+      title: عدل الحساب
+      my settings: إعداداتي
+      current email address: عنوان البريد الإلكرتروني الحالي
+      external auth: مصادقة خارجية
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: ما هذا؟
+      public editing:
+        heading: تعديل عام
+        enabled: مفعَّل، غير مجهول ويمكنك تعديل البيانات.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ما هذا؟
+        disabled: مُعطل ولا يمكن تعديل البيانات، جميع التعديلات السابقة مجهولة الهوية.
+        disabled link text: لماذا لا أستطيع التعديل؟
+      public editing note:
+        heading: تعديل عام
+        html: في الوقت الحالي، تعديلاتك مجهولة الهوية ولا يمكن للأشخاص إرسال رسائل
+          إليك أو الاطلاع على موقعك، لإظهار ما قمت بتحريره والسماح للأشخاص بالاتصال
+          بك عبر موقع الويب; انقر فوق الزر أدناه<b>منذ تغيير واجهة برمجة التطبيقات
+          0.6، لا يمكن سوى للمستخدمين العموميين تعديل بيانات الخريطة</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">اكتشف
+          السبب</a>).<ul><li>لن يتم الكشف عن عنوان بريدك الإلكتروني من خلال جعله عاما.</li><li>لا
+          يمكن عكس هذا الإجراء وأصبح جميع المستخدمين الجدد عامين افتراضيا.</li></ul>
+      contributor terms:
+        heading: شروط المساهم
+        agreed: لقد وافقت على شروط المساهم الجديدة.
+        not yet agreed: لم توافق بعد على شروط المساهم الجديدة.
+        review link text: يُرجَى اتباع هذا الرابط في الوقت الذي يناسبك لمراجعة وقبول
+          شروط المساهمة الجديدة.
+        agreed_with_pd: وقد أعلنت أيضًا أنك تعتبر تعديلاتك ملكية عامة.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: ما هذا؟
+      save changes button: حفظ التغييرات
+      make edits public button: اجعل جميع تعديلاتي عامة
+    update:
+      success_confirm_needed: تم تحديث معلومات المستخدم بنجاح، تحقق من بريدك الإلكتروني
+        لملاحظة تأكيد العنوان الإلكتروني الجديد.
+      success: تم تحديث معلومات المستخدم بنجاح.
   browse:
     created: تم الإنشاء
     closed: تم الإغلاق
@@ -2348,43 +2387,6 @@ ar:
       delete_user: احذف هذا المستخدم
       confirm: تأكيد
       report: أبلغ عن هذا المستخدم
-    account:
-      title: عدل الحساب
-      my settings: إعداداتي
-      current email address: عنوان البريد الإلكرتروني الحالي
-      external auth: مصادقة خارجية
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: ما هذا؟
-      public editing:
-        heading: تعديل عام
-        enabled: مفعَّل، غير مجهول ويمكنك تعديل البيانات.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ما هذا؟
-        disabled: مُعطل ولا يمكن تعديل البيانات، جميع التعديلات السابقة مجهولة الهوية.
-        disabled link text: لماذا لا أستطيع التعديل؟
-      public editing note:
-        heading: تعديل عام
-        html: في الوقت الحالي، تعديلاتك مجهولة الهوية ولا يمكن للأشخاص إرسال رسائل
-          إليك أو الاطلاع على موقعك، لإظهار ما قمت بتحريره والسماح للأشخاص بالاتصال
-          بك عبر موقع الويب; انقر فوق الزر أدناه<b>منذ تغيير واجهة برمجة التطبيقات
-          0.6، لا يمكن سوى للمستخدمين العموميين تعديل بيانات الخريطة</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">اكتشف
-          السبب</a>).<ul><li>لن يتم الكشف عن عنوان بريدك الإلكتروني من خلال جعله عاما.</li><li>لا
-          يمكن عكس هذا الإجراء وأصبح جميع المستخدمين الجدد عامين افتراضيا.</li></ul>
-      contributor terms:
-        heading: شروط المساهم
-        agreed: لقد وافقت على شروط المساهم الجديدة.
-        not yet agreed: لم توافق بعد على شروط المساهم الجديدة.
-        review link text: يُرجَى اتباع هذا الرابط في الوقت الذي يناسبك لمراجعة وقبول
-          شروط المساهمة الجديدة.
-        agreed_with_pd: وقد أعلنت أيضًا أنك تعتبر تعديلاتك ملكية عامة.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: ما هذا؟
-      save changes button: حفظ التغييرات
-      make edits public button: اجعل جميع تعديلاتي عامة
-      flash update success confirm needed: تم تحديث معلومات المستخدم بنجاح، تحقق من
-        بريدك الإلكتروني لملاحظة تأكيد العنوان الإلكتروني الجديد.
-      flash update success: تم تحديث معلومات المستخدم بنجاح.
     set_home:
       flash success: موقع المنزل حُفِظ بنجاح
     go_public:
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 6ec0bba6e..d7dffe437 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -106,6 +106,31 @@ arz:
         needs_view: هل يحتاج المستخدم لتسجيل الدخول قبل أن يتم مسح هذه العرقلة؟
       user:
         new_email: (لا يظهر علنًا)
+  accounts:
+    edit:
+      title: عدّل الحساب
+      my settings: إعداداتي
+      public editing:
+        heading: تعديل عام
+        enabled: مفعّل. غير مجهول ويمكنك تعديل البيانات.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ما هذا؟
+        disabled: مُعطل ولا يمكن تعديل البيانات، جميع التعديلات السابقه مجهوله الهويه.
+        disabled link text: لماذا لا أستطيع التعديل؟
+      public editing note:
+        heading: 'تعديل عام:'
+        html: حاليًا تعديلاتك تظهر بشكل مجهول ولا يمكن للناس إرسال رسائل لك أو رؤيه
+          موقعك. لإظهار ما قمت بتعديله وللسماح للناس بالاتصال بك من خلال الموقع، انقر
+          على الزر أدناه. <b>منذ التغيير إلى الأى بى أى 0.6، فقط المستخدمين العلنيين
+          يمكنه تحرير بيانات الخريطة</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">لمعرفه
+          السبب</a>). <ul><li>عنوانك البريدى لن يكشف به علنّا.</li><li>هذا الإجراء
+          لا يمكن عكسه وجميع المستخدمين الجديد علنيين بشكل افتراضى.</li></ul>
+      save changes button: حفظ التغييرات
+      make edits public button: اجعل جميع تعديلاتى عامة
+    update:
+      success_confirm_needed: تم تحديث معلومات المستخدم بنجاح. تحقق من بريدك الإلكترونى
+        لمذكره تأكيد العنوان الإلكترونى الجديد.
+      success: تم تحديث معلومات المستخدم بنجاح.
   browse:
     changeset:
       title: 'حزمه التغييرات: %{id}'
@@ -996,29 +1021,6 @@ arz:
       unhide_user: أظهر هذا المستخدم
       delete_user: احذف هذا المستخدم
       confirm: أكّد
-    account:
-      title: عدّل الحساب
-      my settings: إعداداتي
-      public editing:
-        heading: 'تعديل عام:'
-        enabled: مفعّل. غير مجهول ويمكنك تعديل البيانات.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ما هذا؟
-        disabled: مُعطل ولا يمكن تعديل البيانات، جميع التعديلات السابقه مجهوله الهويه.
-        disabled link text: لماذا لا أستطيع التعديل؟
-      public editing note:
-        heading: تعديل عام
-        html: حاليًا تعديلاتك تظهر بشكل مجهول ولا يمكن للناس إرسال رسائل لك أو رؤيه
-          موقعك. لإظهار ما قمت بتعديله وللسماح للناس بالاتصال بك من خلال الموقع، انقر
-          على الزر أدناه. <b>منذ التغيير إلى الأى بى أى 0.6، فقط المستخدمين العلنيين
-          يمكنه تحرير بيانات الخريطة</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">لمعرفه
-          السبب</a>). <ul><li>عنوانك البريدى لن يكشف به علنّا.</li><li>هذا الإجراء
-          لا يمكن عكسه وجميع المستخدمين الجديد علنيين بشكل افتراضى.</li></ul>
-      save changes button: حفظ التغييرات
-      make edits public button: اجعل جميع تعديلاتى عامة
-      flash update success confirm needed: تم تحديث معلومات المستخدم بنجاح. تحقق من
-        بريدك الإلكترونى لمذكره تأكيد العنوان الإلكترونى الجديد.
-      flash update success: تم تحديث معلومات المستخدم بنجاح.
     set_home:
       flash success: موقع المنزل حُفظ بنجاح
     go_public:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 4e45a2491..7bd583404 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -213,6 +213,50 @@ ast:
       entry:
         comment: Comentariu
         full: Nota completa
+  accounts:
+    edit:
+      title: Editar la cuenta
+      my settings: Les mios preferencies
+      current email address: Direición de corréu electrónicu actual
+      external auth: Autenticación esterna
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: ¿qué ye esto?
+      public editing:
+        heading: Edición pública
+        enabled: Activaes. Nun yes anónimu y puedes editar los datos.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ¿qué ye esto?
+        disabled: Desactivaes y nun puedes editar los datos; toles ediciones anteriores
+          son anónimes.
+        disabled link text: ¿por qué nun puedo editar?
+      public editing note:
+        heading: Ediciones públiques
+        html: Anguaño, les tos ediciones son anónimes y la xente nun puede unviate
+          mensaxes o ver la to llocalización. P'amosar lo qu'editasti y permitir que
+          la xente se ponga en contautu contigo pela páxina web, pulsia nel botón
+          qu'apaez abaxo. <b>Dende'l cambiu al API 0.6, sólo los usuarios públicos
+          pueden editar los datos del mapa</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">por
+          estes razones</a>).<ul><li>Les direiciones de corréu electrónicu nun se
+          fairán públiques.</li><li>Nun ye posible volver atrás d'esta aición, y agora
+          tolos usuarios nuevos son públicos de mou predetermináu.</li></ul>
+      contributor terms:
+        heading: Términos de collaboración
+        agreed: Aceutasti los nuevos términos de collaboración.
+        not yet agreed: Entá nun aceutasti los nuevos términos de collaboración.
+        review link text: Cuando quieras sigui esti enllaz pa revisar y aceutar los
+          nuevos términos de collaboración.
+        agreed_with_pd: Tamién declarasti que consideres que les tos ediciones pertenecen
+          al Dominiu Públicu.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: ¿qué ye esto?
+      save changes button: Guardar los cambios
+      make edits public button: Facer públiques toles mios ediciones
+    update:
+      success_confirm_needed: La información del usuariu s'anovó correutamente. Nel
+        to corréu electrónicu alcontrarás una nota pa confirmar la to nueva direición
+        de corréu.
+      success: La información del usuariu s'anovó correutamente.
   browse:
     created: Creáu
     closed: Zarráu
@@ -2235,48 +2279,6 @@ ast:
       delete_user: Desaniciar esti usuariu
       confirm: Confirmar
       report: Informar d'esti usuariu
-    account:
-      title: Editar la cuenta
-      my settings: Les mios preferencies
-      current email address: Direición de corréu electrónicu actual
-      external auth: Autenticación esterna
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: ¿qué ye esto?
-      public editing:
-        heading: Ediciones públiques
-        enabled: Activaes. Nun yes anónimu y puedes editar los datos.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ¿qué ye esto?
-        disabled: Desactivaes y nun puedes editar los datos; toles ediciones anteriores
-          son anónimes.
-        disabled link text: ¿por qué nun puedo editar?
-      public editing note:
-        heading: Edición pública
-        html: Anguaño, les tos ediciones son anónimes y la xente nun puede unviate
-          mensaxes o ver la to llocalización. P'amosar lo qu'editasti y permitir que
-          la xente se ponga en contautu contigo pela páxina web, pulsia nel botón
-          qu'apaez abaxo. <b>Dende'l cambiu al API 0.6, sólo los usuarios públicos
-          pueden editar los datos del mapa</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">por
-          estes razones</a>).<ul><li>Les direiciones de corréu electrónicu nun se
-          fairán públiques.</li><li>Nun ye posible volver atrás d'esta aición, y agora
-          tolos usuarios nuevos son públicos de mou predetermináu.</li></ul>
-      contributor terms:
-        heading: Términos de collaboración
-        agreed: Aceutasti los nuevos términos de collaboración.
-        not yet agreed: Entá nun aceutasti los nuevos términos de collaboración.
-        review link text: Cuando quieras sigui esti enllaz pa revisar y aceutar los
-          nuevos términos de collaboración.
-        agreed_with_pd: Tamién declarasti que consideres que les tos ediciones pertenecen
-          al Dominiu Públicu.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: ¿qué ye esto?
-      save changes button: Guardar los cambios
-      make edits public button: Facer públiques toles mios ediciones
-      flash update success confirm needed: La información del usuariu s'anovó correutamente.
-        Nel to corréu electrónicu alcontrarás una nota pa confirmar la to nueva direición
-        de corréu.
-      flash update success: La información del usuariu s'anovó correutamente.
     set_home:
       flash success: Llocalización d'aniciu guardada correutamente
     go_public:
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 3365ca4b4..c552a55de 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -153,6 +153,17 @@ az:
       entry:
         comment: Şərh
         full: Tam qeydlər
+  accounts:
+    edit:
+      current email address: 'Hazırki E-Poçt Ünvanı:'
+      openid:
+        link text: bu nədir?
+      public editing:
+        enabled link text: Bu nədir?
+        disabled link text: Niyə mən redaktə edə bilmirəm?
+      contributor terms:
+        link text: bu nədir?
+      save changes button: Dəyişiklikləri yadda saxla
   browse:
     created: Yaradılıb
     closed: Bağlanıb
@@ -1101,16 +1112,6 @@ az:
       hide_user: Bu istifadəçini gizlət
       delete_user: bu istifadəçini sil
       confirm: Təsdiq et
-    account:
-      current email address: 'Hazırki E-Poçt Ünvanı:'
-      openid:
-        link text: bu nədir?
-      public editing:
-        enabled link text: Bu nədir?
-        disabled link text: Niyə mən redaktə edə bilmirəm?
-      contributor terms:
-        link text: bu nədir?
-      save changes button: Dəyişiklikləri yadda saxla
     index:
       title: İstifadəçilər
       heading: İstifadəçilər
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 35fcff6e2..fee78f778 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -241,6 +241,48 @@ be-Tarask:
       entry:
         comment: Камэнтар
         full: Поўны тэкст
+  accounts:
+    edit:
+      title: Рэдагаваньне рахунку
+      my settings: Мае налады
+      current email address: Цяперашні адрас электроннай пошты
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: што гэта?
+      public editing:
+        heading: Публічнае рэдагаваньне
+        enabled: Уключана. Вы не ананім і можаце рэдагаваць зьвесткі.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: што гэта?
+        disabled: Забаронены і ня можа рэдагаваць зьвесткі, усе папярэднія рэдагаваньні
+          былі ананімнымі.
+        disabled link text: чаму я не магу рэдагаваць?
+      public editing note:
+        heading: Публічнае рэдагаваньне
+        html: У цяперашні момант Вашыя рэдагаваньні зьяўляюцца ананімнымі і людзі
+          ня могуць дасылаць Вам паведамленьні, ці бачыць Вашае месцазнаходжаньне.
+          Каб быў бачны Ваш унёсак і людзі маглі кантактаваць з Вамі праз ўэб-сайт,
+          націсьніце кнопку ніжэй. <b>Пасьля зьменаў API вэрсіі 0.6, толькі даступныя
+          для сувязі карыстальнікі могуць рэдагаваць зьвесткі на мапе</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">даведацца
+          чаму</a>).<ul><li>Ваш адрас электроннай пошты ня будзе паказвацца публічна.</li><li>Гэтае
+          дзеяньне ня можа быць адмененае і ўсе новыя карыстальнікі цяпер даступныя
+          для сувязі па змоўчваньні.</li></ul>
+      contributor terms:
+        heading: Умовы супрацоўніцтва
+        agreed: Вы пагадзіліся з новымі ўмовамі супрацоўніцтва.
+        not yet agreed: Вы яшчэ не пагадзіліся з новымі ўмовамі супрацоўніцтва.
+        review link text: Калі ласка, перайдзіце па гэтай спасылцы ў зручны для Вас
+          час і пацьвердзіце згоду з новымі ўмовамі супрацоўніцтва.
+        agreed_with_pd: Вы таксама заяўляеце, што перадаеце Вашыя рэдагаваньні ў грамадзкі
+          набытак.
+        link text: што гэта?
+      save changes button: Захаваць зьмены
+      make edits public button: Зрабіць усе мае рэдагаваньні публічнымі
+    update:
+      success_confirm_needed: Інфармацыя карыстальніка была абноўленая пасьпяхова.
+        Праверце Вашую электронную пошту каб пацьвердзіць Ваш новы адрас электроннай
+        пошты.
+      success: Зьвесткі пра карыстальніка пасьпяхова абноўленыя.
   browse:
     created: Створана
     closed: Закрытае
@@ -1502,46 +1544,6 @@ be-Tarask:
       unhide_user: Паказаць гэтага ўдзельніка
       delete_user: Выдаліць гэтага ўдзельніка
       confirm: Пацьвердзіць
-    account:
-      title: Рэдагаваньне рахунку
-      my settings: Мае налады
-      current email address: Цяперашні адрас электроннай пошты
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: што гэта?
-      public editing:
-        heading: Публічнае рэдагаваньне
-        enabled: Уключана. Вы не ананім і можаце рэдагаваць зьвесткі.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: што гэта?
-        disabled: Забаронены і ня можа рэдагаваць зьвесткі, усе папярэднія рэдагаваньні
-          былі ананімнымі.
-        disabled link text: чаму я не магу рэдагаваць?
-      public editing note:
-        heading: Публічнае рэдагаваньне
-        html: У цяперашні момант Вашыя рэдагаваньні зьяўляюцца ананімнымі і людзі
-          ня могуць дасылаць Вам паведамленьні, ці бачыць Вашае месцазнаходжаньне.
-          Каб быў бачны Ваш унёсак і людзі маглі кантактаваць з Вамі праз ўэб-сайт,
-          націсьніце кнопку ніжэй. <b>Пасьля зьменаў API вэрсіі 0.6, толькі даступныя
-          для сувязі карыстальнікі могуць рэдагаваць зьвесткі на мапе</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">даведацца
-          чаму</a>).<ul><li>Ваш адрас электроннай пошты ня будзе паказвацца публічна.</li><li>Гэтае
-          дзеяньне ня можа быць адмененае і ўсе новыя карыстальнікі цяпер даступныя
-          для сувязі па змоўчваньні.</li></ul>
-      contributor terms:
-        heading: Умовы супрацоўніцтва
-        agreed: Вы пагадзіліся з новымі ўмовамі супрацоўніцтва.
-        not yet agreed: Вы яшчэ не пагадзіліся з новымі ўмовамі супрацоўніцтва.
-        review link text: Калі ласка, перайдзіце па гэтай спасылцы ў зручны для Вас
-          час і пацьвердзіце згоду з новымі ўмовамі супрацоўніцтва.
-        agreed_with_pd: Вы таксама заяўляеце, што перадаеце Вашыя рэдагаваньні ў грамадзкі
-          набытак.
-        link text: што гэта?
-      save changes button: Захаваць зьмены
-      make edits public button: Зрабіць усе мае рэдагаваньні публічнымі
-      flash update success confirm needed: Інфармацыя карыстальніка была абноўленая
-        пасьпяхова. Праверце Вашую электронную пошту каб пацьвердзіць Ваш новы адрас
-        электроннай пошты.
-      flash update success: Зьвесткі пра карыстальніка пасьпяхова абноўленыя.
     set_home:
       flash success: Вашае месцазнаходжаньне пасьпяхова захаванае
     go_public:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 378962d14..057f7f929 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -246,6 +246,48 @@ be:
       entry:
         comment: Каментар
         full: Тлумачэнне
+  accounts:
+    edit:
+      title: Правіць рахунак
+      my settings: Мае настройкі
+      current email address: 'Бягучы адрас электроннай пошты:'
+      external auth: 'Знешняя Аўтэнтыфікацыя:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: што гэта?
+      public editing:
+        heading: Агульнае рэдагаванне
+        enabled: Уключана. Вы - не ананімны і можаце рэдагаваць дадзеныя.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: што гэта?
+        disabled: Адключана. Вы не можаце больш рэдагаваць, але ўсе ранейшыя змены
+          ананімныя.
+        disabled link text: чаму я не магу рэдагаваць?
+      public editing note:
+        heading: 'Публічнае рэдагаванне:'
+        html: У цяперашні момант Вашы рэдагаванні з'яўляюцца ананімнымі, і людзі не
+          могуць дасылаць Вам паведамленні, ці бачыць Ваша месцазнаходжанне. Каб быў
+          бачны Ваш уклад, і людзі маглі звязацца з Вамі праз вэб-сайт, націсніце
+          кнопку ніжэй. <b>Пасля пераходу на API версіі 0.6, толькі даступныя для
+          сувязі карыстальнікі могуць рэдагаваць звесткі на карце</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">даведацца,
+          чаму</a>) <ul><li>Гэта дзеянне не можа быць адменена, а ўсе новыя карыстальнікі
+          цяпер даступныя для сувязі па змаўчанні.</li></ul>
+      contributor terms:
+        heading: 'Умовы ўдзелу:'
+        agreed: Вы пагадзіліся на новыя ўмовы ўдзелу.
+        not yet agreed: Вы яшчэ не пагадзіліся на новыя ўмовы ўдзелу.
+        review link text: Калі ласка, прайдзіце па гэтай спасылцы для Вашай зручнасці,
+          каб разгледзець і прыняць новыя ўмовы ўдзелу.
+        agreed_with_pd: Вы таксама заявілі, што лічыце, што змены павінны знаходзіцца
+          ў агульнай уласнасці.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: што гэта?
+      save changes button: Запісаць змены
+      make edits public button: Зрабіць усе мае змены публічнымі
+    update:
+      success_confirm_needed: Звесткі аб карыстальніку паспяхова абноўленыя. Праверце
+        сваю эл.пошту, вам павінен прыйсці запыт на пацвярджэнне вашага новага адраса.
+      success: Звесткі аб карыстальніку паспяхова абноўленыя.
   browse:
     created: Створаны
     closed: Зачынены
@@ -2254,47 +2296,6 @@ be:
       delete_user: Выдаліць гэтага карыстальніка
       confirm: Пацвердзіць
       report: Паскардзіцца на гэтага карыстальніка
-    account:
-      title: Правіць рахунак
-      my settings: Мае настройкі
-      current email address: 'Бягучы адрас электроннай пошты:'
-      external auth: 'Знешняя Аўтэнтыфікацыя:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: што гэта?
-      public editing:
-        heading: 'Публічнае рэдагаванне:'
-        enabled: Уключана. Вы - не ананімны і можаце рэдагаваць дадзеныя.
-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        enabled link text: што гэта?
-        disabled: Адключана. Вы не можаце больш рэдагаваць, але ўсе ранейшыя змены
-          ананімныя.
-        disabled link text: чаму я не магу рэдагаваць?
-      public editing note:
-        heading: Агульнае рэдагаванне
-        html: У цяперашні момант Вашы рэдагаванні з'яўляюцца ананімнымі, і людзі не
-          могуць дасылаць Вам паведамленні, ці бачыць Ваша месцазнаходжанне. Каб быў
-          бачны Ваш уклад, і людзі маглі звязацца з Вамі праз вэб-сайт, націсніце
-          кнопку ніжэй. <b>Пасля пераходу на API версіі 0.6, толькі даступныя для
-          сувязі карыстальнікі могуць рэдагаваць звесткі на карце</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">даведацца,
-          чаму</a>) <ul><li>Гэта дзеянне не можа быць адменена, а ўсе новыя карыстальнікі
-          цяпер даступныя для сувязі па змаўчанні.</li></ul>
-      contributor terms:
-        heading: 'Умовы ўдзелу:'
-        agreed: Вы пагадзіліся на новыя ўмовы ўдзелу.
-        not yet agreed: Вы яшчэ не пагадзіліся на новыя ўмовы ўдзелу.
-        review link text: Калі ласка, прайдзіце па гэтай спасылцы для Вашай зручнасці,
-          каб разгледзець і прыняць новыя ўмовы ўдзелу.
-        agreed_with_pd: Вы таксама заявілі, што лічыце, што змены павінны знаходзіцца
-          ў агульнай уласнасці.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: што гэта?
-      save changes button: Запісаць змены
-      make edits public button: Зрабіць усе мае змены публічнымі
-      flash update success confirm needed: Звесткі аб карыстальніку паспяхова абноўленыя.
-        Праверце сваю эл.пошту, вам павінен прыйсці запыт на пацвярджэнне вашага новага
-        адраса.
-      flash update success: Звесткі аб карыстальніку паспяхова абноўленыя.
     set_home:
       flash success: Дамашняе месцазнаходжанне паспяхова запісана
     go_public:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 5d710d98e..ae8eac2bb 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -230,6 +230,34 @@ bg:
       entry:
         comment: Коментар
         full: Цялата бележка
+  accounts:
+    edit:
+      title: Промяна на профил
+      my settings: Моите настройки
+      current email address: Текуща електронна поща
+      external auth: Удостоверяване от външен източник
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: Какво е това?
+      public editing:
+        enabled: Разрешено. Не е анонимно и можете да променяте данните.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Какво е това?
+        disabled link text: защо не мога да редактирам?
+      public editing note:
+        heading: Обществено видимо редактиране
+      contributor terms:
+        heading: Условия за сътрудничество
+        agreed: Приели сте новите условия за сътрудничество.
+        not yet agreed: Все още не сте приели новите Условия за участие.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Какво е това?
+      save changes button: Съхраняване на промените
+      make edits public button: Всички мои промени да са публично достъпни
+    update:
+      success_confirm_needed: Сведенията за потребителя са успешно обновени. Проверете
+        електронната си поща за писмо, с което да потвърдите новия адрес.
+      success: Сведенията за потребителя са успешно обновени.
   browse:
     created: Създадена
     closed: Затворена
@@ -1872,31 +1900,6 @@ bg:
       delete_user: Изтриване на този потребител
       confirm: Потвърдете
       report: Докладване на потребителя
-    account:
-      title: Промяна на профил
-      my settings: Моите настройки
-      current email address: Текуща електронна поща
-      external auth: Удостоверяване от външен източник
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: Какво е това?
-      public editing:
-        heading: Обществено видимо редактиране
-        enabled: Разрешено. Не е анонимно и можете да променяте данните.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Какво е това?
-        disabled link text: защо не мога да редактирам?
-      contributor terms:
-        heading: Условия за сътрудничество
-        agreed: Приели сте новите условия за сътрудничество.
-        not yet agreed: Все още не сте приели новите Условия за участие.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Какво е това?
-      save changes button: Съхраняване на промените
-      make edits public button: Всички мои промени да са публично достъпни
-      flash update success confirm needed: Сведенията за потребителя са успешно обновени.
-        Проверете електронната си поща за писмо, с което да потвърдите новия адрес.
-      flash update success: Сведенията за потребителя са успешно обновени.
     set_home:
       flash success: Вашето местоположение е успешно запазено
     index:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 97da1e764..56064d3a5 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -233,6 +233,26 @@ bn:
         title: ওপেনস্ট্রিটম্যাপ টীকা
       entry:
         comment: মন্তব্য
+  accounts:
+    edit:
+      title: অ্যাকাউন্ট সম্পাদনা করুন
+      my settings: আমার সেটিংস
+      current email address: বর্তমান ই-মেইল ঠিকানা
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: এটি কী?
+      public editing:
+        enabled: সক্রিয়। বেনামী নয় এবং উপাত্ত সম্পাদনা করতে পারবে।
+        enabled link text: এটি কী?
+        disabled link text: আমি সম্পাদনা করতে পারছি না কেন?
+      public editing note:
+        heading: 'সম্পাদনা উন্মুক্ত:'
+      contributor terms:
+        agreed: আপনি নতুন অবদানকারীর শর্তাবলীতে সম্মত।
+        agreed_with_pd: আপনি ঘোষণা করেছেন যে আপনি আপনার সম্পাদনাগুলো পাবলিক ডোমেইনের
+          অধীনে প্রকাশ করছেন।
+        link text: এটি কী?
+      save changes button: পরিবর্তন সংরক্ষণ
   browse:
     created: তৈরি হয়েছে
     closed: বন্ধ হয়েছে
@@ -1645,24 +1665,6 @@ bn:
       unhide_user: এই ব্যবহাকারীকে দেখান
       delete_user: এই ব্যবহাকারীকে অপসারণ করুন
       confirm: নিশ্চিত করুন
-    account:
-      title: অ্যাকাউন্ট সম্পাদনা করুন
-      my settings: আমার সেটিংস
-      current email address: বর্তমান ই-মেইল ঠিকানা
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: এটি কী?
-      public editing:
-        heading: 'সম্পাদনা উন্মুক্ত:'
-        enabled: সক্রিয়। বেনামী নয় এবং উপাত্ত সম্পাদনা করতে পারবে।
-        enabled link text: এটি কী?
-        disabled link text: আমি সম্পাদনা করতে পারছি না কেন?
-      contributor terms:
-        agreed: আপনি নতুন অবদানকারীর শর্তাবলীতে সম্মত।
-        agreed_with_pd: আপনি ঘোষণা করেছেন যে আপনি আপনার সম্পাদনাগুলো পাবলিক ডোমেইনের
-          অধীনে প্রকাশ করছেন।
-        link text: এটি কী?
-      save changes button: পরিবর্তন সংরক্ষণ
     go_public:
       flash success: আপনার সকল সম্পাদনা এখন উন্মুক্ত, এবং এখন আপনার সম্পাদনের অনুমতি
         রয়েছে।
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 9812fd2dc..ee2d9bb7e 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -270,6 +270,49 @@ br:
       entry:
         comment: Evezhiadenn
         full: Notenn glok
+  accounts:
+    edit:
+      title: Aozañ ar gont
+      my settings: Ma arventennoù
+      current email address: Chomlec'h postel a-vremañ
+      external auth: Dilesadur diavaez
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: petra eo se ?
+      public editing:
+        heading: Kemm foran
+        enabled: Gweredekaet. N'eo ket dizanv ha gallout a ra aozañ roadennoù.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Petra eo se ?
+        disabled: Diweredekaet ha ne c'hall ket aozañ roadennoù ; diznav eo an holl
+          aozadennoù kent.
+        disabled link text: Perak n'on ket evit aozañ ?
+      public editing note:
+        heading: Aozañ foran
+        html: Evit poent ez eo dianv ho tegasadennoù ha den ne c'hall skrivañ deoc'h
+          pe gwelet ho lec'hiadur. Evit diskouez ar pezh hoc'h eus embannet ha reiñ
+          an tu d'an dud da vont e darempred ganeoc'h dre al lec'hienn, klikit war
+          al liamm da-heul. <b>Abaoe ar c'hemm davet ar stumm API 0.6, n'eus  nemet
+          an dud gant an doare "kemmoù foran" a c'hall kemmañ roadennoù ar c'hartennoù</b>.
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">gouzout hiroc'h</a>).<ul><li>Ne
+          vo ket roet ho chomlec'h postel d'an dud.</li><li>N'hall ket an obererezh-se
+          bezañ nullet hag emañ an holl implijerien nevez gant an doare "kemmoù foran"
+          dre ziouer.</li></ul>
+      contributor terms:
+        heading: Diferadennoù ar c'henlabourer
+        agreed: Degemeret hoc'h eus diferadennoù nevez ar c'henlabourer.
+        not yet agreed: N'hoc'h eus ket degemeret c'hoazh diferadennoù nevez ar c'henlabourer.
+        review link text: Heuilhit al liamm-mañ evel ma karot evit sellet ouzh diferadennoù
+          nevez ar c'henlabourer hag asantiñ dezho.
+        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 ?
+      save changes button: Enrollañ ar c'hemmoù
+      make edits public button: Lakaat ma holl aozadennoù da vezañ foran
+    update:
+      success_confirm_needed: Hizivaet eo bet titouroù an implijer. Gwiriit ho posteloù
+        evit kadarnaat ho chomlec'h postel nevez.
+      success: Hizivaet eo bet titouroù an implijer.
   browse:
     created: Krouet
     closed: Serret
@@ -2480,47 +2523,6 @@ br:
       delete_user: Dilemel an implijer-mañ
       confirm: Kadarnaat
       report: Disklêriañ an implijer-mañ
-    account:
-      title: Aozañ ar gont
-      my settings: Ma arventennoù
-      current email address: Chomlec'h postel a-vremañ
-      external auth: Dilesadur diavaez
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: petra eo se ?
-      public editing:
-        heading: Aozañ foran
-        enabled: Gweredekaet. N'eo ket dizanv ha gallout a ra aozañ roadennoù.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Petra eo se ?
-        disabled: Diweredekaet ha ne c'hall ket aozañ roadennoù ; diznav eo an holl
-          aozadennoù kent.
-        disabled link text: Perak n'on ket evit aozañ ?
-      public editing note:
-        heading: Kemm foran
-        html: Evit poent ez eo dianv ho tegasadennoù ha den ne c'hall skrivañ deoc'h
-          pe gwelet ho lec'hiadur. Evit diskouez ar pezh hoc'h eus embannet ha reiñ
-          an tu d'an dud da vont e darempred ganeoc'h dre al lec'hienn, klikit war
-          al liamm da-heul. <b>Abaoe ar c'hemm davet ar stumm API 0.6, n'eus  nemet
-          an dud gant an doare "kemmoù foran" a c'hall kemmañ roadennoù ar c'hartennoù</b>.
-          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">gouzout hiroc'h</a>).<ul><li>Ne
-          vo ket roet ho chomlec'h postel d'an dud.</li><li>N'hall ket an obererezh-se
-          bezañ nullet hag emañ an holl implijerien nevez gant an doare "kemmoù foran"
-          dre ziouer.</li></ul>
-      contributor terms:
-        heading: Diferadennoù ar c'henlabourer
-        agreed: Degemeret hoc'h eus diferadennoù nevez ar c'henlabourer.
-        not yet agreed: N'hoc'h eus ket degemeret c'hoazh diferadennoù nevez ar c'henlabourer.
-        review link text: Heuilhit al liamm-mañ evel ma karot evit sellet ouzh diferadennoù
-          nevez ar c'henlabourer hag asantiñ dezho.
-        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 ?
-      save changes button: Enrollañ ar c'hemmoù
-      make edits public button: Lakaat ma holl aozadennoù da vezañ foran
-      flash update success confirm needed: Hizivaet eo bet titouroù an implijer. Gwiriit
-        ho posteloù evit kadarnaat ho chomlec'h postel nevez.
-      flash update success: Hizivaet eo bet titouroù an implijer.
     set_home:
       flash success: Enrollet eo bet lec'hiadur ar gêr
     go_public:
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 668ea1454..489920edf 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -137,6 +137,45 @@ bs:
     notes:
       comment:
         opened_at_html: Kreirano prije %{when}
+  accounts:
+    edit:
+      title: Urediti korisnički račun
+      my settings: Moja podešavanja
+      current email address: 'Trenutna e-mail adresa:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: Å ta je ovo?
+      public editing:
+        heading: 'Javno uređivanje:'
+        enabled: Omogućeno. Nije anonimno i mogu se uređivati podaci.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Å ta je ovo?
+        disabled: Onemogućno i ne mogu se uređivati podaci, sva prethodna uređivanja
+          su anonimna.
+        disabled link text: Zašto ja ne mogu uređivati?
+      public editing note:
+        heading: 'Javno uređivanje:'
+        html: Trenutno su vaša uređivanja anonimna i ljudi vam ne mogu poslati poruke
+          ili vidjeti vašu lokaciju. Da bi pokazali vaša uređivanja i dozvolili ljudima
+          da vas kontaktiraju preko website-a, kliknite na dugme ispod <b>Od promjene
+          0.6 API-a, samo javni korisnici mogu uređivati karte</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">saznajte
+          zašto</a>).<ul> <li>Vaša e-mail adrea neće biti otkrivena ako postanete
+          javni.</li> <li>Ova akcija se ne može poništiti i svi novi korisnici su
+          postavljeni kao javni.</li> </ul>
+      contributor terms:
+        heading: 'Uslovi za doprinosioce:'
+        agreed: Prihvatili ste nove uslove za doprinosioce.
+        not yet agreed: Niste još uvijek prihvatili nove uslove za doprinosioce.
+        review link text: Molimo Vas da slijedite ovaj link kada vam bude prikladno
+          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?
+      save changes button: Sačuvati promjene
+      make edits public button: Napraviti sve moje promjene javnim
+    update:
+      success_confirm_needed: Korisničke informacije su uspješno osvježene. Provjerite
+        e-mail za porukom za potvrdu nove e-mail adrese.
+      success: Korisničke informacije su uspješno osvježene.
   browse:
     created: Napravljeno
     closed: Zatvoreno
@@ -1538,43 +1577,6 @@ bs:
       unhide_user: Otkrij ovog korisnika
       delete_user: Obriši ovog korisnika
       confirm: Potvrditi
-    account:
-      title: Urediti korisnički račun
-      my settings: Moja podešavanja
-      current email address: 'Trenutna e-mail adresa:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: Å ta je ovo?
-      public editing:
-        heading: 'Javno uređivanje:'
-        enabled: Omogućeno. Nije anonimno i mogu se uređivati podaci.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Å ta je ovo?
-        disabled: Onemogućno i ne mogu se uređivati podaci, sva prethodna uređivanja
-          su anonimna.
-        disabled link text: Zašto ja ne mogu uređivati?
-      public editing note:
-        heading: 'Javno uređivanje:'
-        html: Trenutno su vaša uređivanja anonimna i ljudi vam ne mogu poslati poruke
-          ili vidjeti vašu lokaciju. Da bi pokazali vaša uređivanja i dozvolili ljudima
-          da vas kontaktiraju preko website-a, kliknite na dugme ispod <b>Od promjene
-          0.6 API-a, samo javni korisnici mogu uređivati karte</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">saznajte
-          zašto</a>).<ul> <li>Vaša e-mail adrea neće biti otkrivena ako postanete
-          javni.</li> <li>Ova akcija se ne može poništiti i svi novi korisnici su
-          postavljeni kao javni.</li> </ul>
-      contributor terms:
-        heading: 'Uslovi za doprinosioce:'
-        agreed: Prihvatili ste nove uslove za doprinosioce.
-        not yet agreed: Niste još uvijek prihvatili nove uslove za doprinosioce.
-        review link text: Molimo Vas da slijedite ovaj link kada vam bude prikladno
-          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?
-      save changes button: Sačuvati promjene
-      make edits public button: Napraviti sve moje promjene javnim
-      flash update success confirm needed: Korisničke informacije su uspješno osvježene.
-        Provjerite e-mail za porukom za potvrdu nove e-mail adrese.
-      flash update success: Korisničke informacije su uspješno osvježene.
     set_home:
       flash success: Matična lokacija uspješno snimljena.
     go_public:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 6a6c73a52..5cb0fa29b 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -289,6 +289,50 @@ ca:
       entry:
         comment: Comentari
         full: Nota sencera
+  accounts:
+    edit:
+      title: Edita el compte
+      my settings: Preferències
+      current email address: Adreça electrònica actual
+      external auth: Autenticació externa
+      openid:
+        link: https://wiki.OpenStreetMap.org/wiki/OpenID
+        link text: què és això?
+      public editing:
+        heading: Modificació pública
+        enabled: Activades. No anònim i amb permís per editar dades.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: què és això?
+        disabled: Desactivades i sense permís per a editar; les modificacions anteriors
+          són anònimes.
+        disabled link text: per què no puc editar?
+      public editing note:
+        heading: Edició pública
+        html: Actualment, les vostres modificacions són anònimes i la gent no us pot
+          enviar missatges o veure la vostra ubicació. Per mostrar el que heu editat
+          i permetre que la gent us pugui contactar a través del web, feu clic al
+          botó de sota. <b>Des de canvi de l'API 0.6, només els usuaris públics poden
+          editar les dades de mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sapigueu
+          per què</a>).<ul><li>La vostra adreça de correu electrònic no serà revelada
+          quan sigueu usuari públic.</li><li>Aquesta acció no es pot desfer i tots
+          els nous usuaris seran públics per defecte.</li></ul>
+      contributor terms:
+        heading: Termes de col·laboració
+        agreed: Heu acceptat els nous termes de col·laboració.
+        not yet agreed: Encara no heu acceptat els nous termes de col·laboració.
+        review link text: Seguiu aquest enllaç per revisar i acceptar els nous termes
+          de col·laboració.
+        agreed_with_pd: També declareu que considereu que les vostres modificacions
+          són de domini públic.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: què és això?
+      save changes button: Desa els canvis
+      make edits public button: Fes totes les meves modificacions públiques
+    update:
+      success_confirm_needed: Informació de l'usuari ha actualitzat correctament.
+        Comproveu el vostre correu per a confirmar la vostra adreça de correu electrònic
+        nova.
+      success: Informació de l'usuari ha actualitzat correctament.
   browse:
     created: Creat
     closed: Tancat
@@ -2703,48 +2747,6 @@ ca:
       delete_user: Suprimeix aquest usuari
       confirm: Confirma
       report: Denuncieu aquest usuari
-    account:
-      title: Edita el compte
-      my settings: Preferències
-      current email address: Adreça electrònica actual
-      external auth: Autenticació externa
-      openid:
-        link: https://wiki.OpenStreetMap.org/wiki/OpenID
-        link text: què és això?
-      public editing:
-        heading: Edició pública
-        enabled: Activades. No anònim i amb permís per editar dades.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: què és això?
-        disabled: Desactivades i sense permís per a editar; les modificacions anteriors
-          són anònimes.
-        disabled link text: per què no puc editar?
-      public editing note:
-        heading: Modificació pública
-        html: Actualment, les vostres modificacions són anònimes i la gent no us pot
-          enviar missatges o veure la vostra ubicació. Per mostrar el que heu editat
-          i permetre que la gent us pugui contactar a través del web, feu clic al
-          botó de sota. <b>Des de canvi de l'API 0.6, només els usuaris públics poden
-          editar les dades de mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sapigueu
-          per què</a>).<ul><li>La vostra adreça de correu electrònic no serà revelada
-          quan sigueu usuari públic.</li><li>Aquesta acció no es pot desfer i tots
-          els nous usuaris seran públics per defecte.</li></ul>
-      contributor terms:
-        heading: Termes de col·laboració
-        agreed: Heu acceptat els nous termes de col·laboració.
-        not yet agreed: Encara no heu acceptat els nous termes de col·laboració.
-        review link text: Seguiu aquest enllaç per revisar i acceptar els nous termes
-          de col·laboració.
-        agreed_with_pd: També declareu que considereu que les vostres modificacions
-          són de domini públic.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: què és això?
-      save changes button: Desa els canvis
-      make edits public button: Fes totes les meves modificacions públiques
-      flash update success confirm needed: Informació de l'usuari ha actualitzat correctament.
-        Comproveu el vostre correu per a confirmar la vostra adreça de correu electrònic
-        nova.
-      flash update success: Informació de l'usuari ha actualitzat correctament.
     set_home:
       flash success: La ubicació d'inici s'ha desat correctament
     go_public:
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index cc7a8d30c..b1339a54d 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -175,6 +175,14 @@ ce:
       entry:
         comment: Коммент
         full: Дуьззина йоза
+  accounts:
+    edit:
+      current email address: 'Карара электронан поштан адрес:'
+      openid:
+        link text: хӀун йу хӀара?
+      contributor terms:
+        link text: хӀун йу хӀара?
+      save changes button: Ӏалашбе хийцамаш
   browse:
     created: Кхоьллина
     closed: ДӀачӀагӀа
@@ -960,13 +968,6 @@ ce:
       description: Цуьнах лаьцна
       user location: Декъашхо волу/йолу меттиг
       report: Хаамбе хӀокху декъашхох
-    account:
-      current email address: 'Карара электронан поштан адрес:'
-      openid:
-        link text: хӀун йу хӀара?
-      contributor terms:
-        link text: хӀун йу хӀара?
-      save changes button: Ӏалашбе хийцамаш
     index:
       title: Декъашхой
       heading: Декъашхой
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 687cf0899..9a216deb8 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -289,6 +289,48 @@ cs:
       entry:
         comment: Komentář
         full: Celá poznámka
+  accounts:
+    edit:
+      title: Upravit účet
+      my settings: Moje nastavení
+      current email address: Stávající e-mailová adresa
+      external auth: Externí autentizace
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/Cs:OpenID
+        link text: co to znamená?
+      public editing:
+        heading: Veřejné editace
+        enabled: Aktivní. Není anonym, smí editovat data.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: co to znamená?
+        disabled: Deaktivováno, nemůže editovat data, všechny předchozí editace jsou
+          anonymní.
+        disabled link text: proč nemůžu editovat?
+      public editing note:
+        heading: Veřejné editace
+        html: V současné době jsou vaše editace anonymní a nikdo vám nemůže psát zprávy
+          ani vidět vaši polohu. Pokud chcete ukázat, co jste editovali, a dovolit
+          lidem vás kontaktovat prostřednictvím webu, klikněte na níže zobrazené tlačítko.
+          <b>Od přechodu na API 0.6 mohou mapová data editovat jen veřejní uživatelé</b>.
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Přečtěte
+          si důvody.</a>)<ul><li>Vaše e-mailová adresa se přepnutím na veřejné editace
+          neprozradí.</li><li>Tuto operaci nelze vrátit a všichni noví uživatelé jsou
+          implicitně veřejní.</li></ul>
+      contributor terms:
+        heading: Podmínky pro přispěvatele
+        agreed: Odsouhlasili jste nové Podmínky pro přispěvatele.
+        not yet agreed: Dosud jste neodsouhlasili nové Podmínky pro přispěvatele.
+        review link text: Až se vám to bude hodit, pomocí tohoto odkazu si prosím
+          přečtěte a odsouhlaste nové Podmínky pro přispěvatele.
+        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á?
+      save changes button: Uložit změny
+      make edits public button: Zvěřejnit všechny moje úpravy
+    update:
+      success_confirm_needed: Uživatelské údaje byly úspěšně aktualizovány. Zkontrolujte
+        si e-mail, měla by vám přijít výzva k potvrzení nové e-mailové adresy.
+      success: Uživatelské údaje byly úspěšně aktualizovány.
   browse:
     created: Vytvořeno
     closed: Uzavřeno
@@ -2692,47 +2734,6 @@ cs:
       delete_user: Odstranit tohoto uživatele
       confirm: Potvrdit
       report: Nahlásit tohoto uživatele
-    account:
-      title: Upravit účet
-      my settings: Moje nastavení
-      current email address: Stávající e-mailová adresa
-      external auth: Externí autentizace
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/Cs:OpenID
-        link text: co to znamená?
-      public editing:
-        heading: Veřejné editace
-        enabled: Aktivní. Není anonym, smí editovat data.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: co to znamená?
-        disabled: Deaktivováno, nemůže editovat data, všechny předchozí editace jsou
-          anonymní.
-        disabled link text: proč nemůžu editovat?
-      public editing note:
-        heading: Veřejné editace
-        html: V současné době jsou vaše editace anonymní a nikdo vám nemůže psát zprávy
-          ani vidět vaši polohu. Pokud chcete ukázat, co jste editovali, a dovolit
-          lidem vás kontaktovat prostřednictvím webu, klikněte na níže zobrazené tlačítko.
-          <b>Od přechodu na API 0.6 mohou mapová data editovat jen veřejní uživatelé</b>.
-          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Přečtěte
-          si důvody.</a>)<ul><li>Vaše e-mailová adresa se přepnutím na veřejné editace
-          neprozradí.</li><li>Tuto operaci nelze vrátit a všichni noví uživatelé jsou
-          implicitně veřejní.</li></ul>
-      contributor terms:
-        heading: Podmínky pro přispěvatele
-        agreed: Odsouhlasili jste nové Podmínky pro přispěvatele.
-        not yet agreed: Dosud jste neodsouhlasili nové Podmínky pro přispěvatele.
-        review link text: Až se vám to bude hodit, pomocí tohoto odkazu si prosím
-          přečtěte a odsouhlaste nové Podmínky pro přispěvatele.
-        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á?
-      save changes button: Uložit změny
-      make edits public button: Zvěřejnit všechny moje úpravy
-      flash update success confirm needed: Uživatelské údaje byly úspěšně aktualizovány.
-        Zkontrolujte si e-mail, měla by vám přijít výzva k potvrzení nové e-mailové
-        adresy.
-      flash update success: Uživatelské údaje byly úspěšně aktualizovány.
     set_home:
       flash success: Pozice domova byla úspěšně uložena
     go_public:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 828b03583..152dd7bcc 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -152,6 +152,29 @@ cy:
       entry:
         comment: Sylw
         full: Nodyn llawn
+  accounts:
+    edit:
+      title: Golygu'r cyfrif
+      my settings: Fy ngosodiadau
+      current email address: 'Cyfeiriad Ebost Presenol:'
+      openid:
+        link text: beth yw hwn?
+      public editing:
+        heading: Golygu cyhoeddus
+        enabled: Galluogwyd. Ddim yn anhysbys ac yn gallu golygu data.
+        enabled link text: beth yw hwn?
+        disabled link text: pam na allaf olygu?
+      public editing note:
+        heading: 'Golygu cyhoeddus:'
+      contributor terms:
+        heading: 'Telerau Cyfranwyr:'
+        agreed: Rydych wedi derbyn y telerau cyfranwyr newydd.
+        not yet agreed: Nid ydych eto wedi cytuno i'r telerau cyfranwyr newydd.
+        review link text: Dilynwch y ddolen hon i adolygu a derbyn y telerau cyfranwyr
+          newydd.
+        link text: beth yw hwn?
+      save changes button: Cadw'r Newidiadau
+      make edits public button: Gwneud fy holl olygiadau yn gyhoeddus
   browse:
     created: Crewyd
     closed: Wedi cau
@@ -1481,28 +1504,6 @@ cy:
       unhide_user: Datguddio'r Defnyddiwr
       delete_user: Dileu'r Defnyddiwr
       confirm: Cadarnhau
-    account:
-      title: Golygu'r cyfrif
-      my settings: Fy ngosodiadau
-      current email address: 'Cyfeiriad Ebost Presenol:'
-      openid:
-        link text: beth yw hwn?
-      public editing:
-        heading: 'Golygu cyhoeddus:'
-        enabled: Galluogwyd. Ddim yn anhysbys ac yn gallu golygu data.
-        enabled link text: beth yw hwn?
-        disabled link text: pam na allaf olygu?
-      public editing note:
-        heading: Golygu cyhoeddus
-      contributor terms:
-        heading: 'Telerau Cyfranwyr:'
-        agreed: Rydych wedi derbyn y telerau cyfranwyr newydd.
-        not yet agreed: Nid ydych eto wedi cytuno i'r telerau cyfranwyr newydd.
-        review link text: Dilynwch y ddolen hon i adolygu a derbyn y telerau cyfranwyr
-          newydd.
-        link text: beth yw hwn?
-      save changes button: Cadw'r Newidiadau
-      make edits public button: Gwneud fy holl olygiadau yn gyhoeddus
     set_home:
       flash success: Wedi cadw'r lleoliad cartref
     go_public:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 5485dbad8..439fe3874 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -274,6 +274,48 @@ da:
       entry:
         comment: Kommentar
         full: Fuld bemærkning
+  accounts:
+    edit:
+      title: Rediger konto
+      my settings: Mine indstillinger
+      current email address: Nuværende e-mailadresse
+      external auth: Ekstern godkendelse
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: hvad er dette?
+      public editing:
+        heading: Offentlig redigering
+        enabled: Aktiveret. Ikke anonym og kan ændre data.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: hvad er dette?
+        disabled: Deaktiveret og kan ikke ændre data, alle tidligere ændringer er
+          anonyme.
+        disabled link text: hvorfor kan jeg ikke redigere?
+      public editing note:
+        heading: Offentlig redigering
+        html: I øjeblikket er dine ændringer anonyme og andre kan ikke sende dig beskeder
+          eller se hvor du er. Klik på knappen nedenfor for at vise hvad du har ændret
+          og lade folk kontakte dig gennem siden. <b>Siden 0.6 API blev sat i drift
+          kan kun offentlige brugere rette i kortdata</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">se
+          hvorfor</a>).<ul><li>Din e-postadresse bliver ikke afsløret ved at skrive
+          offentligt.</li><li>Den handling kan ikke omgøres, og alle nye brugere er
+          nu offentlige som standard.</li></ul>
+      contributor terms:
+        heading: 'Vilkår for bidragsydere:'
+        agreed: Du har accepteret de nye vilkår for bidragsydere.
+        not yet agreed: Du har endnu ikke accepteret de nye vilkår for bidragsydere.
+        review link text: Følg dette link når det er bekvemt for dig for at gennemse
+          og acceptere de nye vilkår for bidragsydere.
+        agreed_with_pd: Du har også erklæret at du anser dine ændringer for at være
+          fælleseje/uden ophavsret.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: hvad er dette?
+      save changes button: Gem ændringer
+      make edits public button: Gør alle mine rettelser offentlige
+    update:
+      success_confirm_needed: Brugeroplysningerne blev opdateret. Tjek din e-mail
+        for en besked om at bekræfte din nye e-mailadresse.
+      success: Brugerinformation opdateret.
   browse:
     created: Oprettet
     closed: Lukket
@@ -2686,46 +2728,6 @@ da:
       delete_user: Slet denne bruger
       confirm: Bekræft
       report: Rapporter denne bruger
-    account:
-      title: Rediger konto
-      my settings: Mine indstillinger
-      current email address: Nuværende e-mailadresse
-      external auth: Ekstern godkendelse
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: hvad er dette?
-      public editing:
-        heading: Offentlig redigering
-        enabled: Aktiveret. Ikke anonym og kan ændre data.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: hvad er dette?
-        disabled: Deaktiveret og kan ikke ændre data, alle tidligere ændringer er
-          anonyme.
-        disabled link text: hvorfor kan jeg ikke redigere?
-      public editing note:
-        heading: Offentlig redigering
-        html: I øjeblikket er dine ændringer anonyme og andre kan ikke sende dig beskeder
-          eller se hvor du er. Klik på knappen nedenfor for at vise hvad du har ændret
-          og lade folk kontakte dig gennem siden. <b>Siden 0.6 API blev sat i drift
-          kan kun offentlige brugere rette i kortdata</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">se
-          hvorfor</a>).<ul><li>Din e-postadresse bliver ikke afsløret ved at skrive
-          offentligt.</li><li>Den handling kan ikke omgøres, og alle nye brugere er
-          nu offentlige som standard.</li></ul>
-      contributor terms:
-        heading: 'Vilkår for bidragsydere:'
-        agreed: Du har accepteret de nye vilkår for bidragsydere.
-        not yet agreed: Du har endnu ikke accepteret de nye vilkår for bidragsydere.
-        review link text: Følg dette link når det er bekvemt for dig for at gennemse
-          og acceptere de nye vilkår for bidragsydere.
-        agreed_with_pd: Du har også erklæret at du anser dine ændringer for at være
-          fælleseje/uden ophavsret.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: hvad er dette?
-      save changes button: Gem ændringer
-      make edits public button: Gør alle mine rettelser offentlige
-      flash update success confirm needed: Brugeroplysningerne blev opdateret. Tjek
-        din e-mail for en besked om at bekræfte din nye e-mailadresse.
-      flash update success: Brugerinformation opdateret.
     set_home:
       flash success: Hjemmeposition gemt
     go_public:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d80bdb266..ff46ade76 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -330,6 +330,50 @@ de:
       entry:
         comment: Kommentar
         full: Vollständiger Hinweis
+  accounts:
+    edit:
+      title: Benutzerkonto bearbeiten
+      my settings: Einstellungen
+      current email address: Aktuelle E-Mail-Adresse
+      external auth: Externe Authentifikation
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: Was ist das?
+      public editing:
+        heading: Öffentliches Bearbeiten
+        enabled: Aktiviert. Normales Bearbeiten der Kartendaten ist möglich.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Was bedeutet das?
+        disabled: Deaktiviert. Das Bearbeiten von Kartendaten NICHT möglich, alle
+          bisherigen Bearbeitungen sind anonym.
+        disabled link text: Warum kann ich nichts bearbeiten?
+      public editing note:
+        heading: Karte bearbeiten (public editing)
+        html: Im Moment sind deine Beiträge anonym und man kann dir weder Nachrichten
+          senden noch deinen Wohnort sehen. Um sichtbar zu machen, welche Arbeit von
+          dir stammt, und um kontaktierbar zu werden, klicke auf den Button unten.
+          <b>Seit Version 0.6 der API aktiv ist, können unangemeldete Benutzer die
+          Karte nicht mehr bearbeiten</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Warum?</a>).<ul><li>Deine
+          E-Mail-Adresse wird bei Verlassen des anonymen Status nicht veröffentlicht.</li><li>Die
+          Aktion kann nicht rückgängig gemacht werden. Für neu registrierte Benutzer
+          besteht die Möglichkeit des anonymen Benutzerkontos nicht mehr.</li></ul>
+      contributor terms:
+        heading: Bedingungen für Mitwirkende
+        agreed: Du hast den neuen Bedingungen für Mitwirkende zugestimmt.
+        not yet agreed: Du hast der neuen Bedingungen für Mitwirkende bislang noch
+          nicht zugestimmt.
+        review link text: Bitte folge diesem Link, um die neuen Bedingungen für Mitwirkende
+          durchzulesen sowie zu akzeptieren.
+        agreed_with_pd: Du hast zudem erklärt, dass du deine Beiträge gemeinfrei veröffentlichst
+          (unter Public Domain stellst).
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Worum handelt es sich?
+      save changes button: Änderungen speichern
+      make edits public button: Alle meine Bearbeitungen öffentlich machen
+    update:
+      success_confirm_needed: Deine Änderungen wurden gespeichert. Du erhältst nun
+        eine E-Mail, um deine neue E-Mail-Adresse zu bestätigen.
+      success: Benutzerinformationen erfolgreich aktualisiert.
   browse:
     created: Erstellt
     closed: Geschlossen
@@ -2787,48 +2831,6 @@ de:
       delete_user: Benutzer löschen
       confirm: Bestätigen
       report: Diesen Benutzer melden
-    account:
-      title: Benutzerkonto bearbeiten
-      my settings: Einstellungen
-      current email address: Aktuelle E-Mail-Adresse
-      external auth: Externe Authentifikation
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: Was ist das?
-      public editing:
-        heading: Karte bearbeiten (public editing)
-        enabled: Aktiviert. Normales Bearbeiten der Kartendaten ist möglich.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Was bedeutet das?
-        disabled: Deaktiviert. Das Bearbeiten von Kartendaten NICHT möglich, alle
-          bisherigen Bearbeitungen sind anonym.
-        disabled link text: Warum kann ich nichts bearbeiten?
-      public editing note:
-        heading: Öffentliches Bearbeiten
-        html: Im Moment sind deine Beiträge anonym und man kann dir weder Nachrichten
-          senden noch deinen Wohnort sehen. Um sichtbar zu machen, welche Arbeit von
-          dir stammt, und um kontaktierbar zu werden, klicke auf den Button unten.
-          <b>Seit Version 0.6 der API aktiv ist, können unangemeldete Benutzer die
-          Karte nicht mehr bearbeiten</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Warum?</a>).<ul><li>Deine
-          E-Mail-Adresse wird bei Verlassen des anonymen Status nicht veröffentlicht.</li><li>Die
-          Aktion kann nicht rückgängig gemacht werden. Für neu registrierte Benutzer
-          besteht die Möglichkeit des anonymen Benutzerkontos nicht mehr.</li></ul>
-      contributor terms:
-        heading: Bedingungen für Mitwirkende
-        agreed: Du hast den neuen Bedingungen für Mitwirkende zugestimmt.
-        not yet agreed: Du hast der neuen Bedingungen für Mitwirkende bislang noch
-          nicht zugestimmt.
-        review link text: Bitte folge diesem Link, um die neuen Bedingungen für Mitwirkende
-          durchzulesen sowie zu akzeptieren.
-        agreed_with_pd: Du hast zudem erklärt, dass du deine Beiträge gemeinfrei veröffentlichst
-          (unter Public Domain stellst).
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Worum handelt es sich?
-      save changes button: Änderungen speichern
-      make edits public button: Alle meine Bearbeitungen öffentlich machen
-      flash update success confirm needed: Deine Änderungen wurden gespeichert. Du
-        erhältst nun eine E-Mail, um deine neue E-Mail-Adresse zu bestätigen.
-      flash update success: Benutzerinformationen erfolgreich aktualisiert.
     set_home:
       flash success: Standort erfolgreich gespeichert
     go_public:
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index e5d2db786..9bea337da 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -163,6 +163,24 @@ diq:
       entry:
         comment: Mışewre
         full: Note pêro
+  accounts:
+    edit:
+      title: Hesabi bıvurne
+      my settings: Eyarê mı
+      current email address: 'E-postay şımaya newki:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: no çıko?
+      public editing:
+        heading: 'Pêron rê akerde vurnayış:'
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: no çıko?
+        disabled link text: Ezo çı nêşena bıvurna?
+      public editing note:
+        heading: 'Pêron rê akerde vırnayış:'
+      contributor terms:
+        link text: no çıko?
+      save changes button: Vurnayışan qeyd ke
   browse:
     created: Vıraziya
     closed: Kerd kip
@@ -1055,23 +1073,6 @@ diq:
       unhide_user: nê karberi menımnê
       delete_user: nê karberi esternê
       confirm: Tesdiq ke
-    account:
-      title: Hesabi bıvurne
-      my settings: Eyarê mı
-      current email address: 'E-postay şımaya newki:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: no çıko?
-      public editing:
-        heading: 'Pêron rê akerde vırnayış:'
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: no çıko?
-        disabled link text: Ezo çı nêşena bıvurna?
-      public editing note:
-        heading: 'Pêron rê akerde vurnayış:'
-      contributor terms:
-        link text: no çıko?
-      save changes button: Vurnayışan qeyd ke
     index:
       title: Karberi
       heading: Karberi
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index da9b15829..b1ae2c00b 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -147,6 +147,45 @@ dsb:
       entry:
         comment: Komentar
         full: Dopołna pokazka
+  accounts:
+    edit:
+      title: Konto wobźěłaś
+      my settings: Móje nastajenja
+      current email address: 'Aktualna e-mailowa adresa:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: Co to jo?
+      public editing:
+        heading: Zjawne wobźěłowanje
+        enabled: Zmóžnjony. Nic anonymny, daty daju se wobźěłaś.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Co to jo?
+        disabled: Znjemóžnjony, daty njedaju se wobźěłas, wše pjerwjejšne změny su
+          anonymne.
+        disabled link text: Cogodla njamógu wobźěłas?
+      public editing note:
+        heading: 'Zjawne wobźěłowanje:'
+        html: Tuchylu twóje změny su anonymne a luźe njamógu śi powěsći pósłaś abo
+          twójo městno wiźeś. Aby pokazał, což sy wobźěłał a luźam dowólił, se z tobu
+          pśez websedło do zwiska stajiś, klikni dołojnce na tłocašk. <b>Wót pśeźenja
+          do API 0.6, jano zjawne wužywarje mógu kórtowe daty wobźěłaś.</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">glědaj
+          pśicyny</a>).<ul><li>Twója e-mailowa adresa njebuźo zjawnje widobna.</li><li>Toś
+          ta akcija njedajo se anulěrowaś a wše nowe wužywarje su něnto pó standarźe
+          zjawne.</li></ul>
+      contributor terms:
+        heading: 'Wuměnjenja za sobustatkujucych:'
+        agreed: Sy nowe wuměnjenja za sobuskutkujucych akceptěrował.
+        not yet agreed: Hyšći njejsy nowe wuměnjenja za sobuskutkujucych akceptěrował.
+        review link text: Pšosym slěduj toś tomu wótkazoju, aby pśeglědał a akceptěrował
+          nowe wuměnjenja za sobuskutkajucych.
+        agreed_with_pd: Sy teke deklarěrował, až twóje změny su zjawne.
+        link text: Co to jo?
+      save changes button: Změny składowaś
+      make edits public button: Wše móje změny wózjawiś
+    update:
+      success_confirm_needed: Wužywarske informacije wuspěšnje zaktualizěrowane. Dostanjoš
+        e-mail z napominanim, twóju e-mailowu adresu wobkšuśiś.
+      success: Wužywarske informacije wuspěšnje zaktualizěrowane.
   browse:
     created: Napórany
     closed: Zacynjony
@@ -1730,43 +1769,6 @@ dsb:
       unhide_user: toś togo wužiwarja pokazaś
       delete_user: toś togo wužywarja lašowaś
       confirm: Wobkšuśiś
-    account:
-      title: Konto wobźěłaś
-      my settings: Móje nastajenja
-      current email address: 'Aktualna e-mailowa adresa:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: Co to jo?
-      public editing:
-        heading: 'Zjawne wobźěłowanje:'
-        enabled: Zmóžnjony. Nic anonymny, daty daju se wobźěłaś.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Co to jo?
-        disabled: Znjemóžnjony, daty njedaju se wobźěłas, wše pjerwjejšne změny su
-          anonymne.
-        disabled link text: Cogodla njamógu wobźěłas?
-      public editing note:
-        heading: Zjawne wobźěłowanje
-        html: Tuchylu twóje změny su anonymne a luźe njamógu śi powěsći pósłaś abo
-          twójo městno wiźeś. Aby pokazał, což sy wobźěłał a luźam dowólił, se z tobu
-          pśez websedło do zwiska stajiś, klikni dołojnce na tłocašk. <b>Wót pśeźenja
-          do API 0.6, jano zjawne wužywarje mógu kórtowe daty wobźěłaś.</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">glědaj
-          pśicyny</a>).<ul><li>Twója e-mailowa adresa njebuźo zjawnje widobna.</li><li>Toś
-          ta akcija njedajo se anulěrowaś a wše nowe wužywarje su něnto pó standarźe
-          zjawne.</li></ul>
-      contributor terms:
-        heading: 'Wuměnjenja za sobustatkujucych:'
-        agreed: Sy nowe wuměnjenja za sobuskutkujucych akceptěrował.
-        not yet agreed: Hyšći njejsy nowe wuměnjenja za sobuskutkujucych akceptěrował.
-        review link text: Pšosym slěduj toś tomu wótkazoju, aby pśeglědał a akceptěrował
-          nowe wuměnjenja za sobuskutkajucych.
-        agreed_with_pd: Sy teke deklarěrował, až twóje změny su zjawne.
-        link text: Co to jo?
-      save changes button: Změny składowaś
-      make edits public button: Wše móje změny wózjawiś
-      flash update success confirm needed: Wužywarske informacije wuspěšnje zaktualizěrowane.
-        Dostanjoš e-mail z napominanim, twóju e-mailowu adresu wobkšuśiś.
-      flash update success: Wužywarske informacije wuspěšnje zaktualizěrowane.
     set_home:
       flash success: Bydlišćo jo se wuspěšnje składło.
     go_public:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index a2cf195be..e95a9f7eb 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -280,6 +280,52 @@ el:
       entry:
         comment: Σχόλιο
         full: Πλήρης σημείωση
+  accounts:
+    edit:
+      title: Επεξεργασία λογαριασμού
+      my settings: Οι ρυθμίσεις μου
+      current email address: Τρέχουσα διεύθυνση ηλεκτρονικού ταχυδρομείου
+      external auth: Εξωτερική επαλήθευση ταυτότητας
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: τι είναι αυτό;
+      public editing:
+        heading: Δημόσια επεξεργασία
+        enabled: Ενεργοποιήθηκε. Δεν είστε πια ανώνυμοι και μπορείτε να επεξεργαστείτε
+          δεδομένα.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: τι είναι αυτό;
+        disabled: Απενεργοποιήθηκε και δεν μπορείτε να επεξεργαστείτε δεδομένα, όλες
+          οι προηγούμενες επεξεργασίες είναι ανώνυμες.
+        disabled link text: γιατί δεν μπορώ να επεξεργαστώ τον χάρτη;
+      public editing note:
+        heading: Δημόσια επεξεργασία
+        html: Αυτήν τη στιγμή οι επεξεργασίες σας είναι ανώνυμες και δεν μπορεί κανείς
+          να σας στείλει μήνυμα ή να δει την τοποθεσία σας. Για να δείξετε τι έχετε
+          επεξεργαστεί και να επιτρέψετε στους άλλους έρθουν σε επαφή μαζί σας μέσω
+          του ιστοχώρου, πατήστε το κουμπί από κάτω. <b>Μετά την αλλαγή σε API 0.6,
+          μόνο οι επώνυμοι χρήστες μπορούν να επεξεργαστούν δεδομένα του χάρτη.</b>.
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">μάθετε γιατί</a>).
+          <ul><li>Η διεύθυνσή σας ηλεκτρονικού ταχυδρομείου δεν θα αποκαλυφθεί δημόσια.
+          </li><li> Αυτή η ενέργεια δεν μπορεί να αναιρεθεί και όλοι οι νέοι χρήστες
+          είναι επώνυμοι εξ' αρχής.</li></ul>
+      contributor terms:
+        heading: Όροι Συνεισφοράς
+        agreed: Έχετε αποδεχτεί τους νέους Όρους Συνεισφοράς.
+        not yet agreed: Δεν έχετε αποδεχτεί τους νέους Όρους Συνεισφοράς.
+        review link text: Παρακαλούμε ακολουθήστε αυτό το σύνδεσμο, για την ενημέρωση
+          σας και την αποδοχή των νέων όρων συνεισφοράς.
+        agreed_with_pd: Δηλώσατε επίσης ότι αποδέχεστε ότι οι τροποποιήσεις σας ανήκουν
+          στον δημόσιο τομέα.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: τι είναι αυτό;
+      save changes button: Αποθήκευση αλλαγών
+      make edits public button: Να γίνουν όλες οι επεξεργασίες μου δημόσιες
+    update:
+      success_confirm_needed: Οι πληροφορίες του χρήστη ενημερώθηκαν επιτυχώς. Ελέγξτε
+        το ηλεκτρονικό ταχυδρομείο σας για μια ειδοποίηση επιβεβαίωσης της νέας σας
+        διεύθυνση ηλεκτρονικού ταχυδρομείου.
+      success: Οι πληροφορίες χρήστη ενημερώθηκαν με επιτυχία.
   browse:
     created: Δημιουργήθηκε
     closed: Έκλεισε
@@ -2539,50 +2585,6 @@ el:
       delete_user: Διαγραφή αυτού του Χρήστη
       confirm: Επιβεβαίωση
       report: Αναφορά αυτού του χρήστη
-    account:
-      title: Επεξεργασία λογαριασμού
-      my settings: Οι ρυθμίσεις μου
-      current email address: Τρέχουσα διεύθυνση ηλεκτρονικού ταχυδρομείου
-      external auth: Εξωτερική επαλήθευση ταυτότητας
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: τι είναι αυτό;
-      public editing:
-        heading: Δημόσια επεξεργασία
-        enabled: Ενεργοποιήθηκε. Δεν είστε πια ανώνυμοι και μπορείτε να επεξεργαστείτε
-          δεδομένα.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: τι είναι αυτό;
-        disabled: Απενεργοποιήθηκε και δεν μπορείτε να επεξεργαστείτε δεδομένα, όλες
-          οι προηγούμενες επεξεργασίες είναι ανώνυμες.
-        disabled link text: γιατί δεν μπορώ να επεξεργαστώ τον χάρτη;
-      public editing note:
-        heading: Δημόσια επεξεργασία
-        html: Αυτήν τη στιγμή οι επεξεργασίες σας είναι ανώνυμες και δεν μπορεί κανείς
-          να σας στείλει μήνυμα ή να δει την τοποθεσία σας. Για να δείξετε τι έχετε
-          επεξεργαστεί και να επιτρέψετε στους άλλους έρθουν σε επαφή μαζί σας μέσω
-          του ιστοχώρου, πατήστε το κουμπί από κάτω. <b>Μετά την αλλαγή σε API 0.6,
-          μόνο οι επώνυμοι χρήστες μπορούν να επεξεργαστούν δεδομένα του χάρτη.</b>.
-          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">μάθετε γιατί</a>).
-          <ul><li>Η διεύθυνσή σας ηλεκτρονικού ταχυδρομείου δεν θα αποκαλυφθεί δημόσια.
-          </li><li> Αυτή η ενέργεια δεν μπορεί να αναιρεθεί και όλοι οι νέοι χρήστες
-          είναι επώνυμοι εξ' αρχής.</li></ul>
-      contributor terms:
-        heading: Όροι Συνεισφοράς
-        agreed: Έχετε αποδεχτεί τους νέους Όρους Συνεισφοράς.
-        not yet agreed: Δεν έχετε αποδεχτεί τους νέους Όρους Συνεισφοράς.
-        review link text: Παρακαλούμε ακολουθήστε αυτό το σύνδεσμο, για την ενημέρωση
-          σας και την αποδοχή των νέων όρων συνεισφοράς.
-        agreed_with_pd: Δηλώσατε επίσης ότι αποδέχεστε ότι οι τροποποιήσεις σας ανήκουν
-          στον δημόσιο τομέα.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: τι είναι αυτό;
-      save changes button: Αποθήκευση αλλαγών
-      make edits public button: Να γίνουν όλες οι επεξεργασίες μου δημόσιες
-      flash update success confirm needed: Οι πληροφορίες του χρήστη ενημερώθηκαν
-        επιτυχώς. Ελέγξτε το ηλεκτρονικό ταχυδρομείο σας για μια ειδοποίηση επιβεβαίωσης
-        της νέας σας διεύθυνση ηλεκτρονικού ταχυδρομείου.
-      flash update success: Οι πληροφορίες χρήστη ενημερώθηκαν με επιτυχία.
     set_home:
       flash success: Η τοποθεσία σπιτιού αποθηκεύτηκε επιτυχώς
     go_public:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 47de3c431..6a7f2eb8d 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -253,6 +253,47 @@ en-GB:
       entry:
         comment: Comment
         full: Full note
+  accounts:
+    edit:
+      title: Edit account
+      my settings: My settings
+      current email address: Current Email Address
+      external auth: External Authentication
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: what is this?
+      public editing:
+        heading: Public editing
+        enabled: Enabled. Not anonymous and can edit data.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: what is this?
+        disabled: Disabled and cannot edit data, all previous edits are anonymous.
+        disabled link text: why can't I edit?
+      public editing note:
+        heading: Public editing
+        html: Currently your edits are anonymous and people cannot send you messages
+          or see your location. To show what you edited and allow people to contact
+          you through the website, click the button below. <b>Since the 0.6 API changeover,
+          only public users can edit map data</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">find
+          out why</a>).<ul><li>Your e-mail address will not be revealed by becoming
+          public.</li><li>This action cannot be reversed and all new users are now
+          public by default.</li></ul>
+      contributor terms:
+        heading: Contributor Terms
+        agreed: You have agreed to the new Contributor Terms.
+        not yet agreed: You have not yet agreed to the new Contributor Terms.
+        review link text: Please follow this link at your convenience to review and
+          accept the new Contributor Terms.
+        agreed_with_pd: You have also declared that you consider your edits to be
+          in the Public Domain.
+        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: what is this?
+      save changes button: Save Changes
+      make edits public button: Make all my edits public
+    update:
+      success_confirm_needed: User information updated successfully. Check your email
+        for a note to confirm your new email address.
+      success: User information updated successfully.
   browse:
     created: Created
     closed: Closed
@@ -2150,45 +2191,6 @@ en-GB:
       unhide_user: Unhide this User
       delete_user: Delete this User
       confirm: Confirm
-    account:
-      title: Edit account
-      my settings: My settings
-      current email address: Current Email Address
-      external auth: External Authentication
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: what is this?
-      public editing:
-        heading: Public editing
-        enabled: Enabled. Not anonymous and can edit data.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: what is this?
-        disabled: Disabled and cannot edit data, all previous edits are anonymous.
-        disabled link text: why can't I edit?
-      public editing note:
-        heading: Public editing
-        html: Currently your edits are anonymous and people cannot send you messages
-          or see your location. To show what you edited and allow people to contact
-          you through the website, click the button below. <b>Since the 0.6 API changeover,
-          only public users can edit map data</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">find
-          out why</a>).<ul><li>Your e-mail address will not be revealed by becoming
-          public.</li><li>This action cannot be reversed and all new users are now
-          public by default.</li></ul>
-      contributor terms:
-        heading: Contributor Terms
-        agreed: You have agreed to the new Contributor Terms.
-        not yet agreed: You have not yet agreed to the new Contributor Terms.
-        review link text: Please follow this link at your convenience to review and
-          accept the new Contributor Terms.
-        agreed_with_pd: You have also declared that you consider your edits to be
-          in the Public Domain.
-        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: what is this?
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      flash update success confirm needed: User information updated successfully.
-        Check your email for a note to confirm your new email address.
-      flash update success: User information updated successfully.
     set_home:
       flash success: Home location saved successfully
     go_public:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 3ca1a0b50..bf1d672dd 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -263,6 +263,47 @@ eo:
       entry:
         comment: Komento
         full: Tuta rimarko
+  accounts:
+    edit:
+      title: Redakti konton
+      my settings: Miaj agordoj
+      current email address: Aktuala retpoŝta adreso
+      external auth: Ekstera aÅ­tentigo
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: kio estas tio?
+      public editing:
+        heading: Publika redaktado
+        enabled: Ebligita. Ne anonima kaj rajtas redakti.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Kio estas tio ?
+        disabled: Malebligita kaj ne rajtas redakti, ĉiuj antaŭaj redaktoj naŭ estas
+          publikaj.
+        disabled link text: kial mi ne povas redakti?
+      public editing note:
+        heading: Publika redaktado
+        html: Nuntempe viaj redaktoj estas anonimaj kaj aliuloj ne povas sendi mesaĝojn
+          al vi kaj vidi vian lokon. Por montri kion vi redaktis kaj ebligi al aliuloj
+          kontakti vin per la retejo, alklaku la butonon sube. <b>Ekde la versio 0.6
+          de API, nur publikaj uzantoj povas redakti map-datumojn.</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sciiĝi
+          kial</a>).<ul><li>Via retpoŝta adreso ne estos publikigita.</li><li>Tiu
+          ĉi ago ne povos esti malfarita kaj ĉiuj novaj uzantoj estas publikaj implicite.</li></ul>
+      contributor terms:
+        heading: Interkonsento pri kontribuado
+        agreed: Vi konsentis la novan interkonsenton pri kontribuado.
+        not yet agreed: Vi ankoraÅ­ ne konsentis la novan interkonsenton pri kontribuado.
+        review link text: Bonvolu sekvi ĉi tiun ligilon por legi kaj akcepti la novan
+          interkonsenton pri uzado.
+        agreed_with_pd: Vi ankaŭ deklaris, ke viaj kontribuaĵoj estas en la publika
+          havaĵo.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: kio estas tio?
+      save changes button: Konservi ŝanĝojn
+      make edits public button: Publikigu ĉiujn miajn redaktojn.
+    update:
+      success_confirm_needed: Uzantinformoj sukcese freŝigitaj. Kontrolu vian retpoŝtilon
+        por iu mesaĝo kiu konfirmos vian novan retadreso.
+      success: Uzantinformoj sukcese freŝigitaj.
   browse:
     created: Kreita
     closed: Fermita
@@ -2643,45 +2684,6 @@ eo:
       delete_user: Forigi ĉi tiun uzanton
       confirm: Konfirmi
       report: Raporti tiun ĉi uzanton
-    account:
-      title: Redakti konton
-      my settings: Miaj agordoj
-      current email address: Aktuala retpoŝta adreso
-      external auth: Ekstera aÅ­tentigo
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: kio estas tio?
-      public editing:
-        heading: Publika redaktado
-        enabled: Ebligita. Ne anonima kaj rajtas redakti.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Kio estas tio ?
-        disabled: Malebligita kaj ne rajtas redakti, ĉiuj antaŭaj redaktoj naŭ estas
-          publikaj.
-        disabled link text: kial mi ne povas redakti?
-      public editing note:
-        heading: Publika redaktado
-        html: Nuntempe viaj redaktoj estas anonimaj kaj aliuloj ne povas sendi mesaĝojn
-          al vi kaj vidi vian lokon. Por montri kion vi redaktis kaj ebligi al aliuloj
-          kontakti vin per la retejo, alklaku la butonon sube. <b>Ekde la versio 0.6
-          de API, nur publikaj uzantoj povas redakti map-datumojn.</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sciiĝi
-          kial</a>).<ul><li>Via retpoŝta adreso ne estos publikigita.</li><li>Tiu
-          ĉi ago ne povos esti malfarita kaj ĉiuj novaj uzantoj estas publikaj implicite.</li></ul>
-      contributor terms:
-        heading: Interkonsento pri kontribuado
-        agreed: Vi konsentis la novan interkonsenton pri kontribuado.
-        not yet agreed: Vi ankoraÅ­ ne konsentis la novan interkonsenton pri kontribuado.
-        review link text: Bonvolu sekvi ĉi tiun ligilon por legi kaj akcepti la novan
-          interkonsenton pri uzado.
-        agreed_with_pd: Vi ankaŭ deklaris, ke viaj kontribuaĵoj estas en la publika
-          havaĵo.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: kio estas tio?
-      save changes button: Konservi ŝanĝojn
-      make edits public button: Publikigu ĉiujn miajn redaktojn.
-      flash update success confirm needed: Uzantinformoj sukcese freŝigitaj. Kontrolu
-        vian retpoŝtilon por iu mesaĝo kiu konfirmos vian novan retadreso.
-      flash update success: Uzantinformoj sukcese freŝigitaj.
     set_home:
       flash success: Pozicio de hejmo sukcese konservita
     go_public:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9eec77526..c01437b97 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -324,6 +324,50 @@ es:
       entry:
         comment: Comentario
         full: Nota completa
+  accounts:
+    edit:
+      title: Editar cuenta
+      my settings: Mis preferencias
+      current email address: Dirección de correo electrónico actual
+      external auth: Autenticación externa
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: ¿Qué es esto?
+      public editing:
+        heading: Edición pública
+        enabled: Activadas. No es anónimo y puede editar datos.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ¿Qué es esto?
+        disabled: Desactivadas y no puede editar datos; todas las ediciones anteriores
+          son anónimas.
+        disabled link text: ¿Por qué no puedo editar?
+      public editing note:
+        heading: Edición pública
+        html: Actualmente, sus ediciones son anónimas y las personas no pueden enviarle
+          mensajes ni ver su ubicación. Para mostrar lo que editó y permitir que las
+          personas se comuniquen con usted a través del sitio web, haga clic en el
+          botón a continuación.<b>Desde el cambio de API 0.6, solo los usuarios públicos
+          pueden editar los datos del mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">más
+          detalles aquí</a>).<ul> <li> Su dirección de correo electrónico no será
+          revelada al hacerse pública.</li><li> Esta acción no se puede revertir y
+          todos los usuarios nuevos ahora son públicos de forma predeterminada.</li></ul>
+      contributor terms:
+        heading: Términos de colaborador
+        agreed: Ha aceptado los nuevos Términos de colaborador.
+        not yet agreed: Aún no ha aceptado los nuevos Términos de Colaborador.
+        review link text: Siga este enlace cuando le resulte conveniente para revisar
+          y aceptar los nuevos Términos de colaborador.
+        agreed_with_pd: También ha declarado que considera que sus ediciones son de
+          Dominio Público.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: ¿Qué es esto?
+      save changes button: Guardar cambios
+      make edits public button: Hacer que todas mis ediciones sean públicas
+    update:
+      success_confirm_needed: La información del usuario se ha actualizado correctamente.
+        Compruebe su correo electrónico para ver una nota sobre cómo confirmar su
+        nueva dirección de correo electrónico.
+      success: La información del usuario se ha actualizado correctamente.
   browse:
     created: Creado
     closed: Cerrado
@@ -2742,48 +2786,6 @@ es:
       delete_user: Eliminar este usuario
       confirm: Confirmar
       report: Denunciar a este usuario
-    account:
-      title: Editar cuenta
-      my settings: Mis preferencias
-      current email address: Dirección de correo electrónico actual
-      external auth: Autenticación externa
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: ¿Qué es esto?
-      public editing:
-        heading: Edición pública
-        enabled: Activadas. No es anónimo y puede editar datos.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ¿Qué es esto?
-        disabled: Desactivadas y no puede editar datos; todas las ediciones anteriores
-          son anónimas.
-        disabled link text: ¿Por qué no puedo editar?
-      public editing note:
-        heading: Edición pública
-        html: Actualmente, sus ediciones son anónimas y las personas no pueden enviarle
-          mensajes ni ver su ubicación. Para mostrar lo que editó y permitir que las
-          personas se comuniquen con usted a través del sitio web, haga clic en el
-          botón a continuación.<b>Desde el cambio de API 0.6, solo los usuarios públicos
-          pueden editar los datos del mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">más
-          detalles aquí</a>).<ul> <li> Su dirección de correo electrónico no será
-          revelada al hacerse pública.</li><li> Esta acción no se puede revertir y
-          todos los usuarios nuevos ahora son públicos de forma predeterminada.</li></ul>
-      contributor terms:
-        heading: Términos de colaborador
-        agreed: Ha aceptado los nuevos Términos de colaborador.
-        not yet agreed: Aún no ha aceptado los nuevos Términos de Colaborador.
-        review link text: Siga este enlace cuando le resulte conveniente para revisar
-          y aceptar los nuevos Términos de colaborador.
-        agreed_with_pd: También ha declarado que considera que sus ediciones son de
-          Dominio Público.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: ¿Qué es esto?
-      save changes button: Guardar cambios
-      make edits public button: Hacer que todas mis ediciones sean públicas
-      flash update success confirm needed: La información del usuario se ha actualizado
-        correctamente. Compruebe su correo electrónico para ver una nota sobre cómo
-        confirmar su nueva dirección de correo electrónico.
-      flash update success: La información del usuario se ha actualizado correctamente.
     set_home:
       flash success: Ubicación guardada correctamente
     go_public:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 8d08107eb..8fb814896 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -227,6 +227,47 @@ et:
       entry:
         comment: Kommentaar
         full: Täielik tekst
+  accounts:
+    edit:
+      title: Konto muutmine
+      my settings: Minu sätted
+      current email address: Praegune e-posti aadress
+      external auth: Väline autentimine
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: mis see on?
+      public editing:
+        heading: Avalik toimetamine
+        enabled: Lubatud. Pole anonüümne ja saab andmeid muuta.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: mis see on?
+        disabled: Keelatud ja ei saa andmeid muuta, kõik varasemad muudatused on anonüümsed.
+        disabled link text: Miks ma ei saa kaarti töödelda?
+      public editing note:
+        heading: Avalik redigeerimine
+        html: Praegu on su muudatused anonüümsed ja inimesed ei saa saata sulle sõnumeid
+          ega näha sinu asukohta. Et näha, mida sa muutsid ja et võimaldada inimestel
+          selle veebilehe kaudu sinuga ühendust võtta, klõpsa alljärgneval nupul.
+          <b>Pärast üleminekut API versioonile 0.6 võivad kaardiandmeid muuta ainult
+          avalikud kasutajad</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">saa
+          teada, miks</a>).<ul><li>Sinu e-posti aadressi ei avalikustata avalikuks
+          muutumisel.</li><li>Seda toimingut ei saa tühistada ja kõik uued kasutajad
+          on nüüdsest vaikimisi avalikud.</li></ul>
+      contributor terms:
+        heading: Kaastöötingimused
+        agreed: Oled nõustunud uute kaastöötingimustega.
+        not yet agreed: Sa ei ole veel nõustunud uute kaastöötingimustega.
+        review link text: Palun mine sulle sobival ajal lingitud leheküljele, et lugeda
+          uusi kaastöötingimusi ja et nendega nõustuda.
+        agreed_with_pd: Samuti oled deklareerinud oma kaastöö autoriõigustest vabaks
+          (Public Domain).
+        link text: mis see on?
+      save changes button: Salvesta muudatused
+      make edits public button: Tee kõik minu muudatused avalikuks
+    update:
+      success_confirm_needed: Kasutajateabe värskendamine õnnestus. Kontrolli e-kirju,
+        et kinnitada uus e-posti aadress.
+      success: Kasutaja informatsioon uuendatud edukalt.
   browse:
     created: Loodud
     closed: Suletud
@@ -2070,45 +2111,6 @@ et:
       delete_user: Kustuta see kasutaja
       confirm: Kinnita
       report: Teata sellest kasutajast
-    account:
-      title: Konto muutmine
-      my settings: Minu sätted
-      current email address: Praegune e-posti aadress
-      external auth: Väline autentimine
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: mis see on?
-      public editing:
-        heading: Avalik redigeerimine
-        enabled: Lubatud. Pole anonüümne ja saab andmeid muuta.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: mis see on?
-        disabled: Keelatud ja ei saa andmeid muuta, kõik varasemad muudatused on anonüümsed.
-        disabled link text: Miks ma ei saa kaarti töödelda?
-      public editing note:
-        heading: Avalik toimetamine
-        html: Praegu on su muudatused anonüümsed ja inimesed ei saa saata sulle sõnumeid
-          ega näha sinu asukohta. Et näha, mida sa muutsid ja et võimaldada inimestel
-          selle veebilehe kaudu sinuga ühendust võtta, klõpsa alljärgneval nupul.
-          <b>Pärast üleminekut API versioonile 0.6 võivad kaardiandmeid muuta ainult
-          avalikud kasutajad</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">saa
-          teada, miks</a>).<ul><li>Sinu e-posti aadressi ei avalikustata avalikuks
-          muutumisel.</li><li>Seda toimingut ei saa tühistada ja kõik uued kasutajad
-          on nüüdsest vaikimisi avalikud.</li></ul>
-      contributor terms:
-        heading: Kaastöötingimused
-        agreed: Oled nõustunud uute kaastöötingimustega.
-        not yet agreed: Sa ei ole veel nõustunud uute kaastöötingimustega.
-        review link text: Palun mine sulle sobival ajal lingitud leheküljele, et lugeda
-          uusi kaastöötingimusi ja et nendega nõustuda.
-        agreed_with_pd: Samuti oled deklareerinud oma kaastöö autoriõigustest vabaks
-          (Public Domain).
-        link text: mis see on?
-      save changes button: Salvesta muudatused
-      make edits public button: Tee kõik minu muudatused avalikuks
-      flash update success confirm needed: Kasutajateabe värskendamine õnnestus. Kontrolli
-        e-kirju, et kinnitada uus e-posti aadress.
-      flash update success: Kasutaja informatsioon uuendatud edukalt.
     set_home:
       flash success: Kodukoht edukalt salvestatud
     go_public:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 16f235a93..af8261e7a 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -209,6 +209,48 @@ eu:
       entry:
         comment: Iruzkina
         full: Ohar osoa
+  accounts:
+    edit:
+      title: Kontua aldatu
+      my settings: Nire aukerak
+      current email address: Egungo posta helbidea
+      external auth: Kanpoko Autentifikazioa
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: zer da hau?
+      public editing:
+        heading: Aldaketa publikoa
+        enabled: Gaituta. Ez da anonimoa eta datuak editatu ditzake.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: zer da hau?
+        disabled: Ezgaituta dago eta ezin ditu datuak editatu, aurreko aldaketa guztiak
+          anonimoak dira.
+        disabled link text: Zergatik ezin dut aldatu?
+      public editing note:
+        heading: Aldaketa publikoak
+        html: Gaur egun, zure aldaketak anonimoak dira eta jendeak ezin dizu mezurik
+          bidali edo zure kokapena ikusi. Editatu duzuna erakusteko eta webgunearen
+          bidez zurekin harremanetan jartzeko, hautatu beheko botoia. <b> 0.6 API
+          aldaketaz geroztik, erabiltzaile publikoek soilik mapa datuak aldatu ditzakete
+          </b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits"> jakin
+          zergatik </a>). <ul> <li> Zure helbide elektronikoa ez da agerian utziko
+          publikoa bihurtzearekin. </li > <li> Ekintza hau ezin da alderantzikatu
+          eta erabiltzaile berri guztiek lehenespenez publikoak direlako. </ li> </ul>
+      contributor terms:
+        heading: Kolaboratzaile Terminoak
+        agreed: Kolaboratzaile-termino berriak onartu dituzu.
+        not yet agreed: Oraindik ez duzu Laguntzaileen Baldintza berririk onartu.
+        review link text: Mesedez, jarraitu esteka hau zure Kolaboratzaile Terminoaen
+          erosotasuna berrikusteko eta onartzeko.
+        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?
+      save changes button: Aldaketak gorde
+      make edits public button: Nire aldaketa guztiak publikoak egin
+    update:
+      success_confirm_needed: Erabiltzaile informazio igoera arrakastatsua. Zure email-a
+        begiratu posta elektroniko berria egiaztatzeko oharra ikusteko.
+      success: Erabiltzailearen informazioa behar bezala eguneratu da.
   browse:
     created: Sortua
     closed: Itxita
@@ -2314,46 +2356,6 @@ eu:
       delete_user: Erabiltzaile hau ezabatu
       confirm: Berretsi
       report: Salatu erabiltzaile hau
-    account:
-      title: Kontua aldatu
-      my settings: Nire aukerak
-      current email address: Egungo posta helbidea
-      external auth: Kanpoko Autentifikazioa
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: zer da hau?
-      public editing:
-        heading: Aldaketa publikoak
-        enabled: Gaituta. Ez da anonimoa eta datuak editatu ditzake.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: zer da hau?
-        disabled: Ezgaituta dago eta ezin ditu datuak editatu, aurreko aldaketa guztiak
-          anonimoak dira.
-        disabled link text: Zergatik ezin dut aldatu?
-      public editing note:
-        heading: Aldaketa publikoa
-        html: Gaur egun, zure aldaketak anonimoak dira eta jendeak ezin dizu mezurik
-          bidali edo zure kokapena ikusi. Editatu duzuna erakusteko eta webgunearen
-          bidez zurekin harremanetan jartzeko, hautatu beheko botoia. <b> 0.6 API
-          aldaketaz geroztik, erabiltzaile publikoek soilik mapa datuak aldatu ditzakete
-          </b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits"> jakin
-          zergatik </a>). <ul> <li> Zure helbide elektronikoa ez da agerian utziko
-          publikoa bihurtzearekin. </li > <li> Ekintza hau ezin da alderantzikatu
-          eta erabiltzaile berri guztiek lehenespenez publikoak direlako. </ li> </ul>
-      contributor terms:
-        heading: Kolaboratzaile Terminoak
-        agreed: Kolaboratzaile-termino berriak onartu dituzu.
-        not yet agreed: Oraindik ez duzu Laguntzaileen Baldintza berririk onartu.
-        review link text: Mesedez, jarraitu esteka hau zure Kolaboratzaile Terminoaen
-          erosotasuna berrikusteko eta onartzeko.
-        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?
-      save changes button: Aldaketak gorde
-      make edits public button: Nire aldaketa guztiak publikoak egin
-      flash update success confirm needed: Erabiltzaile informazio igoera arrakastatsua.
-        Zure email-a begiratu posta elektroniko berria egiaztatzeko oharra ikusteko.
-      flash update success: Erabiltzailearen informazioa behar bezala eguneratu da.
     set_home:
       flash success: Etxeko helbidea modu egokian gorde da.
     go_public:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 038d3c46f..28e78bdc0 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -278,6 +278,48 @@ fa:
       entry:
         comment: نظر
         full: یادداشت کامل
+  accounts:
+    edit:
+      title: ویرایش حساب
+      my settings: تنظیمات من
+      current email address: ایمیل فعلی
+      external auth: احراز هویت خارجی
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: این چیست؟
+      public editing:
+        heading: ویرایش عمومی
+        enabled: فعال. گمنام نیستید و می‌توانید داده را ویرایش کنید.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: این چیست؟
+        disabled: غیرفعال شده و نمی‌توان داده را ویرایش کرد، همهٔ ویرایش‌های قبلی
+          گمنام هستند.
+        disabled link text: چرا من نمی‌توانم ویرایش کنم؟
+      public editing note:
+        heading: ویرایش عمومی
+        html: هم اکنون ویرایش‌های شما گمنام هستند و مردم نمی‌توانند مکان شما را ببینند
+          یا برایتان پیام بفرستند. برای نمایش آنچه ویرایش کرده‌اید و اجازه به مردم
+          برای تماس با شما از طریق وب‌سایت، روی دکمهٔ زیر کلیک کنید. <b>از زمان روی
+          کار آمدن  0.6 API، فقط کاربران عمومی می‌توانند نقشه را ویرایش کنند</b>.
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">چرا؟</a>).
+          <ul><li>نشانی ایمیل شما خصوصی می‌ماند و آشکار نخواهد شد.</li><li>این عملیات
+          برگشت‌پذیر نیست و همهٔ کاربران تازه به‌طور پیش‌فرض عمومی هستند.</li></ul>
+      contributor terms:
+        heading: شرایط مشارکت‌کننده
+        agreed: شما شرایط جدید مشارکت‌کننده را پذیرفته‌اید.
+        not yet agreed: شما هنوز شرایط جدید مشارکت‌کننده را نپذیرفته‌اید.
+        review link text: لطفاً در فرصت مناسب این پیوند را دنبال کنید و پس از مطالعهٔ
+          شرایط جدید مشارکت‌کننده، موافقت خود را با آن اعلام کنید.
+        agreed_with_pd: شما همچنین اعلام کرده‌اید که ویرایش‌هایتان در مالکیت عمومی
+          باشد.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: این چیست؟
+      save changes button: ذخیره‌کردن تغییرات
+      make edits public button: همهٔ ویرایش‌های من را عمومی کن
+    update:
+      success_confirm_needed: اطلاعات کاربر با موفقیت روزآمد شد. برای تأیید نشانی
+        ایمیل جدید، یادداشت ارسال‌شده به ایمیل‌تان را بررسی کنید.
+      success: اطلاعات کاربر با موفقیت روزآمد شد.
   browse:
     created: ایجاد شد
     closed: بسته شد
@@ -2610,46 +2652,6 @@ fa:
       delete_user: حذف این کاربر
       confirm: تأیید
       report: گزارش این کاربر
-    account:
-      title: ویرایش حساب
-      my settings: تنظیمات من
-      current email address: ایمیل فعلی
-      external auth: احراز هویت خارجی
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: این چیست؟
-      public editing:
-        heading: ویرایش عمومی
-        enabled: فعال. گمنام نیستید و می‌توانید داده را ویرایش کنید.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: این چیست؟
-        disabled: غیرفعال شده و نمی‌توان داده را ویرایش کرد، همهٔ ویرایش‌های قبلی
-          گمنام هستند.
-        disabled link text: چرا من نمی‌توانم ویرایش کنم؟
-      public editing note:
-        heading: ویرایش عمومی
-        html: هم اکنون ویرایش‌های شما گمنام هستند و مردم نمی‌توانند مکان شما را ببینند
-          یا برایتان پیام بفرستند. برای نمایش آنچه ویرایش کرده‌اید و اجازه به مردم
-          برای تماس با شما از طریق وب‌سایت، روی دکمهٔ زیر کلیک کنید. <b>از زمان روی
-          کار آمدن  0.6 API، فقط کاربران عمومی می‌توانند نقشه را ویرایش کنند</b>.
-          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">چرا؟</a>).
-          <ul><li>نشانی ایمیل شما خصوصی می‌ماند و آشکار نخواهد شد.</li><li>این عملیات
-          برگشت‌پذیر نیست و همهٔ کاربران تازه به‌طور پیش‌فرض عمومی هستند.</li></ul>
-      contributor terms:
-        heading: شرایط مشارکت‌کننده
-        agreed: شما شرایط جدید مشارکت‌کننده را پذیرفته‌اید.
-        not yet agreed: شما هنوز شرایط جدید مشارکت‌کننده را نپذیرفته‌اید.
-        review link text: لطفاً در فرصت مناسب این پیوند را دنبال کنید و پس از مطالعهٔ
-          شرایط جدید مشارکت‌کننده، موافقت خود را با آن اعلام کنید.
-        agreed_with_pd: شما همچنین اعلام کرده‌اید که ویرایش‌هایتان در مالکیت عمومی
-          باشد.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: این چیست؟
-      save changes button: ذخیره‌کردن تغییرات
-      make edits public button: همهٔ ویرایش‌های من را عمومی کن
-      flash update success confirm needed: اطلاعات کاربر با موفقیت روزآمد شد. برای
-        تأیید نشانی ایمیل جدید، یادداشت ارسال‌شده به ایمیل‌تان را بررسی کنید.
-      flash update success: اطلاعات کاربر با موفقیت روزآمد شد.
     set_home:
       flash success: موقعیت خانه با موفقیت ذخیره شد
     go_public:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 00e5e7263..3cce47b35 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -285,6 +285,48 @@ fi:
       entry:
         comment: Kommentti
         full: Koko karttailmoitus
+  accounts:
+    edit:
+      title: Asetusten muokkaus
+      my settings: Käyttäjäasetukset
+      current email address: Nykyinen sähköpostiosoite
+      external auth: Kolmannen osapuolen tunnukset kirjautuessa
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/Fi:OpenID
+        link text: Mitä tämä tarkoittaa?
+      public editing:
+        heading: Julkinen muokkaus
+        enabled: Kyllä. Karttatietojen muokkaus sallittu.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Mitä tämä tarkoittaa?
+        disabled: Ei. Karttatietojen muokkaus estetty. Aiemmat karttamuutokset anonyymejä.
+        disabled link text: Miksen voi enää muokata karttaa?
+      public editing note:
+        heading: Muokkaukset julkisia
+        html: Tällä hetkellä muokkauksesi ovat yksityisiä ja ihmiset eivät voi lähettää
+          sinulle viestejä tai nähdä sijaintiasi. Nähdääksesi mitä olet muokannut
+          ja salliaksesi ihmisten lähettää sinulle viestejä nettisivun kautta, napsauta
+          alla olevaa painiketta. <b>0.6 API versioon siirtymisen jälkeen vain yleiset
+          käyttäjät voivat muokata kartan dataa.</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Katso
+          täältä miksi</a>).<ul><li>Sähköpostiosoitettasi ei saateta julkiseen tietoon.</li><li>Tätä
+          toimintoa ei voi perua ja kaikki uudet käyttäjät ovat automaattisesti julkisia.<a
+          href="https://wiki.openstreetmap.org/wiki/Anonymous_edits"></a></li></ul>
+      contributor terms:
+        heading: Osallistumisehdot
+        agreed: Olet hyväksynyt osallistumisehdot.
+        not yet agreed: Et ole vielä hyväksynyt osallistumisehtoja.
+        review link text: Lue ja hyväksy uudistuneet osallistumisehdot napsauttamalla
+          tätä linkkiä.
+        agreed_with_pd: Olet myös ilmaissut muokkaustesi olevan tekijänoikeudesta
+          vapaita (Public Domain).
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Mitä tämä tarkoittaa?
+      save changes button: Tallenna muutokset
+      make edits public button: Tee muokkauksistani julkisia
+    update:
+      success_confirm_needed: Käyttäjätietojen muutokset on tallennettu. Vahvista
+        uusi sähköpostiosoite siihen lähetettyjen ohjeiden mukaisesti.
+      success: Käyttäjätietojen muutokset on tallennettu.
   browse:
     created: Luotu
     closed: Ratkaistu
@@ -2566,46 +2608,6 @@ fi:
       delete_user: Poista tämä käyttäjä
       confirm: Vahvista
       report: Ilmianna käyttäjä
-    account:
-      title: Asetusten muokkaus
-      my settings: Käyttäjäasetukset
-      current email address: Nykyinen sähköpostiosoite
-      external auth: Kolmannen osapuolen tunnukset kirjautuessa
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/Fi:OpenID
-        link text: Mitä tämä tarkoittaa?
-      public editing:
-        heading: Muokkaukset julkisia
-        enabled: Kyllä. Karttatietojen muokkaus sallittu.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Mitä tämä tarkoittaa?
-        disabled: Ei. Karttatietojen muokkaus estetty. Aiemmat karttamuutokset anonyymejä.
-        disabled link text: Miksen voi enää muokata karttaa?
-      public editing note:
-        heading: Julkinen muokkaus
-        html: Tällä hetkellä muokkauksesi ovat yksityisiä ja ihmiset eivät voi lähettää
-          sinulle viestejä tai nähdä sijaintiasi. Nähdääksesi mitä olet muokannut
-          ja salliaksesi ihmisten lähettää sinulle viestejä nettisivun kautta, napsauta
-          alla olevaa painiketta. <b>0.6 API versioon siirtymisen jälkeen vain yleiset
-          käyttäjät voivat muokata kartan dataa.</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Katso
-          täältä miksi</a>).<ul><li>Sähköpostiosoitettasi ei saateta julkiseen tietoon.</li><li>Tätä
-          toimintoa ei voi perua ja kaikki uudet käyttäjät ovat automaattisesti julkisia.<a
-          href="https://wiki.openstreetmap.org/wiki/Anonymous_edits"></a></li></ul>
-      contributor terms:
-        heading: Osallistumisehdot
-        agreed: Olet hyväksynyt osallistumisehdot.
-        not yet agreed: Et ole vielä hyväksynyt osallistumisehtoja.
-        review link text: Lue ja hyväksy uudistuneet osallistumisehdot napsauttamalla
-          tätä linkkiä.
-        agreed_with_pd: Olet myös ilmaissut muokkaustesi olevan tekijänoikeudesta
-          vapaita (Public Domain).
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Mitä tämä tarkoittaa?
-      save changes button: Tallenna muutokset
-      make edits public button: Tee muokkauksistani julkisia
-      flash update success confirm needed: Käyttäjätietojen muutokset on tallennettu.
-        Vahvista uusi sähköpostiosoite siihen lähetettyjen ohjeiden mukaisesti.
-      flash update success: Käyttäjätietojen muutokset on tallennettu.
     set_home:
       flash success: Kodin sijainnin tallennus onnistui
     go_public:
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 07e4b315c..9a36dce99 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -187,6 +187,19 @@ fit:
       entry:
         comment: Kommentti
         full: Koko karttailmoitus
+  accounts:
+    edit:
+      title: Mookkaa konttua
+      my settings: Minun inställninkit
+      current email address: 'Nykynen e-postiatressi:'
+      public editing:
+        heading: Julkinen mookkaus
+        enabled: Joo. Karttatietojen mookkaus sallittu.
+        disabled link text: miksi en voi mookata?
+      public editing note:
+        heading: 'Mookkaukset julkisia:'
+      save changes button: Säästä muutokset
+      make edits public button: Tee mookkauksistani julkisia
   browse:
     created: Luotu
     closed: Ratkaistu
@@ -982,18 +995,6 @@ fit:
       add as friend: Lissää ystäväksi
       latest edit: 'Viimeisin muutos (%{ago}):'
       email address: 'E-postiatressi:'
-    account:
-      title: Mookkaa konttua
-      my settings: Minun inställninkit
-      current email address: 'Nykynen e-postiatressi:'
-      public editing:
-        heading: 'Mookkaukset julkisia:'
-        enabled: Joo. Karttatietojen mookkaus sallittu.
-        disabled link text: miksi en voi mookata?
-      public editing note:
-        heading: Julkinen mookkaus
-      save changes button: Säästä muutokset
-      make edits public button: Tee mookkauksistani julkisia
     go_public:
       flash success: Kaikki tekemäsi mookkaukset ovat nyt julkisia.
     auth_failure:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1400de2d0..7da05f45f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -332,6 +332,53 @@ fr:
       entry:
         comment: Commentaire
         full: Note complète
+  accounts:
+    edit:
+      title: Modifier le compte
+      my settings: Mes options
+      current email address: Adresse de courriel actuelle
+      external auth: Authentification externe
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: qu’est-ce que ceci ?
+      public editing:
+        heading: Modification publique
+        enabled: Activée. Non anonyme et peut modifier les données.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: qu’est-ce que ceci ?
+        disabled: Désactivée et ne peut pas modifier les données ; toutes les précédentes
+          modifications sont anonymes.
+        disabled link text: pourquoi ne puis-je pas modifier ?
+      public editing note:
+        heading: Modification publique
+        html: Votre compte est actuellement en mode de « modifications anonymes »
+          et les autres contributeurs ne peuvent pas vous envoyer de message ni connaître
+          votre localisation géographique. Pour qu’il soit possible de lister vos
+          contributions et permettre aux autres personnes de vous contacter via ce
+          site, cliquez sur le bouton ci-dessous. <b>Depuis le basculement de l’API
+          en version 0.6, seuls les utilisateurs en mode de « modifications publiques »
+          peuvent modifier les données des cartes</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">en
+          savoir plus</a>).<ul><li>Votre adresse de courriel ne sera pas rendue publique.</li><li>Cette
+          opération ne peut pas être annulée et tous les nouveaux utilisateurs sont
+          maintenant en mode de « modifications publiques » par défaut.</li></ul>
+      contributor terms:
+        heading: Conditions de contribution
+        agreed: Vous avez accepté les nouvelles Conditions de contribution.
+        not yet agreed: Vous n’avez pas encore accepté les nouvelles Conditions de
+          contribution.
+        review link text: Veuillez suivre ce lien à votre convenance pour examiner
+          et accepter les nouvelles Conditions de contribution.
+        agreed_with_pd: Vous avez également déclaré que vous considériez vos modifications
+          comme relevant du domaine public.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: qu’est-ce que ceci ?
+      save changes button: Enregistrer les modifications
+      make edits public button: Rendre toutes mes modifications publiques
+    update:
+      success_confirm_needed: Informations sur l’utilisateur mises à jour avec succès.
+        Consultez la boîte de réception de votre messagerie pour confirmer votre nouvelle
+        adresse de courriel.
+      success: Informations sur l’utilisateur mises à jour avec succès.
   browse:
     created: Créé
     closed: Fermé
@@ -2792,51 +2839,6 @@ fr:
       delete_user: Supprimer cet utilisateur ou cette utilisatrice
       confirm: Confirmer
       report: Signaler cet utilisateur ou cette utilisatrice
-    account:
-      title: Modifier le compte
-      my settings: Mes options
-      current email address: Adresse de courriel actuelle
-      external auth: Authentification externe
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: qu’est-ce que ceci ?
-      public editing:
-        heading: Modification publique
-        enabled: Activée. Non anonyme et peut modifier les données.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: qu’est-ce que ceci ?
-        disabled: Désactivée et ne peut pas modifier les données ; toutes les précédentes
-          modifications sont anonymes.
-        disabled link text: pourquoi ne puis-je pas modifier ?
-      public editing note:
-        heading: Modification publique
-        html: Votre compte est actuellement en mode de « modifications anonymes »
-          et les autres contributeurs ne peuvent pas vous envoyer de message ni connaître
-          votre localisation géographique. Pour qu’il soit possible de lister vos
-          contributions et permettre aux autres personnes de vous contacter via ce
-          site, cliquez sur le bouton ci-dessous. <b>Depuis le basculement de l’API
-          en version 0.6, seuls les utilisateurs en mode de « modifications publiques »
-          peuvent modifier les données des cartes</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">en
-          savoir plus</a>).<ul><li>Votre adresse de courriel ne sera pas rendue publique.</li><li>Cette
-          opération ne peut pas être annulée et tous les nouveaux utilisateurs sont
-          maintenant en mode de « modifications publiques » par défaut.</li></ul>
-      contributor terms:
-        heading: Conditions de contribution
-        agreed: Vous avez accepté les nouvelles Conditions de contribution.
-        not yet agreed: Vous n’avez pas encore accepté les nouvelles Conditions de
-          contribution.
-        review link text: Veuillez suivre ce lien à votre convenance pour examiner
-          et accepter les nouvelles Conditions de contribution.
-        agreed_with_pd: Vous avez également déclaré que vous considériez vos modifications
-          comme relevant du domaine public.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: qu’est-ce que ceci ?
-      save changes button: Enregistrer les modifications
-      make edits public button: Rendre toutes mes modifications publiques
-      flash update success confirm needed: Informations sur l’utilisateur mises à
-        jour avec succès. Consultez la boîte de réception de votre messagerie pour
-        confirmer votre nouvelle adresse de courriel.
-      flash update success: Informations sur l’utilisateur mises à jour avec succès.
     set_home:
       flash success: Lieu de domicile enregistré avec succès
     go_public:
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 31b964176..2e1239105 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -27,6 +27,9 @@ fur:
       client_application:
         create: Regjistre
         update: Inzorne
+      doorkeeper_application:
+        create: Regjistre
+        update: Inzorne
       trace:
         create: Cjame
         update: Salve cambiaments
@@ -75,6 +78,14 @@ fur:
       way_node: Grop de vie
       way_tag: Etichete de vie
     attributes:
+      client_application:
+        allow_read_prefs: lei lis sôs preferencis dal utent
+        allow_write_prefs: modificâ lis sôs preferencis dal utent
+        allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs
+        allow_write_api: modificâ la mape
+        allow_read_gpx: lei i siei percors GPS privâts
+        allow_write_gpx: cjamâ percors GPS
+        allow_write_notes: cambiâ lis notis
       diary_comment:
         body: Cuarp
       diary_entry:
@@ -83,6 +94,9 @@ fur:
         latitude: Latitudin
         longitude: Longjitudin
         language: Lenghe
+      doorkeeper/application:
+        name: Non
+        scopes: Permès
       friend:
         user: Utent
         friend: Amì
@@ -207,6 +221,40 @@ fur:
       entry:
         comment: Coment
         full: Note complete
+  accounts:
+    edit:
+      title: Modifiche profîl
+      my settings: Mês impostazions
+      current email address: Direzion di pueste eletroniche atuâl
+      external auth: Autenticazion esterne
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: ce isal chest?
+      public editing:
+        heading: Modifiche publiche
+        enabled: Ativâts. No anonims e si pues cambiâ i dâts.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ce isal chest?
+        disabled: Disativâts e no si pues cambiâ i dâts, ducj i cambiaments precedents
+          a son anonims.
+        disabled link text: parcè no puedio cambiâ?
+      public editing note:
+        heading: Cambiaments publics
+      contributor terms:
+        heading: Tiermins par contribuî
+        agreed: Tu âs acetât i gnûfs tiermins di contribuzion.
+        not yet agreed: No tu âs ancjemò acetât i gnûfs tiermins di contribuzion.
+        review link text: Frache par plasê su chest leam par viodi e acetâ i gnûf
+          tiermins par contribuî.
+        agreed_with_pd: Tu âs ancje declarât di considerâ i tiei cambiaments intal
+          Public Domini.
+        link text: ce isal chest?
+      save changes button: Salve cambiaments
+      make edits public button: Rint publics ducj i miei cambiaments
+    update:
+      success_confirm_needed: Informazions dal utent inzornadis cun sucès. Controle
+        la tô pueste par confermâ la tô gnove direzion di pueste eletroniche.
+      success: Informazions dal utent inzornadis cun sucès.
   browse:
     created: Creât
     closed: Sierât
@@ -375,6 +423,8 @@ fur:
     comment:
       comment: 'Gnûf coment sul grup di cambiaments #%{changeset_id} di %{author}'
       commented_at_by_html: Inzornât %{when} di %{user}
+    comments:
+      comment: 'Gnûf coment sul grup di cambiaments #%{changeset_id} di %{author}'
     index:
       title_all: Discussion sul grup di cambiaments di OpenStreetMap
       title_particular: 'Discussion sul grup di cambiaments #%{changeset_id} di OpenStreetMap'
@@ -387,6 +437,8 @@ fur:
       nearby mapper: Mapadôr dongje
       friend: Amì
     show:
+      title: La mê pagjine iniziâl
+      edit_your_profile: Cambie il to profîl
       my friends: I miei amîs
       no friends: No tu âs ancjemò nissun amì.
       nearby users: Altris utents dongje
@@ -460,6 +512,10 @@ fur:
         title: Vôs dai diaris di OpenStreetMap
         description: Lis ultimis vôs dai diaris dai utents di OpenStreetMap
     comments:
+      title: Coments ai diaris zontâts par %{user}
+      heading: Coments ai diaris di %{user}
+      subheading_html: Coments ai diaris zontâts di %{user}
+      no_comments: Nissun coment ai diaris
       post: Messaç
       when: Cuant
       comment: Coment
@@ -523,7 +579,9 @@ fur:
           hospital: Ospedâl
           ice_cream: Gjelato
           kindergarten: Scuelute
+          language_school: Scuele di lenghis
           library: Biblioteche
+          music_school: Scuele di musiche
           nightclub: Club noturni
           parking: Parcament
           pharmacy: Farmacie
@@ -599,6 +657,11 @@ fur:
           tertiary: Strade terziarie
           tertiary_link: Strade terziarie
           track: Piste
+          traffic_mirror: Spieli pal traffic
+          trunk: Strade rapide
+          trunk_link: Strade rapide
+          unclassified: Strade no classificade
+          "yes": Strade
         historic:
           archaeological_site: Sît archeologic
           battlefield: Cjamp di bataie
@@ -611,9 +674,17 @@ fur:
           memorial: Memoriâl
           mine: Miniere
           monument: Monument
+          roman_road: Strade romane
           ruins: Ruvinàs
+          stone: Piere
           tomb: Tombe
           tower: Tor
+          wayside_chapel: Capele
+          wayside_cross: Crôs
+          wayside_shrine: Anconute
+          "yes": Lûc storic
+        junction:
+          "yes": Crosade
         landuse:
           cemetery: Simiteri
           commercial: Aree comerciâl
@@ -644,9 +715,15 @@ fur:
           swimming_pool: Pissine
           track: Piste pe corse
           water_park: Parc acuatic
+        man_made:
+          bridge: Puint
+          bunker_silo: Bunker
+          tower: Tor
+          water_well: Poç
         military:
           airfield: Cjamp di aviazion militâr
           barracks: Caserme
+          bunker: Bunker
         mountain_pass:
           "yes": Pas di montagne
         natural:
@@ -693,11 +770,13 @@ fur:
           postcode: Codis postâl
           region: Regjon
           sea: Mâr
+          square: Place
           state: Stât
           subdivision: Sotdivision
           suburb: Cuartîr
           town: Citadine
           village: Vilaç
+          "yes": Lûc
         railway:
           abandoned: Ferade bandonade
           construction: Ferade in costruzion
@@ -753,9 +832,11 @@ fur:
           river: Flum
       admin_levels:
         level2: Confin di paîs
+        level3: Confin di regjon
         level4: Confin di stât
         level5: Confin di regjon
         level6: Confin di contee
+        level7: Confine municipâl
         level8: Confin di citât
         level9: Confin di vilaç
       types:
@@ -768,6 +849,8 @@ fur:
   issues:
     index:
       reported_user: Utent segnalât
+      search: Cîr
+      status: Stât
       reports: Segnalazions
       last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> di %{user}
@@ -775,12 +858,21 @@ fur:
       reports_count:
         one: 1 segnalazion
         other: '%{count} segnalazions'
+      states:
+        ignored: Ignorât
+        open: Viert
+        resolved: Risolt
     update:
       new_report: La tô segnalazion e je stade registrade corretamentri
     show:
       reports:
         one: 1 segnalazion
         other: '%{count} segnalazions'
+      resolve: Risolf
+      ignore: Ignore
+    helper:
+      reportable_title:
+        note: 'Note #%{note_id}'
   reports:
     new:
       title_html: Segnale %{link}
@@ -811,11 +903,13 @@ fur:
     intro_text: OpenStreetMap e je une mape dal mont, creade di int come te e di ûs
       libar sot di une licence vierte.
     intro_2_create_account: Cree il to profîl utent
-    hosting_partners_html: L'hosting al è sostignût di %{ucl}, %{bytemark} e altris
-      %{partners}.
+    hosting_partners_html: L'hosting al è sostignût di %{ucl}, %{fastly}, %{bytemark}
+      e altris %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: associâts
+    tou: Cundizions pal ûs
     osm_offline: La base di dâts di OpenStreetMap e je par cumò fûr linie parcè che
       o sin daûr a fâ lavôrs essenziâi di manutenzion de base di dâts.
     osm_read_only: La base di dâts di OpenStreetMap e je par cumò dome in leture dilunc
@@ -865,6 +959,11 @@ fur:
         il cambiament.
     note_comment_notification:
       anonymous: Un utent anonim
+    changeset_comment_notification:
+      commented:
+        partial_changeset_with_comment: cun coment '%{changeset_comment}'
+        partial_changeset_with_comment_html: cun coment '%{changeset_comment}'
+        partial_changeset_without_comment: cence coment
   confirmations:
     confirm:
       heading: Controle la tô pueste!
@@ -961,11 +1060,28 @@ fur:
       heading: Azere la password par %{user}
       reset: Azere la password
       flash changed: La tô password e je stade cambiade.
+  preferences:
+    show:
+      title: Preferencis
+      preferred_editor: Editôr preferît
+      preferred_languages: Lenghis preferidis
+      edit_preferences: Cambie lis preferencis
+    edit:
+      title: Cambie lis preferencis
+      save: Inzorna lis preferencis
+      cancel: Scancele
+    update_success_flash:
+      message: Preferencis inzornadis.
   profiles:
     edit:
+      title: Cambie il profîl
+      save: Inzorne il profîl
+      cancel: Scancele
       image: Figure
       gravatar:
         gravatar: Dopre Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Ce isal Gravatar?
       new image: Zonte une figure
       keep image: Ten la figure di cumò
       delete image: Gjave la figure di cumò
@@ -975,6 +1091,8 @@ fur:
       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?
+    update:
+      success: Profîl inzornât
   sessions:
     new:
       title: Jentre
@@ -1025,7 +1143,14 @@ fur:
       heading: Va fûr di OpenStreetMap
       logout_button: Jes
   shared:
+    markdown_help:
+      link: Leam
+      text: Test
+      image: Figure
+      alt: Test alternatîf
+      url: URL
     richtext_field:
+      edit: Cambie
       preview: Anteprime
   site:
     about:
@@ -1119,6 +1244,7 @@ fur:
       irc:
         title: IRC
       welcomemat:
+        url: https://welcome.openstreetmap.org/
         title: Pe organizazions
       wiki:
         url: http://wiki.openstreetmap.org/
@@ -1128,6 +1254,8 @@ fur:
       close: Siere
     search:
       search: Cîr
+      get_directions: Cjate indicazions
+      get_directions_title: Cjate lis indicazions tra doi ponts
       from: Di
       to: A
       where_am_i: Dulà soio?
@@ -1138,8 +1266,11 @@ fur:
       table:
         entry:
           motorway: Autostrade
+          main_road: Strade principâl
+          trunk: Strade rapide
           primary: Strade primarie
           secondary: Strade secondarie
+          unclassified: Strade no classificade
           rail: Ferade
           subway: Metropolitane
           tram:
@@ -1193,9 +1324,12 @@ fur:
         jessi zontât ae base di dâts. Chest al sucêt in gjenar jentri di une ore;
         ti mandarìn un messaç cuant che il lavôr al sarà stât completât.
     edit:
+      cancel: Scancele
       title: Daûr a cambiâ il percors %{name}
       heading: Daûr a cambiâ il percors %{name}
       visibility_help: ce vuelial dî?
+    update:
+      updated: Percors inzornât
     trace_optionals:
       tags: Etichetis
     show:
@@ -1238,11 +1372,13 @@ fur:
       in: in
     index:
       public_traces: Percors GPS publics
-      my_traces: I miei percors GPS
+      my_traces: I miei percors
       public_traces_from: Percors GPS publics di %{user}
       description: Viôt i percors GPS cjamâts sù tai ultins timps
       tagged_with: ' etichetât cun %{tags}'
       upload_trace: Cjame un percors
+      all_traces: Ducj i percors
+      traces_from: Percors publics di %{user}
     georss:
       title: Percors GPS di OpenStreetMap
     description:
@@ -1287,13 +1423,39 @@ fur:
       no_apps_html: Âstu une aplicazion web che tu volaressis regjistrâ par doprâ
         ca di no cul standard %{oauth}? Tu scugnis regjistrâle prime che podedi fâ
         richiestis OAuth a chest servizi.
+      oauth: OAuth
       registered_apps: 'Tu âs chestis aplicazions client regjistradis:'
       register_new: Regjistre la tô aplicazion
     form:
       requests: 'Domande i permès ca sot al utent:'
   oauth2_applications:
+    index:
+      new: Regjistre une gnove aplicazion
+      name: Non
+      permissions: Permès
+    application:
+      edit: Cambie
+      delete: Elimine
+      confirm_delete: Vuelistu eliminâ cheste aplicazion?
     new:
       title: Regjistre une gnove aplicazion
+    edit:
+      title: Cambie la tô aplicazion
+    show:
+      edit: Cambie
+      delete: Elimine
+      permissions: Permès
+  oauth2_authorizations:
+    new:
+      authorize: Autorize
+      deny: Dinee
+    show:
+      title: Codiç di autorizazion
+  oauth2_authorized_applications:
+    index:
+      title: Lis aplicazions che o ai autorizât
+      application: Aplicazion
+      permissions: Permès
   users:
     new:
       title: Regjistriti
@@ -1341,8 +1503,11 @@ fur:
       my profile: Il gno profîl
       my settings: Impostazions
       my comments: I mei coments
+      my_preferences: Preferencis
+      my_dashboard: La mê pagjine iniziâl
       blocks on me: Blocs su di me
       blocks by me: Blocs aplicâts di me
+      edit_profile: Cambie il profîl
       send message: Mande messaç
       diary: Diari
       edits: Cambiaments
@@ -1376,38 +1541,6 @@ fur:
       delete_user: elimine chest utent
       confirm: Conferme
       report: Segnale chest utent
-    account:
-      title: Modifiche profîl
-      my settings: Mês impostazions
-      current email address: Direzion di pueste eletroniche atuâl
-      external auth: Autenticazion esterne
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: ce isal chest?
-      public editing:
-        heading: Cambiaments publics
-        enabled: Ativâts. No anonims e si pues cambiâ i dâts.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ce isal chest?
-        disabled: Disativâts e no si pues cambiâ i dâts, ducj i cambiaments precedents
-          a son anonims.
-        disabled link text: parcè no puedio cambiâ?
-      public editing note:
-        heading: Modifiche publiche
-      contributor terms:
-        heading: Tiermins par contribuî
-        agreed: Tu âs acetât i gnûfs tiermins di contribuzion.
-        not yet agreed: No tu âs ancjemò acetât i gnûfs tiermins di contribuzion.
-        review link text: Frache par plasê su chest leam par viodi e acetâ i gnûf
-          tiermins par contribuî.
-        agreed_with_pd: Tu âs ancje declarât di considerâ i tiei cambiaments intal
-          Public Domini.
-        link text: ce isal chest?
-      save changes button: Salve cambiaments
-      make edits public button: Rint publics ducj i miei cambiaments
-      flash update success confirm needed: Informazions dal utent inzornadis cun sucès.
-        Controle la tô pueste par confermâ la tô gnove direzion di pueste eletroniche.
-      flash update success: Informazions dal utent inzornadis cun sucès.
     set_home:
       flash success: Lûc iniziâl salvât cun sucès
     go_public:
@@ -1423,6 +1556,8 @@ fur:
       summary_no_ip_html: '%{name} creât ai %{date}'
       confirm: Conferme i utents selezionâts
       hide: Plate i utents selezionâts
+    suspended:
+      support: assistence
   user_role:
     grant:
       confirm: Conferme
@@ -1465,6 +1600,8 @@ fur:
     show:
       title: '%{block_on} blocât di %{block_by}'
       heading_html: '%{block_on} blocât di %{block_by}'
+      created: 'Creât:'
+      duration: 'Durade:'
       status: 'Stât:'
       show: Mostre
       edit: Cambie
@@ -1517,6 +1654,8 @@ fur:
       center_marker: Centre la mape sul marcadôr
       paste_html: Tache l'HTML par inserîlu tal to sît web
       view_larger_map: Viôt une mape plui grande
+    embed:
+      report_problem: Segnale un probleme
     key:
       title: Leiende
       tooltip: Leiende
@@ -1541,6 +1680,7 @@ fur:
         title: Nivei
       copyright: © <a href='%{copyright_url}'>Colaboradôrs di OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Fâs une donazion</a>
+      terms: <a href='%{terms_url}' target='_blank'>Sît web e tiermins di ûs des APIs</a>
     site:
       edit_tooltip: Cambie la mape
       edit_disabled_tooltip: Cres il zoom par cambiâ la mape
@@ -1590,10 +1730,78 @@ fur:
         no_place: No si à rivât a cjatâ "%{place}".
       instructions:
         continue_without_exit: Continue su %{name}
+        slight_right_without_exit: Volte un ninin a diestre su %{name}
+        offramp_right: Cjape la rampe a diestre
+        offramp_right_with_exit: Cjape la jessude %{exit} a diestre
+        offramp_right_with_exit_name: Cjape la jessude %{exit} a diestre su %{name}
+        offramp_right_with_exit_directions: Cjape la jessude %{exit} a diestre bande
+          %{directions}
+        offramp_right_with_exit_name_directions: Cjape la jessude %{exit} a diestre
+          su %{name}, bande %{directions}
+        offramp_right_with_name: Cjape la rampe a diestre su %{name}
+        offramp_right_with_directions: Cjape la rampe a diestre bande %{directions}
+        offramp_right_with_name_directions: Cjape la rampe a diestre su %{name}, bande
+          %{directions}
+        onramp_right_without_exit: Volte a diestre su la rampe su %{name}
+        onramp_right_with_directions: Volte a diestre su la rampe bande %{directions}
+        onramp_right_with_name_directions: Volte a diestre su la rampe su %{name},
+          bande %{directions}
+        onramp_right_without_directions: Volte a diestre su la rampe
+        onramp_right: Volte a diestre su la rampe
+        endofroad_right_without_exit: Ae fin de strade volte a diestre su %{name}
+        merge_right_without_exit: Jentre a diestre su %{name}
+        fork_right_without_exit: Ae crosade volte a diestre su %{name}
+        turn_right_without_exit: Volte a diestre su %{name}
+        sharp_right_without_exit: Volte dut a diestre su %{name}
+        uturn_without_exit: Inversion a U dilunc %{name}
+        sharp_left_without_exit: Volte dut a çampe su %{name}
+        turn_left_without_exit: Volte a çampe su %{name}
+        offramp_left: Cjape la rampe a çampe
+        offramp_left_with_exit: Cjape la jessude %{exit} a çampe
+        offramp_left_with_exit_name: Cjape la jessude %{exit} a çampe su %{name}
+        offramp_left_with_exit_directions: Cjape la jessude %{exit} a çampe bande
+          %{directions}
+        offramp_left_with_exit_name_directions: Cjape la jessude %{exit} a çampe su
+          %{name}, bande %{directions}
+        offramp_left_with_name: Cjape la rampe a çampe su %{name}
+        offramp_left_with_directions: Cjape la rampe a çampe bande %{directions}
+        offramp_left_with_name_directions: Cjape la rampe a çampe su %{name}, bande
+          %{directions}
+        onramp_left_without_exit: Volte a çampe su la rampe su %{name}
+        onramp_left_with_directions: Volte a çampe su la rampe bande %{directions}
+        onramp_left_with_name_directions: Volte a çampe su la rampe su %{name}, bande
+          %{directions}
+        onramp_left_without_directions: Volte a çampe su la rampe
+        onramp_left: Volte a çampe su la rampe
+        endofroad_left_without_exit: Ae fin de strade volte a çampe su %{name}
+        merge_left_without_exit: Jentre a çampe su %{name}
+        fork_left_without_exit: Ae crosade volte a çampe su %{name}
+        slight_left_without_exit: Volte un ninin a çampe su %{name}
+        via_point_without_exit: (pal pont)
         follow_without_exit: Seguìs %{name}
+        roundabout_without_exit: Ae taronde cjape la jessude su %{name}
+        leave_roundabout_without_exit: Lasse la taronde - %{name}
+        stay_roundabout_without_exit: Sta te taronde - %{name}
+        start_without_exit: Scomence su %{name}
         destination_without_exit: Rive ae destinazion
+        against_oneway_without_exit: Va cuintri sens su %{name}
+        end_oneway_without_exit: Fin dal sens unic su %{name}
+        roundabout_with_exit: Ae taronde cjape la jessude %{exit} su %{name}
+        roundabout_with_exit_ordinal: Ae taronde cjape la %{exit} jessude su %{name}
+        exit_roundabout: Jes de taronde su %{name}
         unnamed: cence non
         courtesy: Indicazions furnidis di %{link}
+        exit_counts:
+          first: 1e
+          second: 2e
+          third: 3e
+          fourth: 4e
+          fifth: 5e
+          sixth: 6e
+          seventh: 7e
+          eighth: 8e
+          ninth: 9e
+          tenth: 10e
       time: Timp
     query:
       node: Grop
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 6cea2b56c..c6ea5cc9d 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -210,6 +210,49 @@ fy:
       entry:
         comment: Reäksje
         full: Folsleine notysje
+  accounts:
+    edit:
+      title: Akkount bewurkje
+      my settings: Myn ynstellings
+      current email address: Hjoeddeisk e-mailadres
+      external auth: Autentifikaasje om utens
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: wat is dat?
+      public editing:
+        heading: Iepenbier bewurkjen
+        enabled: Ynskeakele. Net anonym en kin data bewurkje.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: wat is dat?
+        disabled: Utskeakele en kin gjin data bewurkje, alle eardere bewurkings binne
+          anonym.
+        disabled link text: wêrom kin ik net bewurkje?
+      public editing note:
+        heading: Iepenbier bewurkjen
+        html: Op it stuit binne jo bewurkings anonym, en kinne minsken jo gjin berjochten
+          stjoere of jo lokaasje sjen. Klik de knop hjirûnder om sjen te litten wat
+          jo bewurke hawwe, en om minsken ta te stean op it webstee kontakt mei jo
+          op te nimmen. <b>Sûnt de oergong nei API 0.6, kinne inkeld iepenbiere meidoggers
+          kaartdata bewurkje</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">fyn
+          út wêrom</a>).<ul><li>Jo e-mailadres wurdt net bekend makke by it iepenbier
+          wurden.</li><li>Dizze hanneling kin net weromdraaid wurde, en alle nije
+          meidoggers binne no standert iepenbier.</li></ul>
+      contributor terms:
+        heading: Bydragersbetingsten
+        agreed: Jo binne akkoart gien mei de nije Bydragersbetingsten.
+        not yet agreed: Jo binne noch net akkoart gien mei de nije Bydragersbetingsten.
+        review link text: Folgje dizze keppeling wannear't it jo útkomt, om de nije
+          Bydragersbetingsten te besjen en te akseptearjen.
+        agreed_with_pd: Jo hawwe ek oanjûn dat jo jo bewurkings as part fan it Publyk
+          Domein beskôgje.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: wat is dat?
+      save changes button: Feroarings bewarje
+      make edits public button: Al myn bewurkings iepenbier meitsje
+    update:
+      success_confirm_needed: Meidoggergegevens bywurkjen slagge. Besjoch jo e-mail
+        foar in berjocht om jo nije e-mailadres te befêstigjen.
+      success: Meidoggergegevens bywurkjen slagge.
   browse:
     created: Makke
     closed: Ofdien
@@ -1887,47 +1930,6 @@ fy:
       delete_user: Dizze meidogger wiskje
       confirm: Befêstigje
       report: Dizze meidogger melde
-    account:
-      title: Akkount bewurkje
-      my settings: Myn ynstellings
-      current email address: Hjoeddeisk e-mailadres
-      external auth: Autentifikaasje om utens
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: wat is dat?
-      public editing:
-        heading: Iepenbier bewurkjen
-        enabled: Ynskeakele. Net anonym en kin data bewurkje.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: wat is dat?
-        disabled: Utskeakele en kin gjin data bewurkje, alle eardere bewurkings binne
-          anonym.
-        disabled link text: wêrom kin ik net bewurkje?
-      public editing note:
-        heading: Iepenbier bewurkjen
-        html: Op it stuit binne jo bewurkings anonym, en kinne minsken jo gjin berjochten
-          stjoere of jo lokaasje sjen. Klik de knop hjirûnder om sjen te litten wat
-          jo bewurke hawwe, en om minsken ta te stean op it webstee kontakt mei jo
-          op te nimmen. <b>Sûnt de oergong nei API 0.6, kinne inkeld iepenbiere meidoggers
-          kaartdata bewurkje</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">fyn
-          út wêrom</a>).<ul><li>Jo e-mailadres wurdt net bekend makke by it iepenbier
-          wurden.</li><li>Dizze hanneling kin net weromdraaid wurde, en alle nije
-          meidoggers binne no standert iepenbier.</li></ul>
-      contributor terms:
-        heading: Bydragersbetingsten
-        agreed: Jo binne akkoart gien mei de nije Bydragersbetingsten.
-        not yet agreed: Jo binne noch net akkoart gien mei de nije Bydragersbetingsten.
-        review link text: Folgje dizze keppeling wannear't it jo útkomt, om de nije
-          Bydragersbetingsten te besjen en te akseptearjen.
-        agreed_with_pd: Jo hawwe ek oanjûn dat jo jo bewurkings as part fan it Publyk
-          Domein beskôgje.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: wat is dat?
-      save changes button: Feroarings bewarje
-      make edits public button: Al myn bewurkings iepenbier meitsje
-      flash update success confirm needed: Meidoggergegevens bywurkjen slagge. Besjoch
-        jo e-mail foar in berjocht om jo nije e-mailadres te befêstigjen.
-      flash update success: Meidoggergegevens bywurkjen slagge.
     set_home:
       flash success: Fêste lokaasje bewarjen slagge
     go_public:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index d5b6abef6..318df903a 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -193,6 +193,26 @@ ga:
       entry:
         comment: Nóta tráchta
         full: An nóta iomlán
+  accounts:
+    edit:
+      title: Cuir an cuntas in eagar
+      my settings: Mo chuid socruithe
+      current email address: An seoladh ríomhphoist reatha
+      external auth: Fíordheimhniú Seachtrach
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: céard é seo?
+      public editing:
+        enabled link text: céard é seo?
+      public editing note:
+        heading: Eagarthóireacht phoiblí
+      contributor terms:
+        heading: Téarmaí do Rannchuiditheoirí
+        agreed: D'aontaigh tú leis na Téarmaí nua do Rannchuiditheoirí.
+        not yet agreed: Níor aontaigh tú leis na Téarmaí nua do Rannchuiditheoirí
+          fós.
+        link text: céard é seo?
+      save changes button: Sábháil na hAthruithe
   browse:
     created: Cruthaithe ag
     closed: Dúnta ag
@@ -2003,24 +2023,6 @@ ga:
       unhide_user: Taispeáin an tÚsáideoir seo
       delete_user: Scrios an tÚsáideoir seo
       confirm: Deimhnigh
-    account:
-      title: Cuir an cuntas in eagar
-      my settings: Mo chuid socruithe
-      current email address: An seoladh ríomhphoist reatha
-      external auth: Fíordheimhniú Seachtrach
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: céard é seo?
-      public editing:
-        heading: Eagarthóireacht phoiblí
-        enabled link text: céard é seo?
-      contributor terms:
-        heading: Téarmaí do Rannchuiditheoirí
-        agreed: D'aontaigh tú leis na Téarmaí nua do Rannchuiditheoirí.
-        not yet agreed: Níor aontaigh tú leis na Téarmaí nua do Rannchuiditheoirí
-          fós.
-        link text: céard é seo?
-      save changes button: Sábháil na hAthruithe
     index:
       title: Úsáideoirí
       heading: Úsáideoirí
diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 23d3f04a7..9e9b57ea7 100644
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -12,6 +12,23 @@ gcf:
     help:
       user:
         new_email: (Pa janmen maké piblikman)
+  accounts:
+    edit:
+      my settings: Mes options
+      public editing:
+        enabled: Aktif. Y pa anonnim, y pé édité doné.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        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é?
+      public editing note:
+        heading: 'Édision piblik:'
+      save changes button: Enrèjisré tout chanjman
+      make edits public button: Mèt tou sa an fè piblik
+    update:
+      success_confirm_needed: Enfowmasion asi itilisatè la bien anrèjistré. Gadé bwet
+        imél aw pou konfirmé adres nouvo imél aw
+      success: Efowmasion asi itilisatè la bien anrejistré.
   browse:
     changeset:
       changesetxml: Niméwo Chanjeman XML
@@ -154,20 +171,6 @@ gcf:
       mapper since: 'Arpantè dèpi:'
       description: Deskription
       user location: Ola itilizatè yé
-    account:
-      my settings: Mes options
-      public editing:
-        heading: 'Édision piblik:'
-        enabled: Aktif. Y pa anonnim, y pé édité doné.
-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        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é?
-      save changes button: Enrèjisré tout chanjman
-      make edits public button: Mèt tou sa an fè piblik
-      flash update success confirm needed: Enfowmasion asi itilisatè la bien anrèjistré.
-        Gadé bwet imél aw pou konfirmé adres nouvo imél aw
-      flash update success: Efowmasion asi itilisatè la bien anrejistré.
     set_home:
       flash success: La ou ka rété la bien anrèjistré
     go_public:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 9946deaa5..9d68b797d 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -153,6 +153,51 @@ gd:
       entry:
         comment: Beachd
         full: Nòta slàn
+  accounts:
+    edit:
+      title: Deasaich an cunntas
+      my settings: Na roghainnean agam
+      current email address: 'An seòladh puist-d làithreach:'
+      external auth: 'Dearbhadh taobh a-muigh:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: dè th`ann?
+      public editing:
+        heading: Deasachadh poblach
+        enabled: An comas. Nochdaidh d' ainm agus faodaidh tu dàta a dheasachadh.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: dè th`ann?
+        disabled: À comas agus chan fhaod thu dàta a dheasachadh, bith gach deasachadh
+          a rinn thu roimhe gun urra.
+        disabled link text: Carson nach urrainn dhomh deasachadh?
+      public editing note:
+        heading: 'Deasachadh poblach:'
+        html: Cha nochd d' ainm leis na dheasaicheas tu aig an àm seo agus chan fhaodar
+          teachdaireachd a chur thugad no sealltainn far a bheil thu. Gus na dheasaich
+          thu a shealltainn agus cead a thoirt do chàch gun cuir iad fios thugad air
+          an làrach-lìn, briog air a' phutan gu h-ìosal. <b>O na ghluais sinn dha
+          tionndadh 0.6 dhen API, chan fhaod ach cleachdaichean poblach dàta a' mhapa
+          a dheasachadh</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">faigh
+          a-mach carson</a>).<ul><li>Cha dèid an seòladh puist-d agad fhoillseachadh
+          nuair a thèid thu 'nad deasaiche poblach.</li><li>Cha ghabh an gnìomh seo
+          a neo-dhèanamh agus bidh gach cleachdaiche ùr poblach o thùs o seo a-mach.</li></ul>
+      contributor terms:
+        heading: 'Teirmichean a'' chom-pàirtiche:'
+        agreed: Dh'aontaich thu ri teirmichean ùra a' chom-pàirtiche.
+        not yet agreed: Cha do dh'aontaich thu ri teirmichean ùra a' chom-pàirtiche
+          fhathast.
+        review link text: Lean air a' cheangal seo nuair a bhios e iomchaidh dhut
+          gus teirmichean ùra a' chom-pàirtiche a leughadh is gabhail riutha.
+        agreed_with_pd: Thuirt thu cuideachd gun dèid gach rud a dheasaicheas tu a
+          chur ris a' Public Domain.
+        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Dè th`ann?
+      save changes button: Sàbhail na dh'atharraich thu
+      make edits public button: Dèan fear poblach de gach deasachadh a rinn mi
+    update:
+      success_confirm_needed: Chaidh fiosrachadh a' chleachdaiche ùrachadh gu soirbheachail.
+        Thoir sùil air a' phost-d agad gus an seòladh puist-d ùr agad a dhearbhadh.
+      success: Chaidh fiosrachadh a' chleachdaiche ùrachadh gu soirbheachail.
   browse:
     created: Air a chruthachadh
     closed: Dùinte
@@ -1937,50 +1982,6 @@ gd:
       unhide_user: Neo-fhalaich an cleachdaiche seo
       delete_user: Sguab às an cleachdaiche seo
       confirm: Dearbhaich
-    account:
-      title: Deasaich an cunntas
-      my settings: Na roghainnean agam
-      current email address: 'An seòladh puist-d làithreach:'
-      external auth: 'Dearbhadh taobh a-muigh:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: dè th`ann?
-      public editing:
-        heading: 'Deasachadh poblach:'
-        enabled: An comas. Nochdaidh d' ainm agus faodaidh tu dàta a dheasachadh.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: dè th`ann?
-        disabled: À comas agus chan fhaod thu dàta a dheasachadh, bith gach deasachadh
-          a rinn thu roimhe gun urra.
-        disabled link text: Carson nach urrainn dhomh deasachadh?
-      public editing note:
-        heading: Deasachadh poblach
-        html: Cha nochd d' ainm leis na dheasaicheas tu aig an àm seo agus chan fhaodar
-          teachdaireachd a chur thugad no sealltainn far a bheil thu. Gus na dheasaich
-          thu a shealltainn agus cead a thoirt do chàch gun cuir iad fios thugad air
-          an làrach-lìn, briog air a' phutan gu h-ìosal. <b>O na ghluais sinn dha
-          tionndadh 0.6 dhen API, chan fhaod ach cleachdaichean poblach dàta a' mhapa
-          a dheasachadh</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">faigh
-          a-mach carson</a>).<ul><li>Cha dèid an seòladh puist-d agad fhoillseachadh
-          nuair a thèid thu 'nad deasaiche poblach.</li><li>Cha ghabh an gnìomh seo
-          a neo-dhèanamh agus bidh gach cleachdaiche ùr poblach o thùs o seo a-mach.</li></ul>
-      contributor terms:
-        heading: 'Teirmichean a'' chom-pàirtiche:'
-        agreed: Dh'aontaich thu ri teirmichean ùra a' chom-pàirtiche.
-        not yet agreed: Cha do dh'aontaich thu ri teirmichean ùra a' chom-pàirtiche
-          fhathast.
-        review link text: Lean air a' cheangal seo nuair a bhios e iomchaidh dhut
-          gus teirmichean ùra a' chom-pàirtiche a leughadh is gabhail riutha.
-        agreed_with_pd: Thuirt thu cuideachd gun dèid gach rud a dheasaicheas tu a
-          chur ris a' Public Domain.
-        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Dè th`ann?
-      save changes button: Sàbhail na dh'atharraich thu
-      make edits public button: Dèan fear poblach de gach deasachadh a rinn mi
-      flash update success confirm needed: Chaidh fiosrachadh a' chleachdaiche ùrachadh
-        gu soirbheachail. Thoir sùil air a' phost-d agad gus an seòladh puist-d ùr
-        agad a dhearbhadh.
-      flash update success: Chaidh fiosrachadh a' chleachdaiche ùrachadh gu soirbheachail.
     set_home:
       flash success: Chaidh far a bheil thu a' fuireach a shàbhaladh gu soirbheachail.
     go_public:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 71b1083d0..1870e19e9 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -260,6 +260,49 @@ gl:
       entry:
         comment: Comentario
         full: Nota completa
+  accounts:
+    edit:
+      title: Editar a conta
+      my settings: Os meus axustes
+      current email address: Enderezo de correo electrónico actual
+      external auth: Autenticación externa
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: que é isto?
+      public editing:
+        heading: Edición pública
+        enabled: Activado. Non es anónimo e podes editar os datos.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: que é isto?
+        disabled: Desactivado e non pode editar os datos. Tódalas anteriores edicións
+          son anónimas.
+        disabled link text: por que non podo editar?
+      public editing note:
+        heading: Edición pública
+        html: Actualmente, as túas edicións son anónimas e a xente non che pode enviar
+          mensaxes ou ollar a túa localización. Para amosar o que editaches e permitir
+          que a xente se poña en contacto contigo mediante a páxina web, preme no
+          botón que aparece deseguido. <b>Dende a migración da API á versión 0.6,
+          tan só os usuarios públicos poden editar os datos do mapa</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">máis
+          información</a>).<ul><li>Os enderezos de correo electrónico non se farán
+          públicos.</li><li>Non é posíbel reverter esta acción e agora os novos usuarios
+          xa son públicos por defecto.</li></ul>
+      contributor terms:
+        heading: Termos do contribuínte
+        agreed: Aceptaches os novos termos do contribuínte.
+        not yet agreed: Aínda non aceptaches os novos termos do contribuínte.
+        review link text: Siga esta ligazón para revisar e aceptar os novos termos
+          do contribuínte.
+        agreed_with_pd: Tamén declarou que coida que as súas edicións pertencen ó
+          dominio público.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: que é isto?
+      save changes button: Gardar as modificacións
+      make edits public button: Facer públicas tódalas miñas edicións
+    update:
+      success_confirm_needed: Información de usuario actualizada de xeito correcto.
+        Procura no teu correo electrónico unha mensaxe para confirmar o teu novo enderezo.
+      success: Información de usuario actualizada correctamente.
   browse:
     created: Creado
     closed: Pechado
@@ -2686,48 +2729,6 @@ gl:
       delete_user: Eliminar este usuario
       confirm: Confirmar
       report: Denunciar este usuario
-    account:
-      title: Editar a conta
-      my settings: Os meus axustes
-      current email address: Enderezo de correo electrónico actual
-      external auth: Autenticación externa
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: que é isto?
-      public editing:
-        heading: Edición pública
-        enabled: Activado. Non es anónimo e podes editar os datos.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: que é isto?
-        disabled: Desactivado e non pode editar os datos. Tódalas anteriores edicións
-          son anónimas.
-        disabled link text: por que non podo editar?
-      public editing note:
-        heading: Edición pública
-        html: Actualmente, as túas edicións son anónimas e a xente non che pode enviar
-          mensaxes ou ollar a túa localización. Para amosar o que editaches e permitir
-          que a xente se poña en contacto contigo mediante a páxina web, preme no
-          botón que aparece deseguido. <b>Dende a migración da API á versión 0.6,
-          tan só os usuarios públicos poden editar os datos do mapa</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">máis
-          información</a>).<ul><li>Os enderezos de correo electrónico non se farán
-          públicos.</li><li>Non é posíbel reverter esta acción e agora os novos usuarios
-          xa son públicos por defecto.</li></ul>
-      contributor terms:
-        heading: Termos do contribuínte
-        agreed: Aceptaches os novos termos do contribuínte.
-        not yet agreed: Aínda non aceptaches os novos termos do contribuínte.
-        review link text: Siga esta ligazón para revisar e aceptar os novos termos
-          do contribuínte.
-        agreed_with_pd: Tamén declarou que coida que as súas edicións pertencen ó
-          dominio público.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: que é isto?
-      save changes button: Gardar as modificacións
-      make edits public button: Facer públicas tódalas miñas edicións
-      flash update success confirm needed: Información de usuario actualizada de xeito
-        correcto. Procura no teu correo electrónico unha mensaxe para confirmar o
-        teu novo enderezo.
-      flash update success: Información de usuario actualizada correctamente.
     set_home:
       flash success: Gardouse o domicilio
     go_public:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index eb0dd62ca..e61efbacf 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -299,6 +299,46 @@ he:
       entry:
         comment: תגובה
         full: הערה מלאה
+  accounts:
+    edit:
+      title: עריכת חשבון
+      my settings: ההגדרות שלי
+      current email address: כתובת דוא״ל נוכחית
+      external auth: אימות חיצוני
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: מה זה?
+      public editing:
+        heading: עריכה ציבורית
+        enabled: מופעלת. לא אלמוני ויכול לערוך מידע.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: מה זה?
+        disabled: לא מופעלת, אין אפשרות לערוך נתונים וכל העריכות הקודמות אלמוניות.
+        disabled link text: מדוע איני יכול לערוך?
+      public editing note:
+        heading: עריכה ציבורית
+        html: כעת העריכות שלך אלמוניות ואנשים לא יכולים לשלוח לך הודעות או לראות את
+          המיקום שלך. כדי להציג מה ערכת ולאפשר לאנשים ליצור אתך קשר דרך האתר, יש ללחוץ
+          על הכפתור למטה. <b>מאז השינוי ב־API בגרסה 0.6, רק משתמשים ציבוריים יכולים
+          לערוך נתוני מפה</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">הסבר
+          למה זה ככה</a>).<ul><li>כתובת הדוא"ל שלך לא תיחשף כתוצאה מזה שתהיה משתמש
+          ציבורי.</li><li>לא ניתן להפוך את הפעולה הזאת וכל המשתמשים החדשים יהיו מעתה
+          ציבוריים לפי ברירת המחדל.</li></ul>
+      contributor terms:
+        heading: תנאי תרומה
+        agreed: הסכמת לתנאי התרומה החדשים.
+        not yet agreed: עדיין לא הסכמת לתנאי התרומה החדשים.
+        review link text: נא לעבור לקישור הזה בזמנך הפנוי כדי לסקור ולקבל את תנאי
+          התרומה החדשים.
+        agreed_with_pd: הצהרת גם שמבחינתך העריכות שלך יהיו בנחלת הכלל.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: מה זה?
+      save changes button: שמירת השינויים
+      make edits public button: להפוך את כל עריכותיי לציבוריות
+    update:
+      success_confirm_needed: מידע על המשתמש עודכן בהצלחה. נא לבדוק את תיבת הדוא"ל
+        כדי לאמת את הדוא"ל החדש.
+      success: פרטי המשתמש עודכנו בהצלחה.
   browse:
     created: נוצרה
     closed: נסגרה
@@ -2668,44 +2708,6 @@ he:
       delete_user: מחיקת משתמש זה
       confirm: אישור
       report: דיווח על המשתמש
-    account:
-      title: עריכת חשבון
-      my settings: ההגדרות שלי
-      current email address: כתובת דוא״ל נוכחית
-      external auth: אימות חיצוני
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: מה זה?
-      public editing:
-        heading: עריכה ציבורית
-        enabled: מופעלת. לא אלמוני ויכול לערוך מידע.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: מה זה?
-        disabled: לא מופעלת, אין אפשרות לערוך נתונים וכל העריכות הקודמות אלמוניות.
-        disabled link text: מדוע איני יכול לערוך?
-      public editing note:
-        heading: עריכה ציבורית
-        html: כעת העריכות שלך אלמוניות ואנשים לא יכולים לשלוח לך הודעות או לראות את
-          המיקום שלך. כדי להציג מה ערכת ולאפשר לאנשים ליצור אתך קשר דרך האתר, יש ללחוץ
-          על הכפתור למטה. <b>מאז השינוי ב־API בגרסה 0.6, רק משתמשים ציבוריים יכולים
-          לערוך נתוני מפה</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">הסבר
-          למה זה ככה</a>).<ul><li>כתובת הדוא"ל שלך לא תיחשף כתוצאה מזה שתהיה משתמש
-          ציבורי.</li><li>לא ניתן להפוך את הפעולה הזאת וכל המשתמשים החדשים יהיו מעתה
-          ציבוריים לפי ברירת המחדל.</li></ul>
-      contributor terms:
-        heading: תנאי תרומה
-        agreed: הסכמת לתנאי התרומה החדשים.
-        not yet agreed: עדיין לא הסכמת לתנאי התרומה החדשים.
-        review link text: נא לעבור לקישור הזה בזמנך הפנוי כדי לסקור ולקבל את תנאי
-          התרומה החדשים.
-        agreed_with_pd: הצהרת גם שמבחינתך העריכות שלך יהיו בנחלת הכלל.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: מה זה?
-      save changes button: שמירת השינויים
-      make edits public button: להפוך את כל עריכותיי לציבוריות
-      flash update success confirm needed: מידע על המשתמש עודכן בהצלחה. נא לבדוק את
-        תיבת הדוא"ל כדי לאמת את הדוא"ל החדש.
-      flash update success: פרטי המשתמש עודכנו בהצלחה.
     set_home:
       flash success: מיקום ראשי נשמר בהצלחה
     go_public:
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 24fa33131..4cefa721e 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -237,6 +237,15 @@ hi:
       entry:
         comment: टिप्पणी
         full: पूरा नोट
+  accounts:
+    edit:
+      public editing:
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: यह क्या है?
+        disabled link text: मैं नक्षे में बदलाव क्यों नहीं कर पा रहा हूँ?
+      contributor terms:
+        link text: यह क्या है?
+      save changes button: बदलाव सहेजें
   browse:
     created: बनाया गया
     closed: बंद किया गया
@@ -1019,14 +1028,6 @@ hi:
     new:
       deny: मना
   users:
-    account:
-      public editing:
-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        enabled link text: यह क्या है?
-        disabled link text: मैं नक्षे में बदलाव क्यों नहीं कर पा रहा हूँ?
-      contributor terms:
-        link text: यह क्या है?
-      save changes button: बदलाव सहेजें
     index:
       title: सदस्य
       heading: सदस्य
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 44c67f07e..3171356fc 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -234,6 +234,45 @@ hr:
       entry:
         comment: Komentar
         full: Cijela bilješka
+  accounts:
+    edit:
+      title: Uredi korisnički račun
+      my settings: Moje postavke
+      current email address: 'Trenutna E-mail adresa:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: Å¡to je ovo?
+      public editing:
+        heading: Javno uređivanje
+        enabled: Omogućeno. Nije anonimno i mogu se uređivati podaci.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Å¡to je ovo?
+        disabled: Onemogućno i ne mogu se uređivati podaci, sve prethodne promjene
+          su anonimne.
+        disabled link text: zašto ne mogu uređivati?
+      public editing note:
+        heading: 'Javno uređivanje:'
+        html: Trenutno su vaše izmjene anonimne i ljudi vam ne mogu poslati poruke
+          ili vidjeti vašu lokaciju. Da bi pokazali vaše izmjene i dozvolili ljudima
+          da vas kontaktiraju preko website-a, kliknite gumb ispod <b>Od promjene
+          0.6 API-a, samo javni korisnici mogu uređivati karte</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">saznajte
+          zašto</a>).<ul> <li>Vaša email adrea neće biti otkrivena ako postanete javni.</li>
+          <li>Ova akcija se ne može poništiti i svi novi korisnici su postavljeni
+          kao javni.</li> </ul>
+      contributor terms:
+        heading: 'Uvjeti doprinositelja:'
+        agreed: Prihvatio/la si nove Uvjete doprinositelja.
+        not yet agreed: Niste još uvijek prihvatili nove uvjete doprinositelja.
+        review link text: Molim slijedi ovu poveznicu kada budeš u prilici za pregled
+          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?
+      save changes button: Snimi promjene
+      make edits public button: Napravi sve moje promjene javnim
+    update:
+      success_confirm_needed: Korisničke informacije su uspješno ažurirane. Provjeri
+        email za poruku potvrde nove email adrese.
+      success: Korisničke informacije su uspješno ažurirane.
   browse:
     created: Stvoreno
     closed: Zatvoreno
@@ -1805,43 +1844,6 @@ hr:
       delete_user: Obriši ovog korisnika
       confirm: Potvrdi
       report: Prijavi ovog korisnika
-    account:
-      title: Uredi korisnički račun
-      my settings: Moje postavke
-      current email address: 'Trenutna E-mail adresa:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: Å¡to je ovo?
-      public editing:
-        heading: 'Javno uređivanje:'
-        enabled: Omogućeno. Nije anonimno i mogu se uređivati podaci.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Å¡to je ovo?
-        disabled: Onemogućno i ne mogu se uređivati podaci, sve prethodne promjene
-          su anonimne.
-        disabled link text: zašto ne mogu uređivati?
-      public editing note:
-        heading: Javno uređivanje
-        html: Trenutno su vaše izmjene anonimne i ljudi vam ne mogu poslati poruke
-          ili vidjeti vašu lokaciju. Da bi pokazali vaše izmjene i dozvolili ljudima
-          da vas kontaktiraju preko website-a, kliknite gumb ispod <b>Od promjene
-          0.6 API-a, samo javni korisnici mogu uređivati karte</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">saznajte
-          zašto</a>).<ul> <li>Vaša email adrea neće biti otkrivena ako postanete javni.</li>
-          <li>Ova akcija se ne može poništiti i svi novi korisnici su postavljeni
-          kao javni.</li> </ul>
-      contributor terms:
-        heading: 'Uvjeti doprinositelja:'
-        agreed: Prihvatio/la si nove Uvjete doprinositelja.
-        not yet agreed: Niste još uvijek prihvatili nove uvjete doprinositelja.
-        review link text: Molim slijedi ovu poveznicu kada budeš u prilici za pregled
-          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?
-      save changes button: Snimi promjene
-      make edits public button: Napravi sve moje promjene javnim
-      flash update success confirm needed: Korisničke informacije su uspješno ažurirane.
-        Provjeri email za poruku potvrde nove email adrese.
-      flash update success: Korisničke informacije su uspješno ažurirane.
     set_home:
       flash success: Lokacija doma uspješno snimljena.
     go_public:
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 446488987..4deb0fea8 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -234,6 +234,47 @@ hsb:
       entry:
         comment: Komentar
         full: Dospołna pokazka
+  accounts:
+    edit:
+      title: Konto wobdźěłać
+      my settings: Moje nastajenja
+      current email address: Aktualna e-mejlowa adresa
+      external auth: Eksterna awtentifikacija
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: Å to to je?
+      public editing:
+        heading: Zjawne wobdźěłowanje
+        enabled: Zmóžnjene. Nic anonymne a daty hodźa so wobdźěłać.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Å to to je?
+        disabled: Znjemóžnjeny a daty njehodźa so wobdźěłać, wšě prjedawše změny su
+          anonymne.
+        disabled link text: čehodla njemóžu wobdźěłać?
+      public editing note:
+        heading: Zjawne wobdźěłowanje
+        html: Tuchwilu twoje změny su anonymne a ludźo njemóžeja ći powěsće pósłać
+          abo twoje stejnišćo widźeć. Zo by pokazał, štož sy wobdźěłał a ludźom dowolił,
+          so z tobu přez websydło do zwiska stajić, klikń deleka na tłóčatko. <b>Wot
+          přeńdźenja do API 0.6, jenož zjawni wužiwarjo móžeja kartowe daty wobdźěłać</b>.
+          (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">hlej přičiny</a>).<ul><li>Twoja
+          e-mejlowa adresa njebudźe so zjawnej pokazać.</li><li>Tuta akcija njeda
+          so wobroćić a wšitcy nowi wužiwarjo su nětko po standardźe zjawni.</li></ul>
+      contributor terms:
+        heading: Wuměnjenja za sobuskutkowarjow
+        agreed: Sy do nowych wuměnjenjow za sobuskutkowarjow zwolił.
+        not yet agreed: Hišće njejsy do nowych wuměnjenjow za sobuskutkowarjow zwolił.
+        review link text: Prošu slěduj někajkižkuli wotkaz, zo by nowe wuměnjenja
+          za sobuskutkowarjow přehladał a akceptował.
+        agreed_with_pd: Sy tež deklarował, zo twoje změny su zjawne.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Å¡to to je?
+      save changes button: Změny składować
+      make edits public button: Wšě moje změny zjawne činić
+    update:
+      success_confirm_needed: Wužiwarske informacije wuspěšnje zaktualizowane. Dóstanješ
+        e-mejl z namołwu, swoju nowu e-mejlowu adresu wobkrućić.
+      success: Wužiwarske informacije wuspěšnje zaktualizowane.
   browse:
     created: Wutworjeny
     closed: 'Začinjeny:'
@@ -2564,45 +2605,6 @@ hsb:
       delete_user: Tutoho wužiwarja zhašeć
       confirm: Wobkrućić
       report: Tutoho wužiwarja zdźělić
-    account:
-      title: Konto wobdźěłać
-      my settings: Moje nastajenja
-      current email address: Aktualna e-mejlowa adresa
-      external auth: Eksterna awtentifikacija
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: Å to to je?
-      public editing:
-        heading: Zjawne wobdźěłowanje
-        enabled: Zmóžnjene. Nic anonymne a daty hodźa so wobdźěłać.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Å to to je?
-        disabled: Znjemóžnjeny a daty njehodźa so wobdźěłać, wšě prjedawše změny su
-          anonymne.
-        disabled link text: čehodla njemóžu wobdźěłać?
-      public editing note:
-        heading: Zjawne wobdźěłowanje
-        html: Tuchwilu twoje změny su anonymne a ludźo njemóžeja ći powěsće pósłać
-          abo twoje stejnišćo widźeć. Zo by pokazał, štož sy wobdźěłał a ludźom dowolił,
-          so z tobu přez websydło do zwiska stajić, klikń deleka na tłóčatko. <b>Wot
-          přeńdźenja do API 0.6, jenož zjawni wužiwarjo móžeja kartowe daty wobdźěłać</b>.
-          (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">hlej přičiny</a>).<ul><li>Twoja
-          e-mejlowa adresa njebudźe so zjawnej pokazać.</li><li>Tuta akcija njeda
-          so wobroćić a wšitcy nowi wužiwarjo su nětko po standardźe zjawni.</li></ul>
-      contributor terms:
-        heading: Wuměnjenja za sobuskutkowarjow
-        agreed: Sy do nowych wuměnjenjow za sobuskutkowarjow zwolił.
-        not yet agreed: Hišće njejsy do nowych wuměnjenjow za sobuskutkowarjow zwolił.
-        review link text: Prošu slěduj někajkižkuli wotkaz, zo by nowe wuměnjenja
-          za sobuskutkowarjow přehladał a akceptował.
-        agreed_with_pd: Sy tež deklarował, zo twoje změny su zjawne.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Å¡to to je?
-      save changes button: Změny składować
-      make edits public button: Wšě moje změny zjawne činić
-      flash update success confirm needed: Wužiwarske informacije wuspěšnje zaktualizowane.
-        Dóstanješ e-mejl z namołwu, swoju nowu e-mejlowu adresu wobkrućić.
-      flash update success: Wužiwarske informacije wuspěšnje zaktualizowane.
     set_home:
       flash success: Domjace stejnišćo bu wuspěšnje składowany
     go_public:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 72ef09dd3..9fdef14e4 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -272,6 +272,49 @@ hu:
       entry:
         comment: Hozzászólás
         full: Teljes jegyzet
+  accounts:
+    edit:
+      title: Fiók szerkesztése
+      my settings: Személyes beállítások
+      current email address: Jelenlegi e-mail-cím
+      external auth: Külső hitelesítés
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: mi ez?
+      public editing:
+        heading: Nyilvános szerkesztés
+        enabled: Engedélyezve. Nem vagy névtelen, így szerkesztheted az adatokat.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: mi ez?
+        disabled: Tiltva, így nem szerkesztheted az adatokat, az összes eddigi szerkesztés
+          névtelen.
+        disabled link text: miért nem tudok szerkeszteni?
+      public editing note:
+        heading: Nyilvános szerkesztés
+        html: Jelenleg a szerkesztéseid névtelenek, és az emberek nem küldhetnek neked
+          üzeneteket, és nem láthatják a tartózkodási helyedet. Hogy megmutasd, mit
+          szerkesztettél, és megengedd az embereknek, hogy a webhelyen keresztül kapcsolatba
+          lépjenek veled, kattints az alábbi gombra. <b>A 0.6 API-ra történt átállás
+          óta csak nyilvános felhasználók szerkeszthetik a térképadatokat</b>. (<a
+          href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">nézz utána, miért</a>).<ul><li>Az
+          e-mail címed nem kerül felfedésre azzal, hogy nyilvános leszel.</li><li>Ez
+          a művelet nem vonható vissza, és alapértelmezésben az összes új felhasználó
+          már nyilvános.</li></ul>
+      contributor terms:
+        heading: Hozzájárulási feltételek
+        agreed: Elfogadtad az új hozzájárulási feltételeket.
+        not yet agreed: Még nem fogadtad el az új hozzájárulási feltételeket.
+        review link text: Kérjük, kövesd ezt a hivatkozást az új közreműködési feltételek
+          áttekintéséhez és elfogadásához.
+        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?
+      save changes button: Módosítások mentése
+      make edits public button: Az összes szerkesztésem nyilvánossá tétele
+    update:
+      success_confirm_needed: Felhasználói információk sikeresen frissítve. Nézd meg
+        az e-mailjeidet az új e-mail címedet megerősítő levélhez.
+      success: Felhasználói információk sikeresen frissítve.
   browse:
     created: Létrehozva
     closed: Lezárva
@@ -545,6 +588,9 @@ hu:
         title: OpenStreetMap naplóbejegyzések
         description: Legutóbbi naplóbejegyzések az OpenStreetMap felhasználóitól
     comments:
+      title: '%{user} naplóhozzászólásai'
+      heading: '%{user} naplóhozzászólásai'
+      subheading_html: '%{user} naplóhozzászólásai'
       no_comments: Nincs naplóhozzászólás
       post: Bejegyzés
       when: Mikor
@@ -869,6 +915,7 @@ hu:
           trailhead: Turistaút végpontja
           trunk: Autóút
           trunk_link: Autóút fel- vagy lehajtó
+          turning_circle: Megfordulókör
           turning_loop: Megfordulóhurok
           unclassified: Egyéb közút
           "yes": Út
@@ -2464,6 +2511,8 @@ hu:
       read_gpx: Magán nyomvonalak olvasása
       write_gpx: GPS-nyomvonalak feltöltése
       write_notes: Jegyzetek módosítása
+      read_email: Felhasználó e-mail-címének elolvasása
+      skip_authorization: Alkalmazás automatikus jóváhagyása
   oauth_clients:
     new:
       title: Új alkalmazás regisztrálása
@@ -2674,47 +2723,6 @@ hu:
       delete_user: felhasználó törlése
       confirm: Megerősítés
       report: Felhasználó bejelentése
-    account:
-      title: Fiók szerkesztése
-      my settings: Személyes beállítások
-      current email address: Jelenlegi e-mail-cím
-      external auth: Külső hitelesítés
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: mi ez?
-      public editing:
-        heading: Nyilvános szerkesztés
-        enabled: Engedélyezve. Nem vagy névtelen, így szerkesztheted az adatokat.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: mi ez?
-        disabled: Tiltva, így nem szerkesztheted az adatokat, az összes eddigi szerkesztés
-          névtelen.
-        disabled link text: miért nem tudok szerkeszteni?
-      public editing note:
-        heading: Nyilvános szerkesztés
-        html: Jelenleg a szerkesztéseid névtelenek, és az emberek nem küldhetnek neked
-          üzeneteket, és nem láthatják a tartózkodási helyedet. Hogy megmutasd, mit
-          szerkesztettél, és megengedd az embereknek, hogy a webhelyen keresztül kapcsolatba
-          lépjenek veled, kattints az alábbi gombra. <b>A 0.6 API-ra történt átállás
-          óta csak nyilvános felhasználók szerkeszthetik a térképadatokat</b>. (<a
-          href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">nézz utána, miért</a>).<ul><li>Az
-          e-mail címed nem kerül felfedésre azzal, hogy nyilvános leszel.</li><li>Ez
-          a művelet nem vonható vissza, és alapértelmezésben az összes új felhasználó
-          már nyilvános.</li></ul>
-      contributor terms:
-        heading: Hozzájárulási feltételek
-        agreed: Elfogadtad az új hozzájárulási feltételeket.
-        not yet agreed: Még nem fogadtad el az új hozzájárulási feltételeket.
-        review link text: Kérjük, kövesd ezt a hivatkozást az új közreműködési feltételek
-          áttekintéséhez és elfogadásához.
-        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?
-      save changes button: Módosítások mentése
-      make edits public button: Az összes szerkesztésem nyilvánossá tétele
-      flash update success confirm needed: Felhasználói információk sikeresen frissítve.
-        Nézd meg az e-mailjeidet az új e-mail címedet megerősítő levélhez.
-      flash update success: Felhasználói információk sikeresen frissítve.
     set_home:
       flash success: Otthon helye sikeresen mentve
     go_public:
@@ -2750,6 +2758,7 @@ hu:
       no_authorization_code: Nem engedély kód
       unknown_signature_algorithm: Ismeretlen aláírási algoritmus
       invalid_scope: Érvénytelen kód
+      unknown_error: A hitelesítés sikertelen
     auth_association:
       heading: Az azonosítódhoz még nem tartozik OpenStreetMap fiók.
       option_1: Ha most vagy itt először, készíts magadnak egy OpenStreetMap-fiókot
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 7d7ae3d15..5167146e8 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -248,6 +248,49 @@ ia:
       entry:
         comment: Commento
         full: Nota complete
+  accounts:
+    edit:
+      title: Modificar conto
+      my settings: Mi configurationes
+      current email address: Adresse de e-mail actual
+      external auth: Authentication externe
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: que es isto?
+      public editing:
+        heading: Modification public
+        enabled: Activate. Non anonyme e pote modificar datos.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: que es isto?
+        disabled: Disactivate e non pote modificar datos, tote le previe modificationes
+          es anonyme.
+        disabled link text: proque non pote io modificar?
+      public editing note:
+        heading: Modification public
+        html: A iste momento tu modificationes es anonyme, e le gente non pote inviar
+          te messages ni vider tu position. Pro poter monstrar tu contributiones e
+          pro permitter al gente de contactar te per le sito web, clicca le button
+          ci infra. <b>Post le cambio al API 0.6, solo le usatores public pote modificar
+          datos cartographic</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">lege
+          proque</a>).<ul><li>Tu adresse de e-mail non essera revelate si tu deveni
+          public.</li><li>Iste action non pote esser revertite e tote le nove usatores
+          es ora public per predefinition.</li></ul>
+      contributor terms:
+        heading: Conditiones de contributor
+        agreed: Tu ha acceptate le nove Conditiones de Contributor.
+        not yet agreed: Tu non ha ancora acceptate le nove Conditiones de Contributor.
+        review link text: Per favor seque iste ligamine a tu convenientia pro revider
+          e acceptar le nove Conditiones de Contributor.
+        agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
+          liberate al Dominio Public.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: que es isto?
+      save changes button: Salveguardar modificationes
+      make edits public button: Render tote mi modificationes public
+    update:
+      success_confirm_needed: Informationes del usator actualisate con successo. Tu
+        recipera in e-mail un nota pro confirmar tu nove adresse de e-mail.
+      success: Informationes del usator actualisate con successo.
   browse:
     created: Create a
     closed: Claudite a
@@ -2667,47 +2710,6 @@ ia:
       delete_user: Deler iste usator
       confirm: Confirmar
       report: Signalar iste usator
-    account:
-      title: Modificar conto
-      my settings: Mi configurationes
-      current email address: Adresse de e-mail actual
-      external auth: Authentication externe
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: que es isto?
-      public editing:
-        heading: Modification public
-        enabled: Activate. Non anonyme e pote modificar datos.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: que es isto?
-        disabled: Disactivate e non pote modificar datos, tote le previe modificationes
-          es anonyme.
-        disabled link text: proque non pote io modificar?
-      public editing note:
-        heading: Modification public
-        html: A iste momento tu modificationes es anonyme, e le gente non pote inviar
-          te messages ni vider tu position. Pro poter monstrar tu contributiones e
-          pro permitter al gente de contactar te per le sito web, clicca le button
-          ci infra. <b>Post le cambio al API 0.6, solo le usatores public pote modificar
-          datos cartographic</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">lege
-          proque</a>).<ul><li>Tu adresse de e-mail non essera revelate si tu deveni
-          public.</li><li>Iste action non pote esser revertite e tote le nove usatores
-          es ora public per predefinition.</li></ul>
-      contributor terms:
-        heading: Conditiones de contributor
-        agreed: Tu ha acceptate le nove Conditiones de Contributor.
-        not yet agreed: Tu non ha ancora acceptate le nove Conditiones de Contributor.
-        review link text: Per favor seque iste ligamine a tu convenientia pro revider
-          e acceptar le nove Conditiones de Contributor.
-        agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
-          liberate al Dominio Public.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: que es isto?
-      save changes button: Salveguardar modificationes
-      make edits public button: Render tote mi modificationes public
-      flash update success confirm needed: Informationes del usator actualisate con
-        successo. Tu recipera in e-mail un nota pro confirmar tu nove adresse de e-mail.
-      flash update success: Informationes del usator actualisate con successo.
     set_home:
       flash success: Position de origine confirmate con successo
     go_public:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 610cb7ccf..7fbec59a6 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -256,6 +256,49 @@ id:
       entry:
         comment: Komentar
         full: Catatan lengkap
+  accounts:
+    edit:
+      title: Edit akun
+      my settings: Pengaturan saya
+      current email address: Alamat surel saat ini
+      external auth: Autentikasi Eksternal
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: Apa ini?
+      public editing:
+        heading: Mengedit secara publik
+        enabled: Diaktifkan. Tidak anonim dan dapat mengedit data.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Apa ini?
+        disabled: Dinonaktifkan dan tidak dapat mengedit data, seluruh hasil edit
+          sebelumnya anonim.
+        disabled link text: mengapa saya tidak bisa mengedit?
+      public editing note:
+        heading: Menyunting secara publik
+        html: Saat ini suntingan Anda adalah tanpa nama dan orang tidak dapat mengirimkan
+          pesan atau melihat lokasi Anda. Untuk menunjukkan apa yang Anda telah edit
+          dan memungkinkan orang menghubungi Anda melalui situs web, klik tombol di
+          bawah ini. <b>Sejak perubahan ke API 0.6 , hanya pengguna umum yang dapat
+          mengedit data peta</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Cari
+          tahu mengapa</a>).<ul><li>Alamat email Anda akan tidak dipublikasikan apabila
+          anda menjadi pengguna umum.</li><li>Tindakan ini tidak dapat dikembalikan
+          dan semua pengguna baru akan diatur sebagai pengguna umum secara standar.</li></ul>
+      contributor terms:
+        heading: Syarat-syarat Kontributor
+        agreed: Anda telah menyetujui Persyaratan Kontributor yang baru.
+        not yet agreed: Anda belum menyetujui Persyaratan Kontributor yang baru.
+        review link text: Silahkan ikuti link ini untuk kenyamanan Anda untuk meninjau
+          dan menyetujui Persyaratan Kontributor yang baru.
+        agreed_with_pd: Anda juga telah menyatakan bahwa Anda mempertimbangkan suntingan
+          Anda berada dalam Domain publik.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Apa ini?
+      save changes button: Simpan Perubahan
+      make edits public button: Membuat seluruh suntingan saya menjadi publik
+    update:
+      success_confirm_needed: Informasi pengguna telah berhasil diperbarui. Periksa
+        email untuk melakukan konfirmasi alamat email.
+      success: Informasi mengenai pengguna sudah berhasil diperbarui.
   browse:
     created: Dibuat
     closed: Ditutup
@@ -2435,47 +2478,6 @@ id:
       delete_user: Hapus Pengguna Ini
       confirm: Konfirmasi
       report: Laporkan Pengguna Ini
-    account:
-      title: Edit akun
-      my settings: Pengaturan saya
-      current email address: Alamat surel saat ini
-      external auth: Autentikasi Eksternal
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: Apa ini?
-      public editing:
-        heading: Menyunting secara publik
-        enabled: Diaktifkan. Tidak anonim dan dapat mengedit data.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Apa ini?
-        disabled: Dinonaktifkan dan tidak dapat mengedit data, seluruh hasil edit
-          sebelumnya anonim.
-        disabled link text: mengapa saya tidak bisa mengedit?
-      public editing note:
-        heading: Mengedit secara publik
-        html: Saat ini suntingan Anda adalah tanpa nama dan orang tidak dapat mengirimkan
-          pesan atau melihat lokasi Anda. Untuk menunjukkan apa yang Anda telah edit
-          dan memungkinkan orang menghubungi Anda melalui situs web, klik tombol di
-          bawah ini. <b>Sejak perubahan ke API 0.6 , hanya pengguna umum yang dapat
-          mengedit data peta</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Cari
-          tahu mengapa</a>).<ul><li>Alamat email Anda akan tidak dipublikasikan apabila
-          anda menjadi pengguna umum.</li><li>Tindakan ini tidak dapat dikembalikan
-          dan semua pengguna baru akan diatur sebagai pengguna umum secara standar.</li></ul>
-      contributor terms:
-        heading: Syarat-syarat Kontributor
-        agreed: Anda telah menyetujui Persyaratan Kontributor yang baru.
-        not yet agreed: Anda belum menyetujui Persyaratan Kontributor yang baru.
-        review link text: Silahkan ikuti link ini untuk kenyamanan Anda untuk meninjau
-          dan menyetujui Persyaratan Kontributor yang baru.
-        agreed_with_pd: Anda juga telah menyatakan bahwa Anda mempertimbangkan suntingan
-          Anda berada dalam Domain publik.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Apa ini?
-      save changes button: Simpan Perubahan
-      make edits public button: Membuat seluruh suntingan saya menjadi publik
-      flash update success confirm needed: Informasi pengguna telah berhasil diperbarui.
-        Periksa email untuk melakukan konfirmasi alamat email.
-      flash update success: Informasi mengenai pengguna sudah berhasil diperbarui.
     set_home:
       flash success: Lokasi rumah berhasil disimpan
     go_public:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index c3540ca65..220c56794 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -235,6 +235,52 @@ is:
       entry:
         comment: Athugasemd
         full: Allur minnispunkturinn
+  accounts:
+    edit:
+      title: Stillingar
+      my settings: Mínar stillingar
+      current email address: Núverandi póstfang
+      external auth: Ytri auðkenning
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: hvað er openID?
+      public editing:
+        heading: Nafngreindar breytingar
+        enabled: Nei, nafngreindur og getur breytt gögnum.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Hvað er þetta?
+        disabled: Óvirkur og getur ekki breytt gögnum, allar fyrri breytingar eru
+          ónafngreindar.
+        disabled link text: hví get ég ekki breytt neinu?
+      public editing note:
+        heading: Opinberar breytingar
+        html: Breytingarnar þínar eru núna ónafngreindar þannig að aðrir notendur
+          geta ekki sent þér skilaboð eða séð staðsetningu þína. Til þess að breytingar
+          þínar sjáist og að fólk geti haft samband við þig í gegnum vefsvæðið, smelltu
+          þá á hnappinn hér fyrir neðan. <b>Eftir að breytingar urðu vegna 0.6 API
+          forritunarviðmótsins, geta einungis opinberir notendur breytt kortagögnum</b>.
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sjáðu hvers
+          vegna</a>).<ul><li>Þótt þú gerist opinber notandi, verður netfangið þitt
+          ekki birt opinberlega.</li><li>Þessa aðgerð er ekki hægt að afturkalla og
+          allir nýir notendur eru sjálfgefið opinberir.</li></ul>
+      contributor terms:
+        heading: Skilmálar vegna framlags
+        agreed: Þú hefur samþykkt nýju skilmálana vegna framlags þíns.
+        not yet agreed: Þú hefur ekki ennþá samþykkt nýju skilmálana vegna framlags
+          þíns.
+        review link text: Þegar þér hentar skaltu endilega lesa og samþykkja nýju
+          skilmálana vegna framlags þíns.
+        agreed_with_pd: Þú hefur einnig lýst því yfir að breytingar þínar verði í
+          almenningseigu (Public Domain).
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Hvað er þetta?
+      save changes button: Vista breytingar
+      make edits public button: Gera allar breytingarnar mínar opinberar
+    update:
+      success_confirm_needed: Stillingarnar þínar voru uppfærðar. Póstur var sendur
+        á netfangið þitt sem þú þarft að bregðast við til að netfangið þitt verði
+        staðfest.
+      success: Stillingarnar þínar voru uppfærðar.
   browse:
     created: Búið til
     closed: Lokað
@@ -2515,50 +2561,6 @@ is:
       delete_user: Eyða þessum notanda
       confirm: Staðfesta
       report: Tilkynna þennan notanda
-    account:
-      title: Stillingar
-      my settings: Mínar stillingar
-      current email address: Núverandi póstfang
-      external auth: Ytri auðkenning
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: hvað er openID?
-      public editing:
-        heading: Opinberar breytingar
-        enabled: Nei, nafngreindur og getur breytt gögnum.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Hvað er þetta?
-        disabled: Óvirkur og getur ekki breytt gögnum, allar fyrri breytingar eru
-          ónafngreindar.
-        disabled link text: hví get ég ekki breytt neinu?
-      public editing note:
-        heading: Nafngreindar breytingar
-        html: Breytingarnar þínar eru núna ónafngreindar þannig að aðrir notendur
-          geta ekki sent þér skilaboð eða séð staðsetningu þína. Til þess að breytingar
-          þínar sjáist og að fólk geti haft samband við þig í gegnum vefsvæðið, smelltu
-          þá á hnappinn hér fyrir neðan. <b>Eftir að breytingar urðu vegna 0.6 API
-          forritunarviðmótsins, geta einungis opinberir notendur breytt kortagögnum</b>.
-          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sjáðu hvers
-          vegna</a>).<ul><li>Þótt þú gerist opinber notandi, verður netfangið þitt
-          ekki birt opinberlega.</li><li>Þessa aðgerð er ekki hægt að afturkalla og
-          allir nýir notendur eru sjálfgefið opinberir.</li></ul>
-      contributor terms:
-        heading: Skilmálar vegna framlags
-        agreed: Þú hefur samþykkt nýju skilmálana vegna framlags þíns.
-        not yet agreed: Þú hefur ekki ennþá samþykkt nýju skilmálana vegna framlags
-          þíns.
-        review link text: Þegar þér hentar skaltu endilega lesa og samþykkja nýju
-          skilmálana vegna framlags þíns.
-        agreed_with_pd: Þú hefur einnig lýst því yfir að breytingar þínar verði í
-          almenningseigu (Public Domain).
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Hvað er þetta?
-      save changes button: Vista breytingar
-      make edits public button: Gera allar breytingarnar mínar opinberar
-      flash update success confirm needed: Stillingarnar þínar voru uppfærðar. Póstur
-        var sendur á netfangið þitt sem þú þarft að bregðast við til að netfangið
-        þitt verði staðfest.
-      flash update success: Stillingarnar þínar voru uppfærðar.
     set_home:
       flash success: Staðsetning þín hefur verið stillt
     go_public:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 7ded64ca5..1e4a1123e 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -299,6 +299,49 @@ it:
       entry:
         comment: Commento
         full: Nota completa
+  accounts:
+    edit:
+      title: Modifica profilo
+      my settings: Impostazioni
+      current email address: Indirizzo email attuale
+      external auth: Autenticazione esterna
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/IT:OpenID
+        link text: che cos'è questo?
+      public editing:
+        heading: Modifica pubblica
+        enabled: Abilitate. Non anonimo con il permesso di modificare i dati.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: che cos'è questo?
+        disabled: Disabilitate senza il permesso di modificare i dati, tutte le modifiche
+          precedenti sono anonime.
+        disabled link text: perché non posso modificare?
+      public editing note:
+        heading: Modifica pubblica
+        html: Al momento le tue modifiche sono anonime e le persone non possono inviarti
+          messaggi o vedere la tua posizione. Per rendere visibili le tue modifiche
+          e per permettere agli altri utenti di contattarti tramite il sito, clicca
+          sul pulsante sotto. <b>Dalla versione 0.6 delle API, soltanto gli utenti
+          pubblici possono modificare i dati della mappa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">scopri
+          perché</a>).<ul><li>Il tuo indirizzo email non sarà reso pubblico.</li><li>Questa
+          decisione non può essere revocata e tutti i nuovi utenti sono ora pubblici
+          in modo predefinito.</li></ul>
+      contributor terms:
+        heading: Regole per contribuire
+        agreed: Hai accettato le nuove regole per contribuire.
+        not yet agreed: Non hai ancora accettato le nuove regole per contribuire.
+        review link text: Quando puoi segui per favore questo link per leggere ed
+          accettare le nuove regole per contribuire.
+        agreed_with_pd: Hai anche dichiarato di considerare le tue modifiche come
+          fossero di pubblico dominio.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: che cos'è questo?
+      save changes button: Salva modifiche
+      make edits public button: Rendi pubbliche tutte le mie modifiche
+    update:
+      success_confirm_needed: Informazioni sull'utente aggiornate con successo. Controllare
+        la propria email per la conferma del nuovo indirizzo di posta elettronica.
+      success: Informazioni sull'utente aggiornate con successo.
   browse:
     created: Creato
     closed: Chiuso
@@ -2732,48 +2775,6 @@ it:
       delete_user: Cancella questo utente
       confirm: Conferma
       report: Segnala questo utente
-    account:
-      title: Modifica profilo
-      my settings: Impostazioni
-      current email address: Indirizzo email attuale
-      external auth: Autenticazione esterna
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/IT:OpenID
-        link text: che cos'è questo?
-      public editing:
-        heading: Modifica pubblica
-        enabled: Abilitate. Non anonimo con il permesso di modificare i dati.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: che cos'è questo?
-        disabled: Disabilitate senza il permesso di modificare i dati, tutte le modifiche
-          precedenti sono anonime.
-        disabled link text: perché non posso modificare?
-      public editing note:
-        heading: Modifica pubblica
-        html: Al momento le tue modifiche sono anonime e le persone non possono inviarti
-          messaggi o vedere la tua posizione. Per rendere visibili le tue modifiche
-          e per permettere agli altri utenti di contattarti tramite il sito, clicca
-          sul pulsante sotto. <b>Dalla versione 0.6 delle API, soltanto gli utenti
-          pubblici possono modificare i dati della mappa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">scopri
-          perché</a>).<ul><li>Il tuo indirizzo email non sarà reso pubblico.</li><li>Questa
-          decisione non può essere revocata e tutti i nuovi utenti sono ora pubblici
-          in modo predefinito.</li></ul>
-      contributor terms:
-        heading: Regole per contribuire
-        agreed: Hai accettato le nuove regole per contribuire.
-        not yet agreed: Non hai ancora accettato le nuove regole per contribuire.
-        review link text: Quando puoi segui per favore questo link per leggere ed
-          accettare le nuove regole per contribuire.
-        agreed_with_pd: Hai anche dichiarato di considerare le tue modifiche come
-          fossero di pubblico dominio.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: che cos'è questo?
-      save changes button: Salva modifiche
-      make edits public button: Rendi pubbliche tutte le mie modifiche
-      flash update success confirm needed: Informazioni sull'utente aggiornate con
-        successo. Controllare la propria email per la conferma del nuovo indirizzo
-        di posta elettronica.
-      flash update success: Informazioni sull'utente aggiornate con successo.
     set_home:
       flash success: Posizione personale salvata con successo
     go_public:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2b24c77f4..d809f67eb 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -290,6 +290,40 @@ ja:
       entry:
         comment: コメント
         full: メモ全文
+  accounts:
+    edit:
+      title: アカウントの編集
+      my settings: 設定
+      current email address: 現在のメール アドレス
+      external auth: 外部認証
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/JA:OpenID?uselang=ja
+        link text: これは何ですか?
+      public editing:
+        heading: 公開編集
+        enabled: 有効。匿名ではなく、データを編集できます。
+        enabled link: http://wiki.openstreetmap.org/wiki/JA:Anonymous_edits?uselang=ja
+        enabled link text: これは何ですか?
+        disabled: 無効。データを編集できず、これまでの編集はすべて匿名です。
+        disabled link text: なぜ編集できないのですか?
+      public editing note:
+        heading: 公開編集
+        html: 現在、あなたの編集作業はIP利用者扱いであるため、他の人々からメッセージを受信したり、あなたの場所を見つけてもらったりすることはできません。あなたの編集結果を表示できるようにして、他の人々がウェブサイト経由であなたに連絡できるようにするには、下のボタンをクリックしてください。<b>0.6
+          API 更新より地図データの編集は公開利用者以外、できなくなりました</b>。 (<a href="https://wiki.openstreetmap.org/wiki/JA:Anonymous_edits?uselang=ja">その理由はこちらで</a>)。<ul><li>公開扱いに変更しても、あなたのメール
+          アドレスが暴露されることはありません。</li><li>この変更は取り消せません。なお新しい利用者は、既定で公開扱いとなります。</li></ul>
+      contributor terms:
+        heading: 協力者規約
+        agreed: あなたは、新しい協力者規約を承諾しています。
+        not yet agreed: あなたはまだ新しい投稿規約を承諾していません。
+        review link text: ご都合の良い時にこのリンクをクリックして新しい協力者規約を確認の上、承諾してしてください。
+        agreed_with_pd: また、あなたは、自分の編集結果がパブリックドメインにあるべきだと考えているということも宣言しています。
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: これは何ですか?
+      save changes button: 変更を保存
+      make edits public button: 自分の編集をすべて公開する
+    update:
+      success_confirm_needed: 利用者情報を更新しました。新着メールを確認して新しいメール アドレスを検証してください。
+      success: ユーザー情報を更新しました。
   browse:
     created: 作成
     closed: クローズ
@@ -2492,38 +2526,6 @@ ja:
       delete_user: この利用者を削除
       confirm: 確認
       report: この利用者を通報
-    account:
-      title: アカウントの編集
-      my settings: 設定
-      current email address: 現在のメール アドレス
-      external auth: 外部認証
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/JA:OpenID?uselang=ja
-        link text: これは何ですか?
-      public editing:
-        heading: 公開編集
-        enabled: 有効。匿名ではなく、データを編集できます。
-        enabled link: http://wiki.openstreetmap.org/wiki/JA:Anonymous_edits?uselang=ja
-        enabled link text: これは何ですか?
-        disabled: 無効。データを編集できず、これまでの編集はすべて匿名です。
-        disabled link text: なぜ編集できないのですか?
-      public editing note:
-        heading: 公開編集
-        html: 現在、あなたの編集作業はIP利用者扱いであるため、他の人々からメッセージを受信したり、あなたの場所を見つけてもらったりすることはできません。あなたの編集結果を表示できるようにして、他の人々がウェブサイト経由であなたに連絡できるようにするには、下のボタンをクリックしてください。<b>0.6
-          API 更新より地図データの編集は公開利用者以外、できなくなりました</b>。 (<a href="https://wiki.openstreetmap.org/wiki/JA:Anonymous_edits?uselang=ja">その理由はこちらで</a>)。<ul><li>公開扱いに変更しても、あなたのメール
-          アドレスが暴露されることはありません。</li><li>この変更は取り消せません。なお新しい利用者は、既定で公開扱いとなります。</li></ul>
-      contributor terms:
-        heading: 協力者規約
-        agreed: あなたは、新しい協力者規約を承諾しています。
-        not yet agreed: あなたはまだ新しい投稿規約を承諾していません。
-        review link text: ご都合の良い時にこのリンクをクリックして新しい協力者規約を確認の上、承諾してしてください。
-        agreed_with_pd: また、あなたは、自分の編集結果がパブリックドメインにあるべきだと考えているということも宣言しています。
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: これは何ですか?
-      save changes button: 変更を保存
-      make edits public button: 自分の編集をすべて公開する
-      flash update success confirm needed: 利用者情報を更新しました。新着メールを確認して新しいメール アドレスを検証してください。
-      flash update success: ユーザー情報を更新しました。
     set_home:
       flash success: ホーム地点を保存しました。
     go_public:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index a24d392f4..809078630 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -123,6 +123,20 @@ ka:
         commented_at_by_html: განაახლა %{when} წინ მომხმარებელმა %{user}
       entry:
         comment: კომენტარი
+  accounts:
+    edit:
+      title: ანგარიშის რედაქტირება
+      my settings: ჩემი პარამეტრები
+      current email address: 'ელ-ფოსტის ამჟამინდელი მისამართი:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/KA:OpenID
+        link text: რა არის ეს?
+      public editing:
+        enabled link text: რა არის ეს?
+        disabled link text: რატომ არ შემიძლია რედაქტირება?
+      contributor terms:
+        link text: რა არის ეს?
+      save changes button: ცვლილებების შენახვა
   browse:
     created: შეიქმნა
     closed: დახურულია
@@ -1083,19 +1097,6 @@ ka:
       unhide_user: ამ მომხმარებლის გამოჩენა
       delete_user: ამ მომხმარებლის წაშლა
       confirm: დადასტურება
-    account:
-      title: ანგარიშის რედაქტირება
-      my settings: ჩემი პარამეტრები
-      current email address: 'ელ-ფოსტის ამჟამინდელი მისამართი:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/KA:OpenID
-        link text: რა არის ეს?
-      public editing:
-        enabled link text: რა არის ეს?
-        disabled link text: რატომ არ შემიძლია რედაქტირება?
-      contributor terms:
-        link text: რა არის ეს?
-      save changes button: ცვლილებების შენახვა
     index:
       title: მომხმარებლები
       heading: მომხმარებლები
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index bc150c54d..b777e9775 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -214,6 +214,28 @@ kab:
       entry:
         comment: Awennit
         full: Tazmilt tummiḍt
+  accounts:
+    edit:
+      title: Ẓreg amiḍan
+      my settings: Iɣewwaṛen-iw
+      current email address: Tansa imayl n tura
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: d acu-t wa?
+      public editing:
+        heading: Taẓrigt tazayezt
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: d acu-t wa?
+        disabled link text: Acu zemreɣ ad beddleɣ?
+      public editing note:
+        heading: Taẓrigt tazayezt
+      contributor terms:
+        heading: 'Tiwtilin n iwiziw:'
+        link text: what is this?
+      save changes button: Sekles asnifel
+      make edits public button: Err akk tiẓrigin-iw s tizuyaz
+    update:
+      success: Talɣut n useqdac tettwasnifel akken iwata
   browse:
     created: Yettwarna
     closed: Yemdel
@@ -1377,26 +1399,6 @@ kab:
       unhide_user: Sken aseqdac-agi
       delete_user: Kkes aseqdac-agi
       confirm: Sentem
-    account:
-      title: Ẓreg amiḍan
-      my settings: Iɣewwaṛen-iw
-      current email address: Tansa imayl n tura
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: d acu-t wa?
-      public editing:
-        heading: Taẓrigt tazayezt
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: d acu-t wa?
-        disabled link text: Acu zemreɣ ad beddleɣ?
-      public editing note:
-        heading: Taẓrigt tazayezt
-      contributor terms:
-        heading: 'Tiwtilin n iwiziw:'
-        link text: what is this?
-      save changes button: Sekles asnifel
-      make edits public button: Err akk tiẓrigin-iw s tizuyaz
-      flash update success: Talɣut n useqdac tettwasnifel akken iwata
     set_home:
       flash success: Adig n uxxam yettwasekles akken iwata
     index:
diff --git a/config/locales/km.yml b/config/locales/km.yml
index 90c9392fa..11b913d10 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -85,6 +85,15 @@ km:
         description: បរិយាយ​
         languages: ភាសា​
         pass_crypt: ពាក្យ​សម្ងាត់
+  accounts:
+    edit:
+      title: កែប្រែគណនី​
+      public editing:
+        disabled link text: មូលហេតុអ្វី​ ខ្ញុំមិនអាចកែប្រែបាន​?
+    update:
+      success_confirm_needed: ព័ត៌មានអ្នកប្រើប្រាស់​ បានបន្ទាន់សម័យដោយជោគជ័យ​។ សូមពិនិត្យមើលអ៊ីមែលរបស់អ្នក
+        ដើម្បីបញ្ជាក់អាសយដ្ឋានអ៊ីមែលថ្មីរបស់អ្នក។
+      success: ព័ត៌មានអ្នកប្រើប្រាស់​ បានបន្ទាន់សម័យដោយជោគជ័យ​។
   browse:
     created: បាន​បង្កើត​
     closed: បាន​បិទ
@@ -793,13 +802,6 @@ km:
       remove as friend: ដកចេញជាមិត្ត​
       add as friend: បន្ថែមជាមិត្ត​
       description: បរិយាយ​
-    account:
-      title: កែប្រែគណនី​
-      public editing:
-        disabled link text: មូលហេតុអ្វី​ ខ្ញុំមិនអាចកែប្រែបាន​?
-      flash update success confirm needed: ព័ត៌មានអ្នកប្រើប្រាស់​ បានបន្ទាន់សម័យដោយជោគជ័យ​។
-        សូមពិនិត្យមើលអ៊ីមែលរបស់អ្នក ដើម្បីបញ្ជាក់អាសយដ្ឋានអ៊ីមែលថ្មីរបស់អ្នក។
-      flash update success: ព័ត៌មានអ្នកប្រើប្រាស់​ បានបន្ទាន់សម័យដោយជោគជ័យ​។
   javascripts:
     embed:
       report_problem: រាយការណ៍​បញ្ហា
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b5fb28484..5eb7574d0 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -248,6 +248,42 @@ ko:
       entry:
         comment: 의견
         full: 전체 참고
+  accounts:
+    edit:
+      title: 계정 편집
+      my settings: 프로필 설정
+      current email address: 현재 이메일 주소
+      external auth: 외부 인증
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: 무엇인가요?
+      public editing:
+        heading: 공개 편집
+        enabled: 활성화했습니다. 익명이 아니며 데이터를 편집할 수 있습니다.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: 무엇인가요?
+        disabled: 바활성화되어 데이터를 편집할 수 없으며, 모든 이전 편집은 익명입니다.
+        disabled link text: 왜 편집할 수 없나요?
+      public editing note:
+        heading: 공개 편집
+        html: 현재 편집은 익명으로 나타나며, 다른 사람에게서 메시지를 받을 수 없고 자신의 위치가 공개되지 않습니다. 자신이 편집한 것을
+          드러내고 다른 사람이 웹 사이트를 통해 연락할 수 있게 하려면 아래 버튼을 클릭하세요. <b>0.6 API 개편 이후 공개 사용자만
+          지도 데이터를 편집할 수 있습니다</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">이유
+          알아보기</a>).<ul><li>공개 사용자가 되더라도 이메일 주소는 공개되지 않습니다.</li><li>이 동작은 취소할 수 없으며,
+          모든 새로운 사용자는 현재 기본적으로 공개 계정입니다.</li></ul>
+      contributor terms:
+        heading: 기여자 약관
+        agreed: 새 기여자 약관에 동의했습니다.
+        not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다.
+        review link text: 검토할 사용자의 편의에 이 링크를 따르고 새 기여자 약관에 동의하세요.
+        agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: 무엇인가요?
+      save changes button: 변경사항 저장
+      make edits public button: 내 편집을 공개하기
+    update:
+      success_confirm_needed: 사용자 정보를 성공적으로 업데이트했습니다. 새 이메일 주소를 확인하기 위해 이메일을 확인하세요.
+      success: 사용자 정보를 성공적으로 업데이트했습니다.
   browse:
     created: 만들어짐
     closed: 닫힘
@@ -2408,41 +2444,6 @@ ko:
       delete_user: 이 사용자를 삭제
       confirm: 확인
       report: 이 사용자 보고
-    account:
-      title: 계정 편집
-      my settings: 프로필 설정
-      current email address: 현재 이메일 주소
-      external auth: 외부 인증
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: 무엇인가요?
-      public editing:
-        heading: 공개 편집
-        enabled: 활성화했습니다. 익명이 아니며 데이터를 편집할 수 있습니다.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: 무엇인가요?
-        disabled: 바활성화되어 데이터를 편집할 수 없으며, 모든 이전 편집은 익명입니다.
-        disabled link text: 왜 편집할 수 없나요?
-      public editing note:
-        heading: 공개 편집
-        html: 현재 편집은 익명으로 나타나며, 다른 사람에게서 메시지를 받을 수 없고 자신의 위치가 공개되지 않습니다. 자신이 편집한 것을
-          드러내고 다른 사람이 웹 사이트를 통해 연락할 수 있게 하려면 아래 버튼을 클릭하세요. <b>0.6 API 개편 이후 공개 사용자만
-          지도 데이터를 편집할 수 있습니다</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">이유
-          알아보기</a>).<ul><li>공개 사용자가 되더라도 이메일 주소는 공개되지 않습니다.</li><li>이 동작은 취소할 수 없으며,
-          모든 새로운 사용자는 현재 기본적으로 공개 계정입니다.</li></ul>
-      contributor terms:
-        heading: 기여자 약관
-        agreed: 새 기여자 약관에 동의했습니다.
-        not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다.
-        review link text: 검토할 사용자의 편의에 이 링크를 따르고 새 기여자 약관에 동의하세요.
-        agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: 무엇인가요?
-      save changes button: 변경사항 저장
-      make edits public button: 내 편집을 공개하기
-      flash update success confirm needed: 사용자 정보를 성공적으로 업데이트했습니다. 새 이메일 주소를 확인하기
-        위해 이메일을 확인하세요.
-      flash update success: 사용자 정보를 성공적으로 업데이트했습니다.
     set_home:
       flash success: 집 위치를 성공적으로 저장했습니다
     go_public:
diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index f824a33de..5a5a5f699 100644
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -56,6 +56,10 @@ ksh:
         display_name: Nahme för zem Aanzeije
         languages: Schprohche
         pass_crypt: Paßwoot
+  accounts:
+    edit:
+      external auth: 'Donn övver en anndere Schtäll de Dahte för et Enlogge pröhve
+        lasse:'
   browse:
     relation_member:
       type:
@@ -434,9 +438,6 @@ ksh:
       hide_user: Donn heh dä Metmaacher verschteijsche
       unhide_user: Donn heh dä Metmaacher nim_mih verschteijsche
       delete_user: Donn heh dä Metmaacher fott schmiiße
-    account:
-      external auth: 'Donn övver en anndere Schtäll de Dahte för et Enlogge pröhve
-        lasse:'
   user_blocks:
     show:
       created: Aanjelaat
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index eff29dde6..11f3b7ea0 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -246,6 +246,50 @@ ku-Latn:
       entry:
         comment: Şîrove
         full: Temamiya notê
+  accounts:
+    edit:
+      title: Hesabê biguherîne
+      my settings: Hevyazên min
+      current email address: Navnîşana e-nameyê yê niha
+      external auth: Teyîdkirina xaricî
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: Ev çi ye?
+      public editing:
+        heading: Guherandina ji her kesê re vekirî
+        enabled: Çalak e. Ne anonîm e û dikare daneyan biguherîne.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Ev çiye?
+        disabled: Neçalak e û nikare daneyan biguherîne, hemû guherandinên berê anonîm
+          in.
+        disabled link text: Ez çima nikarim biguherînim?
+      public editing note:
+        heading: Guherandina ji her kesê re vekirî
+        html: Guherandinên ku tu vêga dikî anonîm in û lewma bikarhênerên din nikarin
+          ji te re peyaman bişînin an jî cihê ku tu lê yî bibînin. Ji bo ku guherandinên
+          te werin xuyan ku te çêkiriye û însanên din ji ser malperê bikaribin bi
+          te re têkiliyê deynin bitikîne ser bişkoka li jêr. <b>Ji wextê ku me derbasî
+          0.6 API'yê bû heta niha tenê bikarhênerên ji her kesê re vekirî  dikarin
+          daneyên nexşeyê biguherînin</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">hîn
+          bibe ku çima wisa ye</a>). <ul><li>Navnîşana e-nameya te wê ji her kesê
+          re vekirî nê kirin</li><li>Hûn nikarin ji vê kiryarê bizivirin û bikarhênerên
+          nû bi otomatîkî ji her kesê re vekirî têne xuyan.</li></ul>
+      contributor terms:
+        heading: Şertên beşdariyê
+        agreed: Te Şertên Beşdariyê ya nû qebûl kir
+        not yet agreed: Te hêj Şertên Beşdariyê ya nû qebûl nekiriye.
+        review link text: Gava ku tu misaîd bî, ji bo ku Şertên Beşdariyê ya nû kontrol
+          bikî û qebûl bikî xêra xwe vê lînkê taqîb bike.
+        agreed_with_pd: Herwiha te beyan kir ku tu dixwazî guherandinên te wek Malê
+          Giştî were qebûlkirin.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Ev çi ye?
+      save changes button: Guherandinan qeyd bike
+      make edits public button: Hemû guherandinên min bila ji her kesê re vekirî be
+    update:
+      success_confirm_needed: Agahiyên bikarhêner bi awayekî serkeftî hate nûkirin.
+        Ji bo pejirandina navnîşana e-nameya xwe ya nû e-nameya xwe kontrol bike.
+      success: Agahiya bikarhêner bi serkeftinî hate nûkirin.
   browse:
     created: Hate çêkirin
     closed: Hate girtin
@@ -2625,49 +2669,6 @@ ku-Latn:
       delete_user: Vî/ê bikarhênerî/ê jê bibe
       confirm: Pesend bike
       report: Vî/Vê bikarhênerî/ê gilî bike
-    account:
-      title: Hesabê biguherîne
-      my settings: Hevyazên min
-      current email address: Navnîşana e-nameyê yê niha
-      external auth: Teyîdkirina xaricî
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: Ev çi ye?
-      public editing:
-        heading: Guherandina ji her kesê re vekirî
-        enabled: Çalak e. Ne anonîm e û dikare daneyan biguherîne.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Ev çiye?
-        disabled: Neçalak e û nikare daneyan biguherîne, hemû guherandinên berê anonîm
-          in.
-        disabled link text: Ez çima nikarim biguherînim?
-      public editing note:
-        heading: Guherandina ji her kesê re vekirî
-        html: Guherandinên ku tu vêga dikî anonîm in û lewma bikarhênerên din nikarin
-          ji te re peyaman bişînin an jî cihê ku tu lê yî bibînin. Ji bo ku guherandinên
-          te werin xuyan ku te çêkiriye û însanên din ji ser malperê bikaribin bi
-          te re têkiliyê deynin bitikîne ser bişkoka li jêr. <b>Ji wextê ku me derbasî
-          0.6 API'yê bû heta niha tenê bikarhênerên ji her kesê re vekirî  dikarin
-          daneyên nexşeyê biguherînin</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">hîn
-          bibe ku çima wisa ye</a>). <ul><li>Navnîşana e-nameya te wê ji her kesê
-          re vekirî nê kirin</li><li>Hûn nikarin ji vê kiryarê bizivirin û bikarhênerên
-          nû bi otomatîkî ji her kesê re vekirî têne xuyan.</li></ul>
-      contributor terms:
-        heading: Şertên beşdariyê
-        agreed: Te Şertên Beşdariyê ya nû qebûl kir
-        not yet agreed: Te hêj Şertên Beşdariyê ya nû qebûl nekiriye.
-        review link text: Gava ku tu misaîd bî, ji bo ku Şertên Beşdariyê ya nû kontrol
-          bikî û qebûl bikî xêra xwe vê lînkê taqîb bike.
-        agreed_with_pd: Herwiha te beyan kir ku tu dixwazî guherandinên te wek Malê
-          Giştî were qebûlkirin.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Ev çi ye?
-      save changes button: Guherandinan qeyd bike
-      make edits public button: Hemû guherandinên min bila ji her kesê re vekirî be
-      flash update success confirm needed: Agahiyên bikarhêner bi awayekî serkeftî
-        hate nûkirin. Ji bo pejirandina navnîşana e-nameya xwe ya nû e-nameya xwe
-        kontrol bike.
-      flash update success: Agahiya bikarhêner bi serkeftinî hate nûkirin.
     set_home:
       flash success: Cihê malê bi awayekî serkeftî hate rojanekirin.
     go_public:
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 6f46b7a72..3b92b5104 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -246,6 +246,23 @@ lb:
       entry:
         comment: Bemierkung
         full: Vollstännegen Hiweis
+  accounts:
+    edit:
+      title: Benotzerkont änneren
+      my settings: Meng Astellungen
+      current email address: Aktuell E-Mail-Adress
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: wat ass dat?
+      public editing:
+        enabled link text: wat ass dëst?
+        disabled link text: Firwat kann ech net änneren?
+      contributor terms:
+        link text: wat ass dëst?
+      save changes button: Ännerunge späicheren
+      make edits public button: All meng Ännerunge ëffentlech maachen
+    update:
+      success: Benotzerinformatioun ass elo aktualiséiert.
   browse:
     created: Ugeluecht
     closed: Zou
@@ -2291,21 +2308,6 @@ lb:
       delete_user: Dëse Benotzer läschen
       confirm: Confirméieren
       report: Dëse Benotzer mellen
-    account:
-      title: Benotzerkont änneren
-      my settings: Meng Astellungen
-      current email address: Aktuell E-Mail-Adress
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: wat ass dat?
-      public editing:
-        enabled link text: wat ass dëst?
-        disabled link text: Firwat kann ech net änneren?
-      contributor terms:
-        link text: wat ass dëst?
-      save changes button: Ännerunge späicheren
-      make edits public button: All meng Ännerunge ëffentlech maachen
-      flash update success: Benotzerinformatioun ass elo aktualiséiert.
     go_public:
       flash success: All Är Ännerunge sinn elo ëffentlech, an Dir däerft elo änneren.
     index:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index d0ff1549f..e9dd4fe2e 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -242,6 +242,50 @@ lt:
       entry:
         comment: Komentaras
         full: Pilna pastaba
+  accounts:
+    edit:
+      title: Keisti paskyrą
+      my settings: Mano nustatymai
+      current email address: 'Dabartinis e-pašto adresas:'
+      external auth: 'Išorinė autentikacija:'
+      openid:
+        link: https://wiki.OpenStreetMap.org/wiki/OpenID
+        link text: kas tai?
+      public editing:
+        heading: Viešas keitimas
+        enabled: Įjungtas. Nėra anoniminis ir gali keisti duomenis.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: kas tai?
+        disabled: Išjungtas ir negali keisti duomenų, visi ankstesni pakeitimai yra
+          anonimiški.
+        disabled link text: kodėl aš negaliu redaguoti?
+      public editing note:
+        heading: 'Viešas keitimas:'
+        html: Šiuo metu jūsų keitimai yra anonimiški ir žmonės negali jums siųsti
+          pranešimų ar matyti jūsų vietovės. Parodymui ką jūs keitėte ir galimybei
+          kitiems žmonėms su jumis susisiekti per šią svetainę, spauskit nuorodą žemiau.
+          <b>Nuo 0.6 API pakeitimo, tik vieši naudotojai gali keisti duomenis</b>.
+          (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">sužinokite
+          kodėl</a>).<ul><li>Jūsų el. pašto adresas nebus viešai atskleistas.</li><li>Šis
+          veiksmas negalės būti atšauktas ir visi nauji naudotojai dabar yra automatiškai
+          vieši.</li></ul>
+      contributor terms:
+        heading: 'Talkininkų sąlygos:'
+        agreed: Jūs sutikote su naujomis talkininkų sąlygomis.
+        not yet agreed: Jūs dar nesutikote su naujomis talkininkų sąlygomis.
+        review link text: Sekite šią nuorodą, kad peržiūrėkite ir priimkite naujas
+          talkininkų sąlygas.
+        agreed_with_pd: Jūs taip pat pareiškėte, kad visi jūsų pakeitimai yra viešo
+          naudojimo.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: kas tai?
+      save changes button: Įrašyti pakeitimus
+      make edits public button: Padaryti visus mano pakeitimus viešais
+    update:
+      success_confirm_needed: Naudotojo informacija sėkmingai atnaujinta. Patikrinkite
+        savo el. pašto dėžutę, kurioje turėtų būti pranešimas jūsų naujo el. pašto
+        adreso patvirtinimui.
+      success: Naudotojo informacija sėkmingai atnaujinta.
   browse:
     created: Sukurtas
     closed: Uždarytas
@@ -2227,48 +2271,6 @@ lt:
       delete_user: Pašalinti šį naudotoją
       confirm: Patvirtinti
       report: Pranešti apie šį naudotoją
-    account:
-      title: Keisti paskyrą
-      my settings: Mano nustatymai
-      current email address: 'Dabartinis e-pašto adresas:'
-      external auth: 'Išorinė autentikacija:'
-      openid:
-        link: https://wiki.OpenStreetMap.org/wiki/OpenID
-        link text: kas tai?
-      public editing:
-        heading: 'Viešas keitimas:'
-        enabled: Įjungtas. Nėra anoniminis ir gali keisti duomenis.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: kas tai?
-        disabled: Išjungtas ir negali keisti duomenų, visi ankstesni pakeitimai yra
-          anonimiški.
-        disabled link text: kodėl aš negaliu redaguoti?
-      public editing note:
-        heading: Viešas keitimas
-        html: Šiuo metu jūsų keitimai yra anonimiški ir žmonės negali jums siųsti
-          pranešimų ar matyti jūsų vietovės. Parodymui ką jūs keitėte ir galimybei
-          kitiems žmonėms su jumis susisiekti per šią svetainę, spauskit nuorodą žemiau.
-          <b>Nuo 0.6 API pakeitimo, tik vieši naudotojai gali keisti duomenis</b>.
-          (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">sužinokite
-          kodėl</a>).<ul><li>Jūsų el. pašto adresas nebus viešai atskleistas.</li><li>Šis
-          veiksmas negalės būti atšauktas ir visi nauji naudotojai dabar yra automatiškai
-          vieši.</li></ul>
-      contributor terms:
-        heading: 'Talkininkų sąlygos:'
-        agreed: Jūs sutikote su naujomis talkininkų sąlygomis.
-        not yet agreed: Jūs dar nesutikote su naujomis talkininkų sąlygomis.
-        review link text: Sekite šią nuorodą, kad peržiūrėkite ir priimkite naujas
-          talkininkų sąlygas.
-        agreed_with_pd: Jūs taip pat pareiškėte, kad visi jūsų pakeitimai yra viešo
-          naudojimo.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: kas tai?
-      save changes button: Įrašyti pakeitimus
-      make edits public button: Padaryti visus mano pakeitimus viešais
-      flash update success confirm needed: Naudotojo informacija sėkmingai atnaujinta.
-        Patikrinkite savo el. pašto dėžutę, kurioje turėtų būti pranešimas jūsų naujo
-        el. pašto adreso patvirtinimui.
-      flash update success: Naudotojo informacija sėkmingai atnaujinta.
     set_home:
       flash success: Namų pozicija sėkmingai įrašyta
     go_public:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 91529b17b..f73ad7697 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -176,6 +176,45 @@ lv:
       entry:
         comment: Komentārs
         full: Pilna piezīme
+  accounts:
+    edit:
+      title: Rediģēt kontu
+      my settings: Mani iestatījumi
+      current email address: 'Pašreizējā e-pasta adrese:'
+      external auth: 'Ārējā autentifikācija:'
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: Kas tas ir?
+      public editing:
+        heading: Publiska rediģēšana
+        enabled: Ieslēgts. Nav anonīms, un var rediģēt datus.
+        enabled link: https://wiki.OpenStreetMap.org/wiki/Anonymous_edits
+        enabled link text: Kas tas ir?
+        disabled: Atspējots un nevar labot datus, visi iepriekšējie labojumi ir anonīmi.
+        disabled link text: Kāpēc nevar rediģēt?
+      public editing note:
+        heading: 'Publiska rediģēšana:'
+        html: Pašlaik tavi labojumi ir anonīmi un cilvēki nevar nosūtīt tev ziņojumus
+          vai redzēt tavu atrašanās vietu. Lai parādītu, ko tu esi labojis un ļautu
+          cilvēkiem sazināties ar tevi caur mājaslapu, spied uz pogu zemāk. <b>Kopš
+          0.6 API nomaiņas, tikai publiski lietotāji var labot karti</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">uzzini
+          kāpēc</a>). <ul><li>Tava e-pasta adrese netiks atklāta, ja kļūsi publisks.</li><li>Šo
+          darbību nevar atgriezt un visi jaunie lietotāji ir publiski pēc noklusējuma.
+      contributor terms:
+        heading: 'Devuma Noteikumi:'
+        agreed: Tu esi pieņēmis jaunos Veidotāju Noteikumus.
+        not yet agreed: Tu vēl neesi piekritis jaunajiem Veidotāju Noteikumiem
+        review link text: Lūdzu sekojiet šai saitei un izskatiet un pieņemiet jaunos
+          Veidotāju Noteikumus.
+        agreed_with_pd: Tu arī esi paziņojis, ka tavi labojumi var būt Publiskajā
+          Domēnā.
+        link text: kas tas ir?
+      save changes button: Saglabāt izmaiņas
+      make edits public button: Padarīt visus manus labojumus publiskus
+    update:
+      success_confirm_needed: Lietotāja informācija veiksmīgi atjaunota. Pārbaudi
+        e-pastu, lai apstiprinātu savu jauno e-pasta adresi.
+      success: Lietotāja informācija veiksmīgi atjaunināta.
   browse:
     created: Izveidots
     closed: Aizvērts
@@ -2006,43 +2045,6 @@ lv:
       delete_user: Dzēst šo dalībnieku
       confirm: Apstiprināt
       report: Ziņot par šo lietotāju
-    account:
-      title: Rediģēt kontu
-      my settings: Mani iestatījumi
-      current email address: 'Pašreizējā e-pasta adrese:'
-      external auth: 'Ārējā autentifikācija:'
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: Kas tas ir?
-      public editing:
-        heading: 'Publiska rediģēšana:'
-        enabled: Ieslēgts. Nav anonīms, un var rediģēt datus.
-        enabled link: https://wiki.OpenStreetMap.org/wiki/Anonymous_edits
-        enabled link text: Kas tas ir?
-        disabled: Atspējots un nevar labot datus, visi iepriekšējie labojumi ir anonīmi.
-        disabled link text: Kāpēc nevar rediģēt?
-      public editing note:
-        heading: Publiska rediģēšana
-        html: Pašlaik tavi labojumi ir anonīmi un cilvēki nevar nosūtīt tev ziņojumus
-          vai redzēt tavu atrašanās vietu. Lai parādītu, ko tu esi labojis un ļautu
-          cilvēkiem sazināties ar tevi caur mājaslapu, spied uz pogu zemāk. <b>Kopš
-          0.6 API nomaiņas, tikai publiski lietotāji var labot karti</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">uzzini
-          kāpēc</a>). <ul><li>Tava e-pasta adrese netiks atklāta, ja kļūsi publisks.</li><li>Šo
-          darbību nevar atgriezt un visi jaunie lietotāji ir publiski pēc noklusējuma.
-      contributor terms:
-        heading: 'Devuma Noteikumi:'
-        agreed: Tu esi pieņēmis jaunos Veidotāju Noteikumus.
-        not yet agreed: Tu vēl neesi piekritis jaunajiem Veidotāju Noteikumiem
-        review link text: Lūdzu sekojiet šai saitei un izskatiet un pieņemiet jaunos
-          Veidotāju Noteikumus.
-        agreed_with_pd: Tu arī esi paziņojis, ka tavi labojumi var būt Publiskajā
-          Domēnā.
-        link text: kas tas ir?
-      save changes button: Saglabāt izmaiņas
-      make edits public button: Padarīt visus manus labojumus publiskus
-      flash update success confirm needed: Lietotāja informācija veiksmīgi atjaunota.
-        Pārbaudi e-pastu, lai apstiprinātu savu jauno e-pasta adresi.
-      flash update success: Lietotāja informācija veiksmīgi atjaunināta.
     set_home:
       flash success: Mājas atrašanās vieta veiksmīgi saglabāta
     go_public:
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 36b4205cb..14ee6314f 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -253,6 +253,49 @@ mk:
       entry:
         comment: Коментар
         full: Целата белешка
+  accounts:
+    edit:
+      title: Уреди сметка
+      my settings: Мои прилагодувања
+      current email address: Тековна е-пошта
+      external auth: Надворешна заверка
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/MK:OpenID?uselang=mk
+        link text: што е ова?
+      public editing:
+        heading: Јавно уредување
+        enabled: Овозможено. Сега не е анонимно и може да се уредуваат податоци.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: што е ова?
+        disabled: Оневозможено и не може да се уредуваат податоци, сите претходни
+          уредувања се анонимни.
+        disabled link text: зошто не можам да уредувам?
+      public editing note:
+        heading: Јавно уредување
+        html: Во моментов вашите уредувања се анонимни и луѓето не можат да ви пратат
+          порака или да ви ја видат местоположбата. За да покажете што уредувате и
+          да овозможите корисниците да ве контактираат преку оваа страница, стиснете
+          на копчето подолу. <b>По преодот на 0.6 API, само јавни корисници можат
+          да уредуваат податоци на карти</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">дознајте
+          зошто</a>).<ul> <li>Ако станете јавен корисник, вашата е-пошта сепак нема
+          да се открие.</li> <li>Оваа постапка не може да се врати, и сите нови корисници
+          сега се автоматски јавни.</li> </ul>
+      contributor terms:
+        heading: Услови за учество
+        agreed: Се согласивте на новите Услови за учество.
+        not yet agreed: Сè уште се немате согласено со новите Услови за учество.
+        review link text: Проследете ја врската кога ќе сакате за да ги прегледате
+          и прифатите новите Услови за учество
+        agreed_with_pd: Исто така изјавивте дека вашите уредувања ги сметате за јавна
+          сопственост.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=mk
+        link text: што е ова?
+      save changes button: Зачувај ги промените
+      make edits public button: Објавувај ми ги сите уредувања
+    update:
+      success_confirm_needed: Корисничките информации се успешно подновени. Проверете
+        ја вашата е-пошта за да ја потврдите на адресата.
+      success: Корисничките информации се успешно подновени.
   browse:
     created: Создадено
     closed: Затворено
@@ -2674,47 +2717,6 @@ mk:
       delete_user: Избриши го корисников
       confirm: Потврди
       report: Пријави го корисников
-    account:
-      title: Уреди сметка
-      my settings: Мои прилагодувања
-      current email address: Тековна е-пошта
-      external auth: Надворешна заверка
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/MK:OpenID?uselang=mk
-        link text: што е ова?
-      public editing:
-        heading: Јавно уредување
-        enabled: Овозможено. Сега не е анонимно и може да се уредуваат податоци.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: што е ова?
-        disabled: Оневозможено и не може да се уредуваат податоци, сите претходни
-          уредувања се анонимни.
-        disabled link text: зошто не можам да уредувам?
-      public editing note:
-        heading: Јавно уредување
-        html: Во моментов вашите уредувања се анонимни и луѓето не можат да ви пратат
-          порака или да ви ја видат местоположбата. За да покажете што уредувате и
-          да овозможите корисниците да ве контактираат преку оваа страница, стиснете
-          на копчето подолу. <b>По преодот на 0.6 API, само јавни корисници можат
-          да уредуваат податоци на карти</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">дознајте
-          зошто</a>).<ul> <li>Ако станете јавен корисник, вашата е-пошта сепак нема
-          да се открие.</li> <li>Оваа постапка не може да се врати, и сите нови корисници
-          сега се автоматски јавни.</li> </ul>
-      contributor terms:
-        heading: Услови за учество
-        agreed: Се согласивте на новите Услови за учество.
-        not yet agreed: Сè уште се немате согласено со новите Услови за учество.
-        review link text: Проследете ја врската кога ќе сакате за да ги прегледате
-          и прифатите новите Услови за учество
-        agreed_with_pd: Исто така изјавивте дека вашите уредувања ги сметате за јавна
-          сопственост.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=mk
-        link text: што е ова?
-      save changes button: Зачувај ги промените
-      make edits public button: Објавувај ми ги сите уредувања
-      flash update success confirm needed: Корисничките информации се успешно подновени.
-        Проверете ја вашата е-пошта за да ја потврдите на адресата.
-      flash update success: Корисничките информации се успешно подновени.
     set_home:
       flash success: Матичната местоположба е успешно зачувана
     go_public:
diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 0f57e08de..fb52375a9 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -79,6 +79,20 @@ mo:
     help:
       user:
         new_email: (ну се афишязэ публик)
+  accounts:
+    edit:
+      my settings: Реглажеле меле
+      current email address: 'Адреса де поштэ електроникэ курентэ:'
+      external auth: 'Ынтраря ын конт екстернэ:'
+      openid:
+        link text: че май есте ши аста?
+      public editing:
+        enabled link text: че май есте ши аста?
+      public editing note:
+        heading: 'Редактаря публикэ:'
+      contributor terms:
+        link text: че май есте ши аста?
+      save changes button: Апликаря модификэрилор
   browse:
     created: Креат
     closed: Ынкис
@@ -640,16 +654,4 @@ mo:
       my profile: Профилул меу
       my settings: Реглажеле меле
       my comments: Коментарииле меле
-    account:
-      my settings: Реглажеле меле
-      current email address: 'Адреса де поштэ електроникэ курентэ:'
-      external auth: 'Ынтраря ын конт екстернэ:'
-      openid:
-        link text: че май есте ши аста?
-      public editing:
-        heading: 'Редактаря публикэ:'
-        enabled link text: че май есте ши аста?
-      contributor terms:
-        link text: че май есте ши аста?
-      save changes button: Апликаря модификэрилор
 ...
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 2fb10fe2c..b7fe8e38c 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -109,6 +109,20 @@ mr:
     remote:
       name: सुदूर नियंत्रण
       description: सुदूर नियंत्रण (JOSM अथवा Merkaartor)
+  accounts:
+    edit:
+      title: खाते संपादा
+      my settings: माझ्या मांडण्या
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: हे काय आहे?
+      public editing:
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: हे काय आहे?
+        disabled link text: मी संपादन कां करू शकत नाही?
+      contributor terms:
+        link text: हे काय आहे?
+      save changes button: बदल जतन करा
   browse:
     created: बनविले
     closed: बंद केले
@@ -1270,19 +1284,6 @@ mr:
       latest edit: 'नवीनतम संपादन %{ago}:'
       status: 'स्थिती:'
       description: वर्णन
-    account:
-      title: खाते संपादा
-      my settings: माझ्या मांडण्या
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: हे काय आहे?
-      public editing:
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: हे काय आहे?
-        disabled link text: मी संपादन कां करू शकत नाही?
-      contributor terms:
-        link text: हे काय आहे?
-      save changes button: बदल जतन करा
     index:
       title: सदस्य
       heading: सदस्य
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index e90f3f707..cdbe37425 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -194,6 +194,47 @@ ms:
       entry:
         comment: Komen
         full: Nota penuh
+  accounts:
+    edit:
+      title: Sunting akaun
+      my settings: Tetapan saya
+      current email address: 'Alamat E-Mel Sekarang:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: apakah ini?
+      public editing:
+        heading: Penyuntingan umum
+        enabled: Dihidupkan. Tidak tanpa nama, data boleh disunting.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: apakah ini?
+        disabled: Dimatikan, data tidak boleh disunting, semua suntingan yang sebelumnya
+          adalah tanpa nama.
+        disabled link text: mengapa tak boleh sunting?
+      public editing note:
+        heading: 'Penyuntingan umum:'
+        html: Kini, anda menyunting secara tanpa nama, maka orang lain tidak boleh
+          menghantar pesanan kepada anda atau melihat lokasi anda. Untuk menunjukkan
+          apa yang anda sunting serta membolehkan orang ramai berhubung dengan anda
+          melalui tapak web ini, sila klik butang di bawah. <b>Semenjak peralihan
+          0.6 API, hanya pengguna umum boleh menyunting data peta</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">ketahui
+          sebabnya</a>).<ul><li>Alamat e-mel anda tidak akan didedahkan dengan menjadi
+          umum.</li><li>Tindakan ini tidak boleh diterbalikkan dan semua pengguna
+          baru adalah umum pada asalinya.</li></ul>
+      contributor terms:
+        heading: 'Terma-Terma Penyumbang:'
+        agreed: Anda telah bersetuju dengan Terma-Terma Penyumbang yang baru.
+        not yet agreed: Anda belum bersetuju dengan Terma-Terma Penyumbang yang baru.
+        review link text: Sila ikuti pautan ini bila-bila anda senang untuk meneliti
+          dan menerima Terma-Terma Penyumbang yang baru.
+        agreed_with_pd: Anda juga telah mengisytiharkan bahawa anda menganggap suntingan-suntingan
+          anda sebagai berada dalam Domain Awam.
+        link text: apakah ini?
+      save changes button: Simpan Perubahan
+      make edits public button: Umumkan semua suntingan saya
+    update:
+      success_confirm_needed: Maklumat pengguna berjaya dikemaskinikan. Semak e-mel
+        anda untuk pesanan untuk mengesahkan alamat e-mel baru anda.
+      success: Maklumat pengguna berjaya dikemaskinikan.
   browse:
     created: Dicipta
     closed: Ditutup
@@ -2021,45 +2062,6 @@ ms:
       unhide_user: tunjukkan pengguna ini
       delete_user: hapuskan pengguna ini
       confirm: Sahkan
-    account:
-      title: Sunting akaun
-      my settings: Tetapan saya
-      current email address: 'Alamat E-Mel Sekarang:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: apakah ini?
-      public editing:
-        heading: 'Penyuntingan umum:'
-        enabled: Dihidupkan. Tidak tanpa nama, data boleh disunting.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: apakah ini?
-        disabled: Dimatikan, data tidak boleh disunting, semua suntingan yang sebelumnya
-          adalah tanpa nama.
-        disabled link text: mengapa tak boleh sunting?
-      public editing note:
-        heading: Penyuntingan umum
-        html: Kini, anda menyunting secara tanpa nama, maka orang lain tidak boleh
-          menghantar pesanan kepada anda atau melihat lokasi anda. Untuk menunjukkan
-          apa yang anda sunting serta membolehkan orang ramai berhubung dengan anda
-          melalui tapak web ini, sila klik butang di bawah. <b>Semenjak peralihan
-          0.6 API, hanya pengguna umum boleh menyunting data peta</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">ketahui
-          sebabnya</a>).<ul><li>Alamat e-mel anda tidak akan didedahkan dengan menjadi
-          umum.</li><li>Tindakan ini tidak boleh diterbalikkan dan semua pengguna
-          baru adalah umum pada asalinya.</li></ul>
-      contributor terms:
-        heading: 'Terma-Terma Penyumbang:'
-        agreed: Anda telah bersetuju dengan Terma-Terma Penyumbang yang baru.
-        not yet agreed: Anda belum bersetuju dengan Terma-Terma Penyumbang yang baru.
-        review link text: Sila ikuti pautan ini bila-bila anda senang untuk meneliti
-          dan menerima Terma-Terma Penyumbang yang baru.
-        agreed_with_pd: Anda juga telah mengisytiharkan bahawa anda menganggap suntingan-suntingan
-          anda sebagai berada dalam Domain Awam.
-        link text: apakah ini?
-      save changes button: Simpan Perubahan
-      make edits public button: Umumkan semua suntingan saya
-      flash update success confirm needed: Maklumat pengguna berjaya dikemaskinikan.
-        Semak e-mel anda untuk pesanan untuk mengesahkan alamat e-mel baru anda.
-      flash update success: Maklumat pengguna berjaya dikemaskinikan.
     set_home:
       flash success: Lokasi rumah berjaya disimpan
     go_public:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 90005f681..e701974c5 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -115,6 +115,10 @@ my:
       entry:
         comment: မှတ်ချက်
         full: မှတ်စု အပြည့်အစုံ
+  accounts:
+    edit:
+      current email address: လက်ရှိ အီးမေးလ်လိပ်စာ
+      save changes button: ပြောင်းလဲမှုများကို သိမ်းရန်
   browse:
     created: ဖန်တီးလိုက်သည်
     closed: ပိတ်လိုက်သည်
@@ -773,9 +777,6 @@ my:
       comments: မှတ်ချက်များ
       create_block: ဤအသုံးပြုသူကို ပိတ်ပင်ရန်
       confirm: အတည်ပြု
-    account:
-      current email address: လက်ရှိ အီးမေးလ်လိပ်စာ
-      save changes button: ပြောင်းလဲမှုများကို သိမ်းရန်
     index:
       title: အသုံးပြုသူများ
       heading: အသုံးပြုသူများ
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index df8799011..f848e3bf2 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -259,6 +259,48 @@ nb:
       entry:
         comment: Kommentar
         full: Fullstendig merknad
+  accounts:
+    edit:
+      title: Rediger konto
+      my settings: Mine innstillinger
+      current email address: Nåværende e-postadresse
+      external auth: Ekstern autentisering
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: hva er dette?
+      public editing:
+        heading: Offentlig redigering
+        enabled: Aktivert. Ikke anonym og kan redigere data.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: hva er dette?
+        disabled: Deaktivert og kan ikke redigere data. Alle tidligere redigeringer
+          er anonyme.
+        disabled link text: hvorfor kan jeg ikke redigere?
+      public editing note:
+        heading: Offentlig redigering
+        html: For øyeblikket er redigeringene dine anonyme og folk kan ikke sende
+          deg meldinger eller se posisjonen din. For å vise hva du redigerte og tillate
+          folk å kontakte deg gjennom nettsiden, klikk på knappen nedenfor. <b>Siden
+          overgangen til 0.6 API-et, kan kun offentlige brukere redigere kartdata.</b>
+          (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Finn ut hvorfor</a>
+          ). <ul><li>Din e-postadresse vil ikke bli avslørt ved å bli offentlig.</li><li>Denne
+          handlingen kan ikke angres, og alle nye brukere er nå offentlige som standard.</li></ul>
+      contributor terms:
+        heading: Bidragsytervilkår
+        agreed: Du har godkjent de nye Bidragsytervilkårene.
+        not yet agreed: Du har ennå ikke godkjent de nye bidragsytervilkårene.
+        review link text: Vennligst følg denne lenken når det passer deg, for å se
+          igjennom og godkjenne de nye bidragsytervilkårene.
+        agreed_with_pd: Du har også opplyst at du anser dine redigeringer for å være
+          offentlig eiendom (Public Domain).
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: hva er dette?
+      save changes button: Lagre endringer
+      make edits public button: Gjør alle mine redigeringer offentlig
+    update:
+      success_confirm_needed: Brukerinformasjon oppdatert. Sjekk eposten din for å
+        bekrefte din epostadresse.
+      success: Brukerinformasjon oppdatert.
   browse:
     created: Opprettet
     closed: Lukket
@@ -2377,46 +2419,6 @@ nb:
       delete_user: Slett denne brukeren
       confirm: Bekreft
       report: Rapporter denne brukeren
-    account:
-      title: Rediger konto
-      my settings: Mine innstillinger
-      current email address: Nåværende e-postadresse
-      external auth: Ekstern autentisering
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: hva er dette?
-      public editing:
-        heading: Offentlig redigering
-        enabled: Aktivert. Ikke anonym og kan redigere data.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: hva er dette?
-        disabled: Deaktivert og kan ikke redigere data. Alle tidligere redigeringer
-          er anonyme.
-        disabled link text: hvorfor kan jeg ikke redigere?
-      public editing note:
-        heading: Offentlig redigering
-        html: For øyeblikket er redigeringene dine anonyme og folk kan ikke sende
-          deg meldinger eller se posisjonen din. For å vise hva du redigerte og tillate
-          folk å kontakte deg gjennom nettsiden, klikk på knappen nedenfor. <b>Siden
-          overgangen til 0.6 API-et, kan kun offentlige brukere redigere kartdata.</b>
-          (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Finn ut hvorfor</a>
-          ). <ul><li>Din e-postadresse vil ikke bli avslørt ved å bli offentlig.</li><li>Denne
-          handlingen kan ikke angres, og alle nye brukere er nå offentlige som standard.</li></ul>
-      contributor terms:
-        heading: Bidragsytervilkår
-        agreed: Du har godkjent de nye Bidragsytervilkårene.
-        not yet agreed: Du har ennå ikke godkjent de nye bidragsytervilkårene.
-        review link text: Vennligst følg denne lenken når det passer deg, for å se
-          igjennom og godkjenne de nye bidragsytervilkårene.
-        agreed_with_pd: Du har også opplyst at du anser dine redigeringer for å være
-          offentlig eiendom (Public Domain).
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: hva er dette?
-      save changes button: Lagre endringer
-      make edits public button: Gjør alle mine redigeringer offentlig
-      flash update success confirm needed: Brukerinformasjon oppdatert. Sjekk eposten
-        din for å bekrefte din epostadresse.
-      flash update success: Brukerinformasjon oppdatert.
     set_home:
       flash success: Hjemmeposisjon lagret
     go_public:
diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 812c30e35..cce633d60 100644
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -64,6 +64,14 @@ nds:
     help:
       user:
         new_email: (nich apen wiesen)
+  accounts:
+    edit:
+      title: Brukerkonto ännern
+      public editing:
+        enabled link text: Wat is dat?
+        disabled link text: Worüm kann ik nix ännern?
+      save changes button: Ännern spiekern
+      make edits public button: All mien Ännern apen wiesen
   browse:
     relation_member:
       entry_role_html: '%{type} %{name} as %{role}'
@@ -599,13 +607,6 @@ nds:
       mapper since: 'Koortenmaker sied:'
       email address: 'E-Mail-Adress:'
       description: Beschrieven
-    account:
-      title: Brukerkonto ännern
-      public editing:
-        enabled link text: Wat is dat?
-        disabled link text: Worüm kann ik nix ännern?
-      save changes button: Ännern spiekern
-      make edits public button: All mien Ännern apen wiesen
     set_home:
       flash success: Standoort is spiekert.
   user_blocks:
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index cb017e76c..63b58b0d8 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -130,6 +130,24 @@ ne:
     notes:
       entry:
         comment: टिप्पणी
+  accounts:
+    edit:
+      my settings: मेरो अनुकुलताहरु
+      openid:
+        link text: यो के हो ?
+      public editing:
+        heading: सार्वजनिक सम्पादन
+        enabled link text: यो के हो ?
+        disabled link text: म किन सम्पादन गर्न सक्दिन?
+      public editing note:
+        heading: 'सार्वजनिक सम्पादन:'
+      contributor terms:
+        link text: यो के हो ?
+      save changes button: परिवर्तनहरू संग्रह गर्नुहोस्
+    update:
+      success_confirm_needed: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक गरियो।
+        Check your email for a note to confirm your new email address.
+      success: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक गरियो।
   browse:
     created: सृजना गरिएको
     closed: समापन भएको
@@ -1158,22 +1176,6 @@ ne:
         administrator: यी प्रयोगकर्ता प्रबन्धक हुनुहुन्छ
       comments: टिप्पणी
       confirm: निश्चित गर्ने
-    account:
-      my settings: मेरो अनुकुलताहरु
-      openid:
-        link text: यो के हो ?
-      public editing:
-        heading: 'सार्वजनिक सम्पादन:'
-        enabled link text: यो के हो ?
-        disabled link text: म किन सम्पादन गर्न सक्दिन?
-      public editing note:
-        heading: सार्वजनिक सम्पादन
-      contributor terms:
-        link text: यो के हो ?
-      save changes button: परिवर्तनहरू संग्रह गर्नुहोस्
-      flash update success confirm needed: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक
-        गरियो। Check your email for a note to confirm your new email address.
-      flash update success: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक गरियो।
     go_public:
       flash success: तपाईंका सबै सम्पादनहरू सार्वाजनिक छन् , तपाईं अब सम्पादन लायक
         हुनु भयो ।
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 3628b4d36..d9e3eb29f 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -299,6 +299,50 @@ nl:
       entry:
         comment: Opmerking
         full: Volledige opmerking
+  accounts:
+    edit:
+      title: Account bewerken
+      my settings: Mijn instellingen
+      current email address: Huidig e-mailadres
+      external auth: Externe authenticatie
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: wat is dit?
+      public editing:
+        heading: Publiek bewerken
+        enabled: Ingeschakeld. U bent niet anoniem en u kunt bewerken.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: wat is dit?
+        disabled: Uitgeschakeld. U kunt niet bewerken en al uw eerdere bewerkingen
+          zijn anoniem.
+        disabled link text: waarom kan ik niets bewerken?
+      public editing note:
+        heading: Openbaar bewerken
+        html: Op dit moment zijn uw bewerkingen anoniem en kunnen andere gebruikers
+          u geen berichten sturen of uw locatie zien. Om uw bewerkingen weer te kunnen
+          geven en andere gebruikers in staat te stellen in contact met u te komen,
+          kunt u op de onderstaande knop klikken. <b>Sinds de overgang naar versie
+          0.6 van de API kunnen alleen publieke gebruikers de kaartgegevens bewerken</b>.
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Meer informatie</a>).<ul><li>Uw
+          e-mailadres wordt niet publiek gemaakt door uw bewerkingen publiek te maken.</li><li>Deze
+          handeling kan niet ongedaan gemaakt worden en alle nieuwe gebrukers zijn
+          nu standaard publiek.</li></ul>
+      contributor terms:
+        heading: Bijdragers Voorwaarden
+        agreed: U bent akkoord gegaan met de nieuwe Bijdragersovereenkomst.
+        not yet agreed: U hebt nog niet ingestemd met de nieuwe Bijdragersovereenkomst.
+        review link text: Volg deze koppeling als u wilt om de nieuwe Bijdragersovereenkomst
+          te lezen en te accepteren.
+        agreed_with_pd: U hebt ook verklaard dat uw bijdragen onderdeel zijn van het
+          Publieke domein.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: wat is dit?
+      save changes button: Wijzigingen opslaan
+      make edits public button: Al mijn wijzigingen  openbaar maken
+    update:
+      success_confirm_needed: Gebruikersinformatie succesvol bijgewerkt. Controleer
+        uw e-mail om uw nieuwe e-mailadres te bevestigen.
+      success: De gebruikersinformatie is bijgewerkt.
   browse:
     created: Aangemaakt
     closed: Gesloten
@@ -2735,48 +2779,6 @@ nl:
       delete_user: Deze gebruiker verwijderen
       confirm: Bevestigen
       report: Rapporteer deze Gebruiker
-    account:
-      title: Account bewerken
-      my settings: Mijn instellingen
-      current email address: Huidig e-mailadres
-      external auth: Externe authenticatie
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: wat is dit?
-      public editing:
-        heading: Openbaar bewerken
-        enabled: Ingeschakeld. U bent niet anoniem en u kunt bewerken.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: wat is dit?
-        disabled: Uitgeschakeld. U kunt niet bewerken en al uw eerdere bewerkingen
-          zijn anoniem.
-        disabled link text: waarom kan ik niets bewerken?
-      public editing note:
-        heading: Publiek bewerken
-        html: Op dit moment zijn uw bewerkingen anoniem en kunnen andere gebruikers
-          u geen berichten sturen of uw locatie zien. Om uw bewerkingen weer te kunnen
-          geven en andere gebruikers in staat te stellen in contact met u te komen,
-          kunt u op de onderstaande knop klikken. <b>Sinds de overgang naar versie
-          0.6 van de API kunnen alleen publieke gebruikers de kaartgegevens bewerken</b>.
-          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Meer informatie</a>).<ul><li>Uw
-          e-mailadres wordt niet publiek gemaakt door uw bewerkingen publiek te maken.</li><li>Deze
-          handeling kan niet ongedaan gemaakt worden en alle nieuwe gebrukers zijn
-          nu standaard publiek.</li></ul>
-      contributor terms:
-        heading: Bijdragers Voorwaarden
-        agreed: U bent akkoord gegaan met de nieuwe Bijdragersovereenkomst.
-        not yet agreed: U hebt nog niet ingestemd met de nieuwe Bijdragersovereenkomst.
-        review link text: Volg deze koppeling als u wilt om de nieuwe Bijdragersovereenkomst
-          te lezen en te accepteren.
-        agreed_with_pd: U hebt ook verklaard dat uw bijdragen onderdeel zijn van het
-          Publieke domein.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: wat is dit?
-      save changes button: Wijzigingen opslaan
-      make edits public button: Al mijn wijzigingen  openbaar maken
-      flash update success confirm needed: Gebruikersinformatie succesvol bijgewerkt.
-        Controleer uw e-mail om uw nieuwe e-mailadres te bevestigen.
-      flash update success: De gebruikersinformatie is bijgewerkt.
     set_home:
       flash success: Thuislocatie succesvol opgeslagen
     go_public:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 0ecb71083..9ce5504a6 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -212,6 +212,48 @@ nn:
       entry:
         comment: Kommentar
         full: Fullstendig merknad
+  accounts:
+    edit:
+      title: Rediger konto
+      my settings: Innstellingane mine
+      current email address: 'Noverande e-postadresse:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: kva er dette?
+      public editing:
+        heading: Offentleg redigering
+        enabled: Aktivert. Ikkje anonym og kan redigere data.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: kva er dette?
+        disabled: Deaktivert og kan ikkje redigere data. Alle tidlegare redigeringar
+          er anonyme.
+        disabled link text: kvifor can eg ikkje redigere?
+      public editing note:
+        heading: 'Offentleg redigering:'
+        html: For augneblunken er redigeringane dine anonyme og folk kan ikkje sende
+          deg meldingar eller sjå posisjonen din. For å vise kva du redigerte og tillate
+          folk å kontakte deg gjennom nettsiden, klikk på knappen nedanfor. <b>Sidan
+          overgangen til 0.6 API-et, kan berre offentlege brukarar redigere kartdata.</b>
+          ( <a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Finn ut kvifor</a>
+          ). <ul><li> di e-postadresse vil ikkje avslørast ved å verte offentleg.
+          </li><li> Denne handlinga kan ikkje omgjerast, og alle nye brukarar er no
+          offentleg tilgjengeleg som standard. </li></ul>
+      contributor terms:
+        heading: 'Bidragsytervilkår:'
+        agreed: Du har godkjent dei nye bidragsytervilkåra
+        not yet agreed: Du har endå ikkje godkjent dei nye bidragsytervilkåra.
+        review link text: Vennligst følg denne lenkja når det passar deg, for å sjå
+          igjennom og godkjenne dei nye bidragsytervilkåra.
+        agreed_with_pd: Du har òg opplyst at du ansar redigeringane dine for å vere
+          offentleg eigedom (Public Domain).
+        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: kva er dette?
+      save changes button: Lagre endringar
+      make edits public button: Gjer alle redigeringane mine offentleg
+    update:
+      success_confirm_needed: Brukerinformasjon oppdatert. Sjekk eposten din for å
+        stadfeste din epostadresse.
+      success: Brukerinformasjon oppdatert.
   browse:
     created: Oppretta
     closed: Attlaten
@@ -1822,46 +1864,6 @@ nn:
       delete_user: Slett denne brukaren
       confirm: Stadfest
       report: Rapporter denne brukaren
-    account:
-      title: Rediger konto
-      my settings: Innstellingane mine
-      current email address: 'Noverande e-postadresse:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: kva er dette?
-      public editing:
-        heading: 'Offentleg redigering:'
-        enabled: Aktivert. Ikkje anonym og kan redigere data.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: kva er dette?
-        disabled: Deaktivert og kan ikkje redigere data. Alle tidlegare redigeringar
-          er anonyme.
-        disabled link text: kvifor can eg ikkje redigere?
-      public editing note:
-        heading: Offentleg redigering
-        html: For augneblunken er redigeringane dine anonyme og folk kan ikkje sende
-          deg meldingar eller sjå posisjonen din. For å vise kva du redigerte og tillate
-          folk å kontakte deg gjennom nettsiden, klikk på knappen nedanfor. <b>Sidan
-          overgangen til 0.6 API-et, kan berre offentlege brukarar redigere kartdata.</b>
-          ( <a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Finn ut kvifor</a>
-          ). <ul><li> di e-postadresse vil ikkje avslørast ved å verte offentleg.
-          </li><li> Denne handlinga kan ikkje omgjerast, og alle nye brukarar er no
-          offentleg tilgjengeleg som standard. </li></ul>
-      contributor terms:
-        heading: 'Bidragsytervilkår:'
-        agreed: Du har godkjent dei nye bidragsytervilkåra
-        not yet agreed: Du har endå ikkje godkjent dei nye bidragsytervilkåra.
-        review link text: Vennligst følg denne lenkja når det passar deg, for å sjå
-          igjennom og godkjenne dei nye bidragsytervilkåra.
-        agreed_with_pd: Du har òg opplyst at du ansar redigeringane dine for å vere
-          offentleg eigedom (Public Domain).
-        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: kva er dette?
-      save changes button: Lagre endringar
-      make edits public button: Gjer alle redigeringane mine offentleg
-      flash update success confirm needed: Brukerinformasjon oppdatert. Sjekk eposten
-        din for å stadfeste din epostadresse.
-      flash update success: Brukerinformasjon oppdatert.
     set_home:
       flash success: Heimelokasjon lagra
     go_public:
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 6a40da417..a7e209a8e 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -142,7 +142,7 @@ nqo:
         new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
         active: ߞߎ߲߬ߞߊߟߌ߲
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
-        description: ߦߊߞߙߍ ߛߎ߯ߦߌߘߊ
+        description: ߦߊߞߙߍ ߞߊ߲߬ߛߓߍߟߌ
         home_lat: ߘߟߊߕߍ߮
         home_lon: ߕߍߟߍ߲
         languages: ߞߊ߲߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
@@ -193,6 +193,20 @@ nqo:
       entry:
         comment: ߡߙߌߣߊ߲
         full: ߦߟߌߣߐ ߘߝߊߣߍ߲
+  accounts:
+    edit:
+      title: ߖߊ߬ߕߋ߬ߘߊ ߡߊߦߟߍ߬ߡߊ߲߬
+      my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
+      current email address: ߕߋ߲߭ߕߋ߲߭ ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
+      public editing:
+        enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
+        disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
+      contributor terms:
+        link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
+      save changes button: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߠߊߞߎ߲߬ߘߎ߬
   browse:
     created: ߛߌ߲ߘߌߣߍ߲
     closed: ߘߊߕߎ߲߯ߣߍ߲
@@ -1573,19 +1587,6 @@ nqo:
       delete_user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߖߏ߰ߛߌ߫
       confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
       report: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߠߊߞߏߝߐ߫
-    account:
-      title: ߖߊ߬ߕߋ߬ߘߊ ߡߊߦߟߍ߬ߡߊ߲߬
-      my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
-      current email address: ߕߋ߲߭ߕߋ߲߭ ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
-      public editing:
-        enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
-        disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
-      contributor terms:
-        link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
-      save changes button: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߠߊߞߎ߲߬ߘߎ߬
     auth_failure:
       unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫
 ...
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 8176511a2..a08bd2011 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -14,6 +14,8 @@ oc:
     formats:
       friendly: '%e %B %Y a %H:%M'
   helpers:
+    file:
+      prompt: Seleccionatz un fichier
     submit:
       diary_comment:
         create: Sauvar
@@ -26,7 +28,10 @@ oc:
         create: Mandar
       client_application:
         create: Enregistrar
-        update: Modificar
+        update: Actualizar
+      doorkeeper_application:
+        create: Enregistrar
+        update: Actualizar
       redaction:
         create: Crear la redaccion
         update: Sauvar la redaccion
@@ -79,8 +84,18 @@ oc:
       way_tag: Balisa del camin
     attributes:
       client_application:
+        name: Nom (Obligatòri)
+        url: URL de l'aplicacion principala (Obligatòri)
         callback_url: URL de rapèl
         support_url: URL de supòrt
+        allow_read_prefs: consultar lei preferéncias d'utilizaire.
+        allow_write_prefs: modificar lei preferéncias d'utilizaire.
+        allow_write_diary: creatz d'intradas dins lo jornau, de comentaris e fasètz-vos
+          d'amics.
+        allow_write_api: modificar la mapa
+        allow_read_gpx: legir vòstrei traças GPS privadas.
+        allow_write_gpx: telecargar de traças GPS.
+        allow_write_notes: modificar lei nòtas.
       diary_comment:
         body: Còrs
       diary_entry:
@@ -89,19 +104,24 @@ oc:
         latitude: Latitud
         longitude: Longitud
         language: Lenga
+      doorkeeper/application:
+        name: Nom
+        redirect_uri: Redirigir URIs
+        confidential: Aplicacion confidenciala ?
+        scopes: Permissions
       friend:
         user: Utilizaire
         friend: Amic
       trace:
         user: Utilizaire
         visible: Visible
-        name: Nom
+        name: Nom dau fichier
         size: Mesura
         latitude: Latitud
         longitude: Longitud
         public: Public
         description: Descripcion
-        gpx_file: 'Mandar un fichièr GPX :'
+        gpx_file: 'Mandar un fichier GPX :'
         visibility: 'Visibilitat :'
         tagstring: 'Balisas :'
       message:
@@ -110,26 +130,45 @@ oc:
         body: Còrs
         recipient: Destinatari
       redaction:
+        title: Títol
         description: Descripcion
       report:
+        category: 'Seleccionatz una rason per la denóncia:'
         details: Se vos plai, fornissètz mai de detalhs sus la dificultat (obligatòri).
       user:
+        auth_provider: Fornidor d'autenticacion
+        auth_uid: UID d'autentificacion
         email: Adreça de corrièr electronic
-        new_email: 'Novèla adreça de corrièr electronic :'
+        email_confirmation: Corrier electronic d'autentificacion
+        new_email: 'Novèla adreiça de corrier electronic :'
         active: Actiu
         display_name: Nom afichat
-        description: Descripcion
+        description: Descripcion dau perfiu
         home_lat: 'Latitud :'
         home_lon: 'Longitud :'
-        languages: Lengas
+        languages: Lengas preferidas
+        preferred_editor: 'Editor preferit :'
         pass_crypt: Senhau
+        pass_crypt_confirmation: Confirmacion dau senhau
     help:
+      doorkeeper/application:
+        confidential: L'aplicacion serà utilizada se lo secrèt dau client se pòt garentir
+          (leis aplicacions nativas de mobile e leis aplicacions d'una sola pagina
+          son pas confidencialas)
+        redirect_uri: Usatz una linha per URI
       trace:
         tagstring: separadas per de virgulas
       user_block:
+        reason: Rason per la quala l'utilizator es blocat. Mercé d'èsser tant suau
+          e rasonable com possible, e de balhar tant de detalhs coma possible sus
+          la situacion. Doblidetz pas qu'aqueste messatge serà visible de totes. Sapiatz
+          que tot lo monde compren pas lo gergon de la comunautat, adonc utilizatz
+          de tèrmes simples e precís.
         needs_view: L’utilizaire se deu connectar abans qu'aqueste blocatge expire
           ?
       user:
+        email_confirmation: Vòstra adreiça se mostrarà pas publicament (vejatz la
+          nòstra politica de privadança&#60;/a&#62; per mai d'informacion)
         new_email: (pas jamai afichat publicament)
   datetime:
     distance_in_words_ago:
@@ -210,6 +249,42 @@ oc:
       entry:
         comment: Comentari
         full: Nòta completa
+  accounts:
+    edit:
+      title: Modificar lo compte
+      my settings: Meis opcions
+      current email address: 'Adreiça de corrier electronic actuala:'
+      external auth: 'Autentificacion extèrna:'
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: qu’es aquò ?
+      public editing:
+        heading: Modificacion publica
+        enabled: Activat. Pas anonim e pòt modificar las donadas.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: qu’es aquò ?
+        disabled: Desactivadas e sensa permés per editar; lei modificacions anterioras
+          son anonimas.
+        disabled link text: perqué pòdi pas modificar ?
+      public editing note:
+        heading: 'Modificacion publica :'
+      contributor terms:
+        heading: Tèrmes de collaboracion
+        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.
+        review link text: Seguissètz aqueu ligame per revisar e acceptar lei tèrmes
+          novèus de collaboracion.
+        agreed_with_pd: Declaratz tanben que consideratz que vòstrei modificacions
+          son de domeni public.
+        link: https://Www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: qu’es aquò ?
+      save changes button: Enregistrar las modificacions
+      make edits public button: Rendre totas mas modificacions publicas
+    update:
+      success_confirm_needed: Informacions sus l'utilizaire mesas a jorn amb succès.
+        Verificatz vòstra bóstia mail per tal de validar la verificacion de vòstre
+        novèla adreça e-mail.
+      success: Informacions sus l'utilizaire mesas a jorn amb succès.
   browse:
     created: Creat
     closed: Plegat
@@ -224,6 +299,12 @@ oc:
     anonymous: anonim
     no_comment: (sens comentaris)
     part_of: Partida de
+    part_of_relations:
+      one: 1 relacion
+      other: '%{count} relacions'
+    part_of_ways:
+      one: 1 linha
+      other: '%{count} linhas'
     download_xml: Telecargar lo XML
     view_history: Mostrar l’istoric
     view_details: Mostrar lei detalhs
@@ -257,6 +338,9 @@ oc:
       title_html: 'Linha : %{name}'
       history_title_html: 'Istoric de la linha : %{name}'
       nodes: Nos
+      nodes_count:
+        one: 1 nos
+        other: '%{count} nos'
       also_part_of_html:
         one: partida de la linha %{related_ways}
         other: partida dei linhas %{related_ways}
@@ -264,6 +348,9 @@ oc:
       title_html: 'Relacion : %{name}'
       history_title_html: 'Istoric de la relacion : %{name}'
       members: Membres
+      members_count:
+        one: 1 membre
+        other: '%{count} membres'
     relation_member:
       entry_role_html: '%{type} %{name} amb lo ròtle %{role}'
       type:
@@ -274,6 +361,7 @@ oc:
       entry_html: Relacion %{relation_name}
       entry_role_html: Relacion %{relation_name} (en tant que %{relation_role})
     not_found:
+      title: S'es pas trobat
       sorry: 'O planhèm, %{type} #%{id} a pas pogut èsser trobat.'
       type:
         node: nos
@@ -282,6 +370,7 @@ oc:
         changeset: grop de modificacions
         note: nòta
     timeout:
+      title: Error de temps d'espèra despassat
       sorry: O planhèm, las donadas pel tipe %{type} amb l'id %{id} prenon tròp de
         temps per èsser recuperadas.
       type:
@@ -392,6 +481,10 @@ oc:
       nearby mapper: Mapaire dins los environs
       friend: Amic
     show:
+      title: Tablèu de bòrd
+      no_home_location_html: '%{edit_profile_link} E establissètz la posicion de vòstre
+        domicili per veire leis usatgiers vesins.'
+      edit_your_profile: Modificar lo perfiu
       my friends: los mens amics
       no friends: Avètz pas encara apondut cap d'amic
       nearby users: Autres utilizaires a proximitat
@@ -416,6 +509,7 @@ oc:
       in_language_title: Entradas de jornau en %{language}
       new: Novèla entrada de jornau
       new_title: Ajustar una novèla entrada dins vòstre jornau
+      my_diary: Mon jornau
       no_entries: Ges d'entrada dins vòstre jornau
       recent_entries: 'Entradas recentas de jornau :'
       older_entries: Entradas pus ancianas
@@ -436,8 +530,9 @@ oc:
         %{id}. Verificatz vòstra ortografia o la validitat dau ligam qu'avètz clicat.
     diary_entry:
       posted_by_html: Postat per %{link_user} a %{created} en %{language_link}
+      updated_at_html: Darriera actualizacion de %{updated}
       comment_link: Comentar aquesta entrada
-      reply_link: Respòndre a aquesta entrada
+      reply_link: Respòndre a aquesta intrada
       comment_count:
         one: '%{count} comentari'
         zero: Pas de comentari
@@ -469,11 +564,20 @@ oc:
         title: Entradas de jornau d'OpenStreetMap
         description: Entradas recentas de jornau deis utilizaires d'OpenStreetMap
     comments:
+      title: Comentaris ajustats au jornau per %{user}
+      heading: Comentaris dau jornau de %{user}
+      subheading_html: Comentaris dau jornau ajustats per %{user}
+      no_comments: Ges de comentaris au jornau
       post: Mandar
       when: Quand
       comment: Comentari
       newer_comments: Comentaris pus recents
       older_comments: Comentaris pus ancians
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: S'es enregistrat l'aplicacion.
   friendships:
     make_friend:
       heading: Ajustar %{user} per amic ?
@@ -481,6 +585,8 @@ oc:
       success: d'ara enlà, %{name} es vòstre amic.
       failed: O planhèm, fracàs al moment de l'apondon de %{name} coma vòstre amic
       already_a_friend: Sètz ja amic amb %{name}.
+      limit_exceeded: Avètz enviat tròp de de messatges recentament, esperatz un moment
+        abans d'assajar tornarmai.
     remove_friend:
       heading: Suprimir %{user} en tant qu’amic ?
       button: Suprimir en tant qu'amic
@@ -508,6 +614,7 @@ oc:
           pylon: Pilòn
           station: Gara de telecabina
           t-bar: Montabarra en T
+          "yes": Vias per cables penjats
         aeroway:
           aerodrome: Aerodròm
           airstrip: Pista d’aterrissatge
@@ -516,11 +623,15 @@ oc:
           hangar: Cobèrt
           helipad: Elipòrt
           holding_position: Posicion d’espèra
+          navigationaid: Ajuda de Navigacion per l'Aviacion
           parking_position: Plaça de parcatge
           runway: Pista
+          taxilane: Via de taxi
           taxiway: Via de manòbra
           terminal: Terminal
+          windsock: Manega de vent
         amenity:
+          animal_boarding: Pension per animaus
           animal_shelter: Refugi per animals
           arts_centre: Centre artistic
           atm: Distribuidor automatic de bilhets
@@ -530,7 +641,9 @@ oc:
           bench: Banc
           bicycle_parking: Aparcament per bicicletas
           bicycle_rental: Logason de bicicletas
+          bicycle_repair_station: Estacion per rabobar lei bicicletas
           biergarten: Braçariá a l’aire liure
+          blood_bank: Banca de sang
           boat_rental: Barcas a renda
           brothel: Bordèl
           bureau_de_change: Burèu de cambi
@@ -547,6 +660,7 @@ oc:
           clock: Relòtge
           college: Collègi
           community_centre: Sala polivalenta
+          conference_centre: Centre de conferéncias
           courthouse: Palais de justícia
           crematorium: Crematòri
           dentist: Dentista
@@ -554,6 +668,7 @@ oc:
           drinking_water: Aiga potabla
           driving_school: Escòla de conduita
           embassy: Embaissada
+          events_venue: Espaci per eveniments
           fast_food: Restauracion rapida
           ferry_terminal: Terminau maritim
           fire_station: Casèrna de pompièrs
@@ -566,16 +681,24 @@ oc:
           hospital: Espital
           hunting_stand: Taulièr de tir
           ice_cream: Glacet
+          internet_cafe: Cafè internet
           kindergarten: Ensenhament preelementari
+          language_school: Escòla de lenga
           library: Bibliotèca
+          loading_dock: Cai de carga
+          love_hotel: Ostalariá d'amor
           marketplace: Plaça de mercat
+          mobile_money_agent: Agent de Sòus mobiles
           monastery: Mostièr
+          money_transfer: Transferéncia de sòus
           motorcycle_parking: Aparcament de bicicleta
+          music_school: Escòla de musica
           nightclub: Discotèca
           nursing_home: Ostal de santat
           parking: Aparcament
           parking_entrance: Entrada de l’aparcament
           parking_space: Plaça d’aparcament
+          payment_terminal: Terminau de pagament
           pharmacy: Farmàcia
           place_of_worship: Luòc de culte
           police: Polícia
@@ -583,9 +706,13 @@ oc:
           post_office: Burèu de pòsta
           prison: Preson
           pub: Bar
+          public_bath: Banh public
+          public_bookcase: Biblioteca publica
           public_building: Bastissa publica
+          ranger_station: Pòsta de gardabòsc
           recycling: Ponch de reciclatge
           restaurant: Restaurant
+          sanitary_dump_station: Estacion de descarga sanitària
           school: Escòla
           shelter: Abric
           shower: Docha
@@ -598,18 +725,27 @@ oc:
           theatre: Teatre
           toilets: Comuns
           townhall: Ostau de vila
+          training: Installacions d'entraïnament
           university: Universitat
+          vehicle_inspection: Inspeccion de veïcules
           vending_machine: Distribuidor automatic
           veterinary: Cirurgia veterinària
           village_hall: Sala comunala
           waste_basket: Escobilhièr
           waste_disposal: Eliminacion de sobras
+          waste_dump_site: Site de descarga de curum
+          watering_place: Abeurador
           water_point: Ponch d'aiga
+          weighbridge: Pònt bascula
+          "yes": Servici
         boundary:
+          aboriginal_lands: Tèrras aborigenas
           administrative: Limit administratiu
           census: Frontièra estatistica
           national_park: Pargue nacional
+          political: Circonscripcion electorala
           protected_area: Zòna protegida
+          "yes": Frontiera
         bridge:
           aqueduct: Aqüeducte
           boardwalk: Passejada
@@ -618,24 +754,93 @@ oc:
           viaduct: Viaducte
           "yes": Pont
         building:
+          apartment: Departement
+          apartments: Apartaments
+          barn: Feniera
+          bungalow: Bastidon
+          cabin: Cabanon
+          chapel: Capèla
+          church: Bastissa de la glèisa
+          civic: Edifici municipau
+          college: Bastissa universitària
+          commercial: Bastissa comerciala
+          construction: Bastissa en bastiment
+          detached: Ostau independent
+          dormitory: Residéncia Universitària
+          duplex: Ostau doble
+          farm: Tenement
+          farm_auxiliary: Dependéncias d'un tenement
+          garage: Garatge
+          garages: Garatges
+          greenhouse: Sèrra de cultura
+          hangar: Cobèrt
+          hospital: Bastissa espitaliera
+          hotel: Bastissa ostaliera
+          house: Ostau
+          houseboat: Ostau flotant
+          hut: Barraca
+          industrial: Bastissa industriala
+          kindergarten: Bastissa d'escòla mairala
+          manufacture: Fabrega
+          office: Bastissa de burèus
+          public: Bastissa publica
+          residential: Bastissa residenciala
+          retail: Venda de detalh
+          roof: Torre
+          ruins: Bastissa en roïnas
+          school: Bastissa escolara
+          service: Bastissa de servici
+          shed: Cabanon
+          stable: Estable
+          static_caravan: Caravana
+          temple: Bastissa d'un temple
+          terrace: Bastissa en terrassas
+          train_station: Edifici d'estacion de trens
+          university: Bastissa universitària
+          warehouse: Entrepaus
           "yes": Bastissa
+        club:
+          sport: Club esportiu
+          "yes": Cèrcle
         craft:
+          beekeeper: Apicultor
+          blacksmith: Faure
           brewery: Braçariá
           carpenter: Fustièr
+          caterer: Manjador
+          confectionery: Confiseria
+          dressmaker: Sartre
           electrician: Electrician
+          electronics_repair: Radobament d'aparelhs electronics
           gardener: Jardinièr
+          glaziery: Vitrier
+          handicraft: Artesanat
+          hvac: Fabricant de produchs de climatizacion
+          metal_construction: Construccions metalicas
           painter: Pintre
           photographer: Fotograf
           plumber: Plombier
+          roofer: Teulissier
+          sawmill: Rèssa
           shoemaker: Sabatièr
+          stonemason: Maçon
           tailor: Sartre
+          window_construction: Construccion de fenèstras
+          winery: Domeni viticòla
           "yes": Botiga d'artesanat
+        crossing: Crosament
         emergency:
+          access_point: Ponch d'accès
           ambulance_station: Depaus d'ambulància
           assembly_point: Punt d'acampada
           defibrillator: Desfibrillador
+          fire_extinguisher: Extintor de fòc
+          fire_water_pond: Bassin d'aiga per incendis
           landing_site: Terren d’aterrissatge d’urgéncia
+          life_ring: Bòia sauvavidas
           phone: Telefòn d'urgéncia
+          siren: Sirena d'urgéncia
+          suction_point: Ponch d'aspiracion d'urgéncia
           water_tank: Cistèrna d'aiga d'urgéncia
         highway:
           abandoned: Autorota abandonada
@@ -647,6 +852,7 @@ oc:
           cycleway: Pista ciclabla
           elevator: Ascensor
           emergency_access_point: Punt d'accès d'urgéncia
+          emergency_bay: Zòna d'urgéncia
           footway: Camin piedonier
           ford: Ga
           give_way: Panèl de cedar lo passatge
@@ -677,35 +883,46 @@ oc:
           tertiary: Rota terciària
           tertiary_link: Rota terciària
           track: Pista
+          traffic_mirror: Mirau de trafec
           traffic_signals: Fuòcs de circulacion
+          trailhead: Ponch de partença
           trunk: Via exprèssa
           trunk_link: Via exprèssa
           turning_loop: Virada en bocla
           unclassified: Rota menora
           "yes": Rota
         historic:
+          aircraft: Avion istoric
           archaeological_site: Site arqueologic
+          bomb_crater: Cratèr de bomba istoric
           battlefield: Prat batalhier
           boundary_stone: Bòrna frontiera
           building: Bastiment istoric
           bunker: Bunker
+          cannon: Canon istoric
           castle: Castèl
+          charcoal_pile: Carboniera istorica
           church: Glèisa
           city_gate: Portau
           citywalls: Muralhas de vila
           fort: Fòrt
           heritage: Site del patrimòni
+          hollow_way: Camins fons
           house: Ostal
           manor: Castelet
           memorial: Memoriau
+          milestone: Boina istorica
           mine: Mina
           mine_shaft: Potz de mina
           monument: Monument
+          railway: Camin de fèrre istoric
           roman_road: Via romana
           ruins: Roïnas
+          rune_stone: Pèira runica
           stone: Pèira
           tomb: Tombèu
           tower: Torre
+          wayside_chapel: Capèla votiva
           wayside_cross: Calvari
           wayside_shrine: Orador
           wreck: Varatge
@@ -714,6 +931,7 @@ oc:
           "yes": Interseccion/Caireforc
         landuse:
           allotments: Òrts familials
+          aquaculture: Aquacultura
           basin: Bacin
           brownfield: Terren rasat, ermàs
           cemetery: Cementèri
@@ -733,9 +951,11 @@ oc:
           military: Zòna militara
           mine: Mina
           orchard: Vergier
+          plant_nursery: Abarbador
           quarry: Peirièra
           railway: Via ferrada
           recreation_ground: Airal de jòcs
+          religious: Terren religiós
           reservoir: Sèrva
           reservoir_watershed: Bacin versant de sèrva
           residential: Zòna residenciala
@@ -744,9 +964,15 @@ oc:
           vineyard: Vinha
           "yes": Usatge del terren
         leisure:
+          adult_gaming_centre: Centre recreatiu per adultes
+          amusement_arcade: Sala recreativa de jòcsvideo
+          bandstand: Quiòsc de la musica
           beach_resort: Estacion balneara
           bird_hide: Obsevatòri ornitologic
+          bleachers: Bancaus
+          bowling_alley: Pista de bòchas
           common: Terrens comunals
+          dance: Balèti
           dog_park: Parc canin
           firepit: Fogau
           fishing: Zòna de pesca
@@ -759,7 +985,9 @@ oc:
           marina: Pòrt de plasença
           miniature_golf: Gòlf miniatura
           nature_reserve: Resèrva naturala
+          outdoor_seating: Assètis exteriors
           park: Pargue
+          picnic_table: Taulas per manjar defòra
           pitch: Terren d'espòrt
           playground: Airal de jòcs
           recreation_ground: Terren de jòcs
@@ -774,13 +1002,20 @@ oc:
           "yes": Lesers
         man_made:
           adit: Galariá d'accès
+          advertising: Publicitat
+          antenna: Antena
+          avalanche_protection: Proteccion còntra avalancas
           beacon: Far
           beehive: Bornhon
           breakwater: Mòle
           bridge: Pont
           bunker_silo: Bunker
+          cairn: Clapàs
           chimney: Chemenèia
+          clearcut: Deboscatge
+          communications_tower: Torre de comunicacions
           crane: Grua
+          cross: Crotz
           dolphin: Pòste d’amarratge
           dyke: Levada
           embankment: tèrraplen
@@ -789,6 +1024,7 @@ oc:
           groyne: Espiga de plaja
           kiln: Forn de terralha
           lighthouse: Far
+          manhole: Tapa de toat
           mast: Biga
           mine: Mina
           mineshaft: Potz de mina
@@ -796,12 +1032,19 @@ oc:
           petroleum_well: Potz petrolifèr
           pier: Peirada
           pipeline: Pipeline
+          pumping_station: Estacion de pompatge
+          reservoir_covered: Depaus cobèrt
           silo: Silò
+          snow_cannon: Canon de nèu
           storage_tank: Cistèrna d'emmagazinatge
+          street_cabinet: Armari tecnic
           surveillance: Susvelhança
+          telescope: Telescòpi
           tower: Torre
+          utility_pole: Biga electrica
           wastewater_plant: Estacion de tractament de las aigas usadas
           watermill: Molin d’aiga
+          water_tap: Robinet d'aiga
           water_tower: Torre d'aiga
           water_well: Potz
           water_works: Sistèma idrolic
@@ -812,15 +1055,20 @@ oc:
           airfield: Terren d'aviacion militara
           barracks: Casèrna
           bunker: Bunker
+          checkpoint: Ponch de contraròtle
+          trench: Trencada
           "yes": Armada
         mountain_pass:
           "yes": Còl de montanha
         natural:
+          atoll: Atòl
+          bare_rock: Rocassiera
           bay: Baia
           beach: Plaja
           cape: Cap
           cave_entrance: Entrada d’espeluca
           cliff: Bauç
+          coastline: Còsta
           crater: Cratèr
           dune: Duna
           fell: Lana
@@ -831,12 +1079,15 @@ oc:
           grassland: Prada
           heath: Bruguièra
           hill: Puèg
+          hot_spring: Fònt termala
           island: Illa
+          isthmus: Friu
           land: Tèrra
           marsh: Sanha
           moor: Tèrra gasta
           mud: Nita
           peak: Pic
+          peninsula: Peninsula
           point: Poncha
           reef: Estèu
           ridge: Cresta
@@ -845,34 +1096,49 @@ oc:
           sand: Sabla
           scree: Esbudèl
           scrub: Brossa
+          shingle: Còdol
           spring: Sorgent
           stone: Pèira
           strait: Estrech
           tree: Arbre
+          tree_row: Renguiera d'aubres
+          tundra: Tondra
           valley: Vau
           volcano: Volcan
           water: Aiga
           wetland: Zòna umida
           wood: Bòsc
+          "yes": Element naturau
         office:
           accountant: Comptable
           administrative: Administracion
+          advertising_agency: Agéncia publicitària
           architect: Arquitècte
           association: Associacion
           company: Societat
+          diplomatic: Burèu diplomatic
           educational_institution: Institucion educativa
           employment_agency: Agéncia per l'emplec
+          energy_supplier: Burèu de fornitura d'energia
           estate_agent: Agent immobilièr
+          financial: Burèu financier
           government: Agéncia governamentala
           insurance: Burèu d'assegurança
           it: Burèu d'informacion
           lawyer: Avocat
+          logistics: Burèu logistic
+          newspaper: Burèu de redaccion d'un jornau
           ngo: Burèu d'una ONG
+          notary: Notari
+          religion: Burèu religiós
+          research: Burèu de recèrca
+          tax_advisor: Consultant fiscau
           telecommunication: Burèus de telecomunicacion
           travel_agent: Agéncia de viatge
           "yes": Burèu
         place:
           allotments: Òrts familials
+          archipelago: Archipèla
           city: Vila
           city_block: Illa d'ostals
           country: País
@@ -887,6 +1153,7 @@ oc:
           locality: Localitat
           municipality: Municipalitat
           neighbourhood: Quartier forestier, escart
+          plot: Parcèla
           postcode: Còdi postal
           quarter: Quartièr
           region: Region
@@ -923,11 +1190,16 @@ oc:
           tram_stop: Arrèst de tram
           yard: Via de triatge
         shop:
+          agrarian: Botiga agricòla
           alcohol: Magazin oficial d'alcoòl
           antiques: Antiquari
+          appliance: Botiga d'aparelhs electrodomestics
           art: Botiga d'art
+          baby_goods: Botiga d'articles per la mainada
           bakery: Fornariá
+          bathroom_furnishing: Mòbles de banh
           beauty: Botiga de produchs de beutat
+          bed: Matalassaria
           beverages: Magazin de bevendas
           bicycle: Botiga de bicicletas
           bookmaker: Ostal d'escomesas
@@ -939,61 +1211,89 @@ oc:
           car_repair: Reparacion d'automobilas
           carpet: Botiga de tapís
           charity: Magazin de benfasença
+          cheese: Fromatgier
           chemist: Farmàcia
+          chocolate: Chocolatier
           clothes: Botga de vestits
+          coffee: Cafeteria
           computer: Magazin informatic
           confectionery: Confisariá
           convenience: Especiariá
           copyshop: Magazin de fotocòpias
           cosmetics: Botiga de cosmetics
+          craft: Fornidudas per l'artesanat
+          curtain: Botiga de cortinas
+          dairy: Lachariá
           deli: Tractaire
           department_store: Grand magazin
           discount: Magazin discount
           doityourself: Botiga de bricolatge
           dry_cleaning: Netejatge a sec
+          e-cigarette: Botiga de cigaretas electronicas
           electronics: Magazin d'electronica
+          erotic: Botiga erotica
           estate_agent: Agent immobilièr
+          fabric: Botiga de teissuts
           farm: Venda de produchs agricòlas
           fashion: Magazin de mòda
+          fishing: Botiga d'accessòris de pesca
           florist: Florista
           food: Botiga d'alimentacion
           funeral_directors: Pompas funèbras
           furniture: Amòblament
           garden_centre: Jardinariá
+          gas: Combustibles
           general: Magazin generalista
           gift: Botiga de presents
           greengrocer: Mercand d’èrbas
           grocery: Especiariá
           hairdresser: Cofaire
           hardware: Quicalhariá
+          health_food: Botiga d'alimentacion naturala
+          hearing_aids: Aparelhs auditius
+          herbalist: Erboristeria
           hifi: Magazin Hi-Fi
           houseware: Venda d’articles per l'ostau
+          ice_cream: Glacier
           interior_decoration: Decoracion d'interior
           jewelry: Joielariá
           kiosk: Quiòsque
           kitchen: Botiga de cosina
           laundry: Bugadariá
+          locksmith: Serralhier
           lottery: Lotariá
           mall: Galariá mercanda
           massage: Massatge
+          medical_supply: Articles sanitaris
           mobile_phone: Botiga de telefòns mobils
+          money_lender: Prestador de sòus
           motorcycle: Magazin de mòto
+          motorcycle_repair: Botiga de radob per motocicletas
           music: Magazin de musica
+          musical_instrument: Instruments de musica
           newsagent: Mercand de jornaus
+          nutrition_supplements: Complements alimentaris
           optician: Optician
           organic: Magazin bio
           outdoor: Venda d’articles d'activitats de plen aire
           paint: Galariá de pintura
+          pastry: Pastissariá
           pawnbroker: Prestaire per gatges
+          perfumery: Perfumaria
           pet: Animalariá
+          pet_grooming: Perruqueria per animaus
           photo: Magazin de fotografia
           seafood: Crustacèus e cauquilhatges de mar
           second_hand: Botiga d’ocasions
+          sewing: Merceria
           shoes: Botiga de cauçaduras
           sports: Magazin d'espòrt
           stationery: Papetariá
+          storage_rental: Depaus de mòbles
           supermarket: Supermercat
           tailor: Sartre
+          tattoo: Botiga de tatoatges
+          tea: Botiga de te
           ticket: Bilhetariá
           tobacco: Burèu de tabat
           toys: Botiga de joguets
@@ -1002,6 +1302,8 @@ oc:
           vacant: Comèrci vacant
           variety_store: Magasin de varietats
           video: Botiga de vidèos
+          video_games: Botiga de jòcsvideo
+          wholesale: Grossista
           wine: Cavista
           "yes": Botiga
         tourism:
@@ -1011,6 +1313,7 @@ oc:
           attraction: Atraccion
           bed_and_breakfast: Aubèrga d’oste
           cabin: Cabanon
+          camp_pitch: Terren de campatge
           camp_site: Campatge
           caravan_site: Site de caravana
           chalet: Aberc
@@ -1024,6 +1327,7 @@ oc:
           picnic_site: Site de picnic
           theme_park: Pargue a tèma
           viewpoint: Amirador
+          wilderness_hut: Sosta rurala
           zoo: Zoo
         tunnel:
           building_passage: Passatge de bastiment
@@ -1050,12 +1354,15 @@ oc:
           "yes": Via navegabla
       admin_levels:
         level2: Frontièra del país
+        level3: Limit regionau
         level4: Frontièra de l’estat
         level5: Frontièra de la region
         level6: Frontièra del comtat
+        level7: Limit municipau
         level8: Limit de la vila
         level9: Limit del vilatge
         level10: Limit de la banlèga
+        level11: Limit de quartier
       types:
         cities: Vilas
         towns: Vilas
@@ -1191,9 +1498,10 @@ oc:
     intro_text: OpenStreetMap es una mapa del mond, creada per de personas coma vos
       e liura d’utilizacion jos licéncia liura.
     intro_2_create_account: Creatz un compte d'utilizaire
-    hosting_partners_html: L'albergament es pres en carga per %{ucl}, %{bytemark},
+    hosting_partners_html: L'aubergament es pres en carga per %{ucl}, %{fastly}, %{bytemark},
       e d'autres %{partners}.
     partners_ucl: UCL
+    partners_fastly: Lèu
     partners_bytemark: Albergament Bytemark
     partners_partners: partenaris
     tou: Condicions d'utilizacion
@@ -1224,6 +1532,7 @@ oc:
       footer: Tanben podètz legir lo comentari sus %{readurl}, lo comentar sus %{commenturl}
         o respondre sus %{replyurl}
     message_notification:
+      subject: '[OpenStreetMap] %{message_title}'
       hi: Bonjorn %{to_user},
       header: '%{from_user} vos a mandat un messatge dempuèi OpenStreetMap amb lo
         subjècte %{subject} :'
@@ -1234,11 +1543,23 @@ oc:
       subject: '[OpenStreetMap] %{user} vos a apondut coma amic'
       had_added_you: '%{user} vos a apondut coma amic dins OpenStreetMap.'
       see_their_profile: 'Podètz veire son perfil aicí : %{userurl}.'
+      see_their_profile_html: 'Podètz veire son perfiu aicí : %{userurl}.'
       befriend_them: 'Tanben, lo podètz apondre coma amic aicí : %{befriendurl}.'
+      befriend_them_html: 'Tanben, lo podètz ajustar coma amic-ga aicí : %{befriendurl}.'
+    gpx_description:
+      description_with_tags_html: 'Sembla que vòstre fichier GPX %{trace_name} amb
+        la descripcion %{trace_description} e leis etiquetas seguentas: %{tags}'
+      description_with_no_tags_html: Sembla que vòstre fichier GPX %{trace_name} amb
+        la descripcion %{trace_description} e sensa etiquetas
     gpx_failure:
+      hi: Bonjorn %{to_user},
       failed_to_import: 'a pas pogut èsser importat. Aquí l''error :'
+      more_info_html: Podètz trobar mai informacion sus lei mancadas d'importacion
+        de GPX e coma leis evitar a %{url}.
+      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Impòrt_Failures
       subject: '[OpenStreetMap] Error al moment de l''impòrt GPX'
     gpx_success:
+      hi: Adieu %{to_user},
       loaded_successfully: s'es cargat correctament amb %{trace_points} punch sus
         %{possible_points}.
       subject: '[OpenStreetMap] Impòrt GPX capitat'
@@ -1275,13 +1596,19 @@ oc:
           vos interessatz'
         your_note: '%{commenter} a daissat un comentari sus una de vòstras nòtas de
           mapa prèp de %{place}.'
+        your_note_html: '%{commenter} a laissat un comentari sus una de vòstrei nòtas
+          de mapa pròche de %{place}.'
         commented_note: '%{commenter} a daissat un comentari sus una de vòstras nòtas
           de mapa qu''avètz comentada. La nòta es pròcha de %{place}.'
+        commented_note_html: '%{commenter} A laissat un comentari en una nòta de mapa
+          qu''aviatz comentat. Aquela nòta es pròcha de %{place}.'
       closed:
         subject_own: '[OpenStreetMap] %{commenter} a resolgut una de vòstras nòtas'
         subject_other: '[OpenStreetMap] %{commenter} que vis i interessàvetz.'
         your_note: '[OpenStreetMap] %{commenter} a resolgut una de vòstras nòtas prèp
           de %{place}.'
+        your_note_html: '%{commenter} A reglat una de vòstrei nòtas de mapa pròche
+          de %{place}.'
         commented_note: '%{commenter} a resolgut una nòta de mapa qu''avètz comentada.
           La nòta es pròcha de %{place}.'
       reopened:
@@ -2088,35 +2415,6 @@ oc:
       delete_user: Suprimir aqueste utilizaire
       confirm: Confirmar
       report: Denonciatz aquel usatgièr
-    account:
-      title: Modificar lo compte
-      my settings: Meis opcions
-      current email address: 'Adreça de corrièr electronic actuala:'
-      external auth: 'Autenticacion extèrna:'
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: qu’es aquò ?
-      public editing:
-        heading: 'Modificacion publica :'
-        enabled: Activat. Pas anonim e pòt modificar las donadas.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: qu’es aquò ?
-        disabled: Desactivadas e sensa permés per editar; lei modificacions anterioras
-          son anonimas.
-        disabled link text: perqué pòdi pas modificar ?
-      public editing note:
-        heading: Modificacion publica
-      contributor terms:
-        heading: 'Tèrmes del contributor :'
-        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ò ?
-      save changes button: Enregistrar las modificacions
-      make edits public button: Rendre totas mas modificacions publicas
-      flash update success confirm needed: Informacions sus l'utilizaire mesas a jorn
-        amb succès. Verificatz vòstra bóstia mail per tal de validar la verificacion
-        de vòstre novèla adreça e-mail.
-      flash update success: Informacions sus l'utilizaire mesas a jorn amb succès.
     set_home:
       flash success: Emplaçament de mon domicili salvat amb succès
     index:
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 5ce9af455..f52aff31c 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -135,6 +135,25 @@ pa:
       entry:
         comment: ਟਿੱਪਣੀ ਕਰੋ
         full: ਪੂਰੀ ਟਿੱਪਣੀ
+  accounts:
+    edit:
+      title: ਖਾਤਾ ਸੋਧੋ
+      my settings: ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ
+      current email address: 'ਮੌਜੂਦਾ ਈਮੇਲ ਪਤਾ:'
+      openid:
+        link text: ਇਹ ਕੀ ਹੈ?
+      public editing:
+        heading: ਜਨਤਕ ਸੁਧਾਈ
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ਇਹ ਕੀ ਹੈ?
+        disabled link text: ਮੈਂ ਸੋਧ ਕਿਉਂ ਨਹੀਂ ਕਰ ਸਕਦਾ?
+      contributor terms:
+        heading: 'ਯੋਗਦਾਨੀ ਦੀਆਂ ਸ਼ਰਤਾਂ:'
+        agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਜਤਾਈ ਹੈ।
+        not yet agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਨਹੀਂ ਜਤਾਈ।
+        link text: ਇਹ ਕੀ ਹੈ?
+      save changes button: ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ
+      make edits public button: ਮੇਰੀਆਂ ਸਾਰੀਆਂ ਸੋਧਾਂ ਜਨਤਕ ਕਰੋ
   browse:
     created: ਬਣਾਇਆ ਗਿਆ
     closed: ਬੰਦ ਹੋਇਆ
@@ -1110,25 +1129,6 @@ pa:
       unhide_user: ਇਸ ਵਰਤੋਂਕਾਰ ਦਾ ਉਹਲਾ ਹਟਾਉ
       delete_user: ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਉ
       confirm: ਤਸਦੀਕ ਕਰੋ
-    account:
-      title: ਖਾਤਾ ਸੋਧੋ
-      my settings: ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ
-      current email address: 'ਮੌਜੂਦਾ ਈਮੇਲ ਪਤਾ:'
-      openid:
-        link text: ਇਹ ਕੀ ਹੈ?
-      public editing:
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ਇਹ ਕੀ ਹੈ?
-        disabled link text: ਮੈਂ ਸੋਧ ਕਿਉਂ ਨਹੀਂ ਕਰ ਸਕਦਾ?
-      public editing note:
-        heading: ਜਨਤਕ ਸੁਧਾਈ
-      contributor terms:
-        heading: 'ਯੋਗਦਾਨੀ ਦੀਆਂ ਸ਼ਰਤਾਂ:'
-        agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਜਤਾਈ ਹੈ।
-        not yet agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਨਹੀਂ ਜਤਾਈ।
-        link text: ਇਹ ਕੀ ਹੈ?
-      save changes button: ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ
-      make edits public button: ਮੇਰੀਆਂ ਸਾਰੀਆਂ ਸੋਧਾਂ ਜਨਤਕ ਕਰੋ
     index:
       title: ਵਰਤੋਂਕਾਰ
       heading: ਵਰਤੋਂਕਾਰ
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 42f419a72..0fbd0e24c 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -329,6 +329,48 @@ pl:
       entry:
         comment: Komentarz
         full: Pełna treść uwagi
+  accounts:
+    edit:
+      title: Zmiana ustawień konta
+      my settings: Ustawienia
+      current email address: 'Aktualny adres e-mail:'
+      external auth: 'Zewnętrzne uwierzytelnienie:'
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/Pl:OpenID
+        link text: co to jest?
+      public editing:
+        heading: Publiczna edycja
+        enabled: Włączone. Nieanonimowy i uprawniony do edycji danych.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: co to jest?
+        disabled: Wyłączone i nieuprawniony do edycji danych, wszystkie wcześniejsze
+          edycje są anonimowe.
+        disabled link text: dlaczego nie mogę mapować?
+      public editing note:
+        heading: 'Edycje publiczne:'
+        html: Obecnie twoje edycje są anonimowe i ludzie nie mogą wysyłać do ciebie
+          wiadomości lub zobaczyć twojej lokalizacji. Aby pokazać, co edytowałeś i
+          umożliwić ludziom kontakt z tobą za pośrednictwem strony internetowej, kliknij
+          przycisk poniżej. <b>W międzyczasie API 0.6 zmienił się, jedynie publiczni
+          użytkownicy mogą edytować dane mapy. </b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">dowiedz
+          się dlaczego</a>).<ul><li>Twój adres e-mail nie zostanie ujawniony przez
+          stanie się publicznym. Tej akcji nie można cofnąć i wszyscy nowi użytkownicy
+          są już domyślnie publiczni.</ul></li>
+      contributor terms:
+        heading: 'Warunki uczestnictwa:'
+        agreed: Wyrażono zgodę na nowe Warunki Uczestnictwa.
+        not yet agreed: Nie wyrażono zgody na nowe Warunki Uczestnictwa.
+        review link text: Na tej stronie możesz zapoznać się z nowymi Warunkami Uczestnictwa
+          i je zaakceptować.
+        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?
+      save changes button: Zapisz zmiany
+      make edits public button: Niech wszystkie edycje będą publiczne.
+    update:
+      success_confirm_needed: Zaktualizowano profil użytkownika.  Sprawdź, czy przyszedł
+        już mail potwierdzający nowy adres mailowy.
+      success: Zaktualizowano profil użytkownika.
   browse:
     created: Utworzone
     closed: Zamknięte
@@ -2758,46 +2800,6 @@ pl:
       delete_user: Usuń tego użytkownika
       confirm: Potwierdź
       report: zgłoś tego użytkownika
-    account:
-      title: Zmiana ustawień konta
-      my settings: Ustawienia
-      current email address: 'Aktualny adres e-mail:'
-      external auth: 'Zewnętrzne uwierzytelnienie:'
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/Pl:OpenID
-        link text: co to jest?
-      public editing:
-        heading: 'Edycje publiczne:'
-        enabled: Włączone. Nieanonimowy i uprawniony do edycji danych.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: co to jest?
-        disabled: Wyłączone i nieuprawniony do edycji danych, wszystkie wcześniejsze
-          edycje są anonimowe.
-        disabled link text: dlaczego nie mogę mapować?
-      public editing note:
-        heading: Publiczna edycja
-        html: Obecnie twoje edycje są anonimowe i ludzie nie mogą wysyłać do ciebie
-          wiadomości lub zobaczyć twojej lokalizacji. Aby pokazać, co edytowałeś i
-          umożliwić ludziom kontakt z tobą za pośrednictwem strony internetowej, kliknij
-          przycisk poniżej. <b>W międzyczasie API 0.6 zmienił się, jedynie publiczni
-          użytkownicy mogą edytować dane mapy. </b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">dowiedz
-          się dlaczego</a>).<ul><li>Twój adres e-mail nie zostanie ujawniony przez
-          stanie się publicznym. Tej akcji nie można cofnąć i wszyscy nowi użytkownicy
-          są już domyślnie publiczni.</ul></li>
-      contributor terms:
-        heading: 'Warunki uczestnictwa:'
-        agreed: Wyrażono zgodę na nowe Warunki Uczestnictwa.
-        not yet agreed: Nie wyrażono zgody na nowe Warunki Uczestnictwa.
-        review link text: Na tej stronie możesz zapoznać się z nowymi Warunkami Uczestnictwa
-          i je zaakceptować.
-        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?
-      save changes button: Zapisz zmiany
-      make edits public button: Niech wszystkie edycje będą publiczne.
-      flash update success confirm needed: Zaktualizowano profil użytkownika.  Sprawdź,
-        czy przyszedł już mail potwierdzający nowy adres mailowy.
-      flash update success: Zaktualizowano profil użytkownika.
     set_home:
       flash success: Zapisano nowe położenie domu
     go_public:
diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index b92367d2b..91a3b62a6 100644
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -72,6 +72,16 @@ ps:
     default: تلواليز (اوسنی %{name})
     id:
       name: iD
+  accounts:
+    edit:
+      my settings: زما امستنې
+      openid:
+        link text: دا څه دی؟
+      public editing:
+        enabled link text: دا څه دی؟
+      contributor terms:
+        link text: دا څه دی؟
+      save changes button: بدلونونه خوندي کول
   browse:
     created: جوړ شو
     closed: تړل شوی
@@ -419,15 +429,6 @@ ps:
       unhide_user: دا کارن ښکاره کول
       delete_user: دا کارن ړنگول
       confirm: تاييد
-    account:
-      my settings: زما امستنې
-      openid:
-        link text: دا څه دی؟
-      public editing:
-        enabled link text: دا څه دی؟
-      contributor terms:
-        link text: دا څه دی؟
-      save changes button: بدلونونه خوندي کول
     index:
       title: کارنان
       heading: کارنان
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index c7aed78e0..f174f576a 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -297,6 +297,49 @@ pt-BR:
       entry:
         comment: Comentário
         full: Nota completa
+  accounts:
+    edit:
+      title: Editar conta
+      my settings: Minhas configurações
+      current email address: Endereço de e-mail atual
+      external auth: Autenticação externa
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: o que é isto?
+      public editing:
+        heading: Edição pública
+        enabled: Ativado. Não é anônimo e pode editar dados.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: o que é isso?
+        disabled: Desativado e não pode editar dados, todas as edições anteriores
+          são anônimas.
+        disabled link text: porque não posso editar?
+      public editing note:
+        heading: Edição pública
+        html: Neste momento as suas edições são anónimas e as outras pessoas não lhe
+          podem enviar mensagens nem ver onde se encontra. Para mostrar as suas edições
+          e permitir que o contactem através do OpenStreetMap, clique na ligação seguinte.
+          <b>Desde a migração 0.6 da API, apenas os usuários com edições públicas
+          podem editar dados do mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">mais
+          informações</a>).<ul><li>Ao tornar as suas edições públicas o seu endereço
+          de e-mail não será revelado.</li><li>Esta ação não pode ser revertida e
+          todos os novos utilizadores têm as edições disponibilizadas publicamente.</li></ul>
+      contributor terms:
+        heading: Termos do contribuidor
+        agreed: Você aceitou os novos termos do contribuidor.
+        not yet agreed: Você não aceitou os novos termos do contribuidor.
+        review link text: Por favor siga este link quando você puder para revisar
+          e aceitar os novos Termos de Contribuição.
+        agreed_with_pd: Você também declara que considera suas edições em Domínio
+          Público.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: o que é isso?
+      save changes button: Salvar alterações
+      make edits public button: Tornar públicas todas as minhas edições
+    update:
+      success_confirm_needed: Informação de usuário atualizada com sucesso. Confira
+        o seu e-mail para confirmar seu novo endereço.
+      success: Sucesso ao atualizar informação de usuário.
   browse:
     created: Criado
     closed: Fechado
@@ -2726,47 +2769,6 @@ pt-BR:
       delete_user: Excluir este usuário
       confirm: Confirmar
       report: Denunciar este usuário
-    account:
-      title: Editar conta
-      my settings: Minhas configurações
-      current email address: Endereço de e-mail atual
-      external auth: Autenticação externa
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: o que é isto?
-      public editing:
-        heading: Edição pública
-        enabled: Ativado. Não é anônimo e pode editar dados.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: o que é isso?
-        disabled: Desativado e não pode editar dados, todas as edições anteriores
-          são anônimas.
-        disabled link text: porque não posso editar?
-      public editing note:
-        heading: Edição pública
-        html: Neste momento as suas edições são anónimas e as outras pessoas não lhe
-          podem enviar mensagens nem ver onde se encontra. Para mostrar as suas edições
-          e permitir que o contactem através do OpenStreetMap, clique na ligação seguinte.
-          <b>Desde a migração 0.6 da API, apenas os usuários com edições públicas
-          podem editar dados do mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">mais
-          informações</a>).<ul><li>Ao tornar as suas edições públicas o seu endereço
-          de e-mail não será revelado.</li><li>Esta ação não pode ser revertida e
-          todos os novos utilizadores têm as edições disponibilizadas publicamente.</li></ul>
-      contributor terms:
-        heading: Termos do contribuidor
-        agreed: Você aceitou os novos termos do contribuidor.
-        not yet agreed: Você não aceitou os novos termos do contribuidor.
-        review link text: Por favor siga este link quando você puder para revisar
-          e aceitar os novos Termos de Contribuição.
-        agreed_with_pd: Você também declara que considera suas edições em Domínio
-          Público.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: o que é isso?
-      save changes button: Salvar alterações
-      make edits public button: Tornar públicas todas as minhas edições
-      flash update success confirm needed: Informação de usuário atualizada com sucesso.
-        Confira o seu e-mail para confirmar seu novo endereço.
-      flash update success: Sucesso ao atualizar informação de usuário.
     set_home:
       flash success: Local principal salvo com sucesso
     go_public:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index f7fca4aea..775fff87c 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -286,6 +286,49 @@ pt-PT:
       entry:
         comment: Comentário
         full: Nota completa
+  accounts:
+    edit:
+      title: Editar conta
+      my settings: Definições
+      current email address: E-mail atual
+      external auth: Autenticação externa
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: o que é isto?
+      public editing:
+        heading: Edição pública
+        enabled: Ativado. Não é anónimo e pode editar dados.
+        enabled link: https://wiki.openstreetmap.org/wiki/Pt:Anonymous_edits
+        enabled link text: o que é isto?
+        disabled: Desativado e não pode editar. Todas as edições anteriores são anónimas.
+        disabled link text: porque não posso editar?
+      public editing note:
+        heading: Edição pública
+        html: Neste momento, as tuas edições são anónimas e as outras pessoas não
+          te podem enviar mensagens nem ver a tua localização. Para mostrares as tuas
+          edições e permitires que te contactem através do OpenStreetMap, clica na
+          ligação seguinte. <b>Desde a migração 0.6 da API, apenas os utilizadores
+          com edições públicas podem editar dados do mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">mais
+          informações</a>).<ul><li>Ao tornares as tuas edições públicas, o teu endereço
+          de correio eletrónico não será revelado.</li><li>Esta ação não pode ser
+          revertida e todos os novos utilizadores têm as edições disponibilizadas
+          publicamente.</li></ul>
+      contributor terms:
+        heading: Termos de contribuidor
+        agreed: Aceitaste os novos Termos de Contribuidor.
+        not yet agreed: Ainda não aceitaste os novos Termos de Contribuidor.
+        review link text: Por favor, clica na ligação seguinte para reveres e aceitares
+          os novos Termos de Contribuidor.
+        agreed_with_pd: Também declaraste que as tuas edições são disponibilizadas
+          em Domínio Público.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: o que é isto?
+      save changes button: Gravar alterações
+      make edits public button: Tornar todas as minhas edições públicas
+    update:
+      success_confirm_needed: As informações de utilizador foram atualizadas com sucesso.
+        Verifica o teu e-mail para confirmares o teu novo endereço eletrónico.
+      success: Informações de utilizador atualizadas com sucesso.
   browse:
     created: Criado
     closed: Fechado
@@ -568,6 +611,9 @@ pt-PT:
         title: Publicações no diário de mapeadores do OpenStreetMap
         description: Publicações recentes no diário OpenStreetMap
     comments:
+      title: Comentários no Diário feitos por %{user}
+      heading: Comentários no Diário de %{user}
+      subheading_html: Comentários no Diário feitos por %{user}
       no_comments: Sem comentários no diário
       post: Publicação
       when: Quando
@@ -892,6 +938,7 @@ pt-PT:
           trailhead: Marco de caminho
           trunk: Via rápida
           trunk_link: Via rápida
+          turning_circle: Círculo de viragem
           turning_loop: Anel de viragem
           unclassified: Estrada sem classificação
           "yes": Estrada
@@ -2715,47 +2762,6 @@ pt-PT:
       delete_user: Eliminar este utilizador
       confirm: Confirmar
       report: Denunciar este utilizador
-    account:
-      title: Editar conta
-      my settings: Definições
-      current email address: E-mail atual
-      external auth: Autenticação externa
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: o que é isto?
-      public editing:
-        heading: Edição pública
-        enabled: Ativado. Não é anónimo e pode editar dados.
-        enabled link: https://wiki.openstreetmap.org/wiki/Pt:Anonymous_edits
-        enabled link text: o que é isto?
-        disabled: Desativado e não pode editar. Todas as edições anteriores são anónimas.
-        disabled link text: porque não posso editar?
-      public editing note:
-        heading: Edição pública
-        html: Neste momento, as tuas edições são anónimas e as outras pessoas não
-          te podem enviar mensagens nem ver a tua localização. Para mostrares as tuas
-          edições e permitires que te contactem através do OpenStreetMap, clica na
-          ligação seguinte. <b>Desde a migração 0.6 da API, apenas os utilizadores
-          com edições públicas podem editar dados do mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">mais
-          informações</a>).<ul><li>Ao tornares as tuas edições públicas, o teu endereço
-          de correio eletrónico não será revelado.</li><li>Esta ação não pode ser
-          revertida e todos os novos utilizadores têm as edições disponibilizadas
-          publicamente.</li></ul>
-      contributor terms:
-        heading: Termos de contribuidor
-        agreed: Aceitaste os novos Termos de Contribuidor.
-        not yet agreed: Ainda não aceitaste os novos Termos de Contribuidor.
-        review link text: Por favor, clica na ligação seguinte para reveres e aceitares
-          os novos Termos de Contribuidor.
-        agreed_with_pd: Também declaraste que as tuas edições são disponibilizadas
-          em Domínio Público.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: o que é isto?
-      save changes button: Gravar alterações
-      make edits public button: Tornar todas as minhas edições públicas
-      flash update success confirm needed: As informações de utilizador foram atualizadas
-        com sucesso. Verifica o teu e-mail para confirmares o teu novo endereço eletrónico.
-      flash update success: Informações de utilizador atualizadas com sucesso.
     set_home:
       flash success: Localização gravada com êxito
     go_public:
@@ -2790,6 +2796,7 @@ pt-PT:
       no_authorization_code: Sem código de autorização
       unknown_signature_algorithm: Algoritmo de assinatura desconhecido
       invalid_scope: Âmbito inválido
+      unknown_error: Falha na autenticação
     auth_association:
       heading: O teu ID ainda não está associado a uma conta do OpenStreetMap.
       option_1: Se ainda não tens conta no OpenStreetMap, por favor, preenche o seguinte
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 19c8bda54..0a53e5a37 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -265,6 +265,49 @@ ro:
       entry:
         comment: Comentariu
         full: Notă completă
+  accounts:
+    edit:
+      title: Modificare cont
+      my settings: Setările mele
+      current email address: Adresa de e-mail actuală
+      external auth: Autentificare externă
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: Ce este aceasta?
+      public editing:
+        heading: 'Editarea publică:'
+        enabled: Activat. Nu este anonim și poate edita date.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Ce este aceasta?
+        disabled: Dezactivat și nu poate edita date, toate editările anterioare sunt
+          anonime.
+        disabled link text: de ce nu pot edita?
+      public editing note:
+        heading: Editare publică
+        html: În prezent, editările dvs. sunt anonime, iar utilizatorii nu vă pot
+          trimite mesaje sau să vă vadă locația. Pentru a arăta ceea ce ați editat
+          și a permite oamenilor să vă contacteze prin intermediul site-ului, faceți
+          clic pe butonul de mai jos. <b>De la schimbarea cu 0,6 API, numai utilizatorii
+          publici pot edita date de hartă</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">find
+          out why</a>).<ul><li>Adresa dvs. de e-mail nu va fi dezvăluită prin faptul
+          că devine publică.</li><li> Această acțiune nu poate fi inversată și toți
+          utilizatorii noi sunt acum publici în mod implicit.</li></ul>
+      contributor terms:
+        heading: Termenii contribuitorului
+        agreed: Ați fost de acord cu noii Termeni ai Contributorului.
+        not yet agreed: Încă nu ați fost de acord cu noii Termeni de Contributor.
+        review link text: Vă rugăm să urmați acest link la comoditatea dvs. pentru
+          a revizui și accepta noii Termeni de Contributor.
+        agreed_with_pd: De asemenea, ați declarat că considerați că editările dvs.
+          sunt în Domeniul Public.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Ce este aceasta?
+      save changes button: Salvează modificările
+      make edits public button: Faceți toate editările mele publice
+    update:
+      success_confirm_needed: Informațiile despre utilizator s-au actualizat cu succes.
+        Verificați e-mailul pentru o notă pentru a confirma noua adresă de e-mail.
+      success: Informațiile despre utilizator s-au actualizat cu succes.
   browse:
     created: Creat
     closed: Închis
@@ -2588,48 +2631,6 @@ ro:
       delete_user: Șterge acest utilizator
       confirm: Confirmă
       report: Reclamă acest utilizator
-    account:
-      title: Modificare cont
-      my settings: Setările mele
-      current email address: Adresa de e-mail actuală
-      external auth: Autentificare externă
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: Ce este aceasta?
-      public editing:
-        heading: Editare publică
-        enabled: Activat. Nu este anonim și poate edita date.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Ce este aceasta?
-        disabled: Dezactivat și nu poate edita date, toate editările anterioare sunt
-          anonime.
-        disabled link text: de ce nu pot edita?
-      public editing note:
-        heading: 'Editarea publică:'
-        html: În prezent, editările dvs. sunt anonime, iar utilizatorii nu vă pot
-          trimite mesaje sau să vă vadă locația. Pentru a arăta ceea ce ați editat
-          și a permite oamenilor să vă contacteze prin intermediul site-ului, faceți
-          clic pe butonul de mai jos. <b>De la schimbarea cu 0,6 API, numai utilizatorii
-          publici pot edita date de hartă</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">find
-          out why</a>).<ul><li>Adresa dvs. de e-mail nu va fi dezvăluită prin faptul
-          că devine publică.</li><li> Această acțiune nu poate fi inversată și toți
-          utilizatorii noi sunt acum publici în mod implicit.</li></ul>
-      contributor terms:
-        heading: Termenii contribuitorului
-        agreed: Ați fost de acord cu noii Termeni ai Contributorului.
-        not yet agreed: Încă nu ați fost de acord cu noii Termeni de Contributor.
-        review link text: Vă rugăm să urmați acest link la comoditatea dvs. pentru
-          a revizui și accepta noii Termeni de Contributor.
-        agreed_with_pd: De asemenea, ați declarat că considerați că editările dvs.
-          sunt în Domeniul Public.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Ce este aceasta?
-      save changes button: Salvează modificările
-      make edits public button: Faceți toate editările mele publice
-      flash update success confirm needed: Informațiile despre utilizator s-au actualizat
-        cu succes. Verificați e-mailul pentru o notă pentru a confirma noua adresă
-        de e-mail.
-      flash update success: Informațiile despre utilizator s-au actualizat cu succes.
     set_home:
       flash success: Locația locuinței a fost salvată cu succes
     go_public:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9ed958ebe..50ac79391 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -355,6 +355,49 @@ ru:
       entry:
         comment: Комментарий
         full: Полный текст
+  accounts:
+    edit:
+      title: Изменить учетную запись
+      my settings: Мои настройки
+      current email address: Текущий адрес электронной почты
+      external auth: 'Внешняя аутентификация:'
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/RU:OpenID
+        link text: что это?
+      public editing:
+        heading: Общедоступная правка
+        enabled: Включено. Можно редактировать. Правки не анонимны.
+        enabled link: https://wiki.openstreetmap.org/wiki/RU:%D0%90%D0%BD%D0%BE%D0%BD%D0%B8%D0%BC%D0%BD%D1%8B%D0%B5_%D0%BF%D1%80%D0%B0%D0%B2%D0%BA%D0%B8
+        enabled link text: что это?
+        disabled: Отключён и не может вносить правки, все предыдущие изменения анонимны.
+        disabled link text: почему я не могу вносить изменения?
+      public editing note:
+        heading: Общедоступная правка
+        html: В настоящий момент ваши правки анонимны и никто не может отправлять
+          вам сообщения или видеть ваше местоположение. Чтобы указать авторство своих
+          правок и позволить другим связываться с вами через вебсайт, нажмите на кнопку
+          внизу. <b>После перехода на API  версии 0.6, только доступные для связи
+          пользователи могут править данные карты</b>. (<a href="https://wiki.openstreetmap.org/wiki/RU:%D0%90%D0%BD%D0%BE%D0%BD%D0%B8%D0%BC%D0%BD%D1%8B%D0%B5_%D0%BF%D1%80%D0%B0%D0%B2%D0%BA%D0%B8">узнайте,
+          почему</a>).<ul> <li>Ваш адрес электронной почты не будет раскрыт для других,
+          но связаться с вами будет возможно.</li> <li>Это действие не имеет обратной
+          силы, а все новые пользователи теперь доступны для связи по умолчанию.</li>
+          </ul>
+      contributor terms:
+        heading: Условия участия
+        agreed: Вы согласились с новыми Условиями участия.
+        not yet agreed: Вы ещё не согласились с новыми Условиями участия.
+        review link text: Пожалуйста, перейдите по этой ссылке в удобное для вас время
+          и подтвердите согласие с новыми Условиями участия.
+        agreed_with_pd: Вы также заявили, что вы считаете свои правки находящимися
+          в общественном достоянии.
+        link: http://wiki.openstreetmap.org/wiki/RU:Open_Database_License/Contributor_Terms?uselang=ru
+        link text: что это?
+      save changes button: Сохранить изменения
+      make edits public button: Сделать все мои правки доступными
+    update:
+      success_confirm_needed: Информация о пользователе успешно обновлена. Проверьте
+        свою электронную почту для подтверждения вашего нового адреса.
+      success: Информация о пользователе успешно обновлена.
   browse:
     created: Создано
     closed: Закрыто
@@ -553,7 +596,7 @@ ru:
       nearby mapper: Ближайший картограф
       friend: Друг
     show:
-      title: Моя стена
+      title: Мой пульт
       no_home_location_html: '%{edit_profile_link} и установите ваше местоположение,
         чтобы видеть близлежащих  пользователей.'
       edit_your_profile: Отредактируйте свой профиль
@@ -2724,47 +2767,6 @@ ru:
       delete_user: Удалить этого пользователя
       confirm: Подтвердить
       report: Сообщить об этом пользователе
-    account:
-      title: Изменить учетную запись
-      my settings: Мои настройки
-      current email address: Текущий адрес электронной почты
-      external auth: 'Внешняя аутентификация:'
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/RU:OpenID
-        link text: что это?
-      public editing:
-        heading: Общедоступная правка
-        enabled: Включено. Можно редактировать. Правки не анонимны.
-        enabled link: https://wiki.openstreetmap.org/wiki/RU:%D0%90%D0%BD%D0%BE%D0%BD%D0%B8%D0%BC%D0%BD%D1%8B%D0%B5_%D0%BF%D1%80%D0%B0%D0%B2%D0%BA%D0%B8
-        enabled link text: что это?
-        disabled: Отключён и не может вносить правки, все предыдущие изменения анонимны.
-        disabled link text: почему я не могу вносить изменения?
-      public editing note:
-        heading: Общедоступная правка
-        html: В настоящий момент ваши правки анонимны и никто не может отправлять
-          вам сообщения или видеть ваше местоположение. Чтобы указать авторство своих
-          правок и позволить другим связываться с вами через вебсайт, нажмите на кнопку
-          внизу. <b>После перехода на API  версии 0.6, только доступные для связи
-          пользователи могут править данные карты</b>. (<a href="https://wiki.openstreetmap.org/wiki/RU:%D0%90%D0%BD%D0%BE%D0%BD%D0%B8%D0%BC%D0%BD%D1%8B%D0%B5_%D0%BF%D1%80%D0%B0%D0%B2%D0%BA%D0%B8">узнайте,
-          почему</a>).<ul> <li>Ваш адрес электронной почты не будет раскрыт для других,
-          но связаться с вами будет возможно.</li> <li>Это действие не имеет обратной
-          силы, а все новые пользователи теперь доступны для связи по умолчанию.</li>
-          </ul>
-      contributor terms:
-        heading: Условия участия
-        agreed: Вы согласились с новыми Условиями участия.
-        not yet agreed: Вы ещё не согласились с новыми Условиями участия.
-        review link text: Пожалуйста, перейдите по этой ссылке в удобное для вас время
-          и подтвердите согласие с новыми Условиями участия.
-        agreed_with_pd: Вы также заявили, что вы считаете свои правки находящимися
-          в общественном достоянии.
-        link: http://wiki.openstreetmap.org/wiki/RU:Open_Database_License/Contributor_Terms?uselang=ru
-        link text: что это?
-      save changes button: Сохранить изменения
-      make edits public button: Сделать все мои правки доступными
-      flash update success confirm needed: Информация о пользователе успешно обновлена.
-        Проверьте свою электронную почту для подтверждения вашего нового адреса.
-      flash update success: Информация о пользователе успешно обновлена.
     set_home:
       flash success: Домашнее местоположение сохранено
     go_public:
diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index c3bdbbf21..1659a8f3d 100644
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -126,6 +126,18 @@ sat:
       entry:
         comment: ᱚᱠᱛᱟ
         full: ᱜᱚᱴᱟ ᱠᱷᱟᱴᱟᱹ ᱚᱞ
+  accounts:
+    edit:
+      title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
+      my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
+      current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
+      openid:
+        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+      public editing:
+        enabled link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+      contributor terms:
+        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+      save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
   browse:
     created: ᱛᱮᱭᱟᱨᱱᱟ
     closed: ᱵᱚᱸᱫᱚ
@@ -660,17 +672,6 @@ sat:
       user location: ᱵᱮᱵᱷᱟᱨᱤᱡ-ᱟ ᱡᱟᱭᱜᱟ
       comments: ᱚᱠᱛᱟᱠᱚ
       confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
-    account:
-      title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
-      my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
-      current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
-      openid:
-        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      public editing:
-        enabled link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      contributor terms:
-        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 0d84368b8..a39142550 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -134,6 +134,9 @@ sc:
       entry:
         comment: Cummentu
         full: Nota intrea
+  accounts:
+    edit:
+      save changes button: Sarva sas modìficas
   browse:
     created: Creadu
     closed: Serradu
@@ -931,8 +934,6 @@ sc:
       edits: Modìficas
       description: Descritzione
       confirm: Cunfirma
-    account:
-      save changes button: Sarva sas modìficas
   user_role:
     grant:
       confirm: Cunfirma
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 177275a22..1fe8faca9 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -182,6 +182,50 @@ scn:
       entry:
         comment: Cummentu
         full: Nota cumpleta
+  accounts:
+    edit:
+      title: Cancia lu cuntu
+      my settings: Li mè mpustazzioni
+      current email address: Nnirizzu email attuali
+      external auth: Autinticazzioni esterna
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/IT:OpenID
+        link text: chi voli diri?
+      public editing:
+        heading: Canciamenti pùbblici
+        enabled: Attivati. Nun sî anònimu e poi canciari li dati.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: chi voli diri?
+        disabled: Disattivati, e nun poi canciari li dati, tutti li canciamenti pricidenti
+          sunnu anònimi.
+        disabled link text: pirchì nun pozzu fari canciamenti?
+      public editing note:
+        heading: Canciamenti pùbblici
+        html: Com'a ora li tò canciamenti sunnu anònimi e li genti nun ti ponnu mannari
+          missaggi o vìdiri unni sî. Pi fari vìdiri chiddu chi canci e pirmèttiri
+          ê genti di cuntattàriti pi menzu dû situ web, carca lu buttuni cassutta.
+          <b>A pàrtiri dâ ntroduzzioni di l'API 0.6, sulu l'utenti pùbblici ponnu
+          canciari li dati dâ carta</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">vidi
+          pirchì</a>).<ul><li>Si addiventi n'utenti pùbblicu lu tò nnirizzu di posta
+          è pùbblicatu.</li><li>Sta dicisioni nun si pò annullari, e a accuminzari
+          d'ora tutti l'utenti novi sù pùbblici comu mpustazzioni pridifinuta.</li></ul>
+      contributor terms:
+        heading: Cunnizzioni di cuntribbuzzioni
+        agreed: Accittasti li cunnizzioni di cuntribbuzzioni novi.
+        not yet agreed: Ancora nun accittasti li cunnizzioni di cuntribbuzzioni novi.
+        review link text: Quannu voi tu vai nta stu link pi lèggiri e accittari li
+          cunnizzioni di cuntribbuzzioni novi.
+        agreed_with_pd: Dichiarasti macari chi cunzìddiri li tò canciamenti ntô Duminiu
+          Pùbblicu.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: chi voli diri?
+      save changes button: Sarva li canciamenti
+      make edits public button: Arrenni tutti li mè canciamenti pùbblici
+    update:
+      success_confirm_needed: Li nfurmazzioni di l'utenti foru aggiurnati boni. Cuntrolla
+        la tò posta elittrònica chi t'havi a arrivari nu missaggiu pi cunfirmari lu
+        nnirizzu di posta novu.
+      success: Li nfurmazzioni di l'utenti foru aggiurnati boni.
   browse:
     created: Criatu
     closed: Chiudutu
@@ -234,6 +278,9 @@ scn:
       title_html: 'Rilazzioni: %{name}'
       history_title_html: 'Crunuluggìa dâ rilazzioni: %{name}'
       members: Mèmmiri
+      members_count:
+        one: 1 mèmmiru
+        other: '%{count} mèmmiri'
     relation_member:
       entry_role_html: '%{type} %{name} comu %{role}'
       type:
@@ -1978,48 +2025,6 @@ scn:
       unhide_user: Ammustra a st'utenti
       delete_user: Cancella a st'utenti
       confirm: Cunferma
-    account:
-      title: Cancia lu cuntu
-      my settings: Li mè mpustazzioni
-      current email address: Nnirizzu email attuali
-      external auth: Autinticazzioni esterna
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/IT:OpenID
-        link text: chi voli diri?
-      public editing:
-        heading: Canciamenti pùbblici
-        enabled: Attivati. Nun sî anònimu e poi canciari li dati.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: chi voli diri?
-        disabled: Disattivati, e nun poi canciari li dati, tutti li canciamenti pricidenti
-          sunnu anònimi.
-        disabled link text: pirchì nun pozzu fari canciamenti?
-      public editing note:
-        heading: Canciamenti pùbblici
-        html: Com'a ora li tò canciamenti sunnu anònimi e li genti nun ti ponnu mannari
-          missaggi o vìdiri unni sî. Pi fari vìdiri chiddu chi canci e pirmèttiri
-          ê genti di cuntattàriti pi menzu dû situ web, carca lu buttuni cassutta.
-          <b>A pàrtiri dâ ntroduzzioni di l'API 0.6, sulu l'utenti pùbblici ponnu
-          canciari li dati dâ carta</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">vidi
-          pirchì</a>).<ul><li>Si addiventi n'utenti pùbblicu lu tò nnirizzu di posta
-          è pùbblicatu.</li><li>Sta dicisioni nun si pò annullari, e a accuminzari
-          d'ora tutti l'utenti novi sù pùbblici comu mpustazzioni pridifinuta.</li></ul>
-      contributor terms:
-        heading: Cunnizzioni di cuntribbuzzioni
-        agreed: Accittasti li cunnizzioni di cuntribbuzzioni novi.
-        not yet agreed: Ancora nun accittasti li cunnizzioni di cuntribbuzzioni novi.
-        review link text: Quannu voi tu vai nta stu link pi lèggiri e accittari li
-          cunnizzioni di cuntribbuzzioni novi.
-        agreed_with_pd: Dichiarasti macari chi cunzìddiri li tò canciamenti ntô Duminiu
-          Pùbblicu.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: chi voli diri?
-      save changes button: Sarva li canciamenti
-      make edits public button: Arrenni tutti li mè canciamenti pùbblici
-      flash update success confirm needed: Li nfurmazzioni di l'utenti foru aggiurnati
-        boni. Cuntrolla la tò posta elittrònica chi t'havi a arrivari nu missaggiu
-        pi cunfirmari lu nnirizzu di posta novu.
-      flash update success: Li nfurmazzioni di l'utenti foru aggiurnati boni.
     set_home:
       flash success: Pusizzioni basi sarvata bona.
     go_public:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index c9d52bed9..491206ff9 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -90,6 +90,9 @@ sco:
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
+  accounts:
+    edit:
+      title: Eedit accoont
   browse:
     created: Creatit
     closed: Closed
@@ -1066,8 +1069,6 @@ sco:
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location
-    account:
-      title: Eedit accoont
   javascripts:
     notes:
       new:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index b369d635b..2af89683e 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -178,6 +178,46 @@ sk:
       entry:
         comment: Komentár
         full: Celá poznámka
+  accounts:
+    edit:
+      title: Upraviť účet
+      my settings: Moje nastavenia
+      current email address: Aktuálna e-mailová adresa
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/CS:OpenID
+        link text: čo to znamená?
+      public editing:
+        heading: Úprava pre verejnosť
+        enabled: Zapnuté. Nie je anonym a môže upravovať údaje.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: čo to znamená?
+        disabled: Vypnutý a nemôže upravovať údaje, všetky predchádzajúce úpravy sú
+          anonymné.
+        disabled link text: prečo nemôžem upravovať?
+      public editing note:
+        heading: 'Verejné úpravy:'
+        html: Teraz upravujete ako anonym a ostatní Vám nemôžu poslať správy, alebo
+          vidieť vaše domovské miesto. Ukážte čo upravujete a dovoľte ostatným kontaktovať
+          Vás cez webovú stránku, kliknite na tlačítko dolu. <b>Od API verzie 0.6,
+          iba používateľ, ktorý povolil svoje úpravy verejnosti, môže upravovať mapové
+          údaje</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">zistiť
+          prečo</a>).<ul><li>Vaša emailová adresa nebude odhalená pre verejnosť.</li><li>Táto
+          akcia sa nedá vrátiť späť a všetci noví používatelia sú už implicitne verejní.</li></ul>
+      contributor terms:
+        heading: 'Podmienky prispievania:'
+        agreed: Súhlasili ste s novými Podmienkami prispievania.
+        not yet agreed: Zatiaľ ste neodsúhlasili nové Podmienky prispievania.
+        review link text: Keď budete mať čas, pomocou tohoto odkazu si prosím prečítajte
+          a odsúhlaste nové Podmienky prispievania.
+        agreed_with_pd: Deklarovali ste tiež, že svoje úpravy považujete za slobodné
+          dielo.
+        link text: čo to znamená?
+      save changes button: Uložiť zmeny
+      make edits public button: Zverejniť všetky moje úpravy
+    update:
+      success_confirm_needed: Používateľské údaje boli úspešne aktualizované. Skontrolujte
+        si e-mail, mala by Vám prísť výzva na potvrdenie novej e-mailovej adresy.
+      success: Používateľské údaje boli úspešne aktualizované.
   browse:
     created: Vytvorené
     closed: Uzavreté
@@ -1877,45 +1917,6 @@ sk:
       delete_user: Odstrániť tohoto používateľa
       confirm: Potvrdiť
       report: Nahlásiť tohto používateľa
-    account:
-      title: Upraviť účet
-      my settings: Moje nastavenia
-      current email address: Aktuálna e-mailová adresa
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/CS:OpenID
-        link text: čo to znamená?
-      public editing:
-        heading: 'Verejné úpravy:'
-        enabled: Zapnuté. Nie je anonym a môže upravovať údaje.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: čo to znamená?
-        disabled: Vypnutý a nemôže upravovať údaje, všetky predchádzajúce úpravy sú
-          anonymné.
-        disabled link text: prečo nemôžem upravovať?
-      public editing note:
-        heading: Úprava pre verejnosť
-        html: Teraz upravujete ako anonym a ostatní Vám nemôžu poslať správy, alebo
-          vidieť vaše domovské miesto. Ukážte čo upravujete a dovoľte ostatným kontaktovať
-          Vás cez webovú stránku, kliknite na tlačítko dolu. <b>Od API verzie 0.6,
-          iba používateľ, ktorý povolil svoje úpravy verejnosti, môže upravovať mapové
-          údaje</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">zistiť
-          prečo</a>).<ul><li>Vaša emailová adresa nebude odhalená pre verejnosť.</li><li>Táto
-          akcia sa nedá vrátiť späť a všetci noví používatelia sú už implicitne verejní.</li></ul>
-      contributor terms:
-        heading: 'Podmienky prispievania:'
-        agreed: Súhlasili ste s novými Podmienkami prispievania.
-        not yet agreed: Zatiaľ ste neodsúhlasili nové Podmienky prispievania.
-        review link text: Keď budete mať čas, pomocou tohoto odkazu si prosím prečítajte
-          a odsúhlaste nové Podmienky prispievania.
-        agreed_with_pd: Deklarovali ste tiež, že svoje úpravy považujete za slobodné
-          dielo.
-        link text: čo to znamená?
-      save changes button: Uložiť zmeny
-      make edits public button: Zverejniť všetky moje úpravy
-      flash update success confirm needed: Používateľské údaje boli úspešne aktualizované.
-        Skontrolujte si e-mail, mala by Vám prísť výzva na potvrdenie novej e-mailovej
-        adresy.
-      flash update success: Používateľské údaje boli úspešne aktualizované.
     set_home:
       flash success: Domáca poloha úspešne uložená
     go_public:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index f7b05cca3..645c33275 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -249,6 +249,48 @@ sl:
       entry:
         comment: Komentar
         full: Celotna opomba
+  accounts:
+    edit:
+      title: Urejanje uporabniškega računa
+      my settings: Moje nastavitve
+      current email address: Trenutni e-poštni naslov
+      external auth: 'Zunanje preverjanje pristnosti:'
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: kaj je to?
+      public editing:
+        heading: Javno urejanje
+        enabled: Omogočeno. Niste anonimni in lahko urejate podatke.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Kaj je to?
+        disabled: Onemogočeno in ne morete urejati podatkov. Vsi vaši prejšnji prispevki
+          so anonimni.
+        disabled link text: Zakaj ne morem urejati?
+      public editing note:
+        heading: Javno urejanje
+        html: Trenutno so vaše spremembe anonimne in ljudje vam ne morejo poslati
+          sporočil ali videti vaše lokacije. Da prikažete, kar ste urejali in ljudem
+          omogočite, da vas kontaktirajo prek spletne strani, kliknite spodnji gumb.
+          <b>Od prehoda na API 0.6 lahko zemljevid urejajo le javni uporabniki.</b>
+          ( <a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Ugotovite,
+          zakaj</a>). <ul><li> Vaš e-poštni naslov se ob tem, ko boste postali javni
+          uporabnik, ne bo razkril.</li><li>Dejanja ni mogoče razveljaviti in vsi
+          novi uporabniki so zdaj privzeto javni.</li></ul>
+      contributor terms:
+        heading: 'Pogoji sodelovanja:'
+        agreed: Sprejeli ste nove pogoje sodelovanja.
+        not yet agreed: Niste Å¡e sprejeli novih pogojev sodelovanja.
+        review link text: Prosimo sledite tej povezavi, ko imate čas da pregledate
+          in sprejmete nove pogoje sodelovanja..
+        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?
+      save changes button: Shrani spremembe
+      make edits public button: Naj bodo vsi moji prispevki javni
+    update:
+      success_confirm_needed: Podatki o uporabniku so bili uspešno posodobljeni. Preverite
+        svojo e-pošto in potrdite spremembo e-poštnega naslova.
+      success: Podatki o uporabniku so uspešno posodobljeni.
   browse:
     created: Ustvarjeno
     closed: Zaprto
@@ -2153,46 +2195,6 @@ sl:
       delete_user: Izbriši uporabnika
       confirm: Potrdi
       report: Prijavi tega uporabnika
-    account:
-      title: Urejanje uporabniškega računa
-      my settings: Moje nastavitve
-      current email address: Trenutni e-poštni naslov
-      external auth: 'Zunanje preverjanje pristnosti:'
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: kaj je to?
-      public editing:
-        heading: Javno urejanje
-        enabled: Omogočeno. Niste anonimni in lahko urejate podatke.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Kaj je to?
-        disabled: Onemogočeno in ne morete urejati podatkov. Vsi vaši prejšnji prispevki
-          so anonimni.
-        disabled link text: Zakaj ne morem urejati?
-      public editing note:
-        heading: Javno urejanje
-        html: Trenutno so vaše spremembe anonimne in ljudje vam ne morejo poslati
-          sporočil ali videti vaše lokacije. Da prikažete, kar ste urejali in ljudem
-          omogočite, da vas kontaktirajo prek spletne strani, kliknite spodnji gumb.
-          <b>Od prehoda na API 0.6 lahko zemljevid urejajo le javni uporabniki.</b>
-          ( <a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Ugotovite,
-          zakaj</a>). <ul><li> Vaš e-poštni naslov se ob tem, ko boste postali javni
-          uporabnik, ne bo razkril.</li><li>Dejanja ni mogoče razveljaviti in vsi
-          novi uporabniki so zdaj privzeto javni.</li></ul>
-      contributor terms:
-        heading: 'Pogoji sodelovanja:'
-        agreed: Sprejeli ste nove pogoje sodelovanja.
-        not yet agreed: Niste Å¡e sprejeli novih pogojev sodelovanja.
-        review link text: Prosimo sledite tej povezavi, ko imate čas da pregledate
-          in sprejmete nove pogoje sodelovanja..
-        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?
-      save changes button: Shrani spremembe
-      make edits public button: Naj bodo vsi moji prispevki javni
-      flash update success confirm needed: Podatki o uporabniku so bili uspešno posodobljeni.
-        Preverite svojo e-pošto in potrdite spremembo e-poštnega naslova.
-      flash update success: Podatki o uporabniku so uspešno posodobljeni.
     set_home:
       flash success: Domača lokacija uspešno shranjena
     go_public:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 89d78ba6f..4d3b6f634 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -126,6 +126,39 @@ sq:
     remote:
       name: Kontroll nga Larg
       description: Kontrollo nga larg (JOSM, Potlatch, Merkaartor)
+  accounts:
+    edit:
+      title: Redakto llogarinë
+      my settings: Preferencat e mia
+      current email address: Adresa e Tanishme e Emailit
+      openid:
+        link text: çfarë është kjo?
+      public editing:
+        heading: Redaktim publik
+        enabled: I aktivizuar. Jo anonim dhe mund të redaktojë të dhënat.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: çfarë është kjo?
+        disabled: I çaktivizuar dhe nuk mund të redaktojë të dhënat, të gjitha redaktimet
+          e mëparshme janë anonime.
+        disabled link text: pse nuk mund të redaktoj?
+      public editing note:
+        heading: Redaktim publik
+      contributor terms:
+        heading: Kushtet e kontribuesit
+        agreed: Ti je pajtuar me kushtet e reja për kontribues.
+        not yet agreed: Ti ende nuk je pajtuar me kushtet e reja për kontribues.
+        review link text: Të lutem ndiq i këtë link për të për të lexuar dhe pranuar
+          kushtet e kontribuesit.
+        agreed_with_pd: Ti gjithashtu ke deklaruar, që redaktimet e tua të jenë në
+          pronësi publike.
+        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: Çka është kjo?
+      save changes button: Ruaj ndryshimet
+      make edits public button: Të gjitha redaktimet e mia bëjë publike
+    update:
+      success_confirm_needed: Informacioni i përdoruesit u përditësua me sukses. Kontrolloni
+        emailin tuaj për një shënim për të konfirmuar adresën e re të emailit tuaj.
+      success: Informacioni i përdoruesit u përditësua me sukses.
   browse:
     created: Krijuar
     closed: Mbyllur
@@ -1483,38 +1516,6 @@ sq:
       delete_user: fshi këtë përdorues
       confirm: Konfirmo
       report: Raporto ķëtë përdorues
-    account:
-      title: Redakto llogarinë
-      my settings: Preferencat e mia
-      current email address: Adresa e Tanishme e Emailit
-      openid:
-        link text: çfarë është kjo?
-      public editing:
-        heading: Redaktim publik
-        enabled: I aktivizuar. Jo anonim dhe mund të redaktojë të dhënat.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: çfarë është kjo?
-        disabled: I çaktivizuar dhe nuk mund të redaktojë të dhënat, të gjitha redaktimet
-          e mëparshme janë anonime.
-        disabled link text: pse nuk mund të redaktoj?
-      public editing note:
-        heading: Redaktim publik
-      contributor terms:
-        heading: Kushtet e kontribuesit
-        agreed: Ti je pajtuar me kushtet e reja për kontribues.
-        not yet agreed: Ti ende nuk je pajtuar me kushtet e reja për kontribues.
-        review link text: Të lutem ndiq i këtë link për të për të lexuar dhe pranuar
-          kushtet e kontribuesit.
-        agreed_with_pd: Ti gjithashtu ke deklaruar, që redaktimet e tua të jenë në
-          pronësi publike.
-        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: Çka është kjo?
-      save changes button: Ruaj ndryshimet
-      make edits public button: Të gjitha redaktimet e mia bëjë publike
-      flash update success confirm needed: Informacioni i përdoruesit u përditësua
-        me sukses. Kontrolloni emailin tuaj për një shënim për të konfirmuar adresën
-        e re të emailit tuaj.
-      flash update success: Informacioni i përdoruesit u përditësua me sukses.
     set_home:
       flash success: Lokacioni i shtëpisë është ruajtur me sukses
     go_public:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index df8e73963..b5894c889 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -125,6 +125,46 @@ sr-Latn:
     remote:
       name: Daljinsko upravljanje
       description: Daljinsko upravljanje (JOSM ili Merkaartor)
+  accounts:
+    edit:
+      title: Uredi nalog
+      my settings: Postavke
+      current email address: 'Trenutna e-adresa:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: Å¡ta je ovo?
+      public editing:
+        heading: Javno uređivanje
+        enabled: Omogućeno. Nije anonimno i mogu se uređivati podaci.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Å¡ta je ovo?
+        disabled: Onemogućeno i ne mogu se uređivati podaci. Sve prethodne izmene
+          su anonimne.
+        disabled link text: zašto ne mogu da uređujem?
+      public editing note:
+        heading: 'Javno uređivanje:'
+        html: Trenutno su vaše izmene anonimne i ljudi vam ne mogu slati poruke ili
+          videti vašu lokaciju. Da biste pokazali vaše izmene i dozvolili ljudima
+          da vas kontaktiraju, kliknite na dugme ispod. <b>Od promena API-ja 0.6,
+          samo javni korisnici mogu uređivati mape</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">saznajte
+          zašto</a>).<ul><li>Vaša e-adresa neće biti otkrivena na ovaj način.</li><li>Ova
+          radnja ne može biti opozvana i svi novi korisnici su od sada postavljeni
+          kao javni.</li></ul>
+      contributor terms:
+        heading: 'Uslovi uređivanja:'
+        agreed: Prihvatili ste nove uslove uređivanja.
+        not yet agreed: Niste prihvatili nove uslove uređivanja.
+        review link text: Pratite ovu vezu da biste pregledali i prihvatili nove uslove
+          uređivanja.
+        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?
+      save changes button: Sačuvaj izmene
+      make edits public button: Neka sve moje izmene budu javne
+    update:
+      success_confirm_needed: Podaci o korisniku su uspešno ažurirani. Proverite e-poštu
+        da biste potvrdili svoju novu e-adresu.
+      success: Podaci o korisniku su uspešno ažurirani.
   browse:
     changeset:
       title: Skup izmena
@@ -1377,44 +1417,6 @@ sr-Latn:
       unhide_user: otkrij ovog korisnika
       delete_user: obriši ovog korisnika
       confirm: Potvrdi
-    account:
-      title: Uredi nalog
-      my settings: Postavke
-      current email address: 'Trenutna e-adresa:'
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: Å¡ta je ovo?
-      public editing:
-        heading: 'Javno uređivanje:'
-        enabled: Omogućeno. Nije anonimno i mogu se uređivati podaci.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: Å¡ta je ovo?
-        disabled: Onemogućeno i ne mogu se uređivati podaci. Sve prethodne izmene
-          su anonimne.
-        disabled link text: zašto ne mogu da uređujem?
-      public editing note:
-        heading: Javno uređivanje
-        html: Trenutno su vaše izmene anonimne i ljudi vam ne mogu slati poruke ili
-          videti vašu lokaciju. Da biste pokazali vaše izmene i dozvolili ljudima
-          da vas kontaktiraju, kliknite na dugme ispod. <b>Od promena API-ja 0.6,
-          samo javni korisnici mogu uređivati mape</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">saznajte
-          zašto</a>).<ul><li>Vaša e-adresa neće biti otkrivena na ovaj način.</li><li>Ova
-          radnja ne može biti opozvana i svi novi korisnici su od sada postavljeni
-          kao javni.</li></ul>
-      contributor terms:
-        heading: 'Uslovi uređivanja:'
-        agreed: Prihvatili ste nove uslove uređivanja.
-        not yet agreed: Niste prihvatili nove uslove uređivanja.
-        review link text: Pratite ovu vezu da biste pregledali i prihvatili nove uslove
-          uređivanja.
-        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?
-      save changes button: Sačuvaj izmene
-      make edits public button: Neka sve moje izmene budu javne
-      flash update success confirm needed: Podaci o korisniku su uspešno ažurirani.
-        Proverite e-poštu da biste potvrdili svoju novu e-adresu.
-      flash update success: Podaci o korisniku su uspešno ažurirani.
     set_home:
       flash success: Mesto stanovanja je uspešno sačuvano
     go_public:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6b586262f..68052a474 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -46,6 +46,9 @@ sr:
       client_application:
         create: Отвори налог
         update: Ажурирај
+      doorkeeper_application:
+        create: Регистрација
+        update: Ажурирај
       redaction:
         create: Направи редакцију
         update: Сачувај редакцију
@@ -59,6 +62,7 @@ sr:
     errors:
       messages:
         invalid_email_address: не изгледа као важећа имејл адреса
+        email_address_not_routable: није повезљив(а)
     models:
       acl: Листа контроле приступа
       changeset: Скуп промена
@@ -98,6 +102,7 @@ sr:
     attributes:
       client_application:
         name: Име (обавезно)
+        url: Главна адреса апликације (обавезно)
         callback_url: Повратна адреса
         support_url: Адреса подршке
         allow_read_prefs: чита њихове корисничке поставке
@@ -115,6 +120,11 @@ sr:
         latitude: Географска ширина
         longitude: Географска дужина
         language: Језик
+      doorkeeper/application:
+        name: Назив
+        redirect_uri: Адреса за преусмеравање
+        confidential: Поверљива апликација?
+        scopes: Дозволе
       friend:
         user: Корисник
         friend: Пријатељ
@@ -157,6 +167,8 @@ sr:
         pass_crypt: Лозинка
         pass_crypt_confirmation: Потврдите лозинку
     help:
+      doorkeeper/application:
+        redirect_uri: Користите једну линију по адреси
       trace:
         tagstring: раздвојено запетама
       user_block:
@@ -208,6 +220,47 @@ sr:
       entry:
         comment: Коментар
         full: Потпуна белешка
+  accounts:
+    edit:
+      title: Уреди налог
+      my settings: Поставке
+      current email address: Тренутна имејл адреса
+      external auth: Спољна аутентификација
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: шта је ово?
+      public editing:
+        heading: Јавно уређивање
+        enabled: Омогућено. Није анонимно и могу се уређивати подаци.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: шта је ово?
+        disabled: Онемогућено и не могу се уређивати подаци. Све претходне измене
+          су анонимне.
+        disabled link text: зашто не могу да уређујем?
+      public editing note:
+        heading: Јавно уређивање
+        html: Тренутно су ваше измене анонимне и људи вам не могу слати поруке или
+          видети вашу локацију. Да бисте показали ваше измене и дозволили људима да
+          вас контактирају, кликните на дугме испод. <b>Од промена АПИ-ја 0.6, само
+          јавни корисници могу уређивати мапе</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">сазнајте
+          зашто</a>).<ul><li>Ваша е-адреса неће бити откривена на овај начин.</li><li>Ова
+          радња не може бити опозвана и сви нови корисници су од сада постављени као
+          јавни.</li></ul>
+      contributor terms:
+        heading: Услови уређивања
+        agreed: Прихватили сте нове услове уређивања.
+        not yet agreed: Нисте прихватили нове услове уређивања.
+        review link text: Пратите ову везу да бисте прегледали и прихватили нове услове
+          уређивања.
+        agreed_with_pd: Такође се слажете да ваше измене буду у јавном власништву.
+        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=sr-ec
+        link text: шта је ово?
+      save changes button: Сачувај промене
+      make edits public button: Нека све моје измене буду јавне
+    update:
+      success_confirm_needed: Подаци о кориснику су успешно ажурирани. Проверите имејл
+        да бисте потврдили Вашу нову имејл адресу.
+      success: Подаци о кориснику су успешно ажурирани.
   browse:
     created: Направљено
     closed: Затворено
@@ -1471,7 +1524,7 @@ sr:
         везу у поруци за потврду е-поште да бисте га активирали или <a href="%{reconfirm}">затражите
         нову поруку</a>.
       account is suspended: Нажалост, ваш налог је укинут због сумњиве активности.<br
-        />Обратите се <a href="%{webmaster}">администратору</a> ако желите да поразговарате
+        />Обратите се <a href="%{webmaster}">подршци</a> ако желите да поразговарате
         о проблему.
       auth failure: Није могуће пријавити се са тим детаљима.
       openid_logo_alt: Пријавите се с OpenID-јем
@@ -1611,8 +1664,10 @@ sr:
              <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Ланд Форарлберг</a> и
           Ланд Тирол (под лиценцом <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT са изменама и допунама</a>).
         contributors_au_html: |-
-          <strong>Аустралија</strong>: садржи податке о општинама
-              на основу података Аустралијског бироа за статистику.
+          <strong>Аустралија</strong>: садржи податке о општинама &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Аустралија</a>
+          лиценцирано од стране Комонвелта Аустралије под
+          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.
         contributors_ca_html: |-
           <strong>Канада</strong>: садржи податке из
               Беобазе&reg;, Геогратиса (&copy; Одељење за природне
@@ -1995,7 +2050,7 @@ sr:
       in: у
     index:
       public_traces: Јавни ГПС трагови
-      my_traces: Моји GPS трагови
+      my_traces: Моји трагови
       public_traces_from: Јавни GPS трагови корисника %{user}
       description: Претражите недавне аплоуде GPS путева
       tagged_with: ' означени са %{tags}'
@@ -2105,8 +2160,8 @@ sr:
       title: Регистрација
       no_auto_account_create: Нажалост, тренутно нисмо у могућности да отворимо нови
         налог.
-      contact_support_html: Контактирајте <a href="%{support}">администратора</a>
-        за отварање новог налога. Обрадићемо захтев што је пре могуће.
+      contact_support_html: Контактирајте <a href="%{support}">подршку</a> за отварање
+        новог налога - обрадићемо захтев што је пре могуће.
       about:
         header: Слободно и изменљиво
         html: |-
@@ -2201,45 +2256,6 @@ sr:
       delete_user: Избриши корисника
       confirm: Потврди
       report: Пријави овог корисника
-    account:
-      title: Уреди налог
-      my settings: Поставке
-      current email address: Тренутна имејл адреса
-      external auth: Спољна аутентификација
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: шта је ово?
-      public editing:
-        heading: Јавно уређивање
-        enabled: Омогућено. Није анонимно и могу се уређивати подаци.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: шта је ово?
-        disabled: Онемогућено и не могу се уређивати подаци. Све претходне измене
-          су анонимне.
-        disabled link text: зашто не могу да уређујем?
-      public editing note:
-        heading: Јавно уређивање
-        html: Тренутно су ваше измене анонимне и људи вам не могу слати поруке или
-          видети вашу локацију. Да бисте показали ваше измене и дозволили људима да
-          вас контактирају, кликните на дугме испод. <b>Од промена АПИ-ја 0.6, само
-          јавни корисници могу уређивати мапе</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">сазнајте
-          зашто</a>).<ul><li>Ваша е-адреса неће бити откривена на овај начин.</li><li>Ова
-          радња не може бити опозвана и сви нови корисници су од сада постављени као
-          јавни.</li></ul>
-      contributor terms:
-        heading: Услови уређивања
-        agreed: Прихватили сте нове услове уређивања.
-        not yet agreed: Нисте прихватили нове услове уређивања.
-        review link text: Пратите ову везу да бисте прегледали и прихватили нове услове
-          уређивања.
-        agreed_with_pd: Такође се слажете да ваше измене буду у јавном власништву.
-        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=sr-ec
-        link text: шта је ово?
-      save changes button: Сачувај промене
-      make edits public button: Нека све моје измене буду јавне
-      flash update success confirm needed: Подаци о кориснику су успешно ажурирани.
-        Проверите имејл да бисте потврдили Вашу нову имејл адресу.
-      flash update success: Подаци о кориснику су успешно ажурирани.
     set_home:
       flash success: Место становања је успешно сачувано
     go_public:
@@ -2265,7 +2281,7 @@ sr:
         </p>
         <p>
           Ову одлуку ће убрзо размотрити администратор. Такође,
-          можете контактирати %{webmaster}а ако желите да се жалите.
+          можете контактирати %{webmaster} ако желите да ово прокоментаришете.
         </p>
     auth_failure:
       connection_failed: Повезивање до аутентификационог провајдера неуспешно
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 624c70f87..740b92403 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -290,6 +290,49 @@ sv:
       entry:
         comment: Kommentar
         full: Hela anteckningen
+  accounts:
+    edit:
+      title: Redigera konto
+      my settings: Mina inställningar
+      current email address: Nuvarande e-postadress
+      external auth: Extern autentisering
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: vad är detta?
+      public editing:
+        heading: Offentlig redigering
+        enabled: Aktiverat, du är inte anonym och kan redigera data.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: vad är detta?
+        disabled: Avstängt och kan inte redigera data, alla redigeringar som gjorts
+          är anonyma.
+        disabled link text: varför kan jag inte redigera?
+      public editing note:
+        heading: Offentlig redigering
+        html: Dina redigeringar är för tillfället anonyma och andra användare kan
+          inte skicka meddelanden till dig eller se din position. För att visa andra
+          vad du redigerat och för att tillåta andra att kontakta dig genom webbplatsen,
+          klicka på knappen nedan. <b>Sedan bytet till API av version 0.6 kan bara
+          publika användare redigera kartdata</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">ta
+          reda på varför (engelska)</a>).<ul><li>Din e-postadress avslöjas inte om
+          du blir publik användare.</li><li>Denna handling kan inte ångras och alla
+          nya användare är numera publika som standard.</li></ul>
+      contributor terms:
+        heading: Bidragsgivarvillkor
+        agreed: Du har godkänt de nya bidragsgivarvillkoren.
+        not yet agreed: Du har ännu inte godkänt de nya bidragsgivarvillkoren.
+        review link text: Följ denna länk när du har tid att granska och godkänna
+          de nya bidragsvillkoren.
+        agreed_with_pd: Du har också förklarat att du anser att dina redigeringar
+          är inom Public Domain.
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: vad är detta?
+      save changes button: Spara ändringar
+      make edits public button: Gör alla mina redigeringar publika
+    update:
+      success_confirm_needed: Användarinformation uppdaterades. Kontrollera din e-post
+        för att bekräfta din e-postadress.
+      success: Användarinformation uppdaterades.
   browse:
     created: Skapad
     closed: Stängd
@@ -2719,47 +2762,6 @@ sv:
       delete_user: Radera denna användare
       confirm: Bekräfta
       report: Rapportera denna användare
-    account:
-      title: Redigera konto
-      my settings: Mina inställningar
-      current email address: Nuvarande e-postadress
-      external auth: Extern autentisering
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: vad är detta?
-      public editing:
-        heading: Offentlig redigering
-        enabled: Aktiverat, du är inte anonym och kan redigera data.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: vad är detta?
-        disabled: Avstängt och kan inte redigera data, alla redigeringar som gjorts
-          är anonyma.
-        disabled link text: varför kan jag inte redigera?
-      public editing note:
-        heading: Offentlig redigering
-        html: Dina redigeringar är för tillfället anonyma och andra användare kan
-          inte skicka meddelanden till dig eller se din position. För att visa andra
-          vad du redigerat och för att tillåta andra att kontakta dig genom webbplatsen,
-          klicka på knappen nedan. <b>Sedan bytet till API av version 0.6 kan bara
-          publika användare redigera kartdata</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">ta
-          reda på varför (engelska)</a>).<ul><li>Din e-postadress avslöjas inte om
-          du blir publik användare.</li><li>Denna handling kan inte ångras och alla
-          nya användare är numera publika som standard.</li></ul>
-      contributor terms:
-        heading: Bidragsgivarvillkor
-        agreed: Du har godkänt de nya bidragsgivarvillkoren.
-        not yet agreed: Du har ännu inte godkänt de nya bidragsgivarvillkoren.
-        review link text: Följ denna länk när du har tid att granska och godkänna
-          de nya bidragsvillkoren.
-        agreed_with_pd: Du har också förklarat att du anser att dina redigeringar
-          är inom Public Domain.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: vad är detta?
-      save changes button: Spara ändringar
-      make edits public button: Gör alla mina redigeringar publika
-      flash update success confirm needed: Användarinformation uppdaterades. Kontrollera
-        din e-post för att bekräfta din e-postadress.
-      flash update success: Användarinformation uppdaterades.
     set_home:
       flash success: Hemposition sparad
     go_public:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index c51403787..49cc1abe5 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -161,6 +161,16 @@ ta:
     remote:
       name: தொலைவுக் கட்டுப்பாடு
       description: தொலைவு கட்டுப்பாடு (JOSM அல்லது Merkaartor)
+  accounts:
+    edit:
+      title: கணக்கை திருத்து
+      my settings: என் அமைப்புகள்
+      current email address: 'தற்பொழுதுள்ள மின்னஞ்சல் முகவரி:'
+      openid:
+        link text: இது என்ன?
+      contributor terms:
+        link text: இது என்ன?
+      save changes button: மாற்றங்களைச் சேமி
   browse:
     created: உருவாக்கப்பட்டது
     closed: மூடப்பட்டது
@@ -808,15 +818,6 @@ ta:
       unhide_user: இந்த பயனரை மறைத்ததை நீக்கு
       delete_user: இப்பயனரை நீக்கவும்
       confirm: உறுதிசெய்
-    account:
-      title: கணக்கை திருத்து
-      my settings: என் அமைப்புகள்
-      current email address: 'தற்பொழுதுள்ள மின்னஞ்சல் முகவரி:'
-      openid:
-        link text: இது என்ன?
-      contributor terms:
-        link text: இது என்ன?
-      save changes button: மாற்றங்களைச் சேமி
     index:
       title: பயனர்கள்
       heading: பயனர்கள்
diff --git a/config/locales/te.yml b/config/locales/te.yml
index a241ad20d..b3f875093 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -100,6 +100,24 @@ te:
       entry:
         comment: వ్యాఖ్య
         full: పూర్తి గమనిక
+  accounts:
+    edit:
+      title: ఖాతా మార్పు
+      my settings: నా అమరికలు
+      current email address: 'ప్రస్తుత ఈ-మెయిలు చిరునామా:'
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: ఇది ఏమిటి?
+      public editing:
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ఇది ఏమిటి?
+        disabled link text: నేను ఎందుకు మార్చలేను?
+      contributor terms:
+        link text: ఇది ఏమిటి?
+      save changes button: మార్పులను భద్రపరచు
+      make edits public button: నా దిద్దుబాట్లన్నింటినీ బహిరంగం చేయి
+    update:
+      success: వాడుకరి సమాచారం విజయవంతంగా తాజాకరించబడింది.
   browse:
     created: 'సృష్టించబడినది:'
     closed: ముగించబడింది
@@ -776,22 +794,6 @@ te:
       create_block: ఈ వాడుకరిని నిరోధించు
       delete_user: ఈ వాడుకరిని తొలగించు
       confirm: నిర్ధారించు
-    account:
-      title: ఖాతా మార్పు
-      my settings: నా అమరికలు
-      current email address: 'ప్రస్తుత ఈ-మెయిలు చిరునామా:'
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: ఇది ఏమిటి?
-      public editing:
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ఇది ఏమిటి?
-        disabled link text: నేను ఎందుకు మార్చలేను?
-      contributor terms:
-        link text: ఇది ఏమిటి?
-      save changes button: మార్పులను భద్రపరచు
-      make edits public button: నా దిద్దుబాట్లన్నింటినీ బహిరంగం చేయి
-      flash update success: వాడుకరి సమాచారం విజయవంతంగా తాజాకరించబడింది.
     go_public:
       flash success: ఇప్పుడు మీ మార్పుచేర్పులన్నీ బహిరంగం, మీరు ఇక నుండి దిద్దుబాట్లు
         చేయవచ్చు.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 8ac42f4db..d1977a0d3 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -230,6 +230,28 @@ th:
       entry:
         comment: ความคิดเห็น
         full: เนื้อความเต็มในหมายเหตุ
+  accounts:
+    edit:
+      title: แก้ไขบัญชี
+      my settings: การตั้งค่าของฉัน
+      current email address: ที่อยู่อีเมลปัจจุบัน
+      external auth: การยืนยันตัวตนด้วยบริการภายนอก
+      openid:
+        link text: นี้คืออะไร?
+      public editing:
+        heading: แก้ไขโดยเปิดเผย
+        enabled: 'เปิดใช้: สามารถแก้ไขแผนที่ได้ แต่ทำโดยเปิดเผยนาม'
+        enabled link text: นี้คืออะไร?
+        disabled: 'ปิดใช้: ไม่สามารถแก้ไขแผนที่ได้อีก, โดยการแก้ไขในอดีตจะยังคงความนิรนามไว้'
+      public editing note:
+        heading: 'แก้ไขโดยเปิดเผย:'
+      contributor terms:
+        link text: นี้คืออะไร?
+      save changes button: บันทึกการเปลี่ยนแปลง
+      make edits public button: ทำให้การแก้ไขของข้าพเจ้าเป็นสาธารณะเห็นได้ทั่วไป
+    update:
+      success_confirm_needed: การปรับปรุงข้อมูลผู้ใช้งานสำเร็จเรียบร้อย โปรดตรวจสอบอีเมลของท่านเพื่อยืนยันที่อยู่อีเมลใหม่
+      success: การปรับปรุงข้อมูลผู้ใช้งานสำเร็จเรียบร้อย
   browse:
     created: สร้างเมื่อ
     closed: ปิดเมื่อ
@@ -2096,27 +2118,6 @@ th:
       deactivate_user: ปิดใช้งานผู้ใช้นี้
       confirm: ยืนยัน
       report: แจ้งปัญหาเกี่ยวกับผู้ใช้คนนี้
-    account:
-      title: แก้ไขบัญชี
-      my settings: การตั้งค่าของฉัน
-      current email address: ที่อยู่อีเมลปัจจุบัน
-      external auth: การยืนยันตัวตนด้วยบริการภายนอก
-      openid:
-        link text: นี้คืออะไร?
-      public editing:
-        heading: 'แก้ไขโดยเปิดเผย:'
-        enabled: 'เปิดใช้: สามารถแก้ไขแผนที่ได้ แต่ทำโดยเปิดเผยนาม'
-        enabled link text: นี้คืออะไร?
-        disabled: 'ปิดใช้: ไม่สามารถแก้ไขแผนที่ได้อีก, โดยการแก้ไขในอดีตจะยังคงความนิรนามไว้'
-      public editing note:
-        heading: แก้ไขโดยเปิดเผย
-      contributor terms:
-        link text: นี้คืออะไร?
-      save changes button: บันทึกการเปลี่ยนแปลง
-      make edits public button: ทำให้การแก้ไขของข้าพเจ้าเป็นสาธารณะเห็นได้ทั่วไป
-      flash update success confirm needed: การปรับปรุงข้อมูลผู้ใช้งานสำเร็จเรียบร้อย
-        โปรดตรวจสอบอีเมลของท่านเพื่อยืนยันที่อยู่อีเมลใหม่
-      flash update success: การปรับปรุงข้อมูลผู้ใช้งานสำเร็จเรียบร้อย
     set_home:
       flash success: ตำแหน่งที่อยู่บ้านบันทึกเรียบร้อย
     go_public:
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 712657347..8aaf16be5 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -170,6 +170,52 @@ tl:
         commented: bagong puna (malapit sa %{place})
       entry:
         full: Buong tala
+  accounts:
+    edit:
+      title: Baguhin ang akawnt
+      my settings: Mga pagtatakda ko
+      current email address: 'Pangkasalukuyang Tirahan ng E-liham:'
+      external auth: Panlabas na Pagpapatunay
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: ano ba ito?
+      public editing:
+        heading: Pangmadlang pamamatnugot
+        enabled: Pinagana. Nagpakilala at maaaring magbago ng dato.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ano ba ito?
+        disabled: Hindi pinagana at hindi makapagbabago ng dato, lahat ng nakaraang
+          mga pagbabago ay bilang hindi nagpapakilala.
+        disabled link text: bakit hindi ako makapamatnugot?
+      public editing note:
+        heading: Pangmadlang pamamatnugot
+        html: Pangkasalukuyang walang kapangalanan ang mga pagbabago mo at hindi ka
+          mapapadalhan ng mga mensahe ng mga tao o matingnan ang kinalalagyan mo.
+          Upang maipakita kung ano ang binago mo at mapahintulutan ang mga tao na
+          makipag-ugnayan sa iyo sa pamamagitan ng websayt, pindutin ang pindutang
+          nasa ibaba. <b>Magmula noong pagpapalit ng 0.6 API, tanging pangmadlang
+          mga tagagamit lamang ang makakapamatnugot sa dato ng mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">alamin
+          kung bakit</a>).<ul><li>Ang galaw na ito ay hindi maipanunumbalik papunta
+          sa dati at lahat ng bagong mga tagagamit ay pangmadla na ngayon ayon sa
+          likas na katakdaan.</li></ul>
+      contributor terms:
+        heading: Mga Tuntunin sa Tagapag-ambag
+        agreed: Sumang-ayon ka sa bagong mga Tuntunin na Pangtagapag-ambag.
+        not yet agreed: Hindi ka sumang-ayon sa bagong mga Tuntunin na Pangtagapag-ambag.
+        review link text: Mangyaring sundan ang kawing na ito ayon sa kaluwagan ng
+          iyong panahon upang muling suriin at tanggapin ang bagong mga Tuntunin na
+          Pangtagapag-ambag.
+        agreed_with_pd: Ipinahayag mo rin na itinuturing mo ang mga pamamatnugot mo
+          bilang nasa loob ng Nasasakupan ng Madla.
+        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: ano ba ito?
+      save changes button: Sagipin ang mga Pagbabago
+      make edits public button: Gawing pangmadla ang lahat ng mga pamamatnugot ko
+    update:
+      success_confirm_needed: Matagumpay na naisapanahon ang kabatiran sa tagagamit.
+        Suriin ang e-liham mo para sa isang tala upang matiyak ang bago mong tirahan
+        ng e-liham.
+      success: Matagumpay na naisapanahon ang kabatiran sa tagagamit.
   browse:
     created: Nilikha
     closed: Isinara
@@ -1785,50 +1831,6 @@ tl:
       unhide_user: Huwag itago ang Tagagamit na ito
       delete_user: Burahin ang Tagagamit na ito
       confirm: Tiyakin
-    account:
-      title: Baguhin ang akawnt
-      my settings: Mga pagtatakda ko
-      current email address: 'Pangkasalukuyang Tirahan ng E-liham:'
-      external auth: Panlabas na Pagpapatunay
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: ano ba ito?
-      public editing:
-        heading: Pangmadlang pamamatnugot
-        enabled: Pinagana. Nagpakilala at maaaring magbago ng dato.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ano ba ito?
-        disabled: Hindi pinagana at hindi makapagbabago ng dato, lahat ng nakaraang
-          mga pagbabago ay bilang hindi nagpapakilala.
-        disabled link text: bakit hindi ako makapamatnugot?
-      public editing note:
-        heading: Pangmadlang pamamatnugot
-        html: Pangkasalukuyang walang kapangalanan ang mga pagbabago mo at hindi ka
-          mapapadalhan ng mga mensahe ng mga tao o matingnan ang kinalalagyan mo.
-          Upang maipakita kung ano ang binago mo at mapahintulutan ang mga tao na
-          makipag-ugnayan sa iyo sa pamamagitan ng websayt, pindutin ang pindutang
-          nasa ibaba. <b>Magmula noong pagpapalit ng 0.6 API, tanging pangmadlang
-          mga tagagamit lamang ang makakapamatnugot sa dato ng mapa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">alamin
-          kung bakit</a>).<ul><li>Ang galaw na ito ay hindi maipanunumbalik papunta
-          sa dati at lahat ng bagong mga tagagamit ay pangmadla na ngayon ayon sa
-          likas na katakdaan.</li></ul>
-      contributor terms:
-        heading: Mga Tuntunin sa Tagapag-ambag
-        agreed: Sumang-ayon ka sa bagong mga Tuntunin na Pangtagapag-ambag.
-        not yet agreed: Hindi ka sumang-ayon sa bagong mga Tuntunin na Pangtagapag-ambag.
-        review link text: Mangyaring sundan ang kawing na ito ayon sa kaluwagan ng
-          iyong panahon upang muling suriin at tanggapin ang bagong mga Tuntunin na
-          Pangtagapag-ambag.
-        agreed_with_pd: Ipinahayag mo rin na itinuturing mo ang mga pamamatnugot mo
-          bilang nasa loob ng Nasasakupan ng Madla.
-        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: ano ba ito?
-      save changes button: Sagipin ang mga Pagbabago
-      make edits public button: Gawing pangmadla ang lahat ng mga pamamatnugot ko
-      flash update success confirm needed: Matagumpay na naisapanahon ang kabatiran
-        sa tagagamit. Suriin ang e-liham mo para sa isang tala upang matiyak ang bago
-        mong tirahan ng e-liham.
-      flash update success: Matagumpay na naisapanahon ang kabatiran sa tagagamit.
     set_home:
       flash success: Matagumpay na nasagip ang kinalalagyan ng tahanan
     go_public:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 078297e69..e284da857 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -292,6 +292,48 @@ tr:
       entry:
         comment: Yorum
         full: Notun tamamı
+  accounts:
+    edit:
+      title: Hesabı düzenle
+      my settings: Ayarlarım
+      current email address: Geçerli E-posta Adresi
+      external auth: Harici Kimlik Doğrulama
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/Tr:OpenID
+        link text: bu nedir?
+      public editing:
+        heading: Herkese açık düzenleme modu
+        enabled: Etkin. Anonim değil ve verileri düzenleyebilir.
+        enabled link: https://wiki.openstreetmap.org/wiki/Tr:Anonymous_edits
+        enabled link text: bu nedir?
+        disabled: Devre dışı ve verileri düzenleyemez; önceki düzenlemeleri hepsi
+          anonimdir.
+        disabled link text: neden düzenleyemiyorum?
+      public editing note:
+        heading: Herkese açık düzenleme modu
+        html: Şu anda yaptığınız düzenlemeler anonimdir bundan ötürü kullanıcılar
+          size mesaj gönderemez veya konumunuzu göremez. Düzenlemelerinizi görünür
+          kılmak ve site üzerinden sizinle iletişime geçilmesine izin vermek için
+          aşağıdaki butona tıklayın. <b>0.6 API'a geçişten beri yalnızca herkese açık
+          kullanıcılar harita verilerini düzenleyebilmektedir</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sebebini
+          öğren</a>). <ul><li>E-posta adresiniz herkese açık hale getirilmez.</li><li>Bu
+          işlem tersine çevrilemez ve tüm yeni kullanıcılar artık varsayılan olarak
+          herkese açık olarak gösterilmektedir.</li></ul>
+      contributor terms:
+        heading: Katılımcı Şartları
+        agreed: Yeni katılımcı şartlarını kabul ettin.
+        not yet agreed: Yeni katılımcı şartları kabul etmedin.
+        review link text: Yeni Katkıda Bulunma Şartlarını incelemek ve kabul etmek
+          için lütfen bu bağlantıyı kolaylık sağlamak için izleyin.
+        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?
+      save changes button: Değişiklikleri Kaydet
+      make edits public button: Bütün girdiklerim herkese açık olsun
+    update:
+      success_confirm_needed: Kullanıcı bilgisi başarıyla güncellendi. Yeni e-posta
+        adresinizi onaylamak için e-mail'inizi lütfen kontrol ediniz.
+      success: Kullanıcı bilgisi başarıyla güncellendi.
   browse:
     created: Oluşturuldu
     closed: Kapandı
@@ -2738,46 +2780,6 @@ tr:
       delete_user: Bu Kullanıcıyı Sil
       confirm: Onayla
       report: Bu kullanıcıyı rapor et
-    account:
-      title: Hesabı düzenle
-      my settings: Ayarlarım
-      current email address: Geçerli E-posta Adresi
-      external auth: Harici Kimlik Doğrulama
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/Tr:OpenID
-        link text: bu nedir?
-      public editing:
-        heading: Herkese açık düzenleme modu
-        enabled: Etkin. Anonim değil ve verileri düzenleyebilir.
-        enabled link: https://wiki.openstreetmap.org/wiki/Tr:Anonymous_edits
-        enabled link text: bu nedir?
-        disabled: Devre dışı ve verileri düzenleyemez; önceki düzenlemeleri hepsi
-          anonimdir.
-        disabled link text: neden düzenleyemiyorum?
-      public editing note:
-        heading: Herkese açık düzenleme modu
-        html: Şu anda yaptığınız düzenlemeler anonimdir bundan ötürü kullanıcılar
-          size mesaj gönderemez veya konumunuzu göremez. Düzenlemelerinizi görünür
-          kılmak ve site üzerinden sizinle iletişime geçilmesine izin vermek için
-          aşağıdaki butona tıklayın. <b>0.6 API'a geçişten beri yalnızca herkese açık
-          kullanıcılar harita verilerini düzenleyebilmektedir</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sebebini
-          öğren</a>). <ul><li>E-posta adresiniz herkese açık hale getirilmez.</li><li>Bu
-          işlem tersine çevrilemez ve tüm yeni kullanıcılar artık varsayılan olarak
-          herkese açık olarak gösterilmektedir.</li></ul>
-      contributor terms:
-        heading: Katılımcı Şartları
-        agreed: Yeni katılımcı şartlarını kabul ettin.
-        not yet agreed: Yeni katılımcı şartları kabul etmedin.
-        review link text: Yeni Katkıda Bulunma Şartlarını incelemek ve kabul etmek
-          için lütfen bu bağlantıyı kolaylık sağlamak için izleyin.
-        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?
-      save changes button: Değişiklikleri Kaydet
-      make edits public button: Bütün girdiklerim herkese açık olsun
-      flash update success confirm needed: Kullanıcı bilgisi başarıyla güncellendi.
-        Yeni e-posta adresinizi onaylamak için e-mail'inizi lütfen kontrol ediniz.
-      flash update success: Kullanıcı bilgisi başarıyla güncellendi.
     set_home:
       flash success: Ev konumu başarıyla kaydedildi
     go_public:
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index a4bdb86ee..c32ae9e97 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -130,6 +130,13 @@ tt:
     remote:
       name: Дистанцион идарә
       description: Дистанционн идарә (JOSM яки Merkaartor)
+  accounts:
+    edit:
+      public editing:
+        enabled link text: бу нәрсә?
+      contributor terms:
+        link text: бу нәрсә?
+      save changes button: Үзгәрешләрне саклау
   browse:
     created: Төзелгән
     closed: Ябык
@@ -713,12 +720,6 @@ tt:
       email address: 'Электрон почта адресы:'
       status: 'Халәт:'
       confirm: Раслау
-    account:
-      public editing:
-        enabled link text: бу нәрсә?
-      contributor terms:
-        link text: бу нәрсә?
-      save changes button: Үзгәрешләрне саклау
     index:
       title: Кулланучылар
       heading: Кулланучылар
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index b5d14a3fd..262390cce 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -315,6 +315,48 @@ uk:
       entry:
         comment: Коментар
         full: Повний текст
+  accounts:
+    edit:
+      title: Редагувати обліковий запис
+      my settings: Налаштування
+      current email address: Поточна адреса електронної пошти
+      external auth: Зовнішня автентифікація
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/Uk:OpenID
+        link text: що це?
+      public editing:
+        heading: Загальнодоступне редагування
+        enabled: Увімкнено. Не анонім і можна редагувати дані.
+        enabled link: https://wiki.openstreetmap.org/wiki/Uk:Anonymous_edits
+        enabled link text: що це?
+        disabled: Вимкнено й не можна редагувати дані, всі попередні редагування анонімні.
+        disabled link text: чому я не можу вносити зміни?
+      public editing note:
+        heading: Загальнодоступне редагування
+        html: На цей час ваші редагування анонімні й ніхто не може відправляти вам
+          повідомлення або бачити ваше місце розташування. Щоб показати, що ви редагували
+          та дозволити людям зв’язатися з вами через вебсайт, натисніть на кнопку
+          нижче. <b>З переходом на API версії 0.6, тільки зареєстровані учасники можуть
+          редагувати мапу.</b>  (<a href="http://wiki.openstreetmap.org/wiki/Uk:Anonymous_edits">З’ясувати,
+          чому</a>). <ul><li>Ваша електронна адреса не буде розкрита іншим, але зв’язатись
+          з вами стане можливо.</li><li>Ця дія не має зворотної сили, а всі нові учасники
+          тепер доступні для зв’язку.</li></ul>
+      contributor terms:
+        heading: Умови Співпраці
+        agreed: Ви погодилися на нові Умови Співпраці.
+        not yet agreed: Ви ще не погодилися на нові Умови Співпраці.
+        review link text: Перейдіть за цим посиланням у зручний для Вас спосіб, щоб
+          переглянути і прийняти нові Умови Співпраці
+        agreed_with_pd: Ви також заявляєте, що ви розглядаєте свій внесок як Суспільне
+          Надбання.
+        link: https://wiki.openstreetmap.org/wiki/Uk:Open_Database_License/Contributor_Terms
+        link text: що це?
+      save changes button: Зберегти зміни
+      make edits public button: Зробити всі мої редагування загальнодоступними
+    update:
+      success_confirm_needed: Інформацію про учасника успішно оновлено. Перевірте
+        свою електронну пошту, щоб підтвердити вашу нову адресу е-пошти.
+      success: Інформацію про учасника успішно оновлено.
   browse:
     created: Створено
     closed: Закрито
@@ -2755,46 +2797,6 @@ uk:
       delete_user: Вилучити цього учасника
       confirm: Підтвердити
       report: Поскаржитись на цього учасника
-    account:
-      title: Редагувати обліковий запис
-      my settings: Налаштування
-      current email address: Поточна адреса електронної пошти
-      external auth: Зовнішня автентифікація
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/Uk:OpenID
-        link text: що це?
-      public editing:
-        heading: Загальнодоступне редагування
-        enabled: Увімкнено. Не анонім і можна редагувати дані.
-        enabled link: https://wiki.openstreetmap.org/wiki/Uk:Anonymous_edits
-        enabled link text: що це?
-        disabled: Вимкнено й не можна редагувати дані, всі попередні редагування анонімні.
-        disabled link text: чому я не можу вносити зміни?
-      public editing note:
-        heading: Загальнодоступне редагування
-        html: На цей час ваші редагування анонімні й ніхто не може відправляти вам
-          повідомлення або бачити ваше місце розташування. Щоб показати, що ви редагували
-          та дозволити людям зв’язатися з вами через вебсайт, натисніть на кнопку
-          нижче. <b>З переходом на API версії 0.6, тільки зареєстровані учасники можуть
-          редагувати мапу.</b>  (<a href="http://wiki.openstreetmap.org/wiki/Uk:Anonymous_edits">З’ясувати,
-          чому</a>). <ul><li>Ваша електронна адреса не буде розкрита іншим, але зв’язатись
-          з вами стане можливо.</li><li>Ця дія не має зворотної сили, а всі нові учасники
-          тепер доступні для зв’язку.</li></ul>
-      contributor terms:
-        heading: Умови Співпраці
-        agreed: Ви погодилися на нові Умови Співпраці.
-        not yet agreed: Ви ще не погодилися на нові Умови Співпраці.
-        review link text: Перейдіть за цим посиланням у зручний для Вас спосіб, щоб
-          переглянути і прийняти нові Умови Співпраці
-        agreed_with_pd: Ви також заявляєте, що ви розглядаєте свій внесок як Суспільне
-          Надбання.
-        link: https://wiki.openstreetmap.org/wiki/Uk:Open_Database_License/Contributor_Terms
-        link text: що це?
-      save changes button: Зберегти зміни
-      make edits public button: Зробити всі мої редагування загальнодоступними
-      flash update success confirm needed: Інформацію про учасника успішно оновлено.
-        Перевірте свою електронну пошту, щоб підтвердити вашу нову адресу е-пошти.
-      flash update success: Інформацію про учасника успішно оновлено.
     set_home:
       flash success: Ваше місце розташування збережено
     go_public:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index a5e8fc53b..5cfc95e16 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -262,6 +262,47 @@ vi:
       entry:
         comment: Bình luận
         full: Ghi chú đầy đủ
+  accounts:
+    edit:
+      title: Chỉnh sửa tài khoản
+      my settings: Tùy chọn
+      current email address: Địa chỉ Thư điện tử Hiện tại
+      external auth: Xác minh Bên ngoài
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: đây là gì?
+      public editing:
+        heading: Sửa đổi công khai
+        enabled: Kích hoạt. Không vô danh và có thể sửa đổi dữ liệu.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits?uselang=vi
+        enabled link text: đây là gì?
+        disabled: Vô hiệu. Không thể sửa đổi dữ liệu. Tất cả các sửa đổi truớc là
+          vô danh.
+        disabled link text: tại sao không thể sửa đổi?
+      public editing note:
+        heading: Sửa đổi công khai
+        html: |-
+          Các sửa đổi của bạn đang vô danh, và không ai có thể gửi thư cho bạn hay xem bạn ở đâu. Để cho phép mọi người biết bạn sửa đổi gì và gửi thư cho bạn dùng trang Web, bấm nút ở dưới. <b>Từ lúc đổi qua phiên bản 0.6 của API, chỉ có những người dùng công khai có quyền sửa đổi dữ liệu bản đồ</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits?uselang=vi">tìm hiểu tại sao</a>).
+          <ul>
+          <li>Địa chỉ thư điện tử của bạn vẫn không được phát hành công khai sau khi bắt đầu sửa đổi công khai.</li>
+          <li>Không thể lùi lại tác vụ này, và mọi người dùng mới hiện là người dùng công khai theo mặc định.</li>
+          </ul>
+      contributor terms:
+        heading: Các Điều khoản Đóng góp
+        agreed: Bạn đã đồng ý với các Điều khoản Đóng góp mới.
+        not yet agreed: Bạn chưa đồng ý với các Điều khoản Đóng góp mới.
+        review link text: Xin vui lòng theo liên kết này khi nào có thì giờ để đọc
+          lại và chấp nhận các Điều khoản Đóng góp mới.
+        agreed_with_pd: Bạn cũng đã tuyên bố coi rằng các đóng góp của bạn thuộc về
+          phạm vi công cộng.
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms?uselang=vi
+        link text: đây là gì?
+      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
+    update:
+      success_confirm_needed: Đã cập nhật thông tin cá nhân thành công. Kiểm tra thư
+        điện tử xác nhận địa chỉ thư điện tử mới.
+      success: Đã cập nhật thông tin cá nhân thành công.
   browse:
     created: Tạo
     closed: Đóng
@@ -2566,45 +2607,6 @@ vi:
       delete_user: Xóa Tài khoản Này
       confirm: Xác nhận
       report: Báo cáo Người dùng này
-    account:
-      title: Chỉnh sửa tài khoản
-      my settings: Tùy chọn
-      current email address: Địa chỉ Thư điện tử Hiện tại
-      external auth: Xác minh Bên ngoài
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: đây là gì?
-      public editing:
-        heading: Sửa đổi công khai
-        enabled: Kích hoạt. Không vô danh và có thể sửa đổi dữ liệu.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits?uselang=vi
-        enabled link text: đây là gì?
-        disabled: Vô hiệu. Không thể sửa đổi dữ liệu. Tất cả các sửa đổi truớc là
-          vô danh.
-        disabled link text: tại sao không thể sửa đổi?
-      public editing note:
-        heading: Sửa đổi công khai
-        html: |-
-          Các sửa đổi của bạn đang vô danh, và không ai có thể gửi thư cho bạn hay xem bạn ở đâu. Để cho phép mọi người biết bạn sửa đổi gì và gửi thư cho bạn dùng trang Web, bấm nút ở dưới. <b>Từ lúc đổi qua phiên bản 0.6 của API, chỉ có những người dùng công khai có quyền sửa đổi dữ liệu bản đồ</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits?uselang=vi">tìm hiểu tại sao</a>).
-          <ul>
-          <li>Địa chỉ thư điện tử của bạn vẫn không được phát hành công khai sau khi bắt đầu sửa đổi công khai.</li>
-          <li>Không thể lùi lại tác vụ này, và mọi người dùng mới hiện là người dùng công khai theo mặc định.</li>
-          </ul>
-      contributor terms:
-        heading: Các Điều khoản Đóng góp
-        agreed: Bạn đã đồng ý với các Điều khoản Đóng góp mới.
-        not yet agreed: Bạn chưa đồng ý với các Điều khoản Đóng góp mới.
-        review link text: Xin vui lòng theo liên kết này khi nào có thì giờ để đọc
-          lại và chấp nhận các Điều khoản Đóng góp mới.
-        agreed_with_pd: Bạn cũng đã tuyên bố coi rằng các đóng góp của bạn thuộc về
-          phạm vi công cộng.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms?uselang=vi
-        link text: đây là gì?
-      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
-      flash update success confirm needed: Đã cập nhật thông tin cá nhân thành công.
-        Kiểm tra thư điện tử xác nhận địa chỉ thư điện tử mới.
-      flash update success: Đã cập nhật thông tin cá nhân thành công.
     set_home:
       flash success: Đã lưu vị trí nhà thành công
     go_public:
diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 28aba4c39..1b283b87a 100644
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -29,6 +29,10 @@ yo:
         body: Ara
       user:
         languages: Àwọn èdè
+  accounts:
+    edit:
+      public editing:
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
   diary_entries:
     form:
       use_map_link: Lo map
@@ -71,8 +75,4 @@ yo:
     show:
       filename: 'Orúkọ fáìlì:'
       tags: Tags
-  users:
-    account:
-      public editing:
-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
 ...
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 142b67310..75c151fc4 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -312,6 +312,39 @@ zh-CN:
       entry:
         comment: 评论
         full: 完整注记
+  accounts:
+    edit:
+      title: 编辑账户
+      my settings: 我的设置
+      current email address: 当前电子邮件地址
+      external auth: 外部身份验证
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: 这是什么？
+      public editing:
+        heading: 公开编辑
+        enabled: 启用。非匿名用户，可以编辑数据。
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: 这是什么？
+        disabled: 禁用且无法编辑数据，所有过去的编辑均为匿名。
+        disabled link text: 我为什么不能编辑？
+      public editing note:
+        heading: 公开编辑
+        html: 目前您的编辑是匿名的，人们不能发送邮件给您或看到您的位置。为了显示您的编辑，让别人通过网站与您联系，请点击下面的按钮。<b>由于 0.6
+          API 的转换，只有公开的用户可以编辑地图数据</b>。(<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">了解为什么</a>)。<ul><li>您的电子邮件地址将不会被因为成为公开用户而被透露。</li><li>此操作无法撤销，所有新用户现在都默认为公开的。</li></ul>
+      contributor terms:
+        heading: 贡献者条款
+        agreed: 您已同意新的贡献者条款。
+        not yet agreed: 您还没有同意新的贡献者条款。
+        review link text: 请跟随此链接，方便您查看并接受新的贡献者条款。
+        agreed_with_pd: 您也将您的编辑释于公有领域。
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: 这是什么？
+      save changes button: 保存更改
+      make edits public button: 公开我所有的编辑
+    update:
+      success_confirm_needed: 成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。
+      success: 成功更新用户信息。
   browse:
     created: 创建于
     closed: 关闭于
@@ -2510,37 +2543,6 @@ zh-CN:
       delete_user: 删除此用户
       confirm: 确认
       report: 举报此用户
-    account:
-      title: 编辑账户
-      my settings: 我的设置
-      current email address: 当前电子邮件地址
-      external auth: 外部身份验证
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: 这是什么？
-      public editing:
-        heading: 公开编辑
-        enabled: 启用。非匿名用户，可以编辑数据。
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: 这是什么？
-        disabled: 禁用且无法编辑数据，所有过去的编辑均为匿名。
-        disabled link text: 我为什么不能编辑？
-      public editing note:
-        heading: 公开编辑
-        html: 目前您的编辑是匿名的，人们不能发送邮件给您或看到您的位置。为了显示您的编辑，让别人通过网站与您联系，请点击下面的按钮。<b>由于 0.6
-          API 的转换，只有公开的用户可以编辑地图数据</b>。(<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">了解为什么</a>)。<ul><li>您的电子邮件地址将不会被因为成为公开用户而被透露。</li><li>此操作无法撤销，所有新用户现在都默认为公开的。</li></ul>
-      contributor terms:
-        heading: 贡献者条款
-        agreed: 您已同意新的贡献者条款。
-        not yet agreed: 您还没有同意新的贡献者条款。
-        review link text: 请跟随此链接，方便您查看并接受新的贡献者条款。
-        agreed_with_pd: 您也将您的编辑释于公有领域。
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: 这是什么？
-      save changes button: 保存更改
-      make edits public button: 公开我所有的编辑
-      flash update success confirm needed: 成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。
-      flash update success: 成功更新用户信息。
     set_home:
       flash success: 成功保存您所在位置
     go_public:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 9eaf82297..23d58dc5d 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -280,6 +280,40 @@ zh-TW:
       entry:
         comment: 評論
         full: 註記原文
+  accounts:
+    edit:
+      title: 編輯帳號
+      my settings: 我的設定值
+      current email address: 目前的電子郵件地址
+      external auth: 外部認證
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: 這是什麼？
+      public editing:
+        heading: 公開編輯
+        enabled: 已開啟。非匿名且可以編輯資料。
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: 這是什麼？
+        disabled: 已停用且不能編輯資料，所有先前的編輯都會成為匿名的。
+        disabled link text: 為什麼我不能編輯？
+      public editing note:
+        heading: 公開編輯
+        html: 目前您的編輯是匿名的，人們不能發送郵件給您或看到您的位置。為了顯示你的編輯，讓別人透過網站與您聯繫，請點選下面的按鈕。 <b>由於 0.6
+          API 的轉換，只有公開的使用者可以編輯地圖資料</b>。（<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">知道為什麼</a>）。<ul><li>您的電子郵件地址將不會被因為成為公開使用者而被透露。
+          </li><li>這個動作不能逆轉，所有新的使用者現在都預設為公開的。 </li></ul>
+      contributor terms:
+        heading: 貢獻者條款
+        agreed: 您已同意新的貢獻者條款。
+        not yet agreed: 您未同意新的貢獻者條款。
+        review link text: 請跟隨此連結，方便你檢視並接受新的貢獻者條款。
+        agreed_with_pd: 您亦同意將您的編輯放到公共領域
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: 這是什麼？
+      save changes button: 儲存變更
+      make edits public button: 將我所有的編輯設為公開
+    update:
+      success_confirm_needed: 使用者資訊成功的更新。請檢查您的電子郵件，以確認收到新電子郵件地址的通知。
+      success: 使用者資訊已成功更新。
   browse:
     created: 建立於
     closed: 關閉於
@@ -2516,38 +2550,6 @@ zh-TW:
       delete_user: 刪除這位使用者
       confirm: 確認
       report: 回報此使用者
-    account:
-      title: 編輯帳號
-      my settings: 我的設定值
-      current email address: 目前的電子郵件地址
-      external auth: 外部認證
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: 這是什麼？
-      public editing:
-        heading: 公開編輯
-        enabled: 已開啟。非匿名且可以編輯資料。
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: 這是什麼？
-        disabled: 已停用且不能編輯資料，所有先前的編輯都會成為匿名的。
-        disabled link text: 為什麼我不能編輯？
-      public editing note:
-        heading: 公開編輯
-        html: 目前您的編輯是匿名的，人們不能發送郵件給您或看到您的位置。為了顯示你的編輯，讓別人透過網站與您聯繫，請點選下面的按鈕。 <b>由於 0.6
-          API 的轉換，只有公開的使用者可以編輯地圖資料</b>。（<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">知道為什麼</a>）。<ul><li>您的電子郵件地址將不會被因為成為公開使用者而被透露。
-          </li><li>這個動作不能逆轉，所有新的使用者現在都預設為公開的。 </li></ul>
-      contributor terms:
-        heading: 貢獻者條款
-        agreed: 您已同意新的貢獻者條款。
-        not yet agreed: 您未同意新的貢獻者條款。
-        review link text: 請跟隨此連結，方便你檢視並接受新的貢獻者條款。
-        agreed_with_pd: 您亦同意將您的編輯放到公共領域
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: 這是什麼？
-      save changes button: 儲存變更
-      make edits public button: 將我所有的編輯設為公開
-      flash update success confirm needed: 使用者資訊成功的更新。請檢查您的電子郵件，以確認收到新電子郵件地址的通知。
-      flash update success: 使用者資訊已成功更新。
     set_home:
       flash success: 家的位置成功的儲存
     go_public:
diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml
index 9bd84a04f..5992c2a2d 100644
--- a/config/locales/zh-hk.yml
+++ b/config/locales/zh-hk.yml
@@ -186,6 +186,9 @@ zh-hk:
         reopened_at_by_html: 由%{user}於%{when}重新開啟
       entry:
         comment: 評論
+  accounts:
+    edit:
+      my settings: 我的設定
   browse:
     version: 版本
     in_changeset: 變更集
@@ -829,8 +832,6 @@ zh-hk:
       my settings: 我的設定
       user location: 用戶位置
       report: 舉報此用戶
-    account:
-      my settings: 我的設定
     index:
       title: 用戶
       heading: 用戶