diff --git a/app/javascript/mastodon/features/circle_editor/components/search.js b/app/javascript/mastodon/features/circle_editor/components/search.js index 195ed0c1b044c4..a45876c0104c6d 100644 --- a/app/javascript/mastodon/features/circle_editor/components/search.js +++ b/app/javascript/mastodon/features/circle_editor/components/search.js @@ -7,7 +7,7 @@ import classNames from 'classnames'; import Icon from 'mastodon/components/icon'; const messages = defineMessages({ - search: { id: 'circles.search', defaultMessage: 'Search among people you follow' }, + search: { id: 'circles.search', defaultMessage: 'Search among people following you' }, }); const mapStateToProps = state => ({ diff --git a/app/javascript/mastodon/features/circles/components/circle.js b/app/javascript/mastodon/features/circles/components/circle.js index a7f4d32b6929d7..ae81552847a3e0 100644 --- a/app/javascript/mastodon/features/circles/components/circle.js +++ b/app/javascript/mastodon/features/circles/components/circle.js @@ -7,7 +7,6 @@ import { openModal } from '../../../actions/modal'; import { deleteCircle } from '../../../actions/circles'; const messages = defineMessages({ - deleteTitle: { id: 'confirmations.delete_circle.title', defaultMessage: 'Delete' }, deleteMessage: { id: 'confirmations.delete_circle.message', defaultMessage: 'Are you sure you want to permanently delete this circle?' }, deleteConfirm: { id: 'confirmations.delete_circle.confirm', defaultMessage: 'Delete' }, }); @@ -49,7 +48,7 @@ class Circle extends React.PureComponent { {text} - diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 8fb7d044991ae7..83aff61b6ffea8 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -1,5 +1,6 @@ { "account.account_note_header": "Note", + "account.add_or_remove_from_circle": "Add or Remove from circles", "account.add_or_remove_from_list": "Add or Remove from lists", "account.badges.bot": "Bot", "account.badges.group": "Group", @@ -57,8 +58,16 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "circles.account.remove": "Remove from circle", + "circles.account.add": "Add to circle", + "circles.edit.submit": "Change title", + "circles.new.create": "Add circle", + "circles.new.title_placeholder": "New circle title", + "circles.search": "Search among people following you", + "circles.subheading": "Your circles", "column.blocks": "Blocked users", "column.bookmarks": "Bookmarks", + "column.circles": "Circles", "column.community": "Local timeline", "column.direct": "Direct messages", "column.directory": "Browse profiles", @@ -108,6 +117,8 @@ "confirmations.block.message": "Are you sure you want to block {name}?", "confirmations.delete.confirm": "Delete", "confirmations.delete.message": "Are you sure you want to delete this toot?", + "confirmations.delete_circle.confirm": "Delete", + "confirmations.delete_circle.message": "Are you sure you want to permanently delete this circle?", "confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?", "confirmations.domain_block.confirm": "Block entire domain", @@ -271,6 +282,7 @@ "navigation_bar.apps": "Mobile apps", "navigation_bar.blocks": "Blocked users", "navigation_bar.bookmarks": "Bookmarks", + "navigation_bar.circles": "Circles", "navigation_bar.community_timeline": "Local timeline", "navigation_bar.compose": "Compose new toot", "navigation_bar.direct": "Direct messages",