diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-21 16:40:02 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-21 16:40:02 +0200 |
commit | a4c9bda771c04526005f708dfb9ca2ccced60d52 (patch) | |
tree | 9ed60f78e2e8acc823bccb7c75ecaa3fdb1b7ab6 /config/locales/en.yml | |
parent | 98ecadbf99aa823164608f796a40ab1cd067bdc2 (diff) | |
parent | 46061dc041b0a2a4a3907976cc3432abdb1d67ec (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 454a13a9c..a14b5b9d6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -785,6 +785,10 @@ en: <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p> title: "%{instance} Terms of Service and Privacy Policy" + themes: + contrast: High contrast + default: Mastodon + mastodon-light: Mastodon (light) time: formats: default: "%b %d, %Y, %H:%M" |