diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 08:35:55 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 08:35:55 +0100 |
commit | 32c70d2f09e27c474b7e20ef3e3b34f5a7f50121 (patch) | |
tree | 117e952f835329eadc0095e809427f7af5be9631 /config/locales/doorkeeper.ca.yml | |
parent | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff) | |
parent | b59ce0a60ff4f90bb16a8c3338ad37218af052b8 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.
Diffstat (limited to 'config/locales/doorkeeper.ca.yml')
-rw-r--r-- | config/locales/doorkeeper.ca.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml index 954ef2a6e..203388823 100644 --- a/config/locales/doorkeeper.ca.yml +++ b/config/locales/doorkeeper.ca.yml @@ -172,9 +172,9 @@ ca: write: modificar totes les dades del teu compte write:accounts: modifica el teu perfil write:blocks: bloqueja comptes i dominis - write:bookmarks: publicacions a marcadors + write:bookmarks: marcar publicacions write:conversations: silencia i esborra converses - write:favourites: afavorir publicacions + write:favourites: marcar publicacions write:filters: crear filtres write:follows: seguir usuaris write:lists: crear llistes |