diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
commit | 3f60b096b51b000905290d69ea05b874b60fa9e0 (patch) | |
tree | 0b8c7011810b4a97523c2c63816735e519f0682c /config/locales/eo.yml | |
parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
parent | d9cad44ca54374cafa0c97775083bb1bc0a5a3ce (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.
Diffstat (limited to 'config/locales/eo.yml')
-rw-r--r-- | config/locales/eo.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 1a4ecd2df..5c11fa6fc 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -208,7 +208,12 @@ eo: enable_custom_emoji: Ebligi Propran Emoĝion enable_user: Ebligi uzanton promote_user: Promocii Uzanton + remove_avatar_user: Forigi profilbildon reopen_report: Remalfermi signalon + reset_password_user: Restarigi pasvorton + resolve_report: Solvitaj reporto + silence_account: Silentigi konton + suspend_account: Haltigi konton actions: assigned_to_self_report: "%{name} asignis signalon %{target} al si mem" change_email_user: "%{name} ŝanĝis retadreson de uzanto %{target}" |