From c841756be082747d2a90a9f1e9677a4827c09347 Mon Sep 17 00:00:00 2001 From: KMY Date: Tue, 9 May 2023 15:34:04 +0900 Subject: [PATCH] Rename emoji reactions to stamp --- .../mastodon/components/status_action_bar.jsx | 2 +- .../features/compose/components/action_bar.jsx | 2 +- .../features/emoji_reacted_statuses/index.jsx | 2 +- .../features/keyboard_shortcuts/index.jsx | 2 +- .../components/column_settings.jsx | 2 +- .../notifications/components/filter_bar.jsx | 2 +- app/javascript/mastodon/locales/ja.json | 6 ++++++ config/locales/en.yml | 12 ++++++------ config/locales/ja.yml | 18 +++++++++--------- 9 files changed, 27 insertions(+), 21 deletions(-) diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx index 27ff6e7469..01a273c599 100644 --- a/app/javascript/mastodon/components/status_action_bar.jsx +++ b/app/javascript/mastodon/components/status_action_bar.jsx @@ -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' }, diff --git a/app/javascript/mastodon/features/compose/components/action_bar.jsx b/app/javascript/mastodon/features/compose/components/action_bar.jsx index eaa6f500a9..61ae51cb66 100644 --- a/app/javascript/mastodon/features/compose/components/action_bar.jsx +++ b/app/javascript/mastodon/features/compose/components/action_bar.jsx @@ -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' }, diff --git a/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx b/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx index 2d290b7403..9655c9fd56 100644 --- a/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx +++ b/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx @@ -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 => ({ diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx index abaca66343..dea6281222 100644 --- a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx +++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx @@ -139,7 +139,7 @@ class KeyboardShortcuts extends ImmutablePureComponent { g+e - + g+p diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx index b6a3124ccb..42dd6d1533 100644 --- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx +++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx @@ -116,7 +116,7 @@ export default class ColumnSettings extends React.PureComponent {
- +
diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx index 690da7b142..c2abec5af6 100644 --- a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx +++ b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx @@ -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' }, diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index eaf6bfdf66..da1d7472cc 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -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": "フィルターされました", diff --git a/config/locales/en.yml b/config/locales/en.yml index 937b443f07..6231a54997 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1465,9 +1465,9 @@ en: subject: "%{name} favorited your post" title: New favorite emoji_reaction: - body: 'Your post was reacted with emoji by %{name}:' - subject: "%{name} reacted your post with emoji" - title: New emoji reaction + body: 'Your post was stamped by %{name}:' + subject: "%{name} stamped your post" + title: New stamp follow: body: "%{name} is now following you!" subject: "%{name} is now following you" @@ -1711,7 +1711,7 @@ en: enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below exceptions: Exceptions explanation: Because deleting posts is an expensive operation, this is done slowly over time when the server is not otherwise busy. For this reason, your posts may be deleted a while after they reach the age threshold. - ignore_emojis: Ignore emoji reactions + ignore_emojis: Ignore stamps ignore_favs: Ignore favorites ignore_reblogs: Ignore boosts interaction_exceptions: Exceptions based on interactions @@ -1738,8 +1738,8 @@ en: '63113904': 2 years '7889238': 3 months min_age_label: Age threshold - min_emojis: Keep posts emoji-reacted at least - min_emojis_hint: Doesn't delete any of your posts that has received at least this number of emoji reactions. Leave blank to delete posts regardless of their number of emojis + min_emojis: Keep posts stamped at least + min_emojis_hint: Doesn't delete any of your posts that has received at least this number of stamps. Leave blank to delete posts regardless of their number of emojis min_favs: Keep posts favorited at least min_favs_hint: Doesn't delete any of your posts that has received at least this number of favorites. Leave blank to delete posts regardless of their number of favorites min_reblogs: Keep posts boosted at least diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 06bd4abd6c..bcbef7a42d 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -411,8 +411,8 @@ ja: private_comment_hint: このコメントは同じサーバーのモデレーターも閲覧できます。 public_comment: コメント (公開) public_comment_hint: ドメインブロックの公開を有効にしている場合、このコメントも公開されます。 - reject_favourite: お気に入り、絵文字リアクションを拒否 - reject_favourite_hint: 今後のお気に入り、絵文字リアクションを拒否します。停止とは無関係です + reject_favourite: お気に入り、スタンプを拒否 + reject_favourite_hint: 今後のお気に入り、スタンプを拒否します。停止とは無関係です reject_hashtag: ハッシュタグを拒否 reject_hashtag_hint: ハッシュタグで検索できなくなり、トレンドにも影響しなくなります。停止とは無関係です reject_media: メディアファイルを拒否 @@ -1418,9 +1418,9 @@ ja: subject: "%{name}さんにお気に入りに登録されました" title: 新たなお気に入り登録 emoji_reaction: - body: "%{name}さんに絵文字リアクションされた、あなたの投稿があります:" - subject: "%{name}さんに絵文字リアクションされました" - title: 新たな絵文字リアクション + body: "%{name}さんにスタンプをつけられた、あなたの投稿があります:" + subject: "%{name}さんにスタンプをつけられました" + title: 新たなスタンプ follow: body: "%{name}さんにフォローされています！" subject: "%{name}さんにフォローされています" @@ -1674,8 +1674,8 @@ ja: keep_polls_hint: アンケート付きの投稿を削除せずに残します keep_self_bookmark: ブックマークした投稿を保持 keep_self_bookmark_hint: 自分自身でブックマークした投稿を削除せずに残します - keep_self_emoji: 絵文字リアクションした投稿を保持 - keep_self_emoji_hint: 自分自身で絵文字リアクションした投稿を削除せずに残します + keep_self_emoji: スタンプをつけた投稿を保持 + keep_self_emoji_hint: 自分自身でスタンプをつけた投稿を削除せずに残します keep_self_fav: お気に入りに登録した投稿を保持 keep_self_fav_hint: 自分自身でお気に入りに登録した投稿を削除せずに残します min_age: @@ -1688,8 +1688,8 @@ ja: '63113904': 2年 '7889238': 3ヶ月 min_age_label: 投稿を保持する期間 - min_emojis: 絵文字リアクションの基準値 - min_emojis_hint: この数以上、絵文字リアクションされた投稿を削除せずに残します。空白にしておくと、数に関わらず投稿を削除します。 + min_emojis: スタンプの基準値 + min_emojis_hint: この数以上、スタンプをつけられた投稿を削除せずに残します。空白にしておくと、数に関わらず投稿を削除します。 min_favs: お気に入りの基準値 min_favs_hint: この数以上、お気に入り登録された投稿を削除せずに残します。空白にしておくと、お気に入りの数に関わらず投稿を削除します。 min_reblogs: ブーストの基準値