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/gl.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/gl.yml')
| -rw-r--r-- | config/locales/gl.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/gl.yml b/config/locales/gl.yml index da00efe89..3ae0550f3 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -207,6 +207,7 @@ gl: reject_user: Rexeitar Usuaria remove_avatar_user: Eliminar avatar reopen_report: Reabrir denuncia + resend_user: Reenviar o email de confirmación reset_password_user: Restabelecer contrasinal resolve_report: Resolver denuncia sensitive_account: Marca o multimedia da túa conta como sensible @@ -265,6 +266,7 @@ gl: reject_user_html: "%{name} rexeitou o rexistro de %{target}" remove_avatar_user_html: "%{name} eliminou o avatar de %{target}" reopen_report_html: "%{name} reabriu a denuncia %{target}" + resend_user_html: "%{name} reenviou o email de confirmación para %{target}" reset_password_user_html: "%{name} restableceu o contrasinal da usuaria %{target}" resolve_report_html: "%{name} resolveu a denuncia %{target}" sensitive_account_html: "%{name} marcou o multimedia de %{target} como sensible" @@ -1249,6 +1251,8 @@ gl: carry_blocks_over_text: Esta usuaria chegou desde %{acct}, que ti tes bloqueada. carry_mutes_over_text: Esta usuaria chegou desde %{acct}, que ti tes acalada. copy_account_note_text: 'Esta usuaria chegou desde %{acct}, aquí están as túas notas previas acerca dela:' + navigation: + toggle_menu: Activa o menú notification_mailer: admin: report: |