Revision ab9dc5be
Added by Chris Buechler about 12 years ago
etc/inc/filter.inc | ||
---|---|---|
320 | 320 |
echo "pfctl done at $mt\n"; |
321 | 321 |
} |
322 | 322 |
/* |
323 |
* check for a error while loading the rules file. if an error has occured |
|
323 |
* check for a error while loading the rules file. if an error has occurred
|
|
324 | 324 |
* then output the contents of the error to the caller |
325 | 325 |
*/ |
326 | 326 |
if($rules_loading <> 0) { |
etc/inc/simplepie/simplepie.inc | ||
---|---|---|
1817 | 1817 |
} |
1818 | 1818 |
|
1819 | 1819 |
/** |
1820 |
* Return the error message for the occured error |
|
1820 |
* Return the error message for the occurred error
|
|
1821 | 1821 |
* |
1822 | 1822 |
* @access public |
1823 | 1823 |
* @return string Error message |
etc/rc.filter_synchronize | ||
---|---|---|
107 | 107 |
/* send our XMLRPC message and timeout after 240 seconds */ |
108 | 108 |
$resp = $cli->send($msg, "240"); |
109 | 109 |
if(!is_object($resp)) { |
110 |
$error = "A communications error occured while attempting XMLRPC sync with username {$username} {$url}:{$port}."; |
|
110 |
$error = "A communications error occurred while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
|
|
111 | 111 |
} elseif($resp->faultCode()) { |
112 | 112 |
$error = "An error code was received while attempting XMLRPC sync with username {$username} {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); |
113 | 113 |
} else { |
... | ... | |
247 | 247 |
/* send our XMLRPC message and timeout after 240 seconds */ |
248 | 248 |
$resp = $cli->send($msg, "240"); |
249 | 249 |
if(!is_object($resp)) { |
250 |
$error = "A communications error occured while attempting XMLRPC sync with username {$username} {$url}:{$port}."; |
|
250 |
$error = "A communications error occurred while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
|
|
251 | 251 |
log_error($error); |
252 | 252 |
file_notice("sync_settings", $error, "Settings Sync", ""); |
253 | 253 |
} elseif($resp->faultCode()) { |
... | ... | |
420 | 420 |
$resp = $cli->send($msg, "900"); |
421 | 421 |
|
422 | 422 |
if (!is_object($resp)) { |
423 |
$error = "A communications error occured while attempting Filter sync with username {$username} {$synchronizetoip}:{$port}."; |
|
423 |
$error = "A communications error occurred while attempting Filter sync with username {$username} {$synchronizetoip}:{$port}.";
|
|
424 | 424 |
log_error($error); |
425 | 425 |
file_notice("sync_settings", $error, "Settings Sync", ""); |
426 | 426 |
} elseif($resp->faultCode()) { |
usr/local/share/locale/en/LC_MESSAGES/pfSense.pot | ||
---|---|---|
14692 | 14692 |
#: usr/local/www/interfaces_lagg_edit.php:114 |
14693 | 14693 |
#: usr/local/www/interfaces_gif_edit.php:114 |
14694 | 14694 |
#: usr/local/www/interfaces_bridge_edit.php:217 |
14695 |
msgid "Error occured creating interface, please retry." |
|
14695 |
msgid "Error occurred creating interface, please retry."
|
|
14696 | 14696 |
msgstr "" |
14697 | 14697 |
|
14698 | 14698 |
#: usr/local/www/interfaces_bridge_edit.php:253 |
usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po | ||
---|---|---|
12570 | 12570 |
#: usr/local/www/interfaces_lagg_edit.php:114 |
12571 | 12571 |
#: usr/local/www/interfaces_gif_edit.php:114 |
12572 | 12572 |
#: usr/local/www/interfaces_bridge_edit.php:217 |
12573 |
msgid "Error occured creating interface, please retry." |
|
12573 |
msgid "Error occurred creating interface, please retry."
|
|
12574 | 12574 |
msgstr "Um erro ocorreu ao criar a interface. Por favor, tente novamente." |
12575 | 12575 |
|
12576 | 12576 |
#: usr/local/www/interfaces_bridge_edit.php:253 |
usr/local/share/locale/tr/LC_MESSAGES/pfSense.po | ||
---|---|---|
12928 | 12928 |
#: usr/local/www/interfaces_lagg_edit.php:114 |
12929 | 12929 |
#: usr/local/www/interfaces_gif_edit.php:114 |
12930 | 12930 |
#: usr/local/www/interfaces_bridge_edit.php:217 |
12931 |
msgid "Error occured creating interface, please retry." |
|
12931 |
msgid "Error occurred creating interface, please retry."
|
|
12932 | 12932 |
msgstr "" |
12933 | 12933 |
"Arabirim oluşturulurken bir hata meydana geldi, lütfen tekrar deneyiniz." |
12934 | 12934 |
|
usr/local/www/interfaces_bridge_edit.php | ||
---|---|---|
214 | 214 |
$bridge['bridgeif'] = $_POST['bridgeif']; |
215 | 215 |
interface_bridge_configure($bridge); |
216 | 216 |
if ($bridge['bridgeif'] == "" || !stristr($bridge['bridgeif'], "bridge")) |
217 |
$input_errors[] = gettext("Error occured creating interface, please retry."); |
|
217 |
$input_errors[] = gettext("Error occurred creating interface, please retry.");
|
|
218 | 218 |
else { |
219 | 219 |
if (isset($id) && $a_bridges[$id]) |
220 | 220 |
$a_bridges[$id] = $bridge; |
usr/local/www/interfaces_gif_edit.php | ||
---|---|---|
111 | 111 |
|
112 | 112 |
$gif['gifif'] = interface_gif_configure($gif); |
113 | 113 |
if ($gif['gifif'] == "" || !stristr($gif['gifif'], "gif")) |
114 |
$input_errors[] = gettext("Error occured creating interface, please retry."); |
|
114 |
$input_errors[] = gettext("Error occurred creating interface, please retry.");
|
|
115 | 115 |
else { |
116 | 116 |
if (isset($id) && $a_gifs[$id]) |
117 | 117 |
$a_gifs[$id] = $gif; |
usr/local/www/interfaces_gre_edit.php | ||
---|---|---|
105 | 105 |
|
106 | 106 |
$gre['greif'] = interface_gre_configure($gre); |
107 | 107 |
if ($gre['greif'] == "" || !stristr($gre['greif'], "gre")) |
108 |
$input_errors[] = gettext("Error occured creating interface, please retry."); |
|
108 |
$input_errors[] = gettext("Error occurred creating interface, please retry.");
|
|
109 | 109 |
else { |
110 | 110 |
if (isset($id) && $a_gres[$id]) |
111 | 111 |
$a_gres[$id] = $gre; |
usr/local/www/interfaces_lagg_edit.php | ||
---|---|---|
111 | 111 |
|
112 | 112 |
$lagg['laggif'] = interface_lagg_configure($lagg); |
113 | 113 |
if ($lagg['laggif'] == "" || !stristr($lagg['laggif'], "lagg")) |
114 |
$input_errors[] = gettext("Error occured creating interface, please retry."); |
|
114 |
$input_errors[] = gettext("Error occurred creating interface, please retry.");
|
|
115 | 115 |
else { |
116 | 116 |
if (isset($id) && $a_laggs[$id]) |
117 | 117 |
$a_laggs[$id] = $lagg; |
usr/local/www/interfaces_vlan_edit.php | ||
---|---|---|
121 | 121 |
|
122 | 122 |
$vlan['vlanif'] = interface_vlan_configure($vlan); |
123 | 123 |
if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan")) |
124 |
$input_errors[] = gettext("Error occured creating interface, please retry."); |
|
124 |
$input_errors[] = gettext("Error occurred creating interface, please retry.");
|
|
125 | 125 |
else { |
126 | 126 |
if (isset($id) && $a_vlans[$id]) |
127 | 127 |
$a_vlans[$id] = $vlan; |
usr/local/www/javascript/jquery.js | ||
---|---|---|
7878 | 7878 |
xml; |
7879 | 7879 |
|
7880 | 7880 |
// Firefox throws exceptions when accessing properties |
7881 |
// of an xhr when a network error occured |
|
7881 |
// of an xhr when a network error occurred
|
|
7882 | 7882 |
// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) |
7883 | 7883 |
try { |
7884 | 7884 |
|
Also available in: Unified diff
fix text - s/occured/occurred/