diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index e2a52fb02db8ecc672efa262f4406da1106e2383..9aee4c1f69dcb4977dbd541af938393d0344e4e0 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -91,6 +91,8 @@ "confirmations.mute.message": "Are you sure you want to mute {name}?", "confirmations.redraft.confirm": "Delete & redraft", "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", + "confirmations.reply.confirm": "Reply", + "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?", "confirmations.unfollow.confirm": "Unfollow", "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?", "embed.instructions": "Embed this status on your website by copying the code below.", @@ -294,6 +296,7 @@ "status.open": "Expand this status", "status.pin": "Pin on profile", "status.pinned": "Pinned toot", + "status.read_more": "Read more", "status.reblog": "Boost", "status.reblog_private": "Boost to original audience", "status.reblogged_by": "{name} boosted", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 00338163f9d5157555a44df2d243254cc6f619b3..8228ef302b6fbf45cfb0a70a63a6438b55221618 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -91,6 +91,8 @@ "confirmations.mute.message": "本当ã«{name}ã•んをミュートã—ã¾ã™ã‹ï¼Ÿ", "confirmations.redraft.confirm": "削除ã—ã¦ä¸‹æ›¸ãã«æˆ»ã™", "confirmations.redraft.message": "本当ã«ã“ã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’削除ã—ã¦ä¸‹æ›¸ãã«æˆ»ã—ã¾ã™ã‹ï¼Ÿ ã“ã®ãƒˆã‚¥ãƒ¼ãƒˆã¸ã®ãŠæ°—ã«å…¥ã‚Šç™»éŒ²ã‚„ブーストã¯å¤±ã‚れã€è¿”ä¿¡ã¯å¤ç«‹ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚", + "confirmations.reply.confirm": "返信", + "confirmations.reply.message": "今返信ã™ã‚‹ã¨ç¾åœ¨ä½œæˆä¸ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒä¸Šæ›¸ãã•れã¾ã™ã€‚本当ã«å®Ÿè¡Œã—ã¾ã™ã‹ï¼Ÿ", "confirmations.unfollow.confirm": "フォãƒãƒ¼è§£é™¤", "confirmations.unfollow.message": "本当ã«{name}ã•ã‚“ã®ãƒ•ã‚©ãƒãƒ¼ã‚’解除ã—ã¾ã™ã‹ï¼Ÿ", "embed.instructions": "下記ã®ã‚³ãƒ¼ãƒ‰ã‚’コピーã—ã¦ã‚¦ã‚§ãƒ–サイトã«åŸ‹ã‚è¾¼ã¿ã¾ã™ã€‚", @@ -294,6 +296,7 @@ "status.open": "詳細を表示", "status.pin": "プãƒãƒ•ィールã«å›ºå®šè¡¨ç¤º", "status.pinned": "固定ã•れãŸãƒˆã‚¥ãƒ¼ãƒˆ", + "status.read_more": "ã‚‚ã£ã¨è¦‹ã‚‹", "status.reblog": "ブースト", "status.reblog_private": "ブースト", "status.reblogged_by": "{name}ã•ã‚“ãŒãƒ–ースト", diff --git a/config/locales/en.yml b/config/locales/en.yml index e771496a1e7bf1885bbd6aea59d6581cf7d7fb81..8c70f9ed6843409c9a59c93a89bc20b67346ff38 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -369,7 +369,7 @@ en: desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance thumbnail title: Hero image mascot: - desc_html: Displayed on multiple pages. At least 293px × 205px recommended. When not set, falls back to instance thumbnail + desc_html: Displayed on multiple pages. At least 293×205px recommended. When not set, falls back to instance thumbnail title: Mascot image peers_api_enabled: desc_html: Domain names this instance has encountered in the fediverse @@ -579,6 +579,7 @@ en: resources: Resources generic: changes_saved_msg: Changes successfully saved! + copy: Copy save_changes: Save changes validation_errors: one: Something isn't quite right yet! Please review the error below diff --git a/config/locales/ja.yml b/config/locales/ja.yml index f438197701288e3bb9d89fa3a418707457a2a022..64182ae6029fdc885ce048f97dcb9e5d190e2631 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -367,6 +367,9 @@ ja: hero: desc_html: フãƒãƒ³ãƒˆãƒšãƒ¼ã‚¸ã«è¡¨ç¤ºã•れã¾ã™ã€‚サイズã¯600x100px以上推奨ã§ã™ã€‚未è¨å®šã®å ´åˆã€ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ã‚µãƒ ãƒã‚¤ãƒ«ãŒä½¿ç”¨ã•れã¾ã™ title: ヒーãƒãƒ¼ã‚¤ãƒ¡ãƒ¼ã‚¸ + mascot: + desc_html: 複数ã®ãƒšãƒ¼ã‚¸ã«è¡¨ç¤ºã•れã¾ã™ã€‚サイズã¯293x205px以上推奨ã§ã™ã€‚未è¨å®šã®å ´åˆã€ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ã‚µãƒ ãƒã‚¤ãƒ«ãŒä½¿ç”¨ã•れã¾ã™ + title: マスコットイメージ peers_api_enabled: desc_html: 連åˆå†…ã§ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ãŒéé‡ã—ãŸãƒ‰ãƒ¡ã‚¤ãƒ³ã®åå‰ title: 接続ã—ã¦ã„るインスタンスã®ãƒªã‚¹ãƒˆã‚’公開ã™ã‚‹ @@ -575,6 +578,7 @@ ja: resources: リソース generic: changes_saved_msg: æ£å¸¸ã«å¤‰æ›´ã•れã¾ã—ãŸï¼ + copy: コピー save_changes: 変更をä¿å˜ validation_errors: one: エラーãŒç™ºç”Ÿã—ã¾ã—ãŸï¼ 以下ã®ã‚¨ãƒ©ãƒ¼ã‚’確èªã—ã¦ãã ã•ã„ @@ -915,6 +919,7 @@ ja: tips: è±†çŸ¥è˜ title: よã†ã“ãã€%{name} ï¼ users: + follow_limit_reached: ã‚ãªãŸã¯ç¾åœ¨ %{limit} 人以上フォãƒãƒ¼ã§ãã¾ã›ã‚“ invalid_email: メールアドレスãŒç„¡åйã§ã™ invalid_otp_token: 二段階èªè¨¼ã‚³ãƒ¼ãƒ‰ãŒé–“é•ã£ã¦ã„ã¾ã™ otp_lost_help_html: ã©ã¡ã‚‰ã‚‚使用ã§ããªã„å ´åˆã€%{email} ã«é€£çµ¡ã‚’å–ã‚‹ã¨è§£æ±ºã§ãã‚‹ã‹ã‚‚ã—れã¾ã›ã‚“