Merge remote-tracking branch 'openstreetmap/pull/1172' into next

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 9eed97a237f3bdb9d4023a516b467030e6873b29..52de58fce34ffb2220fc4396a6fdcc0e0039f5ba 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Enolp
+# Author: Macofe
 # Author: Xuacu
 ---
 ast:
@@ -1911,7 +1912,7 @@ ast:
       create_block: bloquiar esti usuariu
       activate_user: activar esti usuariu
       deactivate_user: desactivar esti usuariu
-      confirm_user: confirmar esti usuariu
+      confirm_user: Confirmar esti usuariu
       hide_user: anubrir esti usuariu
       unhide_user: amosar esti usuariu
       delete_user: desaniciar esti usuariu

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 825b867b8cfd4e932d3f259712503d39ee7f984d..647875bbd7470910f7a028abd1bff0ad0c761574 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1972,7 +1972,7 @@ ca:
       create_block: bloca aquest usuari
       activate_user: activa aquest usuari
       deactivate_user: desactiva aquest usuari
-      confirm_user: confirma aquest usuari
+      confirm_user: Confirma aquest usuari
       hide_user: amagar aquest usuari
       unhide_user: Inamagui's d'aquest usuari
       delete_user: Suprimeix aquest usuari

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 3c8a1bdb7de64786de6f5a8ea932cd758047499c..1516a670a12da695486534b1f414a8d988dc1794 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1927,16 +1927,16 @@ cs:
         revoke:
           administrator: Odebrat práva správce
           moderator: Odebrat práva moderátora
-      block_history: zablokování
-      moderator_history: udělená zablokování
+      block_history: Účinná zablokování
+      moderator_history: Udělená zablokování
       comments: Komentáře
-      create_block: blokovat tohoto uživatele
-      activate_user: aktivovat tohoto uživatele
-      deactivate_user: deaktivovat tohoto uživatele
-      confirm_user: potvrdit tohoto uživatele
-      hide_user: skrýt tohoto uživatele
-      unhide_user: zobrazit tohoto uživatele
-      delete_user: odstranit tohoto uživatele
+      create_block: Blokovat tohoto uživatele
+      activate_user: Aktivovat tohoto uživatele
+      deactivate_user: Deaktivovat tohoto uživatele
+      confirm_user: Potvrdit tohoto uživatele
+      hide_user: Skrýt tohoto uživatele
+      unhide_user: Zobrazit tohoto uživatele
+      delete_user: Odstranit tohoto uživatele
       confirm: Potvrdit
       friends_changesets: sady změn přátel
       friends_diaries: záznamy v deníčcích přátel

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0e251b8a166521310ac821e995edd9fc199614af..a6f92e881362fd258bd913d78470cf08b2c18909 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2006,7 +2006,7 @@ de:
         revoke:
           administrator: Administrator-Rechte entziehen
           moderator: Moderator-Rechte entziehen
-      block_history: Erhaltene Sperren
+      block_history: Aktive Sperren
       moderator_history: Vergebene Sperren
       comments: Kommentare
       create_block: Benutzer sperren

diff --git a/config/locales/el.yml b/config/locales/el.yml
index c156d097373376778dd923b2be41e701ec6a93c7..f48deb08056b61e53ed097b5e8070bb95f7aa4ee 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1880,16 +1880,16 @@ el:
         revoke:
           administrator: Ανακαλέστε πρόσβαση διαχειριστή
           moderator: Ανακαλέστε πρόσβαση συντονιστή
-      block_history: φραγές που ελήφθησαν
-      moderator_history: φραγές που επιβλήθηκαν
+      block_history: Ενεργή Φραγές
+      moderator_history: Φραγές που Επιβλήθηκαν
       comments: Σχόλια
-      create_block: φραγή αυτού του χρήστη
-      activate_user: ενεÏ\81γοÏ\80οίηÏ\83η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 Ï\87ρήστη
-      deactivate_user: αÏ\80ενεÏ\81γοÏ\80οίηÏ\83η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 Ï\87ρήστη
-      confirm_user: εÏ\80ιβεβαίÏ\89Ï\83η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 Ï\87ρήστη
-      hide_user: αÏ\80Ï\8cκÏ\81Ï\85Ï\88η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 Ï\87ρήστη
-      unhide_user: εÏ\80ανεμÏ\86άνιÏ\83η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 Ï\87ρήστη
-      delete_user: διαγÏ\81αÏ\86ή αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 Ï\87ρήστη
+      create_block: Φραγή αυτού του Χρήστη
+      activate_user: Î\95νεÏ\81γοÏ\80οίηÏ\83η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 λογαÏ\81ιαÏ\83μοÏ\8d Χρήστη
+      deactivate_user: Î\91Ï\80ενεÏ\81γοÏ\80οίηÏ\83η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 λογαÏ\81ιαÏ\83μοÏ\8d Χρήστη
+      confirm_user: Î\95Ï\80ιβεβαίÏ\89Ï\83η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 λογαÏ\81ιαÏ\83μοÏ\8d Χρήστη
+      hide_user: Î\91Ï\80Ï\8cκÏ\81Ï\85Ï\88η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 λογαÏ\81ιαÏ\83μοÏ\8d Χρήστη
+      unhide_user: Î\95Ï\80ανεμÏ\86άνιÏ\83η αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 λογαÏ\81ιαÏ\83μοÏ\8d Χρήστη
+      delete_user: Î\94ιαγÏ\81αÏ\86ή αÏ\85Ï\84οÏ\8d Ï\84οÏ\85 Χρήστη
       confirm: Επιβεβαίωση
       friends_changesets: ομάδες αλλαγών φίλων
       friends_diaries: καταχωρήσεις ημερολογίου φίλων
@@ -2241,6 +2241,9 @@ el:
         mapquest_car: Αυτοκίνητο (MapQuest)
         mapquest_foot: Με τα πόδια (MapQuest)
         osrm_car: Αυτοκίνητο (OSRM)
+        mapzen_bicycle: Ποδήλατο (Mapzen)
+        mapzen_car: Αυτοκίνητο (Mapzen)
+        mapzen_foot: Πόδι (Mapzen)
       directions: Οδηγίες
       distance: Απόσταση
       errors:
@@ -2266,6 +2269,7 @@ el:
         roundabout_with_exit: Στην κυκλική διασταύρωση, πάρτε την έξοδο %{exit} προς
           %{name}
         unnamed: ανώνυμος δρόμος
+        courtesy: Οι οδηγίες είναι προσφορά του %{link}
       time: Διάρκεια
     query:
       node: Κόμβος

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index ebbc14dd79e26c20daef19d0e27d858a4b841c42..d7917ba2b83e06a5201563fc0487a8fef8f2263f 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -8,6 +8,7 @@
 # Author: Chase me ladies, I'm the Cavalry
 # Author: Jagwar
 # Author: Kosovastar
+# Author: Macofe
 # Author: Meno25
 # Author: Shirayuki
 ---
@@ -1811,7 +1812,7 @@ en-GB:
       create_block: block this user
       activate_user: activate this user
       deactivate_user: deactivate this user
-      confirm_user: confirm this user
+      confirm_user: Confirm this user
       hide_user: hide this user
       unhide_user: unhide this user
       delete_user: delete this user

diff --git a/config/locales/es.yml b/config/locales/es.yml
index b786d377bc5dd76806b1f8e296e7272590661b9b..1cf8c38d0c334ef1dc3a90f9732596f4d9476c19 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1963,7 +1963,7 @@ es:
       create_block: bloquear a este usuario
       activate_user: activar este usuario
       deactivate_user: desactivar este usuario
-      confirm_user: confirmar este usuario
+      confirm_user: Confirmar este usuario
       hide_user: esconder este usuario
       unhide_user: descubrir este usuario
       delete_user: borrar este usuario

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e5dedf81c00f04f312827f10a38433f30340a4bd..c935c7be98948433799ef614da11ce4d29f92d98 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1990,16 +1990,16 @@ fr:
         revoke:
           administrator: Révoquer l'accès administrateur
           moderator: Révoquer l'accès modérateur
-      block_history: blocages reçus
-      moderator_history: blocages fournis
+      block_history: Blocages actifs
+      moderator_history: Blocages fournis
       comments: Commentaires
-      create_block: bloquer cet utilisateur
-      activate_user: activer cet utilisateur
-      deactivate_user: désactiver cet utilisateur
-      confirm_user: confirmer cet utilisateur
-      hide_user: masquer cet utilisateur
-      unhide_user: ré-afficher cet utilisateur
-      delete_user: supprimer cet utilisateur
+      create_block: Bloquer cet utilisateur
+      activate_user: Activer cet utilisateur
+      deactivate_user: Désactiver cet utilisateur
+      confirm_user: Confirmer cet utilisateur
+      hide_user: Masquer cet utilisateur
+      unhide_user: Ré-afficher cet utilisateur
+      delete_user: Supprimer cet utilisateur
       confirm: Confirmer
       friends_changesets: Groupes de modifications des amis
       friends_diaries: Entrées de journal des amis

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 4656ff08d50ad05132335d70249aa12040e671c9..ba62259302c33d854dedb5b4bf1872ffbf61ffde 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Davio
 # Author: Klenje
+# Author: Macofe
 # Author: Tocaibon
 ---
 fur:
@@ -1202,7 +1203,7 @@ fur:
       create_block: bloche chest utent
       activate_user: ative chest utent
       deactivate_user: disative chest utent
-      confirm_user: conferme chest utent
+      confirm_user: Conferme chest utent
       hide_user: plate chest utent
       unhide_user: mostre chest utent
       delete_user: elimine chest utent

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 34e2ffa89301be2f6d389abc030411cd53742966..75a8b6e701d7ade3e37bd216d3843dde8d496c96 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -4,6 +4,7 @@
 # Author: Banjo
 # Author: Elisardojm
 # Author: Gallaecio
+# Author: Macofe
 # Author: Nemo bis
 # Author: Toliño
 # Author: Vivaelcelta
@@ -1945,16 +1946,16 @@ gl:
         revoke:
           administrator: Revogar o acceso de administrador
           moderator: Revogar o acceso de moderador
-      block_history: bloqueos recibidos
-      moderator_history: bloqueos impostos
+      block_history: Bloqueos activos
+      moderator_history: Bloqueos impostos
       comments: Comentarios
-      create_block: bloquear este usuario
-      activate_user: activar este usuario
-      deactivate_user: desactivar este usuario
-      confirm_user: confirmar este usuario
-      hide_user: agochar este usuario
-      unhide_user: descubrir este usuario
-      delete_user: borrar este usuario
+      create_block: Bloquear este usuario
+      activate_user: Activar este usuario
+      deactivate_user: Desactivar este usuario
+      confirm_user: Confirmar este usuario
+      hide_user: Agochar este usuario
+      unhide_user: Descubrir este usuario
+      delete_user: Borrar este usuario
       confirm: Confirmar
       friends_changesets: conxuntos de cambios dos amigos
       friends_diaries: entradas de diario dos amigos

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 75f35d62c24d5a5361cfd4734eb91787942f3023..f647b0ee3f874a9ee900d3880925dc2b08803785 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Carlosedepaula
 # Author: Julian Mendez
+# Author: Macofe
 # Author: McDutchie
 # Author: Nemo bis
 ---
@@ -1897,7 +1898,7 @@ ia:
       create_block: blocar iste usator
       activate_user: activar iste usator
       deactivate_user: disactivar iste usator
-      confirm_user: confirmar iste usator
+      confirm_user: Confirmar iste usator
       hide_user: celar iste usator
       unhide_user: revelar iste usator
       delete_user: deler iste usator

diff --git a/config/locales/it.yml b/config/locales/it.yml
index ab145dc8e0089e591d2098a15b5737ee672f0e46..4cadd5f30ec4bd703a61af8119b0e27095745ea2 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1973,16 +1973,16 @@ it:
         revoke:
           administrator: Revoca l'accesso come amministratore
           moderator: Revoca l'accesso come moderatore
-      block_history: blocchi ricevuti
-      moderator_history: blocchi applicati
+      block_history: Blocchi attivi
+      moderator_history: Blocchi applicati
       comments: Commenti
-      create_block: blocca questo utente
-      activate_user: attiva questo utente
-      deactivate_user: disattiva questo utente
-      confirm_user: conferma questo utente
-      hide_user: nascondi questo utente
-      unhide_user: mostra questo utente
-      delete_user: elimina questo utente
+      create_block: Blocca questo utente
+      activate_user: Attiva questo utente
+      deactivate_user: Disattiva questo utente
+      confirm_user: Conferma questo utente
+      hide_user: Nascondi questo utente
+      unhide_user: Mostra questo utente
+      delete_user: Cancella questo utente
       confirm: Conferma
       friends_changesets: gruppi di modifiche degli amici
       friends_diaries: note dei diari degli amici

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 669b4342188400421ed0ad557e33fbd045db20cc..09b141900565ba32e4c0401d3e9abc9103ce3e91 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -990,14 +990,15 @@ lb:
         revoke:
           administrator: Administrateur-Zougang ofhuelen
           moderator: Moderateursrechter ewechhuelen
+      block_history: Aktiv Spären
       comments: Bemierkungen
-      create_block: dëse Benotzer spären
-      activate_user: dëse Benotzer aktivéieren
-      deactivate_user: dëse Benotzer desaktivéieren
-      confirm_user: dëse Benotzer confirméieren
-      hide_user: dëse Benotzer verstoppen
-      unhide_user: dëse Benotzer net méi verstoppen
-      delete_user: dëse Benotzer läschen
+      create_block: Dëse Benotzer spären
+      activate_user: Dëse Benotzer aktivéieren
+      deactivate_user: Dëse Benotzer desaktivéieren
+      confirm_user: Dëse Benotzer confirméieren
+      hide_user: Dëse Benotzer verstoppen
+      unhide_user: Dëse Benotzer net méi verstoppen
+      delete_user: Dëse Benotzer läschen
       confirm: Confirméieren
     popup:
       friend: Frënn

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f1c290210f7939ccdf2309f8e3cdff6b68b8ebc4..70097e076917fca488c83827d4dbc1ee1faf7975 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1925,16 +1925,16 @@ lt:
         revoke:
           administrator: Atšaukti administratoriaus teises
           moderator: Atšaukti moderatoriaus teises
-      block_history: buvę užblokavimai
+      block_history: Aktyvūs blokavimai
       moderator_history: gauti užblokavimai
       comments: Komentarai
       create_block: blokuoti šį naudotoją
-      activate_user: aktyvuoti šį naudotoją
+      activate_user: Aktyvuoti šį naudotoją
       deactivate_user: aktyvuoti šį naudotoją
       confirm_user: patvirtinti šį naudotoją
       hide_user: slėpti šį naudotoją
       unhide_user: nebeslėpti šio naudotojo
-      delete_user: pašalinti šį naudotoją
+      delete_user: Pašalinti šį naudotoją
       confirm: Patvirtinti
       friends_changesets: draugų keitimai
       friends_diaries: draugų dienoraščių įrašai

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 349bd194ad46875c2f3b75cb6bfdb175a6415693..553766bb9577f32a64ad25f24f51bf39e6581d92 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Cedric31
+# Author: Macofe
 ---
 oc:
   time:
@@ -1700,7 +1701,7 @@ oc:
       create_block: blocar aqueste utilizaire
       activate_user: activar aqueste utilizaire
       deactivate_user: desactivar aqueste utilizaire
-      confirm_user: confirmar aqueste utilizaire
+      confirm_user: Confirmar aqueste utilizaire
       hide_user: amagar aqueste utilizaire
       unhide_user: reafichar aqueste utilizaire
       delete_user: suprimir aqueste utilizaire

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index f3a928c399439bc37ad7f7c8a7b8e9374fd1bda7..60c44a2ca46bc9b084768ab0a254a9a131611dd8 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -18,6 +18,7 @@
 # Author: Leosls
 # Author: Luckas
 # Author: Luckas Blade
+# Author: Macofe
 # Author: Matheus Sousa L.T
 # Author: Nemo bis
 # Author: Nighto
@@ -1973,7 +1974,7 @@ pt-BR:
       create_block: bloquear este usuário
       activate_user: ativar este usuário
       deactivate_user: desativar este usuário
-      confirm_user: confirmar este usuário
+      confirm_user: Confirmar este usuário
       hide_user: esconder esse usuário
       unhide_user: exibir esse usuário
       delete_user: excluir este usuário

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 276045dabec64517d110a02cc0c9c03a1107e9a8..e367a43094d46ba6301417ecf30ca26808449a43 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1961,7 +1961,7 @@ pt-PT:
       create_block: bloquear este utilizador
       activate_user: ativar este utilizador
       deactivate_user: desativar este utilizador
-      confirm_user: confirmar esse utilizador
+      confirm_user: Confirmar esse utilizador
       hide_user: ocultar este utilizador
       unhide_user: descobrir este utilizador
       delete_user: eliminar este utilizador

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d5459fc6ff840d0cce8dd1b853b1920e29881d3f..b2986ba4fcf9dc79ef021b6bdd04829003386bf4 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -35,6 +35,7 @@
 # Author: Nemo bis
 # Author: Nzeemin
 # Author: Okras
+# Author: Perevod16
 # Author: Putnik
 # Author: Riliam
 # Author: Ruila
@@ -1981,16 +1982,16 @@ ru:
         revoke:
           administrator: Отозвать права администратора
           moderator: Отозвать права модератора
-      block_history: полÑ\83Ñ\87еннÑ\8bе блокиÑ\80овки
+      block_history: Ð\90кÑ\82ивнÑ\8bе Ð\91локи
       moderator_history: созданные блокировки
       comments: Комментарии
-      create_block: блокиÑ\80оваÑ\82Ñ\8c полÑ\8cзоваÑ\82елÑ\8f
-      activate_user: активировать этого пользователя
-      deactivate_user: деактивировать этого пользователя
-      confirm_user: подтвердить этого пользователя
-      hide_user: скрыть этого пользователя
-      unhide_user: отобразить этого пользователя
-      delete_user: удалить этого пользователя
+      create_block: Ð\91локиÑ\80оваÑ\82Ñ\8c Ñ\83Ñ\87аÑ\81Ñ\82ника
+      activate_user: активировать пользователя
+      deactivate_user: деактивировать пользователя
+      confirm_user: подтвердить пользователя
+      hide_user: скрыть пользователя
+      unhide_user: отобразить пользователя
+      delete_user: удалить пользователя
       confirm: Подтвердить
       friends_changesets: наборы правок друзей
       friends_diaries: дневники друзей
@@ -2136,6 +2137,7 @@ ru:
       invalid_credentials: Недопустимые учётные данные для аутентификации
       no_authorization_code: Нет кода авторизации
       unknown_signature_algorithm: Неизвестный алгоритм подписи
+      invalid_scope: Недопустимый масштаб
     auth_association:
       heading: Ваш ID пока ещё не связан с учётной записью OpenStreetMap.
       option_1: Если вы впервые на OpenStreetMap, пожалуйста, создайте новую учётную
@@ -2418,6 +2420,7 @@ ru:
         leave_roundabout_without_exit: Покиньте развязку - %{name}
         stay_roundabout_without_exit: Оставайтесь на развязке - %{name}
         start_without_exit: Начните в конце %{name}
+        destination_without_exit: Выбрать место назначения
         against_oneway_without_exit: Идите против одностороннего движения на %{name}
         end_oneway_without_exit: Конец одностороннего движения на %{name}
         roundabout_with_exit: На развязке выберите выход %{exit} на %{name}

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 0173b75bae0da32b294189bb8aa62e56d73815dd..fd1f655e072bd11037ff0080c736eb9dfcc61772 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Gmelfi
+# Author: Macofe
 # Author: Pippinu
 # Author: Sarvaturi
 # Author: SurdusVII
@@ -1946,7 +1947,7 @@ scn:
       create_block: blocca a st'utenti
       activate_user: attiva a st'utenti
       deactivate_user: disattiva a st'utenti
-      confirm_user: cunferma a st'utenti
+      confirm_user: Cunferma a st'utenti
       hide_user: Ammuccia a st'utenti
       unhide_user: Ammustra a st'utenti
       delete_user: Cancella a st'utenti

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 3c6774fe3ee1c0ccc79c0950584e5ea2e22c75fc..df2b6f0de63d432a64d600a19e4fa18db915fa7c 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1775,12 +1775,12 @@ zh-CN:
         revoke:
           administrator: 撤销管理员权限
           moderator: 撤销管理员权限
-      block_history: æ\8e¥å\8f\97的封禁
+      block_history: æ¿\80æ´»的封禁
       moderator_history: 执行封禁者
       comments: 评论
-      create_block: 阻止此用户
-      activate_user: 启用该用户
-      deactivate_user: 停用该用户
+      create_block: 封禁此用户
+      activate_user: 启用此用户
+      deactivate_user: 停用此用户
       confirm_user: 确认此用户
       hide_user: 隐藏此用户
       unhide_user: 取消隐藏此用户