Merge pull request #4499 from tomhughes/help-styling

Improve styling of help page

diff --git a/Gemfile.lock b/Gemfile.lock
index 8949abcbf89b9cb3e9744973d1377668a52548e3..aed48536002eec91f08893238fe68956c161fc59 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,17 +95,17 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.883.0)
-    aws-sdk-core (3.190.3)
+    aws-partitions (1.884.0)
+    aws-sdk-core (3.191.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.76.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -125,7 +125,7 @@ GEM
     bigdecimal (3.1.6)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.17.1)
+    bootsnap (1.18.1)
       msgpack (~> 1.2)
     bootstrap (5.3.2)
       autoprefixer-rails (>= 9.1.0)
@@ -143,11 +143,11 @@ GEM
     cancancan (3.5.0)
     canonical-rails (0.2.15)
       actionview (>= 4.1, <= 7.2)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
@@ -157,10 +157,12 @@ GEM
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.4.1)
-    crack (0.4.5)
+    crack (0.4.6)
+      bigdecimal
       rexml
     crass (1.0.6)
-    dalli (3.2.6)
+    dalli (3.2.7)
+      base64
     dartsass-ruby (3.0.2)
       sass-embedded (~> 1.54, < 1.67)
     dartsass-sprockets (3.0.0)
@@ -230,7 +232,7 @@ GEM
     erubi (1.12.0)
     execjs (2.9.1)
     exifr (1.4.0)
-    factory_bot (6.4.5)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
@@ -483,7 +485,7 @@ GEM
     rouge (4.2.0)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.60.1)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 7e1b06a8dd3bbde8f7cc6c7bbc538e205e65937d..75db7f73bc757ff600bb59b0d9608c4ccdadaebd 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -177,7 +177,7 @@ class ApiController < ApplicationController
   ##
   # wrap an api call in a timeout
   def api_call_timeout(&block)
-    Timeout.timeout(Settings.api_timeout, Timeout::Error, &block)
+    Timeout.timeout(Settings.api_timeout, &block)
   rescue ActionView::Template::Error => e
     e = e.cause
 

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c830d4bcd37bbce3177e80dd295cb4067bae8299..0a7df0994c9fc23f5c452ed2bb62dfc291b88aa6 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -199,7 +199,7 @@ class ApplicationController < ActionController::Base
   ##
   # wrap a web page in a timeout
   def web_timeout(&block)
-    Timeout.timeout(Settings.web_timeout, Timeout::Error, &block)
+    Timeout.timeout(Settings.web_timeout, &block)
   rescue ActionView::Template::Error => e
     e = e.cause
 

diff --git a/app/views/oauth2_authorized_applications/_application.html.erb b/app/views/oauth2_authorized_applications/_application.html.erb
index 28d048c4a098a727d7f289aec84c61ebce69cd6e..4209b8ff919acb36cc5e1bddd98bb3d707fc92ee 100644 (file)
--- a/app/views/oauth2_authorized_applications/_application.html.erb
+++ b/app/views/oauth2_authorized_applications/_application.html.erb
@@ -9,6 +9,9 @@
       <% end -%>
     </ul>
   </td>
+  <td class="align-middle">
+    <%= friendly_date_ago(application.authorized_tokens.where(:resource_owner_id => current_user).maximum(:created_at)) %>
+  </td>
   <td class="align-middle text-end">
     <%= link_to t(".revoke"), oauth_authorized_application_path(application), { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_revoke") } } %>
   </td>

diff --git a/app/views/oauth2_authorized_applications/index.html.erb b/app/views/oauth2_authorized_applications/index.html.erb
index 2d3ad00bdea337b269b3609298ebb0c7d92065ab..59d692393257b4617f7fbcc2f40b500fe743edd5 100644 (file)
--- a/app/views/oauth2_authorized_applications/index.html.erb
+++ b/app/views/oauth2_authorized_applications/index.html.erb
@@ -10,6 +10,7 @@
       <tr>
         <th><%= t ".application" %></th>
         <th><%= t ".permissions" %></th>
+        <th><%= t ".last_authorized" %></th>
         <th></th>
       </tr>
     </thead>

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index be7ff1724684996999aac774948e968885426362..b180eb1a58cd980f5316317444acb1a9941e9b16 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -4,7 +4,7 @@
 
 <p class='introduction'><%= t ".introduction" %></p>
 
-<% sites = %w[beginners_guide help mailing_lists community irc switch2osm welcomemat wiki] %>
+<% sites = %w[beginners_guide community mailing_lists irc switch2osm welcomemat wiki] %>
 <% sites.prepend("welcome") if current_user %>
 
 <div class="row row-cols-sm-3 g-4 mb-3">

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 4c787bd50e46b578d5cf22cdd67b908bd62b380d..d7a7d7a024bb812d27fdf87c8ad34a3a32a04319 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -74,6 +74,7 @@ da:
       messages:
         invalid_email_address: ser ikke ud til at være en gyldig e-mailadresse
         email_address_not_routable: kan ikke rutes
+        display_name_is_user_n: kan ikke være user_n medmindre n er dit bruger-id
       models:
         user_mute:
           is_already_muted: er allerede gjort stille
@@ -136,7 +137,7 @@ da:
         language_code: Sprog
       doorkeeper/application:
         name: Navn
-        redirect_uri: Omdirigerings-URI:jer
+        redirect_uri: Omdirigerings-URI'er
         confidential: Fortrolig applikation?
         scopes: Tilladelser
       friend:
@@ -472,6 +473,15 @@ da:
       introduction: Klik på kortet for at finde kortobjekter i nærheden.
       nearby: Kortobjekter i nærheden
       enclosing: Omgivende kortobjekter
+  old_nodes:
+    not_found:
+      sorry: 'Beklager, node #%{id} version %{version} kunne ikke findes.'
+  old_ways:
+    not_found:
+      sorry: 'Beklager, vej #%{id} version %{version} kunne ikke findes.'
+  old_relations:
+    not_found:
+      sorry: 'Beklager, relation #%{id} version %{version} kunne ikke findes.'
   changesets:
     changeset_paging_nav:
       showing_page: Side %{page}
@@ -1655,6 +1665,8 @@ da:
       loaded:
         one: indlæst med %{trace_points} ud af %{count} muligt punkt.
         other: indlæst med %{trace_points} ud af %{count} mulige punkter.
+      all_your_traces_html: Alle dine succesfuldt overførte GPX-spor kan findes på
+        %{url}.
       subject: '[OpenStreetMap] GPX-importering lykkedes'
     signup_confirm:
       subject: '[OpenStreetMap] Velkommen til OpenStreetMap'
@@ -1855,7 +1867,7 @@ da:
     new:
       title: Glemt adgangskode
       heading: Glemt adgangskode?
-      email address: 'E-mailadresse:'
+      email address: E-mailadresse
       new password button: Nulstil adgangskode
       help_text: Indtast e-mailadressen du brugte da du oprettede kontoen. Vi sender
         et link til den som du kan bruge til at nulstille din adgangskode.
@@ -1915,9 +1927,9 @@ da:
     new:
       title: Log på
       heading: Log på
-      email or username: 'E-mailadresse eller brugernavn:'
-      password: 'Adgangskode:'
-      openid_html: '%{logo} OpenID:'
+      email or username: E-mailadresse eller brugernavn
+      password: Adgangskode
+      openid_html: '%{logo} OpenID'
       remember: Husk mig
       lost password link: Glemt din adgangskode?
       login_button: Log på
@@ -2118,6 +2130,8 @@ da:
           %{czechia}: Indeholder data fra State Administration of Land Surveying
           and Cadastre licenseret under %{cc_licence_link}
         contributors_cz_czechia: Tjekkiet
+        contributors_cz_cc_licence: Creative Commons Kreditering 4.0 International
+          licens (CC BY 4.0)
         contributors_fi_credit_html: '%{finland}: Indeholder data fra National Land
           Survey af Finlands topografiske database og andre datasæt under %{nlsfi_license_link}.'
         contributors_fi_finland: Finland
@@ -2384,6 +2398,7 @@ da:
           allotments: Kolonihaver
           pitch: Sportsbane
           centre: Sportscenter
+          beach: Strand
           reserve: Naturreservat
           military: Militært område
           school: Skole
@@ -2401,7 +2416,9 @@ da:
           bus_stop: Busstop
           stop: Stop
           bicycle_shop: Cykelhandler
+          bicycle_rental: Cykeludlejning
           bicycle_parking: Cykelparkering
+          bicycle_parking_small: Mindre cykelparkering
           toilets: Toiletter
     welcome:
       title: Velkommen!
@@ -2709,7 +2726,7 @@ da:
       client_secret_warning: Sørg for at gemme denne hemmelighed - den vil ikke være
         tilgængelig senere
       permissions: Tilladelser
-      redirect_uris: Omdirigerings-URI:jer
+      redirect_uris: Omdirigerings-URI'er
     not_found:
       sorry: Beklager, applikationen kunne ikke findes.
   oauth2_authorizations:

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c7325e64f117652d13e92d51a37c51aff4fb940d..aae35a788f7b5ced64518f2dd9bf96bf68a1441a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2228,18 +2228,14 @@ en:
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
         title: Beginners' Guide
         description: Community maintained guide for beginners.
-      help:
-        url: https://help.openstreetmap.org/
-        title: Help Forum
-        description: Ask a question or look up answers on OpenStreetMap's question-and-answer site.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Help & Community Forum
+        description: A shared place for to seek help and have conversations about OpenStreetMap.
       mailing_lists:
         url: https://lists.openstreetmap.org/
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
-      community:
-        url: https://community.openstreetmap.org/
-        title: Community forum
-        description: A shared place for conversations about OpenStreetMap.
       irc:
         url: https://irc.openstreetmap.org/
         title: IRC
@@ -2684,6 +2680,7 @@ en:
       title: "My Authorized Applications"
       application: "Application"
       permissions: "Permissions"
+      last_authorized: "Last Authorized"
       no_applications_html: "You have not yet authorized any %{oauth2} applications."
       oauth_2: "OAuth 2"
     application:

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index f41621aa9c5af6d2edd07d2fdc23e6283b0f19ea..69fd1a2fd2336cce2d58c49030dff56a55e96d1e 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -461,6 +461,15 @@ eo:
       introduction: Alklaku la mapon por trovi proksimajn objektojn.
       nearby: Proksimaj objektoj
       enclosing: Ĉirkaŭaj objektoj
+  old_nodes:
+    not_found:
+      sorry: 'Bedaŭrinde la nodo #%{id} en versio %{version} ne troveblas.'
+  old_ways:
+    not_found:
+      sorry: 'Bedaŭrinde la linio #%{id} en versio %{version} ne troveblas.'
+  old_relations:
+    not_found:
+      sorry: 'Bedaŭrinde la rilato #%{id} en versio %{version} ne troveblas.'
   changesets:
     changeset_paging_nav:
       showing_page: Paĝo %{page}
@@ -1828,7 +1837,7 @@ eo:
     new:
       title: Perdita pasvorto
       heading: Forgesis vian pasvorton ?
-      email address: 'Retpoŝtadreso:'
+      email address: Retpoŝta adreso
       new password button: Nuligi pasvorton
       help_text: Entajpu la retpoŝtan adreson kiun vi uzis por ensaluto, ni sendos
         al vi ligilon, kiun vi povos uzi por restarigi vian pasvorton.
@@ -1888,9 +1897,9 @@ eo:
     new:
       title: Ensaluti
       heading: Ensaluti
-      email or username: 'Retpoŝtadreso aŭ uzantnomo:'
-      password: 'Pasvorto:'
-      openid_html: '%{logo} OpenID:'
+      email or username: Retpoŝta adreso aŭ uzantnomo
+      password: Pasvorto
+      openid_html: '%{logo} OpenID'
       remember: Memori min
       lost password link: Ĉu vi forgesis vian pasvorton?
       login_button: Ensaluti

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 9d53bbfdd70556a9cd6019af6447e0823dcb06c2..adbd62d7c36fe0e7adb9746b13a51193d939102a 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -415,7 +415,7 @@ gl:
       entry_role_html: Relación %{relation_name} (como %{relation_role})
     not_found:
       title: Non atopado
-      sorry: Sentímolo, non se puido atopar o %{type} co nº%{id}.
+      sorry: Sentímolo, non se puido atopar o/a %{type} co n.º %{id}.
       type:
         node: nó
         way: vía
@@ -461,6 +461,15 @@ gl:
       introduction: Prema no mapa para atopar elementos preto daquí.
       nearby: Elementos preto daquí
       enclosing: Elementos darredor
+  old_nodes:
+    not_found:
+      sorry: Sentímolo, non se puido atopar a versión %{version} do nó n.º %{id}.
+  old_ways:
+    not_found:
+      sorry: Sentímolo, non se puido atopar a versión %{version} da vía n.º %{id}.
+  old_relations:
+    not_found:
+      sorry: Sentímolo, non se puido atopar a versión %{version} da relación n.º %{id}.
   changesets:
     changeset_paging_nav:
       showing_page: Páxina %{page}
@@ -494,15 +503,16 @@ gl:
         que solicitou.
   changeset_comments:
     comment:
-      comment: 'Novo comentario sobre os conxuntos de modificacións #%{changeset_id}
-        de %{author}'
+      comment: Novo comentario sobre o conxunto de modificacións n.º %{changeset_id}
+        de %{author}
       commented_at_by_html: Actualizado %{when} por %{user}
     comments:
-      comment: 'Novo comentario sobre o conxunto de modificacións #%{changeset_id}
-        de %{author}'
+      comment: Novo comentario sobre o conxunto de modificacións n.º %{changeset_id}
+        de %{author}
     index:
       title_all: Parola do conxunto de modificacións no OpenStreetMap
-      title_particular: 'Parola do conxunto de modificacións #%{changeset_id} no OpenStreetMap'
+      title_particular: Conversa do conxunto de modificacións n.º %{changeset_id}
+        do OpenStreetMap
     timeout:
       sorry: Sentímolo, a listaxe dos comentarios do conxuntos de modificacións que
         solicitaches tardou moito en obterse.
@@ -1484,7 +1494,7 @@ gl:
         open: Abertos
         resolved: Resoltos
     show:
-      title: '%{status} Erro #%{issue_id}'
+      title: '%{status} Erro n.º %{issue_id}'
       reports:
         one: '%{count} denuncia'
         other: '%{count} denuncias'
@@ -1514,8 +1524,8 @@ gl:
       reported_by_html: Denunciado coma %{category} por %{user} o %{updated_at}
     helper:
       reportable_title:
-        diary_comment: '%{entry_title}, comentario #%{comment_id}'
-        note: Nota n.º %{note_id}
+        diary_comment: '%{entry_title}, comentario n.º %{comment_id}'
+        note: Nota n.º %{note_id}
   issue_comments:
     create:
       comment_created: O comentario creouse correctamente
@@ -1918,7 +1928,7 @@ gl:
       heading: Rexistro
       email or username: Enderezo de correo electrónico ou nome de usuario
       password: Contrasinal
-      openid_html: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID'
       remember: Lembrádeme
       lost password link: Perdiches o teu contrasinal?
       login_button: Iniciar a sesión
@@ -3095,9 +3105,9 @@ gl:
     show:
       title: 'Nota: %{id}'
       description: Descrición
-      open_title: Nota sen resolver nº%{note_name}
-      closed_title: Nota resolta nº%{note_name}
-      hidden_title: Nota agochada nº%{note_name}
+      open_title: Nota sen resolver n.º %{note_name}
+      closed_title: Nota resolta n.º %{note_name}
+      hidden_title: Nota agochada n.º %{note_name}
       event_opened_by_html: Creado por %{user} %{time_ago}
       event_opened_by_anonymous_html: Creado por un usuario anónimo %{time_ago}
       event_commented_by_html: Comentario de %{user} %{time_ago}

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 48b248ef7755154ef1950d7967a7a2dbd4013659..366cc3c17c421c6c8aca92e3392043ecc65f4bcc 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -231,7 +231,7 @@ nb:
       description: iD (redigering i nettleseren)
     remote:
       name: Lokalt installert program
-      description: Fjernkontroll (JOSM, Potlatch, Merkaartor)
+      description: eksternt program (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
       none: Ingen

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b7853854494b8ad3502cf720f8146717bf1fcaa6..e7439283861f374ea7736befec6caaf8f2064589 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1947,7 +1947,7 @@ nl:
       heading: Aanmelden
       email or username: 'E-mailadres of gebruikersnaam:'
       password: 'Wachtwoord:'
-      openid_html: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID'
       remember: Aanmeldgegevens onthouden
       lost password link: Wachtwoord vergeten?
       login_button: Aanmelden

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 4d2c010a0cd51c658640b8e413111639368ee4db..329cabf9d09c22adc72921dfcbd4f237dc117841 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -53,6 +53,7 @@
 # Author: SandroHc
 # Author: Trigonometria87
 # Author: Tuliouel
+# Author: Vaniacfon
 # Author: Vgeorge
 # Author: ViriatoLusitano
 # Author: Vitalb
@@ -3069,6 +3070,14 @@ pt:
       showing_page: Página %{page}
       next: Próximo »
       previous: « Anterior
+  user_mutes:
+    index:
+      title: Usuários silenciados
+      table:
+        tbody:
+          send_message: Enviar mensagem
+    destroy:
+      error: Não foi possível silenciar o usuário. Por favor tente novamente.
   notes:
     index:
       title: Notas postadas ou comentadas por %{user}

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index fd8d61d8ab9da2f2aa7ad71929e0993cf652998a..857b1ab78a902da8b7dbb3dfda0a7f3da87a9c77 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1954,8 +1954,8 @@ ru:
       title: Представьтесь
       heading: Представьтесь
       email or username: 'Эл. почта или имя пользователя:'
-      password: 'Пароль:'
-      openid_html: '%{logo} OpenID:'
+      password: Пароль
+      openid_html: '%{logo} OpenID'
       remember: Запомнить меня
       lost password link: Забыли пароль?
       login_button: Представиться
@@ -2774,6 +2774,7 @@ ru:
       remove as friend: Удалить из друзей
       add as friend: Добавить в друзья
       mapper since: 'Зарегистрирован:'
+      uid: 'ID пользователя:'
       ct status: 'Условия участия:'
       ct undecided: Неопределено
       ct declined: Отклонены
@@ -2784,6 +2785,7 @@ ru:
       role:
         administrator: Этот пользователь является администратором
         moderator: Этот пользователь является модератором
+        importer: Этот пользователь является импортером
         grant:
           administrator: Присвоить права администратора
           moderator: Присвоить права модератора
@@ -3096,6 +3098,7 @@ ru:
       map_data_zoom_in_tooltip: Увеличьте масштаб, чтобы увидеть данные карты
       queryfeature_tooltip: Что здесь?
       queryfeature_disabled_tooltip: Приблизьте карту для информации об объектах
+      embed_html_disabled: Встраивание HTML недоступно для этого слоя карты
     changesets:
       show:
         comment: Комментировать

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 523bd80dc1132bc5c9585ac6db0f63ddce6ff975..ff11d9039b308de380700e5c6e94fe11d1217357 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -490,6 +490,15 @@ sl:
       introduction: Kliknite na zemljevid za iskanje bližnjih značilnosti.
       nearby: Značilnosti v neposredni bližini
       enclosing: Vsebujoče značilnosti
+  old_nodes:
+    not_found:
+      sorry: 'Žal vozlišča #%{id} različice %{version} ni bilo mogoče najti.'
+  old_ways:
+    not_found:
+      sorry: 'Žal načina #%{id} različice %{version} ni bilo mogoče najti.'
+  old_relations:
+    not_found:
+      sorry: 'Žal relacije #%{id} različice %{version} ni bilo mogoče najti.'
   changesets:
     changeset_paging_nav:
       showing_page: Stran %{page}
@@ -1962,7 +1971,7 @@ sl:
       heading: Prijava
       email or username: E-poštni naslov ali uporabniško ime
       password: Geslo
-      openid_html: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID'
       remember: Zapomni si me
       lost password link: Ste pozabili geslo?
       login_button: Prijava

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 86ed4714debe1e916b7e862ec7e616a34d1c036a..618f6ee24f38305500501b6209b7a077d71502a8 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1813,6 +1813,7 @@ sv:
       read_button: Markera som läst
       reply_button: Svara
       destroy_button: Radera
+      unmute_button: Flytta till inkorg
     new:
       title: Skicka meddelande
       send_message_to_html: Skicka ett nytt meddelande till %{name}

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 562cc3fe26c640165e430bcc4973484118f9cdb1..e9cb592ca664951ebf646b587c8cffb156e37bc6 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -111,8 +111,8 @@ zh-CN:
         create: 注册
         update: 更新
       redaction:
-        create: 创建修订
-        update: 保存修订
+        create: 创建隐删
+        update: 保存隐删
       trace:
         create: 上传
         update: 保存更改
@@ -124,9 +124,10 @@ zh-CN:
       messages:
         invalid_email_address: 似乎不是有效的电子邮件地址
         email_address_not_routable: 不可路由
+        display_name_is_user_n: 不能为“user_n”，除非“n”是您的用户ID
       models:
         user_mute:
-          is_already_muted: 已弱å\8c\96
+          is_already_muted: 已忽è§\86
     models:
       acl: 访问控制列表
       changeset: 变更集
@@ -468,8 +469,8 @@ zh-CN:
         changeset: 变更集
         note: 注记
     redacted:
-      redaction: 删改 %{id}
-      message_html: 该%{type}版本 %{version} 无法显示，因为其已被删改。详情请见%{redaction_link}。
+      redaction: 隐删 %{id}
+      message_html: 该%{type}版本 %{version} 无法显示，因为其已被隐删。详情请见%{redaction_link}。
       type:
         node: 节点
         way: 路径
@@ -494,6 +495,15 @@ zh-CN:
       introduction: 点击地图以查找附近要素。
       nearby: 附近要素
       enclosing: 封闭要素
+  old_nodes:
+    not_found:
+      sorry: '抱歉，无法找到节点 #%{id} 的版本 %{version}。'
+  old_ways:
+    not_found:
+      sorry: '抱歉，无法找到路径 #%{id} 的版本 %{version}。'
+  old_relations:
+    not_found:
+      sorry: '抱歉，无法找到关系 #%{id} 的版本 %{version}。'
   changesets:
     changeset_paging_nav:
       showing_page: 第 %{page} 页
@@ -1773,10 +1783,10 @@ zh-CN:
       no_sent_messages_html: 您尚未发送信息。何不联系一些%{people_mapping_nearby_link}?
       people_mapping_nearby: 在附近绘制地图的人
     muted:
-      title: 已弱å\8c\96消息
+      title: 已忽è§\86消息
       messages:
-        one: 1 æ\9d¡å¼±å\8c\96消息
-        other: æ\82¨æ\9c\89 %{count} æ\9d¡å¼±å\8c\96消息
+        one: 1 æ\9d¡å¿½è§\86消息
+        other: æ\82¨æ\9c\89 %{count} æ\9d¡å¿½è§\86消息
     reply:
       wrong_user: 您已经以 '%{user}' 的身份登录，但是您想要回复的消息并非寄给这个用户。请以正确的用户身份登录以回复这个消息。
     show:
@@ -1791,7 +1801,7 @@ zh-CN:
     heading:
       my_inbox: 我的收件箱
       my_outbox: 我的发件箱
-      muted_messages: 已弱å\8c\96消息
+      muted_messages: 已忽è§\86消息
     mark:
       as_read: 标记消息为已读
       as_unread: 标记消息为未读
@@ -2441,7 +2451,7 @@ zh-CN:
       oauth1_settings: OAuth 1设置
       oauth2_applications: OAuth 2应用程序
       oauth2_authorizations: OAuth 2授权
-      muted_users: 已弱å\8c\96用户
+      muted_users: 已忽è§\86用户
   oauth:
     authorize:
       title: 授权访问您的账户
@@ -2476,7 +2486,7 @@ zh-CN:
       read_gpx: 读取私人GPS轨迹
       write_gpx: 上传GPS轨迹
       write_notes: 修改备注
-      write_redactions: 编写地图数据
+      write_redactions: 隐删地图数据
       read_email: 查看用户邮箱地址
       skip_authorization: 自动核准应用
   oauth_clients:
@@ -2625,7 +2635,7 @@ zh-CN:
       my_dashboard: 我的综合面板
       blocks on me: 我的封禁
       blocks by me: 被我封禁
-      create_mute: å¼±å\8c\96此用户
+      create_mute: 忽è§\86此用户
       destroy_mute: 取消弱化此用户
       edit_profile: 编辑个人资料
       send message: 发送消息
@@ -2825,23 +2835,23 @@ zh-CN:
       previous: « 上一页
   user_mutes:
     index:
-      title: 已弱å\8c\96用户
-      my_muted_users: æ\88\91已弱å\8c\96的用户
+      title: 已忽è§\86用户
+      my_muted_users: æ\88\91已忽è§\86的用户
       you_have_muted_n_users:
-        one: æ\82¨å·²å¼±å\8c\96 1 名用户
-        other: æ\82¨å·²å¼±å\8c\96 %{count} 名用户
-      user_mute_explainer: 已弱å\8c\96用户的消息会被移至单独的收件箱，您不会收到电子邮件通知。
-      user_mute_admins_and_moderators: æ\82¨å\8f¯ä»¥å¼±å\8c\96管理员和仲裁员，但仍会收到他们的消息通知。
+        one: æ\82¨å·²å¿½è§\86 1 名用户
+        other: æ\82¨å·²å¿½è§\86 %{count} 名用户
+      user_mute_explainer: 已忽è§\86用户的消息会被移至单独的收件箱，您不会收到电子邮件通知。
+      user_mute_admins_and_moderators: æ\82¨å\8f¯ä»¥å¿½è§\86管理员和仲裁员，但仍会收到他们的消息通知。
       table:
         thead:
-          muted_user: 已弱å\8c\96用户
+          muted_user: 已忽è§\86用户
           actions: 操作
         tbody:
           unmute: 取消弱化
           send_message: 发送消息
     create:
-      notice: æ\82¨å·²å¼±å\8c\96%{name}。
-      error: æ\97 æ³\95å¼±å\8c\96%{name}。%{full_message}。
+      notice: æ\82¨å·²å¿½è§\86 %{name}。
+      error: æ\97 æ³\95忽è§\86 %{name}。%{full_message}。
     destroy:
       notice: 您取消弱化了%{name}。
       error: 无法取消弱化用户。请再试一次。
@@ -3076,31 +3086,31 @@ zh-CN:
       centre_map: 将此处置于地图中间
   redactions:
     edit:
-      heading: 编辑修订
-      title: 编辑修订
+      heading: 编辑隐删
+      title: 编辑隐删
     index:
-      empty: 无删改可显示。
-      heading: 修订列表
-      title: 修订列表
+      empty: 无隐删可显示。
+      heading: 隐删列表
+      title: 隐删列表
     new:
-      heading: 请输入新修订的信息
-      title: 创建新修订
+      heading: 请输入新隐删的信息
+      title: 创建新隐删
     show:
       description: 描述：
-      heading: 显示修订“%{title}”
-      title: 显示修订
+      heading: 显示隐删“%{title}”
+      title: 显示隐删
       user: 创建者：
-      edit: 编辑该修订
-      destroy: 删除该修订
+      edit: 编辑该隐删
+      destroy: 删除该隐删
       confirm: 您确定吗？
     create:
-      flash: 修订已创建。
+      flash: 隐删已创建。
     update:
       flash: 更改已保存。
     destroy:
-      not_empty: 修订非空。请在销毁该修订前清除所有属于它的版本。
-      flash: 修订已销毁。
-      error: 销毁该修订时出错。
+      not_empty: 隐删非空。请在销毁该隐删前清除所有属于它的版本。
+      flash: 隐删已销毁。
+      error: 销毁该隐删时出错。
   validations:
     leading_whitespace: 有前导空格
     trailing_whitespace: 有尾随空格