diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 19:12:10 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 21:00:30 +0100 |
| commit | a2a64ecd3e3551707412c47f0d16e484dea25632 (patch) | |
| tree | bc4e0b8e0ca2a2735f527bff8bd73421c0ff72dd /config/locales/devise.co.yml | |
| parent | fb0c906c717f2b21bb63610742a357850142b522 (diff) | |
| parent | 70801b850c78d7879182eeba4eae509af42fafeb (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
Diffstat (limited to 'config/locales/devise.co.yml')
| -rw-r--r-- | config/locales/devise.co.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/devise.co.yml b/config/locales/devise.co.yml index 2471f857b..108a4ef11 100644 --- a/config/locales/devise.co.yml +++ b/config/locales/devise.co.yml @@ -18,6 +18,7 @@ co: mailer: confirmation_instructions: action: Verificà l’indirizzu email + action_with_app: Cunfirmà è rivene à %{app} explanation: Avete creatu un contu nant’à %{host} cù st’indirizzu email. Pudete attivallu cù un clic, o ignurà quessu missaghji s’ellu un era micca voi. extra_html: Pensate à leghje <a href="%{terms_path}">e regule di l’istanza</a> è <a href="%{policy_path}">i termini d’usu</a>. subject: 'Mastodon: Istruzzione di cunfirmazione per %{instance}' @@ -55,7 +56,7 @@ co: updated: A vostra chjave d’accessu hè stata cambiata, è site cunnettatu·a. updated_not_active: A vostra chjave d’accessu hè stata cambiata. registrations: - destroyed: U vostru contu hè statu sguassatu. Avvedeci! + destroyed: Avvedeci! U vostru contu hè statu sguassatu. Speremu di vi rivede da prestu. signed_up: Benvinutu! Site cunnettatu·a. signed_up_but_inactive: Site arregistratu·a, mà ùn pudete micca cunnettavi perchè u vostru contu deve esse attivatu. signed_up_but_locked: Site arregistratu·a, mà ùn pudete micca cunnettavi perchè u vostru contu hè chjosu. |