From 1c92c5b1a42af43feafe7f4dab2e73a4aa17eec0 Mon Sep 17 00:00:00 2001 From: Stephen Beaver Date: Mon, 4 Apr 2016 09:54:43 -0400 Subject: Merge pull request #2831 from NOYB/Includes_-_Remove_Personalizations (cherry picked from commit 7a2c15f527459cc82aadaf23d06895174c008320) --- src/etc/inc/PEAR.inc | 6 +++--- src/etc/inc/auth.inc | 4 ++-- src/etc/inc/config.console.inc | 10 +++++----- src/etc/inc/config.lib.inc | 6 +++--- src/etc/inc/dyndns.class | 10 +++++----- src/etc/inc/interfaces.inc | 2 +- src/etc/inc/priv/user.priv.inc | 4 ++-- src/etc/inc/services.inc | 2 +- src/etc/inc/shaper.inc | 26 +++++++++++++------------- src/etc/inc/upgrade_config.inc | 2 +- src/etc/inc/util.inc | 4 ++-- 11 files changed, 38 insertions(+), 38 deletions(-) (limited to 'src') diff --git a/src/etc/inc/PEAR.inc b/src/etc/inc/PEAR.inc index a280602..c6c3061 100644 --- a/src/etc/inc/PEAR.inc +++ b/src/etc/inc/PEAR.inc @@ -421,18 +421,18 @@ class PEAR $deleted = $this->_checkDelExpect($error) ? true : false; } - return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME + return $deleted ? true : PEAR::raiseError("The expected error submitted does not exist"); // IMPROVE ME } elseif (!empty($error_code)) { // $error_code comes alone, trying to unset it if ($this->_checkDelExpect($error_code)) { return true; } - return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME + return PEAR::raiseError("The expected error submitted does not exist"); // IMPROVE ME } // $error_code is empty - return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME + return PEAR::raiseError("The expected error submitted is empty"); // IMPROVE ME } /** diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 9db25af..1cac566 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -220,7 +220,7 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][ } if ($found_host == false) { if (!security_checks_disabled()) { - display_error_form("501", "An HTTP_REFERER was detected other than what is defined in System -> Advanced (" . htmlspecialchars($_SERVER['HTTP_REFERER']) . "). You can disable this check if needed in System -> Advanced -> Admin."); + display_error_form("501", "An HTTP_REFERER was detected other than what is defined in System -> Advanced (" . htmlspecialchars($_SERVER['HTTP_REFERER']) . "). If not needed, this check can be disabled in System -> Advanced -> Admin."); exit; } $security_passed = false; @@ -458,7 +458,7 @@ function local_user_set(& $user) { global $g, $debug; if (empty($user['password']) && empty($user['bcrypt-hash'])) { - log_error("There is something wrong in your config because user {$user['name']} password is missing!"); + log_error("There is something wrong in the config because user {$user['name']} password is missing!"); return; } diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc index 32c07fc..00a304b 100644 --- a/src/etc/inc/config.console.inc +++ b/src/etc/inc/config.console.inc @@ -119,10 +119,10 @@ BEGIN MANUAL CONFIGURATION OR WE WILL PROCEED WITH AUTO CONFIGURATION. EOD; } - echo "\n" . gettext("Do you want to set up VLANs first?"); + echo "\n" . gettext("Do VLANs need to be set up first?"); echo "\n" . gettext( - "If you are not going to use VLANs, or only for optional interfaces, you should\n" . + "If VLANs will not be used, or only for optional interfaces, it is typical to\n" . "say no here and use the webConfigurator to configure VLANs later, if required.") . "\n"; echo "\n" . gettext("Do you want to set up VLANs now [y|n]?") . " "; @@ -179,7 +179,7 @@ EOD; Assigned WAN to : $wanif Assigned LAN to : $lanif -If you don't like this assignment, +If these assignments are not suitable, press any key to go back to manual configuration. EOD; @@ -213,7 +213,7 @@ EOD; echo <<_dnsIP . ")"; @@ -1158,7 +1158,7 @@ if (preg_match("/internal server error/i", $data)) { $status = $status_intro . $error_str . gettext("Server side error."); } else if (preg_match("/request is badly formed/i", $data)) { - $status = $status_intro . $error_str . gettext("Badly Formed Request (check your settings)."); + $status = $status_intro . $error_str . gettext("Badly Formed Request (check the settings)."); } else if ($ncresponse['interface-response']['ErrCount'] === "0") { $status = $status_intro . $success_str . gettext("IP Address Updated Successfully!"); $successful_update = true; @@ -1269,7 +1269,7 @@ } elseif ($output->errors[0]->code === 9103) { $status = $status_intro . $error_str . gettext("Invalid Credentials! Don't forget to use API Key for password field with CloudFlare."); } elseif (($output->success) && (!$output->result[0]->id)) { - $status = $status_intro . $error_str . gettext("Zone or Host ID was not found, check your hostname."); + $status = $status_intro . $error_str . gettext("Zone or Host ID was not found, check the hostname."); } else { $status = $status_intro . gettext("UNKNOWN ERROR") . " - " . $output->errors[0]->message; log_error($status_intro . gettext("PAYLOAD:") . " " . $data); diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index f08c50a..cefa7ab 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2808,7 +2808,7 @@ EOD; if (isset($wlcfg['wpa']['rsn_preauth'])) { $wpa .= << 'FAIRQ', 'CODELQ' => 'CODELQ', 'PRIQ' => 'PRIQ') - ))->setHelp('Changing this changes all child queues! Beware you can lose information.'); + ))->setHelp('Changing this changes all child queues! Beware information can be lost.'); $group = new Form_group('Bandwidth'); @@ -3500,7 +3500,7 @@ class dnpipe_class extends dummynet_class { } } if ($schedule == 0 && $entries > 1) { - $input_errors[] = gettext("You need to specify a schedule for every additional entry"); + $input_errors[] = gettext("A schedule needs to be specified for every additional entry"); } if ($schedulenone > 0 && $entries > 1) { $input_errors[] = gettext("If more than one bandwidth configured all schedules need to be selected"); @@ -3929,7 +3929,7 @@ EOD; 'Description', 'text', $this->GetDescription() - ))->setHelp('You may enter a description here for your reference (not parsed).'); + ))->setHelp('A description may be entered here for administrative reference (not parsed).'); $sform->add($section); @@ -3940,7 +3940,7 @@ EOD; 'Delay (ms)', 'text', $this->GetDelay() > 0 ? $this->GetDelay():null - ))->setHelp('In most cases, you should specify 0 here (or leave the field empty)'); + ))->setHelp('In most cases, zero (0) should specified here (or leave the field empty)'); $section->addInput(new Form_Input( 'plr', @@ -3948,7 +3948,7 @@ EOD; 'number', $this->GetPlr(), ['step' => '0.001', 'min' => '0.000'] - ))->setHelp('In most cases, you should specify 0 here (or leave the field empty). ' . + ))->setHelp('In most cases, zero (0) should be specified here (or leave the field empty). ' . 'A value of 0.001 means one packet in 1000 gets dropped'); $section->addInput(new Form_Input( @@ -3956,7 +3956,7 @@ EOD; 'Queue size (slots)', 'number', $this->GetQlimit() - ))->setHelp('In most cases, you should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, ' . + ))->setHelp('In most cases, the field should be left empty. All packets in this pipe are placed into a fixed-size queue first, ' . 'then they are delayed by value specified in the Delay field, and then they are delivered to their destination.'); $section->addInput(new Form_Input( @@ -3964,7 +3964,7 @@ EOD; 'Bucket size (slots)', 'number', $this->GetBuckets() - ))->setHelp('In most cases, you should leave this field empty. It increases the hash size set'); + ))->setHelp('In most cases, this field should be left empty. It increases the hash size set'); $sform->add($section); @@ -4233,7 +4233,7 @@ class dnqueue_class extends dummynet_class { 'Description', 'text', $this->GetDescription() - ))->setHelp('You may enter a description here for your reference (not parsed).'); + ))->setHelp('A description may be entered here for administrative reference (not parsed).'); $sform->add($section); @@ -4246,7 +4246,7 @@ class dnqueue_class extends dummynet_class { $this->GetWeight(), ['min' => '1', 'max' => '100'] ))->setHelp('For queues under the same parent this specifies the share that a queue gets(values range from 1 to 100),' . - ' you can leave it blank otherwise'); + ' it can be left blank otherwise.'); $section->addInput(new Form_Input( 'plr', @@ -4254,7 +4254,7 @@ class dnqueue_class extends dummynet_class { 'number', $this->GetPlr(), ['step' => '0.001', 'min' => '0.000'] - ))->setHelp('In most cases, you should specify 0 here (or leave the field empty). ' . + ))->setHelp('In most cases, zero (0) should be specified here (or leave the field empty). ' . 'A value of 0.001 means one packet in 1000 gets dropped'); $section->addInput(new Form_Input( @@ -4262,7 +4262,7 @@ class dnqueue_class extends dummynet_class { 'Queue size (slots)', 'number', $this->GetQlimit() - ))->setHelp('In most cases, you should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, ' . + ))->setHelp('In most cases, the field should be left empty. All packets in this pipe are placed into a fixed-size queue first, ' . 'then they are delayed by value specified in the Delay field, and then they are delivered to their destination.'); $section->addInput(new Form_Input( @@ -4270,7 +4270,7 @@ class dnqueue_class extends dummynet_class { 'Bucket size (slots)', 'number', $this->GetBuckets() - ))->setHelp('In most cases, you should leave this field empty. It increases the hash size set'); + ))->setHelp('In most cases, this field should be left empty. It increases the hash size set'); $section->addInput(new Form_Input( 'pipe', @@ -4667,7 +4667,7 @@ function build_iface_without_this_queue($iface, $qname) { } $default_shaper_msg = sprintf(gettext("Welcome to the %s Traffic Shaper."), $g['product_name']) . "
"; -$default_shaper_msg .= gettext("The tree on the left helps you navigate through the queues.
" +$default_shaper_msg .= gettext("The tree on the left navigates through the queues.
" . "Buttons at the bottom represent queue actions and are activated accordingly."); $dn_default_shaper_msg = $default_shaper_msg; diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index f6614a9..2d0ab84 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -660,7 +660,7 @@ function upgrade_039_to_040() { $config['system']['user'][0]['priv'][3]['descr'] = sprintf(gettext("Indicates whether this user is allowed to copy files onto the %s appliance via SCP/SFTP."), $g['product_name']); $config['system']['user'][0]['priv'][4]['id'] = "isroot"; $config['system']['user'][0]['priv'][4]['name'] = "Is root user"; - $config['system']['user'][0]['priv'][4]['descr'] = gettext("This user is associated with the UNIX root user (you should associate this privilege only with one single user)."); + $config['system']['user'][0]['priv'][4]['descr'] = gettext("This user is associated with the UNIX root user (this privilege should only be associated with one single user)."); $config['system']['nextuid'] = "111"; $config['system']['nextgid'] = "111"; diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index e74dc64..7449dc8 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -148,7 +148,7 @@ function config_unlock() { function lock($lock, $op = LOCK_SH) { global $g, $cfglckkeyconsumers; if (!$lock) { - die(gettext("WARNING: You must give a name as parameter to lock() function.")); + die(gettext("WARNING: A name must be given as parameter to lock() function.")); } if (!file_exists("{$g['tmp_path']}/{$lock}.lock")) { @touch("{$g['tmp_path']}/{$lock}.lock"); @@ -167,7 +167,7 @@ function lock($lock, $op = LOCK_SH) { function try_lock($lock, $timeout = 5) { global $g, $cfglckkeyconsumers; if (!$lock) { - die(gettext("WARNING: You must give a name as parameter to try_lock() function.")); + die(gettext("WARNING: A name must be given as parameter to try_lock() function.")); } if (!file_exists("{$g['tmp_path']}/{$lock}.lock")) { @touch("{$g['tmp_path']}/{$lock}.lock"); -- cgit v1.1