Tweaks to text

Touches page titles, some table headers (capitalisation mostly), menu items.

application/controllers/Accumulated.php

@@ -14,7 +14,7 @@ class Accumulated extends CI_Controller {
     public function index()
     {
         // Render Page
-        $data['page_title'] = "Accumulated statistics";
+        $data['page_title'] = "Accumulated Statistics";
 
         $this->load->model('Accumulate_model');
 

application/controllers/Awards.php

@@ -174,7 +174,7 @@ class Awards extends CI_Controller {
         $data['type'] = $type;
 
         // Render Page
-        $data['page_title'] = "VUCC - band";
+        $data['page_title'] = "VUCC - " .$band . " Band";
         $data['filter'] = "band ".$band;
         $data['band'] = $band;
         $this->load->view('interface_assets/header', $data);

application/controllers/Contesting.php

@@ -33,7 +33,7 @@ class Contesting extends CI_Controller {
         $this->form_validation->set_rules('start_time', 'Time', 'required');
         $this->form_validation->set_rules('callsign', 'Callsign', 'required');
 
-            $data['page_title'] = "Contest logging";
+            $data['page_title'] = "Contest Logging";
 
             $this->load->view('interface_assets/header', $data);
             $this->load->view('contesting/index');

application/controllers/Distances.php

@@ -14,7 +14,7 @@ class Distances extends CI_Controller {
     public function index()
     {
         // Render Page
-        $data['page_title'] = "Distances worked";
+        $data['page_title'] = "Distances Worked";
 
         function js_str($s)
         {

application/controllers/Kml.php

@@ -99,7 +99,7 @@ class Kml extends CI_Controller {
 
 		if ( ! write_file('kml/qsos.kml', $output))
 		{
-		     echo 'Unable to write the file - Make sure the folder KML has write permissions.';
+		     echo 'Unable to write the file. Make sure the folder KML has write permissions.';
 		}
 		else
 		{

application/language/english/general_words_lang.php

@@ -29,7 +29,7 @@ $lang['gen_hamradio_call'] = 'Call';
 $lang['gen_hamradio_callsign'] = 'Callsign';
 $lang['gen_hamradio_mode'] = 'Mode';
 $lang['gen_hamradio_rst_sent'] = 'Sent';
-$lang['gen_hamradio_rst_recv'] = 'Recv';
+$lang['gen_hamradio_rst_recv'] = 'Recv\'d';
 $lang['gen_hamradio_band'] = 'Band';
 
 // Dashboard Words

application/views/awards/cq/index.php

@@ -84,7 +84,7 @@
 
             <!-- Multiple Checkboxes (inline) -->
             <div class="form-group row">
-                <div class="col-md-2" for="checkboxes">Worked / confirmed</div>
+                <div class="col-md-2" for="checkboxes">Worked / Confirmed</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="worked" id="worked" value="1" <?php if ($this->input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >

application/views/awards/dxcc/index.php

@@ -17,7 +17,7 @@
 
             <!-- Multiple Checkboxes (inline) -->
             <div class="form-group row">
-                <div class="col-md-2" for="checkboxes">Worked / confirmed</div>
+                <div class="col-md-2" for="checkboxes">Worked / Confirmed</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="worked" id="worked" value="1" <?php if ($this->input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >

application/views/awards/iota/index.php

@@ -18,7 +18,7 @@
 
             <!-- Multiple Checkboxes (inline) -->
             <div class="form-group row">
-                <div class="col-md-2" for="checkboxes">Worked / confirmed</div>
+                <div class="col-md-2" for="checkboxes">Worked / Confirmed</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="worked" id="worked" value="1" <?php if ($this->input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >

application/views/awards/sota/index.php

@@ -10,7 +10,7 @@
 		<td>Callsign</td>
 		<td>Band</td>
 		<td>RST Sent</td>
-		<td>RST Recvd</td>
+		<td>RST Received</td>
 	</tr>
 	
 	<?php

application/views/awards/vucc/index.php

@@ -5,8 +5,8 @@
             <thead>
             <tr>
                 <td>Band</td>
-                <td>Grids worked</td>
+                <td>Grids Worked</td>
-                <td>Grids confirmed</td>
+                <td>Grids Confirmed</td>
             </tr>
             </thead>
             <tbody>

application/views/awards/wab/index.php

@@ -10,7 +10,7 @@
 		<td>Callsign</td>
 		<td>Band</td>
 		<td>RST Sent</td>
-		<td>RST Recvd</td>
+		<td>RST Received</td>
 	</tr>
 	
 	<?php

application/views/awards/wacral/index.php

@@ -10,7 +10,7 @@
 		<td>Callsign</td>
 		<td>Band</td>
 		<td>RST Sent</td>
-		<td>RST Recvd</td>
+		<td>RST Received</td>
 	</tr>
 	
 	<?php

application/views/awards/was/index.php

@@ -7,7 +7,7 @@
 
             <!-- Multiple Checkboxes (inline) -->
             <div class="form-group row">
-                <div class="col-md-2" for="checkboxes">Worked / confirmed</div>
+                <div class="col-md-2" for="checkboxes">Worked / Confirmed</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="worked" id="worked" value="1" <?php if ($this->input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >

application/views/contesting/index.php

@@ -4,13 +4,13 @@
 
         <div class="col-sm-12 col-md-12">
             <div class="card">
-                <div class="card-header"><h5 class="card-title">Logging form</h5></div>
+                <div class="card-header"><h5 class="card-title">Logging Form</h5></div>
                 <div class="card-body">
                     <form id="qso_input" name="qsos">
 
                             <div class="form-group row">
 
-                                    <label class="col-auto control-label" for="radio">Exchange type</label>
+                                    <label class="col-auto control-label" for="radio">Exchange Type</label>
                                     <div class="col-auto">
                                         <div class="form-check form-check-inline">
                                             <input class="form-check-input" type="radio" name="exchangeradio" id="serial" value="serial" checked>
@@ -379,7 +379,7 @@
                                         </div>
                                 </div>
                             <button type="reset" class="btn btn-sm btn-warning" onclick="reset_log_fields()">Reset</button>
-                            <button type="button" class="btn btn-sm btn-primary" onclick="logQso();"><i class="fas fa-save"></i> Log QSO</button>
+                            <button type="button" class="btn btn-sm btn-primary" onclick="logQso();"><i class="fas fa-save"></i> Save QSO</button>
                             </div>
 
                         </div>
@@ -396,7 +396,7 @@
             </div>
 
             <div class="card log">
-                <div class="card-header"><h5 class="card-title">Logbook (for this logging session)</h5></div>
+                <div class="card-header"><h5 class="card-title">Contest Logbook (Only for this session)</h5></div>
 
                         <table class="table-sm table qsotable table-bordered table-hover table-striped table-condensed text-center">
                             <thead>

application/views/export/index.php

@@ -6,7 +6,7 @@
 	<h3>Data Types</h3>
 	
 	<ul>
-		<li><a href="<?php echo site_url('kml'); ?>">All QSOs as a KML File</a></li>
+		<li><a href="<?php echo site_url('kml'); ?>">All QSOs as KML</a></li>
 		<li><a href="<?php echo site_url('adif/export'); ?>">ADIF Export</a></li>
 	</ul>
 </div>

application/views/interface_assets/footer.php

@@ -1353,7 +1353,7 @@ $(document).ready(function(){
                           renderTo: 'graphcontainer'
                       },
                       title: {
-                          text: 'Distance distribution'
+                          text: 'Distance Distribution'
                       },
                       xAxis: {
                           categories: [],
@@ -2305,7 +2305,7 @@ $(document).ready(function(){
                     renderTo: 'container'
                 },
                 title: {
-                    text: 'Time distribution'
+                    text: 'Time Distribution'
                 },
                 xAxis: {
                     categories: [],

application/views/interface_assets/header.php

@@ -67,7 +67,7 @@
 							<div class="dropdown-divider"></div>
 							<a class="dropdown-item" href="<?php echo site_url('qso?manual=1');?>" title="Log QSO made in the past">Post QSO</a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="<?php echo site_url('contesting');?>" title="Log contest QSOs">Contest logging</a>
+                            <a class="dropdown-item" href="<?php echo site_url('contesting');?>" title="Log contest QSOs">Contest Logging</a>
                             <div class="dropdown-divider"></div>
                             <a class="dropdown-item" href="<?php echo site_url('qsl');?>" title="QSL"> View QSL</a>
 						</div>
@@ -83,13 +83,13 @@
 					<div class="dropdown-divider"></div>
 					<a class="dropdown-item" href="<?php echo site_url('gridsquares');?>" title="Gridsquares">Gridsquares</a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('distances');?>" title="Distances">Distances worked</a>
+                    <a class="dropdown-item" href="<?php echo site_url('distances');?>" title="Distances">Distances Worked</a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('dayswithqso');?>" title="Dayswithqso">Days with QSOs</a>
+                    <a class="dropdown-item" href="<?php echo site_url('dayswithqso');?>" title="Days with QSOs">Days with QSOs</a>
                     <div class="dropdown-divider"></div>
                     <a class="dropdown-item" href="<?php echo site_url('timeline');?>" title="Timeline">Timeline</a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('accumulated');?>" title="Accumulated statistics">Accumulated statistics</a>
+                    <a class="dropdown-item" href="<?php echo site_url('accumulated');?>" title="Accumulated Statistics">Accumulated Statistics</a>
                     <div class="dropdown-divider"></div>
                     <a class="dropdown-item" href="<?php echo site_url('timeplotter');?>" title="View time when worked">Timeplotter</a>
 					<div class="dropdown-divider"></div>

application/views/kml/index.php

@@ -8,7 +8,7 @@
         </div>
 
         <div class="alert alert-warning" role="alert">
-            Only QSOs with a gridsquare defined, is exported!
+            Only QSOs with a gridsquare defined will be exported!
         </div>
 
         <div class="card-body">

application/views/map/qsos.php

@@ -1,6 +1,6 @@
 <div class="container map-QSOs">
 
-	<h2><?php echo $station_profile->station_profile_name; ?> Station Profile QSOs (All)</h2>
+	<h2>Map: All QSOs for "<?php echo $station_profile->station_profile_name; ?>" Station Profile</h2>
 
 	<?php if($this->session->flashdata('notice')) { ?>
 	<div class="alert alert-info" role="alert">
@@ -12,4 +12,4 @@
 	<!-- Map -->
 	<div id="map" style="width: 100%; height: 700px;"></div> 
 
-    <div class="alert alert-success" role="alert">Showing All QSOs for Active Station Profile - <?php echo $station_profile->station_profile_name; ?> </div>
+    <div class="alert alert-success" role="alert">Showing all QSOs for the active Station Profile: <?php echo $station_profile->station_profile_name; ?> </div>

application/views/notes/add.php

@@ -45,7 +45,7 @@
 		<textarea name="content" style="display:none" id="hiddenArea"></textarea>
 	</div>
 
-	<button type="submit" value="Submit" class="btn btn-primary">Save</button>
+	<button type="submit" value="Submit" class="btn btn-primary">Save Note</button>
 	</form>
   </div>
 </div>

application/views/notes/edit.php

@@ -47,7 +47,7 @@
 	</div>
 
 	<input type="hidden" name="id" value="<?php echo $id; ?>" />
-	<button type="submit" value="Submit" class="btn btn-primary">Save</button>
+	<button type="submit" value="Submit" class="btn btn-primary">Save Note</button>
 	</form>
   </div>
 

application/views/options/index.php

@@ -10,7 +10,7 @@
             <div class="card">
                 <div class="card-header"><h2 class="card-title"><?php echo $page_title; ?></h2></div>
                 <div class="card-body">
-                    <p>Cloudlog Options are global settings used for all users of the installation, which are overriddden if theres a setting on a user level.</p>
+                    <p>Cloudlog Options are global settings used for all users of the installation, which are overriddden if there's a setting on a user level.</p>
                 </div>
             </div>
 

application/views/qso/index.php

@@ -468,7 +468,7 @@
                 <td>Call</td>
                 <td>Mode</td>
                 <td>Sent</td>
-                <td>Recv</td>
+                <td>Recv'd</td>
                 <td>Band</td>
               </tr>
 

application/views/search/filter.php

@@ -56,7 +56,7 @@
 					<td>Call</td>
 					<td>Mode</td>
 					<td>Sent</td>
-					<td>Recv</td>
+					<td>Recv'd</td>
 					<td>Band</td>
 					<td>Country</td>
 					<td></td>

application/views/search/result_search.php

@@ -7,7 +7,7 @@
 			<td>Call</td>
 			<td>Mode</td>
 			<td>Sent</td>
-			<td>Recv</td>
+			<td>Recv'd</td>
 			<td>Band</td>
 			<td>Country</td>
 			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>

application/views/statistics/custom_result.php

@@ -87,7 +87,7 @@
 			<td>Call</td>
 			<td>Mode</td>
 			<td>Sent</td>
-			<td>Recv</td>
+			<td>Recv'd</td>
 			<td>Band</td>
 			<td>Country</td>
 		</tr>

application/views/timeline/index.php

@@ -117,7 +117,7 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect,
                         <td>Prefix</td>
                         <td>Country</td>
                         <td>Deleted</td>
-                        <td>End date</td>
+                        <td>End Date</td>
                         <td>Show QSOs</td>
                     </tr>
                 </thead>

application/views/view_log/partial/log.php

@@ -8,7 +8,7 @@
 			<td>Call</td>
 			<td>Mode</td>
 			<td>Sent</td>
-			<td>Recv</td>
+			<td>Recv'd</td>
 			<td>Band</td>
 			<td>Country</td>
 			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>

application/views/view_log/partial/log_ajax.php

@@ -8,7 +8,7 @@
             <td>Call</td>
             <td>Mode</td>
             <td>Sent</td>
-            <td>Recv</td>
+            <td>Recv'd</td>
             <td>Band</td>
             <td>Country</td>
             <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>

application/views/view_log/qso.php

@@ -90,7 +90,7 @@
                     </tr>
 
                     <tr>
-                        <td>RST Recv:</td>
+                        <td>RST Recv'd:</td>
                         <td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX) { ?>(<?php echo $row->COL_SRX;?>)<?php } ?> <?php if ($row->COL_SRX_STRING) { ?>(<?php echo $row->COL_SRX_STRING;?>)<?php } ?></td>
                     </tr>