diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-09 12:12:03 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-09 12:12:03 +0200 |
| commit | 122ac9cd1deb66f02220cadcc50422ffa645e122 (patch) | |
| tree | 63aac8a75d3e573fd3b56eb8f79edec818e03082 /app | |
| parent | 4134a10549a833ad5ab18b3c579304919d594ce1 (diff) | |
| parent | b2a57a5d6f7d98d37aaa6b877291bc789ce07511 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/locales/en.json | 3 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/ja.json | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 65b290be7..0d85ec744 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -95,6 +95,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.", @@ -299,6 +301,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 c84387051..ae2c7e3c4 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -95,6 +95,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": "下記のコードをコピーしてウェブサイトに埋め込みます。", @@ -299,6 +301,7 @@ "status.open": "詳細を表示", "status.pin": "プロフィールに固定表示", "status.pinned": "固定されたトゥート", + "status.read_more": "もっと見る", "status.reblog": "ブースト", "status.reblog_private": "ブースト", "status.reblogged_by": "{name}さんがブースト", |