mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Includes - Remove Personalizations

Browse Source 
Remove "you" personalizations.
This commit is contained in:
NOYB 2016-04-04 00:05:19 -07:00
parent 7517324639
commit 530e47076d
11 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/etc/inc/PEAR.inc
View File

@ -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
}
/**

4
src/etc/inc/auth.inc
View File

@ -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;
}

10
src/etc/inc/config.console.inc
View File

@ -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 <<<EOD
If you do not know the names of your interfaces, you may choose to use
If you do not know the names of the interfaces, you may choose to use
auto-detection. In that case, disconnect all interfaces now before
hitting 'a' to initiate auto detection.
@ -311,7 +311,7 @@ EOD;
if ($ifarr[$i] == $ifarr[$j]) {
echo <<<EOD
Error: you cannot assign the same interface name twice!
Error: The same interface name cannot be assigned twice!
EOD;
fclose($fp);

6
src/etc/inc/config.lib.inc
View File

@ -267,7 +267,7 @@ function parse_config_bootup() {
if (!file_exists("{$g['conf_path']}/config.xml")) {
echo gettext("No XML configuration file found - using factory defaults.\n" .
"Make sure that the configuration floppy disk with the conf/config.xml\n" .
"file is inserted. If it isn't, your configuration changes will be lost\n" .
"file is inserted. If it isn't, the configuration changes will be lost\n" .
"on reboot.\n");
}
} else {
@ -283,8 +283,8 @@ function parse_config_bootup() {
mwexec("/sbin/halt");
exit;
}
log_error("Last known config found and restored. Please double check your configuration file for accuracy.");
file_notice("config.xml", gettext("Last known config found and restored. Please double check your configuration file for accuracy."), "pfSenseConfigurator", "");
log_error("Last known config found and restored. Please double check the configuration file for accuracy.");
file_notice("config.xml", gettext("Last known config found and restored. Please double check the configuration file for accuracy."), "pfSenseConfigurator", "");
}
} else {
unlock($lockkey);

10
src/etc/inc/dyndns.class
View File

@ -850,7 +850,7 @@
} else if (preg_match('/nohost/i', $data)) {
$status = $status_intro . gettext("The hostname passed could not be matched to any services configured. The service field will be blank in the return code.");
} else if (preg_match('/numhost/i', $data)) {
$status = $status_intro . gettext("You may update up to 20 hosts. numhost is returned if you try to update more than 20 or update a round-robin.");
$status = $status_intro . gettext("Up to 20 hosts my be updated. numhost is returned if attempting to update more than 20 or update a round-robin.");
} else if (preg_match('/abuse/i', $data)) {
$status = $status_intro . gettext("The hostname is blocked for update abuse.");
} else if (preg_match('/good/i', $data)) {
@ -1044,7 +1044,7 @@
if (preg_match("/400/i", $data)) {
$status = $status_intro . $error_str . gettext("Bad Request - The URL was malformed. Required parameters were not provided.");
} else if (preg_match('/402/i', $data)) {
$status = $status_intro . $error_str . gettext("Update Too Soon - You have tried updating to quickly since last change.");
$status = $status_intro . $error_str . gettext("Update Too Soon - Attempted to update too quickly since last change.");
} else if (preg_match('/403/i', $data)) {
$status = $status_intro . $error_str . gettext("Database Error - There was a server-sided database error.");
} else if (preg_match('/405/i', $data)) {
@ -1113,7 +1113,7 @@
if (preg_match('/badauth/i', $data)) {
$status = $status_intro . $error_str . gettext("Not a valid username or password!");
} else if (preg_match('/nohost/i', $data)) {
$status = $status_intro . $error_str . gettext("Hostname you are trying to update does not exist.");
$status = $status_intro . $error_str . gettext("Hostname specified does not exist.");
$successful_update = true;
} else if (preg_match('/good/i', $data)) {
$status = $status_intro . $success_str . gettext("IP Address Changed Successfully!") . " (" . $this->_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);

2
src/etc/inc/interfaces.inc
View File

@ -2808,7 +2808,7 @@ EOD;
if (isset($wlcfg['wpa']['rsn_preauth'])) {
$wpa .= <<<EOD
# Enable the next lines for preauth when roaming. Interface = wired or wireless interface talking to the AP you want to roam from/to
# Enable the next lines for preauth when roaming. Interface = wired or wireless interface talking to the AP to roam from/to
rsn_preauth=1
rsn_preauth_interfaces={$if}

4
src/etc/inc/priv/user.priv.inc
View File

@ -42,8 +42,8 @@ $priv_list['user-copy-files'] = array();
$priv_list['user-copy-files']['name'] = gettext("User - System: Copy files (scp)");
$priv_list['user-copy-files']['descr'] = gettext("Indicates whether the user is allowed to copy files ".
"onto the {$g['product_name']} appliance via SCP/SFTP. ".
"If you are going to use this privilege, you must install ".
"scponly on the appliance (Hint: pkg_add -r scponly).");
"To use this privilege, scponly must be installed ".
"on the appliance (Hint: pkg_add -r scponly).");
$priv_list['user-ssh-tunnel'] = array();
$priv_list['user-ssh-tunnel']['name'] = gettext("User - System: SSH tunneling");

2
src/etc/inc/services.inc
View File

@ -2605,7 +2605,7 @@ function configure_cron() {
$crontab_contents .= "\n#\n";
$crontab_contents .= "# " . gettext("If possible do not add items to this file manually.") . "\n";
$crontab_contents .= "# " . gettext("If you do so, this file must be terminated with a blank line (e.g. new line)") . "\n";
$crontab_contents .= "# " . gettext("If done so, this file must be terminated with a blank line (e.g. new line)") . "\n";
$crontab_contents .= "#\n\n";
}

26
src/etc/inc/shaper.inc
View File

@ -848,7 +848,7 @@ class altq_root_queue {
'FAIRQ' => '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']) . "<br />";
$default_shaper_msg .= gettext("The tree on the left helps you navigate through the queues.<br />"
$default_shaper_msg .= gettext("The tree on the left navigates through the queues.<br />"
. "Buttons at the bottom represent queue actions and are activated accordingly.");
$dn_default_shaper_msg = $default_shaper_msg;

2
src/etc/inc/upgrade_config.inc
View File

@ -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";

4
src/etc/inc/util.inc
View File

@ -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");