summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/inc/filter.inc2
-rw-r--r--etc/inc/simplepie/simplepie.inc2
-rwxr-xr-xetc/rc.filter_synchronize6
-rw-r--r--usr/local/share/locale/en/LC_MESSAGES/pfSense.pot2
-rw-r--r--usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po2
-rw-r--r--usr/local/share/locale/tr/LC_MESSAGES/pfSense.po2
-rw-r--r--usr/local/www/interfaces_bridge_edit.php2
-rw-r--r--usr/local/www/interfaces_gif_edit.php2
-rw-r--r--usr/local/www/interfaces_gre_edit.php2
-rw-r--r--usr/local/www/interfaces_lagg_edit.php2
-rwxr-xr-xusr/local/www/interfaces_vlan_edit.php2
-rw-r--r--usr/local/www/javascript/jquery.js2
12 files changed, 14 insertions, 14 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 154e312..55c29ce 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -320,7 +320,7 @@ function filter_configure_sync($delete_states_if_needed = true) {
echo "pfctl done at $mt\n";
}
/*
- * check for a error while loading the rules file. if an error has occured
+ * check for a error while loading the rules file. if an error has occurred
* then output the contents of the error to the caller
*/
if($rules_loading <> 0) {
diff --git a/etc/inc/simplepie/simplepie.inc b/etc/inc/simplepie/simplepie.inc
index 8fd3c62..7052eb4 100644
--- a/etc/inc/simplepie/simplepie.inc
+++ b/etc/inc/simplepie/simplepie.inc
@@ -1817,7 +1817,7 @@ function embed_wmedia(width, height, link) {
}
/**
- * Return the error message for the occured error
+ * Return the error message for the occurred error
*
* @access public
* @return string Error message
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index c5362c3..318eaf4 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -107,7 +107,7 @@ function carp_check_version($url, $username, $password, $port = 80, $method = 'p
/* send our XMLRPC message and timeout after 240 seconds */
$resp = $cli->send($msg, "240");
if(!is_object($resp)) {
- $error = "A communications error occured while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
+ $error = "A communications error occurred while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
} elseif($resp->faultCode()) {
$error = "An error code was received while attempting XMLRPC sync with username {$username} {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
} else {
@@ -247,7 +247,7 @@ function carp_sync_xml($url, $username, $password, $sections, $port = 80, $metho
/* send our XMLRPC message and timeout after 240 seconds */
$resp = $cli->send($msg, "240");
if(!is_object($resp)) {
- $error = "A communications error occured while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
+ $error = "A communications error occurred while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
log_error($error);
file_notice("sync_settings", $error, "Settings Sync", "");
} elseif($resp->faultCode()) {
@@ -420,7 +420,7 @@ if (is_array($config['hasync'])) {
$resp = $cli->send($msg, "900");
if (!is_object($resp)) {
- $error = "A communications error occured while attempting Filter sync with username {$username} {$synchronizetoip}:{$port}.";
+ $error = "A communications error occurred while attempting Filter sync with username {$username} {$synchronizetoip}:{$port}.";
log_error($error);
file_notice("sync_settings", $error, "Settings Sync", "");
} elseif($resp->faultCode()) {
diff --git a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
index 4f5d033..0ef4608 100644
--- a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
+++ b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
@@ -14692,7 +14692,7 @@ msgstr ""
#: usr/local/www/interfaces_lagg_edit.php:114
#: usr/local/www/interfaces_gif_edit.php:114
#: usr/local/www/interfaces_bridge_edit.php:217
-msgid "Error occured creating interface, please retry."
+msgid "Error occurred creating interface, please retry."
msgstr ""
#: usr/local/www/interfaces_bridge_edit.php:253
diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
index 401944f..0e65013 100644
--- a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
@@ -12570,7 +12570,7 @@ msgstr ""
#: usr/local/www/interfaces_lagg_edit.php:114
#: usr/local/www/interfaces_gif_edit.php:114
#: usr/local/www/interfaces_bridge_edit.php:217
-msgid "Error occured creating interface, please retry."
+msgid "Error occurred creating interface, please retry."
msgstr "Um erro ocorreu ao criar a interface. Por favor, tente novamente."
#: usr/local/www/interfaces_bridge_edit.php:253
diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
index 2986542..64a59f2 100644
--- a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
@@ -12928,7 +12928,7 @@ msgstr ""
#: usr/local/www/interfaces_lagg_edit.php:114
#: usr/local/www/interfaces_gif_edit.php:114
#: usr/local/www/interfaces_bridge_edit.php:217
-msgid "Error occured creating interface, please retry."
+msgid "Error occurred creating interface, please retry."
msgstr ""
"Arabirim oluşturulurken bir hata meydana geldi, lütfen tekrar deneyiniz."
diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php
index 61e7159..1565abc 100644
--- a/usr/local/www/interfaces_bridge_edit.php
+++ b/usr/local/www/interfaces_bridge_edit.php
@@ -214,7 +214,7 @@ if ($_POST) {
$bridge['bridgeif'] = $_POST['bridgeif'];
interface_bridge_configure($bridge);
if ($bridge['bridgeif'] == "" || !stristr($bridge['bridgeif'], "bridge"))
- $input_errors[] = gettext("Error occured creating interface, please retry.");
+ $input_errors[] = gettext("Error occurred creating interface, please retry.");
else {
if (isset($id) && $a_bridges[$id])
$a_bridges[$id] = $bridge;
diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php
index 2283280..b5eb89c 100644
--- a/usr/local/www/interfaces_gif_edit.php
+++ b/usr/local/www/interfaces_gif_edit.php
@@ -111,7 +111,7 @@ if ($_POST) {
$gif['gifif'] = interface_gif_configure($gif);
if ($gif['gifif'] == "" || !stristr($gif['gifif'], "gif"))
- $input_errors[] = gettext("Error occured creating interface, please retry.");
+ $input_errors[] = gettext("Error occurred creating interface, please retry.");
else {
if (isset($id) && $a_gifs[$id])
$a_gifs[$id] = $gif;
diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php
index 74b57d8..4551aa0 100644
--- a/usr/local/www/interfaces_gre_edit.php
+++ b/usr/local/www/interfaces_gre_edit.php
@@ -105,7 +105,7 @@ if ($_POST) {
$gre['greif'] = interface_gre_configure($gre);
if ($gre['greif'] == "" || !stristr($gre['greif'], "gre"))
- $input_errors[] = gettext("Error occured creating interface, please retry.");
+ $input_errors[] = gettext("Error occurred creating interface, please retry.");
else {
if (isset($id) && $a_gres[$id])
$a_gres[$id] = $gre;
diff --git a/usr/local/www/interfaces_lagg_edit.php b/usr/local/www/interfaces_lagg_edit.php
index a6f3617..1a1d468 100644
--- a/usr/local/www/interfaces_lagg_edit.php
+++ b/usr/local/www/interfaces_lagg_edit.php
@@ -111,7 +111,7 @@ if ($_POST) {
$lagg['laggif'] = interface_lagg_configure($lagg);
if ($lagg['laggif'] == "" || !stristr($lagg['laggif'], "lagg"))
- $input_errors[] = gettext("Error occured creating interface, please retry.");
+ $input_errors[] = gettext("Error occurred creating interface, please retry.");
else {
if (isset($id) && $a_laggs[$id])
$a_laggs[$id] = $lagg;
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 21884fe..524f9f3 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -121,7 +121,7 @@ if ($_POST) {
$vlan['vlanif'] = interface_vlan_configure($vlan);
if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan"))
- $input_errors[] = gettext("Error occured creating interface, please retry.");
+ $input_errors[] = gettext("Error occurred creating interface, please retry.");
else {
if (isset($id) && $a_vlans[$id])
$a_vlans[$id] = $vlan;
diff --git a/usr/local/www/javascript/jquery.js b/usr/local/www/javascript/jquery.js
index 7883c5c..e375a10 100644
--- a/usr/local/www/javascript/jquery.js
+++ b/usr/local/www/javascript/jquery.js
@@ -7878,7 +7878,7 @@ if ( jQuery.support.ajax ) {
xml;
// Firefox throws exceptions when accessing properties
- // of an xhr when a network error occured
+ // of an xhr when a network error occurred
// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
try {
OpenPOWER on IntegriCloud