diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-10 23:01:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 23:01:56 +0200 |
| commit | c64eef12069c3476f9956dfaaf6a3a9f91c14e2d (patch) | |
| tree | c8048db1bc718663c5ed33c8b225544d5e37f98b /config/locales/en.yml | |
| parent | b45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff) | |
| parent | 7778de467cd35fa4a514dd97ced0d19675f3b9d9 (diff) | |
Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index e70dd1c6b..3a8a0c485 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -512,6 +512,12 @@ en: body: "%{reporter} has reported %{target}" body_remote: Someone from %{domain} has reported %{target} subject: New report for %{instance} (#%{id}) + appearance: + advanced_web_interface: Advanced web interface + advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.' + animations_and_accessibility: Animations and accessibility + confirmation_dialogs: Confirmation dialogs + sensitive_content: Sensitive content application_mailer: notification_preferences: Change e-mail preferences salutation: "%{name}," @@ -792,10 +798,9 @@ en: too_few_options: must have more than one item too_many_options: can't contain more than %{max} items preferences: - languages: Languages other: Other - publishing: Publishing - web: Web + posting_defaults: Posting defaults + public_timelines: Public timelines relationships: activity: Account activity dormant: Dormant |