Merge branch 'master' into master

src/languages/en.js

@@ -13,6 +13,7 @@ export default {
     pauseDashboardHome: "Pause",
     deleteMonitorMsg: "Are you sure want to delete this monitor?",
     deleteNotificationMsg: "Are you sure want to delete this notification for all monitors?",
+    dnsPortDescription: "DNS server port. Defaults to 53. You can change the port at any time.",
     resolverserverDescription: "Cloudflare is the default server. You can change the resolver server anytime.",
     rrtypeDescription: "Select the RR type you want to monitor",
     pauseMonitorMsg: "Are you sure want to pause?",
@@ -330,6 +331,8 @@ export default {
     info: "info",
     warning: "warning",
     danger: "danger",
+    error: "error",
+    critical: "critical",
     primary: "primary",
     light: "light",
     dark: "dark",
@@ -376,6 +379,13 @@ export default {
     "Docker Type": "Connection Type",
     docker_socket: "Socket",
     docker_tcp: "TCP / HTTP",
+    wayToGetPagerDutyKey: "You can get this by going to Service -> Service Directory -> (Select a service) -> Integrations -> Add integration. Here you can search for \"Events API V2\". More info {0}",
+    "Integration Key": "Integration Key",
+    "Integration URL": "Integration URL",
+    "Auto resolve or acknowledged": "Auto resolve or acknowledged",
+    "do nothing": "do nothing",
+    "auto acknowledged": "auto acknowledged",
+    "auto resolve": "auto resolve",
     gorush: "Gorush",
     alerta: "Alerta",
     alertaApiEndpoint: "API Endpoint",