diff --git a/include/class.config.php b/include/class.config.php
index 277741525d9bc3760b784052a362b53c53f6483a..8f10d777aa31df72875c9704d359c9a85416f9c2 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -1089,7 +1089,7 @@ class OsticketConfig extends Config {
return $this->updateKBSettings($vars, $errors);
break;
default:
- $errors['err']=__('Unknown setting option. Get technical support.');
+ $errors['err']=sprintf('%s - %s', __('Unknown setting option'), __('Get technical help!'));
}
return false;
diff --git a/include/class.email.php b/include/class.email.php
index 2cd7fe3efd78f6ac310f7bb08b2c9e94d9643abb..c1542113e4b7056ce1a9e578a96b2c7da76642fe 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -248,7 +248,7 @@ class Email extends VerySimpleModel {
$id = isset($this->email_id) ? $this->getId() : 0;
if($id && $id!=$vars['id'])
- $errors['err']=__('Get technical help.')
+ $errors['err']=__('Get technical help!')
.' '.__('Internal error occurred');
if(!$vars['email'] || !Validator::is_email($vars['email'])) {
@@ -274,7 +274,7 @@ class Email extends VerySimpleModel {
&& $vars['userid']
&& !Crypto::encrypt($vars['passwd'], SECRET_SALT, $vars['userid'])
)
- $errors['passwd'] = __('Unable to encrypt password - get technical support');
+ $errors['passwd'] = sprintf('%s - %s', __('Unable to encrypt password'), __('Get technical help!'));
}
list($vars['mail_protocol'], $encryption) = explode('/', $vars['mail_proto']);
diff --git a/include/upgrader/aborted.inc.php b/include/upgrader/aborted.inc.php
index 846d5cd7238567a9243b92e1cc65ff711e4e9a7b..c34a4e7d2bd6d4403017205165da604e135f81a1 100644
--- a/include/upgrader/aborted.inc.php
+++ b/include/upgrader/aborted.inc.php
@@ -17,7 +17,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access D
echo sprintf('<li>%s</li>',$error);
echo '</ul>';
} else {
- echo '<b><font color="red">'.__('Internal error occurred - get technical help.').'</font></b>';
+ echo '<b><font color="red">'.__('Internal error occurred').' - '.__('Get technical help!').'</font></b>';
}
?>
<p><b><?php echo sprintf(__('For details - please view %s or check your email.'),
diff --git a/main.inc.php b/main.inc.php
index e92ec4a71d3e59876361fba0aa8446328b383779..383156038acea34b4d6e56352df0b508e9136fd1 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -31,7 +31,7 @@ Bootstrap::connect();
$_SERVER['REMOTE_ADDR'] = osTicket::get_client_ip();
if(!($ost=osTicket::start()) || !($cfg = $ost->getConfig()))
-Bootstrap::croak(__('Unable to load config info from DB. Get tech support.'));
+Bootstrap::croak(__('Unable to load config info from DB.').' '.__('Get technical help!'));
//Init
$session = $ost->getSession();
diff --git a/scp/apikeys.php b/scp/apikeys.php
index 9d9336a30b2f41a25b7126842b98d9d753b7f335..1f84789a96341b0ece254d610aac8dd2f28df434 100644
--- a/scp/apikeys.php
+++ b/scp/apikeys.php
@@ -96,7 +96,7 @@ if($_POST){
_N('selected API key', 'selected API keys', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/banlist.php b/scp/banlist.php
index 7dafe2f157db8f453b2fee8c60490f40b2aef4e2..a905f6853bae552ca99f33e46684e12073ea0ce7 100644
--- a/scp/banlist.php
+++ b/scp/banlist.php
@@ -123,7 +123,7 @@ if($_POST && !$errors && $filter){
break;
default:
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/categories.php b/scp/categories.php
index 22e9fab69dffbcbd7fe5da0075c82863aaedfb6f..bea8e9a24cf8a730471d9ba9c73b3d827aa46627 100644
--- a/scp/categories.php
+++ b/scp/categories.php
@@ -111,7 +111,7 @@ if($_POST){
_N('selected category', 'selected categories', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/departments.php b/scp/departments.php
index 45cafc6532e5b9900aa2f177e21159bc6a7bf295..c1d860488f991d92291f73c0102bf16e0647964a 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -118,7 +118,7 @@ if($_POST){
}
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/emails.php b/scp/emails.php
index f19e655761019f3c63338bc377c9b89dc1c3dbfe..b119d11b456ec7a6960c86ce82b57f21f02f475f 100644
--- a/scp/emails.php
+++ b/scp/emails.php
@@ -73,7 +73,7 @@ if($_POST){
break;
default:
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/filters.php b/scp/filters.php
index b8b0d634d105a2a19c48651a4a4fd91788af862d..9e4d63193bfa370b53ca3135d5c2b16c5d7e20ae 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -103,7 +103,7 @@ if($_POST){
_N('selected ticket filter', 'selected ticket filters', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/helptopics.php b/scp/helptopics.php
index 2dd0dc7fe8174b4ef96b6f52a7f870a760af2a3c..b00c231d500211a30c4ea30d35a2b8c87a7b38d4 100644
--- a/scp/helptopics.php
+++ b/scp/helptopics.php
@@ -135,7 +135,7 @@ if($_POST){
}
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/js/scp.js b/scp/js/scp.js
index ae2512f63f921854e78ec117e9061d2bfe5eaadf..c825c051cc64764435c33debafd976b3c0c53324 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -93,7 +93,7 @@ var scp_prep = function() {
else
formObj = $(this).closest('form');
if($('.dialog#confirm-action p#'+name+'-confirm').length === 0) {
- alert('Unknown action '+name+' - get technical help.');
+ alert('Unknown action '+name+' - Get technical help!');
} else if(checkbox_checker(formObj, 1)) {
var action = name;
$('.dialog#confirm-action').undelegate('.confirm');
diff --git a/scp/logs.php b/scp/logs.php
index 26767bd58a335a6961a9ab1895364487d527056a..7e4eea9f945e4d66c81dc06c0886a6e689c82a40 100644
--- a/scp/logs.php
+++ b/scp/logs.php
@@ -38,7 +38,7 @@ if($_POST){
$errors['err']=sprintf(__('Unable to delete %s.'),
_N('selected log entry', 'selected log entries', $count));
} else {
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/orgs.php b/scp/orgs.php
index d08400fc91f25da6cca5e99c4098e7b38c74e563..8a70dcf2b61562fdda3fb9807410af9d5ffe9987 100644
--- a/scp/orgs.php
+++ b/scp/orgs.php
@@ -78,7 +78,7 @@ if ($_POST) {
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
if (!$errors['err'] && !$count) {
$errors['err'] = __('Unable to manage any of the selected organizations');
diff --git a/scp/pages.php b/scp/pages.php
index 31b3cab3bb1dc1f87d81e8b6767811dc0e9c05c9..c7dc6a068df5c00707021eccd1e4f41f66846dcc 100644
--- a/scp/pages.php
+++ b/scp/pages.php
@@ -107,7 +107,7 @@ if($_POST) {
_N('selected site page', 'selected site pages', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/slas.php b/scp/slas.php
index 61bab1e556e1913202f3d5b0054f8bbd4f162ac1..22e3e44e679cdb637193f0b36eb09e1ebdc69272 100644
--- a/scp/slas.php
+++ b/scp/slas.php
@@ -114,7 +114,7 @@ if($_POST){
_N('selected SLA plan', 'selected SLA plans', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/staff.inc.php b/scp/staff.inc.php
index e486cde88b72018c1464c3bc5b94240c482a4420..a91b15a2f370bfcb5481f537a3bb3010d6657908 100644
--- a/scp/staff.inc.php
+++ b/scp/staff.inc.php
@@ -15,7 +15,7 @@
**********************************************************************/
if(basename($_SERVER['SCRIPT_NAME'])==basename(__FILE__)) die('Access denied'); //Say hi to our friend..
-if(!file_exists('../main.inc.php')) die('Fatal error... get technical support');
+if(!file_exists('../main.inc.php')) die('Fatal error... Get technical help!');
require_once('../main.inc.php');
diff --git a/scp/staff.php b/scp/staff.php
index 5ee374366f74a87fb97bb8af0d20f34fe29c3e52..9b2f4a999c6b6d65b10077dc3ededd2769129a89 100644
--- a/scp/staff.php
+++ b/scp/staff.php
@@ -158,7 +158,7 @@ if($_POST){
break;
default:
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
diff --git a/scp/teams.php b/scp/teams.php
index 600d1488338a4a1e107178c9d4ae391eb1ef0686..8f154b97cac453c5b750322e5f2e03a3c769952a 100644
--- a/scp/teams.php
+++ b/scp/teams.php
@@ -110,7 +110,7 @@ if($_POST){
_N('selected team', 'selected teams', $count));
break;
default:
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/templates.php b/scp/templates.php
index e5a8decd0e57583f4a8bb97cd54d4575e7ebfc6b..929e220d5a7c5894d4e226d829f43d6043b0b00a 100644
--- a/scp/templates.php
+++ b/scp/templates.php
@@ -146,7 +146,7 @@ if($_POST){
_N('selected template set', 'selected template sets', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/users.php b/scp/users.php
index 4223f651f4fa8d8ef1d5a5b5cd95a3a289dba341..047d0f91cdc1229c465673be570a6bf109c8db02 100644
--- a/scp/users.php
+++ b/scp/users.php
@@ -126,7 +126,7 @@ if ($_POST) {
case 'setorg':
if (!($org = Organization::lookup($_POST['org_id'])))
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
foreach ($users as $U) {
if ($U->setOrganization($org))
$count++;
@@ -134,7 +134,7 @@ if ($_POST) {
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
if (!$errors['err'] && !$count) {
$errors['err'] = __('Unable to manage any of the selected end users');