Rename emoji reactions to stamp
This commit is contained in:
parent
9429f5b60c
commit
c841756be0
9 changed files with 27 additions and 21 deletions
|
@ -28,7 +28,7 @@ const messages = defineMessages({
|
|||
cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
|
||||
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
|
||||
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
|
||||
emojiReaction: { id: 'status.emoji_reaction', defaultMessage: 'Emoji Reaction' },
|
||||
emojiReaction: { id: 'status.emoji_reaction', defaultMessage: 'Stamp' },
|
||||
bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
|
||||
removeBookmark: { id: 'status.remove_bookmark', defaultMessage: 'Remove bookmark' },
|
||||
open: { id: 'status.open', defaultMessage: 'Expand this status' },
|
||||
|
|
|
@ -10,7 +10,7 @@ const messages = defineMessages({
|
|||
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
|
||||
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
|
||||
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
|
||||
emoji_reactions: { id: 'navigation_bar.emoji_reactions', defaultMessage: 'Emoji Reactions' },
|
||||
emoji_reactions: { id: 'navigation_bar.emoji_reactions', defaultMessage: 'Stamps' },
|
||||
lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
|
||||
followed_tags: { id: 'navigation_bar.followed_tags', defaultMessage: 'Followed hashtags' },
|
||||
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
|
||||
|
|
|
@ -13,7 +13,7 @@ import StatusList from 'mastodon/components/status_list';
|
|||
import Column from 'mastodon/features/ui/components/column';
|
||||
|
||||
const messages = defineMessages({
|
||||
heading: { id: 'column.emoji_reactions', defaultMessage: 'Emoji Reactions' },
|
||||
heading: { id: 'column.emoji_reactions', defaultMessage: 'Stamps' },
|
||||
});
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
|
|
|
@ -139,7 +139,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
|
|||
</tr>
|
||||
<tr>
|
||||
<td><kbd>g</kbd>+<kbd>e</kbd></td>
|
||||
<td><FormattedMessage id='keyboard_shortcuts.emoji_reactions' defaultMessage='to open emoji reactions list' /></td>
|
||||
<td><FormattedMessage id='keyboard_shortcuts.emoji_reactions' defaultMessage='to open stamps list' /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><kbd>g</kbd>+<kbd>p</kbd></td>
|
||||
|
|
|
@ -116,7 +116,7 @@ export default class ColumnSettings extends React.PureComponent {
|
|||
</div>
|
||||
|
||||
<div role='group' aria-labelledby='notifications-emoji_reaction'>
|
||||
<span id='notifications-emoji_reaction' className='column-settings__section'><FormattedMessage id='notifications.column_settings.emoji_reaction' defaultMessage='Emoji Reactions:' /></span>
|
||||
<span id='notifications-emoji_reaction' className='column-settings__section'><FormattedMessage id='notifications.column_settings.emoji_reaction' defaultMessage='Stamps:' /></span>
|
||||
|
||||
<div className='column-settings__row'>
|
||||
<SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'emoji_reaction']} onChange={onChange} label={alertStr} />
|
||||
|
|
|
@ -6,7 +6,7 @@ import Icon from 'mastodon/components/icon';
|
|||
const tooltips = defineMessages({
|
||||
mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
|
||||
favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favourites' },
|
||||
emojiReactions: { id: 'notifications.filter.emoji_reactions', defaultMessage: 'Emoji reactions' },
|
||||
emojiReactions: { id: 'notifications.filter.emoji_reactions', defaultMessage: 'Stamps' },
|
||||
boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
|
||||
polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
|
||||
follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
|
||||
|
|
|
@ -108,6 +108,7 @@
|
|||
"column.direct": "非公開の返信",
|
||||
"column.directory": "ディレクトリ",
|
||||
"column.domain_blocks": "ブロックしたドメイン",
|
||||
"column.emoji_reactions": "スタンプ",
|
||||
"column.favourites": "お気に入り",
|
||||
"column.follow_requests": "フォローリクエスト",
|
||||
"column.home": "ホーム",
|
||||
|
@ -317,6 +318,7 @@
|
|||
"keyboard_shortcuts.description": "説明",
|
||||
"keyboard_shortcuts.direct": "非公開の返信のカラムを開く",
|
||||
"keyboard_shortcuts.down": "カラム内一つ下に移動",
|
||||
"keyboard_shortcuts.emoji_reactions": "スタンプのリストを開く",
|
||||
"keyboard_shortcuts.enter": "投稿の詳細を表示",
|
||||
"keyboard_shortcuts.favourite": "お気に入り",
|
||||
"keyboard_shortcuts.favourites": "お気に入り登録のリストを開く",
|
||||
|
@ -379,6 +381,7 @@
|
|||
"navigation_bar.discover": "見つける",
|
||||
"navigation_bar.domain_blocks": "ブロックしたドメイン",
|
||||
"navigation_bar.edit_profile": "プロフィールを編集",
|
||||
"navigation_bar.emoji_reactions": "スタンプ",
|
||||
"navigation_bar.explore": "エクスプローラー",
|
||||
"navigation_bar.favourites": "お気に入り",
|
||||
"navigation_bar.filters": "フィルター設定",
|
||||
|
@ -412,6 +415,7 @@
|
|||
"notifications.column_settings.admin.report": "新しい通報:",
|
||||
"notifications.column_settings.admin.sign_up": "新規登録:",
|
||||
"notifications.column_settings.alert": "デスクトップ通知",
|
||||
"notifications.column_settings.emoji_reaction": "スタンプ",
|
||||
"notifications.column_settings.favourite": "お気に入り:",
|
||||
"notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
|
||||
"notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
|
||||
|
@ -430,6 +434,7 @@
|
|||
"notifications.column_settings.update": "編集:",
|
||||
"notifications.filter.all": "すべて",
|
||||
"notifications.filter.boosts": "ブースト",
|
||||
"notifications.filter.emoji_reactions": "スタンプ",
|
||||
"notifications.filter.favourites": "お気に入り",
|
||||
"notifications.filter.follows": "フォロー",
|
||||
"notifications.filter.mentions": "返信",
|
||||
|
@ -606,6 +611,7 @@
|
|||
"status.edited": "{date}に編集",
|
||||
"status.edited_x_times": "{count}回編集",
|
||||
"status.embed": "埋め込み",
|
||||
"status.emoji_reaction": "スタンプ",
|
||||
"status.favourite": "お気に入り",
|
||||
"status.filter": "この投稿をフィルターする",
|
||||
"status.filtered": "フィルターされました",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue