From: Tom Hughes <tom@compton.nu>
Date: Tue, 22 Feb 2022 19:06:43 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3462'
X-Git-Tag: live~2222
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fe7996586927f46f048625fe38ccebc43415d5dd?hp=be878df0978d5b51f7fbb72fca16f74c5708c818

Merge remote-tracking branch 'upstream/pull/3462'
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 0c8b03bda..6b90fce50 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,8 +86,8 @@ GEM
     autoprefixer-rails (10.4.2.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.554.0)
-    aws-sdk-core (3.126.1)
+    aws-partitions (1.556.0)
+    aws-sdk-core (3.126.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -180,7 +180,7 @@ GEM
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.9.0)
+    dry-schema (1.9.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)
@@ -193,12 +193,12 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.7.0)
+    dry-validation (1.8.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.8, >= 1.8.0)
+      dry-schema (~> 1.9, >= 1.9.1)
     erb_lint (0.1.1)
       activesupport
       better_html (~> 1.0.7)
@@ -215,29 +215,10 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (1.9.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.2.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
+    faraday-net_http (2.0.1)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -305,12 +286,11 @@ GEM
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     msgpack (1.4.5)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
     net-imap (0.2.3)
       digest
       net-protocol
@@ -327,8 +307,8 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth (0.4.7)
     oauth-plugin (0.5.1)
@@ -336,8 +316,8 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (1.4.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
@@ -376,7 +356,7 @@ GEM
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.1)
     parallel (1.21.0)
-    parser (3.1.0.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
     pg (1.3.2)
     popper_js (1.16.0)
@@ -451,8 +431,8 @@ GEM
       rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.2)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
     rubocop-minitest (0.17.2)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.13.2)
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index b6a388d81..1140515f5 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,6 +1,5 @@
 OSM.initializeBrowse = function (map) {
   var browseBounds;
-  var selectedLayer;
   var dataLayer = map.dataLayer;
 
   dataLayer.setStyle({
@@ -92,7 +91,6 @@ OSM.initializeBrowse = function (map) {
       url: url,
       success: function (xml) {
         dataLayer.clearLayers();
-        selectedLayer = null;
 
         var features = dataLayer.buildFeatures(xml);
 
@@ -112,24 +110,16 @@ OSM.initializeBrowse = function (map) {
           displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures);
         }
 
+        if (map._objectLayer) {
+          map._objectLayer.bringToFront();
+        }
+
         dataLoader = null;
       }
     });
   }
 
   function onSelect(layer) {
-    // Unselect previously selected feature
-    if (selectedLayer) {
-      selectedLayer.setStyle(selectedLayer.originalStyle);
-    }
-
-    // Redraw in selected style
-    layer.originalStyle = layer.options;
-    layer.setStyle({ color: "#0000ff", weight: 8 });
-
     OSM.router.route("/" + layer.feature.type + "/" + layer.feature.id);
-
-    // Stash the currently drawn feature
-    selectedLayer = layer;
   }
 };
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d9fa276ba..d63317812 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1182,8 +1182,9 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
-  input[type="submit"] {
+  button[type="submit"] {
     margin: auto;
+    white-space: nowrap;
   }
 
   .inbox-row {
diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index eb977d094..2017bee0a 100644
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -68,5 +68,5 @@
 <a name="public"></a>
 <h2><%= t ".public editing note.heading" %></h2>
 <%= t ".public editing note.html" %>
-  <%= button_to t(".make edits public button"), user_go_public_path %>
+<%= button_to t(".make edits public button"), user_go_public_path, :class => "btn btn-primary" %>
 <% end %>
diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
index ccf2fcd11..6196fd438 100644
--- a/config/initializers/new_framework_defaults_7_0.rb
+++ b/config/initializers/new_framework_defaults_7_0.rb
@@ -11,10 +11,10 @@
 
 # `button_to` view helper will render `<button>` element, regardless of whether
 # or not the content is passed as the first argument or as a block.
-# Rails.application.config.action_view.button_to_generates_button_tag = true
+Rails.application.config.action_view.button_to_generates_button_tag = true
 
 # `stylesheet_link_tag` view helper will not render the media attribute by default.
-# Rails.application.config.action_view.apply_stylesheet_media_default = false
+Rails.application.config.action_view.apply_stylesheet_media_default = false
 
 # Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
 # Changing this default means invalidate all encrypted messages generated by
@@ -62,10 +62,10 @@ Rails.application.config.active_storage.video_preview_arguments =
   "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"
 
 # Automatically infer `inverse_of` for associations with a scope.
-# Rails.application.config.active_record.automatic_scope_inversing = true
+Rails.application.config.active_record.automatic_scope_inversing = true
 
 # Raise when running tests if fixtures contained foreign key violations
-# Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
+Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
 
 # Disable partial inserts.
 # This default means that all columns will be referenced in INSERT queries
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 5f0fc6978..b99ab92fd 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -289,6 +289,12 @@ ca:
       entry:
         comment: Comentari
         full: Nota sencera
+  account:
+    deletions:
+      show:
+        title: Suprimeix el meu compte
+        delete_account: Suprimeix el compte
+        cancel: Cancel·la
   accounts:
     edit:
       title: Edita el compte
@@ -328,11 +334,14 @@ ca:
         link text: què és això?
       save changes button: Desa els canvis
       make edits public button: Fes totes les meves modificacions públiques
+      delete_account: Suprimeix el compte...
     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.
+    destroy:
+      success: Compte suprimit.
   browse:
     created: Creat
     closed: Tancat
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 7232d63bb..713bedbb9 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -340,7 +340,7 @@ ce:
       no_more: Кхи цхьа нисдарш цакарий.
       no_more_area: Кхузахь нисдарш дина дац.
       no_more_user: Кхузахь хӀокху декъашхочо нисдарш дина дац.
-      load_more: Чуйаха кхин
+      load_more: Чуйаха кхин а
     timeout:
       sorry: Ахьа бихина нисдарийн могӀа, арабаккха тӀехь беха бу.
   changeset_comments:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 77d059266..d34ba50eb 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -274,6 +274,12 @@ da:
       entry:
         comment: Kommentar
         full: Fuld bemærkning
+  account:
+    deletions:
+      show:
+        title: Slet min konto
+        delete_account: Slet konto
+        confirm_delete: Er du sikker?
   accounts:
     edit:
       title: Rediger konto
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 67ce88fbb..7cbccbc96 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -331,6 +331,33 @@ de:
       entry:
         comment: Kommentar
         full: Vollständiger Hinweis
+  account:
+    deletions:
+      show:
+        title: Mein Konto löschen
+        warning: Achtung! Der Vorgang der Kontolöschung ist endgültig und kann nicht
+          rückgängig gemacht werden.
+        delete_account: Konto löschen
+        delete_introduction: 'Du kannst dein OpenStreetMap-Konto über die unten stehende
+          Schaltfläche löschen. Bitte beachte die folgenden Details:'
+        delete_profile: Deine Profilinformationen, einschließlich deines Avatars,
+          deiner Beschreibung und deines Wohnorts, werden entfernt.
+        delete_display_name: Dein Benutzername wird entfernt und kann von anderen
+          Konten wiederverwendet werden.
+        retain_caveats: 'Einige Informationen über dich bleiben jedoch auf OpenStreetMap
+          erhalten, auch nachdem dein Konto gelöscht wurde:'
+        retain_edits: Deine Änderungen an der Kartendatenbank, sofern vorhanden, bleiben
+          erhalten.
+        retain_traces: Deine hochgeladenen Tracks werden, falls vorhanden, aufbewahrt.
+        retain_diary_entries: Deine Tagebucheinträge und etwaige Kommentare bleiben
+          erhalten, werden aber nicht angezeigt.
+        retain_notes: Deine Kartennotizen und eventuellen Kommentare bleiben erhalten,
+          sind aber nicht sichtbar.
+        retain_changeset_discussions: Die Diskussionen über deine Änderungssätze,
+          sofern vorhanden, werden beibehalten.
+        retain_email: Deine E-Mail-Adresse wird beibehalten.
+        confirm_delete: Bist du sicher?
+        cancel: Abbrechen
   accounts:
     edit:
       title: Benutzerkonto bearbeiten
@@ -371,10 +398,13 @@ de:
         link text: Worum handelt es sich?
       save changes button: Änderungen speichern
       make edits public button: Alle meine Bearbeitungen öffentlich machen
+      delete_account: Konto löschen …
     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.
+    destroy:
+      success: Konto gelöscht.
   browse:
     created: Erstellt
     closed: Geschlossen
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 61813a3fb..f2d8ddcb7 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -948,7 +948,7 @@ fa:
           allotments: اراضی اختصاص‌یافته
           aquaculture: آبزیان
           basin: حوض
-          brownfield: زمین جهت ساخت
+          brownfield: زمین قهوه‌ای
           cemetery: قبرستان
           commercial: منطقهٔ تجاری
           conservation: حفاظت شده
@@ -959,7 +959,7 @@ fa:
           forest: جنگل
           garages: گاراژ
           grass: چمن
-          greenfield: زمین سرسبز
+          greenfield: زمین سبز
           industrial: ناحیهٔ صنعتی
           landfill: محل دفن زباله
           meadow: علفزار
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8f9b68eee..edb05f162 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -119,7 +119,7 @@ fr:
         update: Enregistrer les modifications
       user_block:
         create: Créer un bloc
-        update: Mettre à jour le bloc
+        update: Mettre à jour le blocage
   activerecord:
     errors:
       messages:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index b39d26290..51d10627f 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -35,6 +35,9 @@ fy:
       trace:
         create: Oplade
         update: Feroarings bewarje
+      user_block:
+        create: Utsluting oanmeitsje
+        update: Utsluting bywurkje
   activerecord:
     errors:
       messages:
@@ -142,8 +145,14 @@ fy:
         pass_crypt: Wachtwurd
         pass_crypt_confirmation: Wachtwurd befêstigje
     help:
+      doorkeeper/application:
+        confidential: De applikaasje wurdt brûkt wêr't it kliïnt-geheim fertroulik
+          holden wurde kin (systeemeigen mobile apps en ienside-apps binne net fertroulik)
+        redirect_uri: Brûk ien rigel foar elke URI
       trace:
         tagstring: skaat mei komma's
+      user_block:
+        needs_view: Moat de meidogger oanmelde foar't dizze útsluting ferfalt?
       user:
         email_confirmation: Jo adres wurdt net publikelik toand; sjoch ús <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
           title="Privacybelied fan OSMF mei in stik oer e-mailadressen">Privacybelied</a>
@@ -228,6 +237,33 @@ fy:
       entry:
         comment: Reäksje
         full: Folsleine notysje
+  account:
+    deletions:
+      show:
+        title: Myn akkount wiskje
+        warning: Warskôging! It wiskproses fan in akkount is definityf, en kin net
+          weromdraaid wurde.
+        delete_account: Akkount wiskje
+        delete_introduction: 'Jo kinne jo OpenStreetMap-akkount wiskje mei de knop
+          hjirûnder. Tink om ''e neikommende saken:'
+        delete_profile: Jo profylynformaasje, befetsjend jo meidoggerplaatsje, beskriuwing
+          en fêste lokaasje, wurdt fuortsmiten.
+        delete_display_name: Jo werjûne namme wurdt fuortsmiten, en kin op 'e nij
+          brûkt wurde troch oare akkounts.
+        retain_caveats: 'Guon ynformaasje oer jo bliuwt lykwols yn stân op OpenStreetMap,
+          sels neidat jo akkount wiske is:'
+        retain_edits: Jo bewurkings yn 'e kaart-databank, at dy der binne, bliuwe
+          beholden.
+        retain_traces: Jo opladen trajekten, at dy der binne, bliuwe beholden.
+        retain_diary_entries: Jo deiboekstikken en -reäksjes, at dy der binne, bliuwe
+          beholden, mar ferburgen foar werjefte.
+        retain_notes: Jo kaartnotysjes en -reäksjes, at dy der binne, bliuwe beholden,
+          mar ferburgen foar werjefte.
+        retain_changeset_discussions: Jo oerlis oer wizigingssets, at dat der is,
+          bliuwt beholden.
+        retain_email: Jo e-mailadres bliuwt beholden.
+        confirm_delete: Seker witte?
+        cancel: Annulearje
   accounts:
     edit:
       title: Akkount bewurkje
@@ -267,10 +303,13 @@ fy:
         link text: wat is dat?
       save changes button: Feroarings bewarje
       make edits public button: Al myn bewurkings iepenbier meitsje
+      delete_account: Akkount wiskje ...
     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.
+    destroy:
+      success: Akkount wiske.
   browse:
     created: Makke
     closed: Ofdien
@@ -297,7 +336,7 @@ fy:
     location: 'Lokaasje:'
     changeset:
       title: 'Wizigingsset: %{id}'
-      belongs_to: Auteur
+      belongs_to: Makker
       node: Punten (%{count})
       node_paginated: Punten (%{x}-%{y} fan %{count})
       way: Linen (%{count})
@@ -405,7 +444,7 @@ fy:
       report: Dizze notysje melde
     query:
       title: Skaaimerken opfreegje
-      introduction: Klik op 'e kaart foar skaaimerken yn 'e krite.
+      introduction: Klik op 'e kaart foar skaaimerken fuortby
       nearby: Skaaimerken yn 'e omkriten
       enclosing: Omfetsjende skaaimerken
   changesets:
@@ -530,6 +569,13 @@ fy:
     feed:
       user:
         title: OpenStreetMap Deiboekstikken fan %{user}
+        description: Nije OpenStreetMap-deiboekstikken fan %{user}
+      language:
+        title: OpenStreetMap Deiboekstikken yn it %{language_name}
+        description: Nije deiboekstikken fan meidoggers oan OpenStreetMap yn it %{language_name}
+      all:
+        title: OpenStreetMap Deiboekstikken
+        description: Nije deiboekstikken fan meidoggers oan OpenStreetMap
     comments:
       title: Troch %{user} taheakke deiboekreäksjes
       heading: Deiboekreäksjes fan %{user}
@@ -844,7 +890,7 @@ fy:
           road: Wei
           secondary: Sekundêre wei
           secondary_link: Sekundêre wei
-          service: Parallelwei
+          service: Tagongswei
           services: Sjauffeursfoarsjennings
           speed_camera: Flitser
           steps: Trep
@@ -1624,7 +1670,7 @@ fy:
       send_message_to_html: In nij berjocht stjoere oan %{name}
       subject: Underwerp
       body: Ynhâld
-      back_to_inbox: Werom nei ynfek
+      back_to_inbox: Werom nei it ynfek
     create:
       message_sent: Berjocht ferstjoerd
       limit_exceeded: Jo hawwe de lêste tiid in soad berjochten ferstjoerd. Wachtsje
@@ -1747,7 +1793,7 @@ fy:
       account not active: Spitich, jo akkount is noch net aktyf.<br />Brûk de keppeling
         yn 'e akkountbefêstigingsmail en aktivearje jo akkount, of <a href="%{reconfirm}">freegje
         in nije befêstigingsmail</a>.
-      account is suspended: Spitich, jo akkount is útsletten fanwegen fertochte aktiviteiten.<br
+      account is suspended: Spitich, jo akkount is stillein fanwegen fertochte aktiviteiten.<br
         />Nim kontakt op mei <a href="%{webmaster}">Stipe</a> at jo dat beprate wolle.
       auth failure: Spitich, koe jo net oanmelde mei dy gegevens.
       openid_logo_alt: Meld jo oan mei in openID
@@ -2205,6 +2251,14 @@ fy:
         other: GPX-bestân mei %{count} punten fan %{user}
       description_without_count: GPX-bestân fan %{user}
   application:
+    setup_user_auth:
+      blocked_zero_hour: Jo hawwe in driuwend berjocht op it OpenStreetMap-webstee.
+        Jo moatte it berjocht lêze foar't jo jo bewurkings fêstlizze kinne.
+      blocked: Jo tagong ta de API is útsletten. Meld jo oan op 'e webside om der
+        mear oer te witten.
+      need_to_see_terms: Jo tagong ta de API is tydlik stillein. Meld jo oan op 'e
+        webside om de Bydragersbetingsten te besjen. Jo hoege net akkoart te gean,
+        mar jo moatte se besjen.
     settings_menu:
       account_settings: Akkountynstellings
       oauth1_settings: Ynstellings OAuth 1
@@ -2375,6 +2429,8 @@ fy:
       my comments: Myn reäksjes
       my_preferences: Myn foarkarren
       my_dashboard: Myn oersjochpaniel
+      blocks on me: Utslutings foar my
+      blocks by me: Utslutings troch my
       edit_profile: Profyl bewurkje
       send message: Berjocht stjoere
       diary: Deiboek
@@ -2401,7 +2457,12 @@ fy:
         revoke:
           administrator: Behearderskip ynlûke
           moderator: Tafersjochhâlderskip ynlûke
+      block_history: Rinnende útslutings
+      moderator_history: Utslutings útdield
       comments: Reäksjes
+      create_block: Dizze meidogger útslute
+      confirm_user: Dizze meidogger befêstigje
+      hide_user: Dizze meidogger ferbergje
       delete_user: Dizze meidogger wiskje
       confirm: Befêstigje
       report: Dizze meidogger melde
@@ -2417,6 +2478,22 @@ fy:
         other: Side %{page} (%{first_item}-%{last_item} fan %{items})
       summary_html: '%{name} oanmakke fan %{ip_address} ôf op %{date}'
       summary_no_ip_html: '%{name} oanmakke op %{date}'
+      confirm: Selektearre meidoggers befêstigje
+      hide: Selektearre meidoggers ferbergje
+      empty: Gjin oerienkommende meidoggers fûn
+    suspended:
+      title: Akkount stillein
+      heading: Akkount stillein
+      support: Stipe
+      body_html: |-
+        <p>
+          Spitich, jo akkount is automatysk stillein fanwegen
+          fertochte aktiviteiten.
+        </p>
+        <p>
+          Dat beslút wurdt mei gauwens troch in behearder besjoen, of
+          jo kinne kontakt opnimme mei %{webmaster} at jo it beprate wolle.
+        </p>
     auth_failure:
       connection_failed: Ferbining mei de autentifikaasje-oanbieder mislearre
       invalid_credentials: Unjildige autentifikaasjegegevens
@@ -2434,9 +2511,57 @@ fy:
         mei jo meidochnamme en wachtwurd, en dan it akkount ferbine
         oan jo ID yn jo meidoggerynstellings.
   user_blocks:
+    model:
+      non_moderator_update: Moat tafersjochhâlder wêze om in útsluting oanmeitsje
+        as bywurkje te kinnen.
+      non_moderator_revoke: Moat tafersjochhâlder wêze om in útsluting ynlûke te kinnen.
+    not_found:
+      sorry: Spitich, de meidoggerútsluting mei ID %{id} koe net fûn wurde.
+      back: Werom nei de list
+    new:
+      title: Utsluting foar %{name} oanmeitsje
+      heading_html: Utsluting foar %{name} oanmeitsje
+      period: Foar hoe lang, fan no ôf, de meidogger útsletten wurdt fan 'e API.
+      tried_contacting: Ik haw kontakt mei de meidogger opnommen en frege op te hâlden.
+      tried_waiting: Ik haw de meidogger in ridlike tiid jûn op dat boadskip te reägearjen.
+      back: Alle útslutings besjen
+    edit:
+      title: Utsluting foar %{name} bewurkje
+      heading_html: Utsluting foar %{name} bewurkje
+      period: Foar hoe lang, fan no ôf, de meidogger útsletten wurdt fan 'e API.
+      show: Dizze útsluting besjen
+      back: Alle útslutings besjen
+    filter:
+      block_expired: De útsluting is al ferrûn en kin net bewurke wurde.
+      block_period: De útslutingsdoer moat ien fan 'e wearden yn 'e útklapbere karlist
+        wêze.
+    create:
+      try_contacting: Besykje fóár it útsluten kontakt mei de meidogger op te nimmen,
+        en in ridlike tiid te jaan om te reägearjen.
+      try_waiting: Besykje fóár it útsluten de meidogger in ridlike tiid te jaan om
+        te reägearjen.
+      flash: Utsluting oanmakke foar meidogger %{name}.
+    update:
+      only_creator_can_edit: Inkeld de tafersjochhâlder dy't dizze útsluting oanmakke
+        hat, kin it bewurkje.
+      success: Utsluting bywurke.
+    index:
+      title: Utslutings fan meidoggers
+      heading: List mei útslutings fan meidoggers
+      empty: Der binne noch gjin útslutings oanmakke.
     revoke:
+      title: Utsluting foar %{block_on} ynlûke
+      heading_html: Utsluting foar %{block_on} troch %{block_by} ynlûke
+      time_future: Dizze útsluting ferfalt oer %{time}.
+      past: Dizze útsluting is %{time} ferfallen en kin net mear ynlutsen wurde.
+      confirm: Witte jo seker dat jo dizze útsluting ynlûke wolle?
       revoke: Ynlûke!
+      flash: Dizze útsluting is ynlutsen.
     helper:
+      time_future_html: Ferfalt oer %{time}.
+      until_login: Rint oant oanmelding meidogger.
+      time_future_and_until_login_html: Ferfalt oer %{time} nei oanmelding meidogger.
+      time_past_html: Ferfallen %{time}.
       block_duration:
         hours:
           one: 1 oere
@@ -2453,16 +2578,39 @@ fy:
         years:
           one: 1 jier
           other: '%{count} jier'
+    blocks_on:
+      title: Utslutings foar %{name}
+      heading_html: List mei útslutings foar %{name}
+      empty: '%{name} is noch net útsletten west.'
+    blocks_by:
+      title: Utslutings troch %{name}
+      heading_html: List mei útslutings troch %{name}
+      empty: '%{name} hat noch gjin útslutings oanmakke.'
     show:
+      title: '%{block_on} útsletten troch %{block_by}'
+      heading_html: '%{block_on} útsletten troch %{block_by}'
+      created: 'Oanmakke:'
+      duration: 'Tiidsdoer:'
       status: 'Status:'
+      show: Werjaan
       edit: Bewurkje
       revoke: Ynlûke!
       confirm: Seker witte?
+      reason: 'Reden foar útsluting:'
+      back: Alle útslutings besjen
+      revoker: 'Ynlûker:'
+      needs_view: De meidogger moat oanmelde foar't dizze útsluting ferfalt.
     block:
+      not_revoked: (net ynlutsen)
+      show: Werjaan
       edit: Bewurkje
       revoke: Ynlûke!
     blocks:
+      display_name: Utsletten meidogger
+      creator_name: Oanmakker
+      reason: Reden foar útsluting
       status: Status
+      revoker_name: Ynlutsen troch
       showing_page: Side %{page}
       next: Folgjende »
       previous: « Foarige
@@ -2682,10 +2830,33 @@ fy:
       query_features: Skaaimerken opfreegje
       centre_map: Kaart hjir sintrearje
   redactions:
+    edit:
+      heading: Redigearring bewurkje
+      title: Redigearring bewurkje
+    index:
+      empty: Gjin redigearrings wer te jaan.
+      heading: List fan redigearrings
+      title: List fan redigearrings
+    new:
+      heading: Jou ynformaasje foar de nije redigearring
+      title: Nije redigearring oanmeitsje
     show:
       description: 'Beskriuwing:'
-      user: 'Auteur:'
+      heading: Redigearring "%{title}" werjaan
+      title: Redigearring werjaan
+      user: 'Oanmakker:'
+      edit: Dizze redigearring bewurkje
+      destroy: Dizze redigearring fuortsmite
       confirm: Seker witte?
+    create:
+      flash: Redigearring oanmakke.
+    update:
+      flash: Feroarings bewarre.
+    destroy:
+      not_empty: Redigearring is net leech. Untdoch fóár it ferneatigjen alle ferzjes
+        dy't by dizze redigearring hearre fan redaksjewurk.
+      flash: Redigearring ferneatige.
+      error: Der gong wat mis mei it ferneatigjen fan dizze redigearring.
   validations:
     leading_whitespace: begjint mei wytromte
     trailing_whitespace: einiget mei wytromte
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 7f5d3bb3d..288bfc4ea 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -20,6 +20,7 @@
 # Author: LaG roiL
 # Author: Leononon
 # Author: Metraduk
+# Author: N100a
 # Author: Nemo bis
 # Author: Nimrod Rak
 # Author: Orsa
@@ -299,6 +300,23 @@ he:
       entry:
         comment: תגובה
         full: הערה מלאה
+  account:
+    deletions:
+      show:
+        title: למחוק את החשבון
+        warning: אזהרה! תהליך מחיקת החשבון הוא סופי ובלתי־הפיך.
+        delete_account: מחיקת חשבון
+        delete_introduction: 'באפשרותך למחוק את חשבון ה־OpenStreetMap שלך על־ידי לחיצה
+          על הכפתור שלמטה. שים לב לפרטים הבאים:'
+        delete_profile: מידע הפרופיל שלך, כולל התמונה, התיאור, ומיקום הבית שלך יוסרו.
+        delete_display_name: שם התצוגה שלך יוסר, וניתן יהיה להשתמש בו בחשבונות אחרים.
+        retain_caveats: 'אבל חלק מהמידע עליך יישמר ב־OpenStreetMap, אפילו אחרי מחיקת
+          חשבונך:'
+        retain_edits: העריכות שלך לבסיס הנתונים של המפה, אם קיימות, יישמרו.
+        retain_diary_entries: יומן הכניסות ויומן התגובות שלך, אם קיימים, יישמרו, אך
+          לא ניתן יהיה לצפות בהם.
+        retain_email: כתובת הדואר האלקטרוני שלך תישמר.
+        cancel: ביטול
   accounts:
     edit:
       title: עריכת חשבון
@@ -335,10 +353,13 @@ he:
         link text: מה זה?
       save changes button: שמירת השינויים
       make edits public button: להפוך את כל עריכותיי לציבוריות
+      delete_account: למחוק חשבון…
     update:
       success_confirm_needed: מידע על המשתמש עודכן בהצלחה. נא לבדוק את תיבת הדוא"ל
         כדי לאמת את הדוא"ל החדש.
       success: פרטי המשתמש עודכנו בהצלחה.
+    destroy:
+      success: חשבון נמחק.
   browse:
     created: נוצרה
     closed: נסגרה
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index c81aaece6..7f6383340 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -247,6 +247,14 @@ lb:
       entry:
         comment: Bemierkung
         full: Vollstännegen Hiweis
+  account:
+    deletions:
+      show:
+        title: Mäi Benotzerkont läschen
+        delete_account: Benotzerkont läschen
+        retain_email: Är E-Mail-Adress gëtt behalen.
+        confirm_delete: Sidd Dir sécher?
+        cancel: Ofbriechen
   accounts:
     edit:
       title: Benotzerkont änneren
@@ -267,8 +275,11 @@ lb:
         link text: wat ass dëst?
       save changes button: Ännerunge späicheren
       make edits public button: All meng Ännerunge ëffentlech maachen
+      delete_account: Benotzerkont läschen...
     update:
       success: Benotzerinformatioun ass elo aktualiséiert.
+    destroy:
+      success: Benotzerkont geläscht.
   browse:
     created: Ugeluecht
     closed: Zou
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7b14eff6a..dabbe3ddd 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -395,8 +395,8 @@ pl:
       make edits public button: Niech wszystkie edycje będą publiczne.
       delete_account: Usuń konto...
     update:
-      success_confirm_needed: Zaktualizowano profil użytkownika.  Sprawdź, czy przyszedł
-        już mail potwierdzający nowy adres mailowy.
+      success_confirm_needed: Zaktualizowano profil użytkownika. Sprawdź, czy przyszedł
+        już e-mail potwierdzający nowy adres mailowy.
       success: Zaktualizowano profil użytkownika.
     destroy:
       success: Konto zostało usunięte.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 20c1c1b0f..2d8458aa6 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -359,27 +359,27 @@ ru:
   account:
     deletions:
       show:
-        title: Удалить мою учётную запись
+        title: Удаление моей учётной записи
         warning: Внимание! Процесс удаления учётной записи является окончательным
           и не может быть отменён.
         delete_account: Удалить учётную запись
-        delete_introduction: 'Вы можете удалить свою учетную запись на сайте OpenStreetMap
+        delete_introduction: 'Вы можете удалить свою учётную запись на сайте OpenStreetMap
           с помощью кнопки, размещённой ниже. Обратите внимание на следующие детали:'
-        delete_profile: Информация вашего профиля, включая аватар, описание и местожительство,
+        delete_profile: Информация вашего профиля, включая аватар, описание и местоположение,
           будет удалена.
-        delete_display_name: Ваше отображаемое имя будет удалено, и его можно будет
-          использовать в других аккаунтах.
+        delete_display_name: Ваше отображаемое имя пользователя будет удалено и может
+          быть снова использовано другими учётными записями.
         retain_caveats: 'Однако, на сайте OpenStreetMap некоторая информация о вас
-          сохранится даже после удаления вашей учетной записи:'
+          сохранится даже после удаления вашей учётной записи:'
         retain_edits: Ваши правки базы данных карты, если таковые имеются, будут сохранены.
-        retain_traces: Загруженные вами трассировки, если таковые имеются, будут сохранены.
-        retain_diary_entries: Ваши журнальные записи и комментарии, если таковые имеются,
-          будут сохранены, но скрыты от просмотра.
-        retain_notes: Ваши примечания к карте и комментарии к ним, если таковые имеются,
-          будут сохранены, но скрыты от просмотра.
-        retain_changeset_discussions: Ваши обсуждения версий, если таковые имеются,
-          будут сохранены.
-        retain_email: Адрес вашей электронной почты будет удалён.
+        retain_traces: Загруженные вами треки, если таковые имеются, будут сохранены.
+        retain_diary_entries: Ваши записи в дневнике и комментарии к записям в дневнике,
+          если таковые имеются, будут сохранены, но скрыты от просмотра.
+        retain_notes: Ваши заметки и комментарии к ним, если таковые имеются, будут
+          сохранены, но скрыты от просмотра.
+        retain_changeset_discussions: Ваши обсуждения пакетов правок, если таковые
+          имеются, будут сохранены.
+        retain_email: Адрес вашей электронной почты будет сохранён.
         confirm_delete: Вы уверены?
         cancel: Отмена
   accounts:
@@ -421,13 +421,13 @@ ru:
         link text: что это?
       save changes button: Сохранить изменения
       make edits public button: Сделать все мои правки доступными
-      delete_account: Удалить аккаунт...
+      delete_account: Удалить учётную запись...
     update:
       success_confirm_needed: Информация о пользователе успешно обновлена. Проверьте
         свою электронную почту для подтверждения вашего нового адреса.
       success: Информация о пользователе успешно обновлена.
     destroy:
-      success: Аккаунт удалён.
+      success: Учётная запись удалена.
   browse:
     created: Создано
     closed: Закрыто
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 57c2035c7..53842a9cc 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -190,6 +190,12 @@ scn:
       entry:
         comment: Cummentu
         full: Nota cumpleta
+  account:
+    deletions:
+      show:
+        delete_account: Cancella cuntu
+        confirm_delete: Sî sicuru?
+        cancel: Annulla
   accounts:
     edit:
       title: Cancia lu cuntu
@@ -229,11 +235,14 @@ scn:
         link text: chi voli diri?
       save changes button: Sarva li canciamenti
       make edits public button: Arrenni tutti li mè canciamenti pùbblici
+      delete_account: Cancella cuntu...
     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.
+    destroy:
+      success: Cuntu cancillatu.
   browse:
     created: Criatu
     closed: Chiudutu
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 6a4cc03a4..28cc26971 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -250,12 +250,26 @@ sk:
   api:
     notes:
       comment:
-        opened_at_html: Vytvorené pred %{when}
+        opened_at_html: Vytvorené %{when}
+        commented_at_html: Aktualizované %{when}
+        commented_at_by_html: Aktualizované %{when} používateľom %{user}
+        closed_at_html: Vyriešené %{when}
+        closed_at_by_html: Vyriešené %{when} používateľom %{user}
+        reopened_at_html: Opätovne aktivované %{when}
+        reopened_at_by_html: Opätovne aktivované %{when} používateľom %{user}
       rss:
         title: Poznámky OpenStreetMap
+        commented: nový komentár (neďaleko %{place})
       entry:
         comment: Komentár
         full: Celá poznámka
+  account:
+    deletions:
+      show:
+        title: Odstrániť môj účet
+        warning: Pozor! Odstránenie účtu je konečné a nie je možné ho vrátiť späť.
+        delete_account: Odstrániť účet
+        confirm_delete: Ste si istý/á?
   accounts:
     edit:
       title: Upraviť účet
@@ -266,7 +280,7 @@ sk:
         link: http://wiki.openstreetmap.org/wiki/CS:OpenID
         link text: čo to znamená?
       public editing:
-        heading: Úprava pre verejnosť
+        heading: Verejné editácie
         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á?
@@ -275,13 +289,13 @@ sk:
         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
+        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>
+          vás cez webovú stránku, kliknite na tlačidlo nižšie. <b>Od API verzie 0.6,
+          iba používateľ, ktorý povolil verejné editácie, 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.
@@ -293,19 +307,22 @@ sk:
         link text: čo to znamená?
       save changes button: Uložiť zmeny
       make edits public button: Zverejniť všetky moje úpravy
+      delete_account: Odstrániť účet...
     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é.
+    destroy:
+      success: Účet bol odstránený.
   browse:
     created: Vytvorené
     closed: Uzavreté
-    created_html: Vytvorené <abbr title='%{title}'>pred %{time}</abbr>
+    created_html: Vytvorené <abbr title='%{title}'>%{time}</abbr>
     closed_html: Uzavreté <abbr title='%{title}'>%{time}</abbr>
-    created_by_html: Vytvoril <abbr title='%{title}'>pred %{time}</abbr> %{user}
-    deleted_by_html: Odstránil <abbr title='%{title}'>pred %{time}</abbr> %{user}
-    edited_by_html: Upravil <abbr title='%{title}'>pred %{time}</abbr> %{user}
-    closed_by_html: Uzavrel(a) <abbr title='%{title}'>pred %{time}</abbr> %{user}
+    created_by_html: Vytvoril <abbr title='%{title}'>%{time}</abbr> %{user}
+    deleted_by_html: Odstránil <abbr title='%{title}'>%{time}</abbr> %{user}
+    edited_by_html: Upravil(a) <abbr title='%{title}'>%{time}</abbr> %{user}
+    closed_by_html: Uzavrel(a) <abbr title='%{title}'>%{time}</abbr> %{user}
     version: Verzia
     in_changeset: Sada zmien
     anonymous: anonym
@@ -316,6 +333,11 @@ sk:
       few: '%{count} relácie'
       many: '%{count} relácií'
       other: '%{count} relácií'
+    part_of_ways:
+      one: 1 cesta
+      few: '%{count} cesty'
+      many: '%{count} ciest'
+      other: '%{count} ciest'
     download_xml: Stiahnuť XML
     view_history: Zobraziť históriu
     view_details: Zobraziť detaily
@@ -330,9 +352,8 @@ sk:
       relation: Relácie (%{count})
       relation_paginated: Relácie (%{x}–%{y} z %{count})
       comment: Komentáre (%{count})
-      hidden_commented_by_html: Skrytý komentár od %{user} <abbr title='%{exact_time}'>pred
-        %{when}</abbr>
-      commented_by_html: Komentár od %{user} <abbr title='%{exact_time}'>pred %{when}</abbr>
+      hidden_commented_by_html: Skrytý komentár od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Komentár od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: XML sady zmien
       osmchangexml: osmChange XML
       feed:
@@ -367,7 +388,7 @@ sk:
     relation_member:
       entry_role_html: '%{type} %{name} ako %{role}'
       type:
-        node: Bod
+        node: Uzol
         way: Cesta
         relation: Relácia
     containing_relation:
@@ -377,7 +398,7 @@ sk:
       title: Nenájdené
       sorry: 'Ľutujeme, %{type} #%{id} nebolo možné nájsť.'
       type:
-        node: bod
+        node: uzol
         way: cesta
         relation: relácia
         changeset: počet zmien
@@ -386,7 +407,7 @@ sk:
       title: Vypršal časový limit
       sorry: Ľutujeme, ale načítanie dát %{type} číslo %{id} trvalo príliš dlho
       type:
-        node: bod
+        node: uzol
         way: cesta
         relation: relácia
         changeset: sada zmien
@@ -396,12 +417,12 @@ sk:
       message_html: Verzia %{version} tohto objektu %{type} nemôže byť zobrazená,
         pretože bola skrytá. Viac informácií nájdete na %{redaction_link}.
       type:
-        node: bod
+        node: uzol
         way: cesta
         relation: vzťah
     start_rjs:
-      feature_warning: Načíta sa %{num_features} funkcií, ktoré môžu sposobiť, že
-        Váš prehliadač bude spomalený alebo nebude reagovať. Ste si istý, že chcete
+      feature_warning: Načíta sa %{num_features} funkcií, ktoré môžu spôsobiť, že
+        váš prehliadač sa spomalí alebo prestane reagovať. Ste si istý, že chcete
         zobraziť tieto údaje?
       load_data: Načítať údaje
       loading: Nahrávanie...
@@ -419,14 +440,14 @@ sk:
       open_title: 'Nevyriešená chyba #%{note_name}'
       closed_title: 'Vyriešená chyba #%{note_name}'
       hidden_title: Skrytá poznámka %{note_name}
-      opened_by_html: Vytvoril %{user} <abbr title='%{exact_time}'>pred %{when}</abbr>
-      opened_by_anonymous_html: Vytvoril anonym <abbr title='%{exact_time}'>pred %{when}</abbr>
-      commented_by_html: Komentár od %{user} <abbr title='%{exact_time}'>pred %{when}</abbr>
-      commented_by_anonymous_html: Komentoval anonym <abbr title='%{exact_time}'>pred
-        %{when}</abbr>
-      closed_by_html: Vyriešil %{user} <abbr title='%{exact_time}'>pred %{when}</abbr>
-      closed_by_anonymous_html: Vyriešil anonym <abbr title='%{exact_time}'>pred %{when}</abbr>
-      hidden_by_html: Skryl %{user} <abbr title='%{exact_time}'>pred %{when}</abbr>
+      opened_by_html: Vytvoril %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Vytvoril anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Komentár od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Komentoval anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Vyriešil %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Vyriešil anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Opätovne aktivoval používateľ %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Skryl %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Nahlásiť túto poznámku
     query:
       title: Prieskum prvkov
@@ -437,7 +458,7 @@ sk:
     changeset_paging_nav:
       showing_page: Stránka %{page}
       next: Ďalšia »
-      previous: « Predošlá
+      previous: « Predchádzajúca
     changeset:
       anonymous: Anonym
       no_edits: (bez úprav)
@@ -485,7 +506,7 @@ sk:
       title: Nový záznam denníka
     form:
       location: Poloha
-      use_map_link: použiť mapu
+      use_map_link: Použiť mapu
     index:
       title: Denníky používateľov
       title_friends: Denníky priateľov
@@ -545,6 +566,7 @@ sk:
         title: Denníkové záznamy OpenStreetMap
         description: Nedávne položky denníkov používateľov OpenStreetMap
     comments:
+      no_comments: Žiadne komentáre k denníku
       post: Príspevok
       when: Kedy
       comment: Komentár
@@ -810,6 +832,7 @@ sk:
           citywalls: Mestské hradby
           fort: Pevnosť
           heritage: Lokalita historického dedičstva
+          hollow_way: Zatopená cesta
           house: Dom
           manor: Šľachtické sídlo
           memorial: Pomník
@@ -819,6 +842,7 @@ sk:
           ruins: Ruina
           tomb: Náhrobok
           tower: Veža
+          wayside_chapel: Kaplnka pri ceste
           wayside_cross: Božie muky
           wayside_shrine: Malá kaplnka pri ceste
           wreck: Zrúcanina
@@ -1173,14 +1197,18 @@ sk:
       search: Hľadať
       user_not_found: Používateľ neexistuje
       status: Stav
+      reported_item: Hlásená položka
       states:
         ignored: Ignorované
         open: Otvorené
         resolved: Vyriešené
+    update:
+      provide_details: Uveďte, prosím, potrebné detaily
     show:
       resolve: Vyriešiť
       ignore: Ignorovať
       reopen: Znovu otvoriť
+      comments_on_this_issue: Komentáre k problému
   reports:
     new:
       title_html: Nahlásiť %{link}
@@ -1203,9 +1231,11 @@ sk:
           vandal_label: Používateľ je vandal
           other_label: Iné
         note:
+          abusive_label: Tato poznámka je urážlivá
           other_label: Iné
     create:
       successful_report: Vaše hlásenie bolo prijaté
+      provide_details: Uveďte, prosím, potrebné detaily
   layouts:
     logo:
       alt_text: Logo OpenStreetMap
@@ -1235,6 +1265,7 @@ sk:
     hosting_partners_html: Hosting podporuje %{ucl}, %{fastly}, %{bytemark} a ďalší
       %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: partneri
     tou: Podmienky používania
@@ -1268,6 +1299,7 @@ sk:
       hi: Ahoj %{to_user},
       header: '%{from_user} vám zaslal správu cez OpenStreetMap s predmetom %{subject}:'
     friendship_notification:
+      hi: Ahoj %{to_user},
       subject: '[OpenStreetMap] %{user} vás pridal ako priateľa'
       had_added_you: '%{user} vás pridal ako priateľa na OpenStreetMap.'
       see_their_profile: Jeho/jej profil si môžete pozrieť na %{userurl}.
@@ -1337,10 +1369,11 @@ sk:
       button: Potvrdiť
       success: Potvrdená vaša e-mailová adresa, ďakujeme za registráciu!
       failure: E-mailová adresa bola už potvrdená s týmto znakom.
+      unknown_token: Zadaný potvrdzovací kód vypršal alebo neexistuje.
   messages:
     inbox:
       title: Doručená pošta
-      my_inbox: Moja doručená pošta
+      my_inbox: Doručená pošta
       my_outbox: Odoslané
       messages: Máte %{new_messages} a %{old_messages}
       new_messages:
@@ -1434,8 +1467,10 @@ sk:
     show:
       title: Moje predvoľby
       preferred_editor: Preferovaný editor
+      preferred_languages: Preferované jazyky
       edit_preferences: Upraviť preferencie
     edit:
+      title: Upraviť preferencie
       save: Aktualizovať preferencie
   profiles:
     edit:
@@ -1475,8 +1510,8 @@ sk:
       account not active: Ľutujeme, vaše konto ešte nie je aktívne.<br />Môžete si
         ho aktivovať kliknutím na odkaz v potvrdzovacom e-maile, prípadne si <a href="%{reconfirm}">nechajte
         poslať nový potvrdzovací e-mail</a>.
-      account is suspended: Ľutujeme, ale vaše konto bolo pozastavené vzhľadom na
-        podozrivú aktivitu.<br>Ak to chcete riešiť, môžete kontaktovať <a href="%{webmaster}">webmastera</a>.
+      account is suspended: Ľutujeme, ale vaše konto bolo pozastavené kvôli podozrivej
+        aktivite.<br>Ak to chcete riešiť, môžete kontaktovať <a href="%{webmaster}">webmastera</a>.
       auth failure: Ľutujeme, s uvedenými údajmi sa nie je možné prihlásiť.
       openid_logo_alt: Prihlásenie pomocou OpenID
       auth_providers:
@@ -1506,9 +1541,14 @@ sk:
     markdown_help:
       title_html: Spracováva sa <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>om
       headings: Nadpisy
+      heading: Nadpis
+      subheading: Podnadpis
       unordered: Neusporiadaný zoznam
       ordered: Číslovaný zoznam
+      first: Prvá položka
+      second: Druhá položka
       link: Odkaz
+      text: Text
       image: Obrázok
       alt: Alternatívny text
       url: URL
@@ -1529,12 +1569,30 @@ sk:
         využívajú letecké snímky, GPS prístroje a klasické mapy, aby overili, že OSM
         sú presné a aktuálne.
       community_driven_title: Riadené komunitou
+      community_driven_html: "Komunita OpenStreetMap je rozmanitá, zanietená a každý
+        deň sa rozrastá. Medzi našimi prispievateľmi nájdete amatérskych mapovačov,
+        profesionálov z oblasti GIS, technikov spravujúcich servery OSM, humanitárnych
+        pracovníkov mapujúcich oblasti zasiahnuté nešťastím a mnohých ďalších. \nAk
+        sa chcete o komunite dozvedieť viac, prelistujte si <a href='https://blog.openstreetmap.org'>blog
+        OpenStreetMap</a>, <a href='%{diary_path}'>denníky používateľov</a>, <a href='https://blogs.openstreetmap.org/'>komunitné
+        blogy</a> a webovú stránku <a href='https://www.osmfoundation.org/'>nadácie
+        OSM Foundation</a>."
       open_data_title: Otvorené dáta
       open_data_html: 'OpenStreetMap znamenajú <i>otvorené dáta</i>: môžete ich používať
         na ľubovoľný účel, pokiaľ uvediete ako autora OpenStreetMap a jeho prispievateľov.
         Ak dáta meníte alebo ich určitými spôsobmi rozširujete, výsledok môžete šíriť
         len pod rovnakou licenciou. Podrobnosti nájdete na stránke <a href=''%{copyright_path}''>Copyright</a>.'
       legal_title: Právne informácie
+      legal_1_html: Tento web a mnoho ďalších súvisiacich služieb za komunitu oficiálne
+        prevádzkuje <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a>
+        (OSMF). Použitie všetkých služieb prevádzkovaných OSMF podlieha našim <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Podmienkam
+        použitia</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Pravidlám
+        prijateľného použitia</a> a našim <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Pravidlám
+        ochrany osobných údajov</a>.
+      legal_2_html: |-
+        Ak máte otázky týkajúce sa licencovania, autorských práv alebo iných právnych záležitostí, <a href='https://osmfoundation.org/Contact'>kontaktujte, prosím, OSMF</a>.
+        <br>
+        OpenStreetMap, logo s lupou a State of the Map sú <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registrované ochranné známky OSMF</a>.
       partners_title: Partneri
     copyright:
       foreign:
@@ -1604,6 +1662,9 @@ sk:
           (<a href="http://www.and.com">www.and.com</a>)
         contributors_nz_html: '<strong>Nový Zéland</strong>: Obsahuje dáta pochádzajúce
           z Land Information New Zealand. Crown Copyright reserved.'
+        contributors_si_html: '<strong>Slovinsko</strong>: Obsahuje údaje <a href="http://www.gu.gov.si/">Zememeračského
+          a mapovacieho úradu</a> a <a href="http://www.mkgp.gov.si/">Ministerstva
+          poľnohospodárstva, lesníctva a potravín</a> (verejné informácie o Slovinsku).'
         contributors_za_html: '<strong>Juhoafrická republika</strong>: Obsahuje dáta
           pochádzajúce z <a href="http://www.ngi.gov.za/">Chief Directorate: National
           Geo-Spatial Information</a>, State copyright reserved.'
@@ -1624,6 +1685,10 @@ sk:
           stránky, prosíme vás, aby ste si pozreli náš <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">postup
           odstraňovania</a> alebo podajte žiadosť priamo na <a href="https://dmca.openstreetmap.org/">stránke
           pre podávanie sťažností</a>.
+        trademarks_1_html: OpenStreetMap, logo s lupou a State of the Map sú registrované
+          ochranné známky OpenStreetMap Foundation. Ak máte otázky týkajúce sa používania
+          týchto známok, zašlite ich <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">pracovnej
+          skupine pre licencovanie</a>.
     index:
       js_1: Používate prehliadač bez podpory JavaScriptu, alebo máte JavaScript vypnutý.
       js_2: OpenStreetMap používa pre interaktívnu mapu JavaScript.
@@ -1841,6 +1906,10 @@ sk:
         title: Nie je čas upravovať? Pridajte poznámku!
         paragraph_1_html: Pokiaľ chcete len opraviť nejakú drobnosť a nemáte čas sa
           registrovať a učiť sa upravovať, môžete jednoducho pridať poznámku.
+        paragraph_2_html: |-
+          Stačí prejsť <a href='%{map_url}'>na mapu</a> a kliknúť na obrázok poznámky:
+          <span class='icon note'></span>. Tým do mapy pridáte značku, ktorú môžete myšou posunúť na požadované miesto.
+          Pridajte správu, kliknite na Pridať a ostatní tvorcovia mapy sa na to pozrú.
   traces:
     visibility:
       private: Súkromné (iba zdieľané ako anonymné, neusporiadané body)
@@ -1949,10 +2018,16 @@ sk:
       allow_write_api: upravovať mapu.
       allow_read_gpx: čítať vaše súkromné GPS stopy.
       allow_write_gpx: nahrať GPS stopy.
+      allow_write_notes: meniť poznámky.
+      grant_access: Udeliť prístup
     authorize_success:
       verification: Váš overovací kód je %{code}.
     revoke:
       flash: Prístup pre aplikáciu %{application} bol odvolaný.
+    scopes:
+      write_prefs: Meniť osobné nastavenia
+      write_api: Upravovať mapu
+      write_notes: Meniť poznámky
   oauth_clients:
     new:
       title: Registrácia novej aplikácie
@@ -1996,16 +2071,24 @@ sk:
       flash: Registrácia klientskej aplikácie bola zrušená
   oauth2_applications:
     index:
+      new: Zaregistrovať novú aplikáciu
       permissions: Povolenia
     application:
       confirm_delete: Odstrániť túto aplikáciu?
+    new:
+      title: Zaregistrovať novú aplikáciu
     edit:
       title: Upraviť aplikáciu
     show:
+      confirm_delete: Odstrániť túto aplikáciu?
       permissions: Povolenia
+  oauth2_authorizations:
+    show:
+      title: Autorizačný kód
   oauth2_authorized_applications:
     index:
       title: Moje autorizované aplikácie
+      application: Aplikácia
     application:
       revoke: Odobrať prístup
   users:
@@ -2013,7 +2096,7 @@ sk:
       title: Zaregistrovať sa
       no_auto_account_create: Bohužiaľ teraz nie sme schopný vytvoriť pre vás účet
         automaticky.
-      contact_support_html: Kontaktujte prosím <a href="%{support}">webmastera</a>
+      contact_support_html: Kontaktujte, prosím, <a href="%{support}">webmastera</a>
         so žiadosťou o založenie konta – budeme sa snažiť vašu požiadavku vybaviť
         čo najrýchlejšie.
       about:
@@ -2134,6 +2217,8 @@ sk:
          Toto rozhodnutie onedlho posúdi niektorý správca, prípadne
          môžete skúsiť kontaktovať %{webmaster}.
         </p>
+    auth_failure:
+      no_authorization_code: Bez autorizačného kódu
   user_role:
     filter:
       not_a_role: Reťazec `%{role}' nemá platnú úlohu.
@@ -2333,7 +2418,11 @@ sk:
           ktoré by sa mali nezávisle preveriť.
         hide: Skryť
         resolve: Vyriešiť
+        reactivate: Opätovne aktivovať
         comment_and_resolve: Okomentovať a vyriešiť
+        comment: Okomentovať
+    edit_help: Posuňte mapu a priblížte ju na miesto, ktoré chcete upraviť, potom
+      kliknite sem.
     directions:
       ascend: Stúpanie
       engines:
@@ -2366,6 +2455,7 @@ sk:
         fork_right_without_exit: Na rázcestí odbočte vpravo na %{name}
         turn_right_without_exit: Odbočte vpravo na %{name}
         sharp_right_without_exit: Ostro doprava na %{name}
+        uturn_without_exit: Otočte sa na %{name}
         sharp_left_without_exit: Ostro doľava na %{name}
         turn_left_without_exit: Odbočte vľavo na %{name}
         offramp_left: Použite zjazd vľavo
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 200e426c6..4239ec2ce 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -73,6 +73,7 @@ te:
       relation: సంబంధం
       relation_member: సంబంధం సభ్యులు
       relation_tag: సంబంధం ట్యాగు
+      report: నివేదిక
       session: సెషన్
       trace: అనుసరించు
       tracepoint: అనుసరణ బిందువు
@@ -251,6 +252,30 @@ te:
       entry:
         comment: వ్యాఖ్య
         full: పూర్తి గమనిక
+  account:
+    deletions:
+      show:
+        title: నా ఖాతాని తొలగించు
+        warning: హెచ్చరిక! ఖాతా తొలగించడమనేది అంతిమ చర్య, ఇక దాన్ని వెనక్కి తిప్పలేం.
+        delete_account: ఖాతాని తొలగించు
+        delete_introduction: 'కిందనున్న బొత్తాన్ని వాడి మీ OpenStreetMap ఖాతాను తొలగించవచ్చు.
+          కింది వివరాలను గమనించండి:'
+        delete_profile: మీ ప్రొఫైలు సమాచారాన్ని, అవతార్, వివరం, ఇంటి స్థానంతో సహా
+          తీసేస్తాం.
+        delete_display_name: మీ ప్రదర్శన పేరును తీసేస్తాం. దాన్ని ఇతర ఖాతాలవారు వాడుకునే
+          వీలు కలుగుతుంది.
+        retain_caveats: అయితే, ఖాతాను తొలగించాక కూడా మీకు సంబంధించిన కొంత సమాచారాన్ని
+          OpenStreetMap లో మిగిలిపోతుంది.
+        retain_edits: మ్యాపు డేటాబేసులో మీరు చేసిన దిద్దుబాట్లేమైనా ఉంటే వాటిని ఉంచేస్తాం.
+        retain_traces: మీరు ఎక్కించిన ట్రేసులను ఉంచేస్తాం.
+        retain_diary_entries: మీరు రాసిన డైరీ పద్దులు, డైరీ వ్యాఖ్యలను ఉంచేస్తాం.
+          కానీ వాటిని కనబడకుండా దాచి ఉంచుతాం.
+        retain_notes: మీ మ్యాపు గమనికలు, గమనికల వ్య్కాహ్యలను ఉంచేస్తాం. కానీ వాటిని
+          కనబడకుండా దాచి ఉంచుతాం.
+        retain_changeset_discussions: మీరు చేసిన మార్పులసమితి చర్చలను ఉంచేస్తాం.
+        retain_email: మీ ఈమెయిలు చిరెఉనామాను ఉంచేస్తాం.
+        confirm_delete: నిశ్చయించుకున్నారా?
+        cancel: రద్దుచేయి
   accounts:
     edit:
       title: ఖాతా మార్పు
@@ -290,10 +315,13 @@ te:
         link text: ఇది ఏమిటి?
       save changes button: మార్పులను భద్రపరచు
       make edits public button: నా దిద్దుబాట్లన్నింటినీ బహిరంగం చేయి
+      delete_account: ఖాతాని తొలగించు...
     update:
       success_confirm_needed: వాడుకరి సమాచారాన్ని జయప్రదంగా తాజాకరించాం. మీ కొత్త
         ఈమెయిలు చిరునామాను ధ్రువీకరించేందుకు మెయిల్లో వచ్చిన గమనింపును చూడండి.
       success: వాడుకరి సమాచారం విజయవంతంగా తాజాకరించబడింది.
+    destroy:
+      success: ఖాతాను తొలగించాం.
   browse:
     created: 'సృష్టించబడినది:'
     closed: ముగించబడింది
@@ -437,6 +465,7 @@ te:
       title: క్వెరీ విశేషాలు
       introduction: సమీపం లోని అంశాలను చూసేందుకు మ్యాపుపై నొక్కండి.
       nearby: దగ్గర్లోని విశేషాలు
+      enclosing: అంశాలమ్ను శోధిస్తున్నారు
   changesets:
     changeset_paging_nav:
       showing_page: పేజీ %{page}
@@ -683,6 +712,7 @@ te:
           fuel: ఇంధనం
           gambling: జూదం
           grave_yard: స్మశానం
+          grit_bin: Grit Bin
           hospital: ఆసుపత్రి
           hunting_stand: వేట మంచె
           ice_cream: ఐస్ క్రీం
@@ -810,6 +840,7 @@ te:
           sport: క్రీడా క్లబ్బు
           "yes": క్లబ్బు
         craft:
+          beekeeper: Beekeeper
           blacksmith: కమ్మరి
           brewery: బ్రూవరీ
           carpenter: వడ్రంగి
@@ -819,7 +850,9 @@ te:
           electrician: ఎలక్ట్రీషియన్
           electronics_repair: ఎలక్ట్రానిక్స్ రిపేరు
           gardener: తోటమాలి
+          glaziery: Glaziery
           handicraft: హస్తకళ
+          hvac: HVAC Craft
           metal_construction: లోహాల పనివారు
           painter: పెయింటర్
           photographer: చాయాగ్రాహకుడు
@@ -834,6 +867,7 @@ te:
           "yes": క్రాఫ్టు దుకాణం
         crossing: క్రాసింగు
         emergency:
+          access_point: Access Point
           ambulance_station: అంబులెన్సు కేంద్రం
           assembly_point: కూటమి స్థలం
           defibrillator: డీఫైబ్రిలేటర్
@@ -847,6 +881,7 @@ te:
           water_tank: అత్యవసర నీటి ట్యాంకు
         highway:
           abandoned: విసర్జిత హైవే
+          bridleway: Bridleway
           bus_guideway: బస్ లేన్
           bus_stop: బస్ స్టాపు
           construction: నిర్మాణంలో ఉన్న హైవే
@@ -863,6 +898,7 @@ te:
           motorway: మోటార్‌వే
           motorway_junction: మోటార్‌వే కూడలి
           motorway_link: మోటార్‌వే రోడ్డు
+          passing_place: Passing Place
           path: దారి
           pedestrian: కాలిబాట
           platform: ప్లాట్‌ఫారం
@@ -962,6 +998,7 @@ te:
           reservoir_watershed: జలాశయం
           residential: నివాస ప్రాంతం
           retail: రిటెయిల్
+          village_green: Village Green
           vineyard: వైన్‌యార్డు
           "yes": భూఉపయోగం
         leisure:
@@ -1095,6 +1132,7 @@ te:
           reef: భిత్తిక
           ridge: కొండ
           rock: రాయి
+          saddle: Saddle
           sand: ఇసుక
           scree: స్క్రీ
           scrub: పొద
@@ -1206,6 +1244,7 @@ te:
           bathroom_furnishing: బాత్‌రూము అలంకరణ
           beauty: సౌందర్య దుకాణం
           bed: బెడ్డీంగు సామాగ్రి
+          beverages: మద్యం దుకాణం
           bicycle: సైకిలు దుకాణం
           bookmaker: బుక్‌మేకరు
           books: పుస్తకాల దుకాణం
@@ -1257,7 +1296,9 @@ te:
           hardware: హార్డ్‌వేర్ దుకాణం
           health_food: హెల్త్ ఫుడ్ దుకాణం
           hearing_aids: చెవిటి మిషన్లు
+          herbalist: మూలికల దుకాణం
           hifi: హై-ఫై
+          houseware: గృహోపకరణాల దుకాణం
           ice_cream: ఐస్ క్రీము దుకాణం
           interior_decoration: ఇంటీరియర్ డెకొరేషను
           jewelry: నగల దుకాణం
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 327fe5abc..83855da5f 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: A Retired User
+# Author: Anewplayer
 # Author: Dinhxuanduyet
 # Author: Ioe2015
 # Author: JohnsonLee01
@@ -262,6 +263,33 @@ vi:
       entry:
         comment: Bình luận
         full: Ghi chú đầy đủ
+  account:
+    deletions:
+      show:
+        title: Xóa tài khoản
+        warning: Cảnh báo! Việc này sẽ xóa vĩnh viễn tài khoản và không thể được hoàn
+          tác.
+        delete_account: Xóa tài khoản
+        delete_introduction: 'Nhấp vào nút bên dưới để xóa tài khoản OpenStreetMap
+          của bạn. Vui lòng lưu ý các điều sau:'
+        delete_profile: Thông tin hồ sơ của bạn, bao gồm hình đại diện, mô tả và vị
+          trí nhà riêng của bạn sẽ bị xóa.
+        delete_display_name: Tên hiển thị của bạn sẽ bị xoá. Vì vậy, chúng có thể
+          được sử dụng lại bởi các tài khoản khác.
+        retain_caveats: 'Tuy nhiên, một số thông tin về bạn vẫn được giữ lại trên
+          OpenStreetMap, ngay cả sau khi tài khoản của bạn bị xóa:'
+        retain_edits: Các sửa đổi của bạn đối với cơ sở dữ liệu bản đồ (nếu có) sẽ
+          được giữ lại.
+        retain_traces: Các tập tin bạn đã tải lên (nếu có) vẫn sẽ được giữ lại
+        retain_diary_entries: Các mục nhật ký và nhận xét nhật ký của bạn (nếu có)
+          sẽ được giữ lại nhưng không được hiển thị.
+        retain_notes: Ghi chú bản đồ và ghi chú nhận xét (nếu có) sẽ được giữ lại
+          nhưng không được hiển thị.
+        retain_changeset_discussions: Lịch sử thảo luận của bạn (nếu có) sẽ được giữ
+          lại.
+        retain_email: Địa chỉ email của bạn sẽ được giữ lại.
+        confirm_delete: Bạn có chắc không?
+        cancel: Hủy bỏ
   accounts:
     edit:
       title: Chỉnh sửa tài khoản
@@ -299,10 +327,13 @@ 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
+      delete_account: Xóa tài khoản...
     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.
+    destroy:
+      success: Đã xóa tài khoản
   browse:
     created: Tạo
     closed: Đóng
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index cc69c96b9..2a40abe9a 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -312,6 +312,13 @@ zh-CN:
       entry:
         comment: 评论
         full: 完整注记
+  account:
+    deletions:
+      show:
+        title: 删除我的账户
+        delete_account: 删除账户
+        confirm_delete: 您确定吗？
+        cancel: 取消
   accounts:
     edit:
       title: 编辑账户
@@ -342,9 +349,12 @@ zh-CN:
         link text: 这是什么？
       save changes button: 保存更改
       make edits public button: 公开我所有的编辑
+      delete_account: 删除账户……
     update:
       success_confirm_needed: 成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。
       success: 成功更新用户信息。
+    destroy:
+      success: 账户已删除。
   browse:
     created: 创建于
     closed: 关闭于
@@ -1233,6 +1243,7 @@ zh-CN:
           platform: 铁路站台
           preserved: 保留铁路
           proposed: 规划铁路
+          rail: 铁路
           spur: 铁路支线
           station: 火车站
           stop: 火车停车点
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index a627260fb..0186459ee 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -280,6 +280,24 @@ zh-TW:
       entry:
         comment: 評論
         full: 註記原文
+  account:
+    deletions:
+      show:
+        title: 刪除我的帳號
+        warning: 警告！帳號刪除處理是完全徹底、無法還原的。
+        delete_account: 刪除帳號
+        delete_introduction: 您可以使用下方按鈕來刪除您的 OpenStreetMap 帳號。並請注意以下細節：
+        delete_profile: 您的個人檔案資訊，包含像是您的頭像圖片、描述，以及住家位置將會移除。
+        delete_display_name: 您的顯示名稱將會移除，並且會被其他帳號拿來重覆使用。
+        retain_caveats: 然而，即使您的帳號被刪除後，一些關於您的資訊仍會繼續保留在 OpenStreetMap 裡：
+        retain_edits: 若有您對於地圖資料庫的編輯次數，這將會繼續保留。
+        retain_traces: 若有您上傳過的軌跡資料內容，這將會繼續保留。
+        retain_diary_entries: 若有您的日記項目與日記評論內容，這將會繼續保留。
+        retain_notes: 若有您的地圖註記與註記評論內容，這將會繼續保留；不過會隱藏起來。
+        retain_changeset_discussions: 若有您的變更集討論，這將會繼續保留。
+        retain_email: 您的電子郵件地址將會繼續保留。
+        confirm_delete: 您確定嗎？
+        cancel: 取消
   accounts:
     edit:
       title: 編輯帳號
@@ -311,9 +329,12 @@ zh-TW:
         link text: 這是什麼？
       save changes button: 儲存變更
       make edits public button: 將我所有的編輯設為公開
+      delete_account: 刪除帳號…
     update:
       success_confirm_needed: 使用者資訊成功的更新。請檢查您的電子郵件，以確認收到新電子郵件地址的通知。
       success: 使用者資訊已成功更新。
+    destroy:
+      success: 帳號已刪除。
   browse:
     created: 建立於
     closed: 關閉於