tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)

Browse Source 
* Add explit admin actions to (re)subscribe/unsubscribe remote accounts
and re-download avatar/header

* Improve how admin NSFW toggle looks
This commit is contained in:
Eugen Rochko
2017-06-08 14:58:22 +02:00
committed by GitHub
parent b8ea28d6d0
commit 8902e265b4
31 changed files with 348 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/locales/simple_form.en.yml
View File

@ -5,13 +5,13 @@ en:
defaults:
avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px
display_name:
one: '<span class="name-counter">1</span> character left'
other: '<span class="name-counter">%{count}</span> characters left'
one: <span class="name-counter">1</span> character left
other: <span class="name-counter">%{count}</span> characters left
header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
locked: Requires you to manually approve followers and defaults post privacy to followers-only
note:
one: '<span class="note-counter">1</span> character left'
other: '<span class="note-counter">%{count}</span> characters left'
one: <span class="note-counter">1</span> character left
other: <span class="note-counter">%{count}</span> characters left
imports:
data: CSV file exported from another Mastodon instance
sessions:
@ -36,8 +36,8 @@ en:
password: Password
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before boosting
setting_delete_modal: Show confirmation dialog before deleting a toot
setting_default_privacy: Post privacy
setting_delete_modal: Show confirmation dialog before deleting a toot
severity: Severity
type: Import type
username: Username