From 6e2253139bcb1b3d1e3bac760d19ba245681504d Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 25 Jun 2014 15:41:20 -0500
Subject: [PATCH] Fix some consistency issues

---
 include/ajax.tickets.php              |  2 +-
 include/class.email.php               |  2 +-
 include/class.mailfetch.php           |  8 +++---
 include/class.pagenate.php            | 35 ++++++++++++++-------------
 include/staff/apikey.inc.php          | 10 ++++----
 include/staff/banlist.inc.php         |  6 ++---
 include/staff/banrule.inc.php         |  2 +-
 include/staff/cannedresponse.inc.php  |  4 +--
 include/staff/cannedresponses.inc.php |  2 +-
 include/staff/categories.inc.php      |  2 +-
 include/staff/category.inc.php        |  2 +-
 include/staff/department.inc.php      | 10 ++++----
 include/staff/departments.inc.php     |  2 +-
 include/staff/emails.inc.php          |  2 +-
 include/staff/filter.inc.php          | 14 +++++------
 include/staff/filters.inc.php         |  2 +-
 include/staff/group.inc.php           |  4 +--
 include/staff/groups.inc.php          |  2 +-
 include/staff/helptopic.inc.php       | 10 ++++----
 include/staff/slaplan.inc.php         |  8 +++---
 include/staff/staffmembers.inc.php    |  2 +-
 scp/apikeys.php                       |  2 +-
 scp/banlist.php                       |  2 +-
 scp/departments.php                   |  2 +-
 scp/emails.php                        |  2 +-
 scp/filters.php                       |  2 +-
 scp/logs.php                          |  2 +-
 scp/profile.php                       |  2 +-
 scp/settings.php                      |  2 +-
 scp/tickets.php                       |  4 +--
 scp/upgrade.php                       |  2 +-
 setup/inc/class.installer.php         |  4 +--
 32 files changed, 79 insertions(+), 78 deletions(-)

diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
index 0533975b4..c32f170d0 100644
--- a/include/ajax.tickets.php
+++ b/include/ajax.tickets.php
@@ -251,7 +251,7 @@ class TicketsAjaxAPI extends AjaxController {
             $uid = md5($_SERVER['QUERY_STRING']);
             $_SESSION["adv_$uid"] = $tickets;
             $result['success'] = sprintf(__("Search criteria matched %s"),
-                    _N('%d tickets', '%d ticket', count($tickets)))
+                    _N('%d ticket', '%d tickets', count($tickets)))
                 . " - <a href='tickets.php?advsid=$uid'>".__('view')."</a>";
         } else {
             $result['fail']=__('No tickets found matching your search criteria.');
diff --git a/include/class.email.php b/include/class.email.php
index 4ccc6b2d5..699d37a2e 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -294,7 +294,7 @@ class Email {
             if(!$vars['mail_fetchmax'] || !is_numeric($vars['mail_fetchmax']))
                 $errors['mail_fetchmax']=__('Maximum emails required');
             if(!$vars['dept_id'] || !is_numeric($vars['dept_id']))
-                $errors['dept_id']=__('You must select a Dept.');
+                $errors['dept_id']=__('You must select a department');
             if(!$vars['priority_id'])
                 $errors['priority_id']=__('You must select a priority');
 
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 293dbb924..89edc4285 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -851,10 +851,10 @@ class MailFetcher {
                 db_query('UPDATE '.EMAIL_TABLE.' SET mail_errors=mail_errors+1, mail_lasterror=NOW() WHERE email_id='.db_input($emailId));
                 if (++$errors>=$MAXERRORS) {
                     //We've reached the MAX consecutive errors...will attempt logins at delayed intervals
-                    $msg="\n".__('osTicket is having trouble fetching emails from the following mail account:')." \n".
-                        "\n".__('User:')." ".$fetcher->getUsername().
-                        "\n".__('Host:')." ".$fetcher->getHost().
-                        "\n".__('Error:')." ".$fetcher->getLastError().
+                    $msg="\n".__('osTicket is having trouble fetching emails from the following mail account').": \n".
+                        "\n".__('User').": ".$fetcher->getUsername().
+                        "\n".__('Host').": ".$fetcher->getHost().
+                        "\n".__('Error').": ".$fetcher->getLastError().
                         "\n\n ".sprintf(__('%1$d consecutive errors. Maximum of %2$d allowed'), $errors, $MAXERRORS).
                         "\n\n ".sprintf(__('This could be connection issues related to the mail server. Next delayed login attempt in aprox. %d minutes'),$TIMEOUT);
                     $ost->alertAdmin(__('Mail Fetch Failure Alert'), $msg, true);
diff --git a/include/class.pagenate.php b/include/class.pagenate.php
index f711bd0b9..361d21f89 100644
--- a/include/class.pagenate.php
+++ b/include/class.pagenate.php
@@ -15,13 +15,13 @@
 **********************************************************************/
 
 class PageNate {
-    
+
     var $start;
     var $limit;
     var $total;
     var $page;
     var $pages;
-    
+
 
     function PageNate($total,$page,$limit=20,$url='') {
         $this->total = intval($total);
@@ -29,7 +29,7 @@ class PageNate {
         $this->page  = max($page, 1 );
         $this->start = max((($page-1)*$this->limit),0);
         $this->pages = ceil( $this->total / $this->limit );
-        
+
         if (($this->limit > $this->total) || ($this->page>ceil($this->total/$this->limit))) {
             $this->start = 0;
         }
@@ -55,16 +55,16 @@ class PageNate {
     function getLimit() {
         return $this->limit;
     }
-    
-    
+
+
     function getNumPages(){
         return $this->pages;
     }
-  
+
     function getPage() {
         return ceil(($this->start+1)/$this->limit);
     }
-    
+
     function showing() {
         $html = '';
         $from= $this->start+1;
@@ -75,13 +75,14 @@ class PageNate {
         }
         $html="&nbsp;".__('Showing')."&nbsp;&nbsp;";
         if ($this->total > 0) {
-            $html .= "$from - $to ".__('of')." " .$this->total;
+            $html .= sprintf(__('%1$d - %2$d of %3$d' /* Used in pagination output */),
+               $from, $to, $this->total);
         }else{
             $html .= " 0 ";
         }
         return $html;
     }
-    
+
     function getPageLinks() {
         $html                 = '';
         $file                =$this->url;
@@ -91,15 +92,15 @@ class PageNate {
 
         $last=$this_page-1;
         $next=$this_page+1;
-        
+
         $start_loop         = floor($this_page-$displayed_span);
         $stop_loop          = ceil($this_page + $displayed_span);
-       
-        
-        
+
+
+
         $stopcredit    =($start_loop<1)?0-$start_loop:0;
         $startcredit   =($stop_loop>$total_pages)?$stop_loop-$total_pages:0;
-        
+
         $start_loop =($start_loop-$startcredit>0)?$start_loop-$startcredit:1;
         $stop_loop  =($stop_loop+$stopcredit>$total_pages)?$total_pages:$stop_loop+$stopcredit;
 
@@ -107,7 +108,7 @@ class PageNate {
             $lastspan=($start_loop-$displayed_span>0)?$start_loop-$displayed_span:1;
             $html .= "\n<a href=\"$file&p=$lastspan\" ><strong>&laquo;</strong></a>";
         }
-        
+
         for ($i=$start_loop; $i <= $stop_loop; $i++) {
             $page = ($i - 1) * $this->limit;
             if ($i == $this_page) {
@@ -120,9 +121,9 @@ class PageNate {
             $nextspan=($stop_loop+$displayed_span>$total_pages)?$total_pages-$displayed_span:$stop_loop+$displayed_span;
             $html .= "\n<a href=\"$file&p=$nextspan\" ><strong>&raquo;</strong></a>";
         }
-        
 
-        
+
+
         return $html;
     }
 
diff --git a/include/staff/apikey.inc.php b/include/staff/apikey.inc.php
index 3d2bb753b..1e6f845cf 100644
--- a/include/staff/apikey.inc.php
+++ b/include/staff/apikey.inc.php
@@ -38,7 +38,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
     <tbody>
         <tr>
             <td width="150" class="required">
-                <?php echo __('Status:');?>
+                <?php echo __('Status');?>:
             </td>
             <td>
                 <input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong><?php echo __('Active');?></strong>
@@ -49,7 +49,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         <?php if($api){ ?>
         <tr>
             <td width="150">
-                <?php echo __('IP Address:');?>
+                <?php echo __('IP Address');?>:
             </td>
             <td>
                 <span>
@@ -60,14 +60,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="150">
-                <?php echo __('API Key:');?>
+                <?php echo __('API Key');?>:
             </td>
             <td><?php echo $api->getKey(); ?> &nbsp;</td>
         </tr>
         <?php }else{ ?>
         <tr>
             <td width="150" class="required">
-               <?php echo __('IP Address:');?>
+               <?php echo __('IP Address');?>:
             </td>
             <td>
                 <span>
@@ -80,7 +80,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         <?php } ?>
         <tr>
             <th colspan="2">
-                <em><strong><?php echo __('Services:');?></strong> <?php echo __('Check applicable API services enabled for the key.');?></em>
+                <em><strong><?php echo __('Services');?>:</strong> <?php echo __('Check applicable API services enabled for the key.');?></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/banlist.inc.php b/include/staff/banlist.inc.php
index 51d19d78a..89f4309b2 100644
--- a/include/staff/banlist.inc.php
+++ b/include/staff/banlist.inc.php
@@ -53,7 +53,7 @@ $query="$select $from $where ORDER BY $order_by LIMIT ".$pageNav->getStart().","
     <form action="banlist.php" method="GET" name="filter">
      <input type="hidden" name="a" value="filter" >
      <div>
-       <?php echo __('Query:');?> <input name="q" type="text" size="20" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>">
+       <?php echo __('Query');?>: <input name="q" type="text" size="20" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>">
         &nbsp;&nbsp;
         <input type="submit" name="submit" value="<?php echo __('Search');?>"/>
      </div>
@@ -68,7 +68,7 @@ else
     $showing=__('No banned emails matching the query found!');
 
 if($search)
-    $showing=__('Search Results:').' '.$showing;
+    $showing=__('Search Results').': '.$showing;
 
 ?>
 <form action="banlist.php" method="POST" name="banlist">
@@ -111,7 +111,7 @@ if($search)
      <tr>
         <td colspan="5">
             <?php if($res && $num){ ?>
-            <?php echo __('Select:');?>&nbsp;
+            <?php echo __('Select');?>:&nbsp;
             <a id="selectAll" href="#ckb"><?php echo __('All');?></a>&nbsp;&nbsp;
             <a id="selectNone" href="#ckb"><?php echo __('None');?></a>&nbsp;&nbsp;
             <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>&nbsp;&nbsp;
diff --git a/include/staff/banrule.inc.php b/include/staff/banrule.inc.php
index fdc0aab29..b3fe52347 100644
--- a/include/staff/banrule.inc.php
+++ b/include/staff/banrule.inc.php
@@ -32,7 +32,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         <tr>
             <th colspan="2">
                 <h4><?php echo $title; ?></h4>
-                <em><?php echo __('Valid email address required.');?></em>
+                <em><?php echo __('Valid email address required');?></em>
             </th>
         </tr>
     </thead>
diff --git a/include/staff/cannedresponse.inc.php b/include/staff/cannedresponse.inc.php
index 65a2f574e..f2842292d 100644
--- a/include/staff/cannedresponse.inc.php
+++ b/include/staff/cannedresponse.inc.php
@@ -41,7 +41,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
     </thead>
     <tbody>
         <tr>
-            <td width="180" class="required"><?php echo __('Status:');?></td>
+            <td width="180" class="required"><?php echo __('Status');?>:</td>
             <td>
                 <label><input type="radio" name="isenabled" value="1" <?php
                     echo $info['isenabled']?'checked="checked"':''; ?>>&nbsp;<?php echo __('Active'); ?>&nbsp;</label>
@@ -52,7 +52,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
         </tr>
         <tr>
-            <td width="180" class="required"><?php echo __('Department:');?></td>
+            <td width="180" class="required"><?php echo __('Department');?>:</td>
             <td>
                 <select name="dept_id">
                     <option value="0">&mdash; <?php echo __('All Departments');?> &mdash;</option>
diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index fdd01b196..853242f98 100644
--- a/include/staff/cannedresponses.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -99,7 +99,7 @@ else
      <tr>
         <td colspan="5">
             <?php if($res && $num){ ?>
-            <?php echo __('Select:');?>&nbsp;
+            <?php echo __('Select');?>:&nbsp;
             <a id="selectAll" href="#ckb"><?php echo __('All');?></a>&nbsp;&nbsp;
             <a id="selectNone" href="#ckb"><?php echo __('None');?></a>&nbsp;&nbsp;
             <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>&nbsp;&nbsp;
diff --git a/include/staff/categories.inc.php b/include/staff/categories.inc.php
index f64476a92..82f504998 100644
--- a/include/staff/categories.inc.php
+++ b/include/staff/categories.inc.php
@@ -93,7 +93,7 @@ else
      <tr>
         <td colspan="5">
             <?php if($res && $num){ ?>
-            <?php echo __('Select:');?>&nbsp;
+            <?php echo __('Select');?>:&nbsp;
             <a id="selectAll" href="#ckb"><?php echo __('All');?></a>&nbsp;&nbsp;
             <a id="selectNone" href="#ckb"><?php echo __('None');?></a>&nbsp;&nbsp;
             <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>&nbsp;&nbsp;
diff --git a/include/staff/category.inc.php b/include/staff/category.inc.php
index 3d51aa161..ff1ef1f93 100644
--- a/include/staff/category.inc.php
+++ b/include/staff/category.inc.php
@@ -41,7 +41,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </th>
         </tr>
         <tr>
-            <td width="180" class="required"><?php echo __('Category Type:');?></td>
+            <td width="180" class="required"><?php echo __('Category Type');?>:</td>
             <td>
                 <input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>><b><?php echo __('Public');?></b> <?php echo __('(publish)');?>
                 &nbsp;&nbsp;&nbsp;&nbsp;
diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php
index ca5183bc1..3437f72ae 100644
--- a/include/staff/department.inc.php
+++ b/include/staff/department.inc.php
@@ -44,7 +44,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
     <tbody>
         <tr>
             <td width="180" class="required">
-                <?php echo __('Name:');?>
+                <?php echo __('Name');?>:
             </td>
             <td>
                 <input type="text" size="30" name="name" value="<?php echo $info['name']; ?>">
@@ -53,12 +53,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180" class="required">
-                <?php echo __('Type:');?>
+                <?php echo __('Type');?>:
             </td>
             <td>
                 <input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>><strong><?php echo __('Public');?></strong>
                 &nbsp;
-                <input type="radio" name="ispublic" value="0" <?php echo !$info['ispublic']?'checked="checked"':''; ?>><strong><?php echo __('Private');?></strong> <?php echo __('(Internal)');?>
+                <input type="radio" name="ispublic" value="0" <?php echo !$info['ispublic']?'checked="checked"':''; ?>><strong><?php echo __('Private');?></strong> <?php echo mb_convert_case(__('(internal)'), MB_CASE_TITLE);?>
                 &nbsp;<i class="help-tip icon-question-sign" href="#type"></i>
             </td>
         </tr>
@@ -172,7 +172,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180">
-                <?php echo __('New Ticket:');?>
+                <?php echo __('New Ticket');?>:
             </td>
             <td>
                 <span>
@@ -185,7 +185,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180">
-                <?php echo __('New Message:');?>
+                <?php echo __('New Message');?>:
             </td>
             <td>
                 <span>
diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php
index c198fc043..288ba30c7 100644
--- a/include/staff/departments.inc.php
+++ b/include/staff/departments.inc.php
@@ -110,7 +110,7 @@ else
      <tr>
         <td colspan="6">
             <?php if($res && $num){ ?>
-            <?php echo __('Select:');?>&nbsp;
+            <?php echo __('Select');?>:&nbsp;
             <a id="selectAll" href="#ckb"><?php echo __('All');?></a>&nbsp;&nbsp;
             <a id="selectNone" href="#ckb"><?php echo __('None');?></a>&nbsp;&nbsp;
             <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>&nbsp;&nbsp;
diff --git a/include/staff/emails.inc.php b/include/staff/emails.inc.php
index 679f4cea7..862eb0b90 100644
--- a/include/staff/emails.inc.php
+++ b/include/staff/emails.inc.php
@@ -97,7 +97,7 @@ else
      <tr>
         <td colspan="6">
             <?php if($res && $num){ ?>
-            <?php echo __('Select:');?>&nbsp;
+            <?php echo __('Select');?>:&nbsp;
             <a id="selectAll" href="#ckb"><?php echo __('All');?></a>&nbsp;&nbsp;
             <a id="selectNone" href="#ckb"><?php echo __('None');?></a>&nbsp;&nbsp;
             <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>&nbsp;&nbsp;
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index 69cc2e61a..73724f98b 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -40,7 +40,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
     <tbody>
         <tr>
             <td width="180" class="required">
-              <?php echo __('Filter Name:');?>
+              <?php echo __('Filter Name');?>:
             </td>
             <td>
                 <input type="text" size="30" name="name" value="<?php echo $info['name']; ?>">
@@ -49,7 +49,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180" class="required">
-              <?php echo __('Execution Order:');?>
+              <?php echo __('Execution Order');?>:
             </td>
             <td>
                 <input type="text" size="6" name="execorder" value="<?php echo $info['execorder']; ?>">
@@ -112,7 +112,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td colspan=2>
-               <em><?php echo __('Rules Matching Criteria:');?></em>
+               <em><?php echo __('Rules Matching Criteria');?>:</em>
                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                 <input type="radio" name="match_all_rules" value="1" <?php echo $info['match_all_rules']?'checked="checked"':''; ?>><?php echo __('Match All');?>
                 &nbsp;&nbsp;&nbsp;
@@ -229,7 +229,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180">
-                <?php echo __('Department:');?>
+                <?php echo __('Department');?>:
             </td>
             <td>
                 <select name="dept_id">
@@ -249,7 +249,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180">
-                <?php echo __('Priority:');?>
+                <?php echo __('Priority');?>:
             </td>
             <td>
                 <select name="priority_id">
@@ -270,7 +270,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180">
-                <?php echo __('SLA Plan:');?>
+                <?php echo __('SLA Plan');?>:
             </td>
             <td>
                 <select name="sla_id">
@@ -290,7 +290,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180">
-                <?php echo __('Auto-assign To:');?>
+                <?php echo __('Auto-assign To');?>:
             </td>
             <td>
                 <select name="assign">
diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php
index 7d7e91a39..21b79cae0 100644
--- a/include/staff/filters.inc.php
+++ b/include/staff/filters.inc.php
@@ -98,7 +98,7 @@ else
      <tr>
         <td colspan="8">
             <?php if($res && $num){ ?>
-            <?php echo __('Select:');?>&nbsp;
+            <?php echo __('Select');?>:&nbsp;
             <a id="selectAll" href="#ckb"><?php echo __('All');?></a>&nbsp;&nbsp;
             <a id="selectNone" href="#ckb"><?php echo __('None');?></a>&nbsp;&nbsp;
             <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>&nbsp;&nbsp;
diff --git a/include/staff/group.inc.php b/include/staff/group.inc.php
index 7f8df8e3c..31e6819c1 100644
--- a/include/staff/group.inc.php
+++ b/include/staff/group.inc.php
@@ -38,7 +38,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
     <tbody>
         <tr>
             <td width="180" class="required">
-                <?php echo __('Name:');?>
+                <?php echo __('Name');?>:
             </td>
             <td>
                 <input type="text" size="30" name="name" value="<?php echo $info['name']; ?>">
@@ -47,7 +47,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180" class="required">
-                <?php echo __('Status:');?>
+                <?php echo __('Status');?>:
             </td>
             <td>
                 <input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong><?php echo __('Active');?></strong>
diff --git a/include/staff/groups.inc.php b/include/staff/groups.inc.php
index d1ea436b9..dc8304979 100644
--- a/include/staff/groups.inc.php
+++ b/include/staff/groups.inc.php
@@ -100,7 +100,7 @@ else
      <tr>
         <td colspan="7">
             <?php if($res && $num){ ?>
-            <?php echo __('Select:');?>&nbsp;
+            <?php echo __('Select');?>:&nbsp;
             <a id="selectAll" href="#ckb"><?php echo __('All');?></a>&nbsp;&nbsp;
             <a id="selectNone" href="#ckb"><?php echo __('None');?></a>&nbsp;&nbsp;
             <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>&nbsp;&nbsp;
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index 22410b1a5..b3bf3ae29 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -40,7 +40,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
     <tbody>
         <tr>
             <td width="180" class="required">
-               <?php echo __('Topic:');?>
+               <?php echo __('Topic');?>:
             </td>
             <td>
                 <input type="text" size="30" name="topic" value="<?php echo $info['topic']; ?>">
@@ -49,7 +49,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180" class="required">
-                <?php echo __('Status:');?>
+                <?php echo __('Status');?>:
             </td>
             <td>
                 <input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><?php echo __('Active'); ?>
@@ -59,7 +59,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180" class="required">
-                <?php echo __('Type:');?>
+                <?php echo __('Type');?>:
             </td>
             <td>
                 <input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>><?php echo __('Public'); ?>
@@ -69,7 +69,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180">
-                <?php echo __('Parent Topic:');?>
+                <?php echo __('Parent Topic');?>:
             </td>
             <td>
                 <select name="topic_pid">
@@ -152,7 +152,7 @@ if ($info['form_id'] == Topic::FORM_USE_PARENT) echo 'selected="selected"';
         </tr>
         <tr>
             <td width="180">
-                <?php echo __('SLA Plan:');?>:
+                <?php echo __('SLA Plan');?>:
             </td>
             <td>
                 <select name="sla_id">
diff --git a/include/staff/slaplan.inc.php b/include/staff/slaplan.inc.php
index 4c0ab218f..a8b9dcd2a 100644
--- a/include/staff/slaplan.inc.php
+++ b/include/staff/slaplan.inc.php
@@ -38,7 +38,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
     <tbody>
         <tr>
             <td width="180" class="required">
-              <?php echo __('Name:');?>
+              <?php echo __('Name');?>:
             </td>
             <td>
                 <input type="text" size="30" name="name" value="<?php echo $info['name']; ?>">
@@ -47,7 +47,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180" class="required">
-              <?php echo __('Grace Period:');?>
+              <?php echo __('Grace Period');?>:
             </td>
             <td>
                 <input type="text" size="10" name="grace_period" value="<?php echo $info['grace_period']; ?>">
@@ -57,7 +57,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180" class="required">
-                <?php echo __('Status:');?>
+                <?php echo __('Status');?>:
             </td>
             <td>
                 <input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong><?php echo __('Active');?></strong>
@@ -77,7 +77,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180">
-                <?php echo __('Ticket Overdue Alerts:');?>
+                <?php echo __('Ticket Overdue Alerts');?>:
             </td>
             <td>
                 <input type="checkbox" name="disable_overdue_alerts" value="1" <?php echo $info['disable_overdue_alerts']?'checked="checked"':''; ?> >
diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php
index 07bcd6c7f..efd2e61ff 100644
--- a/include/staff/staffmembers.inc.php
+++ b/include/staff/staffmembers.inc.php
@@ -125,7 +125,7 @@ else
         <tr>
             <th width="7px">&nbsp;</th>
             <th width="200"><a <?php echo $name_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th>
-            <th width="100"><a <?php echo $username_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=username"><?php echo __('UserName');?></a></th>
+            <th width="100"><a <?php echo $username_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=username"><?php echo __('Username');?></a></th>
             <th width="100"><a  <?php echo $status_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th>
             <th width="120"><a  <?php echo $group_sort; ?>href="staff.php?<?php echo $qstr; ?>&sort=group"><?php echo __('Group');?></a></th>
             <th width="150"><a  <?php echo $dept_sort; ?>href="staff.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th>
diff --git a/scp/apikeys.php b/scp/apikeys.php
index 9fc46ea16..1b10a7452 100644
--- a/scp/apikeys.php
+++ b/scp/apikeys.php
@@ -83,7 +83,7 @@ if($_POST){
                             $errors['err'] = __('Unable to delete selected API keys');
                         break;
                     default:
-                        $errors['err']=__('Unknown action - get technical help');
+                        $errors['err']=__('Unknown action - get technical help.');
                 }
             }
             break;
diff --git a/scp/banlist.php b/scp/banlist.php
index ba892fb92..211572128 100644
--- a/scp/banlist.php
+++ b/scp/banlist.php
@@ -111,7 +111,7 @@ if($_POST && !$errors && $filter){
 
                         break;
                     default:
-                        $errors['err'] = __('Unknown action - get technical help');
+                        $errors['err'] = __('Unknown action - get technical help.');
                 }
             }
             break;
diff --git a/scp/departments.php b/scp/departments.php
index 54cb8af61..76b7e609a 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -93,7 +93,7 @@ if($_POST){
                         }
                         break;
                     default:
-                        $errors['err']=__('Unknown action - get technical help');
+                        $errors['err']=__('Unknown action - get technical help.');
                 }
             }
             break;
diff --git a/scp/emails.php b/scp/emails.php
index ce3bd7274..ad3bcf571 100644
--- a/scp/emails.php
+++ b/scp/emails.php
@@ -67,7 +67,7 @@ if($_POST){
                         $errors['err'] = __('Unable to delete selected emails');
 
                 } else {
-                    $errors['err'] = __('Unknown action - get technical help');
+                    $errors['err'] = __('Unknown action - get technical help.');
                 }
             }
             break;
diff --git a/scp/filters.php b/scp/filters.php
index 30fc26a85..0521be3be 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -89,7 +89,7 @@ if($_POST){
                             $errors['err'] = __('Unable to delete selected filters');
                         break;
                     default:
-                        $errors['err']=__('Unknown action - get technical help');
+                        $errors['err']=__('Unknown action - get technical help.');
                 }
             }
             break;
diff --git a/scp/logs.php b/scp/logs.php
index d1a6bcc6c..c4e09ff3f 100644
--- a/scp/logs.php
+++ b/scp/logs.php
@@ -34,7 +34,7 @@ if($_POST){
                     } elseif(!$errors['err'])
                         $errors['err']=__('Unable to delete selected logs');
                 } else {
-                    $errors['err']=__('Unknown action - get technical help');
+                    $errors['err']=__('Unknown action - get technical help.');
                 }
             }
             break;
diff --git a/scp/profile.php b/scp/profile.php
index dffed07ef..41d3ea20d 100644
--- a/scp/profile.php
+++ b/scp/profile.php
@@ -23,7 +23,7 @@ if($_POST && $_POST['id']!=$thisstaff->getId()) { //Check dummy ID used on the f
 } elseif(!$errors && $_POST) { //Handle post
 
     if(!$staff)
-        $errors['err']=__('Unknown or invalid staff');
+        $errors['err']=__('Unknown or invalid staff.');
     elseif($staff->updateProfile($_POST,$errors)){
         $msg=__('Profile updated successfully');
         $thisstaff->reload();
diff --git a/scp/settings.php b/scp/settings.php
index 015bdc235..da250fa24 100644
--- a/scp/settings.php
+++ b/scp/settings.php
@@ -42,7 +42,7 @@ if (isset($settingOptions[$target]))
 
 if($page && $_POST && !$errors) {
     if($cfg && $cfg->updateSettings($_POST,$errors)) {
-        $msg=sprintf(__('%s Updated Successfully', Format::htmlchars($page[0])));
+        $msg=sprintf(__('%s Updated Successfully'), Format::htmlchars($page[0]));
         $cfg->reload();
     } elseif(!$errors['err']) {
         $errors['err']=__('Unable to update settings - correct errors below and try again');
diff --git a/scp/tickets.php b/scp/tickets.php
index cfbc886c9..bb7635d88 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -259,7 +259,7 @@ if($_POST && !$errors):
                     } elseif($ticket->isOpen()) {
                         $errors['err'] = __('Ticket is already open!');
                     } elseif($ticket->reopen()) {
-                        $msg=__('Ticket REOPENED');
+                        $msg=__('Ticket Reopened');
 
                         if($_POST['ticket_status_notes'])
                             $note = $_POST['ticket_status_notes'];
@@ -478,7 +478,7 @@ if($_POST && !$errors):
                             }
                             break;
                         default:
-                            $errors['err']=__('Unknown or unsupported action - get technical help');
+                            $errors['err']=__('Unknown or unsupported action - get technical help.');
                     }
                 }
                 break;
diff --git a/scp/upgrade.php b/scp/upgrade.php
index 5466d0bd0..f077c7e4f 100644
--- a/scp/upgrade.php
+++ b/scp/upgrade.php
@@ -48,7 +48,7 @@ if($_POST && $_POST['s'] && !$upgrader->isAborted()) {
             }
             break;
         default:
-            $errors['err']=__('Unknown action!');
+            $errors['err']=__('Unknown action');
     }
 }
 
diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php
index 3e90dd994..8fde38370 100644
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
@@ -84,14 +84,14 @@ class Installer extends SetupWizard {
         // Support port number specified in the hostname with a colon (:)
         list($host, $port) = explode(':', $vars['dbhost']);
         if ($port && is_numeric($port) && ($port < 1 || $port > 65535))
-            $this->errors['db'] = _('Invalid database port number');
+            $this->errors['db'] = __('Invalid database port number');
 
         //MYSQL: Connect to the DB and check the version & database (create database if it doesn't exist!)
         if(!$this->errors) {
             if(!db_connect($vars['dbhost'],$vars['dbuser'],$vars['dbpass']))
                 $this->errors['db']=sprintf(__('Unable to connect to MySQL server: %s'), db_connect_error());
             elseif(explode('.', db_version()) < explode('.', $this->getMySQLVersion()))
-                $this->errors['db']=sprintf(__('osTicket requires MySQL %s or later!',$this->getMySQLVersion()));
+                $this->errors['db']=sprintf(__('osTicket requires MySQL %s or later!'),$this->getMySQLVersion());
             elseif(!db_select_database($vars['dbname']) && !db_create_database($vars['dbname'])) {
                 $this->errors['dbname']=__("Database doesn't exist");
                 $this->errors['db']=__('Unable to create the database.');
-- 
GitLab