dynamic dns: consolidate naming away from DDNS or DynDNS

Contractions should be avoided whenever possible.

src/etc/inc/services.inc

@@ -1736,7 +1736,7 @@ function services_dyndns_configure($int = '')
 		$gwgroups = return_gateway_groups_array();
 		if (is_array($dyndnscfg)) {
 			if (file_exists("/var/run/booting"))
-				echo gettext("Starting DynDNS clients...");
+				echo gettext("Starting dynamic DNS clients...");
 
 			foreach ($dyndnscfg as $dyndns) {
 				if ((empty($int)) || ($int == $dyndns['interface']) || (is_array($gwgroups[$dyndns['interface']]))) {
@@ -2250,12 +2250,12 @@ EOD;
 					if (($wanip != $cachedipv4) || (($currentTime - $cacheTimev4) > $maxCacheAgeSecs) || $forced) {
 						$upinst .= "update delete {$dnsupdate['host']}. A\n";
 						$upinst .= "update add {$dnsupdate['host']}. {$dnsupdate['ttl']} A {$wanip}\n";
-						$notify_text .= sprintf(gettext('DynDNS updated IP Address (A) for %s on %s (%s) to %s'), $dnsupdate['host'], convert_real_interface_to_friendly_descr($if), $if, $wanip) . "\n";
+						$notify_text .= sprintf(gettext('Dynamic DNS updated IP Address (A) for %s on %s (%s) to %s'), $dnsupdate['host'], convert_real_interface_to_friendly_descr($if), $if, $wanip) . "\n";
 						@file_put_contents($cacheFile, "{$wanip}|{$currentTime}");
-						log_error("phpDynDNS: updating cache file {$cacheFile}: {$wanip}");
+						log_error("Dynamic DNS: updating cache file {$cacheFile}: {$wanip}");
 						$need_update = true;
 					} else {
-						log_error("phpDynDNS: Not updating {$dnsupdate['host']} A record because the IP address has not changed.");
+						log_error("Dynamic DNS: Not updating {$dnsupdate['host']} A record because the IP address has not changed.");
 					}
 				} else
 					@unlink($cacheFile);
@@ -2265,12 +2265,12 @@ EOD;
 					if (($wanipv6 != $cachedipv6) || (($currentTime - $cacheTimev6) > $maxCacheAgeSecs) || $forced) {
 						$upinst .= "update delete {$dnsupdate['host']}. AAAA\n";
 						$upinst .= "update add {$dnsupdate['host']}. {$dnsupdate['ttl']} AAAA {$wanipv6}\n";
-						$notify_text .= sprintf(gettext('DynDNS updated IPv6 Address (AAAA) for %s on %s (%s) to %s'), $dnsupdate['host'], convert_real_interface_to_friendly_descr($if), $if, $wanipv6) . "\n";
+						$notify_text .= sprintf(gettext('Dynamic DNS updated IPv6 Address (AAAA) for %s on %s (%s) to %s'), $dnsupdate['host'], convert_real_interface_to_friendly_descr($if), $if, $wanipv6) . "\n";
 						@file_put_contents("{$cacheFile}.ipv6", "{$wanipv6}|{$currentTime}");
-						log_error("phpDynDNS: updating cache file {$cacheFile}.ipv6: {$wanipv6}");
+						log_error("Dynamic DNS: updating cache file {$cacheFile}.ipv6: {$wanipv6}");
 						$need_update = true;
 					} else {
-						log_error("phpDynDNS: Not updating {$dnsupdate['host']} AAAA record because the IPv6 address has not changed.");
+						log_error("Dynamic DNS: Not updating {$dnsupdate['host']} AAAA record because the IPv6 address has not changed.");
 					}
 				} else
 					@unlink("{$cacheFile}.ipv6");

src/www/interfaces_gif.php

@@ -152,7 +152,14 @@ $main_buttons = array(
 										  </strong></span>
 										  <?=gettext("GIF tunnels are configured here."); ?>
 										  <br /><br />
-										  <?php echo gettext("If you are using a GIF tunnel to connect to a Hurricane Electric (he.net) Tunnel Broker on a WAN with a dynamic IP, you may want to add a"); ?> <a href="services_dyndns.php"><?php echo gettext("HE.net Tunnelbroker type DynDNS Entry"); ?></a> <?php echo gettext("to keep your tunnel functional when your IP changes."); ?></p>
+										  <?=sprintf(gettext(
+		'If you are using a GIF tunnel to connect to a Hurricane Electric (he.net) Tunnel Broker ' .
+		'on a WAN with a dynamic IP, you may want to add a %sHE.net Tunnelbroker dynamic DNS entry%s ' .
+		'to keep your tunnel functional when your IP changes.',
+		'<a href="services_dyndns.php">',
+		'</a>'
+	));
+?></p>
                                 </div>
 
 		                        </form>

src/www/services_dyndns_edit.php

@@ -31,7 +31,7 @@ require_once("pfsense-utils.inc");
 require_once("services.inc") ;
 require_once("interfaces.inc");
 
-/* returns true if $uname is a valid DynDNS username */
+/* returns true if $uname is a valid dynamic DNS username */
 function is_dyndns_username($uname) {
         if (!is_string($uname))
                 return false;
@@ -335,7 +335,7 @@ include("head.inc");
 					                  <td width="78%" class="vtable">
 					                    <input name="mx" type="text" class="formfld unknown" id="mx" size="30" value="<?=htmlspecialchars($pconfig['mx']);?>" />
 					                    <br />
-										<?=gettext("Note: With DynDNS service you can only use a hostname, not an IP address.");?>
+										<?=gettext("Note: With a dynamic DNS service you can only use a hostname, not an IP address.");?>
 										<br />
 					                    <?=gettext("Set this option only if you need a special MX record. Not".
 					                   " all services support this.");?></td>
@@ -404,7 +404,7 @@ include("head.inc");
 					                    <textarea name="resultmatch" class="formpre" id="resultmatch" cols="65" rows="7"><?=htmlspecialchars($pconfig['resultmatch']);?></textarea>
 					                    <br /><?= gettext("This field is only used by Custom Dynamic DNS Entries.");?>
 								<br />
-								<?= gettext("This field should be identical to what your DDNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.");?>
+								<?= gettext("This field should be identical to what your dynamic DNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.");?>
 								<br />
 								<?= gettext("If you need the new IP to be included in the request, put %IP% in its place.");?>
 								<br />

src/www/vpn_openvpn_export.php

@@ -653,13 +653,13 @@ endforeach; ?>
                   <select name="useaddr" id="useaddr" class="formselect" onchange="useaddr_changed(this)">
                     <option value="serveraddr" ><?=gettext("Interface IP Address");?></option>
                     <option value="servermagic" ><?=gettext("Automagic Multi-WAN IPs (port forward targets)");?></option>
-                    <option value="servermagichost" ><?=gettext("Automagic Multi-WAN DDNS Hostnames (port forward targets)");?></option>
+                    <option value="servermagichost" ><?=gettext("Automagic Multi-WAN dynamic DNS Hostnames (port forward targets)");?></option>
                     <option value="serverhostname" ><?=gettext("Installation hostname");?></option>
                     <?php if (isset($config['dyndnses']['dyndns'])) :
 ?>
                         <?php foreach ($config['dyndnses']['dyndns'] as $ddns) :
 ?>
-                        <option value="<?php echo $ddns["host"] ?>"><?=gettext("DynDNS");
+                        <option value="<?php echo $ddns["host"] ?>"><?=gettext("Dynamic DNS");
 ?>: <?= htmlspecialchars($ddns["host"]); ?></option>
                         <?php
 endforeach; ?>
@@ -669,7 +669,7 @@ endif; ?>
 ?>
                         <?php foreach ($config['dnsupdates']['dnsupdate'] as $ddns) :
 ?>
-                        <option value="<?php echo $ddns["host"] ?>"><?=gettext("DynDNS");
+                        <option value="<?php echo $ddns["host"] ?>"><?=gettext("Dynamic DNS");
 ?>: <?= htmlspecialchars($ddns["host"]); ?></option>
                         <?php
 endforeach; ?>

src/www/vpn_openvpn_export_shared.php

@@ -337,7 +337,7 @@ endforeach; ?>
                         <?php foreach ($config['dyndnses']['dyndns'] as $ddns) :
 ?>
                         <option value="<?= htmlspecialchars($ddns["host"]);
-?>"><?=gettext("DynDNS:");
+?>"><?=gettext("Dynamic DNS:");
 ?> <?= htmlspecialchars($ddns["host"]);?></option>
                         <?php
 endforeach; ?>