Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`
This commit is contained in:
@@ -2078,21 +2078,25 @@
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "{name} followed you",
|
||||
"id": "notification.follow"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{name} favourited your status",
|
||||
"id": "notification.favourite"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{name} boosted your status",
|
||||
"id": "notification.reblog"
|
||||
"defaultMessage": "{name} followed you",
|
||||
"id": "notification.follow"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Your poll has ended",
|
||||
"id": "notification.own_poll"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "A poll you have voted in has ended",
|
||||
"id": "notification.poll"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{name} boosted your status",
|
||||
"id": "notification.reblog"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/notifications/components/notification.json"
|
||||
@@ -2771,6 +2775,10 @@
|
||||
"defaultMessage": "Exit full screen",
|
||||
"id": "video.exit_fullscreen"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Download file",
|
||||
"id": "video.download"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Sensitive content",
|
||||
"id": "status.sensitive_warning"
|
||||
|
@@ -279,6 +279,7 @@
|
||||
"notification.favourite": "{name} favourited your status",
|
||||
"notification.follow": "{name} followed you",
|
||||
"notification.mention": "{name} mentioned you",
|
||||
"notification.own_poll": "Your poll has ended",
|
||||
"notification.poll": "A poll you have voted in has ended",
|
||||
"notification.reblog": "{name} boosted your status",
|
||||
"notifications.clear": "Clear notifications",
|
||||
@@ -417,6 +418,7 @@
|
||||
"upload_modal.preview_label": "Preview ({ratio})",
|
||||
"upload_progress.label": "Uploading...",
|
||||
"video.close": "Close video",
|
||||
"video.download": "Download file",
|
||||
"video.exit_fullscreen": "Exit full screen",
|
||||
"video.expand": "Expand video",
|
||||
"video.fullscreen": "Full screen",
|
||||
|
Reference in New Issue
Block a user