diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
commit | a2e7997592dd86baa7595c41eed274be4c200d07 (patch) | |
tree | b4c21af8bdf541d8156beb29e9f53766bd1fbadd /config/locales/activerecord.eo.yml | |
parent | 6517b7b9f02f8590a8f9c5aa04e3ef9efeb4e757 (diff) | |
parent | cec1e902e006730f68bde0a4334e5b819a12a475 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.
Diffstat (limited to 'config/locales/activerecord.eo.yml')
-rw-r--r-- | config/locales/activerecord.eo.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/activerecord.eo.yml b/config/locales/activerecord.eo.yml index 7d641e2aa..9ae8bab42 100644 --- a/config/locales/activerecord.eo.yml +++ b/config/locales/activerecord.eo.yml @@ -41,7 +41,7 @@ eo: attributes: email: blocked: uzas nepermesitan retpoŝtan provizanton - unreachable: ne ŝajnas ekzisti + unreachable: ŝajne ne ekzistas role_id: elevated: ne povas esti pli altranga ol via aktuala rolo user_role: |