diff --git a/css/rtl.css b/css/rtl.css
index 7aea43b5262560a4b2bf671926eeab6e444315aa..a8a42fd0ddd02c59b352c9779a4f2c3087fa105c 100644
--- a/css/rtl.css
+++ b/css/rtl.css
@@ -27,10 +27,12 @@
right: auto;
left: 1em;
}
-.rtl #nav .inactive li {
+.rtl #nav .inactive li,
+.rtl #sub_nav li {
text-align: right;
}
-.rtl #nav .inactive li a {
+.rtl #nav .inactive li a,
+.rtl #sub_nav li a {
background-position: 100% 50%;
padding-left: 0;
padding-right: 24px;
@@ -39,6 +41,10 @@
left: auto;
right: -1px;
}
+.rtl #sub_nav li + li > a {
+ margin-left: 0;
+ margin-right: 10px;
+}
.rtl .tip_close {
right: auto;
left: 0.5em;
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 67c1ce7344da3e4a3cf83ec13fef0da89068bd0c..593846f58e9bbf1f4de9031b6ced47d59291c602 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -882,7 +882,7 @@ class Ticket {
// ticket, the ticket is opened and thereafter the status is set to
// the requested status).
if ($current_status = $this->getStatus()) {
- $note = sprintf(__('Status changed from %s to %s by %s'),
+ $note = sprintf(__('Status changed from %1$s to %2$s by %3$s'),
$this->getStatus(),
$status,
$thisstaff ?: 'SYSTEM');
diff --git a/include/client/profile.inc.php b/include/client/profile.inc.php
index 89fa70a095d56c8f68c54d2ae9beb0d23648e299..054267ac4b4e66445a15f4e9d348193afcc97117 100644
--- a/include/client/profile.inc.php
+++ b/include/client/profile.inc.php
@@ -44,7 +44,7 @@ if ($acct = $thisclient->getAccount()) {
<td>
<input type="checkbox" name="dst" value="1" <?php echo $info['dst']?'checked="checked"':''; ?>>
<?php echo __('Observe daylight saving'); ?>
- <em>(<?php __('Current Time'); ?>:
+ <em>(<?php echo __('Current Time'); ?>:
<strong><?php echo Format::date($cfg->getDateTimeFormat(),Misc::gmtime(),$info['tz_offset'],$info['dst']); ?></strong>)</em>
</td>
</tr>
diff --git a/include/i18n/en_US/help/tips/staff.agent.yaml b/include/i18n/en_US/help/tips/staff.agent.yaml
index 37fbe68478d27ac6bdd1ad380f16317404f2e346..298faa1bbe19ab208561d6949618eb88129987d2 100644
--- a/include/i18n/en_US/help/tips/staff.agent.yaml
+++ b/include/i18n/en_US/help/tips/staff.agent.yaml
@@ -13,14 +13,6 @@
# must match the HTML #ids put into the page template.
#
---
-add_new_agent:
- title: Add New Agent
- content: >
-
-agent_staff_information:
- title: Agent (Staff) Information
- content: >
-
username:
title: Username
content: >
diff --git a/include/i18n/en_US/help/tips/staff.agents.yaml b/include/i18n/en_US/help/tips/staff.agents.yaml
index e0dbf0e8c02fb632c40cfe3e64660ac7f68be446..f358b0532a048173b6fb37b3579c5b3857d33749 100644
--- a/include/i18n/en_US/help/tips/staff.agents.yaml
+++ b/include/i18n/en_US/help/tips/staff.agents.yaml
@@ -13,31 +13,3 @@
# must match the HTML #ids put into the page template.
#
---
-add_new_agent:
- title: Add New Agent
- content: >
-
-agents:
- title: Agents
- content: >
-
-name:
- title: Name
- content: >
-
-username:
- title: Username
- content: >
-
-status:
- title: Status
- content: >
-
-created:
- title: Created
- content: >
-
-last_login:
- title: Last Login
- content: >
-
diff --git a/include/i18n/en_US/help/tips/staff.departments.yaml b/include/i18n/en_US/help/tips/staff.departments.yaml
index 782aa58ec5a0c44d6054c37b4c7b5f16109744d5..63858a53e2c7ce710784fdeec85cab77b2342191 100644
--- a/include/i18n/en_US/help/tips/staff.departments.yaml
+++ b/include/i18n/en_US/help/tips/staff.departments.yaml
@@ -13,27 +13,11 @@
# must match the HTML #ids put into the page template.
#
---
-department:
- title: Department
- content: >
-
-name:
- title: Name
- content: >
-
type:
title: Type
content: >
If the Department’s Type is Private, then the Department Signature will not be available on response nor will the department assignment show from the Client Portal.
-users:
- title: Users
- content: >
-
-email_address:
- title: Email Address
- content: >
-
dept_manager:
title: Department Manager
content: >
diff --git a/include/staff/apikeys.inc.php b/include/staff/apikeys.inc.php
index ca0ab622aac2bca72bcb0739b647ec77dbd93128..030bc89f97d4aed9bebb7e8ce865845fbd5e4212 100644
--- a/include/staff/apikeys.inc.php
+++ b/include/staff/apikeys.inc.php
@@ -119,11 +119,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected API key', 'selected API keys', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected API key', 'selected API keys', 2)); ?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/banlist.inc.php b/include/staff/banlist.inc.php
index a858c227ba2fe8ccba4b2797343aeb43ef8d3f6b..9e69cf66577ad6ca9c3e8aef5e56406a3719b54a 100644
--- a/include/staff/banlist.inc.php
+++ b/include/staff/banlist.inc.php
@@ -145,11 +145,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected ban rule', 'selected ban rules', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected ban rule', 'selected ban rules', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index 65de3378bcee0989c2cd4a9ec1ce10d3a981f663..171f6977a71738bf722a82978a4fa86507f88bb8 100644
--- a/include/staff/cannedresponses.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -130,11 +130,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected canned response', 'selected canned responses', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected canned response', 'selected canned responses', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/categories.inc.php b/include/staff/categories.inc.php
index f561dcd1aca9aa8ad9fa5eca1e48c3349d3e9ae6..692443588ab37221e2fe872411aa24c36c3721c8 100644
--- a/include/staff/categories.inc.php
+++ b/include/staff/categories.inc.php
@@ -122,11 +122,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="make_public-confirm">
- <?php echo sprintf(__('Are you sure want to make %s <b>public</b>?'),
+ <?php echo sprintf(__('Are you sure you want to make %s <b>public</b>?'),
_N('selected category', 'selected categories', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="make_private-confirm">
- <?php echo sprintf(__('Are you sure want to make %s <b>private</b> (internal)?'),
+ <?php echo sprintf(__('Are you sure you want to make %s <b>private</b> (internal)?'),
_N('selected category', 'selected categories', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php
index 82e7b3a5a8b057ce044f80c31b54c2c61750f875..267b728a005019027b904c54a7c58422c4b88b5c 100644
--- a/include/staff/departments.inc.php
+++ b/include/staff/departments.inc.php
@@ -141,11 +141,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="make_public-confirm">
- <?php echo sprintf(__('Are you sure want to make %s <b>public</b>?'),
+ <?php echo sprintf(__('Are you sure you want to make %s <b>public</b>?'),
_N('selected department', 'selected departments', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="make_private-confirm">
- <?php echo sprintf(__('Are you sure want to make %s <b>private</b> (internal)?'),
+ <?php echo sprintf(__('Are you sure you want to make %s <b>private</b> (internal)?'),
_N('selected department', 'selected departments', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php
index 1c8561af6dd1b626fcb54c343eb09814636cb0ee..e3eac064393983561377441d9fefe92a8d75bd6c 100644
--- a/include/staff/filters.inc.php
+++ b/include/staff/filters.inc.php
@@ -129,11 +129,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected filter', 'selected filters', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected filter', 'selected filters', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/groups.inc.php b/include/staff/groups.inc.php
index 7c358fa23e04b724964a7e89504ff44512b0e40e..d7f5d55cf058167a51592e6189023318d1977127 100644
--- a/include/staff/groups.inc.php
+++ b/include/staff/groups.inc.php
@@ -131,11 +131,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected group', 'selected groups', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected group', 'selected groups', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/helptopics.inc.php b/include/staff/helptopics.inc.php
index d124a67a26f8118829b7758e7310dc42c01b2630..6f172e6971ebba6b082d84ca4ed5c3f46cd79749 100644
--- a/include/staff/helptopics.inc.php
+++ b/include/staff/helptopics.inc.php
@@ -148,11 +148,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected help topic', 'selected help topics', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected help topic', 'selected help topics', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/pages.inc.php b/include/staff/pages.inc.php
index 5f808b7b1987ee3773b8894335fac99b8bd806f2..4ee3646e3b86c494bd324b217db61ea0f95a1946 100644
--- a/include/staff/pages.inc.php
+++ b/include/staff/pages.inc.php
@@ -136,11 +136,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected site page', 'selected site pages', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected site page', 'selected site pages', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/plugins.inc.php b/include/staff/plugins.inc.php
index cd3282e4b030ad9ff728ccc916231c9083cb0d0b..ecca0e6ac93d7a3c86032cd3ce74d0496ff1182e 100644
--- a/include/staff/plugins.inc.php
+++ b/include/staff/plugins.inc.php
@@ -83,12 +83,12 @@ if ($count) //Show options..
</p>
<p class="confirm-action" style="display:none;" id="enable-confirm">
<font color="green"><?php echo sprintf(
- __('Are you sure want to <b>enable</b> %s?'),
+ __('Are you sure you want to <b>enable</b> %s?'),
_N('selected plugin', 'selected plugins', 2)); ?></font>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
<font color="red"><?php echo sprintf(
- __('Are you sure want to <b>disable</b> %s?'),
+ __('Are you sure you want to <b>disable</b> %s?'),
_N('selected plugin', 'selected plugins', 2)); ?></font>
</p>
<div><?php echo __('Please confirm to continue.'); ?></div>
diff --git a/include/staff/profile.inc.php b/include/staff/profile.inc.php
index a5daad3c52557183cc6d24a88fdf328cdb753b14..e9779b0e92e5f38a0ca556d1cdeba75c7dc40f6b 100644
--- a/include/staff/profile.inc.php
+++ b/include/staff/profile.inc.php
@@ -249,7 +249,7 @@ $info['id']=$staff->getId();
<td colspan=2>
<textarea class="richtext no-bar" name="signature" cols="21"
rows="5" style="width: 60%;"><?php echo $info['signature']; ?></textarea>
- <br><em><?php __('Signature is made available as a choice, on ticket reply.');?></em>
+ <br><em><?php echo __('Signature is made available as a choice, on ticket reply.');?></em>
</td>
</tr>
</tbody>
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index 30efbb4c5d084cbd44c5f4a48b915bf39e6afb11..7b609ce98033de2f0239fdcf204730e902281881 100644
--- a/include/staff/settings-system.inc.php
+++ b/include/staff/settings-system.inc.php
@@ -99,7 +99,8 @@ $gmtime = Misc::gmtime();
for ($i = 1; $i <=12; $i++) {
?>
<option <?php echo $config['log_graceperiod']==$i?'selected="selected"':''; ?> value="<?php echo $i; ?>">
- <?php echo __('After');?> <?php echo $i; ?> <?php echo ($i>1)?__('Months'):__('Month'); ?></option>
+ <?php echo sprintf(_N('After %d month', 'After %d months', $i), $i);?>
+ </option>
<?php
} ?>
</select>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index 0ae82c9d50ea7da1cd1346bff4361f4fd42af6d5..945daa56eeaf9491669a3e7221c4d335542f6e96 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -231,7 +231,9 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
</td>
</tr>
<tr>
- <td width="180"><?php echo __('Agent Maximum File Size');?>:</td>
+ <td width="180"><?php echo __(
+ // Maximum size for agent-uploaded files (via SCP)
+ 'Agent Maximum File Size');?>:</td>
<td>
<select name="max_file_size">
<option value="262144">— <?php echo __('Small'); ?> —</option>
diff --git a/include/staff/slaplans.inc.php b/include/staff/slaplans.inc.php
index f8f6a6400161594411c3ace879e0b380fbd2b157..b8f0b095f24c23062add377282625af766cd76c1 100644
--- a/include/staff/slaplans.inc.php
+++ b/include/staff/slaplans.inc.php
@@ -131,11 +131,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected SLA plan', 'selected SLA plans', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected SLA plan', 'selected SLA plans', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php
index c5c7eaee40e66a09ed509668fd5316f3dc0cdee0..05bd86d93710b7dec492de70fa2aaf9c27e0f2a6 100644
--- a/include/staff/staffmembers.inc.php
+++ b/include/staff/staffmembers.inc.php
@@ -205,11 +205,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> (unlock) %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> (unlock) %s?'),
_N('selected agent', 'selected agents', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> (lock) %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> (lock) %s?'),
_N('selected agent', 'selected agents', 2));?>
<br><br><?php echo __("Locked staff won't be able to login to Staff Control Panel.");?>
</p>
diff --git a/include/staff/teams.inc.php b/include/staff/teams.inc.php
index f18edbeacf431673f5cc54d84016ac5bd67c2fb8..b8ea0f24d0406a72b90ccd384769d2e9bb261aaf 100644
--- a/include/staff/teams.inc.php
+++ b/include/staff/teams.inc.php
@@ -126,11 +126,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected team', 'selected teams', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected team', 'selected teams', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/templates.inc.php b/include/staff/templates.inc.php
index 1c042fdd54e8652f0714079a375512c271cd3517..aece8b0648ce172b6f7b2dde4277c3632229408c 100644
--- a/include/staff/templates.inc.php
+++ b/include/staff/templates.inc.php
@@ -128,11 +128,11 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>enable</b> %s?'),
_N('selected template set', 'selected template sets', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>disable</b> %s?'),
_N('selected template set', 'selected template sets', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index c2608d4b7dc0367f781c6c324d9bff5469a583e3..68443b69e28df95a15b100ec0db60bc55976a30a 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -949,7 +949,7 @@ print $note_form->getField('attachments')->render();
<?php echo sprintf(Format::htmlchars(__('%s <%s> will longer have access to the ticket')),
'<b>'.Format::htmlchars($ticket->getName()).'</b>', Format::htmlchars($ticket->getEmail())); ?>
</span>
- <?php echo sprintf(__('Are you sure want to <b>change</b> ticket owner to %s?'),
+ <?php echo sprintf(__('Are you sure you want to <b>change</b> ticket owner to %s?'),
'<b><span id="newuser">this guy</span></b>'); ?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 6fa756e21ecf5a7948e9f02d74cb3658c62a7c6a..4db119a233c215da3735a5ab8228688b9a0fce90 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -531,7 +531,7 @@ if ($results) {
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="mark_overdue-confirm">
- <?php echo __('Are you sure want to flag the selected tickets as <font color="red"><b>overdue</b></font>?');?>
+ <?php echo __('Are you sure you want to flag the selected tickets as <font color="red"><b>overdue</b></font>?');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/user-view.inc.php b/include/staff/user-view.inc.php
index 1aa93662841de061f66862f95b43f93513013651..6660bbddf77c7c31da6b45e156bd92b9bf69ffac 100644
--- a/include/staff/user-view.inc.php
+++ b/include/staff/user-view.inc.php
@@ -150,18 +150,18 @@ include STAFFINC_DIR . 'templates/notes.tmpl.php';
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="banemail-confirm">
- <?php echo sprintf(__('Are you sure want to <b>ban</b> %s?'), $user->getEmail()); ?>
+ <?php echo sprintf(__('Are you sure you want to <b>ban</b> %s?'), $user->getEmail()); ?>
<br><br>
<?php echo __('New tickets from the email address will be auto-rejected.'); ?>
</p>
<p class="confirm-action" style="display:none;" id="confirmlink-confirm">
<?php echo sprintf(__(
- 'Are you sure want to send an <b>Account Activation Link</b> to <em> %s </em>?'),
+ 'Are you sure you want to send an <b>Account Activation Link</b> to <em> %s </em>?'),
$user->getEmail()); ?>
</p>
<p class="confirm-action" style="display:none;" id="pwreset-confirm">
<?php echo sprintf(__(
- 'Are you sure want to send a <b>Password Reset Link</b> to <em> %s </em>?'),
+ 'Are you sure you want to send a <b>Password Reset Link</b> to <em> %s </em>?'),
$user->getEmail()); ?>
</p>
<div><?php echo __('Please confirm to continue.'); ?></div>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index e77e9703fbd55189c14522cdf92db1979b8e0115..7be7e21822bbcfbbcd096ca1418b415d6e9592c4 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -141,6 +141,7 @@ div#header a {
line-height:26px;
border-left:1px solid #aaa;
border-right:1px solid #aaa;
+ white-space: nowrap;
}
#nav .active, #sub_nav li {