diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php
index 1a61fb34b..0e5b85545 100644
--- a/application/controllers/Awards.php
+++ b/application/controllers/Awards.php
@@ -531,23 +531,23 @@ class Awards extends CI_Controller {
 
 		// Render Page
 		$data['page_title'] = __("Log View")." - " . $type;
-		$data['filter'] = (($type != $band) ? $type : '')." ".$searchphrase.__("and band")." ".$band;
+		$data['filter'] = (($type != $band) ? $type : '')." ".$searchphrase.__(" and band ").$band;
 		if ($band == 'SAT') {
 			if ($sat != 'All' && $sat != null) {
-				$data['filter'] .= " " . __("and satellite")." ".$sat;
+				$data['filter'] .= __(" and satellite ").$sat;
 			}
 			if ($orbit != 'All' && $orbit != null) {
-				$data['filter'] .= " " . __("and orbit type")." ".$orbit;
+				$data['filter'] .= __(" and orbit type ").$orbit;
 			}
 		}
 		if ($propagation != '' && $propagation != null) {
-			$data['filter'] .= " " . __("and propagation")." ".$propagation;
+			$data['filter'] .= __(" and propagation ").$propagation;
 		}
 		if ($mode != null && strtolower($mode) != 'all') {
-			$data['filter'] .= " " . __("and mode")." ".strtoupper($mode);
+			$data['filter'] .= __(" and mode ").strtoupper($mode);
 		}
 		if (!empty($qsltype)) {
-			$data['filter'] .= " " . __("and")." ".implode('/', $qsltype);
+			$data['filter'] .= __(" and ").implode('/', $qsltype);
 		}
 		$data['ispopup'] = true;
 		$this->load->view('awards/details', $data);
@@ -984,7 +984,7 @@ class Awards extends CI_Controller {
 
     public function gridmaster($dxcc) {
       $dxcc = $this->security->xss_clean($dxcc);
-      $data['page_title'] = __("Awards")." - ".strtoupper($dxcc)." Gridmaster";
+      $data['page_title'] = __("Awards - ").strtoupper($dxcc)." Gridmaster";
 
       $this->load->model('bands');
       $this->load->model('gridmap_model');
@@ -1239,7 +1239,7 @@ class Awards extends CI_Controller {
 		$data['type'] = $type;
 
 		// Render page
-		$data['page_title'] = __("Awards - SIG") . " - ".$type;
+		$data['page_title'] = __("Awards - SIG - ") . $type;
 		$this->load->view('interface_assets/header', $data);
 		$this->load->view('awards/sig/qso_list');
 		$this->load->view('interface_assets/footer');
diff --git a/application/controllers/Callstats.php b/application/controllers/Callstats.php
index ad33531bd..b813a60d1 100644
--- a/application/controllers/Callstats.php
+++ b/application/controllers/Callstats.php
@@ -98,23 +98,23 @@ class Callstats extends CI_Controller
 
 		// Render Page
 		$data['page_title'] = __("Log View");
-		$data['filter'] = " ".$searchphrase.__("and band")." ".$band;
+		$data['filter'] = $searchphrase.__(" and band ").$band;
 		if ($band == 'SAT') {
 			if ($sat != 'All' && $sat != null) {
-				$data['filter'] .= " " . __("and sat")." ".$sat;
+				$data['filter'] .= __(" and sat ").$sat;
 			}
 			if ($orbit != 'All' && $orbit != null) {
-				$data['filter'] .= " " . __("and orbit type")." ".$orbit;
+				$data['filter'] .= __(" and orbit type ").$orbit;
 			}
 		}
 		if ($propagation != '' && $propagation != null) {
-			$data['filter'] .= " " . __("and propagation")." ".$propagation;
+			$data['filter'] .= __(" and propagation ").$propagation;
 		}
 		if ($mode != null && strtolower($mode) != 'all') {
-			$data['filter'] .= " " . __("and mode")." ".$mode;
+			$data['filter'] .= __(" and mode ").$mode;
 		}
 		if (!empty($qsltype)) {
-			$data['filter'] .= " " . __("and")." ".implode('/', $qsltype);
+			$data['filter'] .= __(" and ").implode('/', $qsltype);
 		}
 		$this->load->view('awards/details', $data);
 	}
diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php
index 387f04fb6..be067fa9a 100644
--- a/application/controllers/Eqsl.php
+++ b/application/controllers/Eqsl.php
@@ -482,7 +482,7 @@ class eqsl extends CI_Controller {
 				}
 			}
 			$data['eqsl_results'] = $eqsl_results;
-			$data['eqsl_stats'] = __("Successfully downloaded:") . " " . $i . " / "__("Errors") . ": " . count($eqsl_results);
+			$data['eqsl_stats'] = __("Successfully downloaded: ") . $i . __(" / Errors: ") . count($eqsl_results);
 			$data['page_title'] = "eQSL Download Information";
 
 			$this->load->view('interface_assets/header', $data);
diff --git a/application/controllers/Options.php b/application/controllers/Options.php
index cef95bc43..0c3d1fca1 100644
--- a/application/controllers/Options.php
+++ b/application/controllers/Options.php
@@ -141,7 +141,7 @@ class Options extends CI_Controller {
 		} else {
 			$hon_url_update = $this->optionslib->update('hon_url', $this->input->post('hon_url'), 'yes');
 			if($hon_url_update == TRUE) {
-				$this->session->set_flashdata('success', __("Hams-Of-Note URL changed to").": ".$this->input->post('hon_url',true));
+				$this->session->set_flashdata('success', __("Hams-Of-Note URL changed to ").$this->input->post('hon_url',true));
 			}
 			redirect('/options/hon');
 		}
@@ -177,17 +177,17 @@ class Options extends CI_Controller {
 		} else {
 			$dxcluster_decont_update = $this->optionslib->update('dxcluster_decont', $this->input->post('dxcluster_decont'), 'yes');
 			if($dxcluster_decont_update == TRUE) {
-				$this->session->set_flashdata('success', __("de continent changed to").": ".$this->input->post('dxcluster_decont'));
+				$this->session->set_flashdata('success', __("de continent changed to ").$this->input->post('dxcluster_decont'));
 			}
 
 			$dxcluster_maxage_update = $this->optionslib->update('dxcluster_maxage', $this->input->post('dxcluster_maxage'), 'yes');
 			if($dxcluster_maxage_update == TRUE) {
-				$this->session->set_flashdata('success', __("Maximum age of spots changed to").": ".$this->input->post('dxcluster_maxage'));
+				$this->session->set_flashdata('success', __("Maximum age of spots changed to ").$this->input->post('dxcluster_maxage'));
 			}
 
 			$dxcache_url_update = $this->optionslib->update('dxcache_url', $this->input->post('dxcache_url'), 'yes');
 			if($dxcache_url_update == TRUE) {
-				$this->session->set_flashdata('success', __("DXCluster Cache URL changed to").": ".$this->input->post('dxcache_url'));
+				$this->session->set_flashdata('success', __("DXCluster Cache URL changed to ").$this->input->post('dxcache_url'));
 			}
 			redirect('/options/dxcluster');
 		}
@@ -229,7 +229,7 @@ class Options extends CI_Controller {
 
 			// If theme update is complete set a flashsession with a success note
 			if($radioTimeout_update == TRUE) {
-				$this->session->set_flashdata('success', __("Radio Timeout Warning changed to").": ".$this->input->post('radioTimeout').' seconds');
+				$this->session->set_flashdata('success', __("Radio Timeout Warning changed to ").$this->input->post('radioTimeout').' seconds');
 			}
 
 			// Redirect back to /appearance
diff --git a/application/controllers/Station.php b/application/controllers/Station.php
index 78cc80b2a..75b68c1c9 100644
--- a/application/controllers/Station.php
+++ b/application/controllers/Station.php
@@ -80,7 +80,7 @@ class Station extends CI_Controller
 		$this->load->model('stations');
 		if ($this->stations->check_station_is_accessible($id)) {
 			$data = $this->load_station_for_editing($id);
-			$data['page_title'] = __("Edit Station Location") . ": " . $data['my_station_profile']->station_profile_name;
+			$data['page_title'] = __("Edit Station Location: ") . $data['my_station_profile']->station_profile_name;
 
 			$this->form_validation->set_rules('dxcc', 'DXCC', 'required');
 			$this->form_validation->set_rules('gridsquare', 'Locator', 'callback_check_locator');
diff --git a/application/controllers/Stationsetup.php b/application/controllers/Stationsetup.php
index 197494138..30378ebe2 100644
--- a/application/controllers/Stationsetup.php
+++ b/application/controllers/Stationsetup.php
@@ -302,7 +302,7 @@ class Stationsetup extends CI_Controller {
 	private function lblnk2html($public_slug, $logbook_name, $id) {
 		$htmret = '<button class="btn btn-outline-primary btn-sm editVisitorLink" id="' . $id . '"><i class="fas fa-edit"></i></button> ';
 		if($public_slug != '') {
-			$htmret .= '<a target="_blank" href="'.site_url('visitor')."/".$public_slug.'" class="btn btn-outline-primary btn-sm"><i class="fas fa-globe" title="'.__("View Public Page for Logbook") . ": " . $logbook_name.'"></i></a>';
+			$htmret .= '<a target="_blank" href="'.site_url('visitor')."/".$public_slug.'" class="btn btn-outline-primary btn-sm"><i class="fas fa-globe" title="'.__("View Public Page for Logbook: ") . $logbook_name.'"></i></a>';
 			$htmret .= ' <button id="' . $id . '" class="deletePublicSlug btn btn-outline-danger btn-sm" cnftext="' . __("Are you sure you want to delete the public slug?") . '"><i class="fas fa-trash-alt"></i></button>';
 			$htmret .= ' <button id="' . $id . '" class="editExportmapOptions btn btn-outline-primary btn-sm"><i class="fas fa-globe-europe"></i></button>';
 		}
diff --git a/application/controllers/Update.php b/application/controllers/Update.php
index fcab3ac50..f1a24d501 100644
--- a/application/controllers/Update.php
+++ b/application/controllers/Update.php
@@ -65,7 +65,7 @@ class Update extends CI_Controller {
 			if ($count % $batch_size === 0) {
 				$this->db->insert_batch('dxcc_entities', $a_data);
 				$a_data = []; // Clear batch data
-				$this->update_status(__("Preparing DXCC-Entries") . ": " . $count);
+				$this->update_status(__("Preparing DXCC-Entries: ") . $count);
 			}
 		}
 
@@ -130,7 +130,7 @@ class Update extends CI_Controller {
 			if ($count % $batch_size === 0) {
 				$this->db->insert_batch('dxcc_exceptions', $a_data);
 				$a_data = []; // Clear batch data
-				$this->update_status(__("Preparing DXCC Exceptions") . ": " . $count);
+				$this->update_status(__("Preparing DXCC Exceptions: ") . $count);
 			}
 		}
 
@@ -181,7 +181,7 @@ class Update extends CI_Controller {
 			if ($count % $batch_size === 0) {
 				$this->db->insert_batch('dxcc_prefixes', $a_data);
 				$a_data = []; // Clear the batch array
-				$this->update_status(__("Preparing DXCC Prefixes") . ": " . $count);
+				$this->update_status(__("Preparing DXCC Prefixes: ") . $count);
 			}
 		}
 
@@ -370,9 +370,9 @@ class Update extends CI_Controller {
 			unlink($lockfilename);
 			if($this->session->userdata('user_type') == '99') {
 				if (substr($result, 0, 4) == 'DONE') {
-					$this->session->set_flashdata('success', __("SCP Update complete. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('success', __("SCP Update complete. Result: ") . "'" . $result . "'");
 				} else {
-					$this->session->set_flashdata('error', __("SCP Update failed. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('error', __("SCP Update failed. Result: ") . "'" . $result . "'");
 				}
 				redirect('debug');
 			} else {
@@ -409,9 +409,9 @@ class Update extends CI_Controller {
 			unlink($lockfilename);
 			if($this->session->userdata('user_type') == '99') {
 				if (substr($result, 0, 7) == 'Records') {
-					$this->session->set_flashdata('success', __("LoTW Users Update complete. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('success', __("LoTW Users Update complete. Result: ") . "'" . $result . "'");
 				} else {
-					$this->session->set_flashdata('error', __("LoTW Users Update failed. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('error', __("LoTW Users Update failed. Result: ") . "'" . $result . "'");
 				}
 				redirect('debug');
 			} else {
@@ -446,9 +446,9 @@ class Update extends CI_Controller {
 			unlink($lockfilename);
 			if($this->session->userdata('user_type') == '99') {
 				if (substr($result, 0, 4) == 'DONE') {
-					$this->session->set_flashdata('success', __("DOK Update complete. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('success', __("DOK Update complete. Result: ") . "'" . $result . "'");
 				} else {
-					$this->session->set_flashdata('error', __("DOK Update failed. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('error', __("DOK Update failed. Result: ") . "'" . $result . "'");
 				}
 				redirect('debug');
 			} else {
@@ -481,9 +481,9 @@ class Update extends CI_Controller {
 			unlink($lockfilename);
 			if($this->session->userdata('user_type') == '99') {
 				if (substr($result, 0, 4) == 'DONE') {
-					$this->session->set_flashdata('success', __("SOTA Update complete. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('success', __("SOTA Update complete. Result: ") . "'" . $result . "'");
 				} else {
-					$this->session->set_flashdata('error', __("SOTA Update failed. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('error', __("SOTA Update failed. Result: ") . "'" . $result . "'");
 				}
 				redirect('debug');
 			} else {
@@ -516,9 +516,9 @@ class Update extends CI_Controller {
 			unlink($lockfilename);
 			if($this->session->userdata('user_type') == '99') {
 				if (substr($result, 0, 4) == 'DONE') {
-					$this->session->set_flashdata('success', __("WWFF Update complete. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('success', __("WWFF Update complete. Result: ") . "'" . $result . "'");
 				} else {
-					$this->session->set_flashdata('error', __("WWFF Update failed. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('error', __("WWFF Update failed. Result: ") . "'" . $result . "'");
 				}
 				redirect('debug');
 			} else {
@@ -552,9 +552,9 @@ class Update extends CI_Controller {
 			unlink($lockfilename);
 			if($this->session->userdata('user_type') == '99') {
 				if (substr($result, 0, 4) == 'DONE') {
-					$this->session->set_flashdata('success', __("HAMqsl Update complete. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('success', __("HAMqsl Update complete. Result: ") . "'" . $result . "'");
 				} else {
-					$this->session->set_flashdata('error', __("HAMqsl Update failed. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('error', __("HAMqsl Update failed. Result: ") . "'" . $result . "'");
 				}
 
 				$this->load->model('cron_model');
@@ -587,9 +587,9 @@ class Update extends CI_Controller {
 			unlink($lockfilename);
 			if($this->session->userdata('user_type') == '99') {
 				if (substr($result, 0, 4) == 'DONE') {
-					$this->session->set_flashdata('success', __("POTA Update complete. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('success', __("POTA Update complete. Result: ") . "'" . $result . "'");
 				} else {
-					$this->session->set_flashdata('error', __("POTA Update failed. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('error', __("POTA Update failed. Result: ") . "'" . $result . "'");
 				}
 				redirect('debug');
 			} else {
@@ -618,9 +618,9 @@ class Update extends CI_Controller {
 			unlink($lockfilename);
 			if($this->session->userdata('user_type') == '99') {
 				if (substr($result, 0, 4) == 'This') {
-					$this->session->set_flashdata('success', __("TLE Update complete. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('success', __("TLE Update complete. Result: ") . "'" . $result . "'");
 				} else {
-					$this->session->set_flashdata('error', __("TLE Update failed. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('error', __("TLE Update failed. Result: ") . "'" . $result . "'");
 				}
 				redirect($returnpath);
 			} else {
@@ -715,9 +715,9 @@ class Update extends CI_Controller {
 
 			if($this->session->userdata('user_type') == '99') {
 				if (substr($result, 0, 4) == 'DONE') {
-					$this->session->set_flashdata('success', __("VUCC Grid file update complete. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('success', __("VUCC Grid file update complete. Result: ") . "'" . $result . "'");
 				} else {
-					$this->session->set_flashdata('error', __("VUCC Grid file update failed. Result") . ": '" . $result . "'");
+					$this->session->set_flashdata('error', __("VUCC Grid file update failed. Result: ") . "'" . $result . "'");
 				}
 
 
diff --git a/application/models/Hrdlog_model.php b/application/models/Hrdlog_model.php
index 3d392ebe2..5b7f9d8ee 100644
--- a/application/models/Hrdlog_model.php
+++ b/application/models/Hrdlog_model.php
@@ -19,10 +19,10 @@ class Hrdlog_model extends CI_Model {
 				$hrdlog_code = $station->hrdlog_code;
 				$u_result = $this->mass_upload_qsos($station->station_id, $hrdlog_username, $hrdlog_code);
 				if ($u_result['count'] > 0) {
-					$msg = __("HRDlog: QSOs have been uploaded to hrdlog.net for the station callsign").": ".$station->station_callsign." (ID: ".$station->station_id.")";
+					$msg = __("HRDlog: QSOs have been uploaded to hrdlog.net for the station callsign: ").$station->station_callsign." (ID: ".$station->station_id.")";
 					echo $msg;
 				} else {
-					$msg = __("HRDlog: No QSOs found to upload for the station callsign").": ".$station->station_callsign." (ID: ".$station->station_id.")";
+					$msg = __("HRDlog: No QSOs found to upload for the station callsign: ").$station->station_callsign." (ID: ".$station->station_id.")";
 					echo $msg;
 				}
 				log_message('debug', $msg);
diff --git a/application/views/adif/import.php b/application/views/adif/import.php
index 1a0f548b2..93b778f1e 100644
--- a/application/views/adif/import.php
+++ b/application/views/adif/import.php
@@ -71,7 +71,7 @@
                     <?php } ?>
 
                     <p><span class="badge text-bg-warning"><?= __("Important") ?></span> <?= __("Log Files must have the file type *.adi") ?></p>
-                    <p><span class="badge text-bg-warning"><?= __("Warning") ?></span> <?= __("Maximum file upload size is")." " ?><?php echo $max_upload; ?>B.</p>
+                    <p><span class="badge text-bg-warning"><?= __("Warning") ?></span> <?= __("Maximum file upload size is ") ?><?php echo $max_upload; ?>B.</p>
 
                     <form class="form" id="upform" action="<?php echo site_url('adif/import'); ?>" method="post" enctype="multipart/form-data">
 						<div class="row mb-4">
diff --git a/application/views/awards/wae/index.php b/application/views/awards/wae/index.php
index 4334137ec..c0c0b1edf 100644
--- a/application/views/awards/wae/index.php
+++ b/application/views/awards/wae/index.php
@@ -6,7 +6,7 @@
             var lang_awards_info_button = "<?= __("Award Info"); ?>";
             var lang_award_info_ln1 = "<?= __("WAE Award"); ?>";
             var lang_award_info_ln2 = "<?= __("The oldest and most renowned of all DARC certificates is awarded for contacts with amateur radio stations in European countries and on islands listed in the WAE country list on different bands."); ?>";
-            var lang_award_info_ln3 = "<?= __("The WAE will be issued in the following modes: CW, SSB, Phone, RTTY, FT8, Digital and Mixed Modes. It is issued in five classes: WAE III, WAE II, WAE I, WAE TOP and the WAE Trophy."); ?>";
+            var lang_award_info_ln3 = "<?= __("The WAE will be issued in the following modes: CW, SSB, Phone, RTTY, FT8,  Digital and Mixed Modes. It is issued in five classes: WAE III, WAE II, WAE I, WAE TOP and the WAE Trophy."); ?>";
             var lang_award_info_ln4 = "<?= sprintf(__("Official information and the rules can be found in this document: %s."), "<a href='https://www.darc.de/en/der-club/referate/committee-dx/diplome/wae-award/' target='_blank'>https://www.darc.de/en/der-club/referate/committee-dx/diplome/wae-award/</a>"); ?>";
             var lang_award_info_ln5 = "<?= __("Fields taken for this Award: Region, DXCC"); ?>";
             </script>
diff --git a/application/views/bands/index.php b/application/views/bands/index.php
index 2031c556a..9b68a7388 100644
--- a/application/views/bands/index.php
+++ b/application/views/bands/index.php
@@ -158,7 +158,7 @@ $wwff = 0;
 						var lang_options_bands_edit = '<?= __("Edit Band"); ?>';
 						var lang_options_bands_create = '<?= __("Create a band"); ?>';
 						var lang_admin_close = '<?= __("Close"); ?>';
-						var lang_options_bands_delete_warning = '<?= __("Warning! Are you sure you want to delete the following band:")." "; ?>';
+						var lang_options_bands_delete_warning = '<?= __("Warning! Are you sure you want to delete the following band: "); ?>';
 						var lang_options_bands_activateall_warning = '<?= __("Warning! Are you sure you want to activate all bands?"); ?>';
 						var lang_options_bands_deactivateall_warning = '<?= __("Warning! Are you sure you want to deactivate all bands?"); ?>';
 					</script>
diff --git a/application/views/clublog/export.php b/application/views/clublog/export.php
index 61c2413ba..8576e0ca5 100644
--- a/application/views/clublog/export.php
+++ b/application/views/clublog/export.php
@@ -21,7 +21,7 @@
         <div class="card-body">
 			<div class="tab-content">
 				<div class="tab-pane active" id="export" role="tabpanel" aria-labelledby="export-tab">
-            <?php if (($next_run_up ?? '') != '') { echo "<p>".__("The next automatic Upload to Clublog will happen at").": ".$next_run_up." UTC</p>"; } ?>
+            <?php if (($next_run_up ?? '') != '') { echo "<p>".__("The next automatic Upload to Clublog will happen at: ").$next_run_up." UTC</p>"; } ?>
             <p><?= __("Here you can see all QSOs which have not been previously uploaded to a Clublog logbook."); ?></p>
             <p><?= __("You need to set a username and password in your user account. You will also need to enable upload for each station profile ."); ?></p>
 <?php
@@ -66,7 +66,7 @@
 			<div class="tab-pane fade" id="import" role="tabpanel" aria-labelledby="home-tab">
 
 				<form class="form" action="<?php echo site_url('clublog/importlog'); ?>" method="post" enctype="multipart/form-data">
-					<?php if (($next_run_down ?? '') != '') { echo "<p>".__("The next automatic Download from Clublog-QSLs will happen at").": ".$next_run_down."</p>"; } ?>
+					<?php if (($next_run_down ?? '') != '') { echo "<p>".__("The next automatic Download from Clublog-QSLs will happen at: ").$next_run_down."</p>"; } ?>
 					<p><span class="badge text-bg-warning"><?= __("Warning"); ?></span> <?= __("If no startdate is given then the QSLs after last confirmation will be downloaded/updated!"); ?></p>
 					<div class="row">
 						<div class="col-md-2">
diff --git a/application/views/components/dxwaterfall.php b/application/views/components/dxwaterfall.php
index b70375c80..1cd77268f 100644
--- a/application/views/components/dxwaterfall.php
+++ b/application/views/components/dxwaterfall.php
@@ -38,7 +38,7 @@
 		var lang_dxwaterfall_reset_zoom = "<?= __("Reset zoom to default (3)"); ?>";
 		var lang_dxwaterfall_zoom_in = "<?= __("Zoom in"); ?>" + " [" + modKey + "++]";
 		var lang_dxwaterfall_downloading_data = "<?= __("Downloading DX Cluster data"); ?>";
-		var lang_dxwaterfall_comment = "<?= __("Comment:"); ?>";
+		var lang_dxwaterfall_comment = "<?= __("Comment: "); ?>";
 		var lang_dxwaterfall_modes_label = "<?= __("modes:"); ?>";
 		var lang_dxwaterfall_out_of_bandplan = "<?= __("OUT OF BANDPLAN"); ?>";
 		var lang_dxwaterfall_changing_frequency = "<?= __("Changing radio frequency..."); ?>";
@@ -52,7 +52,7 @@
 		var lang_dxwaterfall_label_size_medium = "<?= __("Medium"); ?>";
 		var lang_dxwaterfall_label_size_large = "<?= __("Large"); ?>";
 		var lang_dxwaterfall_label_size_xlarge = "<?= __("X-Large"); ?>";
-		var lang_dxwaterfall_spotted_by = "<?= __("by"); ?>";
+		var lang_dxwaterfall_spotted_by = "<?= __("by:"); ?>";
 
 		// DX Waterfall Configuration from User Options
 		let dxwaterfall_decont = '<?php echo $this->optionslib->get_option('dxcluster_decont'); ?>';
diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php
index 9d0164024..46e7aee01 100644
--- a/application/views/contesting/add.php
+++ b/application/views/contesting/add.php
@@ -52,7 +52,7 @@
 							<td>
 								<script>
 									var lang_admin_danger = '<?= __("DANGER!"); ?>';
-									var lang_admin_contest_deletion_warning = '<?= __("Warning! Are you sure you want to delete the following contest:"); ?>';
+									var lang_admin_contest_deletion_warning = '<?= __("Warning! Are you sure you want to delete the following contest: "); ?>';
 									var lang_admin_contest_active_all_warning = '<?= __("Warning! Are you sure you want to activate all contests?"); ?>';
 									var lang_admin_contest_deactive_all_warning = '<?= __("Warning! Are you sure you want to deactivate all contests?"); ?>';
 								</script>
diff --git a/application/views/dcl_views/index.php b/application/views/dcl_views/index.php
index cee9f6875..a58bbaa42 100644
--- a/application/views/dcl_views/index.php
+++ b/application/views/dcl_views/index.php
@@ -77,7 +77,7 @@
 		</div>
 
 		<div class="card-body">
-            		<?php if (($next_run ?? '') != '') { echo "<p>".__("The next automatic sync with DCL will happen at").": ".$next_run."</p>"; } ?>
+            		<?php if (($next_run ?? '') != '') { echo "<p>".__("The next automatic sync with DCL will happen at: ").$next_run."</p>"; } ?>
 			<button class="btn btn-outline-success" hx-on:click="document.getElementById('dcl_manual_results').innerHTML = '';" hx-get="<?php echo site_url('dcl/dcl_upload'); ?>" hx-indicator="#lotw-sync-running" hx-target="#dcl_manual_results">
             <?= __("Manual Sync"); ?>
 			</button>
diff --git a/application/views/email/oqrs_request.php b/application/views/email/oqrs_request.php
index f459c9515..40b509691 100644
--- a/application/views/email/oqrs_request.php
+++ b/application/views/email/oqrs_request.php
@@ -3,7 +3,7 @@
 $message['subject'] = sprintf(__("Wavelog OQRS from %s"), strtoupper($callsign));
 
 if ($usermessage != '') {
-    $um_formatted = __("The user entered the following message:") . "\n\n";
+    $um_formatted = __("The user entered the following message: ") . "\n\n";
     $um_formatted .= "------------" . "\n";
     $um_formatted .= $usermessage . "\n";
     $um_formatted .= "------------" . "\n\n";
@@ -23,4 +23,4 @@ Regards,
 
 Wavelog");
 
-echo json_encode($message);
+echo json_encode($message);
\ No newline at end of file
diff --git a/application/views/eqsl/import.php b/application/views/eqsl/import.php
index c70e24763..88c6c9e58 100644
--- a/application/views/eqsl/import.php
+++ b/application/views/eqsl/import.php
@@ -25,7 +25,7 @@
 			<?php echo form_open_multipart('eqsl/import'); ?>
 
 			<div class="form-check">
-            			<?php if (($next_run ?? '') != '') { echo "<p>".__("The next automatic sync with eQSL will happen at").": ".$next_run." UTC</p>"; } ?>
+            			<?php if (($next_run ?? '') != '') { echo "<p>".__("The next automatic sync with eQSL will happen at: ").$next_run." UTC</p>"; } ?>
 				<input class="form-check-input" type="radio" name="eqslimport" id="upload" value="upload" checked />
 				<label class="form-check-label" for="exampleRadios1">
 					<?= __("Import from file..."); ?>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 2f22d44dd..68754d456 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -8,17 +8,17 @@
 
     var base_url = "<?php echo base_url(); ?>"; // Base URL
     var site_url = "<?php echo site_url(); ?>"; // Site URL
-    let measurement_base = 'K';
+	let measurement_base = 'K';
 
-    <?php
-    if ($this->session->userdata('user_measurement_base') == NULL) {
-    	?>
-    	measurement_base = '<?php echo $this->config->item('measurement_base'); ?>';
-    <?php }
-    else { ?>
-    	measurement_base = '<?php echo $this->session->userdata('user_measurement_base'); ?>';
-    <?php }
-    ?>
+	<?php
+	if ($this->session->userdata('user_measurement_base') == NULL) {
+		?>
+		measurement_base = '<?php echo $this->config->item('measurement_base'); ?>';
+	<?php }
+	else { ?>
+		measurement_base = '<?php echo $this->session->userdata('user_measurement_base'); ?>';
+	<?php }
+	?>
 
     var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
 
@@ -40,7 +40,7 @@
     var lang_general_word_cancel = "<?= __("Cancel"); ?>";
     var lang_general_word_ok = "<?= __("OK"); ?>";
     var lang_general_word_search = "<?= __("Search"); ?>";
-    var lang_qso_delete_warning = "<?= __("Warning! Are you sure you want delete QSO with"); ?>";
+    var lang_qso_delete_warning = "<?= __("Warning! Are you sure you want delete QSO with "); ?>";
     var lang_general_word_colors = "<?= __("Colors"); ?>";
     var lang_general_word_confirmed = "<?= __("Confirmed"); ?>";
     var lang_general_word_worked_not_confirmed = "<?= __("Worked not confirmed"); ?>";
@@ -69,66 +69,66 @@
     var lang_notes_duplicate_confirmation = "<?= __("Duplicate this note?"); ?>";
     var lang_notes_duplication_disabled_short = "<?= __("Duplication Disabled"); ?>";
     var lang_notes_not_found = "<?= __("No notes were found"); ?>";
-    var lang_qso_note_missing = "<?= __("No notes for this callsign"); ?>";
-    var lang_qso_note_toast_title = "<?= __("Callsign Note"); ?>";
-    var lang_qso_note_deleted = "<?= __("Note deleted successfully"); ?>";
-    var lang_qso_note_created = "<?= __("Note created successfully"); ?>";
-    var lang_qso_note_saved = "<?= __("Note saved successfully"); ?>";
-    var lang_qso_note_error_saving = "<?= __("Error saving note"); ?>";
-    var lang_qso_added = "<?= __("QSO with %s by %s was added to logbook."); ?>";
-    var lang_qso_added_to_backlog = "<?= __("QSO added to backlog"); ?>";
-    var lang_qso_send_email_to = "<?= __("Send email to %s"); ?>";
-    var lang_qso_callsign_confirmed = "<?= __("Callsign was already worked and confirmed in the past on this band and mode!"); ?>";
-    var lang_qso_callsign_worked = "<?= __("Callsign was already worked in the past on this band and mode!"); ?>";
-    var lang_qso_callsign_new = "<?= __("New Callsign!"); ?>";
-    var lang_qso_grid_confirmed = "<?= __("Grid was already worked and confirmed in the past!"); ?>";
-    var lang_qso_grid_worked = "<?= __("Grid was already worked in the past!"); ?>";
-    var lang_qso_grid_new = "<?= __("New grid!"); ?>";
-    var lang_qso_delete_fav_confirm = "<?= __("Are you sure to delete Fav?"); ?>";
-    var lang_qso_dxcc_confirmed = "<?= __("DXCC was already worked and confirmed in the past on this band and mode!"); ?>";
-    var lang_qso_dxcc_worked = "<?= __("DXCC was already worked in the past on this band and mode!"); ?>";
-    var lang_qso_dxcc_new = "<?= __("New DXCC, not worked on this band and mode!"); ?>";
-    var lang_qso_lookup_info = "<?= __("Lookup %s info on %s"); ?>";
-    var lang_qso_lookup_summit_info = "<?= __("Lookup %s summit info on %s"); ?>";
-    var lang_qso_lookup_reference_info = "<?= __("Lookup %s reference info on %s"); ?>";
-    var lang_qso_error_loading_bearing = "<?= __("Error loading bearing!"); ?>";
-    var lang_qso_profile_aliases = "<?= __("Aliases"); ?>";
-    var lang_qso_profile_previously = "<?= __("Previously"); ?>";
-    var lang_qso_profile_born = "<?= __("Born"); ?>";
-    var lang_qso_profile_years_old = "<?= __("years old"); ?>";
-    var lang_qso_profile_license = "<?= __("License"); ?>";
-    var lang_qso_profile_from = "<?= __("from"); ?>";
-    var lang_qso_profile_years = "<?= __("years"); ?>";
-    var lang_qso_profile_expired_on = "<?= __("expired on"); ?>";
-    var lang_qso_profile_website = "<?= __("Website"); ?>";
-    var lang_qso_profile_local_time = "<?= __("Local time"); ?>";
-    var lang_qso_profile_qsl = "<?= __("QSL"); ?>";
-    var lang_qso_profile_view_location_maps = "<?= __("View location on Google Maps (Satellite)"); ?>";
-    var lang_qso_profile_license_novice = "<?= __("Novice"); ?>";
-    var lang_qso_profile_license_technician = "<?= __("Technician"); ?>";
-    var lang_qso_profile_license_general = "<?= __("General"); ?>";
-    var lang_qso_profile_license_advanced = "<?= __("Advanced"); ?>";
-    var lang_qso_profile_license_extra = "<?= __("Extra"); ?>";
-    var lang_qso_gridsquare_formatting = "<?= __("Gridsquare Formatting"); ?>";
-    var lang_qso_gridsquare_help = "<?= __("Enter multiple (4-digit) grids separated with commas. For example: IO77,IO78"); ?>";
-    var lang_cat_live = "<?= __("live"); ?>";
-    var lang_cat_polling = "<?= __("polling"); ?>";
-    var lang_cat_polling_tooltip = "<?= __("Periodic polling is slow. When operating locally, WebSockets are a more convenient way to control your radio in real-time."); ?>";
-    var lang_cat_tx = "<?= __("TX"); ?>";
-    var lang_cat_rx = "<?= __("RX"); ?>";
-    var lang_cat_tx_rx = "<?= __("TX/RX"); ?>";
-    var lang_cat_mode = "<?= __("Mode"); ?>";
-    var lang_cat_power = "<?= __("Power"); ?>";
-    var lang_cat_connection_error = "<?= __("Radio connection error"); ?>";
-    var lang_cat_connection_lost = "<?= __("Connection lost, please select another radio."); ?>";
-    var lang_cat_connection_timeout = "<?= __("Radio connection timeout"); ?>";
-    var lang_cat_data_stale = "<?= __("Data is stale, please select another radio."); ?>";
-    var lang_cat_not_logged_in = "<?= __("You're not logged in. Please log in."); ?>";
-    var lang_cat_radio_tuning_failed = "<?= __("Radio Tuning Failed"); ?>";
-    var lang_cat_failed_to_tune = "<?= __("Failed to tune radio to"); ?>";
-    var lang_cat_not_responding = "<?= __("CAT interface not responding. Please check your radio connection."); ?>";
-    var lang_cat_no_url_configured = "<?= __("No CAT URL configured for this radio"); ?>";
-    var lang_cat_websocket_radio = "<?= __("WebSocket Radio"); ?>";
+	var lang_qso_note_missing = "<?= __("No notes for this callsign"); ?>";
+	var lang_qso_note_toast_title = "<?= __("Callsign Note"); ?>";
+	var lang_qso_note_deleted = "<?= __("Note deleted successfully"); ?>";
+	var lang_qso_note_created = "<?= __("Note created successfully"); ?>";
+	var lang_qso_note_saved = "<?= __("Note saved successfully"); ?>";
+	var lang_qso_note_error_saving = "<?= __("Error saving note"); ?>";
+	var lang_qso_added = "<?= __("QSO with %s by %s was added to logbook."); ?>";
+	var lang_qso_added_to_backlog = "<?= __("QSO Added to Backlog"); ?>";
+	var lang_qso_send_email_to = "<?= __("Send email to %s"); ?>";
+	var lang_qso_callsign_confirmed = "<?= __("Callsign was already worked and confirmed in the past on this band and mode!"); ?>";
+	var lang_qso_callsign_worked = "<?= __("Callsign was already worked in the past on this band and mode!"); ?>";
+	var lang_qso_callsign_new = "<?= __("New Callsign!"); ?>";
+	var lang_qso_grid_confirmed = "<?= __("Grid was already worked and confirmed in the past"); ?>";
+	var lang_qso_grid_worked = "<?= __("Grid was already worked in the past"); ?>";
+	var lang_qso_grid_new = "<?= __("New grid!"); ?>";
+	var lang_qso_delete_fav_confirm = "<?= __("Are you sure to delete Fav?"); ?>";
+	var lang_qso_dxcc_confirmed = "<?= __("DXCC was already worked and confirmed in the past on this band and mode!"); ?>";
+	var lang_qso_dxcc_worked = "<?= __("DXCC was already worked in the past on this band and mode!"); ?>";
+	var lang_qso_dxcc_new = "<?= __("New DXCC, not worked on this band and mode!"); ?>";
+	var lang_qso_lookup_info = "<?= __("Lookup %s info on %s"); ?>";
+	var lang_qso_lookup_summit_info = "<?= __("Lookup %s summit info on %s"); ?>";
+	var lang_qso_lookup_reference_info = "<?= __("Lookup %s reference info on %s"); ?>";
+	var lang_qso_error_loading_bearing = "<?= __("Error loading bearing!"); ?>";
+	var lang_qso_profile_aliases = "<?= __("Aliases"); ?>";
+	var lang_qso_profile_previously = "<?= __("Previously"); ?>";
+	var lang_qso_profile_born = "<?= __("Born"); ?>";
+	var lang_qso_profile_years_old = "<?= __("years old"); ?>";
+	var lang_qso_profile_license = "<?= __("License"); ?>";
+	var lang_qso_profile_from = "<?= __("from"); ?>";
+	var lang_qso_profile_years = "<?= __("years"); ?>";
+	var lang_qso_profile_expired_on = "<?= __("expired on"); ?>";
+	var lang_qso_profile_website = "<?= __("Website"); ?>";
+	var lang_qso_profile_local_time = "<?= __("Local time"); ?>";
+	var lang_qso_profile_qsl = "<?= __("QSL"); ?>";
+	var lang_qso_profile_view_location_maps = "<?= __("View location on Google Maps (Satellite)"); ?>";
+	var lang_qso_profile_license_novice = "<?= __("Novice"); ?>";
+	var lang_qso_profile_license_technician = "<?= __("Technician"); ?>";
+	var lang_qso_profile_license_general = "<?= __("General"); ?>";
+	var lang_qso_profile_license_advanced = "<?= __("Advanced"); ?>";
+	var lang_qso_profile_license_extra = "<?= __("Extra"); ?>";
+	var lang_qso_gridsquare_formatting = "<?= __("Gridsquare Formatting"); ?>";
+	var lang_qso_gridsquare_help = "<?= __("Enter multiple (4-digit) grids separated with commas. For example: IO77,IO78"); ?>";
+	var lang_cat_live = "<?= __("live"); ?>";
+	var lang_cat_polling = "<?= __("polling"); ?>";
+	var lang_cat_polling_tooltip = "<?= __("Periodic polling is slow. When operating locally, WebSockets are a more convenient way to control your radio in real-time."); ?>";
+	var lang_cat_tx = "<?= __("TX"); ?>";
+	var lang_cat_rx = "<?= __("RX"); ?>";
+	var lang_cat_tx_rx = "<?= __("TX/RX"); ?>";
+	var lang_cat_mode = "<?= __("Mode"); ?>";
+	var lang_cat_power = "<?= __("Power"); ?>";
+	var lang_cat_connection_error = "<?= __("Radio connection error"); ?>";
+	var lang_cat_connection_lost = "<?= __("Connection lost, please select another radio."); ?>";
+	var lang_cat_connection_timeout = "<?= __("Radio connection timeout"); ?>";
+	var lang_cat_data_stale = "<?= __("Data is stale, please select another radio."); ?>";
+	var lang_cat_not_logged_in = "<?= __("You're not logged in. Please log in."); ?>";
+	var lang_cat_radio_tuning_failed = "<?= __("Radio Tuning Failed"); ?>";
+	var lang_cat_failed_to_tune = "<?= __("Failed to tune radio to"); ?>";
+	var lang_cat_not_responding = "<?= __("CAT interface not responding. Please check your radio connection."); ?>";
+	var lang_cat_no_url_configured = "<?= __("No CAT URL configured for this radio"); ?>";
+	var lang_cat_websocket_radio = "<?= __("WebSocket Radio"); ?>";
     var lang_qso_location_is_fetched_from_provided_gridsquare = "<?= __("Location is fetched from provided gridsquare"); ?>";
     var lang_qso_location_is_fetched_from_dxcc_coordinates = "<?= __("Location is fetched from DXCC coordinates (no gridsquare provided)"); ?>";
 
@@ -883,9 +883,9 @@ function showActivatorsMap(call, count, grids) {
     let re = /,/g;
     grids = grids.replace(re, ', ');
 
-    var result = '<?= __("Callsign:")." "; ?>'+call.replace('0', '&Oslash;')+"<br />";
-    result +=    '<?= __("Count:")." "; ?>'+count+"<br/>";
-    result +=    '<?= __("Grids:")." "; ?>'+grids+"<br/><br />";
+    var result = '<?= __("Callsign: "); ?>'+call.replace('0', '&Oslash;')+"<br />";
+    result +=    '<?= __("Count: "); ?>'+count+"<br/>";
+    result +=    '<?= __("Grids: "); ?>'+grids+"<br/><br />";
 
     $(".activatorsmapResult").html(result);
 
@@ -2511,7 +2511,7 @@ function viewQsl(picture, callsign) {
             if (callsign == null) {
                 title = "<?= __("QSL Card"); ?>";
             } else {
-                title = "<?= __("QSL Card for"); ?>" + " " + callsign.replace('0', '&Oslash;');
+                title = "<?= __("QSL Card for "); ?>" + callsign.replace('0', '&Oslash;');
             }
 
             BootstrapDialog.show({
@@ -2573,7 +2573,7 @@ function viewEqsl(picture, callsign) {
             if (callsign == null) {
                 title = "<?= __("eQSL Card"); ?>";
             } else {
-                title = "<?= __("eQSL Card for"); ?>" + " " + callsign.replace('0', '&Oslash;');
+                title = "<?= __("eQSL Card for "); ?>" + callsign.replace('0', '&Oslash;');
             }
 
             BootstrapDialog.show({
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 46870898a..c314bfed2 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -609,7 +609,7 @@ $options = json_decode($options);
 						<div class="dropdown-menu dropdown-menu-start" aria-labelledby="quickfilterDropdown" style="min-width: 300px;">
 							<div class="card">
 								<div class="card-header p-2">
-									<span class="h6 w-100 mt-0 mb-0"><?= __("Quicksearch with selected:")." "; ?></span>
+									<span class="h6 w-100 mt-0 mb-0"><?= __("Quicksearch with selected: "); ?></span>
 								</div>
 								<div class="card-body p-2">
 									<div class="d-grid gap-2">
@@ -673,11 +673,11 @@ $options = json_decode($options);
                         <div class="dropdown-menu dropdown-menu-start" aria-labelledby="actionsDropdown" style="min-width: 300px;">
                             <script>
                                 var lang_filter_actions_delete_warning = '<?= __("Warning! Are you sure you want to delete the marked QSO(s)?"); ?>';
-                                var lang_filter_actions_delete_warning_details = '<?= __("QSO(s) will be deleted"); ?>';
+                                var lang_filter_actions_delete_warning_details = '<?= __(" QSO(s) will be deleted"); ?>';
                             </script>
                             <div class="card">
 								<div class="card-header p-2">
-									<span class="h6 w-100 mt-0 mb-0"><?= __("With selected:")." "; ?></span>
+									<span class="h6 w-100 mt-0 mb-0"><?= __("With selected: "); ?></span>
 								</div>
 								<div class="card-body p-2">
 									<div class="d-grid gap-2">
@@ -717,7 +717,7 @@ $options = json_decode($options);
 					<?php foreach ($station_profile->result() as $station) { ?>
 						<option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $active_station_id) {
 							echo " selected =\"selected\""; } ?>>
-							<?= __("Callsign:") . " " ?>
+							<?= __("Callsign: ") . " " ?>
 							<?php echo str_replace("0", "&Oslash;", strtoupper($station->station_callsign)); ?> (<?php echo $station->station_profile_name; ?>)
 						</option>
 					<?php } ?>
diff --git a/application/views/lotw_views/index.php b/application/views/lotw_views/index.php
index ac503990f..ae3e964be 100644
--- a/application/views/lotw_views/index.php
+++ b/application/views/lotw_views/index.php
@@ -155,7 +155,7 @@
 		</div>
 
 		<div class="card-body">
-            		<?php if (($next_run ?? '') != '') { echo "<p>".__("The next automatic sync with LoTW will happen at:")." ".$next_run."</p>"; } ?>
+            		<?php if (($next_run ?? '') != '') { echo "<p>".__("The next automatic sync with LoTW will happen at: ").$next_run."</p>"; } ?>
 			<button class="btn btn-outline-success" hx-on:click="document.getElementById('lotw_manual_results').innerHTML = '';" hx-get="<?php echo site_url('lotw/lotw_upload'); ?>" hx-indicator="#lotw-sync-running" hx-target="#lotw_manual_results">
             <?= __("Manual Sync"); ?>
 			</button>
diff --git a/application/views/qrz/export.php b/application/views/qrz/export.php
index 4a0088689..fcf96648c 100644
--- a/application/views/qrz/export.php
+++ b/application/views/qrz/export.php
@@ -24,7 +24,7 @@
         <div class="card-body">
 			<div class="tab-content">
 				<div class="tab-pane active" id="export" role="tabpanel" aria-labelledby="export-tab">
-            <?php if (($next_run_up ?? '') != '') { echo "<p>".__("The next automatic Upload to QRZ will happen at:")." ".$next_run_up." UTC</p>"; } ?>
+            <?php if (($next_run_up ?? '') != '') { echo "<p>".__("The next automatic Upload to QRZ will happen at: ").$next_run_up." UTC</p>"; } ?>
             <p><?= __("Here you can see all QSOs which have not been previously uploaded to a QRZ logbook."); ?></p>
             <p><?= __("You need to set a QRZ Logbook API key in your station profile. Only station profiles with an API Key set are displayed."); ?></p>
             <?php if (!($this->config->item('disable_manual_qrz'))) { echo '<p><span class="badge text-bg-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>'; } ?>
@@ -71,7 +71,7 @@
 			<div class="tab-pane fade" id="import" role="tabpanel" aria-labelledby="home-tab">
 
 				<form class="form" action="<?php echo site_url('qrz/import_qrz'); ?>" method="post" enctype="multipart/form-data">
-            				<?php if (($next_run_down ?? '') != '') { echo "<p>".__("The next automatic Download from QRZ-QSLs will happen at:")." ".$next_run_down."</p>"; } ?>
+            				<?php if (($next_run_down ?? '') != '') { echo "<p>".__("The next automatic Download from QRZ-QSLs will happen at: ").$next_run_down."</p>"; } ?>
 					<p><span class="badge text-bg-warning"><?= __("Warning"); ?></span> <?= __("If no startdate is given then the QSLs after last confirmation will be downloaded/updated!"); ?></p>
 					<div class="row">
 						<div class="col-md-2">
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 253d00859..8adb0e38c 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -384,9 +384,9 @@ if (typeof window.DX_WATERFALL_FIELD_MAP === 'undefined') {
               <label for="radio"><?= __("Radio"); ?></label>
               <select class="form-select radios" id="radio" name="radio">
                 <option value="0" selected="selected"><?= __("None"); ?></option>
-		            <option value="ws"<?php if ($this->session->userdata('radio') == 'ws') { echo ' selected="selected"'; } ?>><?= __("Live") . " - ". __("WebSocket (Requires WLGate>=1.1.10)"); ?></option>
+		            <option value="ws"<?php if ($this->session->userdata('radio') == 'ws') { echo ' selected="selected"'; } ?>><?= __("Live - ") . __("WebSocket (Requires WLGate>=1.1.10)"); ?></option>
                 <?php foreach ($radios->result() as $row) { ?>
-                  <option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?= __("Polling") . " - " . $row->radio; ?> <?php if ($radio_last_updated->id == $row->id) { echo "(".__("last updated").")"; } else { echo ''; } ?></option>
+                  <option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?= __("Polling - ") . $row->radio; ?> <?php if ($radio_last_updated->id == $row->id) { echo "(".__("last updated").")"; } else { echo ''; } ?></option>
                 <?php } ?>
                 </select>
             </div>
diff --git a/application/views/satellite/edit.php b/application/views/satellite/edit.php
index 8fe035f19..90bacf269 100644
--- a/application/views/satellite/edit.php
+++ b/application/views/satellite/edit.php
@@ -4,7 +4,7 @@
 	<input type="hidden" id="satelliteid" name="id" value="<?php echo $satellite->id; ?>">
 		<div class = "row">
 			<div class="mb-3 col-md-6">
-				<label for="displayNameInput"><?= __("Satellite Display Name"); ?></label>
+				<label for="displayNameInput"><?= __("Satellite Display Name "); ?></label>
 				<input type="text" class="form-control" name="displayNameInput" id="displayNameInput" aria-describedby="displayNameInputHelp" value="<?php if(set_value('band') != "") { echo set_value('band'); } else { echo $satellite->displayname; } ?>" required>
 				<small id="displayNameInputHelp" class="form-text text-muted"><?= __("Display / cleartext name of the satellite"); ?></small>
 			</div>
diff --git a/application/views/stationsetup/stationsetup.php b/application/views/stationsetup/stationsetup.php
index c4326e17a..63ca92ce8 100644
--- a/application/views/stationsetup/stationsetup.php
+++ b/application/views/stationsetup/stationsetup.php
@@ -65,7 +65,7 @@
                                         <a target="_blank"
                                             href="<?php echo site_url('visitor')."/".$row->public_slug; ?>"
                                             class="btn btn-outline-primary btn-sm"><i class="fas fa-globe"
-                                                title="<?= __("View Public Page for Logbook") . ": " . $row->logbook_name;?>"></i>
+                                                title="<?= __("View Public Page for Logbook: ") . $row->logbook_name;?>"></i>
                                         </a>
 										<button id="<?php echo $row->logbook_id; ?>" class="deletePublicSlug btn btn-outline-danger btn-sm" cnftext="Are you sure you want to delete the public slug?"><i class="fas fa-trash-alt"></i></button>
 										<button id="<?php echo $row->logbook_id; ?>" class="editExportmapOptions btn btn-outline-primary btn-sm"><i class="fas fa-globe-europe"></i></button>
@@ -115,7 +115,7 @@
 	<div class="alert alert-danger" role="alert">
 		  <span class="badge badge-pill badge-warning"><?= __("Warning"); ?></span> <?= __("Due to recent changes within Wavelog you need to reassign QSOs to your station profiles."); ?>
 		</br>
-		<?= __("Please reassign them at")." "; ?> <a href="<?php echo site_url('maintenance/'); ?>" class="btn btn-warning"><i class="fas fa-sync"></i><?= __("Admin") . "/" . __("Maintenance"); ?></a>
+		<?= __("Please reassign them at "); ?> <a href="<?php echo site_url('maintenance/'); ?>" class="btn btn-warning"><i class="fas fa-sync"></i><?= __("Admin") . "/" . __("Maintenance"); ?></a>
 	</div>
 <?php } ?>
 
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 921f8dc64..4780f53db 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -784,7 +784,7 @@
             }
             ?>
 
-            <p><div class="alert alert-warning" role="alert"><span class="badge text-bg-warning"><?= __("Warning"); ?></span> <?= __("Maximum file upload size is")." "; ?> <?php echo $max_upload; ?>B.</div></p>
+            <p><div class="alert alert-warning" role="alert"><span class="badge text-bg-warning"><?= __("Warning"); ?></span> <?= __("Maximum file upload size is "); ?> <?php echo $max_upload; ?>B.</div></p>
 
             <form class="form" id="fileinfo" name="fileinfo" enctype="multipart/form-data">
             <div class="row">
diff --git a/assets/js/dxwaterfall.js b/assets/js/dxwaterfall.js
index 0f137652e..4defc5a3d 100644
--- a/assets/js/dxwaterfall.js
+++ b/assets/js/dxwaterfall.js
@@ -2639,7 +2639,7 @@ var dxWaterfall = {
 
         // Spotter name (already cleaned during data load)
         if (spot.spotter) {
-            tooltipParts.push(lang_dxwaterfall_spotted_by + ': ' + spot.spotter);
+            tooltipParts.push(lang_dxwaterfall_spotted_by + ' ' + spot.spotter);
         }
 
         // Time from when_pretty field (format: "DD/MM/YY HH:MM")
@@ -5318,7 +5318,7 @@ var dxWaterfall = {
                 awards += ' <i class="fas fa-medal new-callsign-icon" title="' + lang_dxwaterfall_new_callsign + '"></i>';
             }
 
-            infoText += awards + ' ' + lang_dxwaterfall_comment + ": " + spotInfo.message;
+            infoText += awards + ' ' + lang_dxwaterfall_comment + spotInfo.message;
         }
 
         // Update the div only when content actually changed
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
index 964b4b422..ab9db6ad3 100644
--- a/assets/js/sections/common.js
+++ b/assets/js/sections/common.js
@@ -236,7 +236,7 @@ async function fill_if_empty(field, data) {
 function qso_delete(id, call) {
     BootstrapDialog.confirm({
         title: lang_general_word_danger,
-        message: lang_qso_delete_warning + " " + call + '?' ,
+        message: lang_qso_delete_warning + call + '?' ,
         type: BootstrapDialog.TYPE_DANGER,
         closable: true,
         draggable: true,
diff --git a/assets/js/sections/contestingnames.js b/assets/js/sections/contestingnames.js
index d35c97753..e1be7d586 100644
--- a/assets/js/sections/contestingnames.js
+++ b/assets/js/sections/contestingnames.js
@@ -98,7 +98,7 @@ function activateContest(contestid) {
 function deleteContest(id, contest) {
 	BootstrapDialog.confirm({
 		title: lang_admin_danger,
-		message: lang_admin_contest_deletion_warning + " " + contest + '?',
+		message: lang_admin_contest_deletion_warning + contest + '?',
 		type: BootstrapDialog.TYPE_DANGER,
 		closable: true,
 		draggable: true,
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index f900288dc..f424ac55d 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -780,7 +780,7 @@ $(document).ready(function () {
 
 		BootstrapDialog.confirm({
 			title: lang_general_word_danger,
-			message: lang_filter_actions_delete_warning+'<br/>'+id_list.length+" "+lang_filter_actions_delete_warning_details,
+			message: lang_filter_actions_delete_warning+'<br/>'+id_list.length+lang_filter_actions_delete_warning_details,
 			type: BootstrapDialog.TYPE_DANGER,
 			closable: true,
 			draggable: true,