diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-01 18:24:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 18:24:36 +0100 |
| commit | 1cd7b15532f0cbfeec42460be434bbc9a117764d (patch) | |
| tree | c579bf0580d7b027c810ca2abc86dc885c5b5b12 /config/locales/en.yml | |
| parent | f611da489929d2592b61b0c0f7c870ae33782343 (diff) | |
| parent | 663593b508e419cb1a4f9f93ce75e0065e0833d4 (diff) | |
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8cc9d7c0b..b8d80a748 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -566,8 +566,8 @@ en: other: "%{count} people" errors: '403': You don't have permission to view this page. - '404': The page you were looking for doesn't exist. - '410': The page you were looking for doesn't exist anymore. + '404': The page you are looking for isn't here. + '410': The page you were looking for doesn't exist here anymore. '422': content: Security verification failed. Are you blocking cookies? title: Security verification failed @@ -580,7 +580,7 @@ en: archive_takeout: date: Date download: Download your archive - hint_html: You can request an archive of your <strong>toots and uploaded media</strong>. The exported data will be in ActivityPub format, readable by any compliant software. You can request an archive every 7 days. + hint_html: You can request an archive of your <strong>toots and uploaded media</strong>. The exported data will be in the ActivityPub format, readable by any compliant software. You can request an archive every 7 days. in_progress: Compiling your archive... request: Request your archive size: Size @@ -934,9 +934,9 @@ 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) + contrast: Mastodon (High contrast) + default: Mastodon (Dark) + mastodon-light: Mastodon (Light) time: formats: default: "%b %d, %Y, %H:%M" |