Resolved merge conflict in es_es.json

This commit is contained in:
Jokob-sk
2023-08-27 18:48:30 +10:00
3 changed files with 39 additions and 13 deletions

View File

@@ -563,13 +563,13 @@
"DynDNS_display_name" : "DynDNS",
"DynDNS_icon" : "<i class=\"fa fa-globe\"></i>",
"DDNS_ACTIVE_name" : "Enable DynDNS",
"DDNS_ACTIVE_description" : "",
"DDNS_ACTIVE_description" : "Enable DynDNS service",
"DDNS_DOMAIN_name" : "DynDNS domain URL",
"DDNS_DOMAIN_description" : "",
"DDNS_DOMAIN_description" : "DynDNS host URL (do not include http:// or https://).",
"DDNS_USER_name" : "DynDNS user",
"DDNS_USER_description" : "",
"DDNS_USER_description" : "The username used to login to the DynDNS service (sometimes a full email address).",
"DDNS_PASSWORD_name" : "DynDNS password",
"DDNS_PASSWORD_description" : "",
"DDNS_PASSWORD_description" : "The DynDNS service access password",
"DDNS_UPDATE_URL_name" : "DynDNS update URL",
"DDNS_UPDATE_URL_description" : "Update URL starting with <code>http://</code> or <code>https://</code>.",
"API_display_name" : "API",