diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/privacy_dropdown.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 30 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/en.json | 9 |
3 files changed, 25 insertions, 16 deletions
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js index c94db59c5..1f0e998d3 100644 --- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js @@ -16,7 +16,7 @@ const messages = defineMessages({ unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' }, private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' }, private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' }, - direct_short: { id: 'privacy.direct.short', defaultMessage: 'Only people I mention' }, + direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' }, direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' }, change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' }, }); diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index e923bc4a5..eb0c07627 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -1326,7 +1326,7 @@ "id": "privacy.private.long" }, { - "defaultMessage": "Only people I mention", + "defaultMessage": "Mentioned people only", "id": "privacy.direct.short" }, { @@ -1616,12 +1616,20 @@ { "descriptors": [ { - "defaultMessage": "Conversations", - "id": "column.conversations" + "defaultMessage": "Direct messages", + "id": "column.direct" + }, + { + "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", + "id": "compose_form.encryption_warning" + }, + { + "defaultMessage": "Learn more", + "id": "compose_form.direct_message_warning_learn_more" }, { - "defaultMessage": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.", - "id": "empty_column.conversations" + "defaultMessage": "You don't have any direct messages yet. When you send or receive one, it will show up here.", + "id": "empty_column.direct" } ], "path": "app/javascript/mastodon/features/direct_timeline/index.json" @@ -1965,8 +1973,8 @@ "id": "navigation_bar.explore" }, { - "defaultMessage": "Conversations", - "id": "column.conversations" + "defaultMessage": "Direct messages", + "id": "navigation_bar.direct" }, { "defaultMessage": "Bookmarks", @@ -2222,8 +2230,8 @@ "id": "keyboard_shortcuts.federated" }, { - "defaultMessage": "to open conversations column", - "id": "keyboard_shortcuts.conversations" + "defaultMessage": "to open direct messages column", + "id": "keyboard_shortcuts.direct" }, { "defaultMessage": "to open \"get started\" column", @@ -3526,8 +3534,8 @@ "id": "tabs_bar.federated_timeline" }, { - "defaultMessage": "Conversations", - "id": "column.conversations" + "defaultMessage": "Direct messages", + "id": "navigation_bar.direct" }, { "defaultMessage": "Favourites", diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 8be90a2b7..1af526de6 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -70,7 +70,7 @@ "column.blocks": "Blocked users", "column.bookmarks": "Bookmarks", "column.community": "Local timeline", - "column.conversations": "Conversations", + "column.direct": "Direct messages", "column.directory": "Browse profiles", "column.domain_blocks": "Blocked domains", "column.favourites": "Favourites", @@ -170,7 +170,7 @@ "empty_column.blocks": "You haven't blocked any users yet.", "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.", "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!", - "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.", + "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.", "empty_column.domain_blocks": "There are no blocked domains yet.", "empty_column.explore_statuses": "Nothing is trending right now. Check back later!", "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.", @@ -234,8 +234,8 @@ "keyboard_shortcuts.boost": "Boost post", "keyboard_shortcuts.column": "Focus column", "keyboard_shortcuts.compose": "Focus compose textarea", - "keyboard_shortcuts.conversations": "to open conversations column", "keyboard_shortcuts.description": "Description", + "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "Move down in the list", "keyboard_shortcuts.enter": "Open post", "keyboard_shortcuts.favourite": "Favourite post", @@ -294,6 +294,7 @@ "navigation_bar.bookmarks": "Bookmarks", "navigation_bar.community_timeline": "Local timeline", "navigation_bar.compose": "Compose new post", + "navigation_bar.direct": "Direct messages", "navigation_bar.discover": "Discover", "navigation_bar.domain_blocks": "Blocked domains", "navigation_bar.edit_profile": "Edit profile", @@ -371,7 +372,7 @@ "poll_button.remove_poll": "Remove poll", "privacy.change": "Change post privacy", "privacy.direct.long": "Visible for mentioned users only", - "privacy.direct.short": "Only people I mention", + "privacy.direct.short": "Mentioned people only", "privacy.private.long": "Visible for followers only", "privacy.private.short": "Followers only", "privacy.public.long": "Visible for all", |