diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-14 09:12:50 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-14 09:12:50 -0500 |
| commit | 813da6788e5129579db04e89aac3076902af2c7a (patch) | |
| tree | 2c7c8435e4eae5baa4b6169973c8da4644d44ded /config | |
| parent | e3d0d72b299103d30fcda2b7175906c73c1571bc (diff) | |
| parent | 78ed4ab75ff77d7cba60d478aa1f45d1c104785d (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: db/schema.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/simple_form.en.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 7ffa59f46..f635bf441 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -8,6 +8,7 @@ en: display_name: one: <span class="name-counter">1</span> character left other: <span class="name-counter">%{count}</span> characters left + fields: You can have up to 4 items displayed as a table on your profile header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px locked: Requires you to manually approve followers note: @@ -22,6 +23,10 @@ en: user: filtered_languages: Checked languages will be filtered from public timelines for you labels: + account: + fields: + name: Label + value: Content defaults: avatar: Avatar confirm_new_password: Confirm new password @@ -31,6 +36,7 @@ en: display_name: Display name email: E-mail address expires_in: Expire after + fields: Profile metadata filtered_languages: Filtered languages header: Header locale: Language |