English Language Updates

Changes to provide consistency for English language.

cps/templates/admin.html

@@ -6,16 +6,16 @@
 <div class="container-fluid">
   <div class="row">
     <div class="col">
-      <h2>{{_('User list')}}</h2>
+      <h2>{{_('Users')}}</h2>
       <table class="table table-striped" id="table_user">
         <tr>
-            <th>{{_('Nickname')}}</th>
-            <th>{{_('E-mail')}}</th>
-            <th>{{_('Kindle')}}</th>
-            <th>{{_('DLS')}}</th>
+            <th>{{_('Username')}}</th>
+            <th>{{_('E-mail Address')}}</th>
+            <th>{{_('Send to Kindle E-mail Address')}}</th>
+            <th>{{_('Downloads')}}</th>
             <th class="hidden-xs">{{_('Admin')}}</th>
             <th class="hidden-xs">{{_('Download')}}</th>
-            <th class="hidden-xs">{{_('View Ebooks')}}</th>
+            <th class="hidden-xs">{{_('View eBooks')}}</th>
             <th class="hidden-xs">{{_('Upload')}}</th>
             <th class="hidden-xs">{{_('Edit')}}</th>
         </tr>
@@ -35,20 +35,20 @@
           {% endif %}
         {% endfor %}
       </table>
-      <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('admin.new_user')}}">{{_('Add new user')}}</a></div>
+      <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('admin.new_user')}}">{{_('Add New User')}}</a></div>
     </div>
   </div>
 
   <div class="row">
     <div class="col">
-      <h2>{{_('SMTP e-mail server settings')}}</h2>
+      <h2>{{_('E-mail Server Settings')}}</h2>
       <table class="table table-striped" id="table_email">
         <tr>
-          <th>{{_('SMTP hostname')}}</th>
-          <th>{{_('SMTP port')}}</th>
-          <th>{{_('SSL')}}</th>
-          <th>{{_('SMTP login')}}</th>
-          <th class="hidden-xs">{{_('From mail')}}</th>
+          <th>{{_('SMTP Hostname')}}</th>
+          <th>{{_('SMTP Port')}}</th>
+          <th>{{_('Encryption')}}</th>
+          <th>{{_('SMTP Login')}}</th>
+          <th class="hidden-xs">{{_('From E-mail')}}</th>
         </tr>
         <tr>
           <td>{{email.mail_server}}</td>
@@ -67,11 +67,11 @@
       <h2>{{_('Configuration')}}</h2>
       <div class="col-xs-12 col-sm-6">
         <div class="row">
-            <div class="col-xs-6 col-sm-6">{{_('Calibre DB dir')}}</div>
+            <div class="col-xs-6 col-sm-6">{{_('Calibre Database Directory')}}</div>
             <div class="col-xs-6 col-sm-6">{{config.config_calibre_dir}}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-6">{{_('Log level')}}</div>
+            <div class="col-xs-6 col-sm-6">{{_('Log Level')}}</div>
             <div class="col-xs-6 col-sm-6">{{config.get_log_level()}}</div>
         </div>
         <div class="row">
@@ -81,27 +81,27 @@
       </div>
       <div class="col-xs-12 col-sm-6">
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Books per page')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Books per Page')}}</div>
             <div class="col-xs-6 col-sm-5">{{config.config_books_per_page}}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Uploading')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Uploads')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_uploading) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Anonymous browsing')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Anonymous Browsing')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_anonbrowse) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Public Registration')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_public_reg) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Remote login')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Magic Link Remote Login')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_remote_login) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Reverse proxy login')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Reverse Proxy Login')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_allow_reverse_proxy_header_login) }}</div>
         </div>
         {% if config.config_allow_reverse_proxy_header_login %}
@@ -111,18 +111,18 @@
         </div>
         {% endif %}
       </div>
-      <div class="btn btn-default"><a id="basic_config" href="{{url_for('admin.configuration')}}">{{_('Basic Configuration')}}</a></div>
-      <div class="btn btn-default"><a id="view_config" href="{{url_for('admin.view_configuration')}}">{{_('UI Configuration')}}</a></div>
+      <div class="btn btn-default"><a id="basic_config" href="{{url_for('admin.configuration')}}">{{_('Edit Basic Configuration')}}</a></div>
+      <div class="btn btn-default"><a id="view_config" href="{{url_for('admin.view_configuration')}}">{{_('Edit UI Configuration')}}</a></div>
     </div>
   </div>
 
   <div class="row">
     <div class="col">
       <h2>{{_('Administration')}}</h2>
-      <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logfiles')}}</a></div>
-      <div class="btn btn-default" id="restart_database">{{_('Reconnect to Calibre DB')}}</div>
-      <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-Web')}}</div>
-      <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-Web')}}</div>
+      <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logs')}}</a></div>
+      <div class="btn btn-default" id="restart_database">{{_('Reconnect Calibre Database')}}</div>
+      <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
+      <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Shutdown')}}</div>
     </div>
   </div>
 
@@ -145,7 +145,7 @@
       </table>
 
       <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
-      <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>
+      <div class="btn btn-default" id="check_for_update">{{_('Check for Update')}}</div>
       <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#UpdateprogressDialog">{{_('Perform Update')}}</div>
     </div>
   </div>
@@ -158,13 +158,13 @@
     <div class="modal-content">
       <div class="modal-header bg-info"></div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to restart Calibre-Web?')}}</p>
+        <p>{{_('Are you sure you want to restart?')}}</p>
           <div id="spinner" class="spinner"  style="display:none;">
                 <img id="img-spinner" src="{{ url_for('static', filename='css/libs/images/loading-icon.gif') }}"/>
           </div>
           <p></p>
-        <button type="button" class="btn btn-default" id="restart" >{{_('Ok')}}</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+        <button type="button" class="btn btn-default" id="restart" >{{_('OK')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -176,9 +176,9 @@
       <div class="modal-header bg-info">
       </div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to stop Calibre-Web?')}}</p>
-        <button type="button" class="btn btn-default" id="shutdown" data-dismiss="modal">{{_('Ok')}}</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+        <p>{{_('Are you sure you want to shutdown?')}}</p>
+        <button type="button" class="btn btn-default" id="shutdown" data-dismiss="modal">{{_('OK')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -188,7 +188,7 @@
     <!-- Modal content-->
     <div class="modal-content">
       <div class="modal-header bg-info text-center">
-      <span>{{_('Updating, please do not reload page')}}</span>
+      <span>{{_('Updating, please do not reload this page')}}</span>
       </div>
       <div class="modal-body text-center">
           <div id="spinner2" class="spinner2"  style="display:none;">
@@ -197,7 +197,7 @@
           <p></p>
          <div id="Updatecontent"></div>
           <p></p>
-        <button type="button" class="btn btn-default hidden" id="updateFinished" data-dismiss="modal">{{_('Ok')}}</button>
+        <button type="button" class="btn btn-default hidden" id="updateFinished" data-dismiss="modal">{{_('OK')}}</button>
       </div>
     </div>
   </div>