diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
| commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
| tree | 766214b52ed217903ae821285391f8e2d4b5f545 /config/locales/simple_form.co.yml | |
| parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
| parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'config/locales/simple_form.co.yml')
| -rw-r--r-- | config/locales/simple_form.co.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml index 25d4a05fb..ac8b89a7b 100644 --- a/config/locales/simple_form.co.yml +++ b/config/locales/simple_form.co.yml @@ -22,8 +22,6 @@ co: data: Un fugliale CSV da un’altr’istanza di Mastodon sessions: otp: 'Entrate u codice d’identificazione à dui fattori nant’à u vostru telefuninu, o unu di i vostri codici di ricuperazione:' - user: - filtered_languages: Ùn viderete micca e lingue selezziunate nant’à e linee pubbliche labels: account: fields: @@ -40,7 +38,6 @@ co: email: Indirizzu e-mail expires_in: Spira dopu à fields: Metadata di u prufile - filtered_languages: Lingue filtrate header: Ritrattu di cuprendula locale: Lingua locked: Privatizà u contu |