src: strip excessive name placement

(cherry picked from commit 6a6f7f3b)

src/etc/rc.filter_synchronize

@@ -76,8 +76,9 @@ function get_vip_config_section()
  * @param string $method xmlrpc method to call
  * @return boolean
  */
-function carp_check_version($url, $username, $password, $method = 'opnsense.firmware_version') {
-    global $config, $g;
+function carp_check_version($url, $username, $password, $method = 'opnsense.firmware_version')
+{
+    global $config;
 
     $client = new SimpleXMLRPC_Client($url,240);
     $client->setCredentials($username, $password);
@@ -102,8 +103,8 @@ function carp_check_version($url, $username, $password, $method = 'opnsense.firm
 
     if (!isset($remote_version['config_version']) ||
         $remote_version['config_version'] < $config['version']) {
-        update_filter_reload_status("The other member is on older configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
-        log_error("The other member is on older configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
+        update_filter_reload_status("The other member is on older configuration version. Sync will not be done to prevent problems!");
+        log_error("The other member is on older configuration version. Sync will not be done to prevent problems!");
         return false;
     } else {
         return true;

src/etc/rc.initial.halt

@@ -2,8 +2,8 @@
 <?php
 
 /*
-	Copyright (C)2004 Bachman Kharazmi
-	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
+    Copyright (C) 2004 Bachman Kharazmi
+    Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -34,9 +34,7 @@ require_once("system.inc");
 
 $fp = fopen('php://stdin', 'r');
 
-echo "\n{$g['product_name']} will shutdown and halt system.\n";
-echo "This may take a minute, depending on your hardware.\n";
-echo "\nDo you want to proceed [y|n]? ";
+echo "\nThe system will halt and power down.  Do you want to proceed [y|n]? ";
 
 if (strcasecmp(chop(fgets($fp)), 'y') == 0) {
     system_halt(true);

src/etc/rc.initial.reboot

@@ -2,7 +2,7 @@
 <?php
 
 /*
-	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
+    Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -33,9 +33,7 @@ require_once("system.inc");
 
 $fp = fopen('php://stdin', 'r');
 
-echo "\n{$g['product_name']} will reboot.\n";
-echo "This may take a minute, depending on your hardware.\n";
-echo "\nDo you want to proceed [y|n]? ";
+echo "\nThe system will reboot.  Do you want to proceed [y|n]? ";
 
 if (strcasecmp(chop(fgets($fp)), 'y') == 0) {
     system_reboot(true);

src/etc/rc.initial.setlanip

@@ -302,10 +302,7 @@ function console_configure_ip_address($version)
                 }
             } while (($ip_conflict === true) || !($is_ipaddr || $intip == ''));
             if ($intip != '') {
-                echo "\n" . sprintf(
-                    gettext("Subnet masks are entered as bit counts (as in CIDR notation) in %s."),
-                    $g['product_name']
-                ) . "\n";
+                echo "\n" . gettext("Subnet masks are entered as bit counts (like CIDR notation).") . "\n";
                 if ($version === 6) {
                     echo "e.g. ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff00 = 120\n";
                     echo "     ffff:ffff:ffff:ffff:ffff:ffff:ffff:0    = 112\n";

src/www/crash_reporter.php

 <?php
 
 /*
-	Copyright (C) 2015 Franco Fichtner <franco@opnsense.org>
+    Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
     Copyright (C) 2014 Deciso B.V.
     Copyright (C) 2011 Scott Ullrich
     All rights reserved.

src/www/diag_backup.php

@@ -584,7 +584,7 @@ $( document ).ready(function() {
                     <tbody>
                       <tr>
                         <td>
-                          <?=gettext("Open a"); ?> <?=$g['[product_name']?> <?=gettext("configuration XML file and click the button below to restore the configuration."); ?>
+                          <?=gettext("Open a configuration XML file and click the button below to restore the configuration."); ?>
                           <br /><br />
                           <?=gettext("Restore area:"); ?>
                           <select name="restorearea" id="restorearea">

src/www/diag_logs_settings.php

@@ -566,9 +566,9 @@ $(document).ready(function() {
                     </tr>
                     <tr>
                       <td  colspan="2"><strong><span class="text-danger"><?=gettext("Note:")?></span></strong><br />
-                      <?=gettext("syslog sends UDP datagrams to port 514 on the specified " .
+                      <?=gettext("Syslog sends UDP datagrams to port 514 on the specified " .
                       "remote syslog server, unless another port is specified. Be sure to set syslogd on the " .
-                      "remote server to accept syslog messages from");?> <?=$g['product_name']?>.
+                      "remote server to accept remote syslog messages.");?>
                       </td>
                     </tr>
                   </table>

src/www/index.php

@@ -367,10 +367,10 @@ if (isset($config['trigger_initial_wizard'])) :
 								<br />
 								<div class="content-box-main">
                                 <?php
-                                    echo sprintf(gettext("Welcome to %s!\n"), $g['product_name']) . "<p>";
+                                    echo sprintf(gettext("Welcome to %s!"), $g['product_name']) . "<p>\n";
                                     echo gettext("One moment while we start the initial setup wizard.") . "<p>\n";
                                     echo gettext("Embedded platform users: Please be patient, the wizard takes a little longer to run than the normal GUI.") . "<p>\n";
-                                    echo sprintf(gettext("To bypass the wizard, click on the %s logo on the initial page."), $g['product_name']) . "\n";
+                                    echo gettext("To bypass the wizard, click on the logo in the upper left corner.") . "\n";
                                 ?>
 								</div>
 							<div>

src/www/interfaces_qinq.php

@@ -167,7 +167,7 @@ $main_buttons = array(
               <div class="container-fluid">
                 <p>
                   <span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
-                  <?php printf(gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."), $g['product_name']);?>
+                  <?= gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems.");?>
                 </p>
               </div>
             </form>

src/www/interfaces_vlan.php

@@ -150,7 +150,7 @@ $main_buttons = array(
               <div class="container-fluid">
                 <p>
                   <span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
-                  <?php printf(gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."),$g['product_name']);?>
+                  <?= gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems.");?>
                 </p>
               </div>
             </form>

src/www/system_usermanager_settings_test.php

@@ -54,7 +54,7 @@ if (!$authcfg) {
 } else {
     echo "<table class='table table-striped'>";
 
-    echo "<tr><th colspan='2'>".sprintf(gettext("Testing %s LDAP settings... One moment please..."), $g['product_name'])."</th></tr>";
+    echo "<tr><th colspan='2'>".gettext("Testing LDAP settings... One moment please...")."</th></tr>";
     echo "<tr><td>" . gettext("Attempting connection to") . " " . $authserver . "</td>";
     if ($ldap_is_connected) {
         echo "<td><font color='green'>OK</font></td></tr>";