diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-03-31 21:30:27 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-31 21:30:27 +0200 |
commit | 01d6f7529faef97c0209ef11bbca2e856961bbab (patch) | |
tree | 513ac21302befa1a08fc4968dcd4dca6b0e06360 /config/locales/doorkeeper.gl.yml | |
parent | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (diff) | |
parent | c6c03b49b255c4fe2183b94288a712ad7a66e2c2 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.
Diffstat (limited to 'config/locales/doorkeeper.gl.yml')
-rw-r--r-- | config/locales/doorkeeper.gl.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml index 622fcfe76..c7f21d1ba 100644 --- a/config/locales/doorkeeper.gl.yml +++ b/config/locales/doorkeeper.gl.yml @@ -120,7 +120,7 @@ gl: title: accounts: Contas admin/accounts: Administración das contas - admin/all: Tódalas funcións administrativas + admin/all: Todas as funcións administrativas admin/reports: Administración das denuncias all: Acceso completo á túa conta de Mastodon blocks: Bloqueos @@ -129,7 +129,7 @@ gl: crypto: Cifrado extremo-a-extremo favourites: Favoritas filters: Filtros - follow: Seguidas, Silenciadas e Bloqueadas + follow: Seguidas, Acaladas e Bloqueadas follows: Seguimentos lists: Listas media: Anexos multimedia @@ -150,7 +150,7 @@ gl: admin:read: ler todos os datos no servidor admin:read:accounts: ler información sensible de todas as contas admin:read:canonical_email_blocks: ler a información sensíbel de tódolos bloqueos de correos electrónicos canónicos - admin:read:domain_allows: ler a información sensible de tódolos dominios permitidos + admin:read:domain_allows: ler a información sensible de todos os dominios permitidos admin:read:domain_blocks: ler a información sensible de tódolos bloqueos de dominio admin:read:email_domain_blocks: ler a información sensible de tódolos dominios de correo electrónico admin:read:ip_blocks: ler a información sensible de tódolos bloqueos de IP |