diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
| commit | f9d000ebaec7732d5fcd46aa6685108a2619966b (patch) | |
| tree | 9593841cf520b117ca4c3d5b68b19e9124c852da /config/locales/simple_form.ca.yml | |
| parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
| parent | c6598b17d9212c2d48395da73fa9529025d704cc (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.
Diffstat (limited to 'config/locales/simple_form.ca.yml')
| -rw-r--r-- | config/locales/simple_form.ca.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index b4d356279..b3692f5ba 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -126,6 +126,7 @@ ca: expires_in: Expira després fields: Metadades del perfil header: Capçalera + honeypot: "%{label} (no omplir)" inbox_url: URL de la safata d'entrada del relay irreversible: Cau en lloc d'ocultar locale: Llengua de la interfície |