Merge branch 'ui-sshkey' into 1.2.0-rc-hotfix

Author: Kristan Kenney

web/inc/i18n/en.php

@@ -771,14 +771,15 @@
     'Avoid adding web domains on admin account' => 'It is strongly advised to create a standard user account before adding web domains to the server due to the increased privileges the admin account possesses and potential security risks involved.',
 
     //SSH Key
-    'Field SSH_KEY can not be blank.' => 'Field SSH Key may not be blank',
+    'Field SSH_KEY can not be blank.' => 'Field SSH Key must not be blank',
     'SSH KEY is invalid' => 'SSH key is invalid',
-    'SSH KEY already exists' => 'SSH key already exsits',
+    'SSH KEY already exists' => 'SSH key already exists',
     'SSH KEY Added' => 'SSH key has been added',
     'Add SSH Key' => 'Add SSH key',
     'SSH KEY' => 'SSH Key',    
-    'DELETE_KEY_CONFIRM' => 'Are you sure you want to delete key %s?',
-    'SSH_ID' => 'SSH Id',
+    'DELETE_KEY_CONFIRM' => 'Are you sure you want to delete SSH key %s?',
+    'SSH_ID' => 'SSH ID',
+    'Manage SSH keys' => 'Manage SSH keys',
 
     //Header 
     'Fm' => 'Files',

web/templates/admin/edit_user.html

@@ -2,7 +2,7 @@
         <div class="l-sort clearfix">
           <div class="l-unit-toolbar__buttonstrip">
             <a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
-            <a href="/list/key" id="btn-create" class="ui-button cancel" title="<?=__('SSH_KEY');?>"><i class="fas fa-key status-icon green"></i><?=__('SSH KEY')?></a>
+            <a href="/list/key" id="btn-create" class="ui-button cancel" title="<?=__('Manage SSH keys');?>"><i class="fas fa-key status-icon green"></i><?=__('Manage SSH keys')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>

web/templates/admin/list_key.html

@@ -1,6 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
+            <a class="ui-button cancel" id="btn-back" href="javascript:history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
         <?php
         	 echo '<a href="/add/key/" id="btn-create" class="ui-button cancel" title="'.__('Add SSH Key').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add SSH Key').'</a>';
         ?>