diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-24 20:13:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 20:13:30 +0100 |
| commit | 60577f4c6ee9f4a4c9af0a41a8954e19a5f2c8cf (patch) | |
| tree | 8c661ea7ceaff780965631c530ca065805c1861d /app/assets/javascripts/components/locales | |
| parent | 5e33445c5ff9ded56c2d40eb17d89ace108c3840 (diff) | |
| parent | 8e34bed7cce7b97388e55fabacee7d424b5846ea (diff) | |
Merge branch 'master' into french-translation
Diffstat (limited to 'app/assets/javascripts/components/locales')
| -rw-r--r-- | app/assets/javascripts/components/locales/en.jsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx index f3326bf90..0ea324f66 100644 --- a/app/assets/javascripts/components/locales/en.jsx +++ b/app/assets/javascripts/components/locales/en.jsx @@ -8,6 +8,8 @@ const en = { "status.reblog": "Reblog", "status.favourite": "Favourite", "status.reblogged_by": "{name} reblogged", + "status.sensitive_warning": "Sensitive content", + "status.sensitive_toggle": "Click to view", "video_player.toggle_sound": "Toggle sound", "account.mention": "Mention", "account.edit_profile": "Edit profile", @@ -35,6 +37,7 @@ const en = { "tabs_bar.notifications": "Notifications", "compose_form.placeholder": "What is on your mind?", "compose_form.publish": "Toot", + "compose_form.sensitive": "Mark content as sensitive", "navigation_bar.settings": "Settings", "navigation_bar.public_timeline": "Public timeline", "navigation_bar.logout": "Logout", |