Andrey/uptime-kuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into docs-update

Browse Source
This commit is contained in:
Frank Elsinga 2025-12-26 02:14:40 +01:00 committed by GitHub
commit 7fef368879
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lang/en.json
View File

@ -93,6 +93,7 @@
"wsSubprotocolDescription": "For more information on subprotocols, please consult the {documentation}",
"WebSocket Application Messaging Protocol": "WAMP (The WebSocket Application Messaging Protocol)",
"Session Initiation Protocol": "WebSocket Transport for SIP (Session Initiation Protocol)",
"Subprotocol": "Subprotocol",
"Network API for Notification Channel": "OMA RESTful Network API for Notification Channel",
"Web Process Control Protocol": "Web Process Control Protocol (WPCP)",
"Advanced Message Queuing Protocol": "Advanced Message Queuing Protocol (AMQP) 1.0+",
@ -510,6 +511,7 @@
"endDateTime": "End Date/Time",
"cronExpression": "Cron Expression",
"cronSchedule": "Schedule: ",
"Duration (Minutes)": "Duration (Minutes)",
"invalidCronExpression": "Invalid Cron Expression: {0}",
"recurringInterval": "Interval",
"Recurring": "Recurring",
@ -573,6 +575,9 @@
"Clone": "Clone",
"cloneOf": "Clone of {0}",
"smtp": "Email (SMTP)",
"SMTP Security": "SMTP Security",
"Ignore STARTTLS": "Ignore STARTTLS",
"Use STARTTLS": "Use STARTTLS",
"Use HTML for custom E-mail body": "Use HTML for custom E-mail body",
"secureOptionNone": "None / STARTTLS (25, 587)",
"secureOptionTLS": "TLS (465)",
@ -1155,6 +1160,8 @@
"The phone number of the recipient in E.164 format.": "The phone number of the recipient in E.164 format.",
"Either a text sender ID or a phone number in E.164 format if you want to be able to receive replies.": "Either a text sender ID or a phone number in E.164 format if you want to be able to receive replies.",
"RabbitMQ Nodes": "RabbitMQ Management Nodes",
"Enter the list of nodes": "Enter the list of RabbitMQ management nodes",
"Press Enter to add node": "Press Enter to add node",
"rabbitmqNodesDescription": "Enter the URL for the RabbitMQ management nodes including protocol and port. Example: {0}",
"rabbitmqNodesRequired": "Please set the nodes for this monitor.",
"rabbitmqNodesInvalid": "Please use a fully qualified (starting with 'http') URL for RabbitMQ nodes.",

6
src/pages/EditMonitor.vue
View File

@ -438,8 +438,8 @@
<label for="smtp_security" class="form-label">{{ $t("SMTP Security") }}</label>
<select id="smtp_security" v-model="monitor.smtpSecurity" class="form-select">
<option value="secure">SMTPS</option>
<option value="nostarttls">Ignore STARTTLS</option>
<option value="starttls">Use STARTTLS</option>
<option value="nostarttls">{{ $t("Ignore STARTTLS") }}</option>
<option value="starttls">{{ $t("Use STARTTLS") }}</option>
</select>
<div class="form-text">
{{ $t("smtpHelpText") }}
@ -449,7 +449,7 @@
<div v-if="monitor.type === 'port'" class="my-3">
<label for="port_security" class="form-label">{{ $t("SSL/TLS") }}</label>
<select id="port_security" v-model="monitor.smtpSecurity" class="form-select">
<option value="nostarttls">None</option>
<option value="nostarttls">{{ $t("None") }}</option>
<option value="secure">SSL</option>
<option value="starttls">STARTTLS</option>
</select>