diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
| commit | 0ad919b19257b7d8eb447f7955030927d26cdbe6 (patch) | |
| tree | d78bd5ba447da166bb7d97a3df3e6d97902a5cdb /config/locales/activerecord.eu.yml | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 5187e4e758b0636432d984d1a95a310cac536205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.
Diffstat (limited to 'config/locales/activerecord.eu.yml')
| -rw-r--r-- | config/locales/activerecord.eu.yml | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/config/locales/activerecord.eu.yml b/config/locales/activerecord.eu.yml index 83b01f91d..8b83b4ef8 100644 --- a/config/locales/activerecord.eu.yml +++ b/config/locales/activerecord.eu.yml @@ -21,6 +21,18 @@ eu: username: invalid: letrak, zenbakiak eta gidoi baxuak besterik ez reserved: erreserbatuta dago + admin/webhook: + attributes: + url: + invalid: ez da baliozko URL bat + doorkeeper/application: + attributes: + website: + invalid: ez da baliozko URL bat + import: + attributes: + data: + malformed: gaizki eratua dago status: attributes: reblog: @@ -30,3 +42,14 @@ eu: email: blocked: onartu gabeko e-posta hornitzaile bat erabiltzen du unreachable: dirudienez ez da existitzen + role_id: + elevated: ezin du gaur egungo zure rola baino goragokoa izan + user_role: + attributes: + permissions_as_keys: + dangerous: oinarrizko rolarentzat seguruak ez diren baimenak ditu + elevated: ezin du eduki zure uneko rolak ez duen baimenik + own_role: ezin da aldatu zure uneko rolarekin aldatu + position: + elevated: ezin du zure uneko rola baino goragokoa izan + own_role: ezin da aldatu zure uneko rolarekin |