diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-11 09:36:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 09:36:14 -0500 |
| commit | 771b950febf2e5ee41ccfcd088f0757d80483332 (patch) | |
| tree | 64419082b5ec535699fb116d933328548beeec92 /config/locales | |
| parent | 0cd5f2a61f60dcad51b2c8461fc705facd725075 (diff) | |
| parent | ed7231947c618b7c7c471699a05da85c59afa824 (diff) | |
Merge pull request #254 from glitch-soc/new-theme-ux
New flavour/skin UX
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index c8acc237a..804f9b199 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -424,6 +424,7 @@ en: changes_saved_msg: Changes successfully saved! powered_by: powered by %{link} save_changes: Save changes + use_this: Use this validation_errors: one: Something isn't quite right yet! Please review the error below other: Something isn't quite right yet! Please review %{count} errors below @@ -587,6 +588,7 @@ en: development: Development edit_profile: Edit profile export: Data export + flavours: Flavours followers: Authorized followers import: Import keyword_mutes: Muted keywords diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 1722eea7b..aa6940e91 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -13,7 +13,6 @@ en: note: one: <span class="note-counter">1</span> character left other: <span class="note-counter">%{count}</span> characters left - setting_flavour: Affects how Mastodon looks when you're logged in from any device setting_noindex: Affects your public profile and status pages setting_skin: Reskins the selected Mastodon flavour imports: @@ -47,7 +46,6 @@ en: setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot setting_favourite_modal: Show confirmation dialog before favouriting - setting_flavour: Flavour setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_skin: Skin |