PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'develop' into johannes/poll-start-sent-receipt

Browse source
This commit is contained in:
Andy Balaam 2023-01-06 11:10:37 +00:00 committed by GitHub
commit b0e15a48a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/settings/Notifications.tsx
View file

@ -642,7 +642,7 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
className="mx_UserNotifSettings_clearNotifsButton" className="mx_UserNotifSettings_clearNotifsButton"
data-testid="clear-notifications" data-testid="clear-notifications"
> >
{_t("Clear notifications")} {_t("Mark all as read")}
</AccessibleButton> </AccessibleButton>
); );
} }

3
src/i18n/strings/en_EN.json
View file

@ -1419,7 +1419,7 @@
"Enable desktop notifications for this session": "Enable desktop notifications for this session", "Enable desktop notifications for this session": "Enable desktop notifications for this session",
"Show message in desktop notification": "Show message in desktop notification", "Show message in desktop notification": "Show message in desktop notification",
"Enable audible notifications for this session": "Enable audible notifications for this session", "Enable audible notifications for this session": "Enable audible notifications for this session",
"Clear notifications": "Clear notifications", "Mark all as read": "Mark all as read",
"Keyword": "Keyword", "Keyword": "Keyword",
"New keyword": "New keyword", "New keyword": "New keyword",
"On": "On", "On": "On",
@ -2126,7 +2126,6 @@
"%(count)s reply|one": "%(count)s reply", "%(count)s reply|one": "%(count)s reply",
"Open thread": "Open thread", "Open thread": "Open thread",
"Jump to first unread message.": "Jump to first unread message.", "Jump to first unread message.": "Jump to first unread message.",
"Mark all as read": "Mark all as read",
"Unable to access your microphone": "Unable to access your microphone", "Unable to access your microphone": "Unable to access your microphone",
"We were unable to access your microphone. Please check your browser settings and try again.": "We were unable to access your microphone. Please check your browser settings and try again.", "We were unable to access your microphone. Please check your browser settings and try again.": "We were unable to access your microphone. Please check your browser settings and try again.",
"No microphone found": "No microphone found", "No microphone found": "No microphone found",