resolve conflicts

This commit is contained in:
Alex Holliday committed 2026-02-26 17:32:11 +00:00
commit dfeba1e4fb
48 files changed
+2921 -217

No files matched your search

+36 -5
View File
@@ -45,7 +45,8 @@
"removeMonitors": "Remove monitors",
"sendTestEmail": "Send test email",
"exportToJSON": "Export to JSON",
"importFromJSON": "Import from JSON"
"importFromJSON": "Import from JSON",
"clearFilters": "Clear filters"
},
"charts": {
"labels": {
@@ -115,7 +116,8 @@
"type": "Type",
"url": "Url",
"interval": "Interval",
"active": "Active"
"active": "Active",
"responseTime": "Response time"
}
}
},
@@ -372,8 +374,8 @@
"table": {
"empty": "No down checks in this time range",
"headers": {
"dateTime": "Date & time",
"statusCode": "Status code"
"statusCode": "Status code",
"location": "Location"
}
}
},
@@ -558,6 +560,36 @@
}
}
},
"geoChecks": {
"title": "Geo-Distributed Checks",
"description": "Run checks from multiple geographic locations to monitor global availability and performance.",
"option": {
"enabled": {
"label": "Enable geo-distributed checks"
},
"locations": {
"label": "Locations",
"placeholder": "Select locations",
"options": {
"EU": "Europe",
"NA": "North America",
"AS": "Asia",
"SA": "South America",
"AF": "Africa",
"OC": "Oceania"
}
},
"interval": {
"label": "Check interval",
"value": {
"fiveMinutes": "5 minutes",
"tenMinutes": "10 minutes",
"fifteenMinutes": "15 minutes",
"thirtyMinutes": "30 minutes"
}
}
}
},
"url": {
"title": "Monitor IP/URL on Status Page",
"description": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
@@ -627,7 +659,6 @@
},
"filters": {
"allMonitors": "All monitors",
"clearFilters": "Clear filters",
"monitor": "Monitor",
"resolutionType": "Resolution type",
"resolutionTypes": {