Merge remote-tracking branch 'upstream/master' into notification_form_i18n

# Conflicts:
#	src/languages/en.js
This commit is contained in:
zsxeee
2021-09-30 19:16:14 +08:00
71 changed files with 4906 additions and 3143 deletions

View File

@@ -168,6 +168,16 @@ export default {
"Search...": "Search...",
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
statusPageNothing: "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",
"Degraded Service": "Degraded Service",
"Add Group": "Add Group",
"Add a monitor": "Add a monitor",
"Edit Status Page": "Edit Status Page",
"Go to Dashboard": "Go to Dashboard",
// Start notification form
defaultNotificationName: "My {0} Alert ({1})",
here: "here",
@@ -279,4 +289,4 @@ export default {
aboutIconURL: "You can provide a link to a picture in \"Icon URL\" to override the default profile picture. Will not be used if Icon Emoji is set.",
aboutMattermostChannelName: "You can override the default channel that webhook posts to by entering the channel name into \"Channel Name\" field. This needs to be enabled in Mattermost webhook settings. Ex: #other-channel",
// End notification form
}
};