diff --git a/application/views/accumulate/index.php b/application/views/accumulate/index.php
index bdada2cde..e1c63327e 100644
--- a/application/views/accumulate/index.php
+++ b/application/views/accumulate/index.php
@@ -1,12 +1,12 @@
 <script>
-    var lang_statistics_accumulated_worked_dxcc = '<?php echo lang('statistics_accumulated_worked_dxcc'); ?>';
-    var lang_statistics_accumulated_worked_states = '<?php echo lang('statistics_accumulated_worked_states'); ?>';
-    var lang_statistics_accumulated_worked_iota = '<?php echo lang('statistics_accumulated_worked_iota'); ?>';
-    var lang_statistics_accumulated_worked_cqzone = '<?php echo lang('statistics_accumulated_worked_cqzone'); ?>';
-    var lang_general_word_year = '<?php echo lang('general_word_year'); ?>';
-    var lang_general_word_yearly = '<?php echo lang('general_word_yearly'); ?>';
-    var lang_general_word_month = '<?php echo lang('general_word_month'); ?>';
-    var lang_general_word_monthly = '<?php echo lang('general_word_monthly'); ?>';
+    var lang_statistics_accumulated_worked_dxcc = '<?php echo __("Accumulated Number of DXCCs worked"); ?>';
+    var lang_statistics_accumulated_worked_states = '<?php echo __("Accumulated Number of States worked"); ?>';
+    var lang_statistics_accumulated_worked_iota = '<?php echo __("Accumulated Number of IOTAs worked"); ?>';
+    var lang_statistics_accumulated_worked_cqzone = '<?php echo __("Accumulated Number of CQ Zones worked"); ?>';
+    var lang_general_word_year = '<?php echo __("Year"); ?>';
+    var lang_general_word_yearly = '<?php echo __("Yearly"); ?>';
+    var lang_general_word_month = '<?php echo __("Month"); ?>';
+    var lang_general_word_monthly = '<?php echo __("Monthly"); ?>';
 </script>
 <div class="container">
     <h2><?php echo $page_title; ?></h1>
@@ -15,20 +15,20 @@
 
             <!-- Select Basic -->
             <div class="mb-3 row">
-                <label class="col-md-1 control-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+                <label class="col-md-1 control-label" for="band"><?php echo __("Band"); ?></label>
                 <div class="col-md-3">
                     <select id="band" name="band" class="form-select">
-                        <option value="All"><?php echo lang('general_word_all'); ?></option>
+                        <option value="All"><?php echo __("All"); ?></option>
                         <?php foreach ($worked_bands as $band) {
                             echo '<option value="' . $band . '">' . $band . '</option>' . "\n";
                         } ?>
                     </select>
                 </div>
 
-                <label class="col-md-1 control-label" for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+                <label class="col-md-1 control-label" for="mode"><?php echo __("Mode"); ?></label>
                 <div class="col-md-3">
                     <select id="mode" name="mode" class="form-select">
-                        <option value="All"><?php echo lang('general_word_all'); ?></option>
+                        <option value="All"><?php echo __("All"); ?></option>
                         <?php
                         foreach ($modes->result() as $mode) {
                             if ($mode->submode == null) {
@@ -44,7 +44,7 @@
 
             <div class="mb-3 row">
 
-                <label class="col-md-1 control-label" for="radio"><?php echo lang('gen_hamradio_award'); ?></label>
+                <label class="col-md-1 control-label" for="radio"><?php echo __("Award"); ?></label>
                 <div class="col-md-3">
                     <div class="form-check">
                         <input class="form-check-input" type="radio" name="awardradio" id="dxcc" value="dxcc" checked>
@@ -72,18 +72,18 @@
                     </div>
                 </div>
 
-                <label class="col-md-1 control-label" for="radio"><?php echo lang('general_word_period'); ?></label>
+                <label class="col-md-1 control-label" for="radio"><?php echo __("Period"); ?></label>
                 <div class="col-md-3">
                     <div class="form-check">
                         <input class="form-check-input" type="radio" name="periodradio" id="yearly" value="year" checked>
                         <label class="form-check-label" for="yearly">
-                            <?php echo lang('general_word_yearly'); ?>
+                            <?php echo __("Yearly"); ?>
                         </label>
                     </div>
                     <div class="form-check">
                         <input class="form-check-input" type="radio" name="periodradio" id="monthly" value="month">
                         <label class="form-check-label" for="monthly">
-                            <?php echo lang('general_word_monthly'); ?>
+                            <?php echo __("Monthly"); ?>
                         </label>
                     </div>
                 </div>
@@ -93,7 +93,7 @@
             <!-- Button (Double) -->
             <div class="mb-3 row">
                 <div class="col-md-10">
-                    <button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="accumulatePlot(this.form)"><?php echo lang('general_word_show'); ?><div class="ld ld-ring ld-spin"></div></button>
+                    <button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="accumulatePlot(this.form)"><?php echo __("Show"); ?><div class="ld ld-ring ld-spin"></div></button>
                 </div>
             </div>
 
diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php
index 0c2da4145..5da73f969 100644
--- a/application/views/activated_gridmap/index.php
+++ b/application/views/activated_gridmap/index.php
@@ -2,12 +2,12 @@
 
 	<br>
 
-	<h2><?php echo lang('gridsquares_activated_gridsquare_map'); ?></h2>
+	<h2><?php echo __("Activated Gridsquare Map"); ?></h2>
 
 <form class="d-flex align-items-center">
-            <label class="my-1 me-2" for="band"><?php echo lang('gridsquares_band'); ?></label>
+            <label class="my-1 me-2" for="band"><?php echo __("Band"); ?></label>
             <select class="form-select my-1 me-sm-2 w-auto"  id="band">
-                <option value="All"><?php echo lang('general_word_all')?></option>
+                <option value="All"><?php echo __("All")?></option>
                 <?php foreach($bands as $band) {
                     echo '<option value="'.$band.'"';
                     if ($user_default_band == $band) {
@@ -17,9 +17,9 @@
                 } ?>
             </select>
             <?php if (count($sats_available) != 0) { ?>
-                <label class="my-1 me-2" for="distplot_sats" id="satslabel" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo lang('gridsquares_sat'); ?></label>
+                <label class="my-1 me-2" for="distplot_sats" id="satslabel" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo __("Satellite"); ?></label>
                 <select class="form-select my-1 me-sm-2 w-auto"  id="sats" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>>
-                    <option value="All"><?php echo lang('general_word_all')?></option>
+                    <option value="All"><?php echo __("All")?></option>
                     <?php foreach($sats_available as $sat) {
                         echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n";
                     } ?>
@@ -27,18 +27,18 @@
             <?php } else { ?>
                 <input id="sats" type="hidden" value="All"></input>
             <?php } ?>
-                <label class="my-1 me-2" id="orbitslabel" for="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo lang('gridsquares_orbit'); ?></label>
+                <label class="my-1 me-2" id="orbitslabel" for="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo __("Orbit"); ?></label>
                 <select class="form-select my-1 me-sm-2 w-auto"  id="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>>
-                    <option value="All"><?php echo lang('general_word_all')?></option>
+                    <option value="All"><?php echo __("All")?></option>
                     <?php
                     foreach($orbits as $orbit){
                          echo '<option value="' . $orbit . '">' . strtoupper($orbit) . '</option>'."\n";
                     }
                     ?>
             </select>
-			<label class="my-1 me-2" for="mode"><?php echo lang('gridsquares_mode'); ?></label>
+			<label class="my-1 me-2" for="mode"><?php echo __("Mode"); ?></label>
             <select class="form-select my-1 me-sm-2 w-auto"  id="mode">
-			<option value="All"><?php echo lang('general_word_all')?></option>
+			<option value="All"><?php echo __("All")?></option>
                     <?php
                     foreach($modes as $mode){
                         if ($mode->submode ?? '' == '') {
@@ -47,7 +47,7 @@
                     }
                     ?>
             </select>
-			<label class="my-1 me-2"><?php echo lang('gridsquares_confirmation'); ?></label>
+			<label class="my-1 me-2"><?php echo __("Confirmation"); ?></label>
                 <div>
                     <div class="form-check-inline">
                     <?php echo '<input class="form-check-input" type="checkbox" name="qsl" id="qsl"';
@@ -83,8 +83,8 @@
                     </div>
                 </div>
 
-            <button id="plot" type="button" name="plot" class="btn btn-primary me-1 ld-ext-right ld-ext-right-plot" onclick="gridPlot(this.form,<?php echo $visitor == true ? "true" : "false"; ?>)"><?php echo lang('gridsquares_button_plot'); ?><div class="ld ld-ring ld-spin"></div></button>
-			<button id="clear" type="button" name="clear" class="btn btn-primary me-1 ld-ext-right ld-ext-right-clear" onclick="clearMarkers()"><?php echo lang('gridsquares_button_clear_markers'); ?><div class="ld ld-ring ld-spin"></div></button>
+            <button id="plot" type="button" name="plot" class="btn btn-primary me-1 ld-ext-right ld-ext-right-plot" onclick="gridPlot(this.form,<?php echo $visitor == true ? "true" : "false"; ?>)"><?php echo __("Plot"); ?><div class="ld ld-ring ld-spin"></div></button>
+			<button id="clear" type="button" name="clear" class="btn btn-primary me-1 ld-ext-right ld-ext-right-clear" onclick="clearMarkers()"><?php echo __("Clear Markers"); ?><div class="ld ld-ring ld-spin"></div></button>
 </form>
 
 		<?php if($this->session->flashdata('message')) { ?>
@@ -99,15 +99,15 @@
 	<div id="gridsquare_map" class="map-leaflet" style="width: 100%;"></div>
 </div>
 <div class="coordinates d-flex">
-        <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>:&nbsp;</div>
+        <div class="cohidden"><?php echo __("Latitude")?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>:&nbsp;</div>
+        <div class="cohidden"><?php echo __("Longitude")?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>:&nbsp;</div>
+        <div class="cohidden"><?php echo __("Gridsquare")?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>:&nbsp;</div>
+        <div class="cohidden"><?php echo __("Distance")?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>:&nbsp;</div>
+        <div class="cohidden"><?php echo __("Bearing")?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>
diff --git a/application/views/activators/index.php b/application/views/activators/index.php
index 2fcaa853c..3467c1c79 100644
--- a/application/views/activators/index.php
+++ b/application/views/activators/index.php
@@ -1,13 +1,13 @@
 <div class="container">
-    <h1><?php echo lang('gridsquares_gridsquare_activators'); ?></h1>
+    <h1><?php echo __("Gridsquare Activators"); ?></h1>
 
     <form class="form" action="<?php echo site_url('activators'); ?>" method="post" enctype="multipart/form-data">
         <!-- Select Basic -->
         <div class="mb-3 row">
-            <label class="col-md-1 control-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+            <label class="col-md-1 control-label" for="band"><?php echo __("Band"); ?></label>
             <div class="col-md-3">
                 <select id="band" name="band" class="form-select">
-                    <option value="All" <?php if ($bandselect == "All") echo ' selected'; ?>><?php echo lang('general_word_all'); ?></option>
+                    <option value="All" <?php if ($bandselect == "All") echo ' selected'; ?>><?php echo __("All"); ?></option>
                     <?php foreach ($worked_bands as $band) {
                         echo '<option value="' . $band . '"';
                         if ($bandselect == $band) echo ' selected';
@@ -27,7 +27,7 @@
             </div>
         </div>
         <div class="mb-3 row">
-            <label class="col-md-1 control-label" for="mincount"><?php echo lang('gridsquares_minimum_count'); ?></label>
+            <label class="col-md-1 control-label" for="mincount"><?php echo __("Minimum Count"); ?></label>
             <div class="col-md-3">
                 <select id="mincount" name="mincount" class="form-select">
                     <?php
@@ -47,7 +47,7 @@
         <div class="mb-3 row">
             <label class="col-md-1 control-label" for="button1id"></label>
             <div class="col-md-10">
-                <button id="button1id" type="submit" name="button1id" class="btn btn-primary"><?php echo lang('filter_options_show'); ?></button>
+                <button id="button1id" type="submit" name="button1id" class="btn btn-primary"><?php echo __("Show"); ?></button>
             </div>
         </div>
 
@@ -96,11 +96,11 @@ function write_activators($activators_array, $vucc_grids, $custom_date_format, $
               <thead>
                     <tr>
                         <td>#</td>
-                        <td>' . lang('gen_hamradio_callsign') . '</td>
-                        <td>' . lang('general_word_count') . '</td>
-                        <td>' . lang('gridsquares_gridsquares') . '</td>
-                        <td>' . lang('gridsquares_show_qsos') . '</td>
-                        <td>' . lang('gridsquares_show_map') . '</td>
+                        <td>' . __("Callsign") . '</td>
+                        <td>' . __("Count") . '</td>
+                        <td>' . __("Gridsquares") . '</td>
+                        <td>' . __("Show QSO's") . '</td>
+                        <td>' . __("Show Map") . '</td>
                     </tr>
                 </thead>
                 <tbody>';
diff --git a/application/views/adif/dcl_success.php b/application/views/adif/dcl_success.php
index 0af525c4c..4f2980206 100644
--- a/application/views/adif/dcl_success.php
+++ b/application/views/adif/dcl_success.php
@@ -9,21 +9,21 @@
 
 <div class="card">
   <div class="card-header">
-    <?php echo lang('dcl_results');?>
+    <?php echo __("Results of DCL DOK Update");?>
   </div>
   <div class="card-body">
     <?php if($dcl_error_count[0] > 0) { ?>
        <h3 class="card-title">Yay, its updated!</h3>
-       <p class="card-text"><?php echo lang('dcl_info_updated')?></p>
+       <p class="card-text"><?php echo __("DCL information for DOKs has been updated.")?></p>
     <?php } else { ?>
-       <h3 class="card-title"><?php echo lang('dcl_no_qsos_updated')?></h3>
+       <h3 class="card-title"><?php echo __("No QSOs found which could be updated.")?></h3>
     <?php } ?>
        <div class="alert alert-info" role="alert">
-          <?php echo lang('dcl_qsos_updated')?>: <?php echo $dcl_error_count[0] ?> / <?php echo lang('dcl_qsos_ignored')?>: <?php echo $dcl_error_count[1] ?> / <?php echo lang('dcl_qsos_unmatched')?>: <?php echo $dcl_error_count[2] ?>
+          <?php echo __("QSOs updated")?>: <?php echo $dcl_error_count[0] ?> / <?php echo __("QSOs ignored")?>: <?php echo $dcl_error_count[1] ?> / <?php echo __("QSOs unmatched")?>: <?php echo $dcl_error_count[2] ?>
        </div>
     <?php if($dcl_errors) { ?>
-      <h3><?php echo lang('dcl_dok_errors')?></h3>
-      <p><?php echo lang('dcl_dok_errors_details')?></p>
+      <h3><?php echo __("DOK Errors")?></h3>
+      <p><?php echo __("There is different data for DOK in your log compared to DCL")?></p>
       <table width="100%">
          <tr class="titles">
             <td>Date</td>
diff --git a/application/views/adif/import.php b/application/views/adif/import.php
index ae0164f52..74bffc258 100644
--- a/application/views/adif/import.php
+++ b/application/views/adif/import.php
@@ -18,13 +18,13 @@
                                                                                                                                                         echo 'true';
                                                                                                                                                     } else {
                                                                                                                                                         echo 'false';
-                                                                                                                                                    } ?>"><?php echo lang('adif_import') ?></a>
+                                                                                                                                                    } ?>"><?php echo __("ADIF Import") ?></a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="export" aria-selected="false"><?php echo lang('adif_export') ?></a>
+                    <a class="nav-link" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="export" aria-selected="false"><?php echo __("ADIF Export") ?></a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" id="lotw-tab" data-bs-toggle="tab" href="#lotw" role="tab" aria-controls="lotw" aria-selected="false"><?php echo lang('lotw_title') ?></a>
+                    <a class="nav-link" id="lotw-tab" data-bs-toggle="tab" href="#lotw" role="tab" aria-controls="lotw" aria-selected="false"><?php echo __("Logbook of the World") ?></a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link <?php if ($showtab == 'dcl') {
@@ -33,7 +33,7 @@
                                                                                                                                                 echo 'true';
                                                                                                                                             } else {
                                                                                                                                                 echo 'false';
-                                                                                                                                            } ?>"><?php echo lang('darc_dcl') ?></a>
+                                                                                                                                            } ?>"><?php echo __("DARC DCL") ?></a>
                 </li>
             </ul>
         </div>
@@ -52,21 +52,21 @@
                         </div>
                     <?php } ?>
 
-                    <p><span class="badge text-bg-warning"><?php echo lang('general_word_important') ?></span> <?php echo lang('adif_alert_log_files_type') ?></p>
-                    <p><span class="badge text-bg-warning"><?php echo lang('general_word_warning') ?></span> <?php echo lang('gen_max_file_upload_size') ?><?php echo $max_upload; ?>B.</p>
+                    <p><span class="badge text-bg-warning"><?php echo __("Important") ?></span> <?php echo __("Log Files must have the file type *.adi") ?></p>
+                    <p><span class="badge text-bg-warning"><?php echo __("Warning") ?></span> <?php echo __("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">
 			<input type="hidden" name="fhash" id="fhash" value="<?php echo hash('sha256', $this->session->userdata('user_callsign') );?>">
-                        <div class="small form-text text-muted"><?php echo lang('adif_select_stationlocation') ?></div>
+                        <div class="small form-text text-muted"><?php echo __("Select Station Location") ?></div>
                         <select name="station_profile" class="form-select mb-2 me-sm-2" style="width: 20%;">
-                            <option value="0"><?php echo lang('adif_select_stationlocation') ?></option>
+                            <option value="0"><?php echo __("Select Station Location") ?></option>
                             <?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\"";
-                                                                                    } ?>><?php echo lang('gen_hamradio_callsign') . ": " ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+                                                                                    } ?>><?php echo __("Callsign") . ": " ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
                             <?php } ?>
                         </select>
-                        <div class="small form-text text-muted"><?php echo lang('gen_add_to_contest') ?></div>
+                        <div class="small form-text text-muted"><?php echo __("Add QSOs to Contest") ?></div>
                         <select name="contest" id="contest" class="form-select mb-2 me-sm-2" style="width: 20%;">
                         	<option value="" selected>No Contest</option>
                             <?php
@@ -74,14 +74,14 @@
                                 echo '<option value="'.$contest['adifname'].'">'.$contest['name'].'</option>';
                             } ?>
 			</select>
- 			<label class="visually-hidden" for="inlineFormInputName2"><?php echo lang('adif_file_label') ?></label>
+ 			<label class="visually-hidden" for="inlineFormInputName2"><?php echo __("ADIF File") ?></label>
                         <input class="form-control mb-2 me-sm-2 w-auto" type="file" name="userfile" id="userfile" size="20" />
 
                         <div class="mb-3 row">
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="skipDuplicate" value="1" id="skipDuplicate">
-                                    <label class="form-check-label" for="skipDuplicate"><?php echo lang('adif_import_dup') ?></label>
+                                    <label class="form-check-label" for="skipDuplicate"><?php echo __("Import duplicate QSOs") ?></label>
                                 </div>
                             </div>
                         </div>
@@ -90,9 +90,9 @@
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="markLotw" value="1" id="markLotwImport">
-                                    <label class="form-check-label" for="markLotwImport"><?php echo lang('adif_mark_imported_lotw') ?></label>
+                                    <label class="form-check-label" for="markLotwImport"><?php echo __("Mark imported QSOs as uploaded to LoTW") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?php echo lang('adif_hint_no_info_in_file') ?></div>
+                                <div class="small form-text text-muted"><?php echo __("Select if ADIF being imported does not contain this information.") ?></div>
                             </div>
                         </div>
 
@@ -100,9 +100,9 @@
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="markHrd" value="1" id="markHrdImport">
-                                    <label class="form-check-label" for="markHrdImport"><?php echo lang('adif_mark_imported_hrdlog') ?></label>
+                                    <label class="form-check-label" for="markHrdImport"><?php echo __("Mark imported QSOs as uploaded to HRDLog.net Logbook") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?php echo lang('adif_hint_no_info_in_file') ?></div>
+                                <div class="small form-text text-muted"><?php echo __("Select if ADIF being imported does not contain this information.") ?></div>
                             </div>
                         </div>
 
@@ -110,9 +110,9 @@
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="markQrz" value="1" id="markQrzImport">
-                                    <label class="form-check-label" for="markQrzImport"><?php echo lang('adif_mark_imported_qrz') ?></label>
+                                    <label class="form-check-label" for="markQrzImport"><?php echo __("Mark imported QSOs as uploaded to QRZ Logbook") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?php echo lang('adif_hint_no_info_in_file') ?></div>
+                                <div class="small form-text text-muted"><?php echo __("Select if ADIF being imported does not contain this information.") ?></div>
                             </div>
                         </div>
 
@@ -120,9 +120,9 @@
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="markClublog" value="1" id="markClublogImport">
-                                    <label class="form-check-label" for="markClublogImport"><?php echo lang('adif_mark_imported_clublog') ?></label>
+                                    <label class="form-check-label" for="markClublogImport"><?php echo __("Mark imported QSOs as uploaded to Clublog Logbook") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?php echo lang('adif_hint_no_info_in_file') ?></div>
+                                <div class="small form-text text-muted"><?php echo __("Select if ADIF being imported does not contain this information.") ?></div>
                             </div>
                         </div>
 
@@ -130,9 +130,9 @@
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="dxccAdif" value="1" id="dxccAdif">
-                                    <label class="form-check-label" for="dxccAdif"><?php echo lang('adif_dxcc_from_adif') ?></label>
+                                    <label class="form-check-label" for="dxccAdif"><?php echo __("Use DXCC information from ADIF") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?php echo lang('adif_dxcc_from_adif_hint') ?></div>
+                                <div class="small form-text text-muted"><?php echo __("If not selected, Wavelog will attempt to determine DXCC information automatically.") ?></div>
                             </div>
                         </div>
 
@@ -140,7 +140,7 @@
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="operatorName" value="1" id="operatorName">
-                                    <label class="form-check-label" for="operatorName"><?php echo lang('adif_always_use_login_call_as_op') ?></label>
+                                    <label class="form-check-label" for="operatorName"><?php echo __("Always use login-callsign as operator-name on import") ?></label>
                                 </div>
                             </div>
                         </div>
@@ -149,34 +149,34 @@
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="skipStationCheck" value="1" id="skipStationCheck">
-                                    <label class="form-check-label" for="skipStationCheck"><span class="badge text-bg-warning"><?php echo lang('general_word_danger') ?></span> <?php echo lang('adif_ignore_station_call') ?></label>
+                                    <label class="form-check-label" for="skipStationCheck"><span class="badge text-bg-warning"><?php echo __("DANGER") ?></span> <?php echo __("Ignore Stationcallsign on import") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?php echo lang('adif_ignore_station_call_hint') ?></div>
+                                <div class="small form-text text-muted"><?php echo __("If selected, Wavelog will try to import <b>all</b> QSO's of the ADIF, regardless if they match to the chosen station-location.") ?></div>
                             </div>
                         </div>
 
-                        <button id="prepare_sub" class="btn btn-sm btn-primary mb-2" value="Upload"><?php echo lang('adif_upload') ?></button>
+                        <button id="prepare_sub" class="btn btn-sm btn-primary mb-2" value="Upload"><?php echo __("Upload") ?></button>
                     </form>
                 </div>
 
                 <div class="tab-pane fade" id="export" role="tabpanel" aria-labelledby="home-tab">
 
                     <form class="form" action="<?php echo site_url('adif/export_custom'); ?>" method="post" enctype="multipart/form-data">
-                        <h5 class="card-title"><?php echo lang('adif_export_take_it_anywhere') ?> </h5>
-                        <p class="card-text"><?php echo lang('adif_export_take_it_anywhere_hint') ?> </p>
+                        <h5 class="card-title"><?php echo __("Take your logbook file anywhere!") ?> </h5>
+                        <p class="card-text"><?php echo __("Exporting ADIFs allows you to import contacts into third party applications like LoTW, Awards or just for keeping a backup.") ?> </p>
                         <select name="station_profile" class="form-select mb-2 me-sm-2" style="width: 20%;">
-                            <option value="0"><?php echo lang('adif_select_stationlocation') ?></option>
+                            <option value="0"><?php echo __("Select Station Location") ?></option>
                             <?php foreach ($station_profile->result() as $station) { ?>
                                 <option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) {
                                                                                         echo " selected =\"selected\"";
-                                                                                    } ?>><?php echo lang('gen_hamradio_callsign') . ": " ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+                                                                                    } ?>><?php echo __("Callsign") . ": " ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
                             <?php } ?>
                         </select>
                         <br>
-                        <label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+                        <label for="from"><?php echo __("From date") . ": " ?></label>
                         <input name="from" id="from" type="date" class="form-control w-auto">
                         <br>
-                        <label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
+                        <label for="to"><?php echo __("To date") . ": " ?></label>
                         <input name="to" id="to" type="date" class="form-control w-auto">
 
                         <br>
@@ -184,7 +184,7 @@
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="markLotw" value="1" id="markLotwExport">
-                                    <label class="form-check-label" for="markLotwExport"><?php echo lang('adif_mark_exported_lotw') ?></label>
+                                    <label class="form-check-label" for="markLotwExport"><?php echo __("Mark exported QSOs as uploaded to LoTW") ?></label>
                                 </div>
                             </div>
                         </div>
@@ -192,40 +192,40 @@
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="exportLotw" value="1" id="exportLotw">
-                                    <label class="form-check-label" for="exportLotw"><?php echo lang('adif_mark_exported_no_lotw') ?></label>
+                                    <label class="form-check-label" for="exportLotw"><?php echo __("Export QSOs not uploaded to LoTW") ?></label>
                                 </div>
                             </div>
                         </div>
 
-                        <button type="submit" class="btn btn-sm btn-primary" value="Export"><?php echo lang('adif_export_qso') ?></button>
+                        <button type="submit" class="btn btn-sm btn-primary" value="Export"><?php echo __("Export QSO's") ?></button>
                     </form>
 
                     <br><br>
 
-                    <h5><?php echo lang('adif_export_sat_only_qso') ?></h5>
-                    <p><a href="<?php echo site_url('adif/exportsat'); ?>" title="Export All Satellite Contacts" target="_blank" class="btn btn-sm btn-primary"><?php echo lang('adif_export_sat_only_qso_all') ?></a></p>
+                    <h5><?php echo __("Export Satellite-Only QSOs") ?></h5>
+                    <p><a href="<?php echo site_url('adif/exportsat'); ?>" title="Export All Satellite Contacts" target="_blank" class="btn btn-sm btn-primary"><?php echo __("Export All Satellite QSOs") ?></a></p>
 
-                    <p><a href="<?php echo site_url('adif/exportsatlotw'); ?>" title="Export All Satellite QSOs Confirmed on LoTW" target="_blank" class="btn btn-sm btn-primary"><?php echo lang('adif_export_sat_only_qso_lotw') ?></a></p>
+                    <p><a href="<?php echo site_url('adif/exportsatlotw'); ?>" title="Export All Satellite QSOs Confirmed on LoTW" target="_blank" class="btn btn-sm btn-primary"><?php echo __("Export All Satellite QSOs Confirmed on LoTW") ?></a></p>
                 </div>
 
 
                 <div class="tab-pane fade" id="lotw" role="tabpanel" aria-labelledby="home-tab">
                     <form class="form" action="<?php echo site_url('adif/mark_lotw'); ?>" method="post" enctype="multipart/form-data">
                         <select name="station_profile" class="form-select mb-2 me-sm-2" style="width: 20%;">
-                            <option value="0"><?php echo lang('adif_select_stationlocation') ?></option>
+                            <option value="0"><?php echo __("Select Station Location") ?></option>
                             <?php foreach ($station_profile->result() as $station) { ?>
-                                <option value="<?php echo $station->station_id; ?>"><?php echo lang('gen_hamradio_callsign') . ": " ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+                                <option value="<?php echo $station->station_id; ?>"><?php echo __("Callsign") . ": " ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
                             <?php } ?>
                         </select>
-                        <p><span class="badge text-bg-warning"><?php echo lang('general_word_warning') ?></span> <?php echo lang('adif_lotw_export_if_selected') ?></p>
+                        <p><span class="badge text-bg-warning"><?php echo __("Warning") ?></span> <?php echo __("If a date range is not selected then all QSOs will be marked!") ?></p>
                         <br>
-                        <label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+                        <label for="from"><?php echo __("From date") . ": " ?></label>
                         <input name="from" id="from" type="date" class="form-control w-auto">
                         <br>
-                        <label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
+                        <label for="to"><?php echo __("To date") . ": " ?></label>
                         <input name="to" id="to" type="date" class="form-control w-auto">
                         <br>
-                        <button type="button" class="btn btn-sm btn-primary" id="markExportedToLotw" value="Export"><?php echo lang('adif_mark_qso_as_exported_to_lotw') ?></button>
+                        <button type="button" class="btn btn-sm btn-primary" id="markExportedToLotw" value="Export"><?php echo __("Mark QSOs as exported to LoTW") ?></button>
                     </form>
                 </div>
                 <div class="tab-pane <?php if ($showtab == 'dcl') {
@@ -239,38 +239,38 @@
                         </div>
                     <?php } ?>
 
-                    <p class="card-text"><?php echo lang('adif_dcl_text_pre') ?> <a href="http://dcl.darc.de/dml/export_adif_form.php" target="_blank"><?php echo lang('darc_dcl') ?></a> <?php echo lang('adif_dcl_text_post') ?></p>
+                    <p class="card-text"><?php echo __("Go to") ?> <a href="http://dcl.darc.de/dml/export_adif_form.php" target="_blank"><?php echo __("DARC DCL") ?></a> <?php echo __("and export your logbook with confirmed DOKs. To speed up the process you can select only DL QSOs to download (i.e. put \"DL\" into Prefix List). The downloaded ADIF file can be uploaded here in order to update QSOs with DOK info.") ?></p>
                     <form class="form" action="<?php echo site_url('adif/dcl'); ?>" method="post" enctype="multipart/form-data">
 
                         <div class="mb-3 row">
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="onlyConfirmed" value="1" id="onlyConfirmed" checked>
-                                    <label class="form-check-label" for="onlyConfirmed"><?php echo lang('only_confirmed_qsos') ?></label>
+                                    <label class="form-check-label" for="onlyConfirmed"><?php echo __("Only import DOK data from QSOs confirmed on DCL.") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?php echo lang('only_confirmed_qsos_hint') ?></div>
+                                <div class="small form-text text-muted"><?php echo __("Uncheck if you also want to update DOK with data from unconfirmed QSOs in DCL.") ?></div>
                             </div>
                         </div>
                         <div class="mb-3 row">
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="overwriteDok" value="1" id="overwriteDok">
-                                    <label class="form-check-label" for="overwriteDok"><span class="badge text-bg-warning"><?php echo lang('general_word_warning') ?></span> <?php echo lang('overwrite_by_dcl') ?></label>
+                                    <label class="form-check-label" for="overwriteDok"><span class="badge text-bg-warning"><?php echo __("Warning") ?></span> <?php echo __("Overwrite exisiting DOK in log by DCL (if different).") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?php echo lang('overwrite_by_dcl_hint') ?></div>
+                                <div class="small form-text text-muted"><?php echo __("If checked Wavelog will forcibly overwrite existing DOK with DOK from DCL log.") ?></div>
                             </div>
                         </div>
                         <div class="mb-3 row">
                             <div class="col-md-10">
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="ignoreAmbiguous" value="1" id="ignoreAmbiguous" checked>
-                                    <label class="form-check-label" for="ignoreAmbiguous"><?php echo lang('ignore_ambiguous') ?></label>
+                                    <label class="form-check-label" for="ignoreAmbiguous"><?php echo __("Ignore QSOs that cannot be matched.") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?php echo lang('ignore_ambiguous_hint') ?></div>
+                                <div class="small form-text text-muted"><?php echo __("If unchecked information about QSO which could not be found in Wavelog will be displayed.") ?></div>
                             </div>
                         </div>
                         <input class="file-input mb-2 me-sm-2" type="file" name="userfile" size="20" />
-                        <button type="submit" class="btn btn-sm btn-primary mb-2" value="Upload"><?php echo lang('adif_upload') ?></button>
+                        <button type="submit" class="btn btn-sm btn-primary mb-2" value="Upload"><?php echo __("Upload") ?></button>
                     </form>
                 </div>
             </div>
diff --git a/application/views/adif/import_success.php b/application/views/adif/import_success.php
index 573767093..a86bb2fae 100644
--- a/application/views/adif/import_success.php
+++ b/application/views/adif/import_success.php
@@ -9,20 +9,20 @@
 
 <div class="card">
   <div class="card-header">
-    <?php echo lang('adif_imported')?>
+    <?php echo __("ADIF Imported")?>
   </div>
   <div class="card-body">
-    <h3 class="card-title"><?php echo lang('adif_yay_its_imported')?></h3>
-    <p class="card-text"><?php echo lang('adif_import_confirm')?>
+    <h3 class="card-title"><?php echo __("Yay, its imported!")?></h3>
+    <p class="card-text"><?php echo __("The ADIF File has been imported.")?>
     <?php if(isset($skip_dupes)) {
-             echo lang('adif_import_dupes_inserted');
+             echo __(" <b>Dupes were inserted!</b>");
           } else {
-             echo lang('adif_import_dupes_skipped');
+             echo __(" Dupes were skipped.");
           } ?>
     </p>
     <?php if($adif_errors) { ?>
-      <h3><?php echo lang('adif_import_errors')?></h3>
-      <p><?php echo lang('adif_import_errors_hint')?></p>
+      <h3><?php echo __("ADIF Errors")?></h3>
+      <p><?php echo __("You have ADIF errors, the QSOs have still been added but these fields have not been populated.")?></p>
       <p class="card-text"><?php echo $adif_errors; ?></p>
     <?php } ?>
   </div>
diff --git a/application/views/adif/mark_lotw.php b/application/views/adif/mark_lotw.php
index 9a7fbf077..b142f35cc 100644
--- a/application/views/adif/mark_lotw.php
+++ b/application/views/adif/mark_lotw.php
@@ -9,11 +9,11 @@
 
     <div class="card">
         <div class="card-header">
-            <?php echo lang('adif_qso_marked')?>
+            <?php echo __("QSOs marked")?>
         </div>
         <div class="card-body">
-            <h3 class="card-title"><?php echo lang('adif_yay_its_done')?></h3>
-            <p class="card-text"><?php echo lang('adif_qso_lotw_marked_confirm')?></p>
+            <h3 class="card-title"><?php echo __("Yay, its done!")?></h3>
+            <p class="card-text"><?php echo __("The QSOs are marked as exported to LoTW.")?></p>
         </div>
     </div>
 
diff --git a/application/views/api/help.php b/application/views/api/help.php
index bbc2b9fd9..289336f50 100644
--- a/application/views/api/help.php
+++ b/application/views/api/help.php
@@ -16,7 +16,7 @@
   <div class="card-body">
 	<p class="card-text">The Wavelog API (Application Programming Interface) lets third party systems access Wavelog in a controlled way. Access to the API is managed via API keys.</p>
 	<p class="card-text">You will need to generate an API key for each tool you wish to use (e.g. WavelogCAT). Generate a read-write key if the application needs to send data to Wavelog. Generate a read-only key if the application only needs to obtain data from Wavelog.</p>
-   <p class="card-text"><span class="badge text-bg-warning">API URL</span> The API URL for this Wavelog instance is: <span class="api-url" id="apiUrl"><a target="_blank" href="<?php echo base_url(); ?>"><?php echo base_url(); ?></a></span><span data-bs-toggle="tooltip" title="<?php echo lang('copy_to_clipboard'); ?>" onClick='copyApiUrl()'><i class="copy-icon fas fa-copy"></i></span></p>
+   <p class="card-text"><span class="badge text-bg-warning">API URL</span> The API URL for this Wavelog instance is: <span class="api-url" id="apiUrl"><a target="_blank" href="<?php echo base_url(); ?>"><?php echo base_url(); ?></a></span><span data-bs-toggle="tooltip" title="<?php echo __("Copy to clipboard"); ?>" onClick='copyApiUrl()'><i class="copy-icon fas fa-copy"></i></span></p>
 	<p class="card-text"><span class="badge text-bg-info">Info</span> It's good practice to delete a key if you are no longer using the associated application.</p>
 
 		<?php if ($api_keys->num_rows() > 0) { ?>
@@ -35,7 +35,7 @@
 		  <tbody>
 			<?php foreach ($api_keys->result() as $row) { ?>
 				<tr>
-					<td><i class="fas fa-key"></i> <span class="api-key" id="<?php echo $row->key; ?>"><?php echo $row->key; ?></span> <span data-bs-toggle="tooltip" title="<?php echo lang('copy_to_clipboard'); ?>" onclick='copyApiKey("<?php echo $row->key; ?>")'><i class="copy-icon fas fa-copy"></span></td>
+					<td><i class="fas fa-key"></i> <span class="api-key" id="<?php echo $row->key; ?>"><?php echo $row->key; ?></span> <span data-bs-toggle="tooltip" title="<?php echo __("Copy to clipboard"); ?>" onclick='copyApiKey("<?php echo $row->key; ?>")'><i class="copy-icon fas fa-copy"></span></td>
 					<td><?php echo $row->description; ?></td>
 					<td><?php echo $row->last_used; ?></td>
 					<td>
diff --git a/application/views/awards/counties/details.php b/application/views/awards/counties/details.php
index 4620d48ee..5266cc54c 100644
--- a/application/views/awards/counties/details.php
+++ b/application/views/awards/counties/details.php
@@ -1,7 +1,7 @@
 <div class="container">
     <h2><?php echo $page_title; ?></h2>
 
-    <h3><?php echo lang('general_word_filtering_on'); ?> <?php echo $filter ?></h3>
+    <h3><?php echo __("Filtering on"); ?> <?php echo $filter ?></h3>
     <?php
     $i = 1;
     if ($counties_array) {
diff --git a/application/views/awards/counties/index.php b/application/views/awards/counties/index.php
index fa126e530..7786934cc 100644
--- a/application/views/awards/counties/index.php
+++ b/application/views/awards/counties/index.php
@@ -3,14 +3,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_counties_description_ln1'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("US County Award"); ?>";
             var lang_award_info_ln2 = "<?php echo lang('awards_counties_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_counties_description_ln3'); ?>";
-            var lang_award_info_ln4 = "<?php echo lang('awards_counties_description_ln4'); ?>";
+            var lang_award_info_ln3 = "<?php echo __("USA-CA is available to all licensed amateurs worldwide and is issued to individuals for all county contacts made, regardless of callsigns used, operating locations, or dates."); ?>";
+            var lang_award_info_ln4 = "<?php echo __("Special USA-CA awards are also available to SWLs on a heard basis."); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
     <?php if ($counties_array) { ?>
diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php
index 6cb55db2c..ddc11efb4 100644
--- a/application/views/awards/cq/index.php
+++ b/application/views/awards/cq/index.php
@@ -14,14 +14,14 @@
 	<br>
   <div id="awardInfoButton">
     <script>
-      var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-      var lang_award_info_ln1 = "<?php echo lang('awards_cq_description_ln1'); ?>";
-      var lang_award_info_ln2 = "<?php echo lang('awards_cq_description_ln2'); ?>";
-      var lang_award_info_ln3 = "<?php echo lang('awards_cq_description_ln3'); ?>";
+      var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+      var lang_award_info_ln1 = "<?php echo __("CQ Magazine WAZ Award"); ?>";
+      var lang_award_info_ln2 = "<?php echo __("The CQ Magazine is located in the US and one of the most popular amateur radio magazines in the world. The magazine first appeared in January 1945 and focuses on awards and the practical aspects of amateur radio."); ?>";
+      var lang_award_info_ln3 = "<?php echo __("The WAZ Award stands for 'Worked All Zones' and requires radio contacts to all 40 CQ Zones along with the corresponding confirmation."); ?>";
       var lang_award_info_ln4 = "<?php echo lang('awards_cq_description_ln4'); ?>";
     </script>
-    <h2><?php echo lang('awards_cq_page_title'); ?></h2>
-    <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+    <h2><?php echo __("Awards - CQ Magazine WAZ"); ?></h2>
+    <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
   </div>
   <!-- End of Award Info Box -->
             <form class="form" action="<?php echo site_url('awards/cq'); ?>" method="post" enctype="multipart/form-data">
@@ -29,37 +29,37 @@
 
             <!-- Multiple Checkboxes (inline) -->
             <div class="mb-3 row">
-                <div class="col-md-2" for="checkboxes"><?php echo lang('general_word_worked') . ' / ' . lang('general_word_confirmed')?></div>
+                <div class="col-md-2" for="checkboxes"><?php echo __("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"'; ?> >
-                        <label class="form-check-label" for="worked"><?php echo lang('awards_show_worked'); ?></label>
+                        <label class="form-check-label" for="worked"><?php echo __("Show worked"); ?></label>
                     </div>
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="confirmed" id="confirmed" value="1" <?php if ($this->input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="confirmed"><?php echo lang('awards_show_confirmed'); ?></label>
+                        <label class="form-check-label" for="confirmed"><?php echo __("Show confirmed"); ?></label>
                     </div>
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="notworked" id="notworked" value="1" <?php if ($this->input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="notworked"><?php echo lang('awards_show_not_worked'); ?></label>
+                        <label class="form-check-label" for="notworked"><?php echo __("Show not worked"); ?></label>
                     </div>
                 </div>
             </div>
 
             <div class="mb-3 row">
-                <div class="col-md-2"><?php echo lang('awards_qsl_type'); ?></div>
+                <div class="col-md-2"><?php echo __("Show QSO with QSL Type"); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="qsl"><?php echo lang('general_word_qslcard'); ?></label>
+                        <label class="form-check-label" for="qsl"><?php echo __("QSL Card"); ?></label>
                     </div>
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="lotw" value="1" id="lotw" <?php if ($this->input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="lotw"><?php echo lang('lotw_short'); ?></label>
+                        <label class="form-check-label" for="lotw"><?php echo __("LoTW"); ?></label>
                     </div>
                    <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="eqsl" value="1" id="eqsl" <?php if ($this->input->post('eqsl')) echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="eqsl"><?php echo lang('eqsl_short'); ?></label>
+                        <label class="form-check-label" for="eqsl"><?php echo __("eQSL"); ?></label>
                     </div>
                    <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qrz" value="1" id="qrz" <?php if ($this->input->post('qrz')) echo ' checked="checked"'; ?> >
@@ -69,10 +69,10 @@
             </div>
 
             <div class="mb-3 row">
-                <label class="col-md-2 control-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+                <label class="col-md-2 control-label" for="band"><?php echo __("Band"); ?></label>
                 <div class="col-md-2">
                     <select id="band2" name="band" class="form-select form-select-sm">
-                        <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
+                        <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo __("All"); ?></option>
                         <?php foreach($worked_bands as $band) {
                             echo '<option value="' . $band . '"';
                             if ($this->input->post('band') == $band) echo ' selected';
@@ -83,10 +83,10 @@
             </div>
 
 			<div class="mb-3 row">
-				<label class="col-md-2 control-label" for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+				<label class="col-md-2 control-label" for="mode"><?php echo __("Mode"); ?></label>
 				<div class="col-md-2">
 					<select id="mode" name="mode" class="form-select form-select-sm">
-						<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>><?php echo lang('general_word_all'); ?></option>
+						<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>><?php echo __("All"); ?></option>
 						<?php
 						foreach($modes->result() as $mode){
 							if ($mode->submode == null) {
@@ -107,10 +107,10 @@
             <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
-                    <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning"><?php echo lang('filter_reset'); ?></button>
-                    <button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"><?php echo lang('filter_options_show'); ?></button>
+                    <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning"><?php echo __("Reset"); ?></button>
+                    <button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"><?php echo __("Show"); ?></button>
                     <?php if ($cq_array) {
-                        ?><button type="button" onclick="load_cq_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> <?php echo lang('awards_show_cq_map'); ?></button>
+                        ?><button type="button" onclick="load_cq_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> <?php echo __("Show CQ Zone Map"); ?></button>
                     <?php }?>
                 </div>
             </div>
@@ -119,10 +119,10 @@
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item">
-            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('general_word_table'); ?></a>
+            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true"><?php echo __("Table"); ?></a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" onclick="load_cq_map();" id="map-tab" data-bs-toggle="tab" href="#cqmaptab" role="tab" aria-controls="home" aria-selected="false"><?php echo lang('filter_map'); ?></a>
+            <a class="nav-link" onclick="load_cq_map();" id="map-tab" data-bs-toggle="tab" href="#cqmaptab" role="tab" aria-controls="home" aria-selected="false"><?php echo __("Map"); ?></a>
         </li>
     </ul>
     <br />
@@ -145,7 +145,7 @@
         <thead>
         <tr>
             <td>#</td>
-            <td>" . lang('gen_hamradio_cq_zone') . "</td>";
+            <td>" . __("CQ Zone") . "</td>";
         foreach($bands as $band) {
             echo '<td>' . $band . '</td>';
             }
@@ -162,7 +162,7 @@
             echo '</tr>';
         }
         echo "</table>
-        <h2>" . lang('awards_summary') . "</h2>
+        <h2>" . __("Summary") . "</h2>
 
         <table class='table-sm tablesummary table table-bordered table-hover table-striped table-condensed text-center'>
         <thead>
@@ -171,18 +171,18 @@
         foreach($bands as $band) {
             echo '<td>' . $band . '</td>';
         }
-        echo "<td>" . lang('awards_total') . "</td></tr>
+        echo "<td>" . __("Total") . "</td></tr>
         </thead>
         <tbody>
 
-        <tr><td>" . lang('awards_total_worked') . "</td>";
+        <tr><td>" . __("Total worked") . "</td>";
 
         foreach ($cq_summary['worked'] as $dxcc) {      // Fills the table with the data
             echo '<td style="text-align: center">' . $dxcc . '</td>';
         }
 
         echo "</tr><tr>
-        <td>" . lang('awards_total_confirmed') . "</td>";
+        <td>" . __("Total confirmed") . "</td>";
         foreach ($cq_summary['confirmed'] as $dxcc) {      // Fills the table with the data
             echo '<td style="text-align: center">' . $dxcc . '</td>';
         }
diff --git a/application/views/awards/details.php b/application/views/awards/details.php
index f656d5272..d66632a32 100644
--- a/application/views/awards/details.php
+++ b/application/views/awards/details.php
@@ -1,3 +1,3 @@
-<h5><?php echo lang('general_word_filtering_on'); ?> <?php echo $filter; ?></h5>
+<h5><?php echo __("Filtering on"); ?> <?php echo $filter; ?></h5>
 
 <?php $this->load->view('view_log/partial/log_ajax'); ?>
\ No newline at end of file
diff --git a/application/views/awards/dok/index.php b/application/views/awards/dok/index.php
index 4b3908103..bfaef588d 100644
--- a/application/views/awards/dok/index.php
+++ b/application/views/awards/dok/index.php
@@ -3,14 +3,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_dok_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_dok_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_dok_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("DOK Award"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("Germany extends over 630 km from East to West and nearly 900 km from North to South. Around 70,000 of Germany's 82 million inhabitants are licensed hams, with more than 40,000 of them being members of DARC. DOK is a system that provides individual local chapters with an identifier and means 'Deutscher Ortsverband Kenner' (English: 'German Local Association Identifier')."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("The DOK consists of a letter for the district and a two-digit number for the local chapter, like P03 Friedrichshafen (city of the 'Hamradio exhibition') or F41 Baunatal (location of the DARC headquarters). Note: A zero in a DOK is a common mistake, often being logged as the letter O."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_dok_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
             <form class="form" action="<?php echo site_url('awards/dok'); ?>" method="post" enctype="multipart/form-data">
@@ -48,7 +48,7 @@
             </div>
 
             <div class="mb-3 row">
-                <div class="col-md-2"><?php echo lang('awards_qsl_type'); ?></div>
+                <div class="col-md-2"><?php echo __("Show QSO with QSL Type"); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php
index ba552d188..15191768b 100644
--- a/application/views/awards/dxcc/index.php
+++ b/application/views/awards/dxcc/index.php
@@ -10,14 +10,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_dxcc_description_ln1'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("DXCC Award"); ?>";
             var lang_award_info_ln2 = "<?php echo lang('awards_dxcc_description_ln2'); ?>";
             var lang_award_info_ln3 = "<?php echo lang('awards_dxcc_description_ln3'); ?>";
-            var lang_award_info_ln4 = "<?php echo lang('awards_dxcc_description_ln4'); ?>";
+            var lang_award_info_ln4 = "<?php echo __("Important Note: Over time, the criteria for the DXCC List have changed. The List remains unchanged until an entity no longer satisfies the criteria under which it was added, at which time it is moved to the Deleted List. You will find Deleted DXCC entities also in the lists on Wavelog. Be aware that these DXCC entities are outdated and no longer valid."); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
@@ -54,7 +54,7 @@
             </div>
 
             <div class="mb-3 row">
-                <div class="col-md-2"><?php echo lang('awards_qsl_type'); ?></div>
+                <div class="col-md-2"><?php echo __("Show QSO with QSL Type"); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
@@ -124,10 +124,10 @@
             </div>
             <div id="satrow" class="mb-3 row" <?php if ($this->input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>>
 			<?php if (count($sats_available) != 0) { ?>
-                <label class="col-md-2 control-label" id="satslabel" for="distplot_sats"><?php echo lang('gridsquares_sat'); ?></label>
+                <label class="col-md-2 control-label" id="satslabel" for="distplot_sats"><?php echo __("Satellite"); ?></label>
 				<div class="col-md-2">
                 <select class="form-select form-select-sm"  id="sats" name="sats">
-                    <option value="All" <?php if ($this->input->post('sats') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>><?php echo lang('general_word_all')?></option>
+                    <option value="All" <?php if ($this->input->post('sats') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>><?php echo __("All")?></option>
                     <?php foreach($sats_available as $sat) {
                         echo '<option value="' . $sat . '"';
 						if ($this->input->post('sats') == $sat) echo ' selected';
@@ -140,10 +140,10 @@
             <?php } ?>
 			</div>
          <div id="orbitrow" class="mb-3 row" <?php if ($this->input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>>
-                <label class="col-md-2 control-label" id="orbitslabel" for="orbits"><?php echo lang('gridsquares_orbit'); ?></label>
+                <label class="col-md-2 control-label" id="orbitslabel" for="orbits"><?php echo __("Orbit"); ?></label>
 				<div class="col-md-2">
                 <select class="form-select form-select-sm"  id="orbits" name="orbits">
-                    <option value="All" <?php if ($this->input->post('orbits') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>><?php echo lang('general_word_all')?></option>
+                    <option value="All" <?php if ($this->input->post('orbits') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>><?php echo __("All")?></option>
                     <?php
                     foreach($orbits as $orbit){
                         echo '<option value="' . $orbit . '"';
@@ -231,7 +231,7 @@
                         <td>'. $i++ .'</td>';
             foreach ($value as $name => $key) {
                 if (isset($value['Deleted']) && $value['Deleted'] == 1 && $name == "name") {
-                   echo '<td style="text-align: center">' . $key . ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span></td>';
+                   echo '<td style="text-align: center">' . $key . ' <span class="badge text-bg-danger">'.__("Deleted DXCC").'</span></td>';
                 } else if ($name == "Deleted") {
                    continue;
                 } else {
diff --git a/application/views/awards/ffma/index.php b/application/views/awards/ffma/index.php
index e9baf3c0b..a711dbc11 100644
--- a/application/views/awards/ffma/index.php
+++ b/application/views/awards/ffma/index.php
@@ -4,14 +4,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_ffma_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_ffma_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_ffma_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("Fred Fish Memorial Award"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("The Fred Fish Memorial Award was created in honor of Fred Fish, W5FF (SK), who was the first amateur to have worked and confirmed all 488 Maidenhead grid squares in the 48 contiguous United States on 6 Meters."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("The award will be given to any amateur who can duplicate W5FF's accomplishment."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_ffma_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
@@ -27,15 +27,15 @@
 	<div id="gridsquare_map" class="map-leaflet" style="width: 100%;"></div>
 </div>
 <div class="coordinates d-flex">
-        <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div>
+        <div class="cohidden"><?php echo __("Latitude")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div>
+        <div class="cohidden"><?php echo __("Longitude")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div>
+        <div class="cohidden"><?php echo __("Gridsquare")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div>
+        <div class="cohidden"><?php echo __("Distance")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div>
+        <div class="cohidden"><?php echo __("Bearing")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>var gridsquaremap = true;
diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php
index 37bfab1e9..7c61bbedf 100644
--- a/application/views/awards/gridmaster/index.php
+++ b/application/views/awards/gridmaster/index.php
@@ -3,14 +3,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_us_gridmaster_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_us_gridmaster_description_ln2'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("US Gridmaster Award"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."); ?>";
             var lang_award_info_ln3 = "<?php echo lang('awards_us_gridmaster_description_ln3'); ?>";
-            var lang_award_info_ln4 = "<?php echo lang('awards_us_gridmaster_description_ln4'); ?>";
+            var lang_award_info_ln4 = "<?php echo __("This map shows only QSOs worked on SAT."); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
 		<?php if($this->session->flashdata('message')) { ?>
@@ -26,15 +26,15 @@
 	<div id="gridsquare_map" class="map-leaflet" style="width: 100%;"></div>
 </div>
 <div class="coordinates d-flex">
-        <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div>
+        <div class="cohidden"><?php echo __("Latitude")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div>
+        <div class="cohidden"><?php echo __("Longitude")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div>
+        <div class="cohidden"><?php echo __("Gridsquare")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div>
+        <div class="cohidden"><?php echo __("Distance")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div>
+        <div class="cohidden"><?php echo __("Bearing")?>: </div>
         <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>var gridsquaremap = true;
diff --git a/application/views/awards/helvetia/index.php b/application/views/awards/helvetia/index.php
index 8b685822d..c98f8308f 100644
--- a/application/views/awards/helvetia/index.php
+++ b/application/views/awards/helvetia/index.php
@@ -14,14 +14,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-                var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-                var lang_award_info_ln1 = "<?php echo lang('awards_helvetia_description_ln1'); ?>";
-                var lang_award_info_ln2 = "<?php echo lang('awards_helvetia_description_ln2'); ?>";
-                var lang_award_info_ln3 = "<?php echo lang('awards_helvetia_description_ln3'); ?>";
+                var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+                var lang_award_info_ln1 = "<?php echo __("HELVETIA 26 | SWITZERLAND AWARD"); ?>";
+                var lang_award_info_ln2 = "<?php echo __("The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."); ?>";
+                var lang_award_info_ln3 = "<?php echo __("These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"); ?>";
                 var lang_award_info_ln4 = "<?php echo lang('awards_helvetia_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
     <form class="form" action="<?php echo site_url('awards/helvetia'); ?>" method="post" enctype="multipart/form-data">
@@ -46,7 +46,7 @@
             </div>
 
             <div class="mb-3 row">
-                <div class="col-md-2"><?php echo lang('awards_qsl_type'); ?></div>
+                <div class="col-md-2"><?php echo __("Show QSO with QSL Type"); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php
index 54f53a851..66409abf7 100644
--- a/application/views/awards/iota/index.php
+++ b/application/views/awards/iota/index.php
@@ -12,14 +12,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_iota_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_iota_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_iota_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("IOTA Awards"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("IOTA is an exciting and innovative activity program that has captured the interest of thousands of radio amateurs worldwide. Established in 1964, it promotes radio contacts with stations located on islands around the world to enhance the experience of all those active on the amateur bands. To achieve this, it draws on the widespread mystique surrounding islands."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("It is administered by Islands On The Air (IOTA) Ltd (referred to as IOTA Management) in partnership with the Radio Society of Great Britain (RSGB). IOTA Management has grouped the world's islands into approximately 1200 'IOTA groups,' each having varying numbers of 'counters,' which are qualifying islands. These listings are published in the IOTA Directory and on the IOTA website. The objective for the IOTA Island Chaser is to make radio contact with at least one counter in as many of these groups as possible. The program has a well-defined set of rules and encourages friendly competition among chasers by publishing participant performance in an Honor Roll and annual listings, as well as recognizing it with certificates and prestigious awards."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_iota_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
     <form class="form" action="<?php echo site_url('awards/iota'); ?>" method="post" enctype="multipart/form-data">
diff --git a/application/views/awards/itu/index.php b/application/views/awards/itu/index.php
index 6e93d411b..f53120e69 100644
--- a/application/views/awards/itu/index.php
+++ b/application/views/awards/itu/index.php
@@ -14,14 +14,14 @@
 	<br>
   <div id="awardInfoButton">
     <script>
-      var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-      var lang_award_info_ln1 = "<?php echo lang('awards_itu_description_ln1'); ?>";
-      var lang_award_info_ln2 = "<?php echo lang('awards_itu_description_ln2'); ?>";
+      var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+      var lang_award_info_ln1 = "<?php echo __("ITU Zones"); ?>";
+      var lang_award_info_ln2 = "<?php echo __("The Classic Worked ITU Zones award may be claimed by producing evidence of having contacted land based amateur radio stations in at least 70 of the 75 broadcasting zones as defined by the International Telecommunications Union (ITU)."); ?>";
       var lang_award_info_ln3 = "<?php echo lang('awards_itu_description_ln3'); ?>";
 	  var lang_award_info_ln4 = "";
     </script>
-    <h2><?php echo lang('awards_itu_page_title'); ?></h2>
-    <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+    <h2><?php echo __("Awards - ITU Zones"); ?></h2>
+    <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
   </div>
   <!-- End of Award Info Box -->
             <form class="form" action="<?php echo site_url('awards/itu'); ?>" method="post" enctype="multipart/form-data">
@@ -29,37 +29,37 @@
 
             <!-- Multiple Checkboxes (inline) -->
             <div class="mb-3 row">
-                <div class="col-md-2" for="checkboxes"><?php echo lang('general_word_worked') . ' / ' . lang('general_word_confirmed')?></div>
+                <div class="col-md-2" for="checkboxes"><?php echo __("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"'; ?> >
-                        <label class="form-check-label" for="worked"><?php echo lang('awards_show_worked'); ?></label>
+                        <label class="form-check-label" for="worked"><?php echo __("Show worked"); ?></label>
                     </div>
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="confirmed" id="confirmed" value="1" <?php if ($this->input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="confirmed"><?php echo lang('awards_show_confirmed'); ?></label>
+                        <label class="form-check-label" for="confirmed"><?php echo __("Show confirmed"); ?></label>
                     </div>
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="notworked" id="notworked" value="1" <?php if ($this->input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="notworked"><?php echo lang('awards_show_not_worked'); ?></label>
+                        <label class="form-check-label" for="notworked"><?php echo __("Show not worked"); ?></label>
                     </div>
                 </div>
             </div>
 
             <div class="mb-3 row">
-                <div class="col-md-2"><?php echo lang('awards_qsl_type'); ?></div>
+                <div class="col-md-2"><?php echo __("Show QSO with QSL Type"); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="qsl"><?php echo lang('general_word_qslcard'); ?></label>
+                        <label class="form-check-label" for="qsl"><?php echo __("QSL Card"); ?></label>
                     </div>
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="lotw" value="1" id="lotw" <?php if ($this->input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="lotw"><?php echo lang('lotw_short'); ?></label>
+                        <label class="form-check-label" for="lotw"><?php echo __("LoTW"); ?></label>
                     </div>
                    <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="eqsl" value="1" id="eqsl" <?php if ($this->input->post('eqsl')) echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="eqsl"><?php echo lang('eqsl_short'); ?></label>
+                        <label class="form-check-label" for="eqsl"><?php echo __("eQSL"); ?></label>
                     </div>
                    <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qrz" value="1" id="qrz" <?php if ($this->input->post('qrz')) echo ' checked="checked"'; ?> >
@@ -69,10 +69,10 @@
             </div>
 
             <div class="mb-3 row">
-                <label class="col-md-2 control-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+                <label class="col-md-2 control-label" for="band"><?php echo __("Band"); ?></label>
                 <div class="col-md-2">
                     <select id="band2" name="band" class="form-select form-select-sm">
-                        <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
+                        <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo __("All"); ?></option>
                         <?php foreach($worked_bands as $band) {
                             echo '<option value="' . $band . '"';
                             if ($this->input->post('band') == $band) echo ' selected';
@@ -83,10 +83,10 @@
             </div>
 
 			<div class="mb-3 row">
-				<label class="col-md-2 control-label" for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+				<label class="col-md-2 control-label" for="mode"><?php echo __("Mode"); ?></label>
 				<div class="col-md-2">
 					<select id="mode" name="mode" class="form-select form-select-sm">
-						<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>><?php echo lang('general_word_all'); ?></option>
+						<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>><?php echo __("All"); ?></option>
 						<?php
 						foreach($modes->result() as $mode){
 							if ($mode->submode == null) {
@@ -107,10 +107,10 @@
             <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
-                    <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning"><?php echo lang('filter_reset'); ?></button>
-                    <button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"><?php echo lang('filter_options_show'); ?></button>
+                    <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning"><?php echo __("Reset"); ?></button>
+                    <button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"><?php echo __("Show"); ?></button>
                     <?php if ($itu_array) {
-                        ?><button type="button" onclick="load_itu_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> <?php echo lang('awards_show_itu_map'); ?></button>
+                        ?><button type="button" onclick="load_itu_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> <?php echo __("Show ITU Zone Map"); ?></button>
                     <?php }?>
                 </div>
             </div>
@@ -119,10 +119,10 @@
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item">
-            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('general_word_table'); ?></a>
+            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true"><?php echo __("Table"); ?></a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" onclick="load_itu_map();" id="map-tab" data-bs-toggle="tab" href="#itumaptab" role="tab" aria-controls="home" aria-selected="false"><?php echo lang('filter_map'); ?></a>
+            <a class="nav-link" onclick="load_itu_map();" id="map-tab" data-bs-toggle="tab" href="#itumaptab" role="tab" aria-controls="home" aria-selected="false"><?php echo __("Map"); ?></a>
         </li>
     </ul>
     <br />
@@ -162,7 +162,7 @@
             echo '</tr>';
         }
         echo "</table>
-        <h2>" . lang('awards_summary') . "</h2>
+        <h2>" . __("Summary") . "</h2>
 
         <table class='table-sm tablesummary table table-bordered table-hover table-striped table-condensed text-center'>
         <thead>
@@ -171,18 +171,18 @@
         foreach($bands as $band) {
             echo '<td>' . $band . '</td>';
         }
-        echo "<td>" . lang('awards_total') . "</td></tr>
+        echo "<td>" . __("Total") . "</td></tr>
         </thead>
         <tbody>
 
-        <tr><td>" . lang('awards_total_worked') . "</td>";
+        <tr><td>" . __("Total worked") . "</td>";
 
         foreach ($itu_summary['worked'] as $dxcc) {      // Fills the table with the data
             echo '<td style="text-align: center">' . $dxcc . '</td>';
         }
 
         echo "</tr><tr>
-        <td>" . lang('awards_total_confirmed') . "</td>";
+        <td>" . __("Total confirmed") . "</td>";
         foreach ($itu_summary['confirmed'] as $dxcc) {      // Fills the table with the data
             echo '<td style="text-align: center">' . $dxcc . '</td>';
         }
diff --git a/application/views/awards/jcc/index.php b/application/views/awards/jcc/index.php
index 17fdd5a6f..8170998d6 100644
--- a/application/views/awards/jcc/index.php
+++ b/application/views/awards/jcc/index.php
@@ -12,14 +12,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_jcc_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_jcc_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_jcc_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("JCC - Japan Century Cities Award"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of at least 100 different cities of Japan."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("JCC-200, 300, 400, 500, 600, 700 and 800 will be issued as separate awards. A list of QSL cards should be arranged in order of JCC reference number, however names of city may be omitted. An additional sticker will be issued at every 50 contacts like 150, 250, 350, 450, 550, 650, 750 cities."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_jcc_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
@@ -45,7 +45,7 @@
             </div>
 
             <div class="mb-3 row">
-                <div class="col-md-2"><?php echo lang('awards_qsl_type'); ?></div>
+                <div class="col-md-2"><?php echo __("Show QSO with QSL Type"); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
@@ -108,7 +108,7 @@
                     <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning">Reset</button>
                     <button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary">Show</button>
                     <?php if ($jcc_array) {?>
-                    <button type="button" onclick="load_jcc_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-asia"></i> <?php echo lang('awards_show_jcc_map'); ?></button>
+                    <button type="button" onclick="load_jcc_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-asia"></i> <?php echo __("Show JCC Map"); ?></button>
                     <button id="button3id" type="button" onclick="export_qsos();" name="button3id" class="btn btn-sm btn-info">Export</button>
                     <?php } ?>
                 </div>
@@ -122,7 +122,7 @@
             <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Results</a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" onclick="load_jcc_map();" id="map-tab" data-bs-toggle="tab" href="#jccmaptab" role="tab" aria-controls="home" aria-selected="false"><?php echo lang('filter_map'); ?></a>
+            <a class="nav-link" onclick="load_jcc_map();" id="map-tab" data-bs-toggle="tab" href="#jccmaptab" role="tab" aria-controls="home" aria-selected="false"><?php echo __("Map"); ?></a>
         </li>
     </ul>
     <br />
diff --git a/application/views/awards/pota/index.php b/application/views/awards/pota/index.php
index cac3e77fd..b3a76e97a 100644
--- a/application/views/awards/pota/index.php
+++ b/application/views/awards/pota/index.php
@@ -3,14 +3,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_pota_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_pota_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_pota_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("POTA Awards"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("Parks on the Air® (POTA) started in early 2017 when the ARRL's National Parks on the Air special event ended. A group of volunteers wanted to continue the fun beyond the one-year event, and thus, POTA was born."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("POTA works similarly to SOTA, with Activators and Hunters. For the awards, there are several categories based on the number of parks, geographic areas, and more."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_pota_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
 	<?php
@@ -28,13 +28,13 @@
 	<thead>
 		
 	<tr>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_pota_reference') ?></th>
-		<th style="text-align: center"><?php echo lang('general_word_date') ?></th>
-		<th style="text-align: center"><?php echo lang('general_word_time') ?></th>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_callsign') ?></th>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_band') ?></th>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_rsts') ?></th>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_rstr') ?></th>
+		<th style="text-align: center"><?php echo __("POTA Reference(s)") ?></th>
+		<th style="text-align: center"><?php echo __("Date") ?></th>
+		<th style="text-align: center"><?php echo __("Time") ?></th>
+		<th style="text-align: center"><?php echo __("Callsign") ?></th>
+		<th style="text-align: center"><?php echo __("Band") ?></th>
+		<th style="text-align: center"><?php echo __("RST (S)") ?></th>
+		<th style="text-align: center"><?php echo __("RST (R)") ?></th>
 	</tr>
 	</thead>
 	
diff --git a/application/views/awards/rac/index.php b/application/views/awards/rac/index.php
index bc5668ad5..726100ad5 100644
--- a/application/views/awards/rac/index.php
+++ b/application/views/awards/rac/index.php
@@ -38,7 +38,7 @@
             </div>
 
             <div class="mb-3 row">
-                <div class="col-md-2"><?php echo lang('awards_qsl_type'); ?></div>
+                <div class="col-md-2"><?php echo __("Show QSO with QSL Type"); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
diff --git a/application/views/awards/sig/index.php b/application/views/awards/sig/index.php
index d12e4ade6..e4b3606c7 100644
--- a/application/views/awards/sig/index.php
+++ b/application/views/awards/sig/index.php
@@ -3,14 +3,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_sig_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_sig_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_sig_description_ln3'); ?>";
-            var lang_award_info_ln4 = "<?php echo lang('awards_sig_description_ln4'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("SIG Information"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("The SIG or Signature Category provides the possibility to use any kind of 'Award Signature' for awards that are not implemented in Wavelog."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("The reason for this is that the common ADIF format provides only a few dedicated fields for certain awards. SIG still makes it possible to use and evaluate all other types of signature markers."); ?>";
+            var lang_award_info_ln4 = "<?php echo __("In the QSO processing, you will find two fields: 'SIG' contains the actual marker, which is also visible in the award evaluation, and 'SIG INFO,' which contains a description of the signature. Both fields are freely customizable."); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
diff --git a/application/views/awards/sota/index.php b/application/views/awards/sota/index.php
index bbb80ff70..7c004d7fa 100644
--- a/application/views/awards/sota/index.php
+++ b/application/views/awards/sota/index.php
@@ -3,14 +3,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_sota_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_sota_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_sota_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("SOTA Awards"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("SOTA (Summits On The Air) is an award scheme for radio amateurs that encourages portable operation in mountainous areas."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("It is fully operational in nearly a hundred countries worldwide. Each country has its own Association that defines the recognized SOTA summits within that Association. Each summit earns the activators and chasers a score related to the height of the summit. Certificates are available for various scores, leading to the prestigious 'Mountain Goat' and 'Shack Sloth' trophies. An Honor Roll for Activators and Chasers is maintained in the SOTA online database."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_sota_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
 	<?php
diff --git a/application/views/awards/vucc/band.php b/application/views/awards/vucc/band.php
index 53371aeee..0caa60fbf 100644
--- a/application/views/awards/vucc/band.php
+++ b/application/views/awards/vucc/band.php
@@ -1,7 +1,7 @@
 <div class="container">
     <h2><?php echo $page_title; ?></h2>
 
-    <h3><?php echo lang('general_word_filtering_on'); ?> <?php echo $filter ?></h3>
+    <h3><?php echo __("Filtering on"); ?> <?php echo $filter ?></h3>
     <?php
     $i = 1;
     if ($vucc_array) {
diff --git a/application/views/awards/vucc/index.php b/application/views/awards/vucc/index.php
index f2a0ec72a..07cd83e1e 100644
--- a/application/views/awards/vucc/index.php
+++ b/application/views/awards/vucc/index.php
@@ -3,14 +3,14 @@
   <br>
   <div id="awardInfoButton">
     <script>
-      var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-      var lang_award_info_ln1 = "<?php echo lang('awards_vucc_description_ln1'); ?>";
-      var lang_award_info_ln2 = "<?php echo lang('awards_vucc_description_ln2'); ?>";
+      var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+      var lang_award_info_ln1 = "<?php echo __("VUCC - VHF/UHF Century Club Award"); ?>";
+      var lang_award_info_ln2 = "<?php echo __("The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band."); ?>";
       var lang_award_info_ln3 = "<?php echo lang('awards_vucc_description_ln3'); ?>";
-      var lang_award_info_ln4 = "<?php echo lang('awards_vucc_description_ln4'); ?>";
+      var lang_award_info_ln4 = "<?php echo __("Only VHF/UHF bands are relevant."); ?>";
     </script>
     <h2><?php echo $page_title; ?></h2>
-    <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+    <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
   </div>
   <!-- End of Award Info Box -->
 <?php if (!empty($vucc_array)) { ?>
diff --git a/application/views/awards/wab/index.php b/application/views/awards/wab/index.php
index 858d69c89..98990e95a 100644
--- a/application/views/awards/wab/index.php
+++ b/application/views/awards/wab/index.php
@@ -8,20 +8,20 @@
     <br>
     <div id="awardInfoButton">
         <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_wab_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_wab_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_wab_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("WAB - Worked All Britain Award"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("WAB, Worked All Britain squares in Amateur Radio, encourages licensed ham radio operators to work all the squares in Great Britain."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("May be claimed for having contacted an amateur station located in the required amount of squares, described on the page linked below."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_wab_description_ln4'); ?>";
         </script>
         <h2><?php echo $page_title; ?></h2>
-        <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+        <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
     </div>
 
 <form class="d-flex align-items-center">
-            <label class="my-1 me-2" for="band"><?php echo lang('gridsquares_band'); ?></label>
+            <label class="my-1 me-2" for="band"><?php echo __("Band"); ?></label>
             <select class="form-select my-1 me-sm-2 w-auto"  id="band">
-                <option value="All"><?php echo lang('general_word_all')?></option>
+                <option value="All"><?php echo __("All")?></option>
                 <?php foreach($bands as $band) {
                     echo '<option value="'.$band.'"';
                     if ($user_default_band == $band) {
@@ -31,9 +31,9 @@
                 } ?>
             </select>
             <?php if (count($sats_available) != 0) { ?>
-                <label class="my-1 me-2" id="satslabel" for="distplot_sats" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo lang('gridsquares_sat'); ?></label>
+                <label class="my-1 me-2" id="satslabel" for="distplot_sats" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo __("Satellite"); ?></label>
                 <select class="form-select my-1 me-sm-2 w-auto"  id="sats" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>>
-                    <option value="All"><?php echo lang('general_word_all')?></option>
+                    <option value="All"><?php echo __("All")?></option>
                     <?php foreach($sats_available as $sat) {
                         echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n";
                     } ?>
@@ -41,18 +41,18 @@
             <?php } else { ?>
                 <input id="sats" type="hidden" value="All"></input>
             <?php } ?>
-                <label class="my-1 me-2" id="orbitslabel" for="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo lang('gridsquares_orbit'); ?></label>
+                <label class="my-1 me-2" id="orbitslabel" for="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo __("Orbit"); ?></label>
                 <select class="form-select my-1 me-sm-2 w-auto"  id="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>>
-                    <option value="All"><?php echo lang('general_word_all')?></option>
+                    <option value="All"><?php echo __("All")?></option>
                     <?php
                     foreach($orbits as $orbit){
                         echo '<option value="' . $orbit . '">' . strtoupper($orbit) . '</option>'."\n";
                     }
                     ?>
             </select>
-			<label class="my-1 me-2" for="mode"><?php echo lang('gridsquares_mode'); ?></label>
+			<label class="my-1 me-2" for="mode"><?php echo __("Mode"); ?></label>
             <select class="form-select my-1 me-sm-2 w-auto"  id="mode">
-			<option value="All"><?php echo lang('general_word_all')?></option>
+			<option value="All"><?php echo __("All")?></option>
                     <?php
                     foreach($modes as $mode){
                         if ($mode->submode ?? '' == '') {
@@ -61,7 +61,7 @@
                     }
                     ?>
             </select>
-			<label class="my-1 me-2"><?php echo lang('gridsquares_confirmation'); ?></label>
+			<label class="my-1 me-2"><?php echo __("Confirmation"); ?></label>
                 <div>
                     <div class="form-check-inline">
                     <?php echo '<input class="form-check-input" type="checkbox" name="qsl" id="qsl"';
diff --git a/application/views/awards/waja/index.php b/application/views/awards/waja/index.php
index 565db062c..aeadfb8e9 100644
--- a/application/views/awards/waja/index.php
+++ b/application/views/awards/waja/index.php
@@ -13,14 +13,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_waja_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_waja_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_waja_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("WAJA - Worked All Japan prefectures Award"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_waja_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
@@ -46,7 +46,7 @@
             </div>
 
             <div class="mb-3 row">
-                <div class="col-md-2"><?php echo lang('awards_qsl_type'); ?></div>
+                <div class="col-md-2"><?php echo __("Show QSO with QSL Type"); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php
index 72a7c48af..dfeb2802b 100644
--- a/application/views/awards/was/index.php
+++ b/application/views/awards/was/index.php
@@ -14,14 +14,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_was_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_was_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_was_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("WAS Award"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("ARRL's most popular award is the Worked All States Award. Thousands upon thousands of awards have been issued to hams around the world. In ARRL's 101st year, they have redesigned the certificates and the program in hopes of streamlining and improving the award program."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("The WAS (Worked All States) Award is available to all amateurs worldwide who submit proof with written confirmation of contacts with each of the 50 states of the United States of America. Amateurs in the U.S. and its possessions must be members of ARRL to apply for a WAS. Applicants from outside the U.S. are exempt from this requirement."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_was_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
     <form class="form" action="<?php echo site_url('awards/was'); ?>" method="post" enctype="multipart/form-data">
@@ -46,7 +46,7 @@
             </div>
 
             <div class="mb-3 row">
-                <div class="col-md-2"><?php echo lang('awards_qsl_type'); ?></div>
+                <div class="col-md-2"><?php echo __("Show QSO with QSL Type"); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
diff --git a/application/views/awards/wwff/index.php b/application/views/awards/wwff/index.php
index 4fa084ae7..0cf666270 100644
--- a/application/views/awards/wwff/index.php
+++ b/application/views/awards/wwff/index.php
@@ -3,14 +3,14 @@
         <br>
         <div id="awardInfoButton">
             <script>
-            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_wwff_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_wwff_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_wwff_description_ln3'); ?>";
+            var lang_awards_info_button = "<?php echo __("Award Info"); ?>";
+            var lang_award_info_ln1 = "<?php echo __("WWFF - World Wide Flora and Fauna Award"); ?>";
+            var lang_award_info_ln2 = "<?php echo __("WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."); ?>";
+            var lang_award_info_ln3 = "<?php echo __("More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."); ?>";
             var lang_award_info_ln4 = "<?php echo lang('awards_wwff_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo __("Award Info"); ?></button>
         </div>
         <!-- End of Award Info Box -->
 	<?php
@@ -28,13 +28,13 @@
 	<thead>
 		
 	<tr>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_wwff_reference') ?></th>
-		<th style="text-align: center"><?php echo lang('general_word_date') ?></th>
-		<th style="text-align: center"><?php echo lang('general_word_time') ?></th>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_callsign') ?></th>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_band') ?></th>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_rsts') ?></th>
-		<th style="text-align: center"><?php echo lang('gen_hamradio_rstr') ?></th>
+		<th style="text-align: center"><?php echo __("WWFF Reference") ?></th>
+		<th style="text-align: center"><?php echo __("Date") ?></th>
+		<th style="text-align: center"><?php echo __("Time") ?></th>
+		<th style="text-align: center"><?php echo __("Callsign") ?></th>
+		<th style="text-align: center"><?php echo __("Band") ?></th>
+		<th style="text-align: center"><?php echo __("RST (S)") ?></th>
+		<th style="text-align: center"><?php echo __("RST (R)") ?></th>
 	</tr>
 	</thead>
 	
diff --git a/application/views/bandmap/index.php b/application/views/bandmap/index.php
index 2c14b09d7..b5262199c 100644
--- a/application/views/bandmap/index.php
+++ b/application/views/bandmap/index.php
@@ -22,9 +22,9 @@
 <div class="tab-content" id="myTabContent">
 <div class="messages my-1 me-2"></div>
 <div class="d-flex align-items-center">
-		<label class="my-1 me-2" for="radio"><?php echo lang('gen_hamradio_radio'); ?></label>
+		<label class="my-1 me-2" for="radio"><?php echo __("Radio"); ?></label>
 		<select class="form-select form-select-sm radios my-1 me-sm-2 w-auto" id="radio" name="radio">
-			<option value="0" selected="selected"><?php echo lang('general_word_none'); ?></option>
+			<option value="0" selected="selected"><?php echo __("None"); ?></option>
 			<?php foreach ($radios->result() as $row) { ?>
 			<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
 			<?php } ?>
@@ -42,7 +42,7 @@
 				<option value="SA"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'SA') { echo " selected"; } ?>>South America</option>
                 </select>
 
-		<label class="my-1 me-2" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+		<label class="my-1 me-2" for="band"><?php echo __("Band"); ?></label>
 		<select id="band" class="form-select form-select-sm my-1 me-sm-2 w-auto" name="band">
 			<?php foreach($bands as $key=>$bandgroup) {
 					echo '<optgroup label="' . strtoupper($key) . '">';
diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php
index 7b5b9dda2..d577c9ee1 100644
--- a/application/views/bandmap/list.php
+++ b/application/views/bandmap/list.php
@@ -57,9 +57,9 @@
 	<div class="tab-content" id="myTabContent">
 		<div class="messages my-1 me-2"></div>
 		<div class="d-flex align-items-center">
-			<label class="my-1 me-2" for="radio"><?php echo lang('gen_hamradio_radio'); ?></label>
+			<label class="my-1 me-2" for="radio"><?php echo __("Radio"); ?></label>
 			<select class="form-select form-select-sm radios my-1 me-sm-2 w-auto" id="radio" name="radio">
-				<option value="0" selected="selected"><?php echo lang('general_word_none'); ?></option>
+				<option value="0" selected="selected"><?php echo __("None"); ?></option>
 				<?php foreach ($radios->result() as $row) { ?>
 					<option value="<?php echo $row->id; ?>" <?php if ($this->session->userdata('radio') == $row->id) {
 																echo "selected=\"selected\"";
@@ -68,14 +68,14 @@
 			</select>
 			<label class="my-1 me-2" for="cwnSelect">DXCC-Status</label>
 			<select class="form-select form-select-sm my-1 me-sm-2 w-auto" id="cwnSelect" name="dxcluster_cwn" aria-describedby="dxcluster_cwnHelp" required>
-				<option value="All"><?php echo lang('general_word_all'); ?></option>
-				<option value="wkd"><?php echo lang('general_word_worked'); ?></option>
-				<option value="cnf"><?php echo lang('general_word_confirmed'); ?></option>
-				<option value="ucnf"><?php echo lang('general_word_not_confirmed'); ?></option>
+				<option value="All"><?php echo __("All"); ?></option>
+				<option value="wkd"><?php echo __("Worked"); ?></option>
+				<option value="cnf"><?php echo __("Confirmed"); ?></option>
+				<option value="ucnf"><?php echo __("Not Confirmed"); ?></option>
 			</select>
 			<label class="my-1 me-2" for="decontSelect">Spots de</label>
 			<select class="form-select form-select-sm my-1 me-sm-2 w-auto" id="decontSelect" name="dxcluster_decont" aria-describedby="dxcluster_decontHelp" required>
-				<option value="Any"><?php echo lang('general_word_all'); ?></option>
+				<option value="Any"><?php echo __("All"); ?></option>
 				<option value="AF" <?php if ($this->optionslib->get_option('dxcluster_decont') == 'AF') {echo " selected";} ?>>Africa</option>
 				<option value="AN" <?php if ($this->optionslib->get_option('dxcluster_decont') == 'AN') {echo " selected";} ?>>Antarctica</option>
 				<option value="AS" <?php if ($this->optionslib->get_option('dxcluster_decont') == 'AS') {echo " selected";} ?>>Asia</option>
@@ -85,7 +85,7 @@
 				<option value="SA" <?php if ($this->optionslib->get_option('dxcluster_decont') == 'SA') {echo " selected";} ?>>South America</option>
 			</select>
 
-			<label class="my-1 me-2" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+			<label class="my-1 me-2" for="band"><?php echo __("Band"); ?></label>
 			<select id="band" class="form-select form-select-sm my-1 me-sm-2 w-auto" name="band">
 				<option value="All">All</option>
 				<?php foreach ($bands as $key => $bandgroup) {
@@ -106,12 +106,12 @@
 		<table style="width:100%" class="table-sm table spottable table-bordered table-hover table-striped table-condensed">
 			<thead>
 				<tr class="log_title titles">
-					<th style="width:200px;"><?php echo lang('general_word_date'); ?>/<?php echo lang('general_word_time'); ?></th>
-					<th style="width:150px;"><?php echo lang('gen_hamradio_frequency'); ?></th>
-					<th><?php echo lang('gen_hamradio_call'); ?></th>
+					<th style="width:200px;"><?php echo __("Date"); ?>/<?php echo __("Time"); ?></th>
+					<th style="width:150px;"><?php echo __("Frequency"); ?></th>
+					<th><?php echo __("Call"); ?></th>
 					<th>DXCC</th>
 					<th style="width:150px;">Spotter</th>
-					<th><?php echo lang('general_word_message'); ?></th>
+					<th><?php echo __("Message"); ?></th>
 				</tr>
 			</thead>
 
diff --git a/application/views/bands/create.php b/application/views/bands/create.php
index 1481f6cf3..ca0a90807 100644
--- a/application/views/bands/create.php
+++ b/application/views/bands/create.php
@@ -21,32 +21,32 @@
 
 		<form>
 		<div class="mb-3">
-		    <label for="bandInput"><?php echo lang('gen_hamradio_band'); ?></label>
+		    <label for="bandInput"><?php echo __("Band"); ?></label>
 		    <input type="text" class="form-control" name="band" id="bandInput" aria-describedby="bandInputHelp" required>
-		    <small id="bandInputHelp" class="form-text text-muted"><?php echo lang('options_bands_name_band'); ?></small>
+		    <small id="bandInputHelp" class="form-text text-muted"><?php echo __("Name of Band (E.g. 20m)"); ?></small>
 		  </div>
 		  <div class="mb-3">
-			<label for="bandGroup"><?php echo lang('gen_hamradio_bandgroup'); ?></label>
+			<label for="bandGroup"><?php echo __("Bandgroup"); ?></label>
 			<input type="text" class="form-control" name="bandgroup" id="bandGroup" aria-describedby="bandgroupInputHelp" required>
-			<small id="bandgroupInputHelp" class="form-text text-muted"><?php echo lang('options_bands_name_bandgroup'); ?></small>
+			<small id="bandgroupInputHelp" class="form-text text-muted"><?php echo __("Name of bandgroup (E.g. hf, vhf, uhf, shf)"); ?></small>
 		</div>
 		<div class="mb-3">
-			<label for="ssbqrg"><?php echo lang('options_bands_ssb_qrg'); ?></label>
+			<label for="ssbqrg"><?php echo __("SSB QRG"); ?></label>
 			<input type="text" class="form-control" name="ssbqrg" id="ssbqrg" aria-describedby="ssbqrgInputHelp" required>
-			<small id="ssbqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_ssb_qrg_hint'); ?></small>
+			<small id="ssbqrgInputHelp" class="form-text text-muted"><?php echo __("Frequency for SSB QRG in band (must be in Hz)"); ?></small>
 		</div>
 		<div class="mb-3">
-			<label for="dataqrg"><?php echo lang('options_bands_data_qrg'); ?></label>
+			<label for="dataqrg"><?php echo __("DATA QRG"); ?></label>
 			<input type="text" class="form-control" name="dataqrg" id="dataqrg" aria-describedby="dataqrgInputHelp" required>
-			<small id="dataqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_data_qrg_hint'); ?></small>
+			<small id="dataqrgInputHelp" class="form-text text-muted"><?php echo __("Frequency for DATA QRG in band (must be in Hz)"); ?></small>
 		</div>
 		<div class="mb-3">
-			<label for="cwqrg"><?php echo lang('options_bands_cw_qrg'); ?></label>
+			<label for="cwqrg"><?php echo __("CW QRG"); ?></label>
 			<input type="text" class="form-control" name="cwqrg" id="cwqrg" aria-describedby="cwqrgInputHelp" required>
-			<small id="cwqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_cw_qrg_hint'); ?></small>
+			<small id="cwqrgInputHelp" class="form-text text-muted"><?php echo __("Frequency for CW QRG in band (must be in Hz)"); ?></small>
 		</div>
 		  
-			<button type="button" onclick="createBand(this.form);" class="btn btn-primary"><i class="fas fa-plus-square"></i> <?php echo lang('options_save'); ?></button>
+			<button type="button" onclick="createBand(this.form);" class="btn btn-primary"><i class="fas fa-plus-square"></i> <?php echo __("Save"); ?></button>
 
 		</form>
 </div>
\ No newline at end of file
diff --git a/application/views/bands/edit.php b/application/views/bands/edit.php
index 60f740ba7..9bb447aa5 100644
--- a/application/views/bands/edit.php
+++ b/application/views/bands/edit.php
@@ -3,32 +3,32 @@
 
 		<input type="hidden" name="id" value="<?php echo $my_band->id; ?>">
 		<div class="mb-3">
-			<label for="bandInput"><?php echo lang('gen_hamradio_band'); ?></label>
+			<label for="bandInput"><?php echo __("Band"); ?></label>
 			<input type="text" class="form-control" name="band" id="bandInput" aria-describedby="bandInputHelp" value="<?php if(set_value('band') != "") { echo set_value('band'); } else { echo $my_band->band; } ?>" required>
-			<small id="bandInputHelp" class="form-text text-muted"><?php echo lang('options_bands_name_band'); ?></small>
+			<small id="bandInputHelp" class="form-text text-muted"><?php echo __("Name of Band (E.g. 20m)"); ?></small>
 		</div>
 		<div class="mb-3">
-			<label for="bandGroup"><?php echo lang('gen_hamradio_bandgroup'); ?></label>
+			<label for="bandGroup"><?php echo __("Bandgroup"); ?></label>
 			<input type="text" class="form-control" name="bandgroup" id="bandGroup" aria-describedby="bandgroupInputHelp" value="<?php if(set_value('bandgroup') != "") { echo set_value('bandgroup'); } else { echo $my_band->bandgroup; } ?>" required>
-			<small id="bandgroupInputHelp" class="form-text text-muted"><?php echo lang('options_bands_name_bandgroup'); ?></small>
+			<small id="bandgroupInputHelp" class="form-text text-muted"><?php echo __("Name of bandgroup (E.g. hf, vhf, uhf, shf)"); ?></small>
 		</div>
 		<div class="mb-3">
-			<label for="ssbqrg"><?php echo lang('options_bands_ssb_qrg'); ?></label>
+			<label for="ssbqrg"><?php echo __("SSB QRG"); ?></label>
 			<input type="text" class="form-control" name="ssbqrg" id="ssbqrg" aria-describedby="ssbqrgInputHelp" value="<?php echo $my_band->ssb; ?>" required>
-			<small id="ssbqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_ssb_qrg_hint'); ?></small>
+			<small id="ssbqrgInputHelp" class="form-text text-muted"><?php echo __("Frequency for SSB QRG in band (must be in Hz)"); ?></small>
 		</div>
 		<div class="mb-3">
-			<label for="dataqrg"><?php echo lang('options_bands_data_qrg'); ?></label>
+			<label for="dataqrg"><?php echo __("DATA QRG"); ?></label>
 			<input type="text" class="form-control" name="dataqrg" id="dataqrg" aria-describedby="dataqrgInputHelp" value="<?php echo $my_band->data; ?>" required>
-			<small id="dataqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_data_qrg_hint'); ?></small>
+			<small id="dataqrgInputHelp" class="form-text text-muted"><?php echo __("Frequency for DATA QRG in band (must be in Hz)"); ?></small>
 		</div>
 		<div class="mb-3">
-			<label for="cwqrg"><?php echo lang('options_bands_cw_qrg'); ?></label>
+			<label for="cwqrg"><?php echo __("CW QRG"); ?></label>
 			<input type="text" class="form-control" name="cwqrg" id="cwqrg" aria-describedby="cwqrgInputHelp" value="<?php echo $my_band->cw; ?>" required>
-			<small id="cwqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_cw_qrg_hint'); ?></small>
+			<small id="cwqrgInputHelp" class="form-text text-muted"><?php echo __("Frequency for CW QRG in band (must be in Hz)"); ?></small>
 		</div>
 
-		<button type="button" onclick="saveUpdatedBand(this.form);" class="btn btn-primary"><i class="fas fa-plus-square"></i> <?php echo lang('options_save'); ?></button>
+		<button type="button" onclick="saveUpdatedBand(this.form);" class="btn btn-primary"><i class="fas fa-plus-square"></i> <?php echo __("Save"); ?></button>
 
 	</form>
 </div>
\ No newline at end of file
diff --git a/application/views/bands/index.php b/application/views/bands/index.php
index 85bf0e3d8..35be9d9c7 100644
--- a/application/views/bands/index.php
+++ b/application/views/bands/index.php
@@ -25,18 +25,18 @@ $wwff = 0;
 		</div>
 	<?php } ?>
 
-<h2><?php echo lang('options_bands'); ?></h2>
+<h2><?php echo __("Bands"); ?></h2>
 
 <div class="card">
 <div class="card-header">
-	<?php echo lang('options_bands'); ?>
+	<?php echo __("Bands"); ?>
   </div>
   <div class="card-body">
     <p class="card-text">
-		<?php echo lang('options_bands_text_ln1'); ?>
+		<?php echo __("Using the band list you can control which bands are shown when creating a new QSO."); ?>
 	</p>
     <p class="card-text">
-		<?php echo lang('options_bands_text_ln2'); ?>
+		<?php echo __("Active bands will be shown in the QSO 'Band' drop-down, while inactive bands will be hidden and cannot be selected."); ?>
 	</p>
     <div class="table-responsive">
 
@@ -44,26 +44,26 @@ $wwff = 0;
 			<thead>
 				<tr>
 					<th></th>
-					<th><?php echo lang('gen_hamradio_band'); ?></th>
-					<th><?php echo lang('gen_hamradio_cq'); ?></th>
-                    <th><?php echo lang('gen_hamradio_dok'); ?></th>
-                    <th><?php echo lang('gen_hamradio_dxcc'); ?></th>
-					<th><?php echo lang('menu_helvetia'); ?></th>
-                    <th><?php echo lang('gen_hamradio_iota'); ?></th>
-                    <th><?php echo lang('menu_jcc'); ?></th>
-					<th><?php echo lang('gen_hamradio_pota'); ?></th>
-					<th><?php echo lang('menu_rac'); ?></th>
-					<th><?php echo lang('gen_hamradio_sig'); ?></th>
-                    <th><?php echo lang('gen_hamradio_sota'); ?></th>
-                    <th><?php echo lang('gen_hamradio_county_reference'); ?></th>
-                    <th><?php echo lang('menu_vucc'); ?></th>
-                    <th><?php echo lang('menu_waja'); ?></th>
-                    <th><?php echo lang('menu_was'); ?></th>
-					<th><?php echo lang('gen_hamradio_wwff'); ?></th>
-					<th><?php echo lang('gen_hamradio_bandgroup'); ?></th>
-					<th><?php echo lang('options_bands_ssb_qrg'); ?></th>
-					<th><?php echo lang('options_bands_data_qrg'); ?></th>
-					<th><?php echo lang('options_bands_cw_qrg'); ?></th>
+					<th><?php echo __("Band"); ?></th>
+					<th><?php echo __("CQ"); ?></th>
+                    <th><?php echo __("DOK"); ?></th>
+                    <th><?php echo __("DXCC"); ?></th>
+					<th><?php echo __("H26"); ?></th>
+                    <th><?php echo __("IOTA"); ?></th>
+                    <th><?php echo __("JCC"); ?></th>
+					<th><?php echo __("POTA"); ?></th>
+					<th><?php echo __("RAC"); ?></th>
+					<th><?php echo __("Sig"); ?></th>
+                    <th><?php echo __("SOTA"); ?></th>
+                    <th><?php echo __("USA County"); ?></th>
+                    <th><?php echo __("VUCC"); ?></th>
+                    <th><?php echo __("WAJA"); ?></th>
+                    <th><?php echo __("WAS"); ?></th>
+					<th><?php echo __("WWFF"); ?></th>
+					<th><?php echo __("Bandgroup"); ?></th>
+					<th><?php echo __("SSB QRG"); ?></th>
+					<th><?php echo __("DATA QRG"); ?></th>
+					<th><?php echo __("CW QRG"); ?></th>
 					<?php if($this->session->userdata('user_type') == '99') { ?>
                     <th></th>
                     <th></th>
@@ -107,7 +107,7 @@ $wwff = 0;
 				<?php } ?>
 			</tbody>
 			<tfoot>
-					<th><?php echo lang('general_word_all'); ?></th>
+					<th><?php echo __("All"); ?></th>
 					<th></th>
 					<th class="master_cq"><input type="checkbox" <?php if ($cq > 0) echo 'checked';?>></th>
 					<th class="master_dok"><input type="checkbox" <?php if ($dok > 0) echo 'checked';?>></th>
@@ -139,16 +139,16 @@ $wwff = 0;
   <p>
 		<?php if($this->session->userdata('user_type') == '99') { ?>
 		<script>
-			var lang_options_bands_edit = '<?php echo lang('options_bands_edit'); ?>';
-			var lang_options_bands_create = '<?php echo lang('options_bands_create'); ?>';
-			var lang_admin_close = '<?php echo lang('admin_close'); ?>';
-			var lang_options_bands_delete_warning = '<?php echo lang('options_bands_delete_warning'); ?>';
-			var lang_options_bands_activateall_warning = '<?php echo lang('options_bands_activateall_warning'); ?>';
-			var lang_options_bands_deactivateall_warning = '<?php echo lang('options_bands_deactivateall_warning'); ?>';
+			var lang_options_bands_edit = '<?php echo __("Edit Band"); ?>';
+			var lang_options_bands_create = '<?php echo __("Create a band"); ?>';
+			var lang_admin_close = '<?php echo __("Close"); ?>';
+			var lang_options_bands_delete_warning = '<?php echo __("Warning! Are you sure you want to delete the following band: "); ?>';
+			var lang_options_bands_activateall_warning = '<?php echo __("Warning! Are you sure you want to activate all bands?"); ?>';
+			var lang_options_bands_deactivateall_warning = '<?php echo __("Warning! Are you sure you want to deactivate all bands?"); ?>';
 		</script>
-	  	<button onclick="createBandDialog();" class="btn btn-primary btn-sm"><i class="fas fa-plus"></i> <?php echo lang('options_bands_create'); ?></button>
-  		<button onclick="activateAllBands();" class="btn btn-primary btn-sm"><?php echo lang('options_bands_activate_all'); ?></button>
-		<button onclick="deactivateAllBands();" class="btn btn-primary btn-sm"><?php echo lang('options_bands_deactivate_all'); ?></button>
+	  	<button onclick="createBandDialog();" class="btn btn-primary btn-sm"><i class="fas fa-plus"></i> <?php echo __("Create a band"); ?></button>
+  		<button onclick="activateAllBands();" class="btn btn-primary btn-sm"><?php echo __("Activate All"); ?></button>
+		<button onclick="deactivateAllBands();" class="btn btn-primary btn-sm"><?php echo __("Deactivate All"); ?></button>
 		<?php } ?>
 	</p>
 </div>
diff --git a/application/views/cabrillo/index.php b/application/views/cabrillo/index.php
index 2b74cd062..0c4afd07e 100644
--- a/application/views/cabrillo/index.php
+++ b/application/views/cabrillo/index.php
@@ -1,9 +1,9 @@
 <script>
-	var lang_export_cabrillo_proceed = '<?php echo lang('export_cabrillo_proceed') ?>';
-	var lang_export_cabrillo_select_year = "<?php echo lang('export_cabrillo_select_year') ?>";
-	var lang_export_cabrillo_select_contest = '<?php echo lang ('export_cabrillo_select_contest') ?>';
-	var lang_export_cabrillo_select_date_range = '<?php echo lang ('export_cabrillo_select_date_range') ?>'; 
-	var lang_export_cabrillo_no_contests_for_stationlocation = '<?php echo lang('export_cabrillo_no_contests_for_stationlocation') ?>';
+	var lang_export_cabrillo_proceed = '<?php echo __("Proceed") ?>';
+	var lang_export_cabrillo_select_year = "<?php echo __("Select Year") ?>";
+	var lang_export_cabrillo_select_contest = '<?php echo __("Select Contest") ?>';
+	var lang_export_cabrillo_select_date_range = '<?php echo __("Select Date Range") ?>'; 
+	var lang_export_cabrillo_no_contests_for_stationlocation = '<?php echo __("No contests were found for this station location!") ?>';
 </script>
 <div class="container">
 
@@ -13,7 +13,7 @@
 
     <div class="card">
         <div class="card-header">
-			<?php echo lang('export_cabrillo_description'); ?>
+			<?php echo __("Export a contest to a Cabrillo log"); ?>
         </div>
         <div class="card-body">
 
@@ -25,13 +25,13 @@
 
 			<form class="form" action="<?php echo site_url('cabrillo/export'); ?>" method="post" enctype="multipart/form-data">
 				<div class="mb-3 d-flex align-items-center row">
-					<div class="col-md-3 control-label" for="station_id"><?php echo lang('export_cabrillo_select_station'); ?> </div>
+					<div class="col-md-3 control-label" for="station_id"><?php echo __("Select Station Location:"); ?> </div>
 					<select id="station_id" name="station_id" class="form-select my-1 me-sm-2 col-md-4 w-auto">
 					<?php foreach ($station_profile->result() as $station) { ?>
-						<option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_callsign') ?>: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+						<option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) { echo " selected =\"selected\""; } ?>><?php echo __("Callsign") ?>: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 					<?php } ?>
 					</select>
-					<button id="button1id" type="button" onclick="loadYears();" name="button1id" class="btn btn-sm btn-primary w-auto"> <?php echo lang('export_cabrillo_proceed') ?></button>
+					<button id="button1id" type="button" onclick="loadYears();" name="button1id" class="btn btn-sm btn-primary w-auto"> <?php echo __("Proceed") ?></button>
 				</div>
 
 				<div class="mb-3 d-flex align-items-center row contestyear">
@@ -45,24 +45,24 @@
 					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="soapbox" type="soapbox" name="soapbox" aria-label="soapbox">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="categoryoperator"><?php echo lang('export_cabrillo_cat_operator') ?>: </div>
+					<div class="col-md-3 control-label" for="categoryoperator"><?php echo __("Category Operator") ?>: </div>
 					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categoryoperator" name="categoryoperator">
-						<option value="SINGLE-OP"><?php echo lang('export_cabrillo_cat_operator_single_op') ?></option>
-						<option value="MULTI-OP"><?php echo lang('export_cabrillo_cat_operator_multi_op') ?></option>
-						<option value="CHECKLOG"><?php echo lang('export_cabrillo_cat_operator_checklog') ?></option>
+						<option value="SINGLE-OP"><?php echo __("Single Operator") ?></option>
+						<option value="MULTI-OP"><?php echo __("Multi Operator") ?></option>
+						<option value="CHECKLOG"><?php echo __("Checklog") ?></option>
 					</select>
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="categoryassisted"><?php echo lang('export_cabrillo_cat_assisted') ?>: </div>
+					<div class="col-md-3 control-label" for="categoryassisted"><?php echo __("Category Assisted") ?>: </div>
 					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categoryassisted" name="categoryassisted">
-						<option value="NON-ASSISTED"><?php echo lang('export_cabrillo_cat_assisted_not_ass') ?></option>
-						<option value="ASSISTED"><?php echo lang('export_cabrillo_cat_assisted_ass') ?></option>
+						<option value="NON-ASSISTED"><?php echo __("Not Assisted") ?></option>
+						<option value="ASSISTED"><?php echo __("Assisted") ?></option>
 					</select>
 				</div>
 					<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="categoryband"><?php echo lang('export_cabrillo_cat_band') ?>: </div>
+					<div class="col-md-3 control-label" for="categoryband"><?php echo __("Category Band") ?>: </div>
 					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categoryband" name="categoryband">
-						<option value="ALL"><?php echo lang('general_word_all') ?></option>
+						<option value="ALL"><?php echo __("All") ?></option>
 						<option value="160M">160 M</option>
 						<option value="80M">80 M</option>
 						<option value="40M">40 M</option>
@@ -86,12 +86,12 @@
 						<option value="122G">122 GHz</option>
 						<option value="134G">134 GHz</option>
 						<option value="241G">241 GHz</option>
-						<option value="Light"><?php echo lang('general_word_light') ?></option>
-						<option value="VHF-3-BAND and VHF-FM-ONLY (ARRL VHF Contests only)"><?php echo lang('export_cabrillo_cat_band_arrl_vhf') ?></option>
+						<option value="Light"><?php echo __("Light/Laser") ?></option>
+						<option value="VHF-3-BAND and VHF-FM-ONLY (ARRL VHF Contests only)"><?php echo __("VHF-3-BAND and VHF-FM-ONLY (ARRL VHF Contests only)") ?></option>
 					</select>
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="categorymode"><?php echo lang('export_cabrillo_cat_mode') ?>: </div>
+					<div class="col-md-3 control-label" for="categorymode"><?php echo __("Category Mode") ?>: </div>
 					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categorymode" name="categorymode">
 						<option value="MIXED">MIXED</option>
 						<option value="CW">CW</option>
@@ -102,7 +102,7 @@
 					</select>
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="categorypower"><?php echo lang('export_cabrillo_cat_power') ?>: </div>
+					<div class="col-md-3 control-label" for="categorypower"><?php echo __("Category Power") ?>: </div>
 					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categorypower" name="categorypower">
 						<option value="LOW">LOW</option>
 						<option value="HIGH">HIGH</option>
@@ -110,7 +110,7 @@
 					</select>
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="categorystation"><?php echo lang('export_cabrillo_cat_station') ?>: </div>
+					<div class="col-md-3 control-label" for="categorystation"><?php echo __("Category Station") ?>: </div>
 					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categorystation" name="categorystation">
 						<option value="FIXED">FIXED</option>
 						<option value="DISTRIBUTED">DISTRIBUTED</option>
@@ -126,7 +126,7 @@
 					</select>
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="categorytransmitter"><?php echo lang('export_cabrillo_cat_transmitter') ?>: </div>
+					<div class="col-md-3 control-label" for="categorytransmitter"><?php echo __("Category Transmitter") ?>: </div>
 					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categorytransmitter" name="categorytransmitter">
 						<option value="ONE">ONE</option>
 						<option value="TWO">TWO</option>
@@ -136,7 +136,7 @@
 					</select>
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="categoryoverlay"><?php echo lang('export_cabrillo_cat_overlay') ?>: </div>
+					<div class="col-md-3 control-label" for="categoryoverlay"><?php echo __("Category Overlay") ?>: </div>
 					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categoryoverlay" name="categoryoverlay">
 						<option value="CLASSIC">CLASSIC</option>
 						<option value="ROOKIE">ROOKIE</option>
@@ -147,43 +147,43 @@
 					</select>
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="operators"><?php echo lang('export_cabrillo_operators') ?>: </div>
+					<div class="col-md-3 control-label" for="operators"><?php echo __("Operators") ?>: </div>
 					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="operators" type="operators" name="operators" aria-label="operators">
 					</select>
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="soapbox"><?php echo lang('export_cabrillo_soapbox') ?>: </div>
+					<div class="col-md-3 control-label" for="soapbox"><?php echo __("Soapbox") ?>: </div>
 					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="soapbox" type="text" name="soapbox" aria-label="soapbox">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="address"><?php echo lang('export_cabrillo_address') ?>: </div>
+					<div class="col-md-3 control-label" for="address"><?php echo __("Address") ?>: </div>
 					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="address" type="text" name="address" aria-label="address">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="addresscity"><?php echo lang('export_cabrillo_address_city') ?>: </div>
+					<div class="col-md-3 control-label" for="addresscity"><?php echo __("Address City") ?>: </div>
 					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="addresscity" type="text" name="addresscity" aria-label="addresscity">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="addressstateprovince"><?php echo lang('export_cabrillo_address_state_province') ?>: </div>
+					<div class="col-md-3 control-label" for="addressstateprovince"><?php echo __("Address State/Province") ?>: </div>
 					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="addressstateprovince" type="text" name="addressstateprovince" aria-label="addressstateprovince">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="addresspostalcode"><?php echo lang('export_cabrillo_address_postalcode') ?>: </div>
+					<div class="col-md-3 control-label" for="addresspostalcode"><?php echo __("Address Postalcode") ?>: </div>
 					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="addresspostalcode" type="text" name="addresspostalcode" aria-label="addresspostalcode">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
-					<div class="col-md-3 control-label" for="addresscountry"><?php echo lang('export_cabrillo_address_country') ?>: </div>
+					<div class="col-md-3 control-label" for="addresscountry"><?php echo __("Address Country") ?>: </div>
 					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="addresscountry" type="text" name="addresscountry" aria-label="addresscountry">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="button1id"></div>
-					<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary w-auto"> <?php echo lang('general_word_export') ?></button>
+					<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary w-auto"> <?php echo __("Export") ?></button>
 				</div>
 			</form>
 
 			<?php }
 			else {
-				echo lang('export_cabrillo_no_contests_in_log');
+				echo __("No contests were found in your log.");
 			}
 			?>
 
diff --git a/application/views/cfd/index.php b/application/views/cfd/index.php
index 597611d9e..555ad0f02 100644
--- a/application/views/cfd/index.php
+++ b/application/views/cfd/index.php
@@ -12,17 +12,17 @@
             <form class="form" action="<?php echo site_url('cfdexport/export'); ?>" method="post" enctype="multipart/form-data">
                 <div class="row">
                     <div class="mb-3 col-md-3">
-                        <label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+                        <label for="from"><?php echo __("From date") . ": " ?></label>
                         <input name="from" id="from" type="date" class="form-control w-auto">
                     </div>
 
                     <div class="mb-3 col-md-3">
-                        <label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
+                        <label for="to"><?php echo __("To date") . ": " ?></label>
                         <input name="to" id="to" type="date" class="form-control w-auto">
                     </div>
                 </div>    
                 <br>
-                <button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo lang('general_word_export'); ?></button>
+                <button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo __("Export"); ?></button>
             </form>
         </div>
     </div>
diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php
index 0b9344ecd..d30cda16f 100644
--- a/application/views/components/hamsat/table.php
+++ b/application/views/components/hamsat/table.php
@@ -16,7 +16,7 @@
     <?php } else { ?>
     <?php if ($rovedata['data'] == []) { ?>
      <div class="alert alert-warning" role="warning">
-       <?php echo lang('hams_at_no_activations_found');?>
+       <?php echo __("No upcoming activations found. Please check back later.");?>
     </div>
     <?php } else { ?>
        <table class="table table-striped table-hover">
diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php
index 4665c50e8..5d8d99631 100644
--- a/application/views/contesting/add.php
+++ b/application/views/contesting/add.php
@@ -13,18 +13,18 @@
 	<div class="card">
 		<div class="card-body">
 			<p class="card-text">
-				<?php echo lang('admin_contest_menu_line_1'); ?>
+				<?php echo __("Using the contest list, you can control which Contests are shown when logging QSOs in a contest."); ?>
 			</p>
 			<p class="card-text">
-				<?php echo lang('admin_contest_menu_line_2'); ?>
+				<?php echo __("Active contests will be shown in the Contest Name drop-down, while inactive contests will be hidden and cannot be selected."); ?>
 			</p>
 			<div class="table-responsive">
 				<table style="width:100%" class="contesttable table table-sm table-striped">
 					<thead>
 					<tr>
-						<th scope="col"><?php echo lang('admin_contest_menu_name'); ?></th>
-						<th scope="col"><?php echo lang('admin_contest_menu_adif'); ?></th>
-						<th scope="col"><?php echo lang('admin_contest_menu_active'); ?></th>
+						<th scope="col"><?php echo __("Name"); ?></th>
+						<th scope="col"><?php echo __("ADIF Name"); ?></th>
+						<th scope="col"><?php echo __("Active"); ?></th>
 						<th scope="col"></th>
 						<th scope="col"></th>
 						<th scope="col"></th>
@@ -36,30 +36,30 @@
 							<td><?php echo $row['name'];?></td>
 							<td><?php echo $row['adifname'];?></td>
 							<script>
-								var lang_admin_contest_menu_n_active = '<?php echo lang('admin_contest_menu_n_active'); ?>';
-								var lang_admin_contest_menu_activate = '<?php echo lang('admin_contest_menu_activate'); ?>';
-								var lang_admin_contest_menu_active = '<?php echo lang('admin_contest_menu_active'); ?>';
-								var lang_admin_contest_menu_deactivate = '<?php echo lang('admin_contest_menu_deactivate'); ?>';
+								var lang_admin_contest_menu_n_active = '<?php echo __("Not Active"); ?>';
+								var lang_admin_contest_menu_activate = '<?php echo __("Activate"); ?>';
+								var lang_admin_contest_menu_active = '<?php echo __("Active"); ?>';
+								var lang_admin_contest_menu_deactivate = '<?php echo __("Deactivate"); ?>';
 							</script>
-							<td class='contest_<?php echo $row['id'] ?>'><?php if ($row['active'] == 1) { echo lang('admin_contest_menu_active');} else { echo lang('admin_contest_menu_n_active');};?></td>
+							<td class='contest_<?php echo $row['id'] ?>'><?php if ($row['active'] == 1) { echo __("Active");} else { echo __("Not Active");};?></td>
 							<td style="text-align: center">
 								<?php if ($row['active'] == 1) {
-									echo "<button onclick='javascript:deactivateContest(". $row['id'] . ")' class='btn_" . $row['id'] . " btn btn-secondary btn-sm'>" . lang('admin_contest_menu_deactivate') . "</button>";
+									echo "<button onclick='javascript:deactivateContest(". $row['id'] . ")' class='btn_" . $row['id'] . " btn btn-secondary btn-sm'>" . __("Deactivate") . "</button>";
 								} else {
-									echo "<button onclick='javascript:activateContest(". $row['id'] . ")' class='btn_" . $row['id'] . " btn btn-secondary btn-sm'>" . lang('admin_contest_menu_activate') . "</button>";
+									echo "<button onclick='javascript:activateContest(". $row['id'] . ")' class='btn_" . $row['id'] . " btn btn-secondary btn-sm'>" . __("Activate") . "</button>";
 								};?>
 							</td>
 							<td>
 								<script>
-									var lang_admin_danger = '<?php echo lang('admin_danger'); ?>';
-									var lang_admin_contest_deletion_warning = '<?php echo lang('admin_contest_deletion_warning'); ?>';
-									var lang_admin_contest_active_all_warning = '<?php echo lang('admin_contest_active_all_warning'); ?>';
-									var lang_admin_contest_deactive_all_warning = '<?php echo lang('admin_contest_deactive_all_warning'); ?>';
+									var lang_admin_danger = '<?php echo __("DANGER!"); ?>';
+									var lang_admin_contest_deletion_warning = '<?php echo __("Warning! Are you sure you want to delete the following contest: "); ?>';
+									var lang_admin_contest_active_all_warning = '<?php echo __("Warning! Are you sure you want to activate all contests?"); ?>';
+									var lang_admin_contest_deactive_all_warning = '<?php echo __("Warning! Are you sure you want to deactivate all contests?"); ?>';
 								</script>
-								<a href="<?php echo site_url('contesting/edit')."/".$row['id']; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i> <?php echo lang('admin_edit'); ?></a>
+								<a href="<?php echo site_url('contesting/edit')."/".$row['id']; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i> <?php echo __("Edit"); ?></a>
 							</td>
 							<td>
-								<a href="javascript:deleteContest('<?php echo $row['id']; ?>', '<?php echo $row['name']; ?>');" class="btn btn-danger btn-sm" ><i class="fas fa-trash-alt"></i> <?php echo lang('admin_delete'); ?></a>
+								<a href="javascript:deleteContest('<?php echo $row['id']; ?>', '<?php echo $row['name']; ?>');" class="btn btn-danger btn-sm" ><i class="fas fa-trash-alt"></i> <?php echo __("Delete"); ?></a>
 							</td>
 						</tr>
 
@@ -70,12 +70,12 @@
 			<br/>
 			<p>
 				<script>
-					var lang_admin_contest_add_contest = '<?php echo lang('admin_contest_add_contest'); ?>';
-					var lang_admin_close = '<?php echo lang('admin_close'); ?>'
+					var lang_admin_contest_add_contest = '<?php echo __("Add a Contest"); ?>';
+					var lang_admin_close = '<?php echo __("Close"); ?>'
 				</script>
-				<button onclick="createContestDialog();" class="btn btn-primary btn-sm"><i class="fas fa-plus"></i> <?php echo lang('admin_contest_add_contest'); ?></button>
-				<button onclick="activateAllContests();" class="btn btn-primary btn-sm"><?php echo lang('admin_contest_all_active'); ?></button>
-				<button onclick="deactivateAllContests();" class="btn btn-primary btn-sm"><?php echo lang('admin_contest_all_deactive'); ?></button>
+				<button onclick="createContestDialog();" class="btn btn-primary btn-sm"><i class="fas fa-plus"></i> <?php echo __("Add a Contest"); ?></button>
+				<button onclick="activateAllContests();" class="btn btn-primary btn-sm"><?php echo __("Activate All"); ?></button>
+				<button onclick="deactivateAllContests();" class="btn btn-primary btn-sm"><?php echo __("Deactivate All"); ?></button>
 			</p>
 		</div>
 	</div>
diff --git a/application/views/contesting/create.php b/application/views/contesting/create.php
index 37624405b..8e84aa378 100644
--- a/application/views/contesting/create.php
+++ b/application/views/contesting/create.php
@@ -21,18 +21,18 @@
 
 		<form>
 		<div class="mb-3">
-		    <label for="contestInput"><?php echo lang('admin_contest_menu_name'); ?></label>
+		    <label for="contestInput"><?php echo __("Name"); ?></label>
 		    <input type="text" class="form-control" name="contestname" id="contestInput" aria-describedby="contestInputHelp" required>
-		    <small id="contestInputHelp" class="form-text text-muted"><?php echo lang('admin_contest_name_of_contest'); ?></small>
+		    <small id="contestInputHelp" class="form-text text-muted"><?php echo __("Name of the Contest"); ?></small>
 		  </div>
 
 		  <div class="mb-3">
-		    <label for="adifcontestInput"><?php echo lang('admin_contest_menu_adif'); ?></label>
+		    <label for="adifcontestInput"><?php echo __("ADIF Name"); ?></label>
 		    <input type="text" class="form-control" name="adifcontestname" id="adifcontestInput" aria-describedby="adifcontestInputHelp">
-		    <small id="adifcontestInputHelp" class="form-text text-muted"><?php echo lang('admin_contest_name_of_adif'); ?></small>
+		    <small id="adifcontestInputHelp" class="form-text text-muted"><?php echo __("Name of Contest in ADIF-specification"); ?></small>
 		  </div>
 
-			<button type="button" onclick="createContest(this.form);" class="btn btn-primary btn-sm"><i class="fas fa-plus-square"></i> <?php echo lang('admin_contest_create'); ?></button>
+			<button type="button" onclick="createContest(this.form);" class="btn btn-primary btn-sm"><i class="fas fa-plus-square"></i> <?php echo __("Create"); ?></button>
 
 		</form>
 </div>
diff --git a/application/views/contesting/edit.php b/application/views/contesting/edit.php
index 7c9327055..de81ce6d9 100644
--- a/application/views/contesting/edit.php
+++ b/application/views/contesting/edit.php
@@ -28,31 +28,31 @@
 
 			<form method="post" action="<?php echo site_url('contesting/edit/'); ?><?php echo $contest->id; ?>" name="edit_contest">
 				<div class="mb-3">
-					<label for="contestnameInput"><?php echo lang('contesting_contest_name'); ?></label>
+					<label for="contestnameInput"><?php echo __("Contest Name"); ?></label>
 					<input type="text" class="form-control" name="name" id="nameInput" aria-describedby="contestnameInputHelp" value="<?php if(set_value('name') != "") { echo set_value('name'); } else { echo $contest->name; } ?>" required>
-					<small id="contestnameInputHelp" class="form-text text-muted"><?php echo lang('admin_contest_name_of_contest'); ?></small>
+					<small id="contestnameInputHelp" class="form-text text-muted"><?php echo __("Name of the Contest"); ?></small>
 				</div>
 
 				<div class="mb-3">
-					<label for="adifnameInput"><?php echo lang('admin_contest_name_adif'); ?></label>
+					<label for="adifnameInput"><?php echo __("Contest ADIF Name"); ?></label>
 					<input type="text" class="form-control" name="adifname" id="adifnameInput" aria-describedby="adifnameInputHelp" value="<?php if(set_value('adifname') != "") { echo set_value('adifname'); } else { echo $contest->adifname; } ?>">
-					<small id="adifnameInputHelp" class="form-text text-muted"><?php echo lang('admin_contest_name_of_adif'); ?></small>
+					<small id="adifnameInputHelp" class="form-text text-muted"><?php echo __("Name of Contest in ADIF-specification"); ?></small>
 				</div>
 
 				<div class="mb-3">
-					<label for="activeInput"><?php echo lang('admin_contest_menu_active'); ?></label>
+					<label for="activeInput"><?php echo __("Active"); ?></label>
 					<select id="activeInput" class="form-select mode form-select-sm" name="active">
         				<option value="1" <?php echo $contest->active == 1 ? "selected=\"selected\"" : ""; ?>>
-            				<?php echo lang('admin_contest_menu_active'); ?>
+            				<?php echo __("Active"); ?>
         				</option>
         				<option value="0" <?php echo $contest->active == 0 ? "selected=\"selected\"" : ""; ?>>
-            				<?php echo lang('admin_contest_menu_n_active'); ?>
+            				<?php echo __("Not Active"); ?>
         				</option>
     				</select>
-					<small id="activeInputHelp" class="form-text text-muted"><?php echo lang('admin_contest_edit_active_hint'); ?></small>
+					<small id="activeInputHelp" class="form-text text-muted"><?php echo __("Set to active if to be listed in Contest-list"); ?></small>
 				</div>
 
-				<button type="submit" class="btn btn-primary btn-sm"><i class="fas fa-plus-square"></i> <?php echo lang('admin_save'); ?></button>
+				<button type="submit" class="btn btn-primary btn-sm"><i class="fas fa-plus-square"></i> <?php echo __("Save"); ?></button>
 
 			</form>
 		</div>
diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php
index 972bb64c2..e657bb515 100644
--- a/application/views/contesting/index.php
+++ b/application/views/contesting/index.php
@@ -1,6 +1,6 @@
 <div class="container qso_panel contesting">
-    <button type="button" class="btn btn-sm btn-warning float-end" onclick="reset_contest_session()"><i class="fas fa-sync-alt"></i> <?php echo lang('contesting_button_reset_contest_session'); ?></button>
-    <h2 style="display:inline"><?php echo lang('contesting_page_title'); ?> </h2> <?php echo ($_GET['manual'] == 0 ? " <span style='display:inline' class='align-text-top badge text-bg-success'>LIVE</span>" : " <span style='display:inline' class='align-text-top badge text-bg-danger'>POST</span>");  ?>
+    <button type="button" class="btn btn-sm btn-warning float-end" onclick="reset_contest_session()"><i class="fas fa-sync-alt"></i> <?php echo __("Start new Contest Session"); ?></button>
+    <h2 style="display:inline"><?php echo __("Contest Logging"); ?> </h2> <?php echo ($_GET['manual'] == 0 ? " <span style='display:inline' class='align-text-top badge text-bg-success'>LIVE</span>" : " <span style='display:inline' class='align-text-top badge text-bg-danger'>POST</span>");  ?>
     <div class="row">
 
         <div class="col-sm-12 col-md-12">
@@ -8,20 +8,20 @@
                 <div class="card-body">
                     <form id="qso_input" name="qsos">
                         <div class="mb-3 row">
-							<label class="col-auto control-label" for="radio"><?php echo lang('contesting_exchange_type'); ?></label>
+							<label class="col-auto control-label" for="radio"><?php echo __("Exchange Type"); ?></label>
 
 							<div class="col-auto">
 								<select class="form-select form-select-sm" id="exchangetype" name="exchangetype">
-									<option value='None'><?php echo lang('contesting_exchange_type_none'); ?></option>
-									<option value='Exchange'><?php echo lang('contesting_exchange_type_exchange'); ?></option>
-									<option value='Gridsquare'><?php echo lang('contesting_exchange_type_gridsquare'); ?></option>
-									<option value='Serial'><?php echo lang('contesting_exchange_type_serial'); ?></option>
-									<option value='Serialexchange'><?php echo lang('contesting_exchange_type_serial_exchange'); ?></option>
-									<option value='Serialgridsquare'><?php echo lang('contesting_exchange_type_serial_gridsquare'); ?></option>
+									<option value='None'><?php echo __("None"); ?></option>
+									<option value='Exchange'><?php echo __("Exchange"); ?></option>
+									<option value='Gridsquare'><?php echo __("Gridsquare"); ?></option>
+									<option value='Serial'><?php echo __("Serial"); ?></option>
+									<option value='Serialexchange'><?php echo __("Serial + Exchange"); ?></option>
+									<option value='Serialgridsquare'><?php echo __("Serial + Gridsquare"); ?></option>
 								</select>
 							</div>
 
-                            <label class="col-auto control-label" for="contestname"><?php echo lang('contesting_contest_name'); ?></label>
+                            <label class="col-auto control-label" for="contestname"><?php echo __("Contest Name"); ?></label>
 
                             <div class="col-auto">
                                 <select class="form-select form-select-sm" id="contestname" name="contestname">
@@ -31,7 +31,7 @@
                                 </select>
                             </div>
 
-                            <label class="col-auto control-label" for="operatorcall"><?php echo lang('contesting_operator_callsign'); ?></label>
+                            <label class="col-auto control-label" for="operatorcall"><?php echo __("Operator Callsign"); ?></label>
                             <div class="col-auto">
                                 <input type="text" class="form-control form-control-sm" id="operator_callsign" name="operator_callsign" value='<?php echo $this->session->userdata('operator_callsign'); ?>' required>
                             </div>
@@ -39,12 +39,12 @@
 
                         <div class="row">
                             <div class="mb-3 col-md-2">
-                                <label for="start_date"><?php echo lang('general_word_date'); ?></label>
+                                <label for="start_date"><?php echo __("Date"); ?></label>
                                 <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> >
                             </div>
 
                             <div class="mb-3 col-md-1">
-                                <label for="start_time"><?php echo lang('general_word_time'); ?></label>
+                                <label for="start_time"><?php echo __("Time"); ?></label>
                                 <input type="text" class="form-control form-control-sm input_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo substr($this->session->userdata('start_time'),0,5); } else { echo $_GET['manual'] == 0 ? date('H:i:s') : date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> >
                             </div>
 
@@ -54,7 +54,7 @@
                             <?php } ?>
 
                             <div class="mb-3 col-md-2">
-                                <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+                                <label for="mode"><?php echo __("Mode"); ?></label>
                                 <select id="mode" class="form-select mode form-select-sm" name="mode">
                                     <?php foreach($modes->result() as $mode) {
                                             if ($mode->submode == null) {
@@ -67,7 +67,7 @@
                             </div>
 
                             <div class="mb-3 col-md-2">
-                                <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+                                <label for="band"><?php echo __("Band"); ?></label>
 
                                 <select id="band" class="form-select form-select-sm" name="band">
                                 <?php foreach($bands as $key=>$bandgroup) {
@@ -84,14 +84,14 @@
                             </div>
 
                             <div class="mb-3 col-md-2">
-                                <label for="frequency"><?php echo lang('gen_hamradio_frequency'); ?></label>
+                                <label for="frequency"><?php echo __("Frequency"); ?></label>
                                 <input type="text" class="form-control form-control-sm" id="frequency" name="freq_display" value="<?php echo $this->session->userdata('freq'); ?>" />
                             </div>
 
                             <div class="mb-3 col-md-2">
-                                <label for="inputRadio"><?php echo lang('gen_hamradio_radio'); ?></label>
+                                <label for="inputRadio"><?php echo __("Radio"); ?></label>
                                 <select class="form-select form-select-sm radios" id="radio" name="radio">
-                                    <option value="0" selected="selected"><?php echo lang('general_word_none'); ?></option>
+                                    <option value="0" selected="selected"><?php echo __("None"); ?></option>
                                         <?php foreach ($radios->result() as $row) { ?>
                                         <option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
                                         <?php } ?>
@@ -101,78 +101,78 @@
 
                         <div class="row">
                             <div class="mb-3 col-md-3">
-                                <label for="callsign"><?php echo lang('gen_hamradio_callsign'); ?></label>
+                                <label for="callsign"><?php echo __("Callsign"); ?></label>
                                 <input type="text" class="form-control form-control-sm" id="callsign" name="callsign" required>
                                 <small id="callsign_info" class="badge text-bg-danger"></small><br/>
                                 <small id="bearing_info" class="form-text text-muted"></small>
                             </div>
 
                             <div class="mb-3 col-md-1">
-                                <label for="rst_sent"><?php echo lang('gen_hamradio_rsts'); ?></label>
+                                <label for="rst_sent"><?php echo __("RST (S)"); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="59">
                             </div>
 
                             <div style="display:none" class="mb-3 col-md-1 serials">
-								<label for="exch_serial_s"><?php echo lang('contesting_exchange_serial_s'); ?></label>
+								<label for="exch_serial_s"><?php echo __("Serial (S)"); ?></label>
 								<input type="number" class="form-control form-control-sm" name="exch_serial_s" id="exch_serial_s" min="0" value="">
 							</div>
 
                             <div style="display:none" class="mb-3 col-md-1 exchanges">
-                                <label for="exch_sent"><?php echo lang('gen_hamradio_exchange_sent_short'); ?></label>
+                                <label for="exch_sent"><?php echo __("Exch (S)"); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="exch_sent" id="exch_sent" value="">
                             </div>
 
 							<div style="display:none" class="mb-3 col-md-2 gridsquares">
-								<label for="exch_gridsquare_s"><?php echo lang('contesting_exchange_gridsquare_s'); ?></label>
+								<label for="exch_gridsquare_s"><?php echo __("Gridsquare (S)"); ?></label>
 								<input disabled type="text" class="form-control form-control-sm" name="exch_gridsquare_s" id="exch_gridsquare_s" value="<?php echo $my_gridsquare;?>">
 							</div>
 
                             <div class="mb-3 col-md-1">
-                                <label for="rst_rcvd"><?php echo lang('gen_hamradio_rstr'); ?></label>
+                                <label for="rst_rcvd"><?php echo __("RST (R)"); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="59">
                             </div>
 
                             <div style="display:none" class="mb-3 col-md-1 serialr">
-								<label for="exch_serial_r"><?php echo lang('contesting_exchange_serial_r'); ?></label>
+								<label for="exch_serial_r"><?php echo __("Serial (R)"); ?></label>
 								<input type="number" class="form-control form-control-sm" name="exch_serial_r" id="exch_serial_r" min="0" value="">
 							</div>
 
 							<div style="display:none" class="mb-3 col-md-1 exchanger">
-								<label for="exch_rcvd"><?php echo lang('gen_hamradio_exchange_rcvd_short'); ?></label>
+								<label for="exch_rcvd"><?php echo __("Exch (R)"); ?></label>
 								<input type="text" class="form-control form-control-sm" name="exch_rcvd" id="exch_rcvd" value="">
 							</div>
 
 							<div style="display:none" class="mb-3 col-md-2 gridsquarer">
-								<label for="exch_gridsquare_r"><?php echo lang('contesting_exchange_gridsquare_r'); ?></label>
+								<label for="exch_gridsquare_r"><?php echo __("Gridsquare (R)"); ?></label>
 								<input type="text" class="form-control form-control-sm" name="locator" id="exch_gridsquare_r" value="">
 							</div>
                         </div>
 
                         <div class="row">
                             <div class="mb-3 col-md-5">
-                                <label for="name"><?php echo lang('general_word_name'); ?></label>
+                                <label for="name"><?php echo __("Name"); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="name" id="name" value="">
                             </div>
 
                             <div class="mb-3 col-md-5">
-                                <label for="comment"><?php echo lang('general_word_comment'); ?></label>
+                                <label for="comment"><?php echo __("Comment"); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="comment" id="comment" value="">
                             </div>
                         </div>
 
-                        <button type="button" class="mb-3 btn btn-sm btn-secondary" onclick="reset_log_fields()"><i class="fas fa-sync-alt"></i> <?php echo lang('contesting_btn_reset_qso'); ?></button>
-                        <button type="button" class="mb-3 btn btn-sm btn-primary" onclick="logQso();"><i class="fas fa-save"></i> <?php echo lang('contesting_btn_save_qso'); ?></button>
+                        <button type="button" class="mb-3 btn btn-sm btn-secondary" onclick="reset_log_fields()"><i class="fas fa-sync-alt"></i> <?php echo __("Reset QSO"); ?></button>
+                        <button type="button" class="mb-3 btn btn-sm btn-primary" onclick="logQso();"><i class="fas fa-save"></i> <?php echo __("Save QSO"); ?></button>
                         <div class="row">
-                            <label class="col-auto control-label" for="radio"><?php echo lang('contesting_copy_exch_to'); ?></label>
+                            <label class="col-auto control-label" for="radio"><?php echo __("Copy received exchange to"); ?></label>
                             <div class="form-check-inline col-auto">
-                                <select class="form-select form-select-sm" id="copyexchangeto" name="copyexchangeto" title="<?php echo lang('contesting_copy_exch_hint'); ?>">
-                                    <option value='None'><?php echo lang('general_word_none'); ?></option>
-                                    <option value='dok'><?php echo lang('gen_hamradio_dok'); ?></option>
-                                    <option value='name'><?php echo lang('general_word_name'); ?></option>
-                                    <option value='age'><?php echo lang('general_word_age'); ?></option>
-                                    <option value='state'><?php echo lang('gen_hamradio_state'); ?></option>
-                                    <option value='power'><?php echo lang('gen_hamradio_receive_power'); ?></option>
-                                    <option value='locator'><?php echo lang('gen_hamradio_locator'); ?></option>
+                                <select class="form-select form-select-sm" id="copyexchangeto" name="copyexchangeto" title="<?php echo __("Exchange is only copied if it is matching rules for the selected field!"); ?>">
+                                    <option value='None'><?php echo __("None"); ?></option>
+                                    <option value='dok'><?php echo __("DOK"); ?></option>
+                                    <option value='name'><?php echo __("Name"); ?></option>
+                                    <option value='age'><?php echo __("Age"); ?></option>
+                                    <option value='state'><?php echo __("State"); ?></option>
+                                    <option value='power'><?php echo __("RX Power (W)"); ?></option>
+                                    <option value='locator'><?php echo __("Locator"); ?></option>
                                 </select>
                             </div>
                       </div>
@@ -184,31 +184,31 @@
 
             <!-- Callsign SCP Box -->
             <div class="card callsign-suggest">
-                <div class="card-header"><h5 class="card-title"><?php echo lang('contesting_title_callsign_suggestions'); ?></h5></div>
+                <div class="card-header"><h5 class="card-title"><?php echo __("Callsign Suggestions"); ?></h5></div>
 
                 <div class="card-body callsign-suggestions"></div>
             </div>
 
             <!-- Past QSO Box -->
             <div class="card log">
-                <div class="card-header"><h5 class="card-title"><?php echo lang('contesting_title_contest_logbook'); ?></h5></div>
+                <div class="card-header"><h5 class="card-title"><?php echo __("Contest Logbook"); ?></h5></div>
                 <p>
 
                 <table style="width:100%" class="table-sm table qsotable table-bordered table-hover table-striped table-condensed text-center">
                     <thead>
                         <tr class="log_title titles">
-                            <th><?php echo lang('general_word_date'); ?>/<?php echo lang('general_word_time'); ?></th>
-                            <th><?php echo lang('gen_hamradio_call'); ?></th>
-                            <th><?php echo lang('gen_hamradio_band'); ?></th>
-                            <th><?php echo lang('gen_hamradio_mode'); ?></th>
-                            <th><?php echo lang('gen_hamradio_rsts'); ?></th>
-                            <th><?php echo lang('gen_hamradio_rstr'); ?></th>
-                            <th><?php echo lang('gen_hamradio_exchange_sent_short'); ?></th>
-                            <th><?php echo lang('gen_hamradio_exchange_rcvd_short'); ?></th>
-							<th><?php echo lang('contesting_exchange_serial_s'); ?></th>
-							<th><?php echo lang('contesting_exchange_serial_r'); ?></th>
-							<th><?php echo lang('contesting_exchange_type_gridsquare'); ?></th>
-							<th><?php echo 'VUCC ' . lang('contesting_exchange_type_gridsquare'); ?></th>
+                            <th><?php echo __("Date"); ?>/<?php echo __("Time"); ?></th>
+                            <th><?php echo __("Call"); ?></th>
+                            <th><?php echo __("Band"); ?></th>
+                            <th><?php echo __("Mode"); ?></th>
+                            <th><?php echo __("RST (S)"); ?></th>
+                            <th><?php echo __("RST (R)"); ?></th>
+                            <th><?php echo __("Exch (S)"); ?></th>
+                            <th><?php echo __("Exch (R)"); ?></th>
+							<th><?php echo __("Serial (S)"); ?></th>
+							<th><?php echo __("Serial (R)"); ?></th>
+							<th><?php echo __("Gridsquare"); ?></th>
+							<th><?php echo 'VUCC ' . __("Gridsquare"); ?></th>
                         </tr>
                     </thead>
 
diff --git a/application/views/cron/edit.php b/application/views/cron/edit.php
index d69afe2c7..143ce14b3 100644
--- a/application/views/cron/edit.php
+++ b/application/views/cron/edit.php
@@ -70,8 +70,8 @@
             </div>
 
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="editCron()" ><?php echo lang('admin_save'); ?></button>
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><?php echo lang('general_word_cancel'); ?></button>
+                <button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="editCron()" ><?php echo __("Save"); ?></button>
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><?php echo __("Cancel"); ?></button>
             </div>
         </div>
     </div>
diff --git a/application/views/cron/index.php b/application/views/cron/index.php
index b68cc5a50..55a60181d 100644
--- a/application/views/cron/index.php
+++ b/application/views/cron/index.php
@@ -18,7 +18,7 @@
                         To execute cron jobs based on the data below, remove all old cron jobs and create a new one:
                     </p>
                     <div class="main_cronjob">
-                        <pre><code id="main_cronjob">* * * * * curl --silent <?php echo base_url(); ?>index.php/cron/run &>/dev/null</code><span data-bs-toggle="tooltip" title="<?php echo lang('copy_to_clipboard'); ?>" onclick='copyCron("main_cronjob")'><i class="copy-icon fas fa-copy"></i></span></pre>
+                        <pre><code id="main_cronjob">* * * * * curl --silent <?php echo base_url(); ?>index.php/cron/run &>/dev/null</code><span data-bs-toggle="tooltip" title="<?php echo __("Copy to clipboard"); ?>" onclick='copyCron("main_cronjob")'><i class="copy-icon fas fa-copy"></i></span></pre>
                     </div>
                 </div>
                 <div class="col text-end" id="alert_status">
diff --git a/application/views/csv/index.php b/application/views/csv/index.php
index c7d9c419c..4c755d6dc 100644
--- a/application/views/csv/index.php
+++ b/application/views/csv/index.php
@@ -1,14 +1,14 @@
 <div class="container">
 	<br>
-	<h2><?php echo lang('export_sota_header'); ?></h2>
+	<h2><?php echo __("SOTA CSV Export"); ?></h2>
 
 	<div class="card">
 		<div class="card-header">
-			<?php echo lang('export_sota_description'); ?>
+			<?php echo __("Export your logbook for SOTA uploads."); ?>
 		</div>
 
 		<div class="alert alert-warning" role="alert">
-			<?php echo lang('export_sota_info_warning'); ?>
+			<?php echo __("Only QSOs with SOTA information will be exported!"); ?>
 		</div>
 
 		<div class="card-body">
@@ -16,11 +16,11 @@
 			<form class="form" action="<?php echo site_url('csv/export'); ?>" method="post" enctype="multipart/form-data">
 				<div class="row">
 					<div class="mb-3 col-md-3">
-						<label for="station_profile"><?php echo lang('wavelog_station_profile'); ?></label>
+						<label for="station_profile"><?php echo __("Station Location"); ?></label>
 						<select name="station_profile" class="station_id form-select">
-							<option value="All"><?php echo lang('general_word_all'); ?></option>
+							<option value="All"><?php echo __("All"); ?></option>
 							<?php foreach ($station_profile->result() as $station) { ?>
-								<option value="<?php echo $station->station_id; ?>"><?php echo lang('gen_hamradio_callsign') . ": "; ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+								<option value="<?php echo $station->station_id; ?>"><?php echo __("Callsign") . ": "; ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 							<?php } ?>
 						</select>
 					</div>
@@ -28,9 +28,9 @@
 
 				<div class="row">
 				<div class="mb-3 col-md-3">
-					<label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+					<label for="band"><?php echo __("Band"); ?></label>
 					<select id="band" name="band" class="form-select">
-						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
+						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo __("All"); ?></option>
 						<?php foreach($worked_bands as $band) {
 							echo '<option value="' . $band . '"';
 							if ($this->input->post('band') == $band) echo ' selected';
@@ -39,9 +39,9 @@
 					</select>
 				</div>
 					<div class="mb-3 col-md-3">
-						<label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+						<label for="mode"><?php echo __("Mode"); ?></label>
 						<select id="mode" name="mode" class="form-select">
-							<option value="All"><?php echo lang('general_word_all'); ?></option>
+							<option value="All"><?php echo __("All"); ?></option>
 							<?php
 							foreach($modes->result() as $mode){
 								if ($mode->submode == null) {
@@ -55,14 +55,14 @@
 					</div>
 
 				<div class="mb-3 col-md-4">
-					<label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
+					<label for="dxcc_id"><?php echo __("DXCC"); ?></label>
 					<select class="form-select" id="dxcc_id" name="dxcc_id">
-						<option value="All"><?php echo lang('general_word_all'); ?></option>
+						<option value="All"><?php echo __("All"); ?></option>
 						<?php
 						foreach($dxcc as $d){
 							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
 							if ($d->Enddate != null) {
-								echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
+								echo ' ('.__("Deleted DXCC").')';
 							}
 							echo '</option>';
 						}
@@ -77,9 +77,9 @@
 
 				<div class="row">
 					<div class="mb-3 col-md-3">
-					<label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
+					<label for="cqz"><?php echo __("CQ Zone"); ?></label>
 					<select class="form-select" id="cqz" name="cqz">
-						<option value="All"><?php echo lang('general_word_all'); ?></option>
+						<option value="All"><?php echo __("All"); ?></option>
 						<?php
 						for ($i = 1; $i<=40; $i++) {
 							echo '<option value="'. $i . '">'. $i .'</option>';
@@ -89,9 +89,9 @@
 				</div>
 
 				<div class="mb-3 col-md-5">
-					<label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
+					<label for="selectPropagation"><?php echo __("Propagation Mode"); ?></label>
 					<select class="form-select" id="selectPropagation" name="prop_mode">
-						<option value="All"><?php echo lang('general_word_all'); ?></option>
+						<option value="All"><?php echo __("All"); ?></option>
 						<option value="AS">Aircraft Scatter</option>
 						<option value="AUR">Aurora</option>
 						<option value="AUE">Aurora-E</option>
@@ -115,17 +115,17 @@
 				</div>
 				<div class="row">
                     <div class="mb-3 col-md-3">
-                        <label for="fromdate"><?php echo lang('gen_from_date') . ": " ?></label>
+                        <label for="fromdate"><?php echo __("From date") . ": " ?></label>
                         <input name="fromdate" id="fromdate" type="date" class="form-control w-auto">
                     </div>
 
                     <div class="mb-3 col-md-3">
-                        <label for="todate"><?php echo lang('gen_to_date') . ": " ?></label>
+                        <label for="todate"><?php echo __("To date") . ": " ?></label>
                         <input name="todate" id="todate" type="date" class="form-control w-auto">
                     </div>
                 </div>
 				<br>
-				<button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo lang('general_word_export'); ?></button>
+				<button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo __("Export"); ?></button>
 			</form>
 		</div>
 	</div>
diff --git a/application/views/dayswithqso/index.php b/application/views/dayswithqso/index.php
index c4f578b72..16008c8f1 100644
--- a/application/views/dayswithqso/index.php
+++ b/application/views/dayswithqso/index.php
@@ -1,5 +1,5 @@
 <script>
-    var lang_days_with_qso_short = "<?php echo lang('statistics_days_with_qso_short'); ?>";
+    var lang_days_with_qso_short = "<?php echo __("Days with QSOs"); ?>";
 </script>
 
 <div class="container">
@@ -13,7 +13,7 @@
     echo '<div id="diffDays" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
 
             echo '<tr>';
-                echo '<th style=\'text-align: center\'>' . lang('general_word_year') . '</th>';
+                echo '<th style=\'text-align: center\'>' . __("Year") . '</th>';
 
                 foreach ($result as $master) {
                 echo '<td style=\'text-align: center\'>' . $master->Year . '</td>';
@@ -22,7 +22,7 @@
                 echo '</tr>';
 
             echo '<tr>';
-                echo '<th style=\'text-align: center\'>' . lang('general_word_days') . '</th>';
+                echo '<th style=\'text-align: center\'>' . __("Days") . '</th>';
 
                 foreach ($result as $master) {
                 echo '<td style=\'text-align: center\'>' . $master->Days . '</td>';
@@ -34,8 +34,8 @@
     }
     ?>
     <canvas id="myChartDiff" width="400" height="150"></canvas>
-    <h2><?php echo lang('statistics_dwq_longest_streak_in_log'); ?></h2>
-    <p><?php echo lang('statistics_dwq_longest_streak_in_log_hint'); ?></p>
+    <h2><?php echo __("Longest streak with QSOs in the log"); ?></h2>
+    <p><?php echo __("A maximum of the 10 longest streaks are shown!"); ?></p>
 
     <?php 
     // Get Date format
@@ -53,9 +53,9 @@
         echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
 
             echo '<tr>';
-                echo '<th style=\'text-align: center\'>' . lang('statistics_dwq_streak_continuous_days') . '</th>';
-                echo '<th style=\'text-align: center\'>' . lang('general_word_startdate') . '</th>';
-                echo '<th style=\'text-align: center\'>' . lang('general_word_enddate') . '</th>';
+                echo '<th style=\'text-align: center\'>' . __("Streak (continuous days with QSOs)") . '</th>';
+                echo '<th style=\'text-align: center\'>' . __("Start Date") . '</th>';
+                echo '<th style=\'text-align: center\'>' . __("End Date") . '</th>';
                 echo '</tr>';
 
             foreach ($streaks as $streak) {
@@ -75,15 +75,15 @@
     }
     ?>
 
-    <h2><?php echo lang('statistics_dwq_current_streak_in_log'); ?></h2>
+    <h2><?php echo __("Current streak with QSOs in the log"); ?></h2>
     <?php
     if (is_array($currentstreak)) {
         echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
 
         echo '<tr>';
-        echo '<th style=\'text-align: center\'>' . lang('statistics_dwq_current_streak_continuous_days') . '</th>';
-        echo '<th style=\'text-align: center\'>' . lang('general_word_startdate') . '</th>';
-        echo '<th style=\'text-align: center\'>' . lang('general_word_enddate') . '</th>';
+        echo '<th style=\'text-align: center\'>' . __("Current streak (continuous days with QSOs)") . '</th>';
+        echo '<th style=\'text-align: center\'>' . __("Start Date") . '</th>';
+        echo '<th style=\'text-align: center\'>' . __("End Date") . '</th>';
         echo '</tr>';
 
             echo '<tr>';
@@ -98,14 +98,14 @@
     }
     elseif (is_array($almostcurrentstreak)) {
         ?>
-        <div class="alert alert-warning" role="alert"><?php echo lang('statistics_dwq_make_qso_to_extend_streak'); ?></div>
+        <div class="alert alert-warning" role="alert"><?php echo __("If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"); ?></div>
         <?php
         echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
 
         echo '<tr>';
-        echo '<th style=\'text-align: center\'>' . lang('statistics_dwq_current_streak_continuous_days') . '</th>';
-        echo '<th style=\'text-align: center\'>' . lang('general_word_startdate') . '</th>';
-        echo '<th style=\'text-align: center\'>' . lang('general_word_enddate') . '</th>';
+        echo '<th style=\'text-align: center\'>' . __("Current streak (continuous days with QSOs)") . '</th>';
+        echo '<th style=\'text-align: center\'>' . __("Start Date") . '</th>';
+        echo '<th style=\'text-align: center\'>' . __("End Date") . '</th>';
         echo '</tr>';
 
         echo '<tr>';
@@ -119,7 +119,7 @@
         echo '</table></div>';
     }
     else {
-        echo '<div class="alert alert-danger" role="alert">' . lang('statistics_dwq_no_current_streak') . '</div>';
+        echo '<div class="alert alert-danger" role="alert">' . __("No current streak found!") . '</div>';
     }
     ?>
 </div>
diff --git a/application/views/debug/index.php b/application/views/debug/index.php
index 086ac8ae5..198e6cc96 100644
--- a/application/views/debug/index.php
+++ b/application/views/debug/index.php
@@ -33,7 +33,7 @@
                         </tr>
                         <tr>
                             <td>Base URL</td>
-                            <td><span id="baseUrl"><a href="<?php echo $this->config->item('base_url') ?>" target="_blank"><?php echo $this->config->item('base_url'); ?></a></span> <span data-bs-toggle="tooltip" title="<?php echo lang('copy_to_clipboard'); ?>" onclick='copyURL("<?php echo $this->config->item('base_url'); ?>")'><i class="copy-icon fas fa-copy"></span></td>
+                            <td><span id="baseUrl"><a href="<?php echo $this->config->item('base_url') ?>" target="_blank"><?php echo $this->config->item('base_url'); ?></a></span> <span data-bs-toggle="tooltip" title="<?php echo __("Copy to clipboard"); ?>" onclick='copyURL("<?php echo $this->config->item('base_url'); ?>")'><i class="copy-icon fas fa-copy"></span></td>
                         </tr>
                         <tr>
                             <td>Migration</td>
diff --git a/application/views/distances/index.php b/application/views/distances/index.php
index 2ce536e5d..0ed7f2f14 100644
--- a/application/views/distances/index.php
+++ b/application/views/distances/index.php
@@ -2,21 +2,21 @@
 
     <br>
 
-    <h2><?php echo lang('statistics_distances_worked'); ?></h2>
+    <h2><?php echo __("Distances Worked"); ?></h2>
     <script>
-        var lang_general_word_qso_data = '<?php echo lang('general_word_qso_data'); ?>';
-        var lang_statistics_distances_worked = '<?php echo lang('statistics_distances_worked'); ?>';
-        var lang_statistics_distances_part1_contacts_were_plotted_furthest = '<?php echo lang('statistics_distances_part1_contacts_were_plotted_furthest'); ?>';
-        var lang_statistics_distances_part2_contacts_were_plotted_furthest = '<?php echo lang('statistics_distances_part2_contacts_were_plotted_furthest'); ?>';
-        var lang_statistics_distances_part3_contacts_were_plotted_furthest = '<?php echo lang('statistics_distances_part3_contacts_were_plotted_furthest'); ?>';
-        var lang_statistics_distances_number_of_qsos = '<?php echo lang('statistics_distances_number_of_qsos'); ?>';
-        var lang_gen_hamradio_distance = '<?php echo lang('gen_hamradio_distance'); ?>';
-        var lang_statistics_distances_callsigns_worked = '<?php echo lang('statistics_distances_callsigns_worked'); ?>';
-        var lang_statistics_distances_qsos_with = '<?php echo lang('statistics_distances_qsos_with'); ?>';
+        var lang_general_word_qso_data = '<?php echo __("QSO Data"); ?>';
+        var lang_statistics_distances_worked = '<?php echo __("Distances Worked"); ?>';
+        var lang_statistics_distances_part1_contacts_were_plotted_furthest = '<?php echo __("contacts were plotted.<br /> Your furthest contact was with"); ?>';
+        var lang_statistics_distances_part2_contacts_were_plotted_furthest = '<?php echo __("in gridsquare"); ?>';
+        var lang_statistics_distances_part3_contacts_were_plotted_furthest = '<?php echo __("the distance was"); ?>';
+        var lang_statistics_distances_number_of_qsos = '<?php echo __("Number of QSOs"); ?>';
+        var lang_gen_hamradio_distance = '<?php echo __("Distance"); ?>';
+        var lang_statistics_distances_callsigns_worked = '<?php echo __("Callsign(s) worked (max 5 shown)"); ?>';
+        var lang_statistics_distances_qsos_with = '<?php echo __("QSOs with"); ?>';
     </script>
     <div id="distances_div">
         <form class="d-flex align-items-center">
-            <label class="my-1 me-2" for="distplot_bands"><?php echo lang('gen_band_selection'); ?></label>
+            <label class="my-1 me-2" for="distplot_bands"><?php echo __("Band selection"); ?></label>
             <select class="form-select my-1 me-sm-2 w-auto"  id="distplot_bands">
                 <?php if (count($sats_available) != 0) { ?>
                     <option value="sat">SAT</option>
@@ -30,9 +30,9 @@
                 } ?>
             </select>
             <?php if (count($sats_available) != 0) { ?>
-                <label class="my-1 me-2" id="satslabel" for="distplot_sats" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo lang('general_word_satellite')?></label>
+                <label class="my-1 me-2" id="satslabel" for="distplot_sats" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo __("Satellite")?></label>
                 <select class="form-select my-1 me-sm-2 w-auto"  id="distplot_sats" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>>
-                    <option value="All"><?php echo lang('general_word_all')?></option>
+                    <option value="All"><?php echo __("All")?></option>
                     <?php foreach($sats_available as $sat) {
                         echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n";
                     } ?>
@@ -40,16 +40,16 @@
             <?php } else { ?>
                 <input id="distplot_sats" type="hidden" value="All"></input>
             <?php } ?>
-			<label class="my-1 me-2" id="orbitslabel" for="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo lang('gridsquares_orbit'); ?></label>
+			<label class="my-1 me-2" id="orbitslabel" for="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>><?php echo __("Orbit"); ?></label>
                 <select class="form-select my-1 me-sm-2 w-auto"  id="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;"<?php } ?>>
-                    <option value="All"><?php echo lang('general_word_all')?></option>
+                    <option value="All"><?php echo __("All")?></option>
                     <?php
                     foreach($orbits as $orbit){
                         echo '<option value="' . $orbit . '">' . strtoupper($orbit) . '</option>'."\n";
                     }
                     ?>
             </select>
-            <button id="plot" type="button" name="plot" class="btn btn-primary ld-ext-right ld-ext-right-plot" onclick="distPlot(this.form)"><?php echo lang('filter_options_show')?><div class="ld ld-ring ld-spin"></div></button>
+            <button id="plot" type="button" name="plot" class="btn btn-primary ld-ext-right ld-ext-right-plot" onclick="distPlot(this.form)"><?php echo __("Show")?><div class="ld ld-ring ld-spin"></div></button>
         </form>
     </div>
 
diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
index ee134d5d8..ced35866d 100644
--- a/application/views/dxatlas/index.php
+++ b/application/views/dxatlas/index.php
@@ -1,14 +1,14 @@
 <div class="container">
 	<br>
-	<h2><?php echo lang('export_dxatlas_header'); ?></h2>
+	<h2><?php echo __("DX Atlas Export"); ?></h2>
 
 	<div class="card">
 		<div class="card-header">
-			<?php echo lang('export_dxatlas_description'); ?>
+			<?php echo __("Export your logbook for use in DX Atlas to display worked / confirmed gridsquares."); ?>
 		</div>
 
 		<div class="alert alert-warning" role="alert">
-			<?php echo lang('export_dxatlas_gridsquare_warning'); ?>
+			<?php echo __("Only QSOs with a gridsquare defined will be exported!"); ?>
 		</div>
 
 		<div class="card-body">
@@ -16,11 +16,11 @@
 			<form class="form" action="<?php echo site_url('dxatlas/export'); ?>" method="post" enctype="multipart/form-data">
 				<div class="row">
 					<div class="mb-3 col-md-3">
-						<label for="station_profile"><?php echo lang('wavelog_station_profile'); ?></label>
+						<label for="station_profile"><?php echo __("Station Location"); ?></label>
 						<select name="station_profile" class="station_id form-select">
-							<option value="All"><?php echo lang('general_word_all'); ?></option>
+							<option value="All"><?php echo __("All"); ?></option>
 							<?php foreach ($station_profile->result() as $station) { ?>
-								<option value="<?php echo $station->station_id; ?>"><?php echo lang('gen_hamradio_callsign') . ": "; ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+								<option value="<?php echo $station->station_id; ?>"><?php echo __("Callsign") . ": "; ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 							<?php } ?>
 						</select>
 					</div>
@@ -28,9 +28,9 @@
 
 				<div class="row">
 				<div class="mb-3 col-md-3">
-					<label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+					<label for="band"><?php echo __("Band"); ?></label>
 					<select id="band" name="band" class="form-select">
-						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
+						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo __("All"); ?></option>
 						<?php foreach($worked_bands as $band) {
 							echo '<option value="' . $band . '"';
 							if ($this->input->post('band') == $band) echo ' selected';
@@ -39,9 +39,9 @@
 					</select>
 				</div>
 					<div class="mb-3 col-md-3">
-						<label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+						<label for="mode"><?php echo __("Mode"); ?></label>
 						<select id="mode" name="mode" class="form-select">
-							<option value="All"><?php echo lang('general_word_all'); ?></option>
+							<option value="All"><?php echo __("All"); ?></option>
 							<?php
 							foreach($modes->result() as $mode){
 								if ($mode->submode == null) {
@@ -55,14 +55,14 @@
 					</div>
 
 				<div class="mb-3 col-md-4">
-					<label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
+					<label for="dxcc_id"><?php echo __("DXCC"); ?></label>
 					<select class="form-select" id="dxcc_id" name="dxcc_id">
-						<option value="All"><?php echo lang('general_word_all'); ?></option>
+						<option value="All"><?php echo __("All"); ?></option>
 						<?php
 						foreach($dxcc as $d){
 							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
 							if ($d->Enddate != null) {
-								echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
+								echo ' ('.__("Deleted DXCC").')';
 							}
 							echo '</option>';
 						}
@@ -77,9 +77,9 @@
 
 				<div class="row">
 					<div class="mb-3 col-md-3">
-					<label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
+					<label for="cqz"><?php echo __("CQ Zone"); ?></label>
 					<select class="form-select" id="cqz" name="cqz">
-						<option value="All"><?php echo lang('general_word_all'); ?></option>
+						<option value="All"><?php echo __("All"); ?></option>
 						<?php
 						for ($i = 1; $i<=40; $i++) {
 							echo '<option value="'. $i . '">'. $i .'</option>';
@@ -89,9 +89,9 @@
 				</div>
 
 				<div class="mb-3 col-md-5">
-					<label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
+					<label for="selectPropagation"><?php echo __("Propagation Mode"); ?></label>
 					<select class="form-select" id="selectPropagation" name="prop_mode">
-						<option value="All"><?php echo lang('general_word_all'); ?></option>
+						<option value="All"><?php echo __("All"); ?></option>
 						<option value="AS">Aircraft Scatter</option>
 						<option value="AUR">Aurora</option>
 						<option value="AUE">Aurora-E</option>
@@ -115,17 +115,17 @@
 				</div>
 				<div class="row">
                     <div class="mb-3 col-md-3">
-                        <label for="fromdate"><?php echo lang('gen_from_date') . ": " ?></label>
+                        <label for="fromdate"><?php echo __("From date") . ": " ?></label>
                         <input name="fromdate" id="fromdate" type="date" class="form-control w-auto">
                     </div>
 
                     <div class="mb-3 col-md-3">
-                        <label for="todate"><?php echo lang('gen_to_date') . ": " ?></label>
+                        <label for="todate"><?php echo __("To date") . ": " ?></label>
                         <input name="todate" id="todate" type="date" class="form-control w-auto">
                     </div>
                 </div>
 				<br>
-				<button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo lang('general_word_export'); ?></button>
+				<button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo __("Export"); ?></button>
 			</form>
 		</div>
 	</div>
diff --git a/application/views/eqslcard/index.php b/application/views/eqslcard/index.php
index 3b0562a3a..f02258387 100644
--- a/application/views/eqslcard/index.php
+++ b/application/views/eqslcard/index.php
@@ -7,7 +7,7 @@
     <?php $userdata_dir = $this->config->item('userdata');
     if (isset($userdata_dir)) { ?>
         <div class="alert alert-info" role="alert">
-            <?php echo lang('qslcard_string_your_are_using'); ?> <?php echo $storage_used; ?> <?php echo lang('qslcard_string_disk_space'); ?>
+            <?php echo __("You are using"); ?> <?php echo $storage_used; ?> <?php echo __("of disk space to store QSL Card assets"); ?>
         </div>
     <?php } ?>
 
diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php
index d9c46718f..a38175765 100644
--- a/application/views/gridmap/index.php
+++ b/application/views/gridmap/index.php
@@ -7,10 +7,10 @@
     <?php if ($visitor == false) { ?>
         <form class="form">
             <div class="row mb-2">
-                <label class="col-md-1" for="band"><?php echo lang('gridsquares_band'); ?></label>
+                <label class="col-md-1" for="band"><?php echo __("Band"); ?></label>
                 <div class="col-sm-2">
                     <select class="form-select form-select-sm" id="band">
-                        <option value="All"><?php echo lang('general_word_all') ?></option>
+                        <option value="All"><?php echo __("All") ?></option>
                         <?php foreach ($bands as $band) {
                             echo '<option value="' . $band . '"';
                             if ($user_default_band == $band) {
@@ -22,10 +22,10 @@
                 </div>
 
                 <?php if (count($sats_available) != 0) { ?>
-                    <label class="col-md-1" id="satslabel" for="distplot_sats" <?php if ($user_default_band != "SAT") { ?>style="display: none;" <?php } ?>><?php echo lang('gridsquares_sat'); ?></label>
+                    <label class="col-md-1" id="satslabel" for="distplot_sats" <?php if ($user_default_band != "SAT") { ?>style="display: none;" <?php } ?>><?php echo __("Satellite"); ?></label>
                     <div class="col-sm-2" id="sats_div" <?php if ($user_default_band != "SAT") { ?>style="display: none;" <?php } ?>>
                         <select class="form-select form-select-sm" id="sat">
-                            <option value="All"><?php echo lang('general_word_all') ?></option>
+                            <option value="All"><?php echo __("All") ?></option>
                             <?php foreach ($sats_available as $sat) {
                                 echo '<option value="' . $sat . '"' . '>' . $sat . '</option>' . "\n";
                             } ?>
@@ -38,7 +38,7 @@
                 <label class="col-md-1" for="propagation">Propagation</label>
                 <div class="col-sm-4">
                     <select class="form-select form-select-sm w-auto" id="propagation" <?php if ($user_default_band == 'SAT') {echo 'disabled';} ?>>
-                        <option value=""><?php echo lang('general_word_all'); ?></option>
+                        <option value=""><?php echo __("All"); ?></option>
                         <option value="AS">Aircraft Scatter</option>
                         <option value="AUR">Aurora</option>
                         <option value="AUE">Aurora-E</option>
@@ -62,10 +62,10 @@
                     
             </div>
             <div class="row mb-2">
-                <label class="col-md-1" for="mode"><?php echo lang('gridsquares_mode'); ?></label>
+                <label class="col-md-1" for="mode"><?php echo __("Mode"); ?></label>
                 <div class="col-sm-2">
                     <select class="form-select form-select-sm" id="mode">
-                        <option value="All"><?php echo lang('general_word_all') ?></option>
+                        <option value="All"><?php echo __("All") ?></option>
                         <?php
                         foreach ($modes as $mode) {
                             if ($mode->submode ?? '' == '') {
@@ -75,10 +75,10 @@
                         ?>
                     </select>
                 </div>
-                <label class="col-md-1" id="orbitslabel" for="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;" <?php } ?>><?php echo lang('gridsquares_orbit'); ?></label>
+                <label class="col-md-1" id="orbitslabel" for="orbits" <?php if ($user_default_band != "SAT") { ?>style="display: none;" <?php } ?>><?php echo __("Orbit"); ?></label>
                 <div class="col-sm-2" id="orbits_div" <?php if ($user_default_band != "SAT") { ?>style="display: none;" <?php } ?>>
                     <select class="form-select form-select-sm" id="orbits">
-                        <option value="All"><?php echo lang('general_word_all') ?></option>
+                        <option value="All"><?php echo __("All") ?></option>
                         <?php
                         foreach ($orbits as $orbit) {
                             echo '<option value="' . $orbit . '">' . strtoupper($orbit) . '</option>' . "\n";
@@ -87,7 +87,7 @@
                     </select>
                 </div>
 
-                <label class="col-md-1"><?php echo lang('gridsquares_confirmation'); ?></label>
+                <label class="col-md-1"><?php echo __("Confirmation"); ?></label>
                 <div class="col-sm-4">
                     <div>
                         <div class="form-check-inline">
@@ -125,8 +125,8 @@
                     </div>
                 </div>
             </div>
-            <button id="plot" type="button" name="plot" class="btn btn-sm btn-primary me-1 mb-1 ld-ext-right ld-ext-right-plot" onclick="gridPlot(this.form,<?php echo $visitor == true ? "true" : "false"; ?>)"><?php echo lang('gridsquares_button_plot'); ?><div class="ld ld-ring ld-spin"></div></button>
-            <button id="clear" type="button" name="clear" class="btn btn-sm btn-primary me-1 mb-1 ld-ext-right ld-ext-right-clear" onclick="clearMarkers()"><?php echo lang('gridsquares_button_clear_markers'); ?><div class="ld ld-ring ld-spin"></div></button>
+            <button id="plot" type="button" name="plot" class="btn btn-sm btn-primary me-1 mb-1 ld-ext-right ld-ext-right-plot" onclick="gridPlot(this.form,<?php echo $visitor == true ? "true" : "false"; ?>)"><?php echo __("Plot"); ?><div class="ld ld-ring ld-spin"></div></button>
+            <button id="clear" type="button" name="clear" class="btn btn-sm btn-primary me-1 mb-1 ld-ext-right ld-ext-right-clear" onclick="clearMarkers()"><?php echo __("Clear Markers"); ?><div class="ld ld-ring ld-spin"></div></button>
             
         </form>
     <?php } ?>
@@ -143,15 +143,15 @@
     <div id="gridsquare_map" class="map-leaflet" style="width: 100%;"></div>
 </div>
 <div class="coordinates d-flex">
-    <div class="cohidden"><?php echo lang('gen_hamradio_latitude') ?>:&nbsp;</div>
+    <div class="cohidden"><?php echo __("Latitude") ?>:&nbsp;</div>
     <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
-    <div class="cohidden"><?php echo lang('gen_hamradio_longitude') ?>:&nbsp;</div>
+    <div class="cohidden"><?php echo __("Longitude") ?>:&nbsp;</div>
     <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
-    <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare') ?>:&nbsp;</div>
+    <div class="cohidden"><?php echo __("Gridsquare") ?>:&nbsp;</div>
     <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
-    <div class="cohidden"><?php echo lang('gen_hamradio_distance') ?>:&nbsp;</div>
+    <div class="cohidden"><?php echo __("Distance") ?>:&nbsp;</div>
     <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
-    <div class="cohidden"><?php echo lang('gen_hamradio_bearing') ?>:&nbsp;</div>
+    <div class="cohidden"><?php echo __("Bearing") ?>:&nbsp;</div>
     <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>
diff --git a/application/views/hrdlog/export.php b/application/views/hrdlog/export.php
index f7d5fc37e..13e427b10 100644
--- a/application/views/hrdlog/export.php
+++ b/application/views/hrdlog/export.php
@@ -74,12 +74,12 @@
 					<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
 					<div class="row">
 						<div class="col-md-2">
-							<label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+							<label for="from"><?php echo __("From date") . ": " ?></label>
 							<input name="from" id="from" type="date" class="form-control w-auto">
 						</div>
 
 						<div class="col-md-2">
-							<label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
+							<label for="to"><?php echo __("To date") . ": " ?></label>
 							<input name="to" id="to" type="date" class="form-control w-auto">
 						</div>
 					</div>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index ad1fb5da7..5ab69342d 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -4,7 +4,7 @@
     */
     var option_map_tile_server = '<?php echo $this->optionslib->get_option('option_map_tile_server');?>';
     var option_map_tile_server_copyright = '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>';
-    var lang_datatables_language = '<?php echo lang('datatables_language'); ?>';
+    var lang_datatables_language = '<?php echo __("en-GB"); ?>';
 
     var base_url = "<?php echo base_url(); ?>"; // Base URL
     var site_url = "<?php echo site_url(); ?>"; // Site URL
@@ -17,20 +17,20 @@
     /*
     General Language
     */
-    var lang_general_word_qso_data = "<?php echo lang('general_word_qso_data'); ?>";
-    var lang_general_edit_qso = "<?php echo lang('general_edit_qso'); ?>";
-    var lang_general_word_danger = "<?php echo lang('general_word_danger'); ?>";
-    var lang_general_word_attention = "<?php echo lang('general_word_attention'); ?>";
-    var lang_general_word_warning = "<?php echo lang('general_word_warning'); ?>";
-    var lang_general_word_cancel = "<?php echo lang('general_word_cancel'); ?>";
-    var lang_general_word_ok = "<?php echo lang('general_word_ok'); ?>";
-    var lang_qso_delete_warning = "<?php echo lang('qso_delete_warning'); ?>";
-    var lang_general_word_colors = "<?php echo lang('general_word_colors'); ?>";
-    var lang_general_word_confirmed = "<?php echo lang('general_word_confirmed'); ?>";
-    var lang_general_word_worked_not_confirmed = "<?php echo lang('general_word_worked_not_confirmed'); ?>";
-    var lang_general_word_not_worked = "<?php echo lang('general_word_not_worked'); ?>";
-    var lang_admin_close = "<?php echo lang('admin_close'); ?>";
-    var lang_admin_clear = "<?php echo lang('admin_clear'); ?>";
+    var lang_general_word_qso_data = "<?php echo __("QSO Data"); ?>";
+    var lang_general_edit_qso = "<?php echo __("Edit QSO"); ?>";
+    var lang_general_word_danger = "<?php echo __("DANGER"); ?>";
+    var lang_general_word_attention = "<?php echo __("Attention"); ?>";
+    var lang_general_word_warning = "<?php echo __("Warning"); ?>";
+    var lang_general_word_cancel = "<?php echo __("Cancel"); ?>";
+    var lang_general_word_ok = "<?php echo __("OK"); ?>";
+    var lang_qso_delete_warning = "<?php echo __("Warning! Are you sure you want delete QSO with "); ?>";
+    var lang_general_word_colors = "<?php echo __("Colors"); ?>";
+    var lang_general_word_confirmed = "<?php echo __("Confirmed"); ?>";
+    var lang_general_word_worked_not_confirmed = "<?php echo __("Worked not confirmed"); ?>";
+    var lang_general_word_not_worked = "<?php echo __("Not worked"); ?>";
+    var lang_admin_close = "<?php echo __("Close"); ?>";
+    var lang_admin_clear = "<?php echo __("Clear"); ?>";
 
 </script>
 
@@ -70,7 +70,7 @@
 
 <script>
     function getDataTablesLanguageUrl() {
-        var lang_datatables_language = "<?php echo lang('datatables_language'); ?>";
+        var lang_datatables_language = "<?php echo __("en-GB"); ?>";
         datatables_language_url = "<?php echo base_url() ;?>assets/json/datatables_languages/" + lang_datatables_language + ".json";
         return datatables_language_url;
     }
@@ -602,10 +602,10 @@ $(document).ready(function() {
 
 <script>
 function printWarning() {
-    if ($("#dxcc_id option:selected").text().includes("<?php echo lang('gen_hamradio_deleted_dxcc'); ?>")) {
+    if ($("#dxcc_id option:selected").text().includes("<?php echo __("Deleted DXCC"); ?>")) {
         $('#warningMessageDXCC').show();
         $('#dxcc_id').css('border', '2px solid rgb(217, 83, 79)');
-        $('#warningMessageDXCC').text("<?php echo lang('station_location_dxcc_warning'); ?>");
+        $('#warningMessageDXCC').text("<?php echo __("Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."); ?>");
     } else {
         $('#dxcc_id').css('border', '');
         $('#warningMessageDXCC').hide();
@@ -1359,14 +1359,14 @@ $(document).ready(function(){
 
   if (grid_four_confirmed_count > 0) {
      var span = document.getElementById('confirmed_grids');
-     span.innerText = span.textContent = '('+grid_four_confirmed_count+' <?php echo lang('gridsquares_grid_squares'); ?>'+(grid_four_confirmed_count != 1 ? 's' : '')+') ';
+     span.innerText = span.textContent = '('+grid_four_confirmed_count+' <?php echo __("grid square"); ?>'+(grid_four_confirmed_count != 1 ? 's' : '')+') ';
   }
   if ((grid_four_count-grid_four_confirmed_count) > 0) {
      var span = document.getElementById('worked_grids');
-     span.innerText = span.textContent = '('+(grid_four_count-grid_four_confirmed_count)+' <?php echo lang('gridsquares_grid_squares'); ?>'+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') ';
+     span.innerText = span.textContent = '('+(grid_four_count-grid_four_confirmed_count)+' <?php echo __("grid square"); ?>'+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') ';
   }
   var span = document.getElementById('sum_grids');
-  span.innerText = span.textContent = ' <?php echo lang('gridsquares_total_count'); ?>'+': '+grid_four_count+' <?php echo lang('gridsquares_grid_squares'); ?>'+(grid_four_count != 1 ? 's' : '');
+  span.innerText = span.textContent = ' <?php echo __("Total count"); ?>'+': '+grid_four_count+' <?php echo __("grid square"); ?>'+(grid_four_count != 1 ? 's' : '');
 
   var maidenhead = L.maidenhead().addTo(map);
 
@@ -1503,14 +1503,14 @@ $(document).ready(function(){
 
   if (grid_four_confirmed_count > 0) {
      var span = document.getElementById('confirmed_grids');
-     span.innerText = span.textContent = '('+grid_four_confirmed_count+' <?php echo lang('gridsquares_grid_squares'); ?>'+(grid_four_confirmed_count != 1 ? 's' : '')+') ';
+     span.innerText = span.textContent = '('+grid_four_confirmed_count+' <?php echo __("grid square"); ?>'+(grid_four_confirmed_count != 1 ? 's' : '')+') ';
   }
   if ((grid_four_count-grid_four_confirmed_count) > 0) {
      var span = document.getElementById('activated_grids');
-     span.innerText = span.textContent = '('+(grid_four_count-grid_four_confirmed_count)+' <?php echo lang('gridsquares_grid_squares'); ?>'+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') ';
+     span.innerText = span.textContent = '('+(grid_four_count-grid_four_confirmed_count)+' <?php echo __("grid square"); ?>'+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') ';
   }
   var span = document.getElementById('sum_grids');
-  span.innerText = span.textContent = ' <?php echo lang('gridsquares_total_count'); ?>'+': '+grid_four_count+' <?php echo lang('gridsquares_grid_squares'); ?>'+(grid_four_count != 1 ? 's' : '');
+  span.innerText = span.textContent = ' <?php echo __("Total count"); ?>'+': '+grid_four_count+' <?php echo __("grid square"); ?>'+(grid_four_count != 1 ? 's' : '');
 
   var maidenhead = L.maidenhead().addTo(map);
 
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 0d1ccbb31..5f1568920 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -82,7 +82,7 @@
 		<div class="container">
 			<a class="navbar-brand" href="<?php echo site_url(); ?>"><img class="headerLogo" src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('header_logo'); ?>.png" alt="Logo" /></a>
 			<?php if (ENVIRONMENT == "development") { ?>
-				<span class="badge text-bg-danger"><?php echo lang('menu_badge_developer_mode'); ?></span>
+				<span class="badge text-bg-danger"><?php echo __("Developer Mode"); ?></span>
 			<?php } ?>
 			<?php if (ENVIRONMENT == "maintenance") { ?>
 				<span class="badge text-bg-info">Maintenance</span>
@@ -93,188 +93,188 @@
 			<div class="collapse navbar-collapse" id="navbarNav">
 				<ul class="navbar-nav navbar-nav-left">
 					<li class="nav-item dropdown"> <!-- LOGBOOK -->
-						<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"> <?php echo lang('menu_logbook'); ?></a>
+						<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"> <?php echo __("Logbook"); ?></a>
 						<ul class="dropdown-menu header-dropdown">
-							<li><a class="dropdown-item" href="<?php echo site_url('logbook'); ?>"><i class="fas fa-book"></i> <?php echo lang('menu_overview'); ?></a></li>
+							<li><a class="dropdown-item" href="<?php echo site_url('logbook'); ?>"><i class="fas fa-book"></i> <?php echo __("Overview"); ?></a></li>
 							<div class="dropdown-divider"></div>
-							<li><a class="dropdown-item" href="<?php echo site_url('logbookadvanced'); ?>"><i class="fas fa-book-open"></i> <?php echo lang('menu_advanced'); ?></a></li>
+							<li><a class="dropdown-item" href="<?php echo site_url('logbookadvanced'); ?>"><i class="fas fa-book-open"></i> <?php echo __("Advanced"); ?></a></li>
 							<div class="dropdown-divider"></div>
 							<?php if (!($this->config->item('disable_qsl') ?? false)) { ?>
-							<li><a class="dropdown-item" href="<?php echo site_url('qsl'); ?>" title="QSL"><i class="fa fa-id-card"></i> <?php echo lang('menu_view_qsl'); ?></a></li>
+							<li><a class="dropdown-item" href="<?php echo site_url('qsl'); ?>" title="QSL"><i class="fa fa-id-card"></i> <?php echo __("View QSL Cards"); ?></a></li>
 							<div class="dropdown-divider"></div>
 							<?php } ?>
-							<li><a class="dropdown-item" href="<?php echo site_url('eqsl'); ?>" title="eQSL"><i class="fa fa-id-card"></i> <?php echo lang('menu_view_eqsl'); ?></a></li>
+							<li><a class="dropdown-item" href="<?php echo site_url('eqsl'); ?>" title="eQSL"><i class="fa fa-id-card"></i> <?php echo __("View eQSL Cards"); ?></a></li>
 						</ul>
 					</li>
 
 					<?php if (($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
 						<li class="nav-item dropdown"> <!-- QSO -->
-							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo lang('menu_qso'); ?></a>
+							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo __("QSO"); ?></a>
 							<ul class="dropdown-menu header-dropdown">
-								<li><a class="dropdown-item" href="<?php echo site_url('qso?manual=0'); ?>" title="Log Live QSOs"><i class="fas fa-list"></i> <?php echo lang('menu_live_qso'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('qso?manual=0'); ?>" title="Log Live QSOs"><i class="fas fa-list"></i> <?php echo __("Live QSO"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('qso?manual=1'); ?>" title="Log QSO made in the past"><i class="fas fa-list"></i> <?php echo lang('menu_post_qso'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('qso?manual=1'); ?>" title="Log QSO made in the past"><i class="fas fa-list"></i> <?php echo __("Post QSO"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('simplefle'); ?>" title="Simple Fast Log Entry"><i class="fas fa-list"></i> <?php echo lang('menu_fast_log_entry'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('simplefle'); ?>" title="Simple Fast Log Entry"><i class="fas fa-list"></i> <?php echo __("Simple Fast Log Entry"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('contesting?manual=0'); ?>" title="Live contest QSOs"><i class="fas fa-list"></i> <?php echo lang('menu_live_contest_logging'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('contesting?manual=0'); ?>" title="Live contest QSOs"><i class="fas fa-list"></i> <?php echo __("Live Contest Logging"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('contesting?manual=1'); ?>" title="Post contest QSOs"><i class="fas fa-list"></i> <?php echo lang('menu_post_contest_logging'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('contesting?manual=1'); ?>" title="Post contest QSOs"><i class="fas fa-list"></i> <?php echo __("Post Contest Logging"); ?></a></li>
 							</ul>
 						</li>
 
 						<?php if ($this->session->userdata('user_show_notes') == 1) { ?><!-- NOTES -->
-							<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo lang('menu_notes'); ?></a>
+							<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo __("Notes"); ?></a>
 						<?php } ?>
 
 						<li class="nav-item dropdown"> <!-- ANALYTICS -->
-							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo lang('menu_analytics'); ?></a>
+							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo __("Analytics"); ?></a>
 							<ul class="dropdown-menu header-dropdown">
-								<li><a class="dropdown-item" href="<?php echo site_url('statistics'); ?>" title="Statistics"><i class="fas fa-chart-area"></i> <?php echo lang('menu_statistics'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('statistics'); ?>" title="Statistics"><i class="fas fa-chart-area"></i> <?php echo __("Statistics"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('gridmap'); ?>" title="Gridmap"><i class="fas fa-globe-europe"></i> <?php echo lang('menu_gridmap'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('gridmap'); ?>" title="Gridmap"><i class="fas fa-globe-europe"></i> <?php echo __("Gridsquare Map"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('activated_gridmap'); ?>" title="Activated Gridsquares"><i class="fas fa-globe-europe"></i> <?php echo lang('menu_activated_gridsquares'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('activated_gridmap'); ?>" title="Activated Gridsquares"><i class="fas fa-globe-europe"></i> <?php echo __("Activated Gridsquares"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('activators'); ?>" title="Gridsquare Activators"><i class="fas fa-globe-europe"></i> <?php echo lang('menu_gridsquare_activators'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('activators'); ?>" title="Gridsquare Activators"><i class="fas fa-globe-europe"></i> <?php echo __("Gridsquare Activators"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('distances'); ?>" title="Distances"><i class="fas fa-chart-area"></i> <?php echo lang('menu_distances_worked'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('distances'); ?>" title="Distances"><i class="fas fa-chart-area"></i> <?php echo __("Distances Worked"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('dayswithqso'); ?>" title="Days with QSOs"><i class="fas fa-chart-area"></i> <?php echo lang('menu_days_with_qsos'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('dayswithqso'); ?>" title="Days with QSOs"><i class="fas fa-chart-area"></i> <?php echo __("Days with QSOs"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('timeline'); ?>" title="Timeline"><i class="fas fa-chart-area"></i> <?php echo lang('menu_timeline'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('timeline'); ?>" title="Timeline"><i class="fas fa-chart-area"></i> <?php echo __("Timeline"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('accumulated'); ?>" title="Accumulated Statistics"><i class="fas fa-chart-area"></i> <?php echo lang('menu_accumulated_statistics'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('accumulated'); ?>" title="Accumulated Statistics"><i class="fas fa-chart-area"></i> <?php echo __("Accumulated Statistics"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('timeplotter'); ?>" title="View time when worked"><i class="fas fa-chart-area"></i> <?php echo lang('menu_timeplotter'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('timeplotter'); ?>" title="View time when worked"><i class="fas fa-chart-area"></i> <?php echo __("Timeplotter"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('continents'); ?>" title="Continents"><i class="fas fa-globe-europe"></i> <?php echo lang('menu_continents'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('continents'); ?>" title="Continents"><i class="fas fa-globe-europe"></i> <?php echo __("Continents"); ?></a></li>
 							</ul>
 						</li>
 						<li class="nav-item dropdown"> <!-- AWARDS -->
-							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo lang('menu_awards'); ?></a>
+							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo __("Awards"); ?></a>
 							<ul class="dropdown-menu header-dropdown">
 								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="fas fa-globe"></i> International</a>
 									<ul class="submenu dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/cq'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_cq'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/cq'); ?>"><i class="fas fa-trophy"></i> <?php echo __("CQ"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/dxcc'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_dxcc'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/dxcc'); ?>"><i class="fas fa-trophy"></i> <?php echo __("DXCC"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/itu'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_itu'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/itu'); ?>"><i class="fas fa-trophy"></i> <?php echo __("ITU"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/sig'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_sig'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/sig'); ?>"><i class="fas fa-trophy"></i> <?php echo __("SIG"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/vucc'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_vucc'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/vucc'); ?>"><i class="fas fa-trophy"></i> <?php echo __("VUCC"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/wwff'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_wwff'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/wwff'); ?>"><i class="fas fa-trophy"></i> <?php echo __("WWFF"); ?></a></li>
 									</ul>
 								</li>
 								<div class="dropdown-divider"></div>
 								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="fas fa-trophy"></i> xOTA</a>
 									<ul class="submenu dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/sota'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_sota'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/sota'); ?>"><i class="fas fa-trophy"></i> <?php echo __("SOTA"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/iota'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_iota'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/iota'); ?>"><i class="fas fa-trophy"></i> <?php echo __("IOTA"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/pota'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_pota'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/pota'); ?>"><i class="fas fa-trophy"></i> <?php echo __("POTA"); ?></a></li>
 									</ul>
 								</li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇨🇦 <?php echo lang('menu_canada'); ?></a>
+								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇨🇦 <?php echo __("Canada"); ?></a>
 									<ul class="submenu dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/rac'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_rac'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/rac'); ?>"><i class="fas fa-trophy"></i> <?php echo __("RAC"); ?></a></li>
 									</ul>
 								</li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇩🇪 <?php echo lang('menu_germany'); ?></a>
+								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇩🇪 <?php echo __("Germany"); ?></a>
 									<ul class="submenu dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/dok'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_dok'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/dok'); ?>"><i class="fas fa-trophy"></i> <?php echo __("DOK"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/dl'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_dl_gridmaster'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/dl'); ?>"><i class="fas fa-trophy"></i> <?php echo __("DL Gridmaster"); ?></a></li>
 									</ul>
 								</li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇬🇧 <?php echo lang('menu_great_britain'); ?></a>
+								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇬🇧 <?php echo __("Great Britain"); ?></a>
 									<ul class="submenu dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/wab'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_wab'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/wab'); ?>"><i class="fas fa-trophy"></i> <?php echo __("WAB"); ?></a></li>
 									</ul>
 								</li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇯🇵 <?php echo lang('menu_japan'); ?></a>
+								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇯🇵 <?php echo __("Japan"); ?></a>
 									<ul class="submenu dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/waja'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_waja'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/waja'); ?>"><i class="fas fa-trophy"></i> <?php echo __("WAJA"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/jcc'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_jcc'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/jcc'); ?>"><i class="fas fa-trophy"></i> <?php echo __("JCC"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/ja'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_ja_gridmaster'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/ja'); ?>"><i class="fas fa-trophy"></i> <?php echo __("JA Gridmaster"); ?></a></li>
 									</ul>
 								</li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇱🇺 <?php echo lang('menu_luxemburg'); ?></a>
+								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇱🇺 <?php echo __("Luxemburg"); ?></a>
 									<ul class="submenu dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/lx'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_lx_gridmaster'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/lx'); ?>"><i class="fas fa-trophy"></i> <?php echo __("LX Gridmaster"); ?></a></li>
 									</ul>
 								</li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇨🇭 <?php echo lang('menu_switzerland'); ?></a>
+								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇨🇭 <?php echo __("Switzerland"); ?></a>
 									<ul class="submenu dropdown-menu">
 										<li><a class="dropdown-item" href="<?php echo site_url('awards/helvetia'); ?>"><i class="fas fa-trophy"></i> H26</a></li>
 									</ul>
 								</li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇺🇸 <?php echo lang('menu_usa'); ?></a>
+								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" href="#">🇺🇸 <?php echo __("USA"); ?></a>
 									<ul class="submenu dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/counties'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_us_counties'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/counties'); ?>"><i class="fas fa-trophy"></i> <?php echo __("US Counties"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/was'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_was'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/was'); ?>"><i class="fas fa-trophy"></i> <?php echo __("WAS"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/us'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_us_gridmaster'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/us'); ?>"><i class="fas fa-trophy"></i> <?php echo __("US Gridmaster"); ?></a></li>
 										<div class="dropdown-divider"></div>
-										<li><a class="dropdown-item" href="<?php echo site_url('awards/ffma'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_ffma'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('awards/ffma'); ?>"><i class="fas fa-trophy"></i> <?php echo __("Fred Fish Memorial Award"); ?></a></li>
 									</ul>
 								</li>
 							</ul>
 						</li>
 
 						<li class="nav-item dropdown"> <!-- TOOLS -->
-							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo lang('menu_tools'); ?></a>
+							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo __("Tools"); ?></a>
 							<ul class="dropdown-menu header-dropdown">
-								<li><a class="dropdown-item" href="<?php echo site_url('dxcalendar'); ?>" title="DX Calendar"><i class="fas fa-calendar"></i> <?php echo lang('menu_dx_calendar'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('dxcalendar'); ?>" title="DX Calendar"><i class="fas fa-calendar"></i> <?php echo __("DX Calendar"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('contestcalendar'); ?>" title="Contest Calendar"><i class="fas fa-calendar"></i> <?php echo lang('menu_contest_calendar'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('contestcalendar'); ?>" title="Contest Calendar"><i class="fas fa-calendar"></i> <?php echo __("Contest Calendar"); ?></a></li>
 								<div class="dropdown-divider"></div>
 								<li><a class="dropdown-item" href="<?php echo site_url('hamsat'); ?>" title="Hams.at"><i class="fas fa-list"></i> Hams.at</a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('bandmap/list'); ?>" title="Bandmap"><i class="fa fa-id-card"></i> <?php echo lang('menu_bandmap'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('bandmap/list'); ?>" title="Bandmap"><i class="fa fa-id-card"></i> <?php echo __("Bandmap"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('sattimers'); ?>" title="SAT Timers"><i class="fas fa-satellite"></i> <?php echo lang('menu_sat_timers'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('sattimers'); ?>" title="SAT Timers"><i class="fas fa-satellite"></i> <?php echo __("SAT Timers"); ?></a></li>
 							</ul>
 						</li>
 					<?php } ?>
 					<?php if (($this->config->item('use_auth')) && ($this->session->userdata('user_type') == 99)) { ?> <!-- ADMIN -->
 						<li class="nav-item dropdown">
-							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" title="<?php echo lang('menu_admin'); ?>"><i class="fas fa-users-cog"></i></a>
+							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" title="<?php echo __("Admin"); ?>"><i class="fas fa-users-cog"></i></a>
 
 							<div class="dropdown-menu header-dropdown">
-								<a class="dropdown-item" href="<?php echo site_url('user'); ?>" title="Manage user accounts"><i class="fas fa-user"></i> <?php echo lang('menu_user_account'); ?></a>
+								<a class="dropdown-item" href="<?php echo site_url('user'); ?>" title="Manage user accounts"><i class="fas fa-user"></i> <?php echo __("User Accounts"); ?></a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('options'); ?>" title="Manage global options"><i class="fas fa-cog"></i> <?php echo lang('menu_global_options'); ?></a>
+								<a class="dropdown-item" href="<?php echo site_url('options'); ?>" title="Manage global options"><i class="fas fa-cog"></i> <?php echo __("Global Options"); ?></a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('mode'); ?>" title="Manage QSO modes"><i class="fas fa-broadcast-tower"></i> <?php echo lang('menu_modes'); ?></a>
+								<a class="dropdown-item" href="<?php echo site_url('mode'); ?>" title="Manage QSO modes"><i class="fas fa-broadcast-tower"></i> <?php echo __("Modes"); ?></a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('contesting/add'); ?>" title="Manage Contest names"><i class="fas fa-broadcast-tower"></i> <?php echo lang('menu_contests'); ?></a>
+								<a class="dropdown-item" href="<?php echo site_url('contesting/add'); ?>" title="Manage Contest names"><i class="fas fa-broadcast-tower"></i> <?php echo __("Contests"); ?></a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('satellite'); ?>" title="Manage Satellites"><i class="fas fa-satellite"></i> <?php echo lang('menu_satellites'); ?></a>
+								<a class="dropdown-item" href="<?php echo site_url('satellite'); ?>" title="Manage Satellites"><i class="fas fa-satellite"></i> <?php echo __("Satellites"); ?></a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('themes'); ?>" title="Manage Themes"><i class="fas fa-cog"></i> <?php echo lang('menu_themes'); ?></a>
+								<a class="dropdown-item" href="<?php echo site_url('themes'); ?>" title="Manage Themes"><i class="fas fa-cog"></i> <?php echo __("Themes"); ?></a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('backup'); ?>" title="Backup Wavelog content"><i class="fas fa-save"></i> <?php echo lang('menu_backup'); ?></a>
+								<a class="dropdown-item" href="<?php echo site_url('backup'); ?>" title="Backup Wavelog content"><i class="fas fa-save"></i> <?php echo __("Backup"); ?></a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('update'); ?>" title="Update Country Files"><i class="fas fa-sync"></i> <?php echo lang('menu_update_country_files'); ?></a>
+								<a class="dropdown-item" href="<?php echo site_url('update'); ?>" title="Update Country Files"><i class="fas fa-sync"></i> <?php echo __("Update Country Files"); ?></a>
 								<div class="dropdown-divider"></div>
 								<a class="dropdown-item" href="<?php echo site_url('cron'); ?>" title="Cron Manager"><i class="fas fa-clock"></i> Cron Manager</a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('debug'); ?>" title="Debug Information"><i class="fas fa-tools"></i> <?php echo lang('menu_debug_information'); ?></a>
+								<a class="dropdown-item" href="<?php echo site_url('debug'); ?>" title="Debug Information"><i class="fas fa-tools"></i> <?php echo __("Debug Information"); ?></a>
 							</div>
 						</li>
 					<?php } ?>
@@ -321,17 +321,17 @@
 						<?php } ?>
 						<form id="quicklog-form" class="d-flex align-items-center me-3" onsubmit="return false;">
 							<div class="input-group">
-								<input class="form-control border" id="nav-bar-search-input" type="text" name="callsign" placeholder="<?php echo lang('menu_search_text_quicklog'); ?>" aria-label="Quicklog" onkeypress="handleKeyPress(event)">
+								<input class="form-control border" id="nav-bar-search-input" type="text" name="callsign" placeholder="<?php echo __("Add/Search Callsign"); ?>" aria-label="Quicklog" onkeypress="handleKeyPress(event)">
 
-								<button title="<?php echo lang('menu_search_button_qicksearch_log'); ?>" class="btn btn-outline-success border" type="button" onclick="logQuicklog()"><i class="fas fa-plus"></i></button>
-								<button title="<?php echo lang('menu_search_button'); ?>" class="btn btn-outline-success border" type="button" onclick="submitForm('search')"><i class="fas fa-search"></i></button>
+								<button title="<?php echo __("Log"); ?>" class="btn btn-outline-success border" type="button" onclick="logQuicklog()"><i class="fas fa-plus"></i></button>
+								<button title="<?php echo __("Search"); ?>" class="btn btn-outline-success border" type="button" onclick="submitForm('search')"><i class="fas fa-search"></i></button>
 							</div>
 						</form>
 					<?php } else { ?>
 						<form id="searchbar-form" method="post" class="d-flex align-items-center me-2" action="<?php echo site_url('search'); ?>">
 							<div class="input-group">
-								<input class="form-control border" id="nav-bar-search-input" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" aria-label="Search">
-								<button title="<?php echo lang('menu_search_button'); ?>" class="btn btn-outline-success border" type="submit"><i class="fas fa-search"></i></button>
+								<input class="form-control border" id="nav-bar-search-input" type="search" name="callsign" placeholder="<?php echo __("Search Callsign"); ?>" aria-label="Search">
+								<button title="<?php echo __("Search"); ?>" class="btn btn-outline-success border" type="submit"><i class="fas fa-search"></i></button>
 							</div>
 						</form>
 					<?php } ?>
@@ -344,7 +344,7 @@
 							<input class="form-control me-sm-2" type="text" name="user_name" placeholder="Username" aria-label="Username">
 							<input class="form-control me-sm-2" type="password" name="user_password" placeholder="Password" aria-label="Password">
 							<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
-							<button class="btn btn-outline-success me-sm-2" type="submit"><?php echo lang('menu_login_button'); ?></button>
+							<button class="btn btn-outline-success me-sm-2" type="submit"><?php echo __("Login"); ?></button>
 						</form>
 					<?php } ?>
 
@@ -355,31 +355,31 @@
 							<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="fas fa-user"></i> <?php echo $this->session->userdata('user_callsign'); ?></a>
 
 							<ul class="dropdown-menu dropdown-menu-right header-dropdown">
-								<li><a class="dropdown-item" href="<?php echo site_url('user/edit') . "/" . $this->session->userdata('user_id'); ?>" title="Account"><i class="fas fa-user"></i> <?php echo lang('menu_account'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('user/edit') . "/" . $this->session->userdata('user_id'); ?>" title="Account"><i class="fas fa-user"></i> <?php echo __("Account"); ?></a></li>
 								<?php
 								$quickswitch_enabled = ($this->user_options_model->get_options('header_menu', array('option_name' => 'locations_quickswitch'))->row()->option_value ?? 'false');
 								if ($quickswitch_enabled != 'true') {
 								?>
-									<li><a class="dropdown-item" href="<?php echo site_url('stationsetup'); ?>" title="Manage station setup"><i class="fas fa-home"></i> <?php echo lang('menu_station_setup'); ?></a></li>
+									<li><a class="dropdown-item" href="<?php echo site_url('stationsetup'); ?>" title="Manage station setup"><i class="fas fa-home"></i> <?php echo __("Station Setup"); ?></a></li>
 								<?php } ?>
-								<li><a class="dropdown-item" href="<?php echo site_url('band'); ?>" title="Manage Bands"><i class="fas fa-cog"></i> <?php echo lang('menu_bands'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('band'); ?>" title="Manage Bands"><i class="fas fa-cog"></i> <?php echo __("Bands"); ?></a></li>
 
 
 								<div class="dropdown-divider"></div>
 
-								<li><a class="dropdown-item" href="<?php echo site_url('adif'); ?>" title="Amateur Data Interchange Format (ADIF) import / export"><i class="fas fa-sync"></i> <?php echo lang('menu_adif_import_export'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('adif'); ?>" title="Amateur Data Interchange Format (ADIF) import / export"><i class="fas fa-sync"></i> <?php echo __("ADIF Import / Export"); ?></a></li>
 
-								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown"><i class="fas fa-sync"></i> <?php echo lang('menu_other_export'); ?></a>
+								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown"><i class="fas fa-sync"></i> <?php echo __("Other Export Options"); ?></a>
 									<ul class="submenu submenu-left dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('kmlexport'); ?>" title="KML Export for Google Earth"><i class="fas fa-sync"></i> <?php echo lang('menu_kml_export'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('kmlexport'); ?>" title="KML Export for Google Earth"><i class="fas fa-sync"></i> <?php echo __("KML Export"); ?></a></li>
 
-										<li><a class="dropdown-item" href="<?php echo site_url('dxatlas'); ?>" title="DX Atlas Gridsquare Export"><i class="fas fa-sync"></i> <?php echo lang('menu_dx_atlas_gridsquare_export'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('dxatlas'); ?>" title="DX Atlas Gridsquare Export"><i class="fas fa-sync"></i> <?php echo __("DX Atlas Gridsquare Export"); ?></a></li>
 
-										<li><a class="dropdown-item" href="<?php echo site_url('csv'); ?>" title="SOTA CSV Export"><i class="fas fa-sync"></i> <?php echo lang('menu_sota_csv_export'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('csv'); ?>" title="SOTA CSV Export"><i class="fas fa-sync"></i> <?php echo __("SOTA CSV Export"); ?></a></li>
 
-										<li><a class="dropdown-item" href="<?php echo site_url('cabrillo'); ?>" title="Cabrillo Export"><i class="fas fa-sync"></i> <?php echo lang('menu_cabrillo_export'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('cabrillo'); ?>" title="Cabrillo Export"><i class="fas fa-sync"></i> <?php echo __("Cabrillo Export"); ?></a></li>
 
-										<li><a class="dropdown-item" href="<?php echo site_url('cfdexport'); ?>" title="CFD Export"><i class="fas fa-sync"></i> <?php echo lang('menu_cfd_export'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('cfdexport'); ?>" title="CFD Export"><i class="fas fa-sync"></i> <?php echo __("CFD Export"); ?></a></li>
 									</ul>
 								</li>
 
@@ -395,30 +395,30 @@
 
 								$oqrs_requests = $this->oqrs_model->oqrs_requests($location_list);
 								?>
-								<li><a class="dropdown-item" href="<?php echo site_url('oqrs/requests'); ?>" title="OQRS Requests"><i class="fa fa-id-card"></i> <?php echo lang('menu_oqrs_requests'); ?> <?php if ($oqrs_requests > 0) {
+								<li><a class="dropdown-item" href="<?php echo site_url('oqrs/requests'); ?>" title="OQRS Requests"><i class="fa fa-id-card"></i> <?php echo __("OQRS Requests"); ?> <?php if ($oqrs_requests > 0) {
 																																																				echo "<span class=\"badge text-bg-light\">" . $oqrs_requests . "</span>";
 																																																			} ?></a></li>
-								<li><a class="dropdown-item" href="<?php echo site_url('qslprint'); ?>" title="Print Requested QSLs"><i class="fas fa-print"></i> <?php echo lang('menu_print_requested_qsls'); ?></a></li>
-								<li><a class="dropdown-item" href="<?php echo site_url('labels'); ?>" title="Label setup"><i class="fas fa-print"></i> <?php echo lang('menu_labels'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('qslprint'); ?>" title="Print Requested QSLs"><i class="fas fa-print"></i> <?php echo __("Print Requested QSLs"); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('labels'); ?>" title="Label setup"><i class="fas fa-print"></i> <?php echo __("Labels"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown"><i class="fas fa-sync"></i> <?php echo lang('menu_third_party_services'); ?></a>
+								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown"><i class="fas fa-sync"></i> <?php echo __("Third-Party Services"); ?></a>
 									<ul class="submenu submenu-left dropdown-menu">
-										<li><a class="dropdown-item" href="<?php echo site_url('lotw'); ?>" title="Synchronise with Logbook of the World (LoTW)"><i class="fas fa-sync"></i> <?php echo lang('menu_logbook_of_the_world'); ?></a></li>
-										<li><a class="dropdown-item" href="<?php echo site_url('eqsl/import'); ?>" title="eQSL import / export"><i class="fas fa-sync"></i> <?php echo lang('menu_eqsl_import_export'); ?></a></li>
-										<li><a class="dropdown-item" href="<?php echo site_url('hrdlog/export'); ?>" title="Upload to HRDLog.net logbook"><i class="fas fa-sync"></i> <?php echo lang('menu_hrd_logbook'); ?></a></li>
-										<li><a class="dropdown-item" href="<?php echo site_url('qrz/export'); ?>" title="Upload to QRZ.com logbook"><i class="fas fa-sync"></i> <?php echo lang('menu_qrz_logbook'); ?></a></li>
-										<li><a class="dropdown-item" href="<?php echo site_url('webadif/export'); ?>" title="Upload to webADIF"><i class="fas fa-sync"></i> <?php echo lang('menu_qo_100_dx_club_upload'); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('lotw'); ?>" title="Synchronise with Logbook of the World (LoTW)"><i class="fas fa-sync"></i> <?php echo __("Logbook of the World"); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('eqsl/import'); ?>" title="eQSL import / export"><i class="fas fa-sync"></i> <?php echo __("eQSL Import / Export"); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('hrdlog/export'); ?>" title="Upload to HRDLog.net logbook"><i class="fas fa-sync"></i> <?php echo __("HRDLog Logbook"); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('qrz/export'); ?>" title="Upload to QRZ.com logbook"><i class="fas fa-sync"></i> <?php echo __("QRZ Logbook"); ?></a></li>
+										<li><a class="dropdown-item" href="<?php echo site_url('webadif/export'); ?>" title="Upload to webADIF"><i class="fas fa-sync"></i> <?php echo __("QO-100 Dx Club Upload"); ?></a></li>
 									</ul>
 								</li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('api/help'); ?>" title="Manage API keys"><i class="fas fa-key"></i> <?php echo lang('menu_api_keys'); ?></a></li>
-								<li><a class="dropdown-item" href="<?php echo site_url('radio'); ?>" title="Interface with one or more radios"><i class="fas fa-broadcast-tower"></i> <?php echo lang('menu_hardware_interfaces'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('api/help'); ?>" title="Manage API keys"><i class="fas fa-key"></i> <?php echo __("API Keys"); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('radio'); ?>" title="Interface with one or more radios"><i class="fas fa-broadcast-tower"></i> <?php echo __("Hardware Interfaces"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="javascript:displayVersionDialog();" title="Version Information"><i class="fas fa-star"></i> <?php echo lang('options_version_dialog'); ?></a></li>
-								<li><a class="dropdown-item" target="_blank" href="https://github.com/wavelog/wavelog/wiki" title="Help"><i class="fas fa-question"></i> <?php echo lang('menu_help'); ?></a></li>
-								<li><a class="dropdown-item" target="_blank" href="https://github.com/wavelog/wavelog/discussions" title="Forum"><i class="far fa-comment-dots"></i> <?php echo lang('menu_forum'); ?></a></li>
+								<li><a class="dropdown-item" href="javascript:displayVersionDialog();" title="Version Information"><i class="fas fa-star"></i> <?php echo __("Version Info"); ?></a></li>
+								<li><a class="dropdown-item" target="_blank" href="https://github.com/wavelog/wavelog/wiki" title="Help"><i class="fas fa-question"></i> <?php echo __("Help"); ?></a></li>
+								<li><a class="dropdown-item" target="_blank" href="https://github.com/wavelog/wavelog/discussions" title="Forum"><i class="far fa-comment-dots"></i> <?php echo __("Forum"); ?></a></li>
 								<div class="dropdown-divider"></div>
-								<li><a class="dropdown-item" href="<?php echo site_url('user/logout'); ?>" title="Logout"><i class="fas fa-sign-out-alt"></i> <?php echo lang('menu_logout'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('user/logout'); ?>" title="Logout"><i class="fas fa-sign-out-alt"></i> <?php echo __("Logout"); ?></a></li>
 							</ul>
 						</li>
 						<?php
@@ -426,7 +426,7 @@
 							<li class="nav-item dropdown">
 								<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="fas fa-map-marker-alt"></i> | <i class="fas fa-book"></i></a>
 								<ul class="dropdown-menu dropdown-menu-right header-dropdown">
-									<li><a class="dropdown-item disabled"><?php echo lang('menu_select_location'); ?>:</a></li>
+									<li><a class="dropdown-item disabled"><?php echo __("Select a Location"); ?>:</a></li>
 									<?php
 									// let's get all stations for the logged in user
 									$all_user_locations = $this->stations->all_of_user($this->session->userdata('user_id'));
@@ -446,7 +446,7 @@
 										$station_id = $row->station_id;
 
 										// the active badge, not shown by default
-										$active_badge = '<span id="quickswitcher_active_badge_' . $station_id . '" class="badge bg-success ms-2 d-none">' . lang('general_word_active') . '</span>';
+										$active_badge = '<span id="quickswitcher_active_badge_' . $station_id . '" class="badge bg-success ms-2 d-none">' . __("Active") . '</span>';
 
 										// only continue if the station id is a favourite and show the station in the list
 										$is_favorite = false;
@@ -466,9 +466,9 @@
 										<?php }
 									} ?>
 									<div class="dropdown-divider"></div>
-									<li><a class="dropdown-item quickswitcher disabled"><?php echo lang('gen_hamradio_active_logbook'); ?>:<span class="badge text-bg-info ms-1"><?php echo $this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?></span></a></li>
+									<li><a class="dropdown-item quickswitcher disabled"><?php echo __("Active Logbook"); ?>:<span class="badge text-bg-info ms-1"><?php echo $this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?></span></a></li>
 									<div class="dropdown-divider"></div>
-									<li><a class="dropdown-item" href="<?php echo site_url('stationsetup'); ?>" title="Manage station locations"><?php echo lang('menu_station_setup'); ?>...</a></li>
+									<li><a class="dropdown-item" href="<?php echo site_url('stationsetup'); ?>" title="Manage station locations"><?php echo __("Station Setup"); ?>...</a></li>
 								</ul>
 							</li>
 							<?php } ?>
@@ -505,7 +505,7 @@
 
 						if ($menuitems) { ?>
 							<li class="nav-item dropdown">
-								<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo lang('menu_extras'); ?></a>
+								<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?php echo __("Extras"); ?></a>
 								<div class="dropdown-menu header-dropdown">
 									<?php
 									foreach (json_decode($menuitems) as $item) {
diff --git a/application/views/kml/index.php b/application/views/kml/index.php
index cc956de79..e58c71129 100644
--- a/application/views/kml/index.php
+++ b/application/views/kml/index.php
@@ -1,14 +1,14 @@
 <div class="container">
 <br>
-    <h2><?php echo lang('export_kml_header'); ?></h2>
+    <h2><?php echo __("KML Export"); ?></h2>
 
     <div class="card">
         <div class="card-header">
-            <?php echo lang('export_kml_description'); ?>
+            <?php echo __("Export your logbook to a KML file for use in Google Earth."); ?>
         </div>
 
         <div class="alert alert-warning" role="alert">
-            <?php echo lang('export_kml_grisquare_warning'); ?>
+            <?php echo __("Only QSOs with a gridsquare defined will be exported!"); ?>
         </div>
 
         <div class="card-body">
@@ -16,9 +16,9 @@
             <form class="form" action="<?php echo site_url('kmlexport/export'); ?>" method="post" enctype="multipart/form-data">
                 <div class="row">
                     <div class="mb-3 col-md-3">
-                        <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+                        <label for="band"><?php echo __("Band"); ?></label>
                             <select id="band" name="band" class="form-select">
-                                <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
+                                <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo __("All"); ?></option>
                                 <?php foreach($worked_bands as $band) {
                                     echo '<option value="' . $band . '"';
                                     if ($this->input->post('band') == $band) echo ' selected';
@@ -28,9 +28,9 @@
                     </div>
 
                     <div class="mb-3 col-md-3">
-                    <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+                    <label for="mode"><?php echo __("Mode"); ?></label>
                         <select id="mode" name="mode" class="form-select">
-                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <option value="All"><?php echo __("All"); ?></option>
                             <?php
                             foreach($modes->result() as $mode){
                                 if ($mode->submode == null) {
@@ -44,14 +44,14 @@
                     </div>
 
                     <div class="mb-3 col-md-4">
-                        <label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
+                        <label for="dxcc_id"><?php echo __("DXCC"); ?></label>
                         <select class="form-select" id="dxcc_id" name="dxcc_id">
-                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <option value="All"><?php echo __("All"); ?></option>
                             <?php
                                 foreach($dxcc as $d){
                                     echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
                                     if ($d->Enddate != null) {
-                                        echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
+                                        echo ' ('.__("Deleted DXCC").')';
                                     }
                                     echo '</option>';
                                 }
@@ -62,9 +62,9 @@
                 </div>
                 <div class="row">                
                     <div class="mb-3 col-md-3">
-                        <label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
+                        <label for="cqz"><?php echo __("CQ Zone"); ?></label>
                         <select class="form-select" id="cqz" name="cqz">
-                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <option value="All"><?php echo __("All"); ?></option>
                             <?php
                             for ($i = 1; $i<=40; $i++) {
                                 echo '<option value="'. $i . '">'. $i .'</option>';
@@ -74,9 +74,9 @@
                     </div>
 
                     <div class="mb-3 col-md-5">
-                        <label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
+                        <label for="selectPropagation"><?php echo __("Propagation Mode"); ?></label>
                         <select class="form-select" id="selectPropagation" name="prop_mode">
-                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <option value="All"><?php echo __("All"); ?></option>
                             <option value="AS">Aircraft Scatter</option>
                             <option value="AUR">Aurora</option>
                             <option value="AUE">Aurora-E</option>
@@ -100,17 +100,17 @@
                 </div>
                 <div class="row">
                     <div class="mb-3 col-md-3">
-                        <label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+                        <label for="from"><?php echo __("From date") . ": " ?></label>
                         <input name="from" id="from" type="date" class="form-control w-auto">
                     </div>
 
                     <div class="mb-3 col-md-3">
-                        <label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
+                        <label for="to"><?php echo __("To date") . ": " ?></label>
                         <input name="to" id="to" type="date" class="form-control w-auto">
                     </div>
                 </div>    
                 <br>
-                <button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo lang('general_word_export'); ?></button>
+                <button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo __("Export"); ?></button>
             </form>
         </div>
     </div>
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index ce3ce25a8..34df82928 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -5,11 +5,11 @@
     var custom_date_format = "<?php echo $custom_date_format ?>";
     let user_map_custom = JSON.parse('<?php echo $user_map_custom; ?>');
 
-    var lang_gen_hamradio_latitude = '<?php echo lang('gen_hamradio_latitude'); ?>';
-    var lang_gen_hamradio_longitude = '<?php echo lang('gen_hamradio_longitude'); ?>';
-    var lang_gen_hamradio_gridsquare = '<?php echo lang('gen_hamradio_gridsquare'); ?>';
-    var lang_gen_hamradio_distance = '<?php echo lang('gen_hamradio_distance'); ?>';
-    var lang_gen_hamradio_bearing = '<?php echo lang('gen_hamradio_bearing'); ?>';
+    var lang_gen_hamradio_latitude = '<?php echo __("Latitude"); ?>';
+    var lang_gen_hamradio_longitude = '<?php echo __("Longitude"); ?>';
+    var lang_gen_hamradio_gridsquare = '<?php echo __("Gridsquare"); ?>';
+    var lang_gen_hamradio_distance = '<?php echo __("Distance"); ?>';
+    var lang_gen_hamradio_bearing = '<?php echo __("Bearing"); ?>';
     <?php
     echo "var homegrid ='" . strtoupper($homegrid[0]) . "';";
     if (!isset($options)) {
@@ -125,22 +125,22 @@ $options = json_decode($options);
             <div class="filterbody collapse">
                 <div class="row">
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="dateFrom"><?php echo lang('filter_general_from') . ": " ?></label>
+                        <label class="form-label" for="dateFrom"><?php echo __("From") . ": " ?></label>
                         <input name="dateFrom" id="dateFrom" type="date" class="form-control form-control-sm w-auto">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="dateTo"><?php echo lang('filter_general_to') . ": " ?></label>
+                        <label class="form-label" for="dateTo"><?php echo __("To") . ": " ?></label>
                         <input name="dateTo" id="dateTo" type="date" class="form-control form-control-sm w-auto">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="dx"><?php echo lang('gen_hamradio_dx'); ?></label>
+                        <label class="form-label" for="dx"><?php echo __("Dx"); ?></label>
                         <input type="text" name="dx" id="dx" class="form-control form-control-sm" value="">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="dxcc"><?php echo lang('gen_hamradio_dxcc'); ?></label>
+                        <label class="form-label" for="dxcc"><?php echo __("DXCC"); ?></label>
                         <select class="form-select form-select-sm" id="dxcc" name="dxcc">
                             <option value="">-</option>
-                            <option value="0"><?php echo lang('filter_general_none'); ?></option>
+                            <option value="0"><?php echo __("- NONE - (e.g. /MM, /AM)"); ?></option>
                             <?php
 					foreach($dxccarray as $dxcc){
 						echo '<option value=' . $dxcc->adif;
@@ -154,7 +154,7 @@ $options = json_decode($options);
                         </select>
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="iota"><?php echo lang('gen_hamradio_iota'); ?></label>
+                        <label class="form-label" for="iota"><?php echo __("IOTA"); ?></label>
                         <select class="form-select form-select-sm" id="iota" name="iota">
                             <option value="">-</option>
                             <?php
@@ -166,17 +166,17 @@ $options = json_decode($options);
                         </select>
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="state"><?php echo lang('gen_hamradio_state'); ?></label>
+                        <label class="form-label" for="state"><?php echo __("State"); ?></label>
                         <input type="text" name="state" id="state" class="form-control form-control-sm" value="">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="gridsquare"><?php echo lang('gen_hamradio_gridsquare'); ?></label>
+                        <label class="form-label" for="gridsquare"><?php echo __("Gridsquare"); ?></label>
                         <input type="text" name="gridsquare" id="gridsquare" class="form-control form-control-sm" value="">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+                        <label class="form-label" for="mode"><?php echo __("Mode"); ?></label>
                         <select id="mode" name="mode" class="form-select form-select-sm">
-                            <option value=""><?php echo lang('general_word_all'); ?></option>
+                            <option value=""><?php echo __("All"); ?></option>
                             <?php
 					foreach($modes as $modeId => $mode){
 						?><option value="<?php echo htmlspecialchars($mode);?>"><?php echo htmlspecialchars($mode);?></option><?php
@@ -185,9 +185,9 @@ $options = json_decode($options);
                         </select>
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+                        <label class="form-label" for="band"><?php echo __("Band"); ?></label>
                         <select id="band" name="band" class="form-select form-select-sm">
-                            <option value=""><?php echo lang('general_word_all'); ?></option>
+                            <option value=""><?php echo __("All"); ?></option>
                             <?php
 					foreach($bands as $band){
 						?><option value="<?php echo htmlentities($band);?>"><?php echo htmlspecialchars($band);?></option><?php
@@ -196,27 +196,27 @@ $options = json_decode($options);
                         </select>
                     </div>
                     <div hidden class="sats_dropdown mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="sats"><?php echo lang('general_word_satellite'); ?></label>
+                        <label class="form-label" for="sats"><?php echo __("Satellite"); ?></label>
                         <select class="form-select form-select-sm" id="sats" name="sats">
-                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <option value="All"><?php echo __("All"); ?></option>
                             <?php foreach($sats as $sat) {
 					echo '<option value="' . htmlentities($sat) . '"' . '>' . htmlentities($sat) . '</option>'."\n";
 				} ?>
                         </select>
                     </div>
                     <div hidden class="orbits_dropdown mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="orbits"><?php echo lang('general_word_orbit'); ?></label>
+                        <label class="form-label" for="orbits"><?php echo __("Orbit"); ?></label>
                         <select class="form-select form-select-sm" id="orbits" name="orbits">
-                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <option value="All"><?php echo __("All"); ?></option>
                             <?php foreach($orbits as $orbit) {
 					echo '<option value="' . htmlentities($orbit) . '"' . '>' . htmlentities($orbit) . '</option>'."\n";
 				} ?>
                         </select>
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="selectPropagation"><?php echo lang('filter_general_propagation'); ?></label>
+                        <label class="form-label" for="selectPropagation"><?php echo __("Propagation"); ?></label>
                         <select id="selectPropagation" class="form-select form-select-sm" name="propmode">
-                            <option value=""><?php echo lang('general_word_all'); ?></option>
+                            <option value=""><?php echo __("All"); ?></option>
                             <option value="AS">Aircraft Scatter</option>
                             <option value="AUR">Aurora</option>
                             <option value="AUE">Aurora-E</option>
@@ -240,7 +240,7 @@ $options = json_decode($options);
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="cqzone">CQ Zone</label>
                         <select id="cqzone" name="cqzone" class="form-select form-select-sm">
-                            <option value=""><?php echo lang('general_word_all'); ?></option>
+                            <option value=""><?php echo __("All"); ?></option>
                             <?php
 								for ($i = 1; $i<=40; $i++) {
 									echo '<option value="'. $i . '">'. $i .'</option>';
@@ -251,7 +251,7 @@ $options = json_decode($options);
 					<div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="ituzone">ITU Zone</label>
                         <select id="ituzone" name="ituzone" class="form-select form-select-sm">
-                            <option value=""><?php echo lang('general_word_all'); ?></option>
+                            <option value=""><?php echo __("All"); ?></option>
                             <?php
 							for ($i = 1; $i<=90; $i++) {
 								echo '<option value="'. $i . '">'. $i .'</option>';
@@ -260,19 +260,19 @@ $options = json_decode($options);
                         </select>
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="sota"><?php echo lang('gen_hamradio_sota'); ?></label>
+                        <label class="form-label" for="sota"><?php echo __("SOTA"); ?></label>
                         <input type="text" name="sota" id="sota" class="form-control form-control-sm" value="">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="wwff"><?php echo lang('gen_hamradio_wwff'); ?></label>
+                        <label class="form-label" for="wwff"><?php echo __("WWFF"); ?></label>
                         <input type="text" name="wwff" id="wwff" class="form-control form-control-sm" value="">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="pota"><?php echo lang('gen_hamradio_pota'); ?></label>
+                        <label class="form-label" for="pota"><?php echo __("POTA"); ?></label>
                         <input type="text" name="pota" id="pota" class="form-control form-control-sm" value="">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="operator"><?php echo lang('gen_hamradio_operator'); ?></label>
+                        <label class="form-label" for="operator"><?php echo __("Operator"); ?></label>
                         <input type="text" name="operator" id="operator" class="form-control form-control-sm" value="">
                     </div>
                 </div>
@@ -281,101 +281,101 @@ $options = json_decode($options);
     <div class="qslfilterbody collapse">
         <div class="row">
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="qslSent"><?php echo lang('filter_qsl_sent'); ?></label>
+                <label for="qslSent"><?php echo __("QSL sent"); ?></label>
                 <select id="qslSent" name="qslSent" class="form-select form-select-sm">
-                    <option value=""><?php echo lang('general_word_all'); ?></option>
-                    <option value="Y"><?php echo lang('general_word_yes'); ?></option>
-                    <option value="N"><?php echo lang('general_word_no'); ?></option>
-                    <option value="R"><?php echo lang('general_word_requested'); ?></option>
-                    <option value="Q"><?php echo lang('general_word_queued'); ?></option>
-                    <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
+                    <option value=""><?php echo __("All"); ?></option>
+                    <option value="Y"><?php echo __("Yes"); ?></option>
+                    <option value="N"><?php echo __("No"); ?></option>
+                    <option value="R"><?php echo __("Requested"); ?></option>
+                    <option value="Q"><?php echo __("Queued"); ?></option>
+                    <option value="I"><?php echo __("Invalid (Ignore)"); ?></option>
                 </select>
             </div>
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="qslReceived"><?php echo lang('filter_qsl_recv'); ?></label>
+                <label for="qslReceived"><?php echo __("QSL received"); ?></label>
                 <select id="qslReceived" name="qslReceived" class="form-select form-select-sm">
-                    <option value=""><?php echo lang('general_word_all'); ?></option>
-                    <option value="Y"><?php echo lang('general_word_yes'); ?></option>
-                    <option value="N"><?php echo lang('general_word_no'); ?></option>
-                    <option value="R"><?php echo lang('general_word_requested'); ?></option>
-                    <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
-                    <option value="V"><?php echo lang('filter_qsl_verified'); ?></option>
+                    <option value=""><?php echo __("All"); ?></option>
+                    <option value="Y"><?php echo __("Yes"); ?></option>
+                    <option value="N"><?php echo __("No"); ?></option>
+                    <option value="R"><?php echo __("Requested"); ?></option>
+                    <option value="I"><?php echo __("Invalid (Ignore)"); ?></option>
+                    <option value="V"><?php echo __("Verified"); ?></option>
                 </select>
             </div>
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="qslSentMethod"><?php echo lang('filter_qsl_sent_method'); ?></label>
+                <label for="qslSentMethod"><?php echo __("QSL send. method"); ?></label>
                 <select id="qslSentMethod" name="qslSentMethod" class="form-select form-select-sm">
-                    <option value=""><?php echo lang('general_word_all'); ?></option>
-                    <option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
-                    <option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
-                    <option value="E"><?php echo lang('general_word_qslcard_electronic'); ?></option>
-                    <option value="M"><?php echo lang('general_word_qslcard_manager'); ?></option>
+                    <option value=""><?php echo __("All"); ?></option>
+                    <option value="B"><?php echo __("Bureau"); ?></option>
+                    <option value="D"><?php echo __("Direct"); ?></option>
+                    <option value="E"><?php echo __("Electronic"); ?></option>
+                    <option value="M"><?php echo __("Manager"); ?></option>
                 </select>
             </div>
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="qslReceivedMethod"><?php echo lang('filter_qsl_recv_method'); ?></label>
+                <label for="qslReceivedMethod"><?php echo __("QSL recv. method"); ?></label>
                 <select id="qslReceivedMethod" name="qslReceivedMethod" class="form-select form-select-sm">
-                    <option value=""><?php echo lang('general_word_all'); ?></option>
-                    <option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
-                    <option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
-                    <option value="E"><?php echo lang('general_word_qslcard_electronic'); ?></option>
-                    <option value="M"><?php echo lang('general_word_qslcard_manager'); ?></option>
+                    <option value=""><?php echo __("All"); ?></option>
+                    <option value="B"><?php echo __("Bureau"); ?></option>
+                    <option value="D"><?php echo __("Direct"); ?></option>
+                    <option value="E"><?php echo __("Electronic"); ?></option>
+                    <option value="M"><?php echo __("Manager"); ?></option>
                 </select>
             </div>
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="lotwSent"><?php echo lang('filter_lotw_sent'); ?></label>
+                <label for="lotwSent"><?php echo __("LoTW sent"); ?></label>
                 <select id="lotwSent" name="lotwSent" class="form-select form-select-sm">
-                    <option value=""><?php echo lang('general_word_all'); ?></option>
-                    <option value="Y"><?php echo lang('general_word_yes'); ?></option>
-                    <option value="N"><?php echo lang('general_word_no'); ?></option>
-                    <option value="R"><?php echo lang('general_word_requested'); ?></option>
-                    <option value="Q"><?php echo lang('general_word_queued'); ?></option>
-                    <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
+                    <option value=""><?php echo __("All"); ?></option>
+                    <option value="Y"><?php echo __("Yes"); ?></option>
+                    <option value="N"><?php echo __("No"); ?></option>
+                    <option value="R"><?php echo __("Requested"); ?></option>
+                    <option value="Q"><?php echo __("Queued"); ?></option>
+                    <option value="I"><?php echo __("Invalid (Ignore)"); ?></option>
                 </select>
             </div>
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="lotwReceived"><?php echo lang('filter_lotw_recv'); ?></label>
+                <label for="lotwReceived"><?php echo __("LoTW received"); ?></label>
                 <select id="lotwReceived" name="lotwReceived" class="form-select form-select-sm">
-                    <option value=""><?php echo lang('general_word_all'); ?></option>
-                    <option value="Y"><?php echo lang('general_word_yes'); ?></option>
-                    <option value="N"><?php echo lang('general_word_no'); ?></option>
-                    <option value="R"><?php echo lang('general_word_requested'); ?></option>
-                    <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
-                    <option value="V"><?php echo lang('filter_qsl_verified'); ?></option>
+                    <option value=""><?php echo __("All"); ?></option>
+                    <option value="Y"><?php echo __("Yes"); ?></option>
+                    <option value="N"><?php echo __("No"); ?></option>
+                    <option value="R"><?php echo __("Requested"); ?></option>
+                    <option value="I"><?php echo __("Invalid (Ignore)"); ?></option>
+                    <option value="V"><?php echo __("Verified"); ?></option>
                 </select>
             </div>
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="eqslSent"><?php echo lang('filter_eqsl_sent'); ?></label>
+                <label for="eqslSent"><?php echo __("eQSL sent"); ?></label>
                 <select id="eqslSent" name="eqslSent" class="form-select form-select-sm">
-                    <option value=""><?php echo lang('general_word_all'); ?></option>
-                    <option value="Y"><?php echo lang('general_word_yes'); ?></option>
-                    <option value="N"><?php echo lang('general_word_no'); ?></option>
-                    <option value="R"><?php echo lang('general_word_requested'); ?></option>
-                    <option value="Q"><?php echo lang('general_word_queued'); ?></option>
-                    <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
+                    <option value=""><?php echo __("All"); ?></option>
+                    <option value="Y"><?php echo __("Yes"); ?></option>
+                    <option value="N"><?php echo __("No"); ?></option>
+                    <option value="R"><?php echo __("Requested"); ?></option>
+                    <option value="Q"><?php echo __("Queued"); ?></option>
+                    <option value="I"><?php echo __("Invalid (Ignore)"); ?></option>
                 </select>
             </div>
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="eqslReceived"><?php echo lang('filter_eqsl_recv'); ?></label>
+                <label for="eqslReceived"><?php echo __("eQSL received"); ?></label>
                 <select id="eqslReceived" name="eqslReceived" class="form-select form-select-sm">
-                    <option value=""><?php echo lang('general_word_all'); ?></option>
-                    <option value="Y"><?php echo lang('general_word_yes'); ?></option>
-                    <option value="N"><?php echo lang('general_word_no'); ?></option>
-                    <option value="R"><?php echo lang('general_word_requested'); ?></option>
-                    <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
-                    <option value="V"><?php echo lang('filter_qsl_verified'); ?></option>
+                    <option value=""><?php echo __("All"); ?></option>
+                    <option value="Y"><?php echo __("Yes"); ?></option>
+                    <option value="N"><?php echo __("No"); ?></option>
+                    <option value="R"><?php echo __("Requested"); ?></option>
+                    <option value="I"><?php echo __("Invalid (Ignore)"); ?></option>
+                    <option value="V"><?php echo __("Verified"); ?></option>
                 </select>
             </div>
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="qslvia"><?php echo lang('filter_qsl_via'); ?></label>
+                <label for="qslvia"><?php echo __("QSL via"); ?></label>
                 <input type="search" name="qslvia" class="form-control form-control-sm">
             </div>
             <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                <label for="qslimages"><?php echo lang('filter_qsl_images'); ?></label>
+                <label for="qslimages"><?php echo __("QSL Images"); ?></label>
                 <select class="form-select form-select-sm" id="qslimages" name="qslimages">
                     <option value="">-</option>
-                    <option value="Y"><?php echo lang('general_word_yes'); ?></option>
-                    <option value="N"><?php echo lang('general_word_no'); ?></option>
+                    <option value="Y"><?php echo __("Yes"); ?></option>
+                    <option value="N"><?php echo __("No"); ?></option>
                 </select>
             </div>
         </div>
@@ -383,115 +383,115 @@ $options = json_decode($options);
 
     <div class="actionbody collapse">
         <script>
-            var lang_filter_actions_delete_warning = '<?php echo lang('filter_actions_delete_warning'); ?>';
+            var lang_filter_actions_delete_warning = '<?php echo __("Warning! Are you sure you want to delete the marked QSO(s)?"); ?>';
         </script>
         <div class="mb-2 btn-group">
-            <span class="h6 me-1"><?php echo lang('filter_actions_w_selected'); ?></span>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="btnUpdateFromCallbook"><?php echo lang('filter_actions_update_f_callbook'); ?></button>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="queueBureau"><?php echo lang('filter_actions_queue_bureau'); ?></button>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="queueDirect"><?php echo lang('filter_actions_queue_direct'); ?></button>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="queueElectronic"><?php echo lang('filter_actions_queue_electronic'); ?></button>
-            <button type="button" class="btn btn-sm btn-success me-1" id="sentBureau"><?php echo lang('filter_actions_sent_bureau'); ?></button>
-            <button type="button" class="btn btn-sm btn-success me-1" id="sentDirect"><?php echo lang('filter_actions_sent_direct'); ?></button>
-            <button type="button" class="btn btn-sm btn-success me-1" id="sentElectronic"><?php echo lang('filter_actions_sent_electronic'); ?></button>
-            <button type="button" class="btn btn-sm btn-danger me-1" id="dontSend"><?php echo lang('filter_actions_not_sent'); ?></button>
-            <button type="button" class="btn btn-sm btn-danger me-1" id="notRequired"><?php echo lang('filter_actions_qsl_n_required'); ?></button>
-            <button type="button" class="btn btn-sm btn-danger me-1" id="notReceived"><?php echo lang('filter_actions_not_rcvd'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedBureau"><?php echo lang('filter_actions_recv_bureau'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedDirect"><?php echo lang('filter_actions_recv_direct'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedElectronic"><?php echo lang('filter_actions_recv_electronic'); ?></button>
-            <button type="button" class="btn btn-sm btn-info me-1" id="exportAdif"><?php echo lang('filter_actions_create_adif'); ?></button>
-            <button type="button" class="btn btn-sm btn-info me-1" id="printLabel"><?php echo lang('filter_actions_print_label'); ?></button>
-            <button type="button" class="btn btn-sm btn-info me-1" id="qslSlideshow"><?php echo lang('filter_actions_qsl_slideshow'); ?></button>
+            <span class="h6 me-1"><?php echo __("With selected: "); ?></span>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="btnUpdateFromCallbook"><?php echo __("Update from Callbook"); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="queueBureau"><?php echo __("Queue Bureau"); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="queueDirect"><?php echo __("Queue Direct"); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="queueElectronic"><?php echo __("Queue Electronic"); ?></button>
+            <button type="button" class="btn btn-sm btn-success me-1" id="sentBureau"><?php echo __("Sent (Bureau)"); ?></button>
+            <button type="button" class="btn btn-sm btn-success me-1" id="sentDirect"><?php echo __("Sent (Direct)"); ?></button>
+            <button type="button" class="btn btn-sm btn-success me-1" id="sentElectronic"><?php echo __("Sent (Electronic)"); ?></button>
+            <button type="button" class="btn btn-sm btn-danger me-1" id="dontSend"><?php echo __("Not Sent"); ?></button>
+            <button type="button" class="btn btn-sm btn-danger me-1" id="notRequired"><?php echo __("QSL Not Required"); ?></button>
+            <button type="button" class="btn btn-sm btn-danger me-1" id="notReceived"><?php echo __("Not Received"); ?></button>
+            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedBureau"><?php echo __("Received (Bureau)"); ?></button>
+            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedDirect"><?php echo __("Received (Direct)"); ?></button>
+            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedElectronic"><?php echo __("Received (Electronic)"); ?></button>
+            <button type="button" class="btn btn-sm btn-info me-1" id="exportAdif"><?php echo __("Create ADIF"); ?></button>
+            <button type="button" class="btn btn-sm btn-info me-1" id="printLabel"><?php echo __("Print Label"); ?></button>
+            <button type="button" class="btn btn-sm btn-info me-1" id="qslSlideshow"><?php echo __("QSL Slideshow"); ?></button>
         </div>
     </div>
     <div class="quickfilterbody collapse">
         <div class="mb-2 btn-group">
-            <span class="h6 me-1"><?php echo lang('filter_quicksearch_w_sel'); ?></span>
+            <span class="h6 me-1"><?php echo __("Quicksearch with selected: "); ?></span>
 			<?php if (($options->dx->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchCallsign"><?php echo lang('filter_search_callsign'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchCallsign"><?php echo __("Search Callsign"); ?></button><?php
             } ?>
 			<?php if (($options->dxcc->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchDxcc"><?php echo lang('filter_search_dxcc'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchDxcc"><?php echo __("Search DXCC"); ?></button><?php
             } ?>
 			<?php if (($options->state->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchState"><?php echo lang('filter_search_state'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchState"><?php echo __("Search State"); ?></button><?php
             } ?>
 			<?php if (($options->gridsquare->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchGridsquare"><?php echo lang('filter_search_gridsquare'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchGridsquare"><?php echo __("Search Gridsquare"); ?></button><?php
             } ?>
 			<?php if (($options->cqzone->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchCqZone"><?php echo lang('filter_search_cq_zone'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchCqZone"><?php echo __("Search CQ Zone"); ?></button><?php
             } ?>
 			<?php if (($options->ituzone->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchItuZone"><?php echo lang('filter_search_itu_zone'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchItuZone"><?php echo __("Search ITU Zone"); ?></button><?php
             } ?>
 			<?php if (($options->mode->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchMode"><?php echo lang('filter_search_mode'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchMode"><?php echo __("Search Mode"); ?></button><?php
             } ?>
 			<?php if (($options->band->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchBand"><?php echo lang('filter_search_band'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchBand"><?php echo __("Search Band"); ?></button><?php
             } ?>
             <?php if (($options->iota->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchIota"><?php echo lang('filter_search_iota'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchIota"><?php echo __("Search IOTA"); ?></button><?php
             } ?>
 			<?php if (($options->sota->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchSota"><?php echo lang('filter_search_sota'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchSota"><?php echo __("Search SOTA"); ?></button><?php
             } ?>
             <?php if (($options->pota->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchPota"><?php echo lang('filter_search_pota'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchPota"><?php echo __("Search POTA"); ?></button><?php
             } ?>
             <?php if (($options->wwff->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchWwff"><?php echo lang('filter_search_wwff'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchWwff"><?php echo __("Search WWFF"); ?></button><?php
             } ?>
             <?php if (($options->operator->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary me-1" id="searchOperator"><?php echo lang('filter_search_operator'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchOperator"><?php echo __("Search Operator"); ?></button><?php
             } ?>
         </div>
     </div>
 <div class="row pt-2">
     <div class="mb-3 d-flex align-items-center col-lg d-flex flex-row justify-content-center align-items-center">
         <button type="button" class="btn btn-sm btn-primary me-1 lba_buttons" data-bs-toggle="collapse"
-            data-bs-target=".quickfilterbody"><?php echo lang('filter_quickfilters'); ?></button>
+            data-bs-target=".quickfilterbody"><?php echo __("Quickfilters"); ?></button>
         <button type="button" class="btn btn-sm btn-primary me-1 lba_buttons" data-bs-toggle="collapse"
-            data-bs-target=".qslfilterbody"><?php echo lang('filter_qsl_filters'); ?></button>
+            data-bs-target=".qslfilterbody"><?php echo __("QSL Filters"); ?></button>
         <button type="button" class="btn btn-sm btn-primary me-1 lba_buttons" data-bs-toggle="collapse"
-            data-bs-target=".filterbody"><?php echo lang('filter_filters'); ?></button>
+            data-bs-target=".filterbody"><?php echo __("Filters"); ?></button>
         <button type="button" class="btn btn-sm btn-primary me-1 lba_buttons" data-bs-toggle="collapse"
-            data-bs-target=".actionbody"><?php echo lang('filter_actions'); ?></button>
-        <label for="qsoResults" class="me-2"><?php echo lang('filter_results'); ?></label>
+            data-bs-target=".actionbody"><?php echo __("Actions"); ?></button>
+        <label for="qsoResults" class="me-2"><?php echo __("# Results"); ?></label>
         <select id="qsoResults" name="qsoresults" class="form-select form-select-sm me-2 w-auto">
             <option value="250">250</option>
             <option value="1000">1000</option>
             <option value="2500">2500</option>
             <option value="5000">5000</option>
         </select>
-		<label class="me-2" for="de"><?php echo lang('general_word_location'); ?></label>
+		<label class="me-2" for="de"><?php echo __("Location"); ?></label>
 		<select id="de" name="de" class="form-select form-select-sm me-2 w-auto">
-			<option value="All"><?php echo lang('general_word_all'); ?></option>
+			<option value="All"><?php echo __("All"); ?></option>
 			<?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\"";
                 } ?>>
-				<?php echo lang('gen_hamradio_callsign') . ": " ?>
+				<?php echo __("Callsign") . ": " ?>
 				<?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)
 			</option>
 			<?php } ?>
 		</select>
-        <button type="submit" class="btn btn-sm btn-primary me-1 ld-ext-right" id="searchButton"><?php echo lang('filter_search'); ?><div class="ld ld-ring ld-spin"></div></button>
-        <button type="button" class="btn btn-sm btn-primary me-1 ld-ext-right" id="dupeButton"><?php echo lang('filter_dupes'); ?><div class="ld ld-ring ld-spin"></div></button>
+        <button type="submit" class="btn btn-sm btn-primary me-1 ld-ext-right" id="searchButton"><?php echo __("Search"); ?><div class="ld ld-ring ld-spin"></div></button>
+        <button type="button" class="btn btn-sm btn-primary me-1 ld-ext-right" id="dupeButton"><?php echo __("Dupes"); ?><div class="ld ld-ring ld-spin"></div></button>
         <button type="button" class="btn btn-sm btn-primary me-1 ld-ext-right" id="editButton">Edit<div class="ld ld-ring ld-spin"></div></button>
-		<button type="button" class="btn btn-sm btn-danger me-1" id="deleteQsos"><?php echo lang('filter_actions_delete'); ?></button>
+		<button type="button" class="btn btn-sm btn-danger me-1" id="deleteQsos"><?php echo __("Delete"); ?></button>
 		<div class="btn-group me-1" role="group">
-            <button type="button" class="btn btn-sm btn-primary ld-ext-right" id="mapButton" onclick="mapQsos(this.form);"><?php echo lang('filter_map'); ?><div class="ld ld-ring ld-spin"></div></button>
+            <button type="button" class="btn btn-sm btn-primary ld-ext-right" id="mapButton" onclick="mapQsos(this.form);"><?php echo __("Map"); ?><div class="ld ld-ring ld-spin"></div></button>
 			<button id="btnGroupDrop1" type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"></button>
 			<ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
                 <li><button type="button" class="dropdown-item" onclick="mapGlobeQsos(this.form);" id="mapGlobeButton">Globe map</button></li>
             </ul>
         </div>
-		<button type="options" class="btn btn-sm btn-primary me-1" id="optionButton"><?php echo lang('filter_options'); ?></button>
-		<button type="reset" class="btn btn-sm btn-danger me-1" id="resetButton"><?php echo lang('filter_reset'); ?></button>
+		<button type="options" class="btn btn-sm btn-primary me-1" id="optionButton"><?php echo __("Options"); ?></button>
+		<button type="reset" class="btn btn-sm btn-danger me-1" id="resetButton"><?php echo __("Reset"); ?></button>
 
             </div>
         </div>
@@ -503,37 +503,37 @@ $options = json_decode($options);
                         <div class="form-check" style="margin-top: -1.5em"><input class="form-check-input" type="checkbox" id="checkBoxAll" /></div>
                     </th>
                     <?php if (($options->datetime->show ?? "true") == "true") {
-                        echo '<th>' . lang('general_word_datetime') . '</th>';
+                        echo '<th>' . __("Date/Time") . '</th>';
                     } ?>
                     <?php if (($options->de->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_de') . '</th>';
+                        echo '<th>' . __("De") . '</th>';
                     } ?>
                     <?php if (($options->dx->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_dx') . '</th>';
+                        echo '<th>' . __("Dx") . '</th>';
                     } ?>
                     <?php if (($options->mode->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_mode') . '</th>';
+                        echo '<th>' . __("Mode") . '</th>';
                     } ?>
                     <?php if (($options->rsts->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_rsts') . '</th>';
+                        echo '<th>' . __("RST (S)") . '</th>';
                     } ?>
                     <?php if (($options->rstr->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_rstr') . '</th>';
+                        echo '<th>' . __("RST (R)") . '</th>';
                     } ?>
                     <?php if (($options->band->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_band') . '</th>';
+                        echo '<th>' . __("Band") . '</th>';
                     } ?>
 					<?php if (($options->gridsquare->show ?? "true") == "true") {
                         echo '<th>Gridsquare</th>';
                     } ?>
                     <?php if (($options->name->show ?? "true") == "true") {
-                        echo '<th>' . lang('general_word_name') . '</th>';
+                        echo '<th>' . __("Name") . '</th>';
                     } ?>
                     <?php if (($options->qslvia->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_qslvia') . '</th>';
+                        echo '<th>' . __("QSL via") . '</th>';
                     } ?>
                     <?php if (($options->qsl->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_qsl') . '</th>';
+                        echo '<th>' . __("QSL") . '</th>';
                     } ?>
                     <?php if ($this->session->userdata('user_eqsl_name') != ""  && ($options->eqsl->show ?? "true") == "true") {
                         echo '<th class="eqslconfirmation">eQSL</th>';
@@ -542,34 +542,34 @@ $options = json_decode($options);
                         echo '<th class="lotwconfirmation">LoTW</th>';
                     } ?>
                     <?php if (($options->qslmsg->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_qslmsg') . '</th>';
+                        echo '<th>' . __("QSL Msg") . '</th>';
                     } ?>
                     <?php if (($options->dxcc->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_dxcc') . '</th>';
+                        echo '<th>' . __("DXCC") . '</th>';
                     } ?>
                     <?php if (($options->state->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_state') . '</th>';
+                        echo '<th>' . __("State") . '</th>';
                     } ?>
                     <?php if (($options->cqzone->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_cq_zone') . '</th>';
+                        echo '<th>' . __("CQ Zone") . '</th>';
                     } ?>
                     <?php if (($options->ituzone->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_itu_zone') . '</th>';
+                        echo '<th>' . __("ITU Zone") . '</th>';
                     } ?>
                     <?php if (($options->iota->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_iota') . '</th>';
+                        echo '<th>' . __("IOTA") . '</th>';
                     } ?>
                     <?php if (($options->pota->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_pota') . '</th>';
+                        echo '<th>' . __("POTA") . '</th>';
                     } ?>
                     <?php if (($options->operator->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_operator') . '</th>';
+                        echo '<th>' . __("Operator") . '</th>';
                     } ?>
                     <?php if (($options->comment->show ?? "true") == "true") {
-                        echo '<th>' . lang('general_word_comment') . '</th>';
+                        echo '<th>' . __("Comment") . '</th>';
                     } ?>
 					<?php if (($options->propagation->show ?? "true") == "true") {
-                        echo '<th>' . lang('filter_general_propagation') . '</th>';
+                        echo '<th>' . __("Propagation") . '</th>';
                     } ?>
 					<?php if (($options->contest->show ?? "true") == "true") {
                         echo '<th>Contest</th>';
@@ -578,7 +578,7 @@ $options = json_decode($options);
                         echo '<th>SOTA</th>';
                     } ?>
 					<?php if (($options->dok->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_dok') . '</th>';
+                        echo '<th>' . __("DOK") . '</th>';
                     } ?>
 					<?php if (($options->wwff->show ?? "true") == "true") {
                         echo '<th>WWFF</th>';
@@ -587,7 +587,7 @@ $options = json_decode($options);
                         echo '<th>SIG</th>';
                     } ?>
 					<?php if (($options->myrefs->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_myrefs') . '</th>';
+                        echo '<th>' . __("My Refs") . '</th>';
                     } ?>
                 </tr>
             </thead>
diff --git a/application/views/logbookadvanced/qslcarousel.php b/application/views/logbookadvanced/qslcarousel.php
index 2af2961e5..449502c2c 100644
--- a/application/views/logbookadvanced/qslcarousel.php
+++ b/application/views/logbookadvanced/qslcarousel.php
@@ -27,16 +27,16 @@
 		<table style="width:100%" class="table-sm table table-bordered table-hover table-striped table-condensed text-center">
 		<thead>
 			<tr>
-				<th><?php echo lang('gen_hamradio_callsign'); ?></th>
-				<th><?php echo lang('general_word_datetime'); ?></th>
-				<th><?php echo lang('gen_hamradio_mode'); ?></th>
-				<th><?php echo lang('gen_hamradio_band'); ?></th>
-				<th><?php echo lang('general_word_name'); ?></th>
-				<th><?php echo lang('gen_hamradio_dxcc'); ?></th>
-				<th><?php echo lang('gen_hamradio_state'); ?></th>
-				<th><?php echo lang('gen_hamradio_cq_zone'); ?></th>
-				<th><?php echo lang('gen_hamradio_iota'); ?></th>
-				<th><?php echo lang('gen_hamradio_gridsquare'); ?></th>
+				<th><?php echo __("Callsign"); ?></th>
+				<th><?php echo __("Date/Time"); ?></th>
+				<th><?php echo __("Mode"); ?></th>
+				<th><?php echo __("Band"); ?></th>
+				<th><?php echo __("Name"); ?></th>
+				<th><?php echo __("DXCC"); ?></th>
+				<th><?php echo __("State"); ?></th>
+				<th><?php echo __("CQ Zone"); ?></th>
+				<th><?php echo __("IOTA"); ?></th>
+				<th><?php echo __("Gridsquare"); ?></th>
 			</tr>
 		</thead>
 		<tbody>
@@ -64,11 +64,11 @@
 <?php if (count($qslimages) > 1) { ?>
 	<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-bs-slide="prev">
 		<span class="carousel-control-prev-icon" aria-hidden="true"></span>
-		<span class="visually-hidden"><?php echo lang('general_word_previous'); ?></span>
+		<span class="visually-hidden"><?php echo __("Previous"); ?></span>
 	</a>
 	<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-bs-slide="next">
 		<span class="carousel-control-next-icon" aria-hidden="true"></span>
-		<span class="visually-hidden"><?php echo lang('general_word_next'); ?></span>
+		<span class="visually-hidden"><?php echo __("Next"); ?></span>
 	</a>
 <?php } ?>
 </div>
diff --git a/application/views/logbookadvanced/startatform.php b/application/views/logbookadvanced/startatform.php
index 0aac7c7b4..847f115a6 100644
--- a/application/views/logbookadvanced/startatform.php
+++ b/application/views/logbookadvanced/startatform.php
@@ -1,29 +1,29 @@
 <form method="post" class="col-md">
     <div class="mb-3 row">
-        <label for="gridlabel"><?php echo lang('filter_actions_print_include_grid'); ?></label>
+        <label for="gridlabel"><?php echo __("Include Grid?"); ?></label>
         <div class="form-check-inline">
             <input class="form-check-input" type="checkbox" name="gridlabel" id="gridlabel">
         </div>
     </div>
     <div class="mb-3 row">
-        <label for="reference"><?php echo lang('filter_actions_print_include_ref'); ?></label>
+        <label for="reference"><?php echo __("Include reference? (SIG, SOTA, POTA, IOTA, WWFF; If available in location)"); ?></label>
         <div class="form-check-inline">
             <input class="form-check-input" type="checkbox" name="reference" id="reference">
         </div>
     </div>
     <div class="mb-3 row">
-        <label for="via"><?php echo lang('filter_actions_print_include_via'); ?></label>
+        <label for="via"><?php echo __("Include Via"); ?></label>
         <div class="form-check-inline">
             <input class="form-check-input" type="checkbox" name="via" id="via">
         </div>
     </div>
     <div class="mb-3 row">
-        <label for="startat"><?php echo lang('filter_actions_start_print'); ?></label>
+        <label for="startat"><?php echo __("Start printing at?"); ?></label>
         <div class="d-flex align-items-center">
             <input class="form-control input-group-sm" type="number" id="startat" name="startat" value="1">
         </div>
     </div>
     <div class="text-start">
-        <button type="button" id="button1id" name="button1id" class="btn btn-primary ld-ext-right" onclick="printlabel();"><?php echo lang('filter_actions_print'); ?></button>
+        <button type="button" id="button1id" name="button1id" class="btn btn-primary ld-ext-right" onclick="printlabel();"><?php echo __("Print"); ?></button>
     </div>
 </form>
diff --git a/application/views/logbookadvanced/useroptions.php b/application/views/logbookadvanced/useroptions.php
index becc79acb..347a86775 100644
--- a/application/views/logbookadvanced/useroptions.php
+++ b/application/views/logbookadvanced/useroptions.php
@@ -13,105 +13,105 @@
 <table style="width:100%" class="table-sm table table-hover table-striped table-condensed text-start" id="useroptions">
 	<thead>
 		<tr>
-			<th class="text-start"><?php echo lang('filter_options_column'); ?></th>
-			<th><?php echo lang('filter_options_show'); ?></th>
+			<th class="text-start"><?php echo __("Column"); ?></th>
+			<th><?php echo __("Show"); ?></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
-			<td><?php echo lang('general_word_datetime'); ?></td>
+			<td><?php echo __("Date/Time"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="datetime" type="checkbox" <?php if (($options->datetime->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_de'); ?></td>
+			<td><?php echo __("De"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="de" type="checkbox" <?php if (($options->de->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_dx'); ?></td>
+			<td><?php echo __("Dx"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="dx" type="checkbox" <?php if (($options->dx->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_mode'); ?></td>
+			<td><?php echo __("Mode"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="mode" type="checkbox" <?php if (($options->mode->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_rsts'); ?></td>
+			<td><?php echo __("RST (S)"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="rsts" type="checkbox" <?php if (($options->rsts->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_rstr'); ?></td>
+			<td><?php echo __("RST (R)"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="rstr" type="checkbox" <?php if (($options->rstr->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_band'); ?></td>
+			<td><?php echo __("Band"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="band" type="checkbox" <?php if (($options->band->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_myrefs'); ?></td>
+			<td><?php echo __("My Refs"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="myrefs" type="checkbox" <?php if (($options->myrefs->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('general_word_name'); ?></td>
+			<td><?php echo __("Name"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="name" type="checkbox" <?php if (($options->name->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_qslvia'); ?></td>
+			<td><?php echo __("QSL via"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="qslvia" type="checkbox" <?php if (($options->qslvia->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_qsl'); ?></td>
+			<td><?php echo __("QSL"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="qsl" type="checkbox" <?php if (($options->qsl->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('lotw_short'); ?></td>
+			<td><?php echo __("LoTW"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="lotw" type="checkbox" <?php if (($options->lotw->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('eqsl_short'); ?></td>
+			<td><?php echo __("eQSL"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="eqsl" type="checkbox" <?php if (($options->eqsl->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_qslmsg'); ?></td>
+			<td><?php echo __("QSL Msg"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="qslmsg" type="checkbox" <?php if (($options->qslmsg->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_dxcc'); ?></td>
+			<td><?php echo __("DXCC"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="dxcc" type="checkbox" <?php if (($options->dxcc->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_state'); ?></td>
+			<td><?php echo __("State"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="state" type="checkbox" <?php if (($options->state->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_cq_zone'); ?></td>
+			<td><?php echo __("CQ Zone"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="cqzone" type="checkbox" <?php if (($options->cqzone->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_itu_zone'); ?></td>
+			<td><?php echo __("ITU Zone"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="ituzone" type="checkbox" <?php if (($options->ituzone->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_sota'); ?></td>
+			<td><?php echo __("SOTA"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="sota" type="checkbox" <?php if (($options->sota->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_iota'); ?></td>
+			<td><?php echo __("IOTA"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="iota" type="checkbox" <?php if (($options->iota->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_pota'); ?></td>
+			<td><?php echo __("POTA"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="pota" type="checkbox" <?php if (($options->pota->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('gen_hamradio_operator'); ?></td>
+			<td><?php echo __("Operator"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="operator" type="checkbox" <?php if (($options->operator->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('general_word_comment'); ?></td>
+			<td><?php echo __("Comment"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="comment" type="checkbox" <?php if (($options->comment->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
-			<td><?php echo lang('filter_general_propagation'); ?></td>
+			<td><?php echo __("Propagation"); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="propagation" type="checkbox" <?php if (($options->propagation->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
 		<tr>
diff --git a/application/views/lookup/index.php b/application/views/lookup/index.php
index c454e729b..a20ea3a75 100644
--- a/application/views/lookup/index.php
+++ b/application/views/lookup/index.php
@@ -28,7 +28,7 @@
 			foreach ($dxcc as $d) {
 				echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
 				if ($d->Enddate != null) {
-					echo ' (' . lang('gen_hamradio_deleted_dxcc') . ')';
+					echo ' (' . __("Deleted DXCC") . ')';
 				}
 				echo '</option>';
 			}
diff --git a/application/views/lotw/import.php b/application/views/lotw/import.php
index fd9ffa5b3..17946afd5 100644
--- a/application/views/lotw/import.php
+++ b/application/views/lotw/import.php
@@ -1,6 +1,6 @@
 <div class="container lotw">
 
-  <h2><?php echo lang('lotw_title'); ?> - <?php echo lang('lotw_title_adif_import'); ?></h2>
+  <h2><?php echo __("Logbook of the World"); ?> - <?php echo __("ADIF Import"); ?></h2>
 
   <?php if (isset($errormsg)) { ?>
     <div class="alert alert-danger" role="alert">
@@ -9,7 +9,7 @@
   <?php } ?>
 
   <div class="card">
-    <div class="card-header"><?php echo lang('lotw_title_adif_import_options'); ?></div>
+    <div class="card-header"><?php echo __("Import Options"); ?></div>
     <div class="card-body">
 
 
@@ -19,12 +19,12 @@
 
       <div class="form-check">
         <input type="radio" id="lotwimport" name="lotwimport" class="form-check-input">
-        <label class="form-check-label" for="lotwimport"><?php echo lang('lotw_input_a_file'); ?></label>
+        <label class="form-check-label" for="lotwimport"><?php echo __("Upload a File"); ?></label>
         <br><br>
         <p><?php echo lang('lotw_upload_exported_adif_file_from_lotw'); ?></p>
-        <p><span class="badge text-bg-info"><?php echo lang('general_word_important'); ?></span> <?php echo lang('lotw_upload_type_must_be_adi'); ?></p>
+        <p><span class="badge text-bg-info"><?php echo __("Important"); ?></span> <?php echo __("Log files must have the file type .adi"); ?></p>
 
-        <label class="visually-hidden" for="adiffile"><?php echo lang('general_word_choose_file'); ?></label>
+        <label class="visually-hidden" for="adiffile"><?php echo __("Choose file"); ?></label>
         <input type="file" class="file-input mb-2 me-sm-2" id="adiffile" name="userfile" size="20" />
       </div>
 
@@ -33,9 +33,9 @@
       <div>
         <div class="form-check">
           <input type="radio" name="lotwimport" id="fetch" class="form-check-input" value="fetch" checked="checked" />
-          <label class="form-check-label" for="fetch"><?php echo lang('lotw_pull_lotw_data_for_me'); ?></label>
+          <label class="form-check-label" for="fetch"><?php echo __("Pull LoTW data for me"); ?></label>
           <br><br>
-          <p class="card-text"><?php echo lang('gen_from_date'); ?>:</p>
+          <p class="card-text"><?php echo __("From date"); ?>:</p>
           <div class="row">
             <div class="col-md-3">
               <input name="from" id="from" type="date" class="form-control w-auto">
@@ -44,7 +44,7 @@
           <br />
           <div class="row">
             <div class="col-md-3">
-              <label class="form-check-label" for="callsign"><?php echo lang('lotw_select_callsign'); ?></label>
+              <label class="form-check-label" for="callsign"><?php echo __("Select callsign to pull LoTW confirmations for"); ?></label>
               <?php
               $options = [];
               foreach ($callsigns->result() as $call) {
@@ -58,10 +58,10 @@
           </div>
           <br />
 
-          <p class="form-text text-muted"><?php echo lang('lotw_report_download_overview_helptext'); ?></p>
+          <p class="form-text text-muted"><?php echo __("Wavelog will use the LoTW username and password stored in your user profile to download a report from LoTW for you. The report Wavelog downloads will have all confirmations since chosen date, or since your last LoTW confirmation (fetched from your log), up until now."); ?></p>
         </div>
 
-        <input class="btn btn-primary" type="submit" value="<?php echo lang('lotw_btn_import_matches'); ?>" />
+        <input class="btn btn-primary" type="submit" value="<?php echo __("Import LoTW Matches"); ?>" />
 
         </form>
       </div>
diff --git a/application/views/lotw_views/index.php b/application/views/lotw_views/index.php
index acfee20d0..a6c28af07 100644
--- a/application/views/lotw_views/index.php
+++ b/application/views/lotw_views/index.php
@@ -1,20 +1,20 @@
 <div class="container lotw">
 <?php if($uploads_folder != true) { ?>
 	<div class="alert alert-warning" role="alert" style="margin-top: 1rem;">
-		<span class="badge text-bg-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-ban"></i> <?php echo lang('lotw_upload_folder_permissions'); ?>
+		<span class="badge text-bg-info"><?php echo __("Important"); ?></span> <i class="fas fa-ban"></i> <?php echo __("Upload folder is not writable. Please contact your admin."); ?>
 	</div>
 <?php } ?>
 <br>
 	<?php
 	if (!($this->config->item('disable_manual_lotw'))) { ?>
-	<a class="btn btn-outline-primary btn-sm float-end" href="<?php echo site_url('/lotw/import'); ?>" role="button"><i class="fas fa-cloud-download-alt"></i> <?php echo lang('lotw_btn_lotw_import'); ?></a>
+	<a class="btn btn-outline-primary btn-sm float-end" href="<?php echo site_url('/lotw/import'); ?>" role="button"><i class="fas fa-cloud-download-alt"></i> <?php echo __("LoTW Import"); ?></a>
 	<?php } ?>
-	<h2><?php echo lang('lotw_title'); ?></h2>
+	<h2><?php echo __("Logbook of the World"); ?></h2>
 
 	<!-- Card Starts -->
 	<div class="card">
 		<div class="card-header">
-			<a class="btn btn-outline-success btn-sm float-end" href="<?php echo site_url('/lotw/cert_upload'); ?>" role="button"><i class="fas fa-cloud-upload-alt"></i> <?php echo lang('lotw_btn_upload_certificate'); ?></a><i class="fab fa-expeditedssl"></i> <?php echo lang('lotw_title_available_cert'); ?>
+			<a class="btn btn-outline-success btn-sm float-end" href="<?php echo site_url('/lotw/cert_upload'); ?>" role="button"><i class="fas fa-cloud-upload-alt"></i> <?php echo __("Upload Certificate"); ?></a><i class="fab fa-expeditedssl"></i> <?php echo __("Available Certificates"); ?>
 		</div>
 
 		<div class="lotw-cert-list">
@@ -36,15 +36,15 @@
 				<table class="table table-hover">
 					<thead class="thead-light">
 						<tr>
-				 			<th scope="col"><?php echo lang('gen_hamradio_callsign'); ?></th>
-							<th scope="col"><?php echo lang('gen_hamradio_dxcc'); ?></th>
-							<th scope="col"><?php echo lang('lotw_qso_start_date'); ?></th>
-							<th scope="col"><?php echo lang('lotw_qso_end_date'); ?></th>
-							<th scope="col"><?php echo lang('lotw_date_created'); ?></th>
-							<th scope="col"><?php echo lang('lotw_date_expires'); ?></th>
-							<th scope="col"><?php echo lang('lotw_status'); ?></th>
-							<th scope="col"><?php echo lang('lotw_last_upload'); ?></th>
-							<th scope="col"><?php echo lang('lotw_options'); ?></th>
+				 			<th scope="col"><?php echo __("Callsign"); ?></th>
+							<th scope="col"><?php echo __("DXCC"); ?></th>
+							<th scope="col"><?php echo __("QSO Start Date"); ?></th>
+							<th scope="col"><?php echo __("QSO End Date"); ?></th>
+							<th scope="col"><?php echo __("Date Created"); ?></th>
+							<th scope="col"><?php echo __("Date Expires"); ?></th>
+							<th scope="col"><?php echo __("Status"); ?></th>
+							<th scope="col"><?php echo __("Last Upload"); ?></th>
+							<th scope="col"><?php echo __("Options"); ?></th>
 						</tr>
 					</thead>
 				 
@@ -53,7 +53,7 @@
 						<?php foreach ($lotw_cert_results->result() as $row) { ?>
 							<tr>
 					      		<td><?php echo $row->callsign; ?></td>
-                           <td><?php echo $row->cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
+                           <td><?php echo $row->cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' <span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>'; } ?></td>
 								<td><?php
 									if (isset($row->qso_start_date)) {
 										$valid_qso_start = strtotime( $row->qso_start_date );
@@ -88,11 +88,11 @@
 									<?php $warning_date = date('Y-m-d H:i:s', strtotime($row->date_expires.'-30 days')); ?>
 
 									<?php if ($current_date > $row->date_expires) { ?>
-										<span class="badge text-bg-danger"><?php echo lang('lotw_expired'); ?></span>
+										<span class="badge text-bg-danger"><?php echo __("Expired"); ?></span>
 									<?php } else if ($current_date <= $row->date_expires && $current_date > $warning_date) { ?>
-										<span class="badge text-bg-warning"><?php echo lang('lotw_expiring'); ?></span>
+										<span class="badge text-bg-warning"><?php echo __("Expiring"); ?></span>
 									<?php } else { ?>
-										<span class="badge text-bg-success"><?php echo lang('lotw_valid'); ?></span>
+										<span class="badge text-bg-success"><?php echo __("Valid"); ?></span>
 									<?php } ?>
 								</td>
 								<td>
@@ -111,11 +111,11 @@
 											<?php } ?>
 										<?php } ?>
 									<?php } else { ?>
-										<span class="badge text-bg-warning"><?php echo lang('lotw_not_synced'); ?></span>
+										<span class="badge text-bg-warning"><?php echo __("Not Synced"); ?></span>
 									<?php } ?>
 								</td>
 								<td>
-									<a class="btn btn-outline-danger btn-sm" href="<?php echo site_url('lotw/delete_cert/'.$row->lotw_cert_id); ?>" role="button"><i class="far fa-trash-alt"></i> <?php echo lang('lotw_btn_delete'); ?></a>
+									<a class="btn btn-outline-danger btn-sm" href="<?php echo site_url('lotw/delete_cert/'.$row->lotw_cert_id); ?>" role="button"><i class="far fa-trash-alt"></i> <?php echo __("Delete"); ?></a>
 								</td>
 							</tr>
 						<?php } ?>
@@ -126,7 +126,7 @@
 
 			<?php } else { ?>
 			<div class="alert alert-info" role="alert">
-				<?php echo lang('lotw_no_certs_uploaded'); ?>
+				<?php echo __("You need to upload some LoTW p12 certificates to use this area."); ?>
 			</div>
 			<?php } ?>
 
@@ -141,12 +141,12 @@
 	if (!($this->config->item('disable_manual_lotw'))) { ?>
 	<div class="card">
 		<div class="card-header">
-			<?php echo lang('lotw_title_information'); ?>
+			<?php echo __("Information"); ?>
 		</div>
 
 		<div class="card-body">
 			<button class="btn btn-outline-success" hx-get="<?php echo site_url('lotw/lotw_upload'); ?>"  hx-target="#lotw_manual_results">
-				<?php echo lang('lotw_btn_manual_sync'); ?>
+				<?php echo __("Manual Sync"); ?>
 			</button>
 
 			<div id="lotw_manual_results"></div>
diff --git a/application/views/lotw_views/upload_cert.php b/application/views/lotw_views/upload_cert.php
index cef2ff4a5..cc139b487 100644
--- a/application/views/lotw_views/upload_cert.php
+++ b/application/views/lotw_views/upload_cert.php
@@ -1,11 +1,11 @@
 <div class="container lotw">
 
-	<h2><?php echo lang('lotw_title'); ?></h2>
+	<h2><?php echo __("Logbook of the World"); ?></h2>
 
 	<!-- Card Starts -->
 	<div class="card">
 		<div class="card-header">
-			<?php echo lang('lotw_title_upload_p12_cert'); ?>
+			<?php echo __("Upload Logbook of the World .p12 Certificate"); ?>
 		</div>
 
 		<div class="card-body">
@@ -16,23 +16,23 @@
 	    	<?php } ?>
 
 	    	<div class="alert alert-info" role="alert">
-		    	<h5><?php echo lang('lotw_title_export_p12_file_instruction'); ?></h5>
+		    	<h5><?php echo __("Export .p12 File Instructions"); ?></h5>
 
 		    	<ul>
-		    		<li><?php echo lang('lotw_p12_export_step_one'); ?></li>
-		    		<li><?php echo lang('lotw_p12_export_step_two'); ?></li>
-		    		<li><?php echo lang('lotw_p12_export_step_three'); ?></li>
-		    		<li><?php echo lang('lotw_p12_export_step_four'); ?></li>
+		    		<li><?php echo __("Open TQSL &amp; go to the Callsign Certificates Tab"); ?></li>
+		    		<li><?php echo __("Right click on desired Callsign"); ?></li>
+		    		<li><?php echo __("Click "Save Callsign Certificate File" and do not add a password"); ?></li>
+		    		<li><?php echo __("Upload File below."); ?></li>
 		    	</ul>
 	    	</div>
 
 			<?php echo form_open_multipart('lotw/do_cert_upload');?>
 				<div class="mb-3">
-				    <label for="exampleFormControlFile1"><?php echo lang('lotw_title_upload_p12_cert'); ?></label>
+				    <label for="exampleFormControlFile1"><?php echo __("Upload Logbook of the World .p12 Certificate"); ?></label>
 				    <input type="file" name="userfile" class="form-control" id="exampleFormControlFile1">
 				 </div>
 
-				<button type="submit" value="upload" class="btn btn-primary"><?php echo lang('lotw_btn_upload_file'); ?></button>
+				<button type="submit" value="upload" class="btn btn-primary"><?php echo __("Upload File"); ?></button>
 			</form>
 
 	    </div>
diff --git a/application/views/mode/index.php b/application/views/mode/index.php
index 3ac01c4c1..cc51abf18 100644
--- a/application/views/mode/index.php
+++ b/application/views/mode/index.php
@@ -65,7 +65,7 @@
 					<th></th>
 					<th></th>
 					<th><---</th>
-					<th><?php echo lang('filter_filters'); ?></th>
+					<th><?php echo __("Filters"); ?></th>
 					<th></th>
 				</tr>
 			</tfoot>
diff --git a/application/views/notes/add.php b/application/views/notes/add.php
index fb329a6e0..da75d9c25 100644
--- a/application/views/notes/add.php
+++ b/application/views/notes/add.php
@@ -3,13 +3,13 @@
 
 <div class="card">
   <div class="card-header">
-    <h2 class="card-title"><?php echo lang('notes_create_note'); ?></h2>
+    <h2 class="card-title"><?php echo __("Create Note"); ?></h2>
     <ul class="nav nav-tabs card-header-tabs">
 	    <li class="nav-item">
-	    	<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo lang('notes_menu_notes'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo __("Notes"); ?></a>
 	    </li>
 	    <li class="nav-item">
-	    	<a class="nav-link active" href="<?php echo site_url('notes/add'); ?>"><?php echo lang('notes_create_note'); ?></a>
+	    	<a class="nav-link active" href="<?php echo site_url('notes/add'); ?>"><?php echo __("Create Note"); ?></a>
 	    </li>
 	</ul>
   </div>
@@ -26,26 +26,26 @@
     <form method="post" action="<?php echo site_url('notes/add'); ?>" name="notes_add" id="notes_add">
 
 	<div class="mb-3">
-		<label for="inputTitle"><?php echo lang('notes_input_title'); ?></label>
+		<label for="inputTitle"><?php echo __("Title"); ?></label>
 		<input type="text" name="title" class="form-control" id="inputTitle">
 	</div>
 
 	<div class="mb-3">
-	   <label for="catSelect"><?php echo lang('notes_input_category'); ?></label>
+	   <label for="catSelect"><?php echo __("Category"); ?></label>
 	   <select name="category" class="form-select" id="catSelect">
-	   	<option value="General" selected="selected"><?php echo lang('notes_selection_general'); ?></option>
-		<option value="Antennas"><?php echo lang('notes_selection_antennas'); ?></option>
-		<option value="Satellites"><?php echo lang('notes_selection_satellites'); ?></option>
+	   	<option value="General" selected="selected"><?php echo __("General"); ?></option>
+		<option value="Antennas"><?php echo __("Antennas"); ?></option>
+		<option value="Satellites"><?php echo __("Satellites"); ?></option>
 	   </select>
 	</div>
 
 	<div class="mb-3">
-		<label for="inputTitle"><?php echo lang('notes_input_notes_content'); ?></label>
+		<label for="inputTitle"><?php echo __("Note Contents"); ?></label>
 		<div id="quillArea"></div>
 		<textarea name="content" style="display:none" id="hiddenArea"></textarea>
 	</div>
 
-	<button type="submit" value="Submit" class="btn btn-primary"><?php echo lang('notes_input_btn_save_note'); ?></button>
+	<button type="submit" value="Submit" class="btn btn-primary"><?php echo __("Save Note"); ?></button>
 	</form>
   </div>
 </div>
diff --git a/application/views/notes/edit.php b/application/views/notes/edit.php
index e7235c78c..2bfcce5e7 100644
--- a/application/views/notes/edit.php
+++ b/application/views/notes/edit.php
@@ -4,13 +4,13 @@
 <?php foreach ($note->result() as $row) { ?>
 <div class="card">
   <div class="card-header">
-    <h2 class="card-title"><?php echo lang('notes_edit_note'); ?></h2>
+    <h2 class="card-title"><?php echo __("Edit Note"); ?></h2>
 	<ul class="nav nav-tabs card-header-tabs">
 	    <li class="nav-item">
-	    	<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo lang('notes_menu_notes'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo __("Notes"); ?></a>
 	    </li>
 	    <li class="nav-item">
-	    	<a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo lang('notes_create_note'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo __("Create Note"); ?></a>
 	    </li>
 	</ul>
   </div>
@@ -27,27 +27,27 @@
 	<form method="post" action="<?php echo site_url('notes/edit'); ?>/<?php echo $id; ?>" name="notes_add" id="notes_add">
 
 	<div class="mb-3">
-		<label for="inputTitle"><?php echo lang('notes_input_title'); ?></label>
+		<label for="inputTitle"><?php echo __("Title"); ?></label>
 		<input type="text" name="title" class="form-control" value="<?php echo $row->title; ?>" id="inputTitle">
 	</div>
 
 	<div class="mb-3">
-	   <label for="catSelect"><?php echo lang('notes_input_category'); ?></label>
+	   <label for="catSelect"><?php echo __("Category"); ?></label>
 	   <select name="category" class="form-select" id="catSelect">
-	    <option value="General" selected="selected"><?php echo lang('notes_selection_general'); ?></option>
-		<option value="Antennas"><?php echo lang('notes_selection_antennas'); ?></option>
-		<option value="Satellites"><?php echo lang('notes_selection_satellites'); ?></option>
+	    <option value="General" selected="selected"><?php echo __("General"); ?></option>
+		<option value="Antennas"><?php echo __("Antennas"); ?></option>
+		<option value="Satellites"><?php echo __("Satellites"); ?></option>
 	   </select>
 	</div>
 
 	<div class="mb-3">
-		<label for="inputTitle"><?php echo lang('notes_input_notes_content'); ?></label>
+		<label for="inputTitle"><?php echo __("Note Contents"); ?></label>
 		<div id="quillArea"><?php echo $row->note; ?></div>
 		<textarea name="content" style="display:none" id="hiddenArea"></textarea>
 	</div>
 
 	<input type="hidden" name="id" value="<?php echo $id; ?>" />
-	<button type="submit" value="Submit" class="btn btn-primary"><?php echo lang('notes_input_btn_save_note'); ?></button>
+	<button type="submit" value="Submit" class="btn btn-primary"><?php echo __("Save Note"); ?></button>
 	</form>
   </div>
 
diff --git a/application/views/notes/main.php b/application/views/notes/main.php
index ad4d23435..4091544e0 100644
--- a/application/views/notes/main.php
+++ b/application/views/notes/main.php
@@ -2,13 +2,13 @@
 
 	<div class="card">
 	  <div class="card-header">
-	  	<h2 class="card-title"><?php echo lang('notes_menu_notes'); ?></h2>
+	  	<h2 class="card-title"><?php echo __("Notes"); ?></h2>
 	    <ul class="nav nav-tabs card-header-tabs">
 	      <li class="nav-item">
-	        <a class="nav-link active" href="<?php echo site_url('notes'); ?>"><?php echo lang('notes_menu_notes'); ?></a>
+	        <a class="nav-link active" href="<?php echo site_url('notes'); ?>"><?php echo __("Notes"); ?></a>
 	      </li>
 	      <li class="nav-item">
-	        <a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo lang('notes_create_note'); ?></a>
+	        <a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo __("Create Note"); ?></a>
 	      </li>
 	    </ul>
 	  </div>
@@ -19,7 +19,7 @@
 
 				if ($notes->num_rows() > 0)
 				{
-					echo "<h3>".lang('notes_your_notes')."</h3>";
+					echo "<h3>".__("Your Notes")."</h3>";
 					echo "<ul class=\"list-group\">";
 					foreach ($notes->result() as $row)
 					{
@@ -29,7 +29,7 @@
 					}
 					echo "</ul>";
 				} else {
-					echo "<p>".lang('notes_welcome')."</p>";
+					echo "<p>".__("You don't currently have any notes, these are a fantastic way of storing data like ATU settings, beacons and general station notes and its better than paper as you can't lose them!")."</p>";
 				}
 
 			?>
diff --git a/application/views/notes/view.php b/application/views/notes/view.php
index c6848abef..06d9aca8c 100644
--- a/application/views/notes/view.php
+++ b/application/views/notes/view.php
@@ -3,22 +3,22 @@
 	<div class="card">
 	<?php foreach ($note->result() as $row) { ?>
 		<div class="card-header">
-    		<h2 class="card-title"><?php echo lang('notes_menu_notes'); ?> - <?php echo $row->title; ?></h2>
+    		<h2 class="card-title"><?php echo __("Notes"); ?> - <?php echo $row->title; ?></h2>
     			<ul class="nav nav-tabs card-header-tabs">
 	    <li class="nav-item">
-	    	<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo lang('notes_menu_notes'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo __("Notes"); ?></a>
 	    </li>
 	    <li class="nav-item">
-	    	<a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo lang('notes_create_note'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo __("Create Note"); ?></a>
 	    </li>
 	</ul>
 		</div>
 	  <div class="card-body">
 	    <p class="card-text"><?php echo nl2br($row->note); ?></p>
 
-	    <a href="<?php echo site_url('notes/edit'); ?>/<?php echo $row->id; ?>" class="btn btn-primary"><i class="fas fa-edit"></i> <?php echo lang('notes_input_btn_edit_note'); ?></a>
+	    <a href="<?php echo site_url('notes/edit'); ?>/<?php echo $row->id; ?>" class="btn btn-primary"><i class="fas fa-edit"></i> <?php echo __("Edit Note"); ?></a>
 
-	    <a href="<?php echo site_url('notes/delete'); ?>/<?php echo $row->id; ?>" class="btn btn-danger"><i class="fas fa-trash-alt"></i> <?php echo lang('notes_input_btn_delete_note'); ?></a>
+	    <a href="<?php echo site_url('notes/delete'); ?>/<?php echo $row->id; ?>" class="btn btn-danger"><i class="fas fa-trash-alt"></i> <?php echo __("Delete Note"); ?></a>
 	    <?php } ?>
 	  </div
 >	</div>
diff --git a/application/views/options/appearance.php b/application/views/options/appearance.php
index 40efca628..f90876637 100644
--- a/application/views/options/appearance.php
+++ b/application/views/options/appearance.php
@@ -45,7 +45,7 @@
 
                         <!-- Form options for selecting global theme choice -->
                         <div class="mb-3">
-                            <label for="themeSelect"><?php echo lang('options_theme'); ?></label>
+                            <label for="themeSelect"><?php echo __("Theme"); ?></label>
                             <select class="form-select" id="themeSelect" name="theme" aria-describedby="themeHelp" required>
 								<?php
 								foreach ($themes as $theme) {
@@ -57,7 +57,7 @@
 								}
 								?>
                                 </select>
-                            <small id="themeHelp" class="form-text text-muted"><?php echo lang('options_global_theme_choice_this_is_used_when_users_arent_logged_in'); ?></small>
+                            <small id="themeHelp" class="form-text text-muted"><?php echo __("Global Theme Choice, this is used when users arent logged in."); ?></small>
                         </div>
                         
                         
@@ -67,40 +67,40 @@
                             </select>
 
                         <div class="mb-3">
-                            <label for="dashboardBanner"><?php echo lang('options_dashboard_notification_banner'); ?></label>
+                            <label for="dashboardBanner"><?php echo __("Dashboard Notification Banner"); ?></label>
                             <select class="form-select" id="dashboardBanner" name="dashboardBanner" aria-describedby="dashboardBannerHelp" required>
                                 <option value='true' <?php if($this->optionslib->get_option('dashboard_banner') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
                                 <option value='false' <?php if($this->optionslib->get_option('dashboard_banner') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
                             </select>
-                            <small id="dashboardBannerHelp" class="form-text text-muted"><?php echo lang('options_this_allows_to_disable_the_global_notification_banner_on_the_dashboard'); ?></small>
+                            <small id="dashboardBannerHelp" class="form-text text-muted"><?php echo __("This allows to disable the global notification banner on the dashboard."); ?></small>
                         </div>
 
                         <div class="mb-3">
-                            <label for="dashboardMap"><?php echo lang('options_dashboard_map'); ?></label>
+                            <label for="dashboardMap"><?php echo __("Dashboard Map"); ?></label>
                             <select class="form-select" id="dashboardMap" name="dashboardMap" aria-describedby="dashboardMapHelp" required>
                                 <option value='true' <?php if($this->optionslib->get_option('dashboard_map') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
                                 <option value='false' <?php if($this->optionslib->get_option('dashboard_map') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
                                 <option value='map_at_right' <?php if($this->optionslib->get_option('dashboard_map') == "map_at_right") { echo "selected=\"selected\""; } ?>>Map at right</option>
                             </select>
-                            <small id="dashboardMapHelp" class="form-text text-muted"><?php echo lang('options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'); ?></small>
+                            <small id="dashboardMapHelp" class="form-text text-muted"><?php echo __("This allows the map on the dashboard to be disabled or placed on the right."); ?></small>
                         </div>
 
                         <div class="mb-3">
-                            <label for="logbookMap"><?php echo lang('options_logbook_map'); ?></label>
+                            <label for="logbookMap"><?php echo __("Logbook Map"); ?></label>
                             <select class="form-select" id="logbookMap" name="logbookMap" aria-describedby="logbookMapHelp" required>
                                 <option value='true' <?php if($this->optionslib->get_option('logbook_map') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
                                 <option value='false' <?php if($this->optionslib->get_option('logbook_map') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
                             </select>
-                            <small id="logbookMapHelp" class="form-text text-muted"><?php echo lang('options_this_allows_to_disable_the_map_in_the_logbook'); ?></small>
+                            <small id="logbookMapHelp" class="form-text text-muted"><?php echo __("This allows to disable the map in the logbook."); ?></small>
                         </div>
 
                         <div class="mb-3">
-                            <label for="publicMaps"><?php echo lang('options_public_maps'); ?></label>
+                            <label for="publicMaps"><?php echo __("Public Maps"); ?></label>
                             <select class="form-select" id="publicMaps" name="publicMaps" aria-describedby="publicMapsHelp" required>
                                 <option value='true' <?php if($this->optionslib->get_option('public_maps') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
                                 <option value='false' <?php if($this->optionslib->get_option('public_maps') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
                             </select>
-                            <small id="publicMapsHelp" class="form-text text-muted"><?php echo lang('options_this_allows_to_disable_all_maps_in_the_public_view'); ?></small>
+                            <small id="publicMapsHelp" class="form-text text-muted"><?php echo __("This allows to disable all maps in the public view. This affects the main map and the gridsquares map."); ?></small>
                         </div>
 
                         <div class="mb-3">
@@ -113,7 +113,7 @@
                         </div>
 
                         <!-- Save the Form -->
-                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
+                        <input class="btn btn-primary" type="submit" value="<?php echo __("Save"); ?>" />
                     </form>
                 </div>
             </div>
diff --git a/application/views/options/dxcluster.php b/application/views/options/dxcluster.php
index c248e8a1e..72740e1a0 100644
--- a/application/views/options/dxcluster.php
+++ b/application/views/options/dxcluster.php
@@ -35,22 +35,22 @@
                     <?php echo form_open('options/dxcluster_save'); ?>
 
                         <div class="mb-3">
-                            <label for="globalSearch"><?php echo lang('options_dxcluster_provider'); ?></label>
+                            <label for="globalSearch"><?php echo __("Provider of DXClusterCache"); ?></label>
                             <p><?php echo lang('options_dxcluster_longtext'); ?></p>
                             <input type="text" name="dxcache_url" class="form-control" id="dxcache_url" aria-describedby="dxcache_urlHelp" value="<?php echo $this->optionslib->get_option('dxcache_url'); ?>">
                             <small id="dxcache_urlHelp" class="form-text text-muted"><?php echo lang('options_dxcluster_hint'); ?></small>
                         </div>
                         <div class="mb-3">
-                            <label for="maxAgeSelect"><?php echo lang('options_dxcluster_maxage'); ?></label>
+                            <label for="maxAgeSelect"><?php echo __("Maximum Age of spots taken care of"); ?></label>
                             <select class="form-select" id="maxAgeSelect" name="dxcluster_maxage" aria-describedby="dxcluster_maxageHelp" required>
 				<option value="120"<?php if ($this->optionslib->get_option('dxcluster_maxage') == '120') { echo " selected"; } ?>>2 Hours</option>
 				<option value="60"<?php if ($this->optionslib->get_option('dxcluster_maxage') == '60') { echo " selected"; } ?>>60 Minutes</option>
 				<option value="30"<?php if ($this->optionslib->get_option('dxcluster_maxage') == '30') { echo " selected"; } ?>>30 Minutes</option>
                                 </select>
-                            <small id="dxcluster_maxageHelp" class="form-text text-muted"><?php echo lang('options_dxcluster_maxage_hint'); ?></small>
+                            <small id="dxcluster_maxageHelp" class="form-text text-muted"><?php echo __("The Age in Minutes of spots, that will be taken care at bandplan/lookup"); ?></small>
                         </div>
 			<div class="mb-3">
-                            <label for="decontSelect"><?php echo lang('options_dxcluster_decont'); ?></label>
+                            <label for="decontSelect"><?php echo __("Show spots which are spotted from following continent"); ?></label>
                             <select class="form-select" id="decontSelect" name="dxcluster_decont" aria-describedby="dxcluster_decontHelp" required>
 				<option value="AF"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'AF') { echo " selected"; } ?>>Africa</option>
 				<option value="AN"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'AN') { echo " selected"; } ?>>Antarctica</option>
@@ -60,11 +60,11 @@
 				<option value="OC"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'OC') { echo " selected"; } ?>>Oceania</option>
 				<option value="SA"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'SA') { echo " selected"; } ?>>South America</option>
                                 </select>
-                            <small id="dxcluster_decontHelp" class="form-text text-muted"><?php echo lang('options_dxcluster_decont_hint'); ?></small>
+                            <small id="dxcluster_decontHelp" class="form-text text-muted"><?php echo __("Only spots by spotters from this continent are shown"); ?></small>
                         </div>
  
                         <!-- Save the Form -->
-                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
+                        <input class="btn btn-primary" type="submit" value="<?php echo __("Save"); ?>" />
                     </form>
                 </div>
             </div>
diff --git a/application/views/options/email.php b/application/views/options/email.php
index 41b2e8a2e..74773216c 100644
--- a/application/views/options/email.php
+++ b/application/views/options/email.php
@@ -42,79 +42,79 @@
                     <?php echo form_open('options/email_save'); ?>
 
                         <div class="mb-3">
-                            <label for="emailProtocol"><?php echo lang('options_outgoing_protocol'); ?></label>
+                            <label for="emailProtocol"><?php echo __("Outgoing Protocol"); ?></label>
                             <select name="emailProtocol" class="form-select" id="emailProtocol">
                                 <option value="sendmail" <?php if($this->optionslib->get_option('emailProtocol')== "sendmail") { echo "selected=\"selected\""; } ?>>Sendmail</option>
                                 <option value="smtp" <?php if($this->optionslib->get_option('emailProtocol')== "smtp") { echo "selected=\"selected\""; } ?>>SMTP</option>
                             </select>
-                            <small class="form-text text-muted"><?php echo lang('options_outgoing_protocol_hint'); ?></small>
+                            <small class="form-text text-muted"><?php echo __("The protocol that will be used to send out emails."); ?></small>
                         </div>
 
                         <div class="mb-3">
-                            <label for="smtpEncryption"><?php echo lang('options_smtp_encryption'); ?></label>
+                            <label for="smtpEncryption"><?php echo __("SMTP Encryption"); ?></label>
                             <select name="smtpEncryption" class="form-select" id="smtpEncryption">
                                 <option value="" <?php if($this->optionslib->get_option('smtpEncryption') == "") { echo "selected=\"selected\""; } ?>>None</option>
                                 <option value="tls" <?php if($this->optionslib->get_option('smtpEncryption') == "tls") { echo "selected=\"selected\""; } ?>>TLS</option>
                                 <option value="ssl" <?php if($this->optionslib->get_option('smtpEncryption') == "ssl") { echo "selected=\"selected\""; } ?>>SSL</option>
                             </select>
-                            <small class="form-text text-muted"><?php echo lang('options_smtp_encryption_hint'); ?></small>
+                            <small class="form-text text-muted"><?php echo __("Choose whether emails should be sent with TLS or SSL."); ?></small>
                         </div>
 
                         <div class="mb-3 row">
-                        <label for="emailSenderName" class="col-sm-2 col-form-label"><?php echo lang('options_email_sender_name'); ?></label>
+                        <label for="emailSenderName" class="col-sm-2 col-form-label"><?php echo __("Email Sender Name"); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="emailSenderName" class="form-control" id="emailSenderName" value="<?php if($this->optionslib->get_option('emailSenderName') != "") { echo $this->optionslib->get_option('emailSenderName'); } ?>">
-                                <small class="form-text text-muted"><?php echo lang('options_email_sender_name_hint'); ?></small>
+                                <small class="form-text text-muted"><?php echo __("The email sender name, e.g. 'Wavelog'"); ?></small>
                             </div>
                         </div>
 
                         <div class="mb-3 row">
-                        <label for="emailAddress" class="col-sm-2 col-form-label"><?php echo lang('options_email_address'); ?></label>
+                        <label for="emailAddress" class="col-sm-2 col-form-label"><?php echo __("Email Address"); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="emailAddress" class="form-control" id="emailAddress" value="<?php if($this->optionslib->get_option('emailAddress') != "") { echo $this->optionslib->get_option('emailAddress'); } ?>">
-                                <small class="form-text text-muted"><?php echo lang('options_email_address_hint'); ?></small>
+                                <small class="form-text text-muted"><?php echo __("The email address from which the emails are sent, e.g. 'wavelog@example.com'"); ?></small>
                             </div>
                         </div>
 
                         <div class="mb-3 row">
-                            <label for="smtpHost" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_host'); ?></label>
+                            <label for="smtpHost" class="col-sm-2 col-form-label"><?php echo __("SMTP Host"); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="smtpHost" class="form-control" id="smtpHost" value="<?php if($this->optionslib->get_option('smtpHost') != "") { echo $this->optionslib->get_option('smtpHost'); } ?>">
-                                <small class="form-text text-muted"><?php echo lang('options_smtp_host_hint'); ?></small>
+                                <small class="form-text text-muted"><?php echo __("The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')"); ?></small>
                             </div>
                         </div>
 
                         <div class="mb-3 row">
-                            <label for="smtpPort" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_port'); ?></label>
+                            <label for="smtpPort" class="col-sm-2 col-form-label"><?php echo __("SMTP Port"); ?></label>
                             <div class="col-sm-10">
                                 <input type="number" name="smtpPort" class="form-control" id="smtpPort" value="<?php if($this->optionslib->get_option('smtpPort') != "") { echo $this->optionslib->get_option('smtpPort'); } ?>">
-                                <small class="form-text text-muted"><?php echo lang('options_smtp_port_hint'); ?></small>
+                                <small class="form-text text-muted"><?php echo __("The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'"); ?></small>
                             </div>
                         </div>
 
                         <div class="mb-3 row">
-                            <label for="smtpUsername" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_username'); ?></label>
+                            <label for="smtpUsername" class="col-sm-2 col-form-label"><?php echo __("SMTP Username"); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="smtpUsername" class="form-control" id="smtpUsername" value="<?php if($this->optionslib->get_option('smtpUsername') != "") { echo $this->optionslib->get_option('smtpUsername'); } ?>">
-                                <small class="form-text text-muted"><?php echo lang('options_smtp_username_hint'); ?></small>
+                                <small class="form-text text-muted"><?php echo __("The username to log in to the mail server, usually this is the email address that is used."); ?></small>
                             </div>
                         </div>
 
                         <div class="mb-3 row">
-                            <label for="smtpPassword" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_password'); ?></label>
+                            <label for="smtpPassword" class="col-sm-2 col-form-label"><?php echo __("SMTP Password"); ?></label>
                             <div class="col-sm-10">
                                 <input type="password" name="smtpPassword" class="form-control" id="smtpPassword"  value="<?php if($this->optionslib->get_option('smtpPassword') != "") { echo $this->optionslib->get_option('smtpPassword'); } ?>">
-                                <small class="form-text text-muted"><?php echo lang('options_smtp_password_hint'); ?></small>
+                                <small class="form-text text-muted"><?php echo __("The password to log in to the mail server."); ?></small>
                             </div>
                         </div>
 
                         <!-- Save the Form -->
-                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
+                        <input class="btn btn-primary" type="submit" value="<?php echo __("Save"); ?>" />
                     </form>
                     <br>
                     <?php echo form_open('options/sendTestMail'); ?>
-                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_send_testmail'); ?>" />
-                        <small class="form-text text-muted"><?php echo lang('options_send_testmail_hint'); ?></small>
+                        <input class="btn btn-primary" type="submit" value="<?php echo __("Send Test-Mail"); ?>" />
+                        <small class="form-text text-muted"><?php echo __("The email will be sent to the address defined in your account settings."); ?></small>
                     </form>
                 </div>
             </div>
diff --git a/application/views/options/index.php b/application/views/options/index.php
index b5272d0f8..8829add31 100644
--- a/application/views/options/index.php
+++ b/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><?php echo lang('options_message1'); ?></p>
+                    <p><?php echo __("Wavelog Options are global settings used for all users of the installation, which are overridden if there\'s a setting on a user level."); ?></p>
                 </div>
             </div>
 
diff --git a/application/views/options/oqrs.php b/application/views/options/oqrs.php
index 82664daaf..5b3b3b8ed 100644
--- a/application/views/options/oqrs.php
+++ b/application/views/options/oqrs.php
@@ -35,31 +35,31 @@
                     <?php echo form_open('options/oqrs_save'); ?>
 
                         <div class="mb-3">
-                            <label for="globalSearch"><?php echo lang('options_global_text'); ?></label>
+                            <label for="globalSearch"><?php echo __("Global text"); ?></label>
                             <input type="text" name="global_oqrs_text" class="form-control" id="global_oqrs_text" aria-describedby="global_oqrs_text" value="<?php echo $this->optionslib->get_option('global_oqrs_text'); ?>">
-                            <small id="global_oqrs_text_help" class="form-text text-muted"><?php echo lang('options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'); ?></small>
+                            <small id="global_oqrs_text_help" class="form-text text-muted"><?php echo __("This text is an optional text that can be displayed on top of the OQRS page."); ?></small>
                         </div>
 
                         <div class="mb-3">
-                            <label for="groupedSearch"><?php echo lang('options_grouped_search'); ?></label>
+                            <label for="groupedSearch"><?php echo __("Grouped search"); ?></label>
                             <select name="groupedSearch" class="form-select" id="groupedSearch">
                                 <option value="off" <?php if($this->optionslib->get_option('groupedSearch') == "off") { echo "selected=\"selected\""; } ?>>Off</option>
                                 <option value="on" <?php if($this->optionslib->get_option('groupedSearch') == "on") { echo "selected=\"selected\""; } ?>>On</option>
                             </select>
-                            <small id="groupedSearchHelp" class="form-text text-muted"><?php echo lang('options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'); ?></small>
+                            <small id="groupedSearchHelp" class="form-text text-muted"><?php echo __("When this is on, all station locations with OQRS active, will be searched at once."); ?></small>
                         </div>
 
                         <div class="mb-3">
-                            <label for="groupedSearchShowStationName"><?php echo lang('options_grouped_search_show_station_name'); ?></label>
+                            <label for="groupedSearchShowStationName"><?php echo __("Show station location name in grouped search results"); ?></label>
                             <select name="groupedSearchShowStationName" class="form-select" id="groupedSearchShowStationName">
                                 <option value="off" <?php if($this->optionslib->get_option('groupedSearchShowStationName') == "off") { echo "selected=\"selected\""; } ?>>Off</option>
                                 <option value="on" <?php if($this->optionslib->get_option('groupedSearchShowStationName') == "on") { echo "selected=\"selected\""; } ?>>On</option>
                             </select>
-                            <small id="groupedSearchShowStationNameHelp" class="form-text text-muted"><?php echo lang('options_grouped_search_show_station_name_hint'); ?></small>
+                            <small id="groupedSearchShowStationNameHelp" class="form-text text-muted"><?php echo __("If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."); ?></small>
                         </div>
 
                         <!-- Save the Form -->
-                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
+                        <input class="btn btn-primary" type="submit" value="<?php echo __("Save"); ?>" />
                     </form>
                 </div>
             </div>
diff --git a/application/views/options/radios.php b/application/views/options/radios.php
index 0f705b4ee..46b2db686 100644
--- a/application/views/options/radios.php
+++ b/application/views/options/radios.php
@@ -35,14 +35,14 @@
                     <?php echo form_open('options/radio_save'); ?>
 
                         <div class="mb-3">
-                            <label for="globalSearch"><?php echo lang('options_radio_timeout_warning'); ?></label>
-                            <p><?php echo lang('options_the_radio_timeout_warning_is_used_on_the_qso_entry_panel_to_alert_you_to_radio_interface_disconnects'); ?></p>
+                            <label for="globalSearch"><?php echo __("Radio Timeout Warning"); ?></label>
+                            <p><?php echo __("The Radio Timeout Warning is used on the QSO entry panel to alert you to radio interface disconnects."); ?></p>
                             <input type="text" name="radioTimeout" class="form-control" id="radioTimeout" aria-describedby="radioTimeoutHelp" value="<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?>">
-                            <small id="radioTimeoutHelp" class="form-text text-muted"><?php echo lang('options_this_number_is_in_seconds'); ?></small>
+                            <small id="radioTimeoutHelp" class="form-text text-muted"><?php echo __("This number is in seconds."); ?></small>
                         </div>
 
                         <!-- Save the Form -->
-                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
+                        <input class="btn btn-primary" type="submit" value="<?php echo __("Save"); ?>" />
                     </form>
                 </div>
             </div>
diff --git a/application/views/options/sidebar.php b/application/views/options/sidebar.php
index 902bd3968..f1cc774ae 100644
--- a/application/views/options/sidebar.php
+++ b/application/views/options/sidebar.php
@@ -1,12 +1,12 @@
 <div class="col-md-3">
 	<div class="card">
 		<ul class="list-group list-group-flush">
-			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/appearance'); ?>"><?php echo lang('options_appearance'); ?></a></li>
-			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/radio'); ?>"><?php echo lang('options_radios'); ?></a></li>
-			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/email'); ?>"><?php echo lang('options_email'); ?></a></li>
-			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/oqrs'); ?>"><?php echo lang('options_oqrs'); ?></a></li>
-			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/dxcluster'); ?>"><?php echo lang('options_dxcluster'); ?></a></li>
-			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/version_dialog'); ?>"><?php echo lang('options_version_dialog'); ?></a></li>
+			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/appearance'); ?>"><?php echo __("Appearance"); ?></a></li>
+			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/radio'); ?>"><?php echo __("Radios"); ?></a></li>
+			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/email'); ?>"><?php echo __("Email"); ?></a></li>
+			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/oqrs'); ?>"><?php echo __("OQRS Options"); ?></a></li>
+			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/dxcluster'); ?>"><?php echo __("DXCluster"); ?></a></li>
+			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/version_dialog'); ?>"><?php echo __("Version Info"); ?></a></li>
 		</ul>
 	</div>
 </div>
diff --git a/application/views/options/version_dialog.php b/application/views/options/version_dialog.php
index 992459f1a..1d94b4f5a 100644
--- a/application/views/options/version_dialog.php
+++ b/application/views/options/version_dialog.php
@@ -44,44 +44,44 @@
                     <?php echo form_open('options/version_dialog_save'); ?>
 
                     <div class="mb-3">
-                        <label for="version_dialog_header"><?php echo lang('options_version_dialog_header'); ?></label>
+                        <label for="version_dialog_header"><?php echo __("Version Info Header"); ?></label>
                         <input type="text" name="version_dialog_header" class="form-control" id="version_dialog_header" aria-describedby="version_dialog_header" value="<?php echo htmlspecialchars($this->optionslib->get_option('version_dialog_header') ?? ''); ?>">
-                        <small id="version_dialog_header_hint" class="form-text text-muted"><?php echo lang('options_version_dialog_header_hint'); ?></small>
+                        <small id="version_dialog_header_hint" class="form-text text-muted"><?php echo __("You can change the header of the version info dialog."); ?></small>
                     </div>
 
                     <div class="mb-3">
-                        <label for="version_dialog_mode"><?php echo lang('options_version_dialog_mode'); ?></label>
+                        <label for="version_dialog_mode"><?php echo __("Version Info Mode"); ?></label>
                         <select name="version_dialog_mode" class="form-select" id="version_dialog_mode">
                             <option value="release_notes" <?php if ($this->optionslib->get_option('version_dialog') == "release_notes") {
                                                                 echo "selected=\"selected\"";
-                                                            } ?>><?php echo lang('options_version_dialog_mode_release_notes'); ?></option>
+                                                            } ?>><?php echo __("Only Release Notes"); ?></option>
                             <option value="custom_text" <?php if ($this->optionslib->get_option('version_dialog') == "custom_text") {
                                                             echo "selected=\"selected\"";
-                                                        } ?>><?php echo lang('options_version_dialog_mode_custom_text'); ?></option>
+                                                        } ?>><?php echo __("Only Custom Text"); ?></option>
                             <option value="both" <?php if ($this->optionslib->get_option('version_dialog') == "both") {
                                                         echo "selected=\"selected\"";
-                                                    } ?>><?php echo lang('options_version_dialog_mode_both'); ?></option>
+                                                    } ?>><?php echo __("Release Notes and Custom Text"); ?></option>
                             <option value="disabled" <?php if ($this->optionslib->get_option('version_dialog') == "disabled") {
                                                             echo "selected=\"selected\"";
-                                                        } ?>><?php echo lang('options_version_dialog_mode_disabled'); ?></option>
+                                                        } ?>><?php echo __("Disabled"); ?></option>
                         </select>
-                        <small id="version_dialog_mode_hint" class="form-text text-muted"><?php echo lang('options_version_dialog_mode_hint'); ?></small>
+                        <small id="version_dialog_mode_hint" class="form-text text-muted"><?php echo __("The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both."); ?></small>
                     </div>
 
                     <div class="mb-3" id="version_dialog_custom_textarea" style="display: none" role="alert">
-                        <label for="version_dialog_custom_text"><?php echo lang('options_version_dialog_custom_text'); ?></label>
+                        <label for="version_dialog_custom_text"><?php echo __("Version Info Custom Text"); ?></label>
                         <textarea type="text" rows="6" name="version_dialog_custom_text" class="form-control" id="version_dialog_custom_text" aria-describedby="version_dialog_custom_text"><?php echo htmlspecialchars($this->optionslib->get_option('version_dialog_text') ?? ''); ?></textarea>
-                        <small id="version_dialog_custom_text_hint" class="form-text text-muted"><?php echo lang('options_version_dialog_custom_text_hint'); ?></small>
+                        <small id="version_dialog_custom_text_hint" class="form-text text-muted"><?php echo __("This is the custom text which is shown in the dialog."); ?></small>
                     </div>
 
                     <!-- Save the Form -->
-                    <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
+                    <input class="btn btn-primary" type="submit" value="<?php echo __("Save"); ?>" />
                     </form>
                 </div>
             </div>
             <div class="card mt-4 mb-4">
                 <div class="card-header">
-                    <h5><?php echo lang('options_version_dialog_show_hide'); ?></h5>
+                    <h5><?php echo __("Show/Hide Version Info Dialog for all Users"); ?></h5>
                 </div>
                 <div class="card-body">
                     <?php if ($this->session->flashdata('success_trigger')) { ?>
@@ -94,16 +94,16 @@
                     <div class="row">
                         <div class="col-md-6 border-end d-flex flex-column align-items-center text-center">
                             <?php echo form_open('options/version_dialog_show_to_all'); ?>
-                            <button class="btn btn-success m-2"><?php echo lang('options_version_dialog_show_all'); ?></button>
+                            <button class="btn btn-success m-2"><?php echo __("Show for all Users"); ?></button>
                             </form>
-                            <small class="form-text text-muted"><?php echo lang('options_version_dialog_show_all_hint'); ?></small>
+                            <small class="form-text text-muted"><?php echo __("This will show the version dialog automatically to all users on their next page reload."); ?></small>
                         </div>
 
                         <div class="col-md-6 d-flex flex-column align-items-center text-center">
                             <?php echo form_open('options/version_dialog_show_to_none'); ?>
-                            <button class="btn btn-danger m-2"><?php echo lang('options_version_dialog_hide_all'); ?></button>
+                            <button class="btn btn-danger m-2"><?php echo __("Hide for all Users"); ?></button>
                             </form>
-                            <small class="form-text text-muted"><?php echo lang('options_version_dialog_hide_all_hint'); ?></small>
+                            <small class="form-text text-muted"><?php echo __("This will deactivate the automatic popup of the version dialog for all users."); ?></small>
                         </div>
                     </div>
 
diff --git a/application/views/oqrs/qsolist.php b/application/views/oqrs/qsolist.php
index c832407f1..f93164ab4 100644
--- a/application/views/oqrs/qsolist.php
+++ b/application/views/oqrs/qsolist.php
@@ -3,12 +3,12 @@ if ($qsos->result() != NULL) {
 	echo '<table style="width:100%" class="qsolist table-sm table-bordered table-hover table-striped table-condensed">
 	<thead>
 	<tr>
-	<th style=\'text-align: center\'>'.lang('gen_hamradio_callsign').'</th>
-	<th style=\'text-align: center\'>' . lang('general_word_date') . '</th>
-	<th style=\'text-align: center\'>'. lang('general_word_time') .'</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_mode') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_band') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_station') . '</th>
+	<th style=\'text-align: center\'>'.__("Callsign").'</th>
+	<th style=\'text-align: center\'>' . __("Date") . '</th>
+	<th style=\'text-align: center\'>'. __("Time") .'</th>
+	<th style=\'text-align: center\'>' . __("Mode") . '</th>
+	<th style=\'text-align: center\'>' . __("Band") . '</th>
+	<th style=\'text-align: center\'>' . __("Station") . '</th>
 	<th style=\'text-align: center\'>QSL</th>';
 	if ($this->session->userdata('user_eqsl_name') != "") {
 		echo '<th style=\'text-align: center\'>eQSL</th>';
@@ -47,16 +47,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_SENT) {
 			case "Y":
-				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_sent').$timestamp;
+				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Sent").$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp;
 				break;
 			default:
 				echo "class=\"qsl-red";
@@ -66,16 +66,16 @@ if ($qsos->result() != NULL) {
 		if ($qsl->COL_QSL_SENT_VIA != "") {
 			switch ($qsl->COL_QSL_SENT_VIA) {
 			case "B":
-				echo " (".lang('general_word_qslcard_bureau').")";
+				echo " (".__("Bureau").")";
 				break;
 			case "D":
-				echo " (".lang('general_word_qslcard_direct').")";
+				echo " (".__("Direct").")";
 				break;
 			case "M":
-				echo " (".lang('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")";
+				echo " (".__("Via").": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")";
 				break;
 			case "E":
-				echo " (".lang('general_word_qslcard_electronic').")";
+				echo " (".__("Electronic").")";
 				break;
 			}
 		}
@@ -89,16 +89,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_RCVD) {
 			case "Y":
-				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_received').$timestamp;
+				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Received").$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp;
 				break;
 			default:
 				echo "class=\"qsl-red";
@@ -108,16 +108,16 @@ if ($qsos->result() != NULL) {
 		if ($qsl->COL_QSL_RCVD_VIA != "") {
 			switch ($qsl->COL_QSL_RCVD_VIA) {
 			case "B":
-				echo " (".lang('general_word_qslcard_bureau').")";
+				echo " (".__("Bureau").")";
 				break;
 			case "D":
-				echo " (".lang('general_word_qslcard_direct').")";
+				echo " (".__("Direct").")";
 				break;
 			case "M":
 				echo " (Manager)";
 				break;
 			case "E":
-				echo " (".lang('general_word_qslcard_electronic').")";
+				echo " (".__("Electronic").")";
 				break;
 			}
 		}
@@ -127,7 +127,7 @@ if ($qsos->result() != NULL) {
 			echo '<td style=\'text-align: center\' class="eqsl">';
 			echo '<span ';
 			if ($qsl->COL_EQSL_QSL_SENT == "Y") {
-				echo "title=\"".lang('eqsl_short')." ".lang('general_word_sent');
+				echo "title=\"".__("eQSL")." ".__("Sent");
 				if ($qsl->COL_EQSL_QSLSDATE != null) {
 					$timestamp = strtotime($qsl->COL_EQSL_QSLSDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -140,7 +140,7 @@ if ($qsos->result() != NULL) {
 
 			echo '<span ';
 			if ($qsl->COL_EQSL_QSL_RCVD == "Y") {
-				echo "title=\"".lang('eqsl_short')." ".lang('general_word_received');
+				echo "title=\"".__("eQSL")." ".__("Received");
 				if ($qsl->COL_EQSL_QSLRDATE != null) {
 					$timestamp = strtotime($qsl->COL_EQSL_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -156,7 +156,7 @@ if ($qsos->result() != NULL) {
 			echo '<td style=\'text-align: center\' class="lotw">';
 			echo '<span ';
 			if ($qsl->COL_LOTW_QSL_SENT == "Y") {
-				echo "title=\"".lang('lotw_short')." ".lang('general_word_sent');
+				echo "title=\"".__("LoTW")." ".__("Sent");
 				if ($qsl->COL_LOTW_QSLSDATE != null) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLSDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -169,7 +169,7 @@ if ($qsos->result() != NULL) {
 
 			echo '<span ';
 			if ($qsl->COL_LOTW_QSL_RCVD == "Y") {
-				echo "title=\"".lang('lotw_short')." ".lang('general_word_received');
+				echo "title=\"".__("LoTW")." ".__("Received");
 				if ($qsl->COL_LOTW_QSLRDATE != null) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
diff --git a/application/views/public_search/result.php b/application/views/public_search/result.php
index 0297f8271..ed16f8456 100644
--- a/application/views/public_search/result.php
+++ b/application/views/public_search/result.php
@@ -10,10 +10,10 @@ if ($results) { ?>
     <table style="width:100%" id="publicsearchtable" class="publicsearchtable table table-sm table-striped table-hover">
         <thead>
             <tr class="titles">
-                <th><?php echo lang('general_word_date'); ?></th>
-                <th><?php echo lang('gen_hamradio_call'); ?></th>
-                <th><?php echo lang('gen_hamradio_mode'); ?></th>
-                <th><?php echo lang('gen_hamradio_band'); ?></th>
+                <th><?php echo __("Date"); ?></th>
+                <th><?php echo __("Call"); ?></th>
+                <th><?php echo __("Mode"); ?></th>
+                <th><?php echo __("Band"); ?></th>
                 <th>Station Callsign</th>
             </tr>
         </thead>
diff --git a/application/views/qrz/export.php b/application/views/qrz/export.php
index 87bc481f1..b6669384a 100644
--- a/application/views/qrz/export.php
+++ b/application/views/qrz/export.php
@@ -73,7 +73,7 @@
 					<p><span class="badge text-bg-warning">Warning</span> If no startdate is given then all QSOs after last confirmation will be downloaded/updated!</p>
 					<div class="row">
 						<div class="col-md-2">
-							<label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+							<label for="from"><?php echo __("From date") . ": " ?></label>
 							<input name="from" id="from" type="date" class="form-control w-auto">
 						</div>
 					</div>
@@ -94,12 +94,12 @@
 					<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
 					<div class="row">
 						<div class="col-md-2">
-							<label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+							<label for="from"><?php echo __("From date") . ": " ?></label>
 							<input name="from" id="from" type="date" class="form-control w-auto">
 						</div>
 
 						<div class="col-md-2">
-							<label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
+							<label for="to"><?php echo __("To date") . ": " ?></label>
 							<input name="to" id="to" type="date" class="form-control w-auto">
 						</div>
 					</div>
diff --git a/application/views/qslcard/index.php b/application/views/qslcard/index.php
index 0ba0e814b..82d886f36 100644
--- a/application/views/qslcard/index.php
+++ b/application/views/qslcard/index.php
@@ -2,12 +2,12 @@
 
     <br>
 
-    <h2><?php echo lang('general_word_qslcards'); ?></h2>
+    <h2><?php echo __("QSL Cards"); ?></h2>
 
     <?php $userdata_dir = $this->config->item('userdata');
     if (isset($userdata_dir)) { ?>
         <div class="alert alert-info" role="alert">
-            <?php echo lang('qslcard_string_your_are_using'); ?> <?php echo $storage_used; ?> <?php echo lang('qslcard_string_disk_space'); ?>
+            <?php echo __("You are using"); ?> <?php echo $storage_used; ?> <?php echo __("of disk space to store QSL Card assets"); ?>
         </div>
     <?php } ?>
 
@@ -25,12 +25,12 @@
         echo '<table style="width:100%" class="qsltable table table-sm table-bordered table-hover table-striped table-condensed">
         <thead>
         <tr>
-        <th style=\'text-align: center\'>'.lang('gen_hamradio_callsign').'</th>
-        <th style=\'text-align: center\'>'.lang('gen_hamradio_mode').'</th>
-        <th style=\'text-align: center\'>'.lang('general_word_date').'</th>
-        <th style=\'text-align: center\'>'.lang('general_word_time').'</th>
-        <th style=\'text-align: center\'>'.lang('gen_hamradio_band').'</th>
-        <th style=\'text-align: center\'>'.lang('gen_hamradio_qsl').' '.lang('general_word_date').'</th>
+        <th style=\'text-align: center\'>'.__("Callsign").'</th>
+        <th style=\'text-align: center\'>'.__("Mode").'</th>
+        <th style=\'text-align: center\'>'.__("Date").'</th>
+        <th style=\'text-align: center\'>'.__("Time").'</th>
+        <th style=\'text-align: center\'>'.__("Band").'</th>
+        <th style=\'text-align: center\'>'.__("QSL").' '.__("Date").'</th>
         <th style=\'text-align: center\'></th>
         <th style=\'text-align: center\'></th>
         <th style=\'text-align: center\'></th>
diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php
index 24d7d7fc5..6f82613bc 100644
--- a/application/views/qslcard/searchresult.php
+++ b/application/views/qslcard/searchresult.php
@@ -1,90 +1,90 @@
 <div class="table-responsive">
 	<table class="table table-sm table-striped table-hover">
 		<tr class="titles">
-			<td><?php echo lang('general_word_date'); ?></td>
+			<td><?php echo __("Date"); ?></td>
 			<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
-				<td><?php echo lang('general_word_time'); ?></td>
+				<td><?php echo __("Time"); ?></td>
 			<?php } ?>
-			<td><?php echo lang('gen_hamradio_call'); ?></td>
+			<td><?php echo __("Call"); ?></td>
 			<?php
 			echo '<td>';
 			switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
-				case 'Mode': echo lang('gen_hamradio_mode'); break;
-				case 'RSTS': echo lang('gen_hamradio_rsts'); break;
-				case 'RSTR': echo lang('gen_hamradio_rstr'); break;
-				case 'Country': echo lang('general_word_country'); break;
-				case 'IOTA': echo lang('gen_hamradio_iota'); break;
-				case 'SOTA': echo lang('gen_hamradio_sota'); break;
-				case 'State': echo lang('gen_hamradio_state'); break;
-				case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
-				case 'Distance': echo lang('gen_hamradio_distance'); break;
-				case 'Band': echo lang('gen_hamradio_band'); break;
-				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
-				case 'Operator': echo lang('gen_hamradio_operator'); break;
+				case 'Mode': echo __("Mode"); break;
+				case 'RSTS': echo __("RST (S)"); break;
+				case 'RSTR': echo __("RST (R)"); break;
+				case 'Country': echo __("Country"); break;
+				case 'IOTA': echo __("IOTA"); break;
+				case 'SOTA': echo __("SOTA"); break;
+				case 'State': echo __("State"); break;
+				case 'Grid': echo __("Gridsquare"); break;
+				case 'Distance': echo __("Distance"); break;
+				case 'Band': echo __("Band"); break;
+				case 'Frequency': echo __("Frequency"); break;
+				case 'Operator': echo __("Operator"); break;
 			}
 			echo '</td>';
 			echo '<td>';
 			switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
-				case 'Mode': echo lang('gen_hamradio_mode'); break;
-				case 'RSTS': echo lang('gen_hamradio_rsts'); break;
-				case 'RSTR': echo lang('gen_hamradio_rstr'); break;
-				case 'Country': echo lang('general_word_country'); break;
-				case 'IOTA': echo lang('gen_hamradio_iota'); break;
-				case 'SOTA': echo lang('gen_hamradio_sota'); break;
-				case 'State': echo lang('gen_hamradio_state'); break;
-				case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
-				case 'Distance': echo lang('gen_hamradio_distance'); break;
-				case 'Band': echo lang('gen_hamradio_band'); break;
-				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
-				case 'Operator': echo lang('gen_hamradio_band'); break;
+				case 'Mode': echo __("Mode"); break;
+				case 'RSTS': echo __("RST (S)"); break;
+				case 'RSTR': echo __("RST (R)"); break;
+				case 'Country': echo __("Country"); break;
+				case 'IOTA': echo __("IOTA"); break;
+				case 'SOTA': echo __("SOTA"); break;
+				case 'State': echo __("State"); break;
+				case 'Grid': echo __("Gridsquare"); break;
+				case 'Distance': echo __("Distance"); break;
+				case 'Band': echo __("Band"); break;
+				case 'Frequency': echo __("Frequency"); break;
+				case 'Operator': echo __("Band"); break;
 			}
 			echo '</td>';
 			echo '<td>';
 			switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
-				case 'Mode': echo lang('gen_hamradio_mode'); break;
-				case 'RSTS': echo lang('gen_hamradio_rsts'); break;
-				case 'RSTR': echo lang('gen_hamradio_rstr'); break;
-				case 'Country': echo lang('general_word_country'); break;
-				case 'IOTA': echo lang('gen_hamradio_iota'); break;
-				case 'SOTA': echo lang('gen_hamradio_sota'); break;
-				case 'State': echo lang('gen_hamradio_state'); break;
-				case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
-				case 'Distance': echo lang('gen_hamradio_distance'); break;
-				case 'Band': echo lang('gen_hamradio_band'); break;
-				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
-				case 'Operator': echo lang('gen_hamradio_operator'); break;
+				case 'Mode': echo __("Mode"); break;
+				case 'RSTS': echo __("RST (S)"); break;
+				case 'RSTR': echo __("RST (R)"); break;
+				case 'Country': echo __("Country"); break;
+				case 'IOTA': echo __("IOTA"); break;
+				case 'SOTA': echo __("SOTA"); break;
+				case 'State': echo __("State"); break;
+				case 'Grid': echo __("Gridsquare"); break;
+				case 'Distance': echo __("Distance"); break;
+				case 'Band': echo __("Band"); break;
+				case 'Frequency': echo __("Frequency"); break;
+				case 'Operator': echo __("Operator"); break;
 			}
 			echo '</td>';
 			echo '<td>';
 			switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
-				case 'Mode': echo lang('gen_hamradio_mode'); break;
-				case 'RSTS': echo lang('gen_hamradio_rsts'); break;
-				case 'RSTR': echo lang('gen_hamradio_rstr'); break;
-				case 'Country': echo lang('general_word_country'); break;
-				case 'IOTA': echo lang('gen_hamradio_iota'); break;
-				case 'SOTA': echo lang('gen_hamradio_sota'); break;
-				case 'State': echo lang('gen_hamradio_state'); break;
-				case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
-				case 'Distance': echo lang('gen_hamradio_distance'); break;
-				case 'Band': echo lang('gen_hamradio_band'); break;
-				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
-				case 'Operator': echo lang('gen_hamradio_operator'); break;
+				case 'Mode': echo __("Mode"); break;
+				case 'RSTS': echo __("RST (S)"); break;
+				case 'RSTR': echo __("RST (R)"); break;
+				case 'Country': echo __("Country"); break;
+				case 'IOTA': echo __("IOTA"); break;
+				case 'SOTA': echo __("SOTA"); break;
+				case 'State': echo __("State"); break;
+				case 'Grid': echo __("Gridsquare"); break;
+				case 'Distance': echo __("Distance"); break;
+				case 'Band': echo __("Band"); break;
+				case 'Frequency': echo __("Frequency"); break;
+				case 'Operator': echo __("Operator"); break;
 			}
 			echo '</td>';
 			echo '<td>';
 			switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
-				case 'Mode': echo lang('gen_hamradio_mode'); break;
-				case 'RSTS': echo lang('gen_hamradio_rsts'); break;
-				case 'RSTR': echo lang('gen_hamradio_rstr'); break;
-				case 'Country': echo lang('general_word_country'); break;
-				case 'IOTA': echo lang('gen_hamradio_iota'); break;
-				case 'SOTA': echo lang('gen_hamradio_sota'); break;
-				case 'State': echo lang('gen_hamradio_state'); break;
-				case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
-				case 'Distance': echo lang('gen_hamradio_distance'); break;
-				case 'Band': echo lang('gen_hamradio_band'); break;
-				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
-				case 'Operator': echo lang('gen_hamradio_operator'); break;
+				case 'Mode': echo __("Mode"); break;
+				case 'RSTS': echo __("RST (S)"); break;
+				case 'RSTR': echo __("RST (R)"); break;
+				case 'Country': echo __("Country"); break;
+				case 'IOTA': echo __("IOTA"); break;
+				case 'SOTA': echo __("SOTA"); break;
+				case 'State': echo __("State"); break;
+				case 'Grid': echo __("Gridsquare"); break;
+				case 'Distance': echo __("Distance"); break;
+				case 'Band': echo __("Band"); break;
+				case 'Frequency': echo __("Frequency"); break;
+				case 'Operator': echo __("Operator"); break;
 			}
 			echo '</td><td></td></tr>';
 
diff --git a/application/views/qslprint/index.php b/application/views/qslprint/index.php
index 69efcf1a1..363d74d2b 100644
--- a/application/views/qslprint/index.php
+++ b/application/views/qslprint/index.php
@@ -13,21 +13,21 @@
 
 	<div class="card">
 	  <div class="card-header">
-	    <?php echo lang('qslcard_qslprint_header'); ?>
+	    <?php echo __("Export Requested QSLs for Printing"); ?>
 	  </div>
 		<div class="card-body">
 			<form class="form" action="<?php echo site_url('adif/import'); ?>" method="post" enctype="multipart/form-data">
-				<?php echo lang('wavelog_station_profile'); ?>:
+				<?php echo __("Station Location"); ?>:
 				<select name="station_profile" class="station_id form-select mb-3 me-sm-3" style="width: 20%;">
-					<option value="All"><?php echo lang('general_word_all'); ?></option>
+					<option value="All"><?php echo __("All"); ?></option>
 					<?php foreach ($station_profile->result() as $station) { ?>
-						<option <?php if ($station->station_id == $station_id) { echo "selected "; } ?>value="<?php echo $station->station_id; ?>"><?php echo lang('gen_hamradio_callsign'); ?>: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+						<option <?php if ($station->station_id == $station_id) { echo "selected "; } ?>value="<?php echo $station->station_id; ?>"><?php echo __("Callsign"); ?>: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 					<?php } ?>
 				</select>
 			</form>
 
-	    <p class="card-text"><?php echo lang('qslcard_qslprint_text_line1'); ?></p>
-	    <p class="card-text"><?php echo lang('qslcard_qslprint_text_line2'); ?></p>
+	    <p class="card-text"><?php echo __("Here you can export requested QSLs as CSV or ADIF files for printing and, optionally, mark them as sent."); ?></p>
+	    <p class="card-text"><?php echo __("Requested QSLs are any QSOs with a value of 'Requested' or 'Queued' in their 'QSL Sent' field."); ?></p>
 
 		<div class="resulttable">
 		<?php 
diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php
index 9ca5b7320..886f4e497 100644
--- a/application/views/qslprint/qslprint.php
+++ b/application/views/qslprint/qslprint.php
@@ -2,9 +2,9 @@
 
 function echo_qsl_sent_via($method) {
 	switch($method) {
-		case 'B': echo lang('general_word_qslcard_bureau'); break;
-		case 'D': echo lang('general_word_qslcard_direct'); break;
-		case 'E': echo lang('general_word_qslcard_electronic'); break;
+		case 'B': echo __("Bureau"); break;
+		case 'D': echo __("Direct"); break;
+		case 'E': echo __("Electronic"); break;
 	}
 }
 
@@ -18,19 +18,19 @@ if ($qsos->result() != NULL) {
 <thead>
 <tr>
 <th style=\'text-align: center\'><div class="form-check" style="margin-top: -1.5em"><input class="form-check-input" type="checkbox" id="checkBoxAll" /></div></th>
-<th style=\'text-align: center\'>'.lang('gen_hamradio_callsign').'</th>
-<th style=\'text-align: center\'>' . lang('general_word_date') . '</th>
-<th style=\'text-align: center\'>'. lang('general_word_time') .'</th>
-<th style=\'text-align: center\'>' . lang('gen_hamradio_mode') . '</th>
-<th style=\'text-align: center\'>' . lang('gen_hamradio_band') . '</th>
-<th style=\'text-align: center\'>' . lang('gen_hamradio_rsts') . '</th>
-<th style=\'text-align: center\'>' . lang('gen_hamradio_rstr') . '</th>
-<th style=\'text-align: center\'>' . lang('gen_hamradio_qsl') . ' ' . lang('general_word_qslcard_via') . '</th>
-<th style=\'text-align: center\'>' . lang('gen_hamradio_station') . '</th>
-<th style=\'text-align: center\'>' . lang('qslcard_qslprint_send_method') . '</th>
-<th style=\'text-align: center\'>' . lang('qslcard_qslprint_mark_as_sent') . '</th>
-<th style=\'text-align: center\'>' . lang('admin_remove') . '</th>
-<th style=\'text-align: center\'>' . lang('qso_simplefle_qso_list') . '</th>
+<th style=\'text-align: center\'>'.__("Callsign").'</th>
+<th style=\'text-align: center\'>' . __("Date") . '</th>
+<th style=\'text-align: center\'>'. __("Time") .'</th>
+<th style=\'text-align: center\'>' . __("Mode") . '</th>
+<th style=\'text-align: center\'>' . __("Band") . '</th>
+<th style=\'text-align: center\'>' . __("RST (S)") . '</th>
+<th style=\'text-align: center\'>' . __("RST (R)") . '</th>
+<th style=\'text-align: center\'>' . __("QSL") . ' ' . __("Via") . '</th>
+<th style=\'text-align: center\'>' . __("Station") . '</th>
+<th style=\'text-align: center\'>' . __("Send Method") . '</th>
+<th style=\'text-align: center\'>' . __("Mark as sent") . '</th>
+<th style=\'text-align: center\'>' . __("Remove") . '</th>
+<th style=\'text-align: center\'>' . __("QSO List") . '</th>
 </tr>
 </thead><tbody>';
 
@@ -64,18 +64,18 @@ if ($qsos->result() != NULL) {
 	echo '</tbody></table></div>';
 	?>
 
-	<p><button onclick="markSelectedQsos();" title="Mark selected QSOs as printed" class="btn btn-success markallprinted"><?php echo lang('qslcard_qslprint_mark_selected_as_printed'); ?></button>
+	<p><button onclick="markSelectedQsos();" title="Mark selected QSOs as printed" class="btn btn-success markallprinted"><?php echo __("Mark selected QSOs as printed"); ?></button>
 
-	<button onclick="removeSelectedQsos();" title="Remove seleced QSOS from print queue" class="btn btn-danger removeall"><?php echo lang('qslcard_qslprint_remove_selected_from_queue'); ?></button></p>
+	<button onclick="removeSelectedQsos();" title="Remove seleced QSOS from print queue" class="btn btn-danger removeall"><?php echo __("Remove selected QSOs from the queue"); ?></button></p>
 
-	<p><a href="<?php echo site_url('qslprint/exportcsv/' . $station_id); ?>" title="Export CSV-file" class="btn btn-primary"><?php echo lang('qslcard_qslprint_export_csv'); ?></a>
+	<p><a href="<?php echo site_url('qslprint/exportcsv/' . $station_id); ?>" title="Export CSV-file" class="btn btn-primary"><?php echo __("Export requested QSLs to CSV-file"); ?></a>
 
-	<a href="<?php echo site_url('qslprint/exportadif/' . $station_id); ?>" title="Export ADIF" class="btn btn-primary"><?php echo lang('qslcard_qslprint_export_adif'); ?></a>
+	<a href="<?php echo site_url('qslprint/exportadif/' . $station_id); ?>" title="Export ADIF" class="btn btn-primary"><?php echo __("Export requested QSLs to ADIF-file"); ?></a>
 
-	<a href="<?php echo site_url('qslprint/qsl_printed/' . $station_id); ?>" title="Mark QSLs as printed" class="btn btn-primary"><?php echo lang('qslcard_qslprint_mark_requested_as_sent'); ?></a></p>
+	<a href="<?php echo site_url('qslprint/qsl_printed/' . $station_id); ?>" title="Mark QSLs as printed" class="btn btn-primary"><?php echo __("Mark requested QSLs as sent"); ?></a></p>
 
 <?php
 } else {
-	echo '<div class="alert alert-danger">' . lang('qslcard_qslprint_no_qsls_found') . '</div>';
+	echo '<div class="alert alert-danger">' . __("No QSLs to print were found!") . '</div>';
 }
 ?>
diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php
index 8198764a2..4a59defee 100644
--- a/application/views/qslprint/qsolist.php
+++ b/application/views/qslprint/qsolist.php
@@ -3,22 +3,22 @@ if ($qsos->result() != NULL) {
 	echo '<table style="width:100%" class="qsolist table-sm table-bordered table-hover table-striped table-condensed">
 	<thead>
 	<tr>
-	<th style=\'text-align: center\'>'.lang('gen_hamradio_callsign').'</th>
-	<th style=\'text-align: center\'>' . lang('general_word_date') . '</th>
-	<th style=\'text-align: center\'>'. lang('general_word_time') .'</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_mode') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_band') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_rsts') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_rstr') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_station') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_qsl') . ' ' . lang('general_word_qslcard_via') . '</th>
-	<th style=\'text-align: center\'>' . lang('qslcard_qslprint_send_method') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_qsl') . '</th>';
+	<th style=\'text-align: center\'>'.__("Callsign").'</th>
+	<th style=\'text-align: center\'>' . __("Date") . '</th>
+	<th style=\'text-align: center\'>'. __("Time") .'</th>
+	<th style=\'text-align: center\'>' . __("Mode") . '</th>
+	<th style=\'text-align: center\'>' . __("Band") . '</th>
+	<th style=\'text-align: center\'>' . __("RST (S)") . '</th>
+	<th style=\'text-align: center\'>' . __("RST (R)") . '</th>
+	<th style=\'text-align: center\'>' . __("Station") . '</th>
+	<th style=\'text-align: center\'>' . __("QSL") . ' ' . __("Via") . '</th>
+	<th style=\'text-align: center\'>' . __("Send Method") . '</th>
+	<th style=\'text-align: center\'>' . __("QSL") . '</th>';
 	if ($this->session->userdata('user_eqsl_name') != "") {
-		echo '<th style=\'text-align: center\'>' . lang('eqsl_short') . '</th>';
+		echo '<th style=\'text-align: center\'>' . __("eQSL") . '</th>';
 	}
 	if($this->session->userdata('user_lotw_name') != "") {
-		echo '<th style=\'text-align: center\'>' . lang('lotw_short') . '</th>';
+		echo '<th style=\'text-align: center\'>' . __("LoTW") . '</th>';
 	}
 	echo '<th style=\'text-align: center\'></th>
 	</tr>
@@ -55,16 +55,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_SENT) {
 			case "Y":
-				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_sent').$timestamp;
+				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Sent").$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp;
 				break;
 			default:
 				echo "class=\"qsl-red";
@@ -74,16 +74,16 @@ if ($qsos->result() != NULL) {
 		if ($qsl->COL_QSL_SENT_VIA != "") {
 			switch ($qsl->COL_QSL_SENT_VIA) {
 			case "B":
-				echo " (".lang('general_word_qslcard_bureau').")";
+				echo " (".__("Bureau").")";
 				break;
 			case "D":
-				echo " (".lang('general_word_qslcard_direct').")";
+				echo " (".__("Direct").")";
 				break;
 			case "M":
-				echo " (".lang('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")";
+				echo " (".__("Via").": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")";
 				break;
 			case "E":
-				echo " (".lang('general_word_qslcard_electronic').")";
+				echo " (".__("Electronic").")";
 				break;
 			}
 		}
@@ -97,16 +97,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_RCVD) {
 			case "Y":
-				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_received').$timestamp;
+				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Received").$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp;
 				break;
 			default:
 				echo "class=\"qsl-red";
@@ -116,16 +116,16 @@ if ($qsos->result() != NULL) {
 		if ($qsl->COL_QSL_RCVD_VIA != "") {
 			switch ($qsl->COL_QSL_RCVD_VIA) {
 			case "B":
-				echo " (".lang('general_word_qslcard_bureau').")";
+				echo " (".__("Bureau").")";
 				break;
 			case "D":
-				echo " (".lang('general_word_qslcard_direct').")";
+				echo " (".__("Direct").")";
 				break;
 			case "M":
-				echo " (".lang('general_word_qslcard_manager').")";
+				echo " (".__("Manager").")";
 				break;
 			case "E":
-				echo " (".lang('general_word_qslcard_electronic').")";
+				echo " (".__("Electronic").")";
 				break;
 			}
 		}
@@ -135,7 +135,7 @@ if ($qsos->result() != NULL) {
 			echo '<td style=\'text-align: center\' class="eqsl">';
 			echo '<span ';
 			if ($qsl->COL_EQSL_QSL_SENT == "Y") {
-				echo "title=\"".lang('eqsl_short')." ".lang('general_word_sent');
+				echo "title=\"".__("eQSL")." ".__("Sent");
 				if ($qsl->COL_EQSL_QSLSDATE != null) {
 					$timestamp = strtotime($qsl->COL_EQSL_QSLSDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -148,7 +148,7 @@ if ($qsos->result() != NULL) {
 
 			echo '<span ';
 			if ($qsl->COL_EQSL_QSL_RCVD == "Y") {
-				echo "title=\"".lang('eqsl_short')." ".lang('general_word_received');
+				echo "title=\"".__("eQSL")." ".__("Received");
 				if ($qsl->COL_EQSL_QSLRDATE != null) {
 					$timestamp = strtotime($qsl->COL_EQSL_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -164,7 +164,7 @@ if ($qsos->result() != NULL) {
 			echo '<td style=\'text-align: center\' class="lotw">';
 			echo '<span ';
 			if ($qsl->COL_LOTW_QSL_SENT == "Y") {
-				echo "title=\"".lang('lotw_short')." ".lang('general_word_sent');
+				echo "title=\"".__("LoTW")." ".__("Sent");
 				if ($qsl->COL_LOTW_QSLSDATE != null) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLSDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -177,7 +177,7 @@ if ($qsos->result() != NULL) {
 
 			echo '<span ';
 			if ($qsl->COL_LOTW_QSL_RCVD == "Y") {
-				echo "title=\"".lang('lotw_short')." ".lang('general_word_received');
+				echo "title=\"".__("LoTW")." ".__("Received");
 				if ($qsl->COL_LOTW_QSLRDATE) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -189,7 +189,7 @@ if ($qsos->result() != NULL) {
 			echo '">&#9660;</span>';
 			echo '</td>';
 		}
-		echo '<td id="'.$qsl->COL_PRIMARY_KEY.'" style=\'text-align: center\'><button onclick="addQsoToPrintQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-success">' . lang('qslcard_qslprint_add_to_queue') . '</button></td>';
+		echo '<td id="'.$qsl->COL_PRIMARY_KEY.'" style=\'text-align: center\'><button onclick="addQsoToPrintQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-success">' . __("Add to print queue") . '</button></td>';
 		echo '</tr>';
 	}
 
@@ -198,14 +198,14 @@ if ($qsos->result() != NULL) {
 
 	<?php
 } else {
-	echo '<div class="alert alert-danger">' . lang('qslcard_qslprint_no_additional_qso_found') . '</div>';
+	echo '<div class="alert alert-danger">' . __("No additional QSO's were found. That means they are probably already in the queue.") . '</div>';
 }
 
 function echo_qsl_sent_via($method) {
 	switch($method) {
-		case 'B': echo lang('general_word_qslcard_bureau'); break;
-		case 'D': echo lang('general_word_qslcard_direct'); break;
-		case 'E': echo lang('general_word_qslcard_electronic'); break;
+		case 'B': echo __("Bureau"); break;
+		case 'D': echo __("Direct"); break;
+		case 'E': echo __("Electronic"); break;
 	}
 }
 ?>
diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php
index 283818269..1331fa153 100644
--- a/application/views/qso/components/previous_contacts.php
+++ b/application/views/qso/components/previous_contacts.php
@@ -3,8 +3,8 @@
 <div class="table-responsive" style="font-size: 0.95rem;">
   <table class="table table-striped">
     <tr class="log_title titles">
-      <th><?php echo lang('general_word_date'); ?>/<?php echo lang('general_word_time'); ?></th>
-	<th><?php echo lang('gen_hamradio_call'); ?></th>
+      <th><?php echo __("Date"); ?>/<?php echo __("Time"); ?></th>
+	<th><?php echo __("Call"); ?></th>
 	<?php
 	echo_table_header_col($this, $this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1'));
 	echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2'));
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index 215564831..94c0eb781 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -226,7 +226,7 @@
                                                 }
                                                 echo '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
                                                 if ($d->Enddate != null) {
-                                                    echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
+                                                    echo ' ('.__("Deleted DXCC").')';
                                                 }
                                                 echo '</option>';
                                             }
@@ -235,16 +235,16 @@
                                         </select>
                                     </div>
                                     <div class="mb-3 col-sm-6">
-                                        <label for="continent"><?php echo lang('gen_hamradio_continent'); ?></label>
+                                        <label for="continent"><?php echo __("Continent"); ?></label>
                                         <select class="form-select" id="continent" name="continent">
                                             <option value=""></option>
-                                            <option value="AF" <?php if($qso->COL_CONT == "AF") { echo "selected=\"selected\""; } ?>><?php echo lang('africa'); ?></option>
-                                            <option value="AN" <?php if($qso->COL_CONT == "AN") { echo "selected=\"selected\""; } ?>><?php echo lang('antarctica'); ?></option>
-                                            <option value="AS" <?php if($qso->COL_CONT == "AS") { echo "selected=\"selected\""; } ?>><?php echo lang('asia'); ?></option>
-                                            <option value="EU" <?php if($qso->COL_CONT == "EU") { echo "selected=\"selected\""; } ?>><?php echo lang('europe'); ?></option>
-                                            <option value="NA" <?php if($qso->COL_CONT == "NA") { echo "selected=\"selected\""; } ?>><?php echo lang('northamerica'); ?></option>
-                                            <option value="OC" <?php if($qso->COL_CONT == "OC") { echo "selected=\"selected\""; } ?>><?php echo lang('oceania'); ?></option>
-                                            <option value="SA" <?php if($qso->COL_CONT == "SA") { echo "selected=\"selected\""; } ?>><?php echo lang('southamerica'); ?></option>
+                                            <option value="AF" <?php if($qso->COL_CONT == "AF") { echo "selected=\"selected\""; } ?>><?php echo __("Africa"); ?></option>
+                                            <option value="AN" <?php if($qso->COL_CONT == "AN") { echo "selected=\"selected\""; } ?>><?php echo __("Antarctica"); ?></option>
+                                            <option value="AS" <?php if($qso->COL_CONT == "AS") { echo "selected=\"selected\""; } ?>><?php echo __("Asia"); ?></option>
+                                            <option value="EU" <?php if($qso->COL_CONT == "EU") { echo "selected=\"selected\""; } ?>><?php echo __("Europe"); ?></option>
+                                            <option value="NA" <?php if($qso->COL_CONT == "NA") { echo "selected=\"selected\""; } ?>><?php echo __("North America"); ?></option>
+                                            <option value="OC" <?php if($qso->COL_CONT == "OC") { echo "selected=\"selected\""; } ?>><?php echo __("Oceania"); ?></option>
+                                            <option value="SA" <?php if($qso->COL_CONT == "SA") { echo "selected=\"selected\""; } ?>><?php echo __("South America"); ?></option>
                                         </select>
                                     </div>
                                 </div>
@@ -473,11 +473,11 @@
                                         <div class="mb-3 row">
                                             <div>
                                                 <div class="alert alert-info" role="alert">
-                                                    <span class="badge text-bg-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
+                                                    <span class="badge text-bg-info"><?php echo __("Info"); ?></span> <?php echo __("This note content is exported to QSL services like eqsl.cc."); ?>
                                                 </div>
                                             </div>
                                             <div>
-                                                <label for="qslmsg"><?php echo lang('general_word_notes'); ?><span class="qso_eqsl_qslmsg_update" title="<?php echo lang('qso_eqsl_qslmsg_helptext'); ?>"><i class="fas fa-redo-alt"></i></span></label>
+                                                <label for="qslmsg"><?php echo __("Notes"); ?><span class="qso_eqsl_qslmsg_update" title="<?php echo __("Get the default message for eQSL, for this station."); ?>"><i class="fas fa-redo-alt"></i></span></label>
 						                        <label class="position-absolute end-0 mb-2 me-3" for="qslmsg" id="charsLeft"> </label>
                                                 <textarea  type="text" class="form-control" id="qslmsg" name="qslmsg" rows="5" maxlength="240"><?php echo $qso->COL_QSLMSG; ?></textarea>
                                                 <div id="qslmsg_hide" style="display:none;"><?php echo $qso->COL_QSLMSG; ?></div>
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index f28f6ed8a..b1795b753 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -1,10 +1,10 @@
 <div class="container qso_panel">
 <script language="javascript">
   var qso_manual  = "<?php echo $_GET['manual']; ?>";
-  var text_error_timeoff_less_timeon = "<?php echo lang('qso_error_timeoff_less_timeon'); ?>";
-  var lang_qso_title_previous_contacts = "<?php echo lang('qso_title_previous_contacts'); ?>";
-  var lang_qso_title_times_worked_before = "<?php echo lang('qso_title_times_worked_before'); ?>";
-  var lang_qso_title_not_worked_before = "<?php echo lang('qso_title_not_worked_before'); ?>";
+  var text_error_timeoff_less_timeon = "<?php echo __("TimeOff is less than TimeOn"); ?>";
+  var lang_qso_title_previous_contacts = "<?php echo __("Previous Contacts"); ?>";
+  var lang_qso_title_times_worked_before = "<?php echo __("times worked before"); ?>";
+  var lang_qso_title_not_worked_before = "<?php echo __("Not worked before"); ?>";
 </script>
 
 <div class="row qsopane">
@@ -17,35 +17,35 @@
       <div class="card-header">
         <ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right"  id="myTab" role="tablist">
           <li class="nav-item">
-            <a class="nav-link active" id="qsp-tab" data-bs-toggle="tab" href="#qso" role="tab" aria-controls="qso" aria-selected="true"><?php echo lang('gen_hamradio_qso'); ?><?php if ($_GET['manual'] == 0) { echo " <span class=\"badge text-bg-success\">LIVE</span>"; }; if ($_GET['manual'] == 1) { echo " <span class=\"badge text-bg-danger\">POST</span>"; } ?></a>
+            <a class="nav-link active" id="qsp-tab" data-bs-toggle="tab" href="#qso" role="tab" aria-controls="qso" aria-selected="true"><?php echo __("QSO"); ?><?php if ($_GET['manual'] == 0) { echo " <span class=\"badge text-bg-success\">LIVE</span>"; }; if ($_GET['manual'] == 1) { echo " <span class=\"badge text-bg-danger\">POST</span>"; } ?></a>
           </li>
 
           <li class="nav-item">
-            <a class="nav-link" id="station-tab" data-bs-toggle="tab" href="#station" role="tab" aria-controls="station" aria-selected="false"><?php echo lang('gen_hamradio_station'); ?></a>
+            <a class="nav-link" id="station-tab" data-bs-toggle="tab" href="#station" role="tab" aria-controls="station" aria-selected="false"><?php echo __("Station"); ?></a>
           </li>
 
           <li class="nav-item">
-            <a class="nav-link" id="general-tab" data-bs-toggle="tab" href="#general" role="tab" aria-controls="general" aria-selected="false"><?php echo lang('general_word_general'); ?></a>
+            <a class="nav-link" id="general-tab" data-bs-toggle="tab" href="#general" role="tab" aria-controls="general" aria-selected="false"><?php echo __("General"); ?></a>
           </li>
 
 <?php if ($sat_active) { ?>
           <li class="nav-item">
-            <a class="nav-link" id="satellite-tab" data-bs-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false"><?php echo lang('general_word_satellite_short'); ?></a>
+            <a class="nav-link" id="satellite-tab" data-bs-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false"><?php echo __("Sat"); ?></a>
           </li>
 <?php } ?>
 
           <li class="nav-item">
-            <a class="nav-link" id="notes-tab" data-bs-toggle="tab" href="#nav-notes" role="tab" aria-controls="notes" aria-selected="false"><?php echo lang('general_word_notes'); ?></a>
+            <a class="nav-link" id="notes-tab" data-bs-toggle="tab" href="#nav-notes" role="tab" aria-controls="notes" aria-selected="false"><?php echo __("Notes"); ?></a>
           </li>
 
           <li class="nav-item">
-            <a class="nav-link" id="qsl-tab" data-bs-toggle="tab" href="#qsl" role="tab" aria-controls="qsl" aria-selected="false"><?php echo lang('gen_hamradio_qsl'); ?></a>
+            <a class="nav-link" id="qsl-tab" data-bs-toggle="tab" href="#qsl" role="tab" aria-controls="qsl" aria-selected="false"><?php echo __("QSL"); ?></a>
           </li>
 
   <li class="nav-item dropdown">
     <a class="nav-link dropdown-toggle" id="fav_item" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-star"></i></a>
     <div class="dropdown-menu">
-      <a class="dropdown-item" href="#" id="fav_add"><?php echo lang('fav_add'); ?></a>
+      <a class="dropdown-item" href="#" id="fav_add"><?php echo __("Add Band/Mode to Favs"); ?></a>
       <div class="dropdown-divider"></div>
       <div id="fav_menu"></div>
     </div>
@@ -61,12 +61,12 @@
               <?php if ($this->session->userdata('user_qso_end_times')  == 1) { ?>
               <div class="row">
                 <div class="mb-3 col-md-3">
-                  <label for="start_date"><?php echo lang('general_word_date'); ?></label>
+                  <label for="start_date"><?php echo __("Date"); ?></label>
                   <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-3][0-9]-[0-1][0-9]-[0-9]{4}">
                 </div>
 
                 <div class="mb-3 col-md-4">
-                <label for="start_time"><?php echo lang('general_word_time_on'); ?></label>
+                <label for="start_time"><?php echo __("Time on"); ?></label>
                   <div class="input-group">
                     <input type="text" class="form-control form-control-sm input_start_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo substr($this->session->userdata('start_time'),0,5); } else { echo $_GET['manual'] == 0 ? date('H:i:s') : date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-2][0-9]:[0-5][0-9]">
                     <?php if ($_GET['manual'] != 1) { ?>
@@ -78,7 +78,7 @@
                 </div>
 
                 <div class="mb-3 col-md-4">
-                  <label for="end_time"><?php echo lang('general_word_time_off'); ?></label>
+                  <label for="end_time"><?php echo __("Time off"); ?></label>
                   <div class="input-group">
                     <input type="text" class="form-control form-control-sm input_end_time" name="end_time" id="end_time" value="<?php if (($this->session->userdata('end_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo substr($this->session->userdata('end_time'),0,5); } else { echo $_GET['manual'] == 0 ? date('H:i:s') : date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-2][0-9]:[0-5][0-9]">
                     <?php if ($_GET['manual'] == 1) { ?>
@@ -97,12 +97,12 @@
               <?php } else {?>
               <div class="row">
                 <div class="mb-3 col-md-6">
-                  <label for="start_date"><?php echo lang('general_word_date'); ?></label>
+                  <label for="start_date"><?php echo __("Date"); ?></label>
                   <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-3][0-9]-[0-1][0-9]-[0-9]{4}">
                 </div>
 
                 <div class="mb-3 col-md-6">
-                  <label for="start_time"><?php echo lang('general_word_time'); ?></label>
+                  <label for="start_time"><?php echo __("Time"); ?></label>
                   <div class="input-group">
                     <input type="text" class="form-control form-control-sm input_start_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo substr($this->session->userdata('start_time'),0,5); } else { echo $_GET['manual'] == 0 ? date('H:i:s') : date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-2][0-9]:[0-5][0-9]">
                     <?php if ($_GET['manual'] == 1) { ?>
@@ -121,7 +121,7 @@
               <!-- Callsign Input -->
               <div class="row">
                 <div class="mb-3 col-md-12">
-                  <label for="callsign"><?php echo lang('gen_hamradio_callsign'); ?></label>&nbsp;<i id="check_cluster" data-bs-toggle="tooltip" title="Search DXCluster for latest Spot" class="fas fa-search"></i>
+                  <label for="callsign"><?php echo __("Callsign"); ?></label>&nbsp;<i id="check_cluster" data-bs-toggle="tooltip" title="Search DXCluster for latest Spot" class="fas fa-search"></i>
                   <div class="input-group">
                     <input tabindex="1" type="text" class="form-control" id="callsign" name="callsign" required>
                     <span id="qrz_info" class="input-group-text btn-included-on-field d-none py-0"></span>
@@ -133,7 +133,7 @@
 
               <div class="row">
                 <div class="mb-3 col">
-                  <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+                  <label for="mode"><?php echo __("Mode"); ?></label>
                   <select id="mode" class="form-select mode form-select-sm" name="mode">
                   <?php
                       foreach($modes->result() as $mode){
@@ -148,7 +148,7 @@
                 </div>
 
                 <div class="mb-3 col">
-                  <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+                  <label for="band"><?php echo __("Band"); ?></label>
 
                   <select id="band" class="form-select form-select-sm" name="band">
                   <?php foreach($bands as $key=>$bandgroup) {
@@ -166,7 +166,7 @@
                   </select>
                 </div>
                 <div class="mb-3 col">
-                  <label for="frequency"><?php echo lang('gen_hamradio_frequency'); ?></label>
+                  <label for="frequency"><?php echo __("Frequency"); ?></label>
                   <input type="text" class="form-control form-control-sm" id="frequency" name="freq_display" value="<?php echo $this->session->userdata('freq'); ?>" />
                 </div>
               </div>
@@ -174,18 +174,18 @@
               <!-- Signal Report Information -->
               <div class="row">
                 <div class="mb-3 col-md-6">
-                  <label for="rst_sent"><?php echo lang('gen_hamradio_rsts'); ?></label>
+                  <label for="rst_sent"><?php echo __("RST (S)"); ?></label>
                   <input tabindex="2" type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="59">
                 </div>
 
                 <div class="mb-3 col-md-6">
-                  <label for="rst_rcvd"><?php echo lang('gen_hamradio_rstr'); ?></label>
+                  <label for="rst_rcvd"><?php echo __("RST (R)"); ?></label>
                   <input tabindex="3" type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="59">
                 </div>
               </div>
 
               <div class="mb-3 row">
-                  <label for="name" class="col-sm-3 col-form-label"><?php echo lang('general_word_name'); ?></label>
+                  <label for="name" class="col-sm-3 col-form-label"><?php echo __("Name"); ?></label>
                   <div class="col-sm-9">
                     <input tabindex="4" type="text" class="form-control form-control-sm" name="name" id="name" maxlength="128" value="">
                 </div>
@@ -193,7 +193,7 @@
 
               <?php if ($user_iota_to_qso_tab ?? false) { ?>
               <div class="mb-3 row">
-                <label class="col-sm-3 col-form-label" for="iota_ref"><?php echo lang('gen_hamradio_iota_reference'); ?></label>
+                <label class="col-sm-3 col-form-label" for="iota_ref"><?php echo __("IOTA Reference"); ?></label>
                       <div class="col-sm-9 align-self-center">
                       <select class="form-select" id="iota_ref" name="iota_ref">
                           <option value =""></option>
@@ -209,7 +209,7 @@
 
               <?php if ($user_sota_to_qso_tab ?? false) { ?>
               <div class="mb-3 row">
-                <label class="col-sm-3 col-form-label" for="sota_ref"><?php echo lang('gen_hamradio_sota_reference'); ?></label>
+                <label class="col-sm-3 col-form-label" for="sota_ref"><?php echo __("SOTA Reference"); ?></label>
                 <div class="col-sm-7 align-self-center">
                   <input class="form-control" id="sota_ref" type="text" name="sota_ref" value="" />
                 </div>
@@ -221,7 +221,7 @@
 
               <?php if ($user_wwff_to_qso_tab ?? false) { ?>
               <div class="mb-3 row">
-                <label class="col-sm-3 col-form-label" for="wwff_ref"><?php echo lang('gen_hamradio_wwff_reference'); ?></label>
+                <label class="col-sm-3 col-form-label" for="wwff_ref"><?php echo __("WWFF Reference"); ?></label>
                 <div class="col-sm-7 align-self-center">
                   <input class="form-control" id="wwff_ref" type="text" name="wwff_ref" value="" />
                 </div>
@@ -233,7 +233,7 @@
 
               <?php if ($user_pota_to_qso_tab ?? false) { ?>
               <div class="mb-3 row">
-                <label class="col-sm-3 col-form-label" for="pota_ref"><?php echo lang('gen_hamradio_pota_reference'); ?></label>
+                <label class="col-sm-3 col-form-label" for="pota_ref"><?php echo __("POTA Reference(s)"); ?></label>
                 <div class="col-sm-7 align-self-center">
                   <input class="form-control" id="pota_ref" type="text" name="pota_ref" value="" />
                 </div>
@@ -245,14 +245,14 @@
 
               <?php if ($user_sig_to_qso_tab ?? false) { ?>
               <div class="mb-3 row">
-                <label class="col-sm-3 col-form-label" for="sig"><?php echo lang('gen_hamradio_sig'); ?></label>
+                <label class="col-sm-3 col-form-label" for="sig"><?php echo __("Sig"); ?></label>
                 <div class="col-sm-9">
                   <input class="form-control" id="sig" type="text" name="sig" value="" />
                 </div>
               </div>
 
               <div class="mb-3 row">
-                <label class="col-sm-3 col-form-label" for="sig_info"><?php echo lang('gen_hamradio_sig_info'); ?></label>
+                <label class="col-sm-3 col-form-label" for="sig_info"><?php echo __("Sig Info"); ?></label>
                 <div class="col-sm-9">
                   <input class="form-control" id="sig_info" type="text" name="sig_info" value="" />
                 </div>
@@ -261,7 +261,7 @@
 
               <?php if ($user_dok_to_qso_tab ?? false) { ?>
               <div class="mb-3 row">
-                <label class="col-sm-3 col-form-label" for="darc_dok"><?php echo lang('gen_hamradio_dok'); ?></label>
+                <label class="col-sm-3 col-form-label" for="darc_dok"><?php echo __("DOK"); ?></label>
                 <div class="col-sm-9">
                   <input class="form-control" id="darc_dok" type="text" name="darc_dok" value="" />
                 </div>
@@ -269,14 +269,14 @@
               <?php } ?>
 
               <div class="mb-3 row">
-                <label for="qth" class="col-sm-3 col-form-label"><?php echo lang('general_word_location'); ?></label>
+                <label for="qth" class="col-sm-3 col-form-label"><?php echo __("Location"); ?></label>
                 <div class="col-sm-9">
                     <input tabindex="5" type="text" class="form-control form-control-sm" name="qth" id="qth" maxlength="64" value="">
                 </div>
               </div>
 
               <div class="mb-3 row">
-                  <label for="locator" class="col-sm-3 col-form-label"><?php echo lang('gen_hamradio_gridsquare'); ?></label>
+                  <label for="locator" class="col-sm-3 col-form-label"><?php echo __("Gridsquare"); ?></label>
                   <div class="col-sm-9">
                     <input tabindex="6" type="text" class="form-control form-control-sm" name="locator" id="locator" value="">
                     <small id="locator_info" class="form-text text-muted"></small>
@@ -286,7 +286,7 @@
               <input type="hidden" name="distance" id="distance" value="0">
 
               <div class="mb-3 row">
-                  <label for="comment" class="col-sm-3 col-form-label"><?php echo lang('general_word_comment'); ?></label>
+                  <label for="comment" class="col-sm-3 col-form-label"><?php echo __("Comment"); ?></label>
                   <div class="col-sm-9">
                     <input tabindex="7"type="text" class="form-control form-control-sm" name="comment" id="comment" value="">
                 </div>
@@ -297,7 +297,7 @@
           <!-- Station Panel Data -->
           <div class="tab-pane fade" id="station" role="tabpanel" aria-labelledby="station-tab">
             <div class="mb-3">
-              <label for="stationProfile"><?php echo lang('wavelog_station_profile'); ?></label>
+              <label for="stationProfile"><?php echo __("Station Location"); ?></label>
               <select id="stationProfile" class="form-select" name="station_profile">
                 <?php
                    $power = '';
@@ -309,9 +309,9 @@
             </div>
 
             <div class="mb-3">
-              <label for="radio"><?php echo lang('gen_hamradio_radio'); ?></label>
+              <label for="radio"><?php echo __("Radio"); ?></label>
               <select class="form-select radios" id="radio" name="radio">
-                <option value="0" selected="selected"><?php echo lang('general_word_none'); ?></option>
+                <option value="0" selected="selected"><?php echo __("None"); ?></option>
                 <?php foreach ($radios->result() as $row) { ?>
                 <option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
                 <?php } ?>
@@ -319,12 +319,12 @@
             </div>
 
             <div class="mb-3">
-              <label for="frequency_rx"><?php echo lang('gen_hamradio_frequency_rx'); ?></label>
+              <label for="frequency_rx"><?php echo __("Frequency (RX)"); ?></label>
               <input type="text" class="form-control" id="frequency_rx" name="freq_display_rx" value="<?php echo $this->session->userdata('freq_rx'); ?>" />
             </div>
 
             <div class="mb-3">
-                  <label for="band_rx"><?php echo lang('gen_hamradio_band_rx'); ?></label>
+                  <label for="band_rx"><?php echo __("Band (RX)"); ?></label>
 
                   <select id="band_rx" class="form-select" name="band_rx">
                     <option value="" <?php if($this->session->userdata('band_rx') == "") { echo "selected=\"selected\""; } ?>></option>
@@ -343,13 +343,13 @@
             </div>
 
             <div class="mb-3">
-              <label for="transmit_power"><?php echo lang('gen_hamradio_transmit_power'); ?></label>
+              <label for="transmit_power"><?php echo __("Transmit Power (W)"); ?></label>
               <input type="number" step="0.001" class="form-control" id="transmit_power" name="transmit_power" value="<?php if ($this->session->userdata('transmit_power')) { echo $this->session->userdata('transmit_power'); } else { echo $power; } ?>" />
-              <small id="powerHelp" class="form-text text-muted"><?php echo lang('qso_transmit_power_helptext'); ?></small>
+              <small id="powerHelp" class="form-text text-muted"><?php echo __("Give power value in Watts. Include only numbers in the input."); ?></small>
             </div>
 
             <div class="mb-3">
-              <label for="operator_callsign"><?php echo lang('qso_operator_callsign'); ?></label>
+              <label for="operator_callsign"><?php echo __("Operator Callsign"); ?></label>
               <input type="text" class="form-control" id="operator_callsign" name="operator_callsign" value="<?php if ($this->session->userdata('operator_callsign')) { echo $this->session->userdata('operator_callsign'); } ?>" />
             </div>
 
@@ -358,14 +358,14 @@
           <!-- General Items -->
           <div class="tab-pane fade" id="general" role="tabpanel" aria-labelledby="general-tab">
               <div class="mb-3">
-                  <label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
+                  <label for="dxcc_id"><?php echo __("DXCC"); ?></label>
                   <select class="form-select" id="dxcc_id" name="dxcc_id" required>
                       <option value="0">- NONE -</option>
                       <?php
                       foreach($dxcc as $d){
                           echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
                           if ($d->Enddate != null) {
-                              echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
+                              echo ' ('.__("Deleted DXCC").')';
                           }
                           echo '</option>';
                       }
@@ -374,20 +374,20 @@
                   </select>
               </div>
               <div class="mb-3">
-                  <label for="continent"><?php echo lang('gen_hamradio_continent'); ?></label>
+                  <label for="continent"><?php echo __("Continent"); ?></label>
                   <select class="form-select" id="continent" name="continent">
                       <option value=""></option>
-                      <option value="AF"><?php echo lang('africa'); ?></option>
-                      <option value="AN"><?php echo lang('antarctica'); ?></option>
-                      <option value="AS"><?php echo lang('asia'); ?></option>
-                      <option value="EU"><?php echo lang('europe'); ?></option>
-                      <option value="NA"><?php echo lang('northamerica'); ?></option>
-                      <option value="OC"><?php echo lang('oceania'); ?></option>
-                      <option value="SA"><?php echo lang('southamerica'); ?></option>
+                      <option value="AF"><?php echo __("Africa"); ?></option>
+                      <option value="AN"><?php echo __("Antarctica"); ?></option>
+                      <option value="AS"><?php echo __("Asia"); ?></option>
+                      <option value="EU"><?php echo __("Europe"); ?></option>
+                      <option value="NA"><?php echo __("North America"); ?></option>
+                      <option value="OC"><?php echo __("Oceania"); ?></option>
+                      <option value="SA"><?php echo __("South America"); ?></option>
                   </select>
               </div>
               <div class="mb-3">
-                  <label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
+                  <label for="cqz"><?php echo __("CQ Zone"); ?></label>
                   <select class="form-select" id="cqz" name="cqz" required>
                       <?php
                       for ($i = 0; $i<=40; $i++) {
@@ -398,7 +398,7 @@
               </div>
 
             <div class="mb-3">
-              <label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
+              <label for="selectPropagation"><?php echo __("Propagation Mode"); ?></label>
               <select class="form-select" id="selectPropagation" name="prop_mode">
                 <option value="" <?php if(!empty($this->session->userdata('prop_mode'))) { echo "selected=\"selected\""; } ?>></option>
                 <option value="AS" <?php if($this->session->userdata('prop_mode') == "AS") { echo "selected=\"selected\""; } ?>>Aircraft Scatter</option>
@@ -430,13 +430,13 @@
             </div>
 
             <div class="mb-3" id="location_us_county">
-                <label for="stationCntyInputQso"><?php echo lang('gen_hamradio_county_reference'); ?></label>
+                <label for="stationCntyInputQso"><?php echo __("USA County"); ?></label>
                 <input class="form-control" id="stationCntyInputQso" type="text" name="county" value="" />
             </div>
 
             <?php if (!$user_iota_to_qso_tab ?? false) { ?>
             <div class="mb-3">
-              <label for="iota_ref"><?php echo lang('gen_hamradio_iota_reference'); ?></label>
+              <label for="iota_ref"><?php echo __("IOTA Reference"); ?></label>
                     <select class="form-select" id="iota_ref" name="iota_ref">
                         <option value =""></option>
 
@@ -453,9 +453,9 @@
             <?php if (!$user_sota_to_qso_tab ?? false) { ?>
             <div class="row">
               <div class="mb-3 col-md-9">
-                <label for="sota_ref"><?php echo lang('gen_hamradio_sota_reference'); ?></label>
+                <label for="sota_ref"><?php echo __("SOTA Reference"); ?></label>
                 <input class="form-control" id="sota_ref" type="text" name="sota_ref" value="" />
-                <small id="sotaRefHelp" class="form-text text-muted"><?php echo lang('qso_sota_ref_helptext'); ?></small>
+                <small id="sotaRefHelp" class="form-text text-muted"><?php echo __("For example: GM/NS-001."); ?></small>
               </div>
               <div class="mb-3 col-md-3 align-self-center">
                 <small id="sota_info" class="btn btn-secondary spw-buttons"></small>
@@ -466,9 +466,9 @@
             <?php if (!$user_wwff_to_qso_tab ?? false) { ?>
             <div class="row">
               <div class="mb-3 col-md-9">
-                <label for="wwff_ref"><?php echo lang('gen_hamradio_wwff_reference'); ?></label>
+                <label for="wwff_ref"><?php echo __("WWFF Reference"); ?></label>
                 <input class="form-control" id="wwff_ref" type="text" name="wwff_ref" value="" />
-                <small id="wwffRefHelp" class="form-text text-muted"><?php echo lang('qso_wwff_ref_helptext'); ?></small>
+                <small id="wwffRefHelp" class="form-text text-muted"><?php echo __("For example: DLFF-0069."); ?></small>
               </div>
               <div class="mb-3 col-md-3 align-self-center">
                 <small id="wwff_info" class="btn btn-secondary spw-buttons"></small>
@@ -479,9 +479,9 @@
             <?php if (!$user_pota_to_qso_tab ?? false) { ?>
             <div class="row">
               <div class="mb-3 col-md-9">
-                <label for="pota_ref"><?php echo lang('gen_hamradio_pota_reference'); ?></label>
+                <label for="pota_ref"><?php echo __("POTA Reference(s)"); ?></label>
                 <input class="form-control" id="pota_ref" type="text" name="pota_ref" value="" />
-                <small id="potaRefHelp" class="form-text text-muted"><?php echo lang('qso_pota_ref_helptext'); ?></small>
+                <small id="potaRefHelp" class="form-text text-muted"><?php echo __("For example: PA-0150. Multiple values allowed."); ?></small>
               </div>
               <div class="mb-3 col-md-3 align-self-center">
                 <small id="pota_info" class="btn btn-secondary spw-buttons"></small>
@@ -491,23 +491,23 @@
 
             <?php if (!$user_sig_to_qso_tab ?? false) { ?>
             <div class="mb-3">
-              <label for="sig"><?php echo lang('gen_hamradio_sig'); ?></label>
+              <label for="sig"><?php echo __("Sig"); ?></label>
               <input class="form-control" id="sig" type="text" name="sig" value="" />
-              <small id="sigHelp" class="form-text text-muted"><?php echo lang('qso_sig_helptext'); ?></small>
+              <small id="sigHelp" class="form-text text-muted"><?php echo __("For example: GMA"); ?></small>
             </div>
 
             <div class="mb-3">
-              <label for="sig_info"><?php echo lang('gen_hamradio_sig_info'); ?></label>
+              <label for="sig_info"><?php echo __("Sig Info"); ?></label>
               <input class="form-control" id="sig_info" type="text" name="sig_info" value="" />
-              <small id="sigInfoHelp" class="form-text text-muted"><?php echo lang('qso_sig_info_helptext'); ?></small>
+              <small id="sigInfoHelp" class="form-text text-muted"><?php echo __("For example: DA/NW-357"); ?></small>
             </div>
             <?php } ?>
 
             <?php if (!$user_dok_to_qso_tab ?? false) { ?>
             <div class="mb-3">
-              <label for="darc_dok"><?php echo lang('gen_hamradio_dok'); ?></label>
+              <label for="darc_dok"><?php echo __("DOK"); ?></label>
               <input class="form-control" id="darc_dok" type="text" name="darc_dok" value="" />
-              <small id="dokHelp" class="form-text text-muted"><?php echo lang('qso_dok_helptext'); ?></small>
+              <small id="dokHelp" class="form-text text-muted"><?php echo __("For example: Q03"); ?></small>
             </div>
             <?php } ?>
 
@@ -516,7 +516,7 @@
           <!-- Satellite Panel -->
           <div class="tab-pane fade" id="satellite" role="tabpanel" aria-labelledby="satellite-tab">
             <div class="mb-3">
-              <label for="sat_name"><?php echo lang('gen_hamradio_satellite_name'); ?></label>
+              <label for="sat_name"><?php echo __("Satellite Name"); ?></label>
 
               <input list="satellite_names" id="sat_name" type="text" name="sat_name" class="form-control" value="<?php echo $this->session->userdata('sat_name'); ?>">
 
@@ -524,7 +524,7 @@
             </div>
 
             <div class="mb-3">
-              <label for="sat_mode"><?php echo lang('gen_hamradio_satellite_mode'); ?></label>
+              <label for="sat_mode"><?php echo __("Satellite Mode"); ?></label>
 
               <input list="satellite_modes" id="sat_mode" type="text" name="sat_mode" class="form-control" value="<?php echo $this->session->userdata('sat_mode'); ?>">
 
@@ -535,10 +535,10 @@
           <!-- Notes Panel Contents -->
           <div class="tab-pane fade" id="nav-notes" role="tabpanel" aria-labelledby="notes-tab">
             <div class="alert alert-info" role="alert">
-              <span class="badge text-bg-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qso_notes_helptext'); ?>
+              <span class="badge text-bg-info"><?php echo __("Info"); ?></span> <?php echo __("Note content is used within Wavelog only and is not exported to other services."); ?>
             </div>
            <div class="mb-3">
-              <label for="notes"><?php echo lang('general_word_notes'); ?></label>
+              <label for="notes"><?php echo __("Notes"); ?></label>
               <textarea  type="text" class="form-control" id="notes" name="notes" rows="10"></textarea>
             </div>
           </div>
@@ -547,43 +547,43 @@
           <div class="tab-pane fade" id="qsl" role="tabpanel" aria-labelledby="qsl-tab">
 
             <div class="mb-3 row">
-              <label for="sent" class="col-sm-3 col-form-label"><?php echo lang('general_word_sent'); ?></label>
+              <label for="sent" class="col-sm-3 col-form-label"><?php echo __("Sent"); ?></label>
               <div class="col-sm-9">
                 <select class="form-select" id="sent" name="qsl_sent">
-                  <option value="N" selected="selected"><?php echo lang('general_word_no'); ?></option>
-                  <option value="Y"><?php echo lang('general_word_yes'); ?></option>
-                  <option value="R"><?php echo lang('general_word_requested'); ?></option>
-                  <option value="Q"><?php echo lang('general_word_queued'); ?></option>
-                  <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
+                  <option value="N" selected="selected"><?php echo __("No"); ?></option>
+                  <option value="Y"><?php echo __("Yes"); ?></option>
+                  <option value="R"><?php echo __("Requested"); ?></option>
+                  <option value="Q"><?php echo __("Queued"); ?></option>
+                  <option value="I"><?php echo __("Invalid (Ignore)"); ?></option>
                 </select>
               </div>
             </div>
 
             <div class="mb-3 row">
-              <label for="sent-method" class="col-sm-3 col-form-label"><?php echo lang('general_word_method'); ?></label>
+              <label for="sent-method" class="col-sm-3 col-form-label"><?php echo __("Method"); ?></label>
               <div class="col-sm-9">
                 <select class="form-select" id="sent-method" name="qsl_sent_method">
-                 <option value="" selected="selected"><?php echo lang('general_word_method'); ?></option>
-                 <option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
-                 <option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
-                 <option value="E"><?php echo lang('general_word_qslcard_electronic'); ?></option>
-                 <option value="M"><?php echo lang('general_word_qslcard_manager'); ?></option>
+                 <option value="" selected="selected"><?php echo __("Method"); ?></option>
+                 <option value="D"><?php echo __("Direct"); ?></option>
+                 <option value="B"><?php echo __("Bureau"); ?></option>
+                 <option value="E"><?php echo __("Electronic"); ?></option>
+                 <option value="M"><?php echo __("Manager"); ?></option>
                 </select>
               </div>
             </div>
 
             <div class="mb-3 row">
-              <label for="qsl_via" class="col-sm-2 col-form-label"><?php echo lang('general_word_qslcard_via'); ?></label>
+              <label for="qsl_via" class="col-sm-2 col-form-label"><?php echo __("Via"); ?></label>
               <div class="col-sm-10">
                 <input type="text" id="qsl_via" class="form-control" name="qsl_via" value="" />
               </div>
             </div>
 
             <div class="alert alert-info" role="alert">
-              <span class="badge text-bg-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
+              <span class="badge text-bg-info"><?php echo __("Info"); ?></span> <?php echo __("This note content is exported to QSL services like eqsl.cc."); ?>
             </div>
            <div class="mb-3">
-            <label for="qslmsg"><?php echo lang('general_word_notes'); ?><span class="qso_eqsl_qslmsg_update" title="<?php echo lang('qso_eqsl_qslmsg_helptext'); ?>"><i class="fas fa-redo-alt"></i></span></label>
+            <label for="qslmsg"><?php echo __("Notes"); ?><span class="qso_eqsl_qslmsg_update" title="<?php echo __("Get the default message for eQSL, for this station."); ?>"><i class="fas fa-redo-alt"></i></span></label>
 						<label class="position-absolute end-0 mb-2 me-3" for="qslmsg" id="charsLeft"> </label>
             <textarea  type="text" class="form-control" id="qslmsg" name="qslmsg" rows="5" maxlength="240"><?php echo $qslmsg; ?></textarea>
             <div id="qslmsg_hide" style="display:none;"><?php echo $qslmsg; ?></div>
@@ -598,13 +598,13 @@
         </div>
 
         <div class="btn-group" role="group">
-              <button tabindex="9" type="button" class="btn btn-secondary" id="btn_reset"><?php echo lang('qso_btn_clear_qso'); ?></button>
+              <button tabindex="9" type="button" class="btn btn-secondary" id="btn_reset"><?php echo __("Clear"); ?></button>
         <button id="btnGroupDrop1" type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"></button>
         <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
-                <li><a class="dropdown-item" href="#" id="btn_fullreset"><?php echo lang('qso_btn_reset_to_default'); ?></a></li>
+                <li><a class="dropdown-item" href="#" id="btn_fullreset"><?php echo __("Reset to Default"); ?></a></li>
             </ul>
         </div>
-        <button tabindex="8" type="submit" id="saveQso" name="saveQso" class="btn btn-primary"><i class="fas fa-save"></i> <?php echo lang('qso_btn_save_qso'); ?></button>
+        <button tabindex="8" type="submit" id="saveQso" name="saveQso" class="btn btn-primary"><i class="fas fa-save"></i> <?php echo __("Save QSO"); ?></button>
         <div class="alert alert-danger warningOnSubmit mt-3" style="display:none;"><span><i class="fas fa-times-circle"></i></span> <span class="warningOnSubmit_txt ms-1">Error</span></div>
       </div>
     </form>
@@ -674,14 +674,14 @@
     <!-- Winkey Ends -->
 
     <div class="card callsign-suggest">
-        <div class="card-header"><h4 style="font-size: 16px; font-weight: bold;" class="card-title"><?php echo lang('qso_title_suggestions'); ?></h4></div>
+        <div class="card-header"><h4 style="font-size: 16px; font-weight: bold;" class="card-title"><?php echo __("Suggestions"); ?></h4></div>
 
         <div class="card-body callsign-suggestions"></div>
     </div>
 
     <?php if ($this->session->userdata('user_show_profile_image')) { ?>
     <div class="card callsign-image" id="callsign-image" style="display: none;">
-        <div class="card-header"><h4 style="font-size: 16px; font-weight: bold;" class="card-title"><?php echo lang('qso_title_image'); ?></h4></div>
+        <div class="card-header"><h4 style="font-size: 16px; font-weight: bold;" class="card-title"><?php echo __("Profile Picture"); ?></h4></div>
 
         <div class="card-body callsign-image">
             <div class="callsign-image-content" id="callsign-image-content">
@@ -691,7 +691,7 @@
     <?php } ?>
 
     <div class="card previous-qsos">
-      <div class="card-header"><h4 class="card-title" id="timesWorked" style="font-size: 16px; font-weight: bold;"><?php echo lang('qso_title_previous_contacts'); ?></h4></div>
+      <div class="card-header"><h4 class="card-title" id="timesWorked" style="font-size: 16px; font-weight: bold;"><?php echo __("Previous Contacts"); ?></h4></div>
 
         <div id="partial_view" style="font-size: 0.95rem;"></div>
 
@@ -705,7 +705,7 @@
 
         </div>
       </div>
-      <small class="mt-0.5" style="float: right;"><?php echo lang('qso_previous_max_shown'); ?></small>
+      <small class="mt-0.5" style="float: right;"><?php echo __("Max. 5 previous contacts are shown"); ?></small>
     </div>
   </div>
 
diff --git a/application/views/satellite/create.php b/application/views/satellite/create.php
index 43793f8ef..076e86ef5 100644
--- a/application/views/satellite/create.php
+++ b/application/views/satellite/create.php
@@ -67,7 +67,7 @@
 			</div>
 		</div>
 
-			<button type="button" onclick="createSatellite(this.form);" class="btn btn-sm btn-primary"><i class="fas fa-plus-square"></i> <?php echo lang('options_save'); ?></button>
+			<button type="button" onclick="createSatellite(this.form);" class="btn btn-sm btn-primary"><i class="fas fa-plus-square"></i> <?php echo __("Save"); ?></button>
 
 		</form>
 </div>
diff --git a/application/views/search/cqzones_result.php b/application/views/search/cqzones_result.php
index 6849742c3..cb62e3c08 100644
--- a/application/views/search/cqzones_result.php
+++ b/application/views/search/cqzones_result.php
@@ -6,14 +6,14 @@ if ($qsos->result() != NULL) {
 	<tr>
 	<th style=\'text-align: center\'>Date</th>
 	<th style=\'text-align: center\'>Time</th>
-	<th style=\'text-align: center\'>'.lang('gen_hamradio_callsign').'</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_mode') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_band') . '</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_gridsquare') . '</th>
+	<th style=\'text-align: center\'>'.__("Callsign").'</th>
+	<th style=\'text-align: center\'>' . __("Mode") . '</th>
+	<th style=\'text-align: center\'>' . __("Band") . '</th>
+	<th style=\'text-align: center\'>' . __("Gridsquare") . '</th>
 	<th style=\'text-align: center\'>CQ Zone</th>
 	<th style=\'text-align: center\'>DXCC CQ Zone</th>
 	<th style=\'text-align: center\'>DXCC</th>
-	<th style=\'text-align: center\'>' . lang('gen_hamradio_station') . '</th>
+	<th style=\'text-align: center\'>' . __("Station") . '</th>
 	</tr>
 	</thead><tbody>';
 
diff --git a/application/views/search/lotw_unconfirmed_result.php b/application/views/search/lotw_unconfirmed_result.php
index 9b5c468d9..2445c09d8 100644
--- a/application/views/search/lotw_unconfirmed_result.php
+++ b/application/views/search/lotw_unconfirmed_result.php
@@ -3,12 +3,12 @@ if ($qsos->result() != NULL) {
 	echo '<table style="width:100%" class="table qsolist table-sm table-bordered table-hover table-striped table-condensed">
 	<thead>
 	<tr>
-		<th style=\'text-align: center\'>'.lang('gen_hamradio_callsign').'</th>
+		<th style=\'text-align: center\'>'.__("Callsign").'</th>
 		<th style=\'text-align: center\'>Date / time</th>
-		<th style=\'text-align: center\'>' . lang('gen_hamradio_mode') . '</th>
-		<th style=\'text-align: center\'>' . lang('gen_hamradio_band') . '</th>
+		<th style=\'text-align: center\'>' . __("Mode") . '</th>
+		<th style=\'text-align: center\'>' . __("Band") . '</th>
 		<th style=\'text-align: center\'>Last LoTW upload</th>
-		<th style=\'text-align: center\'>' . lang('gen_hamradio_station') . '</th>
+		<th style=\'text-align: center\'>' . __("Station") . '</th>
 	</tr>
 	</thead><tbody>';
 
diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php
index ff976fdc1..31c4a1c44 100644
--- a/application/views/search/search_result_ajax.php
+++ b/application/views/search/search_result_ajax.php
@@ -1,22 +1,22 @@
 <?php
 function echo_table_header_col($name) {
 	switch($name) {
-		case 'Mode':      echo lang('gen_hamradio_mode'); break;
-		case 'RSTS':      echo lang('gen_hamradio_rsts'); break;
-		case 'RSTR':      echo lang('gen_hamradio_rstr'); break;
-		case 'Country':   echo lang('general_word_country'); break;
-		case 'IOTA':      echo lang('gen_hamradio_iota'); break;
-		case 'SOTA':      echo lang('gen_hamradio_sota'); break;
-		case 'WWFF':      echo lang('gen_hamradio_wwff'); break;
-		case 'POTA':      echo lang('gen_hamradio_pota'); break;
-		case 'State':     echo lang('gen_hamradio_state'); break;
-		case 'Grid':      echo lang('gen_hamradio_gridsquare'); break;
-		case 'Distance':  echo lang('gen_hamradio_distance'); break;
-		case 'Band':      echo lang('gen_hamradio_band'); break;
-		case 'Frequency': echo lang('gen_hamradio_frequency'); break;
-		case 'Operator':  echo lang('gen_hamradio_operator'); break;
-		case 'Location':  echo lang('wavelog_station_profile'); break;
-		case 'Name':      echo lang('general_word_name'); break;
+		case 'Mode':      echo __("Mode"); break;
+		case 'RSTS':      echo __("RST (S)"); break;
+		case 'RSTR':      echo __("RST (R)"); break;
+		case 'Country':   echo __("Country"); break;
+		case 'IOTA':      echo __("IOTA"); break;
+		case 'SOTA':      echo __("SOTA"); break;
+		case 'WWFF':      echo __("WWFF"); break;
+		case 'POTA':      echo __("POTA"); break;
+		case 'State':     echo __("State"); break;
+		case 'Grid':      echo __("Gridsquare"); break;
+		case 'Distance':  echo __("Distance"); break;
+		case 'Band':      echo __("Band"); break;
+		case 'Frequency': echo __("Frequency"); break;
+		case 'Operator':  echo __("Operator"); break;
+		case 'Location':  echo __("Station Location"); break;
+		case 'Name':      echo __("Name"); break;
 	}
 }
 
@@ -86,11 +86,11 @@ function echo_table_col($row, $name) {
 	<table style="width:100%" class="table table-sm tablewas table-bordered table-hover table-striped table-condensed text-center">
 		<thead>
         <tr class="titles">
-            <th><?php echo lang('general_word_date'); ?></th>
+            <th><?php echo __("Date"); ?></th>
             <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
-            <th><?php echo lang('general_word_time'); ?></th>
+            <th><?php echo __("Time"); ?></th>
             <?php } ?>
-            <th><?php echo lang('gen_hamradio_call'); ?></th>
+            <th><?php echo __("Call"); ?></th>
 <?php
 $ci =& get_instance();
 			echo '<th>';
@@ -124,7 +124,7 @@ $ci =& get_instance();
                     <th>Clublog</th>
                 <?php } ?>
             <?php } ?>
-                <th><?php echo lang('gen_hamradio_station'); ?></th>
+                <th><?php echo __("Station"); ?></th>
             <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
                 <th></th>
             <?php } ?>
@@ -177,16 +177,16 @@ $ci =& get_instance();
                      }
                      switch ($row->COL_QSL_SENT) {
                      case "Y":
-                        echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_sent').$timestamp;
+                        echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Sent").$timestamp;
                         break;
                      case "Q":
-                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp;
+                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp;
                         break;
                      case "R":
-                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp;
+                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp;
                         break;
                      case "I":
-                        echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp;
+                        echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp;
                         break;
                      default:
                         echo "class=\"qsl-red";
@@ -196,16 +196,16 @@ $ci =& get_instance();
                   if ($row->COL_QSL_SENT_VIA != "") {
                      switch ($row->COL_QSL_SENT_VIA) {
                      case "B":
-                        echo " (".lang('general_word_qslcard_bureau').")";
+                        echo " (".__("Bureau").")";
                         break;
                      case "D":
-                        echo " (".lang('general_word_qslcard_direct').")";
+                        echo " (".__("Direct").")";
                         break;
                      case "M":
-                        echo " (".lang('general_word_qslcard_via').": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")";
+                        echo " (".__("Via").": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")";
                         break;
                      case "E":
-                        echo " (".lang('general_word_qslcard_electronic').")";
+                        echo " (".__("Electronic").")";
                         break;
                      }
                   }
@@ -219,16 +219,16 @@ $ci =& get_instance();
                      }
                      switch ($row->COL_QSL_RCVD) {
                      case "Y":
-                        echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_received').$timestamp;
+                        echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Received").$timestamp;
                         break;
                      case "Q":
-                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp;
+                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp;
                         break;
                      case "R":
-                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp;
+                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp;
                         break;
                      case "I":
-                        echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp;
+                        echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp;
                         break;
                      default:
                         echo "class=\"qsl-red";
@@ -238,16 +238,16 @@ $ci =& get_instance();
                   if ($row->COL_QSL_RCVD_VIA != "") {
                      switch ($row->COL_QSL_RCVD_VIA) {
                      case "B":
-                        echo " (".lang('general_word_qslcard_bureau').")";
+                        echo " (".__("Bureau").")";
                         break;
                      case "D":
-                        echo " (".lang('general_word_qslcard_direct').")";
+                        echo " (".__("Direct").")";
                         break;
                      case "M":
                         echo " (Manager)";
                         break;
                      case "E":
-                        echo " (".lang('general_word_qslcard_electronic').")";
+                        echo " (".__("Electronic").")";
                         break;
                      }
                   }
@@ -257,7 +257,7 @@ $ci =& get_instance();
                   echo '<td style=\'text-align: center\' class="eqsl">';
                   echo '<span ';
                   if ($row->COL_EQSL_QSL_SENT == "Y") {
-                     echo "title=\"".lang('eqsl_short')." ".lang('general_word_sent');
+                     echo "title=\"".__("eQSL")." ".__("Sent");
                      if ($row->COL_EQSL_QSLSDATE != null) {
                         $timestamp = strtotime($row->COL_EQSL_QSLSDATE);
                         echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -270,7 +270,7 @@ $ci =& get_instance();
 
                   echo '<span ';
                   if ($row->COL_EQSL_QSL_RCVD == "Y") {
-                     echo "title=\"".lang('eqsl_short')." ".lang('general_word_received');
+                     echo "title=\"".__("eQSL")." ".__("Received");
                      if ($row->COL_EQSL_QSLRDATE != null) {
                         $timestamp = strtotime($row->COL_EQSL_QSLRDATE);
                         echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -295,7 +295,7 @@ $ci =& get_instance();
                 echo '<td style=\'text-align: center\' class="lotw">';
                 echo '<span ';
                 if ($row->COL_LOTW_QSL_SENT == "Y") {
-                   echo "title=\"".lang('lotw_short')." ".lang('general_word_sent');
+                   echo "title=\"".__("LoTW")." ".__("Sent");
                    if ($row->COL_LOTW_QSLSDATE != null) {
                      $timestamp = strtotime($row->COL_LOTW_QSLSDATE);
                      echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -308,7 +308,7 @@ $ci =& get_instance();
 
                 echo '<span ';
                 if ($row->COL_LOTW_QSL_RCVD == "Y") {
-                   echo "title=\"".lang('lotw_short')." ".lang('general_word_received');
+                   echo "title=\"".__("LoTW")." ".__("Received");
                    if ($row->COL_LOTW_QSLRDATE != null) {
                       $timestamp = strtotime($row->COL_LOTW_QSLRDATE);
                       echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -325,7 +325,7 @@ $ci =& get_instance();
                 echo '<td style=\'text-align: center\' class="qrz">';
                 echo '<span ';
                 if ($row->COL_QRZCOM_QSO_UPLOAD_STATUS == "Y") {
-                   echo "title=\"QRZ ".lang('general_word_sent');
+                   echo "title=\"QRZ ".__("Sent");
                    if ($row->COL_QRZCOM_QSO_UPLOAD_DATE != null) {
                      $timestamp = strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE);
                      echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -338,7 +338,7 @@ $ci =& get_instance();
 
                 echo '<span ';
                 if ($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "Y") {
-                   echo "title=\"QRZ ".lang('general_word_received');
+                   echo "title=\"QRZ ".__("Received");
                    if ($row->COL_QRZCOM_QSO_DOWNLOAD_DATE != null) {
                       $timestamp = strtotime($row->COL_QRZCOM_QSO_DOWNLOAD_DATE);
                       echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -355,7 +355,7 @@ $ci =& get_instance();
                 echo '<td style=\'text-align: center\' class="clublog">';
                 echo '<span ';
                 if ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS == "Y") {
-                   echo "title=\"Clublog ".lang('general_word_sent');
+                   echo "title=\"Clublog ".__("Sent");
                    if ($row->COL_CLUBLOG_QSO_UPLOAD_DATE != null) {
                      $timestamp = strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE);
                      echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -368,7 +368,7 @@ $ci =& get_instance();
 
                 echo '<span ';
                 if ($row->COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "Y") {
-                   echo "title=\"Clublog ".lang('general_word_received');
+                   echo "title=\"Clublog ".__("Received");
                    if ($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE != null) {
                       $timestamp = strtotime($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE);
                       echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
@@ -397,35 +397,35 @@ $ci =& get_instance();
                         </a>
 
                         <div class="dropdown-menu menuOnResultTab" aria-labelledby="dropdownMenuLink" data-qsoid="qso_<?php echo $row->COL_PRIMARY_KEY; ?>">
-                            <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo lang('general_edit_qso'); ?></a>
+                            <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo __("Edit QSO"); ?></a>
 
                             <?php if($row->COL_QSL_SENT !='Y') { ?>
                                 <div class="qsl_sent_<?php echo $row->COL_PRIMARY_KEY; ?>">
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_tx_bureau'); ?></a>
-                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_tx_direct'); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Sent (Bureau)"); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Sent (Direct)"); ?></a>
                                 </div>
                             <?php } ?>
 
                             <?php if($row->COL_QSL_RCVD !='Y') { ?>
                                 <div class="qsl_rcvd_<?php echo $row->COL_PRIMARY_KEY; ?>">
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_bureau'); ?></a>
-                                    <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_direct'); ?></a>
-                                    <a class="dropdown-item" href="javascript:qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i><?php echo lang('general_mark_qsl_requested'); ?></a>
-                                    <a class="dropdown-item" href="javascript:qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i><?php echo lang('general_mark_qsl_not_required'); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Received (Bureau)"); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Received (Direct)"); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i><?php echo __("Mark QSL Card Requested"); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i><?php echo __("Mark QSL Card Not Required"); ?></a>
                                 </div>
                             <?php } ?>
 
                             <div class="dropdown-divider"></div>
 
-                            <a class="dropdown-item" href="https://www.qrz.com/db/<?php echo $row->COL_CALL; ?>" target="_blank"><i class="fas fa-question"></i><?php echo lang('general_lookup_qrz'); ?></a>
+                            <a class="dropdown-item" href="https://www.qrz.com/db/<?php echo $row->COL_CALL; ?>" target="_blank"><i class="fas fa-question"></i><?php echo __("Lookup on QRZ.com"); ?></a>
 
-                            <a class="dropdown-item" href="https://www.hamqth.com/<?php echo $row->COL_CALL; ?>" target="_blank"><i class="fas fa-question"></i><?php echo lang('general_lookup_hamqth'); ?></a>
+                            <a class="dropdown-item" href="https://www.hamqth.com/<?php echo $row->COL_CALL; ?>" target="_blank"><i class="fas fa-question"></i><?php echo __("Lookup on HamQTH"); ?></a>
 
                             <div class="dropdown-divider"></div>
 
-                            <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?php echo lang('general_delete_qso'); ?></a>
+                            <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?php echo __("Delete QSO"); ?></a>
                         </div>
                     </div>
                 </td>
diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php
index df555657c..a4114718a 100644
--- a/application/views/simplefle/index.php
+++ b/application/views/simplefle/index.php
@@ -9,34 +9,34 @@
 	<br>
 	<div id="simpleFleInfo">
 		<script>
-			var lang_qso_simplefle_info_ln1 = "<?php echo lang('qso_simplefle_info_ln1'); ?>";
-			var lang_qso_simplefle_info_ln2 = "<?php echo lang('qso_simplefle_info_ln2'); ?>";
-			var lang_qso_simplefle_info_ln3 = "<?php echo lang('qso_simplefle_info_ln3'); ?>";
+			var lang_qso_simplefle_info_ln1 = "<?php echo __("Simple Fast Log Entry (FLE)"); ?>";
+			var lang_qso_simplefle_info_ln2 = "<?php echo __("'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."); ?>";
+			var lang_qso_simplefle_info_ln3 = "<?php echo __("FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."); ?>";
 			var lang_qso_simplefle_info_ln4 = "<?php echo lang('qso_simplefle_info_ln4'); ?>";
-			var lang_qso_simplefle_syntax_help = "<?php echo lang('qso_simplefle_syntax_help_button'); ?>";
-			var lang_qso_simplefle_syntax_help_title = "<?php echo lang('qso_simplefle_syntax_help_title'); ?>";
-			var lang_qso_simplefle_syntax_help_close_w_sample = "<?php echo lang('qso_simplefle_syntax_help_close_w_sample'); ?>";
-			var lang_qso_simplefle_options = "<?php echo lang('qso_simplefle_options'); ?>";
-			var lang_admin_close = "<?php echo lang('admin_close'); ?>";
-			var lang_admin_save = "<?php echo lang('admin_save'); ?>";
-			var lang_qso_simplefle_error_band = "<?php echo lang('qso_simplefle_error_band'); ?>";
-			var lang_qso_simplefle_error_mode = "<?php echo lang('qso_simplefle_error_mode'); ?>";
-			var lang_qso_simplefle_error_time = "<?php echo lang('qso_simplefle_error_time'); ?>";
-			var lang_qso_simplefle_error_date = "<?php echo lang('qso_simplefle_error_date'); ?>";
-			var lang_qso_simplefle_qso_list_total = "<?php echo lang('qso_simplefle_qso_list_total'); ?>";
-			var lang_gen_hamradio_qso = "<?php echo lang('gen_hamradio_qso'); ?>";
-			var lang_qso_simplefle_error_stationcall = "<?php echo lang('qso_simplefle_error_stationcall'); ?>";
-			var lang_qso_simplefle_error_operator = "<?php echo lang('qso_simplefle_error_operator'); ?>";
-			var lang_qso_simplefle_warning_reset = "<?php echo lang('qso_simplefle_warning_reset'); ?>";
-			var lang_qso_simplefle_warning_missing_band_mode = "<?php echo lang('qso_simplefle_warning_missing_band_mode'); ?>";
-			var lang_qso_simplefle_warning_missing_time = "<?php echo lang('qso_simplefle_warning_missing_time'); ?>";
-			var lang_qso_simplefle_warning_example_data = "<?php echo lang('qso_simplefle_warning_example_data'); ?>";
-			var lang_qso_simplefle_confirm_save_to_log = "<?php echo lang('qso_simplefle_confirm_save_to_log'); ?>";
-			var lang_qso_simplefle_success_save_to_log_header = "<?php echo lang('qso_simplefle_success_save_to_log_header'); ?>";
-			var lang_qso_simplefle_success_save_to_log = "<?php echo lang('qso_simplefle_success_save_to_log'); ?>";
+			var lang_qso_simplefle_syntax_help = "<?php echo __("Syntax Help"); ?>";
+			var lang_qso_simplefle_syntax_help_title = "<?php echo __("Syntax for FLE"); ?>";
+			var lang_qso_simplefle_syntax_help_close_w_sample = "<?php echo __("Close and Load Sample Data"); ?>";
+			var lang_qso_simplefle_options = "<?php echo __("Options"); ?>";
+			var lang_admin_close = "<?php echo __("Close"); ?>";
+			var lang_admin_save = "<?php echo __("Save"); ?>";
+			var lang_qso_simplefle_error_band = "<?php echo __("Band is missing!"); ?>";
+			var lang_qso_simplefle_error_mode = "<?php echo __("Mode is missing!"); ?>";
+			var lang_qso_simplefle_error_time = "<?php echo __("Time is not set!"); ?>";
+			var lang_qso_simplefle_error_date = "<?php echo __("Invalid date"); ?>";
+			var lang_qso_simplefle_qso_list_total = "<?php echo __("Total"); ?>";
+			var lang_gen_hamradio_qso = "<?php echo __("QSO"); ?>";
+			var lang_qso_simplefle_error_stationcall = "<?php echo __("Station Call is not selected"); ?>";
+			var lang_qso_simplefle_error_operator = "<?php echo __("'Operator' Field is empty"); ?>";
+			var lang_qso_simplefle_warning_reset = "<?php echo __("Warning! Do you really want to reset everything?"); ?>";
+			var lang_qso_simplefle_warning_missing_band_mode = "<?php echo __("Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"); ?>";
+			var lang_qso_simplefle_warning_missing_time = "<?php echo __("Warning! You can't log the QSO List, because some QSO don't have a time defined!"); ?>";
+			var lang_qso_simplefle_warning_example_data = "<?php echo __("Attention! The Data Field containes example data. First Clear Logging Session!"); ?>";
+			var lang_qso_simplefle_confirm_save_to_log = "<?php echo __("Are you sure that you want to add these QSO to the Log and clear the session?"); ?>";
+			var lang_qso_simplefle_success_save_to_log_header = "<?php echo __("QSO Logged!"); ?>";
+			var lang_qso_simplefle_success_save_to_log = "<?php echo __("The QSO were successfully logged in the logbook!"); ?>";
 		</script>
 		<h2><?php echo $page_title; ?></h2>
-		<button type="button" class="btn btn-sm btn-primary me-1" id="simpleFleInfoButton"><?php echo lang('qso_simplefle_info'); ?></button>
+		<button type="button" class="btn btn-sm btn-primary me-1" id="simpleFleInfoButton"><?php echo __("What is that?"); ?></button>
 	</div>
 
 	<?php if ($this->session->flashdata('message')) { ?>
@@ -60,19 +60,19 @@
 		<div class="card col-xs-12 col-md-4 simplefle" style="border: none">
 
 			<div class="card-header">
-				<?php echo lang('qso_simplefle_qso_data'); ?>
+				<?php echo __("QSO Data"); ?>
 			</div>
 			<div class="card-body">
 				<div class="row">
 					<div class="col-xs-12 col-lg-12 col-xl-6">
 						<div class="mb-3">
-							<label for="qsodate"><?php echo lang('qso_simplefle_qso_date'); ?></label>
+							<label for="qsodate"><?php echo __("QSO Date"); ?></label>
 							<input type="date" class="form-control" id="qsodate">
-							<small class="form-text text-muted"><?php echo lang('qso_simplefle_qso_date_hint'); ?></small>
+							<small class="form-text text-muted"><?php echo __("If you don't choose a date, today's date will be used."); ?></small>
 						</div>
 					</div>
 					<div class="col-xs-12 col-lg-12 col-xl-6">
-						<p><?php echo lang('qso_simplefle_utc_time'); ?></p>
+						<p><?php echo __("Current UTC Time"); ?></p>
 						<h4 class="fw-bold" id="utc-time"></h4>
 					</div>
 				</div>
@@ -80,7 +80,7 @@
 					<div class="col-xs-12 col-lg-6">
 						<div class="mb-3">
 							<label for="stationProfile">
-								<?php echo lang('qso_simplefle_station_call_location'); ?>
+								<?php echo __("Station Call/Location"); ?>
 							</label>
 							<select name="station_profile" class="station_id form-select" id="stationProfile">
 								<?php foreach ($station_profile->result() as $station) { ?>
@@ -92,12 +92,12 @@
 								<?php } ?>
 							</select>
 							<div class="alert alert-danger" role="alert" id="warningStationCall" style="display: none"> </div>
-							<small class="form-text text-muted"><?php echo lang('qso_simplefle_station_call_location_hint'); ?></small>
+							<small class="form-text text-muted"><?php echo __("If you did operate from a new location, first create a new <a href=". site_url('station') . ">Station Location</a>"); ?></small>
 						</div>
 					</div>
 					<div class="col-xs-12 col-lg-6">
 						<div class="mb-3">
-							<label for="operator"><?php echo lang('qso_simplefle_operator'); ?> <span class="text-muted input-example"><?php echo lang('qso_simplefle_operator_hint'); ?></span></label>
+							<label for="operator"><?php echo __("Operator"); ?> <span class="text-muted input-example"><?php echo __("e.g. OK2CQR"); ?></span></label>
 							<input type="text" class="form-control text-uppercase" id="operator" value="<?php echo $this->session->userdata('operator_callsign'); ?>">
 							<div class="alert alert-danger" role="alert" id="warningOperatorField" style="display: none"> </div>
 						</div>
@@ -109,7 +109,7 @@
 			<div class="card-body">
 				<div class="row">
 					<div class="col">
-						<p><?php echo lang('qso_simplefle_enter_the_data'); ?></p>
+						<p><?php echo __("Enter the Data"); ?></p>
 						<textarea name="qso" class="form-control qso-area" cols="auto" rows="11" id="sfle_textarea" style="font-family: 'Courier New', sans-serif;"></textarea>
 					</div>
 				</div>
@@ -117,22 +117,22 @@
 		</div>
 		<div class="card col-xs-12 col-md-8 simplefle" style="border: none">
 			<div class="card-header">
-				<?php echo lang('qso_simplefle_qso_list'); ?>
+				<?php echo __("QSO List"); ?>
 			</div>
 			<div class="card-body">
 				<div class="qsoList">
 					<table class="table table-striped table-hover sfletable" id="qsoTable">
 						<thead>
 							<tr>
-								<th><?php echo lang('general_word_date'); ?></th>
-								<th><?php echo lang('general_word_time'); ?></th>
-								<th><?php echo lang('gen_hamradio_callsign'); ?></th>
-								<th><?php echo lang('gen_hamradio_band'); ?></th>
-								<th><?php echo lang('gen_hamradio_mode'); ?></th>
-								<th><?php echo lang('gen_hamradio_rsts'); ?></th>
-								<th><?php echo lang('gen_hamradio_rstr'); ?></th>
-								<th><?php echo lang('gen_hamradio_gridsquare'); ?></th>
-								<th><?php echo lang('gen_hamradio_refs'); ?>*</th>
+								<th><?php echo __("Date"); ?></th>
+								<th><?php echo __("Time"); ?></th>
+								<th><?php echo __("Callsign"); ?></th>
+								<th><?php echo __("Band"); ?></th>
+								<th><?php echo __("Mode"); ?></th>
+								<th><?php echo __("RST (S)"); ?></th>
+								<th><?php echo __("RST (R)"); ?></th>
+								<th><?php echo __("Gridsquare"); ?></th>
+								<th><?php echo __("Refs"); ?>*</th>
 							</tr>
 						</thead>
 						<tbody id="qsoTableBody">
@@ -144,18 +144,18 @@
 						<span class="js-qso-count"></span>
 					</div>
 					<div class="col-6 col-sm-6 text-end" id="refs_hint">
-						<?php echo lang('qso_simplefle_refs_hint'); ?>
+						<?php echo __("The Refs can be either <u>S</u>OTA, <u>I</u>OTA, <u>P</u>OTA or <u>W</u>WFF"); ?>
 					</div>
 				</div>
 			</div>
 			<div class="row mt-2">
 				<div class="btn-group" role="group" aria-label="sfle button group">
 
-					<button class="btn btn-primary js-reload-qso"><?php echo lang('qso_simplefle_reload'); ?></button>
-					<button class="btn btn-warning js-save-to-log"><?php echo lang('qso_simplefle_save'); ?></button>
-					<button class="btn btn-danger js-empty-qso"><?php echo lang('qso_simplefle_clear'); ?></button>
-					<button class="btn btn-success" id="js-syntax"><?php echo lang('qso_simplefle_syntax_help_button'); ?></button>
-					<button class="btn btn-secondary" id="js-options"><?php echo lang('admin_options'); ?></button>
+					<button class="btn btn-primary js-reload-qso"><?php echo __("Reload QSO List"); ?></button>
+					<button class="btn btn-warning js-save-to-log"><?php echo __("Save in Wavelog"); ?></button>
+					<button class="btn btn-danger js-empty-qso"><?php echo __("Clear Logging Session"); ?></button>
+					<button class="btn btn-success" id="js-syntax"><?php echo __("Syntax Help"); ?></button>
+					<button class="btn btn-secondary" id="js-options"><?php echo __("Options"); ?></button>
 
 				</div>
 			</div>
diff --git a/application/views/simplefle/syntax_help.php b/application/views/simplefle/syntax_help.php
index d4c3cda48..369e69ad1 100644
--- a/application/views/simplefle/syntax_help.php
+++ b/application/views/simplefle/syntax_help.php
@@ -1,20 +1,20 @@
-<p><?php echo lang('qso_simplefle_syntax_help_ln1') ?>:</p>
-<p><?php echo lang('qso_simplefle_syntax_help_ln2') ?></p>
-<p><?php echo lang('qso_simplefle_syntax_help_ln3') ?></p>
-<p><?php echo lang('qso_simplefle_syntax_help_ln4') ?></p>
+<p><?php echo __("Before starting to log a QSO, please note the basic rules.") ?>:</p>
+<p><?php echo __("- Each new QSO should be on a new line.") ?></p>
+<p><?php echo __("- On each new line, only write data that has changed from the previous QSO.") ?></p>
+<p><?php echo __("To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign.") ?></p>
 <pre>
     20m ssb
     2134 2m0sql
 </pre>
-<p><?php echo lang('qso_simplefle_syntax_help_ln5') ?><p>
-<p><?php echo lang('qso_simplefle_syntax_help_ln6') ?></p>
+<p><?php echo __("For example, a QSO that started at 21:34 (UTC) with 4W7EST on 20m SSB.") ?><p>
+<p><?php echo __("If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO.") ?></p>
 <pre>
     20m ssb
     2134 2m0sql
     6 la8aja 47 46
 </pre>
-<p><?php echo lang('qso_simplefle_syntax_help_ln7') ?></p>
-<p><?php echo lang('qso_simplefle_syntax_help_ln8') ?></p>
+<p><?php echo __("The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted.") ?></p>
+<p><?php echo __("For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD.") ?></p>
 <pre>
     20m ssb
     2134 2m0sql
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index 58e531b10..58536bb34 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -29,41 +29,41 @@
 
 		<form method="post" action="<?php echo site_url('station/create'); ?>" name="create_profile">
 		  <div class="mb-3">
-		    <label for="stationNameInput"><?php echo lang("station_location_name"); ?></label>
+		    <label for="stationNameInput"><?php echo __("Profile Name"); ?></label>
 		    <input type="text" class="form-control" name="station_profile_name" id="stationNameInput" aria-describedby="stationNameInputHelp" placeholder="Home QTH" required>
-		    <small id="stationNameInputHelp" class="form-text text-muted"><?php echo lang("station_location_name_hint"); ?></small>
+		    <small id="stationNameInputHelp" class="form-text text-muted"><?php echo __("Shortname for the station location. For example: Home (HM54ip)"); ?></small>
 		  </div>
 
 			<div class="mb-3">
-		    <label for="stationCallsignInput"><?php echo lang("station_location_callsign"); ?></label>
+		    <label for="stationCallsignInput"><?php echo __("Station Callsign"); ?></label>
 		    <input type="text" class="form-control" name="station_callsign" id="stationCallsignInput" aria-describedby="stationCallsignInputHelp" placeholder="4W7EST" required>
-		    <small id="stationCallsignInputHelp" class="form-text text-muted"><?php echo lang("station_location_callsign_hint"); ?></small>
+		    <small id="stationCallsignInputHelp" class="form-text text-muted"><?php echo __("Station callsign. For example: 4W7EST/P"); ?></small>
 		  </div>
 
 			<div class="mb-3">
-		    <label for="stationPowerInput"><?php echo lang("station_location_power"); ?></label>
+		    <label for="stationPowerInput"><?php echo __("Station Power (W)"); ?></label>
 		    <input type="number" class="form-control" name="station_power" id="stationPowerInput" step="1" aria-describedby="stationPowerInputHelp" placeholder="10">
-		    <small id="stationPowerInputHelp" class="form-text text-muted"><?php echo lang("station_location_power_hint"); ?></small>
+		    <small id="stationPowerInputHelp" class="form-text text-muted"><?php echo __("Default station power in Watt. Overwritten by CAT."); ?></small>
 		  </div>
 		  <div class="mb-3">
-		    <label for="stationDXCCInput"><?php echo lang("station_location_dxcc"); ?></label>
+		    <label for="stationDXCCInput"><?php echo __("Station DXCC"); ?></label>
 				<?php if ($dxcc_list->num_rows() > 0) { ?>
 				<select class="form-select" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp">
-				<option value="0" selected><?php echo "- " . lang('general_word_none') . " -"; ?></option>
+				<option value="0" selected><?php echo "- " . __("None") . " -"; ?></option>
 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
-				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.lang('gen_hamradio_deleted_dxcc').')';?>
+				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.__("Deleted DXCC").')';?>
 				</option>
 				<?php } ?>
 				</select>
 				<?php } ?>
-		    <small id="stationDXCCInputHelp" class="form-text text-muted"><?php echo lang("station_location_dxcc_hint"); ?></small>
+		    <small id="stationDXCCInputHelp" class="form-text text-muted"><?php echo __("Station DXCC entity. For example: Scotland"); ?></small>
 			<div class="alert alert-danger" role="alert" id="warningMessageDXCC" style="display: none"> </div>
 		  </div>
 
 		  <div class="mb-3">
-		    <label for="stationCityInput"><?php echo lang("station_location_city"); ?></label>
+		    <label for="stationCityInput"><?php echo __("Station City"); ?></label>
 		    <input type="text" class="form-control" name="city" id="stationCityInput" aria-describedby="stationCityInputHelp">
-		    <small id="stationCityInputHelp" class="form-text text-muted"><?php echo lang("station_location_city_hint"); ?></small>
+		    <small id="stationCityInputHelp" class="form-text text-muted"><?php echo __("Station city. For example: Inverness"); ?></small>
 		  </div>
 
         <!-- State -->
@@ -72,19 +72,19 @@
 			<select class="form-select" name="station_state" id="stateDropdown">
 				<option value=""></option>
 			</select>
-			<small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
+			<small id="StateHelp" class="form-text text-muted"><?php echo __("Station state. Applies to certain countries only. Leave blank if not applicable."); ?></small>
 		</div>
 
 		<!-- US County -->
 		<div class="mb-3" id="location_us_county">
-			<label for="stationCntyInput"><?php echo lang("station_location_county"); ?></label>
+			<label for="stationCntyInput"><?php echo __("Station County"); ?></label>
 			<input type="text" class="form-control" name="station_cnty" id="stationCntyInputEdit" aria-describedby="stationCntyInputHelp">
-			<small id="stationCntyInputHelp" class="form-text text-muted"><?php echo lang("station_location_county_hint"); ?></small>
+			<small id="stationCntyInputHelp" class="form-text text-muted"><?php echo __("Station County (Only used for USA/Alaska/Hawaii)."); ?></small>
 		</div>
 
 		<div class="row">
 			<div class="mb-3 col-sm-6">
-				<label for="stationCQZoneInput"><?php echo lang("gen_hamradio_cq_zone"); ?></label>
+				<label for="stationCQZoneInput"><?php echo __("CQ Zone"); ?></label>
 				<select class="form-select" id="stationCQZoneInput" name="station_cq" required>
 					<?php
 					for ($i = 1; $i<=40; $i++) {
@@ -94,11 +94,11 @@
 					}
 					?>
 				</select>
-				<small id="stationCQInputHelp" class="form-text text-muted"><?php echo lang("gen_find_zone_cq_part1")." <a href='https://zone-check.eu/?m=cq' target='_blank'>".lang("gen_find_zone_part2")."</a> ".lang("gen_find_zone_part3"); ?></small>
+				<small id="stationCQInputHelp" class="form-text text-muted"><?php echo __("If you don't know your CQ Zone then")." <a href='https://zone-check.eu/?m=cq' target='_blank'>".__("click here")."</a> ".__("to find it!"); ?></small>
 			</div>
 
 			<div class="mb-3 col-sm-6">
-				<label for="stationITUZoneInput"><?php echo lang("gen_hamradio_itu_zone"); ?></label>
+				<label for="stationITUZoneInput"><?php echo __("ITU Zone"); ?></label>
 				<select class="form-select" id="stationITUZoneInput" name="station_itu" required>
 					<?php
 					for ($i = 1; $i<=90; $i++) {
@@ -108,26 +108,26 @@
 					}
 					?>
 				</select>
-				<small id="stationITUInputHelp" class="form-text text-muted"><?php echo lang("gen_find_zone_itu_part1")." <a href='https://zone-check.eu/?m=itu' target='_blank'>".lang("gen_find_zone_part2")."</a> ".lang("gen_find_zone_part3"); ?></small>
+				<small id="stationITUInputHelp" class="form-text text-muted"><?php echo __("If you don't know your ITU Zone then")." <a href='https://zone-check.eu/?m=itu' target='_blank'>".__("click here")."</a> ".__("to find it!"); ?></small>
 			</div>
 		</div>
 
 		  <div class="mb-3">
-		    <label for="stationGridsquareInput"><?php echo lang("station_location_gridsquare"); ?></label>
+		    <label for="stationGridsquareInput"><?php echo __("Station Gridsquare"); ?></label>
 
 			<div class="input-group mb-3">
 			<input type="text" class="form-control" name="gridsquare" id="stationGridsquareInput" aria-describedby="stationGridInputHelp" required>
 			<div class="input-group-append">
-				<button type="button" class="btn btn-outline-secondary" onclick="getLocation()"><i class="fas fa-compass"></i> <?php echo lang("gen_hamradio_get_gridsquare"); ?></button>
+				<button type="button" class="btn btn-outline-secondary" onclick="getLocation()"><i class="fas fa-compass"></i> <?php echo __("Get Gridsquare"); ?></button>
 			</div>
 			</div>
 
 		    <small id="stationGridInputHelp" class="form-text text-muted"><?php echo lang("station_location_gridsquare_hint_ln1"); ?></small>
-		    <small id="stationGridInputHelp" class="form-text text-muted"><?php echo lang("station_location_gridsquare_hint_ln2"); ?></small>
+		    <small id="stationGridInputHelp" class="form-text text-muted"><?php echo __("If you are located on a grid line, enter multiple grid squares separated with commas. For example: IO77,IO78,IO87,IO88."); ?></small>
 		  </div>
 
             <div class="mb-3">
-                <label for="stationIOTAInput"><?php echo lang("gen_hamradio_iota_reference"); ?></label>
+                <label for="stationIOTAInput"><?php echo __("IOTA Reference"); ?></label>
                 <select class="form-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
                     <option value =""></option>
 
@@ -138,90 +138,90 @@
                     ?>
 
                 </select>
-                <small id="stationIOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_iota_hint_ln1"); ?></small>
+                <small id="stationIOTAInputHelp" class="form-text text-muted"><?php echo __("Station IOTA reference. For example: EU-005"); ?></small>
                 <small id="stationIOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_iota_hint_ln2"); ?></small>
             </div>
 
 		  <div class="mb-3">
-		    <label for="stationSOTAInput"><?php echo lang("gen_hamradio_sota_reference"); ?></label>
+		    <label for="stationSOTAInput"><?php echo __("SOTA Reference"); ?></label>
 		    <input type="text" class="form-control" name="sota" id="stationSOTAInput" aria-describedby="stationSOTAInputHelp">
 		    <small id="stationSOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_sota_hint_ln1"); ?></small>
 		  </div>
 
 		  <div class="mb-3">
-		    <label for="stationWWFFInput"><?php echo lang("gen_hamradio_wwff_reference"); ?></label>
+		    <label for="stationWWFFInput"><?php echo __("WWFF Reference"); ?></label>
 		    <input type="text" class="form-control" name="wwff" id="stationWWFFInput" aria-describedby="stationWWFFInputHelp">
 		    <small id="stationWWFFInputHelp" class="form-text text-muted"><?php echo lang("station_location_wwff_hint_ln1"); ?></small>
 		  </div>
 
 		  <div class="mb-3">
-		    <label for="stationPOTAInput"><?php echo lang("gen_hamradio_pota_reference"); ?></label>
+		    <label for="stationPOTAInput"><?php echo __("POTA Reference(s)"); ?></label>
 		    <input type="text" class="form-control" name="pota" id="stationPOTAInput" aria-describedby="stationPOTAInputHelp">
 		    <small id="stationPOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_pota_hint_ln1"); ?></small>
 		  </div>
 
 		  <div class="mb-3">
-		    <label for="stationSigInput"><?php echo lang("station_location_signature"); ?></label>
+		    <label for="stationSigInput"><?php echo __("Signature"); ?></label>
 		    <input type="text" class="form-control" name="sig" id="stationSigInput" aria-describedby="stationSigInputHelp">
-		    <small id="stationSigInputHelp" class="form-text text-muted"><?php echo lang("station_location_signature_name_hint"); ?></small>
+		    <small id="stationSigInputHelp" class="form-text text-muted"><?php echo __("Station Signature (e.g. GMA).."); ?></small>
 		  </div>
 
 		  <div class="mb-3">
-		    <label for="stationSigInfoInput"><?php echo lang("station_location_signature_info"); ?></label>
+		    <label for="stationSigInfoInput"><?php echo __("Signature Information"); ?></label>
 		    <input type="text" class="form-control" name="sig_info" id="stationSigInfoInput" aria-describedby="stationSigInfoInputHelp">
-		    <small id="stationSigInfoInput" class="form-text text-muted"><?php echo lang("station_location_signature_info_hint"); ?></small>
+		    <small id="stationSigInfoInput" class="form-text text-muted"><?php echo __("Station Signature Info (e.g. DA/NW-357)."); ?></small>
 		  </div>
 
             <div class="mb-3">
                 <label for="eqslNickname">eQSL QTH Nickname</label> <!-- This does not need Multilanguage Support -->
                 <input type="text" class="form-control" name="eqslnickname" id="eqslNickname" aria-describedby="eqslhelp">
-                <small id="eqslhelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_hint"); ?></small>
+                <small id="eqslhelp" class="form-text text-muted"><?php echo __("The QTH Nickname which is configured in your eQSL Profile"); ?></small>
             </div>
 
 			<div class="mb-3">
-				<label for="eqslDefaultQSLMsg"><?php echo lang("station_location_eqsl_defaultqslmsg"); ?></label>
+				<label for="eqslDefaultQSLMsg"><?php echo __("Default QSLMSG"); ?></label>
 				<label class="position-absolute end-0 mb-2 me-3" for="eqslDefaultQSLMsg" id="charsLeft"> </label>
 				<textarea class="form-control" name="eqsl_default_qslmsg" id="eqslDefaultQSLMsg" aria-describedby="eqsldefaultqslmsghelp" maxlength="240" rows="2" style="width:100%;"></textarea>
-				<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_defaultqslmsg_hint"); ?></small>
+				<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?php echo __("Define a default message that will be populated and sent for each QSO for this station location."); ?></small>
 			</div>
 			<div class="mb-3">
-				<label for="clublogignore"><?php echo lang("station_location_ignore"); ?></label>
+				<label for="clublogignore"><?php echo __("Ignore Clublog Upload"); ?></label>
 				<select class="form-select" id="clublogignore" name="clublogignore">
-					<option value="1" ><?php echo lang("general_word_yes"); ?></option>
-					<option value="0" selected><?php echo lang("general_word_no"); ?></option>
+					<option value="1" ><?php echo __("Yes"); ?></option>
+					<option value="0" selected><?php echo __("No"); ?></option>
 				</select>
-				<small class="form-text text-muted"><?php echo lang("station_location_ignore_hint"); ?></small>
+				<small class="form-text text-muted"><?php echo __("If enabled, the QSOs made from this location will not be uploaded to Clublog. If this is deactivated on it's own please check if the Call is properly configured at Clublog"); ?></small>
 			</div>
             <div class="mb-3" id="clublogrealtimediv">
-				<label for="clublogrealtime"><?php echo lang("station_location_clublog_realtime_upload"); ?></label>
+				<label for="clublogrealtime"><?php echo __("ClubLog Realtime Upload"); ?></label>
 				<select class="form-select" id="clublogrealtime" name="clublogrealtime">
-					<option value="1"><?php echo lang("general_word_yes"); ?></option>
-					<option value="0" selected><?php echo lang("general_word_no"); ?></option>
+					<option value="1"><?php echo __("Yes"); ?></option>
+					<option value="0" selected><?php echo __("No"); ?></option>
 				</select>
 			</div>
 
             <div class="row">
 				<div class="mb-3 col-sm-3">                                                                                                                                                    
-					<label for="hrdlog_username"><?php echo lang("station_location_hrdlog_username"); ?></label> 
+					<label for="hrdlog_username"><?php echo __("HRDLog.net Username"); ?></label> 
                     <input type="text" class="form-control" name="hrdlog_username" id="hrdlog_username" aria-describedby="hrdlog_usernameHelp">
-                    <small id="hrdlog_usernameHelp" class="form-text text-muted"><?php echo lang("station_location_hrdlog_username_hint"); ?></a></small>
+                    <small id="hrdlog_usernameHelp" class="form-text text-muted"><?php echo __("The username you are registered with at HRDlog.net (usually your callsign)."); ?></a></small>
                 </div>
                 <div class="mb-3 col-sm-3">                                                                                                                                                    
-					<label for="hrdlog_code"><?php echo lang("station_location_hrdlog_code"); ?></label>
+					<label for="hrdlog_code"><?php echo __("HRDLog.net API Key"); ?></label>
                     <input type="text" class="form-control" name="hrdlog_code" id="hrdlog_code" aria-describedby="hrdlog_codeHelp">
                     <small id="hrdlog_codeHelp" class="form-text text-muted"><?php echo lang("station_location_hrdlog_code_hint"); ?></a></small>
                 </div>
                 <div class="mb-3 col-sm-3">
-                    <label for="hrdlogrealtime"><?php echo lang("station_location_hrdlog_realtime_upload"); ?></label>                                                                                                                 
+                    <label for="hrdlogrealtime"><?php echo __("HRDLog.net Logbook Realtime Upload"); ?></label>                                                                                                                 
 					<select class="form-select" id="hrdlogrealtime" name="hrdlogrealtime">
-                        <option value="1"><?php echo lang("general_word_yes"); ?></option>
-                        <option value="0" selected><?php echo lang("general_word_no"); ?></option>
+                        <option value="1"><?php echo __("Yes"); ?></option>
+                        <option value="0" selected><?php echo __("No"); ?></option>
                     </select>
                 </div>
             </div>
 
 			<div class="alert alert-warning" role="alert">
-				<?php echo "QRZ.com - " . lang("station_location_qrz_subscription"); ?>
+				<?php echo "QRZ.com - " . __("Subscription Required"); ?>
 			</div>
 
             <div class="row">
@@ -235,11 +235,11 @@
                     <small id="qrzApiKeyHelp" class="form-text text-muted"><?php echo lang("station_location_qrz_hint"); ?></a></small>
                 </div>
                 <div class="mb-3 col-sm-6">
-                    <label for="qrzrealtime"><?php echo lang("station_location_qrz_realtime_upload"); ?></label>
+                    <label for="qrzrealtime"><?php echo __("QRZ.com Logbook Upload"); ?></label>
                     <select class="form-select" id="qrzrealtime" name="qrzrealtime">
-                        <option value="-1" selected><?php echo lang("general_word_disabled"); ?></option>
-                        <option value="1"><?php echo lang("general_word_realtime"); ?></option>
-                        <option value="0"><?php echo lang("general_word_enabled"); ?></option>
+                        <option value="-1" selected><?php echo __("Disabled"); ?></option>
+                        <option value="1"><?php echo __("Realtime"); ?></option>
+                        <option value="0"><?php echo __("Enabled"); ?></option>
                     </select>
                 </div>
             </div>
@@ -251,36 +251,36 @@
 					<small id="webadifApiKeyHelp" class="form-text text-muted"><?php echo lang("station_location_qo100_hint"); ?></a></small>
 				</div>
 				<div class="mb-3 col-sm-6">
-					<label for="webadifrealtime"><?php echo lang("station_location_qo100_realtime_upload"); ?></label>
+					<label for="webadifrealtime"><?php echo __("QO-100 Dx Club Realtime Upload"); ?></label>
 					<select class="form-select" id="webadifrealtime" name="webadifrealtime">
-						<option value="1"><?php echo lang("general_word_yes"); ?></option>
-						<option value="0" selected><?php echo lang("general_word_no"); ?></option>
+						<option value="1"><?php echo __("Yes"); ?></option>
+						<option value="0" selected><?php echo __("No"); ?></option>
 					</select>
 				</div>
 			</div>
 
 			<div class="mb-3">
-				<label for="oqrs"><?php echo lang("station_location_oqrs_enabled"); ?></label>
+				<label for="oqrs"><?php echo __("OQRS Enabled"); ?></label>
 				<select class="form-select" id="oqrs" name="oqrs">
-					<option value="0"><?php echo lang("general_word_no"); ?></option>
-					<option value="1"><?php echo lang("general_word_yes"); ?></option>
+					<option value="0"><?php echo __("No"); ?></option>
+					<option value="1"><?php echo __("Yes"); ?></option>
 				</select>
 			</div>
 			<div class="mb-3">
-						<label for="oqrs"><?php echo lang("station_location_oqrs_email_alert"); ?></label>
+						<label for="oqrs"><?php echo __("OQRS Email alert"); ?></label>
 						<select class="form-select" id="oqrsemail" name="oqrsemail">
-						<option value="0"><?php echo lang("general_word_no"); ?></option>
-						<option value="1"><?php echo lang("general_word_yes"); ?></option>
+						<option value="0"><?php echo __("No"); ?></option>
+						<option value="1"><?php echo __("Yes"); ?></option>
 						</select>
-						<small id="oqrsemailHelp" class="form-text text-muted"><?php echo lang("station_location_oqrs_email_hint"); ?></small>
+						<small id="oqrsemailHelp" class="form-text text-muted"><?php echo __("Make sure email is set up under admin and global options."); ?></small>
 					</div>
 			<div class="mb-3">
-				<label for="oqrstext"><?php echo lang("station_location_oqrs_text"); ?></label>
+				<label for="oqrstext"><?php echo __("OQRS Text"); ?></label>
 				<input type="text" class="form-control" name="oqrstext" id="oqrstext" aria-describedby="oqrstextHelp">
-				<small id="oqrstextHelp" class="form-text text-muted"><?php echo lang("station_location_oqrs_text_hint"); ?></small>
+				<small id="oqrstextHelp" class="form-text text-muted"><?php echo __("Some info you want to add regarding QSL'ing."); ?></small>
 			</div>
 
-			<button type="submit" class="btn btn-primary"><i class="fas fa-plus-square"></i> <?php echo lang("admin_create"); ?> <?php echo lang("station_location"); ?></button>
+			<button type="submit" class="btn btn-primary"><i class="fas fa-plus-square"></i> <?php echo __("Create"); ?> <?php echo __("Station Location"); ?></button>
 
 		</form>
   </div>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index 7667a59cf..df4e20450 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -19,13 +19,13 @@
 	<?php echo validation_errors(); ?>
 
 	<?php if($my_station_profile->station_id != NULL) {
-		$form_action = lang("admin_update");
+		$form_action = __("Update");
 	?>
 		<form method="post" action="<?php echo site_url('station/edit/'); ?><?php echo $my_station_profile->station_id; ?>" name="create_profile">
 			<input type="hidden" name="station_id" value="<?php echo $my_station_profile->station_id; ?>">
 
 	<?php } else {
-		$form_action = lang("admin_create");
+		$form_action = __("Create");
 	?>
 		<form method="post" action="<?php echo site_url('station/copy/'); ?><?php echo $copy_from; ?>" name="create_profile">
 	<?php } ?>
@@ -33,25 +33,25 @@
 	<div class="row">
 		<div class="col-md">
 			<div class="card">
-				<div class="card-header"><?php echo $page_title; ?> <?php echo "(" . lang("gen_hamradio_callsign") . ": "; ?> <?php echo $my_station_profile->station_callsign; ?>)</div>
+				<div class="card-header"><?php echo $page_title; ?> <?php echo "(" . __("Callsign") . ": "; ?> <?php echo $my_station_profile->station_callsign; ?>)</div>
 				<div class="card-body">
 
 					<div class="mb-3">
-						<label for="stationNameInput"><?php echo lang("station_location_name"); ?></label>
+						<label for="stationNameInput"><?php echo __("Profile Name"); ?></label>
 						<input type="text" class="form-control" name="station_profile_name" id="stationNameInput" aria-describedby="stationNameInputHelp" value="<?php if(set_value('station_profile_name') != "") { echo set_value('station_profile_name'); } else { echo $my_station_profile->station_profile_name; } ?>" required>
-						<small id="stationNameInputHelp" class="form-text text-muted"><?php echo lang("station_location_name_hint"); ?></small>
+						<small id="stationNameInputHelp" class="form-text text-muted"><?php echo __("Shortname for the station location. For example: Home (HM54ip)"); ?></small>
 					</div>
 
 					<div class="mb-3">
-						<label for="stationCallsignInput"><?php echo lang("station_location_callsign"); ?></label>
+						<label for="stationCallsignInput"><?php echo __("Station Callsign"); ?></label>
 						<input type="text" class="form-control" name="station_callsign" id="stationCallsignInput" aria-describedby="stationCallsignInputHelp" value="<?php if(set_value('station_callsign') != "") { echo set_value('station_callsign'); } else { echo $my_station_profile->station_callsign; } ?>" required>
-						<small id="stationCallsignInputHelp" class="form-text text-muted"><?php echo lang("station_location_callsign_hint"); ?></small>
+						<small id="stationCallsignInputHelp" class="form-text text-muted"><?php echo __("Station callsign. For example: 4W7EST/P"); ?></small>
 					</div>
 
 					<div class="mb-3">
-						<label for="stationPowerInput"><?php echo lang("station_location_power"); ?></label>
+						<label for="stationPowerInput"><?php echo __("Station Power (W)"); ?></label>
 						<input type="number" class="form-control" name="station_power" step="1" id="stationPowerInput" aria-describedby="stationPowerInputHelp" value="<?php if(set_value('station_power') != "") { echo set_value('station_power'); } else { echo $my_station_profile->station_power; } ?>">
-						<small id="stationPowerInputHelp" class="form-text text-muted"><?php echo lang("station_location_power_hint"); ?></small>
+						<small id="stationPowerInputHelp" class="form-text text-muted"><?php echo __("Default station power in Watt. Overwritten by CAT."); ?></small>
 					</div>
 				</div>
 			</div>
@@ -62,35 +62,35 @@
 		<!-- Location Ends -->
 		<div class="col-md">
 			<div class="card">
-				<div class="card-header"><?php echo lang("general_word_location"); ?></div>
+				<div class="card-header"><?php echo __("Location"); ?></div>
 				<div class="card-body">
 					<!-- DXCC -->
 					<div class="mb-3">
-					    <label for="stationDXCCInput"><?php echo lang("station_location_dxcc"); ?></label>
+					    <label for="stationDXCCInput"><?php echo __("Station DXCC"); ?></label>
 					    <?php if ($dxcc_list->num_rows() > 0) { ?>
 					        <select class="form-select" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp">
-					            <option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>><?php echo "- " . lang('general_word_none') . " -"; ?></option>
+					            <option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>><?php echo "- " . __("None") . " -"; ?></option>
 					            <?php foreach ($dxcc_list->result() as $dxcc) { ?>
 					                <?php $isDeleted = $dxcc->end !== NULL; ?>
 					                <option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>>
 					                    <?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
 					                    if ($isDeleted) {
-					                        echo ' (' . lang('gen_hamradio_deleted_dxcc') . ')';
+					                        echo ' (' . __("Deleted DXCC") . ')';
 					                    }
 					                    ?>
 					                </option>
 					            <?php } ?>
 					        </select>
 					        <?php } ?>
-					    <small id="stationDXCCInputHelp" class="form-text text-muted"><?php echo lang("station_location_dxcc_hint"); ?></small>
+					    <small id="stationDXCCInputHelp" class="form-text text-muted"><?php echo __("Station DXCC entity. For example: Scotland"); ?></small>
 						<div class="alert alert-danger" role="alert" id="warningMessageDXCC" style="display: none"></div>
 					</div>
 
 					<!-- City -->
 					<div class="mb-3">
-						<label for="stationCityInput"><?php echo lang("station_location_city"); ?></label>
+						<label for="stationCityInput"><?php echo __("Station City"); ?></label>
 						<input type="text" class="form-control" name="city" id="stationCityInput" aria-describedby="stationCityInputHelp" value="<?php if(set_value('city') != "") { echo set_value('city'); } else { echo $my_station_profile->station_city; } ?>">
-		    			<small id="stationCityInputHelp" class="form-text text-muted"><?php echo lang("station_location_city_hint"); ?></small>
+		    			<small id="stationCityInputHelp" class="form-text text-muted"><?php echo __("Station city. For example: Inverness"); ?></small>
 		  			</div>
 
 					<!-- State -->
@@ -102,14 +102,14 @@
 						<select class="form-select" name="station_state" id="stateDropdown">
 							<option value=""></option>
 						</select>
-						<small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
+						<small id="StateHelp" class="form-text text-muted"><?php echo __("Station state. Applies to certain countries only. Leave blank if not applicable."); ?></small>
 					</div>
 
 					<!-- US County -->
 					<div class="mb-3" id="location_us_county">
-						<label for="stationCntyInput"><?php echo lang("station_location_county"); ?></label>
+						<label for="stationCntyInput"><?php echo __("Station County"); ?></label>
 						<input type="text" class="form-control" name="station_cnty" id="stationCntyInputEdit" aria-describedby="stationCntyInputHelp" value="<?php if(set_value('station_cnty') != "") { echo set_value('station_cnty'); } else { echo $my_station_profile->station_cnty; } ?>">
-						<small id="stationCntyInputHelp" class="form-text text-muted"><?php echo lang("station_location_county_hint"); ?></small>
+						<small id="stationCntyInputHelp" class="form-text text-muted"><?php echo __("Station County (Only used for USA/Alaska/Hawaii)."); ?></small>
 					</div>
 				</div>
 			</div>
@@ -119,11 +119,11 @@
 		<!-- Zones -->
 		<div class="col-md">
 			<div class="card">
-				<div class="card-header"><?php echo lang("gen_hamradio_zones"); ?></div>
+				<div class="card-header"><?php echo __("Zones"); ?></div>
 				<div class="card-body">
 					<!-- CQ Zone -->
 					<div class="mb-3">
-						<label for="stationCQZoneInput"><?php echo lang("gen_hamradio_cq_zone"); ?></label>
+						<label for="stationCQZoneInput"><?php echo __("CQ Zone"); ?></label>
 						<select class="form-select" id="stationCQZoneInput" name="station_cq" required>
 							<?php
 							for ($i = 1; $i<=40; $i++) {
@@ -135,12 +135,12 @@
 							}
 							?>
 						</select>
-						<small id="stationCQInputHelp" class="form-text text-muted"><?php echo lang("gen_find_zone_cq_part1")." <a href='https://zone-check.eu/?m=cq' target='_blank'>".lang("gen_find_zone_part2")."</a> ".lang("gen_find_zone_part3"); ?></small>
+						<small id="stationCQInputHelp" class="form-text text-muted"><?php echo __("If you don't know your CQ Zone then")." <a href='https://zone-check.eu/?m=cq' target='_blank'>".__("click here")."</a> ".__("to find it!"); ?></small>
 					</div>
 
 					<!-- ITU Zone -->
 					<div class="mb-3">
-                    	<label for="stationITUZoneInput"><?php echo lang("gen_hamradio_itu_zone"); ?></label>
+                    	<label for="stationITUZoneInput"><?php echo __("ITU Zone"); ?></label>
                     	<select class="form-select" id="stationITUZoneInput" name="station_itu" required>
 							<?php
 							for ($i = 1; $i<=90; $i++) {
@@ -152,7 +152,7 @@
 							}
 							?>
                     	</select>
-                    	<small id="stationITUInputHelp" class="form-text text-muted"><?php echo lang("gen_find_zone_itu_part1")." <a href='https://zone-check.eu/?m=itu' target='_blank'>".lang("gen_find_zone_part2")."</a> ".lang("gen_find_zone_part3"); ?></small>
+                    	<small id="stationITUInputHelp" class="form-text text-muted"><?php echo __("If you don't know your ITU Zone then")." <a href='https://zone-check.eu/?m=itu' target='_blank'>".__("click here")."</a> ".__("to find it!"); ?></small>
                 	</div>
 
 				</div>
@@ -164,20 +164,20 @@
 	<div class="row">
 		<div class="col-md">
 			<div class="card">
-				<h5 class="card-header"><?php echo lang("station_location_gridsquare"); ?></h5>
+				<h5 class="card-header"><?php echo __("Station Gridsquare"); ?></h5>
 				<div class="card-body">
 					<div class="mb-3">
-		    			<label for="stationGridsquareInput"><?php echo lang("station_location_gridsquare"); ?></label>
+		    			<label for="stationGridsquareInput"><?php echo __("Station Gridsquare"); ?></label>
 
 						<div class="input-group mb-3">
 						<input type="text" class="form-control" name="gridsquare" id="stationGridsquareInput" aria-describedby="stationGridInputHelp" value="<?php if(set_value('gridsquare') != "") { echo set_value('gridsquare'); } else { echo $my_station_profile->station_gridsquare; } ?>" required>
 							<div class="input-group-append">
-								<button type="button" class="btn btn-outline-secondary" onclick="getLocation()"><i class="fas fa-compass"></i> <?php echo lang("gen_hamradio_get_gridsquare"); ?></button>
+								<button type="button" class="btn btn-outline-secondary" onclick="getLocation()"><i class="fas fa-compass"></i> <?php echo __("Get Gridsquare"); ?></button>
 							</div>
 						</div>
 
 		    			<small id="stationGridInputHelp" class="form-text text-muted"><?php echo lang("station_location_gridsquare_hint_ln1"); ?></small>
-		    			<small id="stationGridInputHelp" class="form-text text-muted"><?php echo lang("station_location_gridsquare_hint_ln2"); ?></small>
+		    			<small id="stationGridInputHelp" class="form-text text-muted"><?php echo __("If you are located on a grid line, enter multiple grid squares separated with commas. For example: IO77,IO78,IO87,IO88."); ?></small>
 		  			</div>
 				</div>
 			</div>
@@ -185,10 +185,10 @@
 
 		<div class="col-md">
 			<div class="card">
-				<h5 class="card-header"><?php echo lang("gen_hamradio_iota"); ?></h5>
+				<h5 class="card-header"><?php echo __("IOTA"); ?></h5>
 				<div class="card-body">
 					<div class="mb-3">
-                		<label for="stationIOTAInput"><?php echo lang("gen_hamradio_iota_reference"); ?></label>
+                		<label for="stationIOTAInput"><?php echo __("IOTA Reference"); ?></label>
                 		<select class="form-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
                     		<option value =""></option>
                     		<?php
@@ -202,7 +202,7 @@
                     		?>
                 		</select>
 
-						<small id="stationIOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_iota_hint_ln1"); ?></small>
+						<small id="stationIOTAInputHelp" class="form-text text-muted"><?php echo __("Station IOTA reference. For example: EU-005"); ?></small>
                 		<small id="stationIOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_iota_hint_ln2"); ?></small>
             		</div>
 				</div>
@@ -213,10 +213,10 @@
 	<div class="row">
 		<div class="col-md">
 			<div class="card">
-				<h5 class="card-header"><?php echo lang("gen_hamradio_sota"); ?></h5>
+				<h5 class="card-header"><?php echo __("SOTA"); ?></h5>
 				<div class="card-body">
 					<div class="mb-3">
-		    			<label for="stationSOTAInput"><?php echo lang("gen_hamradio_sota_reference"); ?></label>
+		    			<label for="stationSOTAInput"><?php echo __("SOTA Reference"); ?></label>
 		    			<input type="text" class="form-control" name="sota" id="stationSOTAInput" aria-describedby="stationSOTAInputHelp" value="<?php if(set_value('sota') != "") { echo set_value('sota'); } else { echo $my_station_profile->station_sota; } ?>">
 		    			<small id="stationSOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_sota_hint_ln1"); ?></small>
 		  			</div>
@@ -226,10 +226,10 @@
 
 		<div class="col-md">
 			<div class="card">
-				<h5 class="card-header"><?php echo lang("gen_hamradio_wwff"); ?></h5>
+				<h5 class="card-header"><?php echo __("WWFF"); ?></h5>
 				<div class="card-body">
 					<div class="mb-3">
-						<label for="stationWWFFInput"><?php echo lang("gen_hamradio_wwff_reference"); ?></label>
+						<label for="stationWWFFInput"><?php echo __("WWFF Reference"); ?></label>
 						<input type="text" class="form-control" name="wwff" id="stationWWFFInput" aria-describedby="stationWWFFInputHelp" value="<?php if(set_value('wwff') != "") { echo set_value('wwff'); } else { echo $my_station_profile->station_wwff; } ?>">
 						<small id="stationWWFFInputHelp" class="form-text text-muted"><?php echo lang("station_location_wwff_hint_ln1"); ?></small>
 					</div>
@@ -239,10 +239,10 @@
 
 		<div class="col-md">
 			<div class="card">
-				<h5 class="card-header"><?php echo lang("gen_hamradio_pota"); ?></h5>
+				<h5 class="card-header"><?php echo __("POTA"); ?></h5>
 				<div class="card-body">
 					<div class="mb-3">
-						<label for="stationPOTAInput"><?php echo lang("gen_hamradio_pota_reference"); ?></label>
+						<label for="stationPOTAInput"><?php echo __("POTA Reference(s)"); ?></label>
 						<input type="text" class="form-control" name="pota" id="stationPOTAInput" aria-describedby="stationPOTAInputHelp" value="<?php if(set_value('pota') != "") { echo set_value('pota'); } else { echo $my_station_profile->station_pota; } ?>">
 						<small id="stationPOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_pota_hint_ln1"); ?></small>
 					</div>
@@ -254,18 +254,18 @@
 	<div class="row">
 		<div class="col-md">
 			<div class="card">
-				<h5 class="card-header"><?php echo lang("station_location_signature"); ?></h5>
+				<h5 class="card-header"><?php echo __("Signature"); ?></h5>
 				<div class="card-body">
 					<div class="mb-3">
-		    			<label for="stationSigInput"><?php echo lang("station_location_signature_name"); ?></label>
+		    			<label for="stationSigInput"><?php echo __("Signature Name"); ?></label>
 		    			<input type="text" class="form-control" name="sig" id="stationSigInput" aria-describedby="stationSigInputHelp" value="<?php if(set_value('sig') != "") { echo set_value('sig'); } else { echo $my_station_profile->station_sig; } ?>">
-		    			<small id="stationSigInputHelp" class="form-text text-muted"><?php echo lang("station_location_signature_name_hint"); ?></small>
+		    			<small id="stationSigInputHelp" class="form-text text-muted"><?php echo __("Station Signature (e.g. GMA).."); ?></small>
 					</div>
 
 					<div class="mb-3">
-		    			<label for="stationSigInfoInput"><?php echo lang("station_location_signature_info"); ?></label>
+		    			<label for="stationSigInfoInput"><?php echo __("Signature Information"); ?></label>
 		    			<input type="text" class="form-control" name="sig_info" id="stationSigInfoInput" aria-describedby="stationSigInfoInputHelp" value="<?php if(set_value('sig_info') != "") { echo set_value('sig_info'); } else { echo $my_station_profile->station_sig_info; } ?>">
-		    			<small id="stationSigInfoInputHelp" class="form-text text-muted"><?php echo lang("station_location_signature_info_hint"); ?></small>
+		    			<small id="stationSigInfoInputHelp" class="form-text text-muted"><?php echo __("Station Signature Info (e.g. DA/NW-357)."); ?></small>
 					</div>
 				</div>
 			</div>
@@ -275,18 +275,18 @@
 	<div class="row">
 		<div class="col-md">
 			<div class="card">
-				<h5 class="card-header"><?php echo lang("eqsl_short"); ?></h5>
+				<h5 class="card-header"><?php echo __("eQSL"); ?></h5>
 				<div class="card-body">
 					<div class="mb-3">
 		    			<label for="eqslNickname">eQSL QTH Nickname</label> <!-- This does not need Multilanguage Support -->
 		    			<input type="text" class="form-control" name="eqslnickname" id="eqslNickname" aria-describedby="eqslhelp" value="<?php if(set_value('eqslnickname') != "") { echo set_value('eqslnickname'); } else { echo $my_station_profile->eqslqthnickname; } ?>">
-		    			<small id="eqslhelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_hint"); ?></small>
+		    			<small id="eqslhelp" class="form-text text-muted"><?php echo __("The QTH Nickname which is configured in your eQSL Profile"); ?></small>
 		  			</div>
 					<div class="mb-3">
-		    			<label for="eqslDefaultQSLMsg"><?php echo lang("station_location_eqsl_defaultqslmsg"); ?></label>
+		    			<label for="eqslDefaultQSLMsg"><?php echo __("Default QSLMSG"); ?></label>
 						<label class="position-absolute end-0 mb-2 me-3" for="eqslDefaultQSLMsg" id="charsLeft"> </label>
 		    			<textarea class="form-control" name="eqsl_default_qslmsg" id="eqslDefaultQSLMsg" aria-describedby="eqsldefaultqslmsghelp" maxlength="240" rows="2" style="width:100%;" value="<?php echo $my_station_profile->eqsl_default_qslmsg; ?>"><?php echo $my_station_profile->eqsl_default_qslmsg; ?></textarea>
-		    			<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_defaultqslmsg_hint"); ?></small>
+		    			<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?php echo __("Define a default message that will be populated and sent for each QSO for this station location."); ?></small>
 		  			</div>
 				</div>
 			</div>
@@ -294,7 +294,7 @@
 
 		<div class="col-md">
 			<div class="card">
-				<h5 class="card-header">QRZ.com <span class="badge text-bg-warning"> <?php echo lang("station_location_qrz_subscription"); ?></span></h5> <!-- "QRZ.com" does not need Multilanguage Support -->
+				<h5 class="card-header">QRZ.com <span class="badge text-bg-warning"> <?php echo __("Subscription Required"); ?></span></h5> <!-- "QRZ.com" does not need Multilanguage Support -->
 				<div class="card-body">
 					<div class="mb-3">
 						<label for="qrzApiKey">QRZ.com Logbook API Key</label> <!-- This does not need Multilanguage Support -->
@@ -307,11 +307,11 @@
 					</div>
 
 					<div class="mb-3">
-						<label for="qrzrealtime"><?php echo lang("station_location_qrz_realtime_upload"); ?></label>
+						<label for="qrzrealtime"><?php echo __("QRZ.com Logbook Upload"); ?></label>
 						<select class="form-select" id="qrzrealtime" name="qrzrealtime">
-							<option value="-1" <?php if ($my_station_profile->qrzrealtime == -1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_disabled"); ?></option>
-							<option value="1" <?php if ($my_station_profile->qrzrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_realtime"); ?></option>
-							<option value="0" <?php if ($my_station_profile->qrzrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_enabled"); ?></option>
+							<option value="-1" <?php if ($my_station_profile->qrzrealtime == -1) { echo " selected =\"selected\""; } ?>><?php echo __("Disabled"); ?></option>
+							<option value="1" <?php if ($my_station_profile->qrzrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Realtime"); ?></option>
+							<option value="0" <?php if ($my_station_profile->qrzrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo __("Enabled"); ?></option>
 						</select>
 					</div>
 				</div>
@@ -325,18 +325,18 @@
 				<h5 class="card-header">ClubLog</h5> <!-- This does not need Multilanguage Support -->
 				<div class="card-body">
 					<div class="mb-3">
-						<label for="clublogignore"><?php echo lang("station_location_ignore"); ?></label>
+						<label for="clublogignore"><?php echo __("Ignore Clublog Upload"); ?></label>
 						<select class="form-select" id="clublogignore" name="clublogignore">
-							<option value="1" <?php if ($my_station_profile->clublogignore == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->clublogignore == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
+							<option value="1" <?php if ($my_station_profile->clublogignore == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->clublogignore == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 						</select>
-						<small class="form-text text-muted"><?php echo lang("station_location_ignore_hint"); ?></small>
+						<small class="form-text text-muted"><?php echo __("If enabled, the QSOs made from this location will not be uploaded to Clublog. If this is deactivated on it's own please check if the Call is properly configured at Clublog"); ?></small>
 					</div>
 					<div class="mb-3" id="clublogrealtimediv">
-						<label for="clublogrealtime"><?php echo lang("station_location_clublog_realtime_upload"); ?></label>
+						<label for="clublogrealtime"><?php echo __("ClubLog Realtime Upload"); ?></label>
 						<select class="form-select" id="clublogrealtime" name="clublogrealtime">
-							<option value="1" <?php if ($my_station_profile->clublogrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->clublogrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
+							<option value="1" <?php if ($my_station_profile->clublogrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->clublogrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 						</select>
 					</div>
 				</div>
@@ -349,20 +349,20 @@
 				<h5 class="card-header">HRDLog.net</h5> <!-- This does not need Multilanguage Support -->
 				<div class="card-body">
 					<div class="mb-3">
-						<label for="webadifApiKey"><?php echo lang("station_location_hrdlog_username"); ?></label>
+						<label for="webadifApiKey"><?php echo __("HRDLog.net Username"); ?></label>
 						<input type="text" class="form-control" name="hrdlog_username" id="hrdlog_username" aria-describedby="hrdlog_usernameHelp" value="<?php if(set_value('hrdlog_username') != "") { echo set_value('hrdlog_username'); } else { echo $my_station_profile->hrdlog_username; } ?>">
-						<small id="hrdlog_usernameHelp" class="form-text text-muted"><?php echo lang("station_location_hrdlog_username_hint"); ?></a></small>
+						<small id="hrdlog_usernameHelp" class="form-text text-muted"><?php echo __("The username you are registered with at HRDlog.net (usually your callsign)."); ?></a></small>
 					</div>
 					<div class="mb-3">
-						<label for="webadifApiKey"><?php echo lang("station_location_hrdlog_code"); ?></label> <!-- This does not need Multilanguage Support -->
+						<label for="webadifApiKey"><?php echo __("HRDLog.net API Key"); ?></label> <!-- This does not need Multilanguage Support -->
 						<input type="text" class="form-control" name="hrdlog_code" id="hrdlog_code" aria-describedby="hrdlog_codeHelp" value="<?php if(set_value('hrdlog_code') != "") { echo set_value('hrdlog_code'); } else { echo $my_station_profile->hrdlog_code; } ?>">
 						<small id="hrdlog_codeHelp" class="form-text text-muted"><?php echo lang("station_location_hrdlog_code_hint"); ?></a></small>
 					</div>
 					<div class="mb-3">
-						<label for="hrdlogrealtime"><?php echo lang("station_location_hrdlog_realtime_upload"); ?></label>
+						<label for="hrdlogrealtime"><?php echo __("HRDLog.net Logbook Realtime Upload"); ?></label>
 						<select class="form-select" id="hrdlogrealtime" name="hrdlogrealtime">
-							<option value="1" <?php if ($my_station_profile->hrdlogrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->hrdlogrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
+							<option value="1" <?php if ($my_station_profile->hrdlogrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->hrdlogrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 						</select>
 					</div>
 				</div>
@@ -380,10 +380,10 @@
 						<small id="webadifApiKeyHelp" class="form-text text-muted"><?php echo lang("station_location_qo100_hint"); ?></a></small>
 					</div>
 					<div class="mb-3">
-						<label for="webadifrealtime"><?php echo lang("station_location_qo100_realtime_upload"); ?></label>
+						<label for="webadifrealtime"><?php echo __("QO-100 Dx Club Realtime Upload"); ?></label>
 						<select class="form-select" id="webadifrealtime" name="webadifrealtime">
-							<option value="1" <?php if ($my_station_profile->webadifrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->webadifrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
+							<option value="1" <?php if ($my_station_profile->webadifrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->webadifrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 						</select>
 					</div>
 				</div>
@@ -396,24 +396,24 @@
 				<h5 class="card-header">OQRS</h5> <!-- This does not need Multilanguage Support -->
 				<div class="card-body">
 					<div class="mb-3">
-						<label for="oqrs"><?php echo lang("station_location_oqrs_enabled"); ?></label>
+						<label for="oqrs"><?php echo __("OQRS Enabled"); ?></label>
 						<select class="form-select" id="oqrs" name="oqrs">
-							<option value="1" <?php if ($my_station_profile->oqrs == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->oqrs == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
+							<option value="1" <?php if ($my_station_profile->oqrs == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->oqrs == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 						</select>
 					</div>
 					<div class="mb-3">
-						<label for="oqrs"><?php echo lang("station_location_oqrs_email_alert"); ?></label>
+						<label for="oqrs"><?php echo __("OQRS Email alert"); ?></label>
 						<select class="form-select" id="oqrsemail" name="oqrsemail">
-							<option value="1" <?php if ($my_station_profile->oqrs_email == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->oqrs_email == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
+							<option value="1" <?php if ($my_station_profile->oqrs_email == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->oqrs_email == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 						</select>
-						<small id="oqrsemailHelp" class="form-text text-muted"><?php echo lang("station_location_oqrs_email_hint"); ?></small>
+						<small id="oqrsemailHelp" class="form-text text-muted"><?php echo __("Make sure email is set up under admin and global options."); ?></small>
 					</div>
 					<div class="mb-3">
-						<label for="oqrstext"><?php echo lang("station_location_oqrs_text"); ?></label>
+						<label for="oqrstext"><?php echo __("OQRS Text"); ?></label>
 						<input type="text" class="form-control" name="oqrstext" id="oqrstext" aria-describedby="oqrstextHelp" value="<?php if(set_value('oqrs_text') != "") { echo set_value('oqrs_text'); } else { echo $my_station_profile->oqrs_text; } ?>">
-						<small id="oqrstextHelp" class="form-text text-muted"><?php echo lang("station_location_oqrs_text_hint"); ?></small>
+						<small id="oqrstextHelp" class="form-text text-muted"><?php echo __("Some info you want to add regarding QSL'ing."); ?></small>
 					</div>
 
 				</div>
@@ -421,7 +421,7 @@
 		</div>
 	</div>
 
-	<button type="submit" class="btn btn-primary" style="margin-bottom: 30px;"><i class="fas fa-plus-square"></i> <?php echo $form_action; ?> <?php echo lang("station_location"); ?></button>
+	<button type="submit" class="btn btn-primary" style="margin-bottom: 30px;"><i class="fas fa-plus-square"></i> <?php echo $form_action; ?> <?php echo __("Station Location"); ?></button>
 
 	</form>
 
diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php
index 6e6c09a30..fb5a4055e 100644
--- a/application/views/station_profile/index.php
+++ b/application/views/station_profile/index.php
@@ -12,25 +12,25 @@
 
 <div class="card">
   <div class="card-body">
-    <p class="card-text"><?php echo lang('station_location_header_ln1'); ?></p>
-	<p class="card-text"><?php echo lang('station_location_header_ln2'); ?></p>
-	<p class="card-text"><?php echo lang('station_location_header_ln3'); ?></p>
+    <p class="card-text"><?php echo __("Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station."); ?></p>
+	<p class="card-text"><?php echo __("Similar to logbooks, a station profile keeps a set of QSOs together."); ?></p>
+	<p class="card-text"><?php echo __("Only one station may be active at a time. In the table below this is shown with the -Active Station- badge."); ?></p>
 
-	  <p><a href="<?php echo site_url('station/create'); ?>" class="btn btn-primary"><i class="fas fa-plus"></i> <?php echo lang('station_location_create'); ?></a></p>
+	  <p><a href="<?php echo site_url('station/create'); ?>" class="btn btn-primary"><i class="fas fa-plus"></i> <?php echo __("Create a Station Location"); ?></a></p>
 
 		<?php if ($stations->num_rows() > 0) { ?>
 
 		<?php if($current_active == 0) { ?>
 		<div class="alert alert-danger" role="alert">
-		<?php echo lang('station_location_warning'); ?>
+		<?php echo __("Attention: You need to set an active station location. Go to Callsign->Station Location to select one."); ?>
 		</div>
 		<?php } ?>
 
 		<?php if (($is_there_qsos_with_no_station_id >= 1) && ($is_admin)) { ?>
 			<div class="alert alert-danger" role="alert">
-		  		<span class="badge rounded-pill text-bg-warning"><?php echo lang('general_word_warning'); ?></span> <?php echo lang('station_location_warning_reassign'); ?>
+		  		<span class="badge rounded-pill text-bg-warning"><?php echo __("Warning"); ?></span> <?php echo __("Due to recent changes within Wavelog you need to reassign QSOs to your station profiles."); ?>
 				</br>
-				<?php echo lang('station_location_reassign_at'); ?> <a href="<?php echo site_url('debug'); ?>" class="btn btn-warning"><i class="fas fa-sync"></i> <?php echo lang('account_word_admin') . "/" . lang('general_word_maintenance'); ?></a>
+				<?php echo __("Please reassign them at "); ?> <a href="<?php echo site_url('debug'); ?>" class="btn btn-warning"><i class="fas fa-sync"></i> <?php echo __("Admin") . "/" . __("Maintenance"); ?></a>
 			</div>
 		<?php } ?>
 
@@ -38,21 +38,21 @@
 		<table id="station_locations_table" class="table table-sm table-striped">
 			<thead>
 				<tr>
-					<th scope="col"><?php echo lang('station_location_name'); ?></th>
-					<th scope="col"><?php echo lang('station_location_callsign'); ?></th>
-					<th scope="col"><?php echo lang('general_word_country'); ?></th>
-					<th scope="col"><?php echo lang('gen_hamradio_gridsquare'); ?></th>
+					<th scope="col"><?php echo __("Profile Name"); ?></th>
+					<th scope="col"><?php echo __("Station Callsign"); ?></th>
+					<th scope="col"><?php echo __("Country"); ?></th>
+					<th scope="col"><?php echo __("Gridsquare"); ?></th>
 					<th></th>
-					<th scope="col"><?php echo lang('admin_edit'); ?></th>
-					<th scope="col"><?php echo lang('admin_copy'); ?></th>
+					<th scope="col"><?php echo __("Edit"); ?></th>
+					<th scope="col"><?php echo __("Copy"); ?></th>
 					<?php
 					$quickswitch_enabled = ($this->user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'))->row()->option_value ?? 'false');
 					if ($quickswitch_enabled == 'true') {
 					?>
 						<th scope="col">Favorite</th>
 					<?php } ?>
-					<th scope="col"><?php echo lang('station_location_emptylog'); ?></th>
-                    <th scope="col"><?php echo lang('admin_delete'); ?></th>
+					<th scope="col"><?php echo __("Empty Log"); ?></th>
+                    <th scope="col"><?php echo __("Delete"); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -62,24 +62,24 @@
 						<?php echo $row->station_profile_name;?><br>
 					</td>
 					<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_callsign;?></td>
-					<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
+					<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>'; } ?></td>
 					<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_gridsquare;?></td>
 					<td style="text-align: center" data-order="<?php echo $row->station_id;?>">
 						<?php if($row->station_active != 1) { ?>
-							<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('<?php echo lang('station_location_confirm_active'); ?> <?php echo $row->station_profile_name; ?>');"><?php echo lang('station_location_set_active'); ?></a>
+							<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('<?php echo __("Are you sure you want to make the following station the active station: "); ?> <?php echo $row->station_profile_name; ?>');"><?php echo __("Set Active"); ?></a>
 						<?php } else { ?>
-							<span class="badge text-bg-success"><?php echo lang('station_location_active'); ?></span>
+							<span class="badge text-bg-success"><?php echo __("Active Station"); ?></span>
 						<?php } ?>
 
 						<br>
 						<span class="badge text-bg-info">ID: <?php echo $row->station_id;?></span>
-						<span class="badge text-bg-light"><?php echo $row->qso_total;?> <?php echo lang('gen_hamradio_qso'); ?></span>
+						<span class="badge text-bg-light"><?php echo $row->qso_total;?> <?php echo __("QSO"); ?></span>
 					</td>
 					<td style="text-align: center; vertical-align: middle;">
-						<a href="<?php echo site_url('station/edit')."/".$row->station_id; ?>" title=<?php echo lang('admin_edit'); ?> class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i></a>
+						<a href="<?php echo site_url('station/edit')."/".$row->station_id; ?>" title=<?php echo __("Edit"); ?> class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i></a>
 					</td>
 					<td style="text-align: center; vertical-align: middle;">
-						<a href="<?php echo site_url('station/copy')."/".$row->station_id; ?>" title=<?php echo lang('admin_copy'); ?> class="btn btn-outline-primary btn-sm"><i class="fas fa-copy"></i></a>
+						<a href="<?php echo site_url('station/copy')."/".$row->station_id; ?>" title=<?php echo __("Copy"); ?> class="btn btn-outline-primary btn-sm"><i class="fas fa-copy"></i></a>
 					</td>
 					<?php
 					if ($quickswitch_enabled == 'true') {
@@ -95,11 +95,11 @@
 						</td>
 					<?php } ?>
 					<td style="text-align: center; vertical-align: middle;">
-                        <a href="<?php echo site_url('station/deletelog')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" title=<?php echo lang('station_location_emptylog'); ?> onclick="return confirm('<?php echo lang('station_location_confirm_del_qso'); ?>');"><i class="fas fa-trash-alt"></i></a></td>
+                        <a href="<?php echo site_url('station/deletelog')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" title=<?php echo __("Empty Log"); ?> onclick="return confirm('<?php echo __("Are you sure you want to delete all QSOs within this station profile?"); ?>');"><i class="fas fa-trash-alt"></i></a></td>
                     </td>
 					<td style="text-align: center; vertical-align: middle;">
 						<?php if($row->station_active != 1) { ?>
-							<a href="<?php echo site_url('station/delete')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" title=<?php echo lang('admin_delete'); ?> onclick="return confirm('<?php echo lang('station_location_confirm_del_stationlocation'); ?> <?php echo $row->station_profile_name; ?> <?php echo lang('station_location_confirm_del_stationlocation_qso'); ?>');"><i class="fas fa-trash-alt"></i></a>
+							<a href="<?php echo site_url('station/delete')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" title=<?php echo __("Delete"); ?> onclick="return confirm('<?php echo __("Are you sure you want delete station profile  "); ?> <?php echo $row->station_profile_name; ?> <?php echo __("This will delete all QSOs within this station profile?"); ?>');"><i class="fas fa-trash-alt"></i></a>
 						<?php } ?>
 					</td>
 				</tr>
diff --git a/application/views/stationsetup/create.php b/application/views/stationsetup/create.php
index 2b208b4d6..0fa83c17a 100644
--- a/application/views/stationsetup/create.php
+++ b/application/views/stationsetup/create.php
@@ -14,9 +14,9 @@
 		<?php $this->load->helper('form'); ?>
 
 		<div class="mb-3">
-			<label for="stationLogbookNameInput"><?php echo lang('station_logbooks_create_name');?></label>
+			<label for="stationLogbookNameInput"><?php echo __("Station Logbook Name");?></label>
 			<input type="text" class="form-control" name="logbook_name" id="logbook_name" aria-describedby="stationLogbookNameHelp" placeholder="Home QTH" required>
-			<small id="stationLogbookNameHelp" class="form-text text-muted"><?php echo lang('station_logbooks_create_name_hint');?></small>
+			<small id="stationLogbookNameHelp" class="form-text text-muted"><?php echo __("You can call a station logbook anything.");?></small>
 		</div>
 
 
diff --git a/application/views/stationsetup/exportmapoptions.php b/application/views/stationsetup/exportmapoptions.php
index 45e4414d2..60e623cb6 100644
--- a/application/views/stationsetup/exportmapoptions.php
+++ b/application/views/stationsetup/exportmapoptions.php
@@ -3,7 +3,7 @@
 	<thead>
 		<tr>
 			<th class="text-start">Options</th>
-			<th><?php echo lang('filter_options_show'); ?></th>
+			<th><?php echo __("Show"); ?></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/application/views/stationsetup/linkedlocations.php b/application/views/stationsetup/linkedlocations.php
index 4bf17d311..6cbd4db72 100644
--- a/application/views/stationsetup/linkedlocations.php
+++ b/application/views/stationsetup/linkedlocations.php
@@ -10,11 +10,11 @@
 ?>
 
 <div class="mb-3">
-	<label for="StationLocationsSelect"><?php echo lang('station_logbooks_select_avail_loc'); ?></label>
+	<label for="StationLocationsSelect"><?php echo __("Select Available Station Locations"); ?></label>
 	<select name="SelectedStationLocation" class="form-select" id="StationLocationSelect" aria-describedby="StationLocationSelectHelp">
 		<?php foreach ($station_locations_list->result() as $row) {
 			if (!in_array($row->station_id, $linked_stations)) { ?>
-			<option value="<?php echo $row->station_id;?>"><?php echo $row->station_profile_name;?> (<?php echo lang('gen_hamradio_callsign'); ?>: <?php echo $row->station_callsign;?> <?php echo lang('gen_hamradio_dxcc'); ?>: <?php echo $row->station_country; if ($row->dxcc_end != NULL) { echo ' ('.lang('gen_hamradio_deleted_dxcc').')'; } ?>)</option>
+			<option value="<?php echo $row->station_id;?>"><?php echo $row->station_profile_name;?> (<?php echo __("Callsign"); ?>: <?php echo $row->station_callsign;?> <?php echo __("DXCC"); ?>: <?php echo $row->station_country; if ($row->dxcc_end != NULL) { echo ' ('.__("Deleted DXCC").')'; } ?>)</option>
 			<?php } ?>
 		<?php } ?>
 	</select>
@@ -22,16 +22,16 @@
 
 <input type="hidden" class="form-control" id="station_logbook_id" name="station_logbook_id" value="<?php echo $station_logbook_details->logbook_id; ?>" required>
 
-<button class="btn btn-sm btn-primary linkLocationButton" onclick="linkLocations();"><i class="fas fa-link"></i> <?php echo lang('station_logbooks_link_loc'); ?></button>
+<button class="btn btn-sm btn-primary linkLocationButton" onclick="linkLocations();"><i class="fas fa-link"></i> <?php echo __("Link Location"); ?></button>
 <br /><br />
 
 <table id="station_logbooks_linked_table" class="table table-hover table-sm table-striped">
 	<thead class="thead-light">
 		<tr>
-			<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('station_location_name'); ?></th>
-			<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('station_location_callsign'); ?></th>
-			<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('gen_hamradio_dxcc'); ?></th>
-			<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('station_logbooks_unlink_station_location'); ?></th>
+			<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("Profile Name"); ?></th>
+			<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("Station Callsign"); ?></th>
+			<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("DXCC"); ?></th>
+			<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("Unlink Station Location"); ?></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -42,7 +42,7 @@
 		<tr id="locationid_<?php echo $row->station_id; ?>">
 			<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_profile_name;?></td>
 			<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_callsign;?></td>
-			<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_country; if ($row->end != NULL) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
+			<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_country; if ($row->end != NULL) { echo ' <span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>'; } ?></td>
 			<td style="text-align: center; vertical-align: middle;"><button class="btn btn-sm btn-danger unlinkbutton" onclick="unLinkLocations('<?php echo $station_logbook_details->logbook_id; ?>','<?php echo $row->station_id;?>')"><i class="fas fa-unlink"></i></button>
 		</tr>
 		<?php
diff --git a/application/views/stationsetup/stationsetup.php b/application/views/stationsetup/stationsetup.php
index dce23e8df..7543f9909 100644
--- a/application/views/stationsetup/stationsetup.php
+++ b/application/views/stationsetup/stationsetup.php
@@ -15,11 +15,11 @@
 
             <div class="card">
                 <div class="card-header">
-				<?php echo lang('station_logbooks')?>
+				<?php echo __("Station Logbooks")?>
 					</div>
 					<div class="card-body">
-                    <p class="card-text"><?php echo lang('station_logbooks_description_text')?></p>
-					<a class="btn btn-primary btn-sm" href="javascript:createStationLogbook();"><i class="fas fa-plus"></i> <?php echo lang('station_logbooks_create')?></a>
+                    <p class="card-text"><?php echo __("Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle.")?></p>
+					<a class="btn btn-primary btn-sm" href="javascript:createStationLogbook();"><i class="fas fa-plus"></i> <?php echo __("Create Station Logbook")?></a>
 
 
 
@@ -27,12 +27,12 @@
                         <table id="station_logbooks_table" class="table-sm table table-hover table-striped table-condensed">
                             <thead>
                                 <tr>
-                                    <th scope="col"><?php echo lang('general_word_name')?></th>
-                                    <th scope="col"><?php echo lang('station_logbooks_status')?></th>
+                                    <th scope="col"><?php echo __("Name")?></th>
+                                    <th scope="col"><?php echo __("Status")?></th>
                                     <th scope="col">Linked locations</th>
-                                    <th scope="col"><?php echo lang('admin_delete')?></th>
+                                    <th scope="col"><?php echo __("Delete")?></th>
                                     <th scope="col">Visitor site</th>
-                                    <th scope="col"><?php echo lang('station_logbooks_public_search')?></th>
+                                    <th scope="col"><?php echo __("Public Search")?></th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -41,9 +41,9 @@
                                     <td><?php echo $row->logbook_name;?> <i id="<?php echo $row->logbook_id ?>" class="editContainerName fas fa-edit" role="button"></i></td>
                                     <td>
                                         <?php if($this->session->userdata('active_station_logbook') != $row->logbook_id) { ?>
-                                        <button id="<?php echo $row->logbook_id; ?>" class="setActiveLogbook btn btn-outline-primary btn-sm"><?php echo lang('station_logbooks_set_active')?></button>
+                                        <button id="<?php echo $row->logbook_id; ?>" class="setActiveLogbook btn btn-outline-primary btn-sm"><?php echo __("Set as Active Logbook")?></button>
                                         <?php } else {
-											echo "<span class='badge bg-success'>" . lang('station_logbooks_active_logbook') . "</span>";
+											echo "<span class='badge bg-success'>" . __("Active Logbook") . "</span>";
 											}?>
                                     </td>
                                     <td>
@@ -52,7 +52,7 @@
                                     <td>
                                         <?php if($this->session->userdata('active_station_logbook') != $row->logbook_id) { ?>
                                         <button id="<?php echo $row->logbook_id; ?>" class="deleteLogbook btn btn-outline-danger btn-sm"
-                                            cnftext="'<?php echo lang('station_logbooks_confirm_delete') . $row->logbook_name; ?>'"><i
+                                            cnftext="'<?php echo __("Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: ") . $row->logbook_name; ?>'"><i
                                                 class="fas fa-trash-alt"></i></a>
                                         <?php } ?>
                                     </td>
@@ -62,7 +62,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="<?php echo lang('station_logbooks_view_public') . $row->logbook_name;?>"></i>
+                                                title="<?php echo __("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>
@@ -70,10 +70,10 @@
                                     </td>
                                     <td>
                                         <?php if ($row->public_search == 1) {
-											echo "<span class='badge bg-success'>" . lang('general_word_enabled') . "</span>";?>
+											echo "<span class='badge bg-success'>" . __("Enabled") . "</span>";?>
 											<div class="form-check" style="margin-top: -1.5em"><input id="<?php echo $row->logbook_id; ?>" class="form-check-input publicSearchCheckbox" type="checkbox" checked /></div>
 										<?php } else {
-											echo "<span class='badge bg-dark'>" . lang('general_word_disabled') . "</span>"; ?>
+											echo "<span class='badge bg-dark'>" . __("Disabled") . "</span>"; ?>
 											<div class="form-check" style="margin-top: -1.5em"><input id="<?php echo $row->logbook_id; ?>" class="form-check-input publicSearchCheckbox" type="checkbox" /></div>
 										<?php } ?>
                                     </td>
@@ -91,23 +91,23 @@
                     Station Locations
                 </div>
                 <div class="card-body">
-				<p class="card-text"><?php echo lang('station_location_header_ln1'); ?></p>
-				<p class="card-text"><?php echo lang('station_location_header_ln2'); ?></p>
-				<p class="card-text"><?php echo lang('station_location_header_ln3'); ?></p>
+				<p class="card-text"><?php echo __("Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station."); ?></p>
+				<p class="card-text"><?php echo __("Similar to logbooks, a station profile keeps a set of QSOs together."); ?></p>
+				<p class="card-text"><?php echo __("Only one station may be active at a time. In the table below this is shown with the -Active Station- badge."); ?></p>
 
-						<p><a href="<?php echo site_url('station/create'); ?>" class="btn btn-sm btn-primary"><i class="fas fa-plus"></i> <?php echo lang('station_location_create'); ?></a></p>
+						<p><a href="<?php echo site_url('station/create'); ?>" class="btn btn-sm btn-primary"><i class="fas fa-plus"></i> <?php echo __("Create a Station Location"); ?></a></p>
 
 <?php if($current_active == 0) { ?>
 <div class="alert alert-danger" role="alert">
-<?php echo lang('station_location_warning'); ?>
+<?php echo __("Attention: You need to set an active station location. Go to Callsign->Station Location to select one."); ?>
 </div>
 <?php } ?>
 
 <?php if (($is_there_qsos_with_no_station_id >= 1) && ($is_admin)) { ?>
 	<div class="alert alert-danger" role="alert">
-		  <span class="badge badge-pill badge-warning"><?php echo lang('general_word_warning'); ?></span> <?php echo lang('station_location_warning_reassign'); ?>
+		  <span class="badge badge-pill badge-warning"><?php echo __("Warning"); ?></span> <?php echo __("Due to recent changes within Wavelog you need to reassign QSOs to your station profiles."); ?>
 		</br>
-		<?php echo lang('station_location_reassign_at'); ?> <a href="<?php echo site_url('maintenance/'); ?>" class="btn btn-warning"><i class="fas fa-sync"></i><?php echo lang('account_word_admin') . "/" . lang('general_word_maintenance'); ?></a>
+		<?php echo __("Please reassign them at "); ?> <a href="<?php echo site_url('maintenance/'); ?>" class="btn btn-warning"><i class="fas fa-sync"></i><?php echo __("Admin") . "/" . __("Maintenance"); ?></a>
 	</div>
 <?php } ?>
 
@@ -115,22 +115,22 @@
 <table id="station_locations_table" class="table-sm table table-hover table-striped table-condensed">
 	<thead>
 		<tr>
-			<th scope="col"><?php echo lang('station_location_id'); ?></th>
-			<th scope="col"><?php echo lang('station_location_name'); ?></th>
-			<th scope="col"><?php echo lang('station_location_callsign'); ?></th>
-			<th scope="col"><?php echo lang('general_word_country'); ?></th>
-			<th scope="col"><?php echo lang('gen_hamradio_gridsquare'); ?></th>
+			<th scope="col"><?php echo __("ID"); ?></th>
+			<th scope="col"><?php echo __("Profile Name"); ?></th>
+			<th scope="col"><?php echo __("Station Callsign"); ?></th>
+			<th scope="col"><?php echo __("Country"); ?></th>
+			<th scope="col"><?php echo __("Gridsquare"); ?></th>
 			<th></th>
-			<th scope="col"><?php echo lang('admin_edit'); ?></th>
-			<th scope="col"><?php echo lang('admin_copy'); ?></th>
+			<th scope="col"><?php echo __("Edit"); ?></th>
+			<th scope="col"><?php echo __("Copy"); ?></th>
 			<?php
 					$quickswitch_enabled = ($this->user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'))->row()->option_value ?? 'false');
 					if ($quickswitch_enabled == 'true') {
 					?>
 						<th scope="col">Favorite</th>
 					<?php } ?>
-			<th scope="col"><?php echo lang('station_location_emptylog'); ?></th>
-			<th scope="col"><?php echo lang('admin_delete'); ?></th>
+			<th scope="col"><?php echo __("Empty Log"); ?></th>
+			<th scope="col"><?php echo __("Delete"); ?></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -143,24 +143,24 @@
 				<?php echo $row->station_profile_name;?><br>
 			</td>
 			<td><?php echo $row->station_callsign;?></td>
-			<td><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
+			<td><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge badge-danger">'.__("Deleted DXCC").'</span>'; } ?></td>
 			<td><?php echo $row->station_gridsquare;?></td>
 			<td>
 				<?php if($row->station_active != 1) { ?>
-					<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('<?php echo lang('station_location_confirm_active'); ?> <?php echo $row->station_profile_name; ?>');"><?php echo lang('station_location_set_active'); ?></a>
+					<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('<?php echo __("Are you sure you want to make the following station the active station: "); ?> <?php echo $row->station_profile_name; ?>');"><?php echo __("Set Active"); ?></a>
 				<?php } else { ?>
-					<span class="badge bg-success"><?php echo lang('station_location_active'); ?></span>
+					<span class="badge bg-success"><?php echo __("Active Station"); ?></span>
 				<?php } ?>
 
 				<br>
 				<span class="badge bg-info">ID: <?php echo $row->station_id;?></span>
-				<span class="badge bg-light"><?php echo $row->qso_total;?> <?php echo lang('gen_hamradio_qso'); ?></span>
+				<span class="badge bg-light"><?php echo $row->qso_total;?> <?php echo __("QSO"); ?></span>
 			</td>
 			<td>
-				<a href="<?php echo site_url('station/edit')."/".$row->station_id; ?>" title=<?php echo lang('admin_edit'); ?> class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i></a>
+				<a href="<?php echo site_url('station/edit')."/".$row->station_id; ?>" title=<?php echo __("Edit"); ?> class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i></a>
 			</td>
 				<td>
-				<a href="<?php echo site_url('station/copy')."/".$row->station_id; ?>" title=<?php echo lang('admin_copy'); ?> class="btn btn-outline-primary btn-sm"><i class="fas fa-copy"></i></a>
+				<a href="<?php echo site_url('station/copy')."/".$row->station_id; ?>" title=<?php echo __("Copy"); ?> class="btn btn-outline-primary btn-sm"><i class="fas fa-copy"></i></a>
 			</td>
 			<?php
 					if ($quickswitch_enabled == 'true') {
@@ -176,11 +176,11 @@
 						</td>
 					<?php } ?>
 			<td>
-				<a href="<?php echo site_url('station/deletelog')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" title=<?php echo lang('station_location_emptylog'); ?> onclick="return confirm('<?php echo lang('station_location_confirm_del_qso'); ?>');"><i class="fas fa-trash-alt"></i></a></td>
+				<a href="<?php echo site_url('station/deletelog')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" title=<?php echo __("Empty Log"); ?> onclick="return confirm('<?php echo __("Are you sure you want to delete all QSOs within this station profile?"); ?>');"><i class="fas fa-trash-alt"></i></a></td>
 			</td>
 			<td>
 				<?php if($row->station_active != 1) { ?>
-					<a href="<?php echo site_url('station/delete')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" title=<?php echo lang('admin_delete'); ?> onclick="return confirm('<?php echo lang('station_location_confirm_del_stationlocation'); ?> <?php echo $row->station_profile_name; ?> <?php echo lang('station_location_confirm_del_stationlocation_qso'); ?>');"><i class="fas fa-trash-alt"></i></a>
+					<a href="<?php echo site_url('station/delete')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" title=<?php echo __("Delete"); ?> onclick="return confirm('<?php echo __("Are you sure you want delete station profile  "); ?> <?php echo $row->station_profile_name; ?> <?php echo __("This will delete all QSOs within this station profile?"); ?>');"><i class="fas fa-trash-alt"></i></a>
 				<?php } ?>
 			</td>
 		</tr>
diff --git a/application/views/stationsetup/visitor.php b/application/views/stationsetup/visitor.php
index 77b04e5a0..200b5e6a2 100644
--- a/application/views/stationsetup/visitor.php
+++ b/application/views/stationsetup/visitor.php
@@ -1,20 +1,20 @@
 
-					<p><?php echo lang('station_logbooks_public_slug_hint'); ?></p>
-					<p><?php echo lang('station_logbooks_public_slug_format1')?><br>
-					<?php echo site_url('visitor'); ?>/<?php echo lang('station_logbooks_public_slug_format2'); ?></p>
+					<p><?php echo __("Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only."); ?></p>
+					<p><?php echo __("Later it looks like this:")?><br>
+					<?php echo site_url('visitor'); ?>/<?php echo __("[your slug]"); ?></p>
 					<form style="display: inline;">
 					<div id="visitorLinkInfo">
 					</div>
 					<div class="mb-3">
 						<input type="hidden" name="logbook_id" id="logbook_id" value="<?php echo $station_logbook_details->logbook_id; ?>">
-						<label for="publicSlugInput"><?php echo lang('station_logbooks_public_slug_input'); ?></label>
+						<label for="publicSlugInput"><?php echo __("Type in Public Slug choice"); ?></label>
 						<input class="form-control" name="public_slug" id="publicSlugInput" pattern="[a-zA-Z0-9-]+" value="<?php echo $station_logbook_details->public_slug; ?>" required>
 					</div>
 					</form>
 
 					<?php if($station_logbook_details->public_slug != "") { ?>
 					<div id="slugLink" class="alert alert-info" role="alert" style="margin-top: 20px;">
-						<p><?php echo lang('station_logbooks_public_slug_visit') . " "; ?></p>
+						<p><?php echo __("Visit Public Page") . " "; ?></p>
 						<p><a href="<?php echo site_url('visitor'); ?>/<?php echo $station_logbook_details->public_slug; ?>" target="_blank"><?php echo site_url('visitor'); ?>/<?php echo $station_logbook_details->public_slug; ?></a></p>
 					</div>
 					<?php } ?>
diff --git a/application/views/statistics/index.php b/application/views/statistics/index.php
index 05880c92d..eb4379839 100644
--- a/application/views/statistics/index.php
+++ b/application/views/statistics/index.php
@@ -11,21 +11,21 @@
 
 <script>
 		// General Language
-		var lang_statistics_years = "<?php echo lang('statistics_years')?>";
-		var lang_statistics_modes = "<?php echo lang('statistics_modes')?>";
-		var lang_statistics_bands = "<?php echo lang('statistics_bands')?>";
-		var lang_statistics_number_of_qso_worked_each_year = "<?php echo lang('statistics_number_of_qso_worked_each_year')?>";
-		var lang_statistics_year = "<?php echo lang('statistics_year')?>";
-		var lang_statistics_number_of_qso_worked = "<?php echo lang('statistics_number_of_qso_worked')?>";
-		var lang_gen_hamradio_mode = "<?php echo lang('gen_hamradio_mode')?>";
-		var lang_gen_hamradio_band = "<?php echo lang('gen_hamradio_band')?>";
+		var lang_statistics_years = "<?php echo __("Years")?>";
+		var lang_statistics_modes = "<?php echo __("Mode")?>";
+		var lang_statistics_bands = "<?php echo __("Bands")?>";
+		var lang_statistics_number_of_qso_worked_each_year = "<?php echo __("Number of QSOs worked each year")?>";
+		var lang_statistics_year = "<?php echo __("Year")?>";
+		var lang_statistics_number_of_qso_worked = "<?php echo __("# of QSO's worked")?>";
+		var lang_gen_hamradio_mode = "<?php echo __("Mode")?>";
+		var lang_gen_hamradio_band = "<?php echo __("Band")?>";
 </script>
 
 <div class="container statistics">
 
 	<h2>
 		<?php echo $page_title; ?>
-		<small class="text-muted"><?php echo lang('statistics_explore_the_logbook'); ?></small>
+		<small class="text-muted"><?php echo __("Explore the logbook."); ?></small>
 	</h2>
 
 	<br>
@@ -47,19 +47,19 @@
 					<br />
 					<ul class="nav nav-pills" id="myTab2" role="tablist">
 						<li class="nav-item">
-							<a class="nav-link active" id="years-tab" data-bs-toggle="tab" href="#yearstab" role="tab" aria-controls="yearstab" aria-selected="true"><?php echo lang('statistics_years'); ?></a>
+							<a class="nav-link active" id="years-tab" data-bs-toggle="tab" href="#yearstab" role="tab" aria-controls="yearstab" aria-selected="true"><?php echo __("Years"); ?></a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="mode-tab" data-bs-toggle="tab" href="#modetab" role="tab" aria-controls="modetab" aria-selected="false"><?php echo lang('statistics_modes'); ?></a>
+							<a class="nav-link" id="mode-tab" data-bs-toggle="tab" href="#modetab" role="tab" aria-controls="modetab" aria-selected="false"><?php echo __("Mode"); ?></a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="band-tab" data-bs-toggle="tab" href="#bandtab" role="tab" aria-controls="bandtab" aria-selected="false"><?php echo lang('statistics_bands'); ?></a>
+							<a class="nav-link" id="band-tab" data-bs-toggle="tab" href="#bandtab" role="tab" aria-controls="bandtab" aria-selected="false"><?php echo __("Bands"); ?></a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="qso-tab" data-bs-toggle="tab" href="#qsotab" role="tab" aria-controls="bandtab" aria-selected="false"><?php echo lang('statistics_qsos'); ?></a>
+							<a class="nav-link" id="qso-tab" data-bs-toggle="tab" href="#qsotab" role="tab" aria-controls="bandtab" aria-selected="false"><?php echo __("QSOs"); ?></a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="unique-tab" data-bs-toggle="tab" href="#uniquetab" role="tab" aria-controls="uniquetab" aria-selected="false"><?php echo lang('statistics_unique_callsigns'); ?></a>
+							<a class="nav-link" id="unique-tab" data-bs-toggle="tab" href="#uniquetab" role="tab" aria-controls="uniquetab" aria-selected="false"><?php echo __("Unique callsigns"); ?></a>
 						</li>
 					</ul>
 				<div class="tab-content">
@@ -93,10 +93,10 @@
 							<a class="nav-link active" id="sat-tab" data-bs-toggle="tab" href="#sattab" role="tab" aria-controls="sattab" aria-selected="true">Satellites</a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="satqsos-tab" data-bs-toggle="tab" href="#satqsostab" role="tab" aria-controls="satqsostab" aria-selected="false"><?php echo lang('statistics_qsos'); ?></a>
+							<a class="nav-link" id="satqsos-tab" data-bs-toggle="tab" href="#satqsostab" role="tab" aria-controls="satqsostab" aria-selected="false"><?php echo __("QSOs"); ?></a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="satunique-tab" data-bs-toggle="tab" href="#satuniquetab" role="tab" aria-controls="satuniquetab" aria-selected="false"><?php echo lang('statistics_unique_callsigns'); ?></a>
+							<a class="nav-link" id="satunique-tab" data-bs-toggle="tab" href="#satuniquetab" role="tab" aria-controls="satuniquetab" aria-selected="false"><?php echo __("Unique callsigns"); ?></a>
 						</li>
 					</ul>
 				<div class="tab-content">
diff --git a/application/views/statistics/qsotable.php b/application/views/statistics/qsotable.php
index 7f963fb3c..01d37d24a 100644
--- a/application/views/statistics/qsotable.php
+++ b/application/views/statistics/qsotable.php
@@ -7,7 +7,7 @@ if ($qsoarray) {
                     foreach($bands as $band) {
                         echo '<th>' . $band . '</th>';
                     }
-                    echo '<th>'.lang('statistics_total').'</th>';
+                    echo '<th>'.__("Total").'</th>';
                     echo '</tr>
             </thead>
             <tbody>';
@@ -20,7 +20,7 @@ if ($qsoarray) {
         echo '<th>' . $modetotal[$mode] . '</th>';
         echo '</tr>';
     }
-    echo '</tbody><tfoot><tr><th>'.lang('statistics_total').'</th>';
+    echo '</tbody><tfoot><tr><th>'.__("Total").'</th>';
 
     $grandtotal = 0;
     foreach ($bandtotal as $band => $value) {
diff --git a/application/views/statistics/satqsotable.php b/application/views/statistics/satqsotable.php
index a1efade3c..b5d44670f 100644
--- a/application/views/statistics/satqsotable.php
+++ b/application/views/statistics/satqsotable.php
@@ -7,7 +7,7 @@ if ($qsoarray) {
                     foreach($modes as $mode) {
                         echo '<th>' . $mode . '</th>';
                     }
-                    echo '<th>'.lang('statistics_total').'</th>';
+                    echo '<th>'.__("Total").'</th>';
                     echo '</tr>
             </thead>
             <tbody>';
@@ -19,7 +19,7 @@ if ($qsoarray) {
         	echo '<th>' . $sattotal[$sat] . '</th>';
 		echo '</tr>';
 	}
-    echo '</tbody><tfoot><tr><th>'.lang('statistics_total').'</th>';
+    echo '</tbody><tfoot><tr><th>'.__("Total").'</th>';
 	$grandtotal=0;
     foreach($modes as $mode) {
         echo '<th>' . $modetotal[$mode] . '</th>';
diff --git a/application/views/statistics/satuniquetable.php b/application/views/statistics/satuniquetable.php
index 855a477a0..711b9fe81 100644
--- a/application/views/statistics/satuniquetable.php
+++ b/application/views/statistics/satuniquetable.php
@@ -7,7 +7,7 @@ if ($qsoarray) {
                     foreach($modes as $mode) {
                         echo '<th>' . $mode . '</th>';
                     }
-                    echo '<th>'.lang('statistics_total').'</th>';
+                    echo '<th>'.__("Total").'</th>';
                     echo '</tr>
             </thead>
             <tbody>';
@@ -19,7 +19,7 @@ if ($qsoarray) {
         	echo '<th>' . $satunique[$sat] . '</th>';
 		echo '</tr>';
 	}
-    echo '</tbody><tfoot><tr><th>'.lang('statistics_total').'</th>';
+    echo '</tbody><tfoot><tr><th>'.__("Total").'</th>';
     foreach($modes as $mode) {
         echo '<th>' . $modeunique[$mode] . '</th>';
     }
diff --git a/application/views/statistics/uniquetable.php b/application/views/statistics/uniquetable.php
index 0a25b170d..af7f15c0f 100644
--- a/application/views/statistics/uniquetable.php
+++ b/application/views/statistics/uniquetable.php
@@ -7,7 +7,7 @@ if ($qsoarray) {
                     foreach($bands as $band) {
                         echo '<th>' . $band . '</th>';
                     }
-                    echo '<th>'.lang('statistics_total').'</th>';
+                    echo '<th>'.__("Total").'</th>';
                     echo '</tr>
             </thead>
             <tbody>';
@@ -20,7 +20,7 @@ if ($qsoarray) {
         echo '<th>' . $modeunique[$mode] . '</th>';
         echo '</tr>';
     }
-    echo '</tbody><tfoot><tr><th>'.lang('statistics_total').'</th>';
+    echo '</tbody><tfoot><tr><th>'.__("Total").'</th>';
 
     foreach($bands as $band) {
         echo '<th>' . $bandunique[$band] . '</th>';
diff --git a/application/views/timeline/details.php b/application/views/timeline/details.php
index 52b59c929..e641b0227 100644
--- a/application/views/timeline/details.php
+++ b/application/views/timeline/details.php
@@ -1,4 +1,4 @@
 <div class="container">
-    <h5><?php echo lang('general_word_filtering_on'); ?> <?php echo $filter ?></h5>
+    <h5><?php echo __("Filtering on"); ?> <?php echo $filter ?></h5>
 
     <?php $this->load->view('view_log/partial/log_ajax') ?>
diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php
index 8bb2ce5d4..6ae994ddd 100644
--- a/application/views/timeline/index.php
+++ b/application/views/timeline/index.php
@@ -1,13 +1,13 @@
 <div class="container">
-    <h1><?php echo lang('statistics_timeline'); ?></h1>
+    <h1><?php echo __("Timeline"); ?></h1>
 
     <form class="form" action="<?php echo site_url('timeline'); ?>" method="post" enctype="multipart/form-data">
         <!-- Select Basic -->
                 <div class="mb-3 row">
-                    <label class="col-md-1 control-label" for="band"><?php echo lang('gen_hamradio_band') ?></label>
+                    <label class="col-md-1 control-label" for="band"><?php echo __("Band") ?></label>
                     <div class="col-md-3">
                         <select id="band" name="band" class="form-select">
-                            <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all') ?></option>
+                            <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo __("All") ?></option>
                             <?php foreach($worked_bands as $band) {
                                 echo '<option value="' . $band . '"';
                                 if ($this->input->post('band') == $band) echo ' selected';
@@ -16,10 +16,10 @@
                         </select>
                     </div>
 
-                    <label class="col-md-1 control-label" for="mode"><?php echo lang('gen_hamradio_mode') ?></label>
+                    <label class="col-md-1 control-label" for="mode"><?php echo __("Mode") ?></label>
                     <div class="col-md-3">
                         <select id="mode" name="mode" class="form-select">
-                            <option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all') ?></option>
+                            <option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo __("All") ?></option>
                             <?php
                             foreach($modes->result() as $mode){
                                 if ($mode->submode == null) {
@@ -38,7 +38,7 @@
                 </div>
 
         <div class="mb-3 row">
-            <label class="col-md-1 control-label" for="award"><?php echo lang('gen_hamradio_award') ?></label>
+            <label class="col-md-1 control-label" for="award"><?php echo __("Award") ?></label>
                 <div class="col-md-3">
                     <select id="award" name="award" class="form-select">
                         <option value="dxcc" <?php if ($this->input->post('award') == "dxcc") echo ' selected'; ?> >DX Century Club (DXCC)</option>
@@ -48,19 +48,19 @@
                         <option value="vucc" <?php if ($this->input->post('award') == "vucc") echo ' selected'; ?> >VHF / UHF Century Club (VUCC)</option>
                     </select>
                 </div>
-                <div class="col-md-1 control-label"><?php echo lang('general_word_confirmation') ?></div>
+                <div class="col-md-1 control-label"><?php echo __("Confirmation") ?></div>
                 <div class="col-md-3">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl'))  echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="qsl"><?php echo lang('gen_hamradio_qsl') ?></label>
+                        <label class="form-check-label" for="qsl"><?php echo __("QSL") ?></label>
                     </div>
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="lotw" value="1" id="lotw" <?php if ($this->input->post('lotw')) echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="lotw"><?php echo lang('general_word_lotw_short') ?></label>
+                        <label class="form-check-label" for="lotw"><?php echo __("LoTW") ?></label>
                     </div>
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="eqsl" value="1" id="eqsl" <?php if ($this->input->post('eqsl')) echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="eqsl"><?php echo lang('eqsl_short') ?></label>
+                        <label class="form-check-label" for="eqsl"><?php echo __("eQSL") ?></label>
                     </div>
                 </div>
             </div>
@@ -68,7 +68,7 @@
             <div class="mb-3 row">
                 <label class="col-md-1 control-label" for="button1id"></label>
                 <div class="col-md-10">
-                    <button id="button1id" type="submit" name="button1id" class="btn btn-primary"><?php echo lang('filter_options_show') ?></button>
+                    <button id="button1id" type="submit" name="button1id" class="btn btn-primary"><?php echo __("Show") ?></button>
                 </div>
             </div>
 
diff --git a/application/views/timeplotter/index.php b/application/views/timeplotter/index.php
index e613f1e81..208caa455 100644
--- a/application/views/timeplotter/index.php
+++ b/application/views/timeplotter/index.php
@@ -1,36 +1,36 @@
 <script>
-    var lang_statistics_timeplotter_contacts_plotted = '<?php echo lang('statistics_timeplotter_contacts_plotted'); ?>';
-    var lang_statistics_timeplotter_chart_header = '<?php echo lang('statistics_timeplotter_chart_header'); ?>';
-    var lang_statistics_timeplotter_number_of_qsos = '<?php echo lang('statistics_timeplotter_number_of_qsos'); ?>';
-    var lang_general_word_time = '<?php echo lang('general_word_time'); ?>';
-    var lang_statistics_timeplotter_callsigns_worked = '<?php echo lang('statistics_timeplotter_callsigns_worked'); ?>';
+    var lang_statistics_timeplotter_contacts_plotted = '<?php echo __("contacts were plotted"); ?>';
+    var lang_statistics_timeplotter_chart_header = '<?php echo __("Time Distribution"); ?>';
+    var lang_statistics_timeplotter_number_of_qsos = '<?php echo __("Number of QSOs"); ?>';
+    var lang_general_word_time = '<?php echo __("Time"); ?>';
+    var lang_statistics_timeplotter_callsigns_worked = '<?php echo __("Callsign(s) worked (max 5)"); ?>';
 </script>
 <div class="container">
-    <h2><?php echo lang('menu_timeplotter'); ?></h1>
-        <p><?php echo lang('statistics_timeplotter_description'); ?></p>
+    <h2><?php echo __("Timeplotter"); ?></h1>
+        <p><?php echo __("The Timeplotter is used to analyze your logbook and find out at what times you worked certain CQ zones or DXCC countries on a selected band."); ?></p>
         <form class="form">
 
             <div class="mb-3 row">
-                <label class="col-md-1 control-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+                <label class="col-md-1 control-label" for="band"><?php echo __("Band"); ?></label>
                 <div class="col-md-3">
                     <select id="band" name="band" class="form-select">
-                        <option value="All"><?php echo lang('general_word_all'); ?></option>
+                        <option value="All"><?php echo __("All"); ?></option>
                         <?php foreach($worked_bands as $band) {
                             echo '<option value="' . $band . '">' . $band . '</option>'."\n";
                         } ?>
                     </select>
                 </div>
 
-                <label class="col-md-1 control-label" for="dxcc"><?php echo lang('gen_hamradio_dxcc'); ?></label>
+                <label class="col-md-1 control-label" for="dxcc"><?php echo __("DXCC"); ?></label>
                 <div class="col-md-3">
                     <select id="dxcc" name="dxcc" class="form-select">
-                        <option value = 'All'><?php echo lang('general_word_all'); ?></option>
+                        <option value = 'All'><?php echo __("All"); ?></option>
                         <?php
                         if ($dxcc_list->num_rows() > 0) {
                                 foreach ($dxcc_list->result() as $dxcc) {
                                     echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
                                     if ($dxcc->end != null) {
-                                        echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
+                                        echo ' ('.__("Deleted DXCC").')';
                                     }
                                     echo '</option>';
                                 }
@@ -41,10 +41,10 @@
             </div>
 
             <div class="mb-3 row">
-                <label class="col-md-1 control-label" for="cqzone"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
+                <label class="col-md-1 control-label" for="cqzone"><?php echo __("CQ Zone"); ?></label>
                 <div class="col-md-3">
                     <select id="cqzone" name="cqzone" class="form-select">
-                        <option value = 'All'><?php echo lang('general_word_all'); ?></option>
+                        <option value = 'All'><?php echo __("All"); ?></option>
                         <?php
                         for ($i = 1; $i<=40; $i++) {
                             echo '<option value='. $i . '>'. $i .'</option>';
@@ -56,7 +56,7 @@
 
             <div class="mb-3 row">
                 <div class="col-md-3">
-                    <button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="timeplot(this.form);"><?php echo lang('general_word_show'); ?><div class="ld ld-ring ld-spin"></div></button>
+                    <button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="timeplot(this.form);"><?php echo __("Show"); ?><div class="ld ld-ring ld-spin"></div></button>
                 </div>
             </div>
 
diff --git a/application/views/user/delete.php b/application/views/user/delete.php
index 91587efed..49f352b84 100644
--- a/application/views/user/delete.php
+++ b/application/views/user/delete.php
@@ -2,16 +2,16 @@
 <br>
 	<div class="card">
 	  <div class="card-header">
-	    <?php echo lang('account_delete_user_account'); ?> <?php echo $user_name; ?>
+	    <?php echo __("Delete User Account"); ?> <?php echo $user_name; ?>
 	  </div>
 	  <div class="card-body">
 	    <h5 class="card-title"></h5>
 
-	    <p class="card-text"><?php echo lang('account_are_you_sure_you_want_to_delete_the_user_account'); ?> <b><?php echo $user_name; ?></b>?</p>
+	    <p class="card-text"><?php echo __("Are you sure you want to delete the user account"); ?> <b><?php echo $user_name; ?></b>?</p>
 
 	    <form method="post" action="<?php echo site_url('user/delete')."/".$this->uri->segment(3); ?>" name="users">
 	    <input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
-			<input class="btn btn-danger" type="submit" value="<?php echo lang('account_yes_delete_this_user'); ?>" /> <a href="<?php echo site_url('user'); ?>" class="btn btn-success"><?php echo lang('account_no_do_not_delete_this_user'); ?></a>
+			<input class="btn btn-danger" type="submit" value="<?php echo __("Yes, delete this user"); ?>" /> <a href="<?php echo site_url('user'); ?>" class="btn btn-success"><?php echo __("No, do not delete this user"); ?></a>
 			</form>
 	  </div>
 	</div>
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index 8a3ddab46..c1d656be4 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -1,9 +1,9 @@
 <div class="container">
 	<h3>
 	  <?php if (isset($user_add)) {
-		echo lang('account_create_user_account');
+		echo __("Create User Account");
 	  } else {
-		echo lang('account_edit_account')." <small class=\"text-muted\">".$user_name."</small>";
+		echo __("Edit Account")." <small class=\"text-muted\">".$user_name."</small>";
 	  }
 	  ?>
 
@@ -38,7 +38,7 @@
 		<div class="accordion-item">
 			<h2 class="accordion-header" id="panelsStayOpen-H_user_general">
 				<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_user_general" aria-expanded="true" aria-controls="panelsStayOpen-B_user_general">
-				<?php echo lang('account_general_information'); ?></button>
+				<?php echo __("General Information"); ?></button>
 			</h2>
 			<div id="panelsStayOpen-B_user_general" class="accordion-collapse collapse show" aria-labelledby="panelsStayOpen-H_user_general">
 				<div class="accordion-body">
@@ -46,22 +46,22 @@
 						<!-- Account Information -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_account_information'); ?></div>
+								<div class="card-header"><?php echo __("Account"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label><?php echo lang('account_username'); ?></label>
+										<label><?php echo __("Username"); ?></label>
 										<input class="form-control" type="text" name="user_name" value="<?php if(isset($user_name)) { echo $user_name; } ?>" />
 										<?php if(isset($username_error)) { echo "<small class=\"badge bg-danger\">".$username_error."</small>"; } ?>
 									</div>
 
 									<div class="mb-3">
-										<label><?php echo lang('account_email_address'); ?></label>
+										<label><?php echo __("Email Address"); ?></label>
 										<input class="form-control" type="text" name="user_email" value="<?php if(isset($user_email)) { echo $user_email; } ?>" />
 										<?php if(isset($email_error)) { echo "<small class=\"badge bg-danger\">".$email_error."</small>"; } ?>
 									</div>
 
 									<div class="mb-3">
-										<label><?php echo lang('account_password'); ?></label>
+										<label><?php echo __("Password"); ?></label>
 										<div class="input-group">
 											<input class="form-control" type="password" name="user_password" value="<?php if(isset($user_password)) { echo $user_password; } ?>" />
 											<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
@@ -74,7 +74,7 @@
 
 									<hr/>
 									<div class="mb-3">
-										<label><?php echo lang('account_user_role'); ?></label>
+										<label><?php echo __("User Role"); ?></label>
 										<?php if($this->session->userdata('user_type') == 99) { ?>
 											<select class="form-select" name="user_type">
 											<?php
@@ -96,17 +96,17 @@
 						<!-- Personal Information -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_personal_information'); ?></div>
+								<div class="card-header"><?php echo __("Personal"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label><?php echo lang('account_first_name'); ?></label>
+										<label><?php echo __("First Name"); ?></label>
 										<input class="form-control" type="text" name="user_firstname" value="<?php if(isset($user_firstname)) { echo $user_firstname; } ?>" />
 											<?php if(isset($firstname_error)) { echo "<small class=\"badge bg-danger\">".$firstname_error."</small>"; } else { ?>
 											<?php } ?>
 									</div>
 
 									<div class="mb-3">
-										<label><?php echo lang('account_last_name'); ?></label>
+										<label><?php echo __("Last Name"); ?></label>
 										<input class="form-control" type="text" name="user_lastname" value="<?php if(isset($user_lastname)) { echo $user_lastname; } ?>" />
 											<?php if(isset($lastname_error)) { echo "<small class=\"badge bg-danger\">".$lastname_error."</small>"; } else { ?>
 											<?php } ?>
@@ -117,17 +117,17 @@
 						<!-- Ham Radio Information -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_hamradio_information'); ?></div>
+								<div class="card-header"><?php echo __("Ham Radio"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label><?php echo lang('account_callsign'); ?></label>
+										<label><?php echo __("Callsign"); ?></label>
 										<input class="form-control" type="text" name="user_callsign" value="<?php if(isset($user_callsign)) { echo $user_callsign; } ?>" />
 											<?php if(isset($callsign_error)) { echo "<small class=\"badge bg-danger\">".$callsign_error."</small>"; } else { ?>
 											<?php } ?>
 									</div>
 
 									<div class="mb-3">
-										<label><?php echo lang('account_gridsquare'); ?></label>
+										<label><?php echo __("Gridsquare"); ?></label>
 										<input class="form-control" type="text" name="user_locator" value="<?php if(isset($user_locator)) { echo $user_locator; } ?>" />
 											<?php if(isset($locator_error)) { echo "<small class=\"badge bg-danger\">".$locator_error."</small>"; } else { ?>
 											<?php } ?>
@@ -143,7 +143,7 @@
 		<div class="accordion-item">
 			<h2 class="accordion-header" id="panelsStayOpen-H_wavelog_general">
 				<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_wavelog_general" aria-expanded="false" aria-controls="panelsStayOpen-B_wavelog_general">
-				<?php echo lang('account_wavelog_preferences'); ?></button>
+				<?php echo __("Wavelog Preferences"); ?></button>
 			</h2>
 			<div id="panelsStayOpen-B_wavelog_general" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_wavelog_general">
 				<div class="accordion-body">
@@ -151,10 +151,10 @@
 						<!-- Wavelog Preferences -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('general_word_general'); ?></div>
+								<div class="card-header"><?php echo __("General"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label><?php echo lang('account_theme').' / '.lang('account_stylesheet'); ?></label>
+										<label><?php echo __("Theme").' / '.__("Stylesheet"); ?></label>
 										<?php if(!isset($user_stylesheet)) { $user_stylesheet='default'; }?>
 										<select class="form-select" id="user_stylesheet" name="user_stylesheet" required>
 											<?php
@@ -166,17 +166,17 @@
 									</div>
 									<hr/>
 									<div class="mb-3">
-										<label for="user_language"><?php echo lang('account_wavelog_language'); ?></label>
+										<label for="user_language"><?php echo __("Wavelog Language"); ?></label>
 										<?php
 										foreach ($existing_languages as $lang) {
 											$options[$lang['folder']] = $lang['name_en'];
 										}
 										echo form_dropdown('user_language', $options, $language['folder']);
 										?>
-										<small id="language_Help" class="form-text text-muted"><?php echo lang('account_choose_wavelog_language'); ?></small>
+										<small id="language_Help" class="form-text text-muted"><?php echo __("Choose Wavelog language."); ?></small>
 									</div>
 									<div class="mb-3">
-										<label><?php echo lang('account_timezone'); ?></label>
+										<label><?php echo __("Timezone"); ?></label>
 										<?php
 										if(!isset($user_timezone)) { $user_timezone='151'; }
 										echo form_dropdown('user_timezone', $timezones, $user_timezone);
@@ -184,7 +184,7 @@
 									</div>
 
 									<div class="mb-3">
-										<label for="SelectDateFormat"><?php echo lang('account_date_format'); ?></label>
+										<label for="SelectDateFormat"><?php echo __("Date Format"); ?></label>
 										<?php if(!isset($user_date_format)) { $user_date_format='d/m/y'; }?>
 										<select name="user_date_format" class="form-select" id="SelectDateFormat" aria-describedby="SelectDateFormatHelp">
 											<option value="d/m/y" <?php if($user_date_format == "d/m/y") { echo "selected=\"selected\""; } ?>><?php echo date('d/m/y'); ?></option>
@@ -197,11 +197,11 @@
 											<option value="M d, Y" <?php if($user_date_format == "M d, Y") { echo "selected=\"selected\""; } ?>><?php echo date('M d, Y'); ?></option>
 											<option value="M d, y" <?php if($user_date_format == "M d, y") { echo "selected=\"selected\""; } ?>><?php echo date('M d, y'); ?></option>
 										</select>
-										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_select_how_you_would_like_dates_shown_when_logged_into_your_account'); ?></small>
+										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo __("Select how you would like dates shown when logged into your account."); ?></small>
 									</div>
 
 									<div class="mb-3">
-										<label for="user_measurement_base"><?php echo lang('account_measurement_preferences'); ?></label>
+										<label for="user_measurement_base"><?php echo __("Measurement preference"); ?></label>
 										<?php if(!isset($user_measurement_base)) { $user_measurement_base='M'; }?>
 										<select class="form-select" id="user_measurement_base" name="user_measurement_base" aria-describedby="user_measurement_base_Help" required>
 											<option value ''></option>
@@ -209,7 +209,7 @@
 											<option value='M' <?php if($user_measurement_base == "M") { echo "selected=\"selected\""; } ?>>Miles</option>
 											<option value='N' <?php if($user_measurement_base == "N") { echo "selected=\"selected\""; } ?>>Nautical miles</option>
 										</select>
-										<small id="user_measurement_base_Help" class="form-text text-muted"><?php echo lang('account_choose_which_unit_distances_will_be_shown_in'); ?></small>
+										<small id="user_measurement_base_Help" class="form-text text-muted"><?php echo __("Choose which unit distances will be shown in"); ?></small>
 									</div>
 								</div>
 							</div>
@@ -218,117 +218,117 @@
 						<!-- Logbook fields Setting -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_logbook_fields'); ?></div>
+								<div class="card-header"><?php echo __("Logbook fields"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label for="column1"><?php echo lang('account_column1_text'); ?></label>
+										<label for="column1"><?php echo __("Choose column 1"); ?></label>
 										<?php if(!isset($user_column1)) { $user_column1='Mode'; }?>
 										<select class="form-select" id="column1" name="user_column1">
-											<option value="Band" <?php if ($user_column1 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column1 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column1 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column1 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column1 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column1 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column1 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column1 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column1 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column1 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column1 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column1 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column1 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column1 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
+											<option value="Band" <?php if ($user_column1 == "Band") { echo " selected =\"selected\""; } ?>><?php echo __("Band"); ?></option>
+											<option value="Frequency" <?php if ($user_column1 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo __("Frequency"); ?></option>
+											<option value="Mode" <?php if ($user_column1 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo __("Mode"); ?></option>
+											<option value="RSTS" <?php if ($user_column1 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo __("RST (S)"); ?></option>
+											<option value="RSTR" <?php if ($user_column1 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo __("RST (R)"); ?></option>
+											<option value="Country" <?php if ($user_column1 == "Country") { echo " selected =\"selected\""; } ?>><?php echo __("Country"); ?></option>
+											<option value="IOTA" <?php if ($user_column1 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo __("IOTA"); ?></option>
+											<option value="SOTA" <?php if ($user_column1 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo __("SOTA"); ?></option>
+											<option value="WWFF" <?php if ($user_column1 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo __("WWFF"); ?></option>
+											<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo __("POTA"); ?></option>
+											<option value="State" <?php if ($user_column1 == "State") { echo " selected =\"selected\""; } ?>><?php echo __("State"); ?></option>
+											<option value="Grid" <?php if ($user_column1 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo __("Gridsquare"); ?></option>
+											<option value="Distance" <?php if ($user_column1 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo __("Distance"); ?></option>
+											<option value="Operator" <?php if ($user_column1 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo __("Operator"); ?></option>
+											<option value="Name" <?php if ($user_column1 == "Name") { echo " selected =\"selected\""; } ?>><?php echo __("Name"); ?></option>
 										</select>
 									</div>
 
 									<div class="mb-3">
-										<label for="column2"><?php echo lang('account_column2_text'); ?></label>
+										<label for="column2"><?php echo __("Choose column 2"); ?></label>
 										<?php if(!isset($user_column2)) { $user_column2='RSTS'; }?>
 										<select class="form-select" id="column2" name="user_column2">
-											<option value="Band" <?php if ($user_column2 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column2 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column2 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column2 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column2 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column2 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column2 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column2 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column2 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column2 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column2 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column2 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column2 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column2 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column2 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
+											<option value="Band" <?php if ($user_column2 == "Band") { echo " selected =\"selected\""; } ?>><?php echo __("Band"); ?></option>
+											<option value="Frequency" <?php if ($user_column2 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo __("Frequency"); ?></option>
+											<option value="Mode" <?php if ($user_column2 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo __("Mode"); ?></option>
+											<option value="RSTS" <?php if ($user_column2 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo __("RST (S)"); ?></option>
+											<option value="RSTR" <?php if ($user_column2 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo __("RST (R)"); ?></option>
+											<option value="Country" <?php if ($user_column2 == "Country") { echo " selected =\"selected\""; } ?>><?php echo __("Country"); ?></option>
+											<option value="IOTA" <?php if ($user_column2 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo __("IOTA"); ?></option>
+											<option value="SOTA" <?php if ($user_column2 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo __("SOTA"); ?></option>
+											<option value="WWFF" <?php if ($user_column2 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo __("WWFF"); ?></option>
+											<option value="POTA" <?php if ($user_column2 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo __("POTA"); ?></option>
+											<option value="State" <?php if ($user_column2 == "State") { echo " selected =\"selected\""; } ?>><?php echo __("State"); ?></option>
+											<option value="Grid" <?php if ($user_column2 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo __("Gridsquare"); ?></option>
+											<option value="Distance" <?php if ($user_column2 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo __("Distance"); ?></option>
+											<option value="Operator" <?php if ($user_column2 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo __("Operator"); ?></option>
+											<option value="Name" <?php if ($user_column2 == "Name") { echo " selected =\"selected\""; } ?>><?php echo __("Name"); ?></option>
 										</select>
 									</div>
 
 									<div class="mb-3">
-										<label for="column3"><?php echo lang('account_column3_text'); ?></label>
+										<label for="column3"><?php echo __("Choose column 3"); ?></label>
 										<?php if(!isset($user_column3)) { $user_column3='RSTR'; }?>
 										<select class="form-select" id="column3" name="user_column3">
-											<option value="Band" <?php if ($user_column3 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column3 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column3 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column3 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column3 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column3 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column3 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column3 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column3 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column3 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column3 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column3 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column3 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column3 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column3 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
+											<option value="Band" <?php if ($user_column3 == "Band") { echo " selected =\"selected\""; } ?>><?php echo __("Band"); ?></option>
+											<option value="Frequency" <?php if ($user_column3 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo __("Frequency"); ?></option>
+											<option value="Mode" <?php if ($user_column3 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo __("Mode"); ?></option>
+											<option value="RSTS" <?php if ($user_column3 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo __("RST (S)"); ?></option>
+											<option value="RSTR" <?php if ($user_column3 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo __("RST (R)"); ?></option>
+											<option value="Country" <?php if ($user_column3 == "Country") { echo " selected =\"selected\""; } ?>><?php echo __("Country"); ?></option>
+											<option value="IOTA" <?php if ($user_column3 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo __("IOTA"); ?></option>
+											<option value="SOTA" <?php if ($user_column3 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo __("SOTA"); ?></option>
+											<option value="WWFF" <?php if ($user_column3 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo __("WWFF"); ?></option>
+											<option value="POTA" <?php if ($user_column3 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo __("POTA"); ?></option>
+											<option value="State" <?php if ($user_column3 == "State") { echo " selected =\"selected\""; } ?>><?php echo __("State"); ?></option>
+											<option value="Grid" <?php if ($user_column3 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo __("Gridsquare"); ?></option>
+											<option value="Distance" <?php if ($user_column3 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo __("Distance"); ?></option>
+											<option value="Operator" <?php if ($user_column3 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo __("Operator"); ?></option>
+											<option value="Name" <?php if ($user_column3 == "Name") { echo " selected =\"selected\""; } ?>><?php echo __("Name"); ?></option>
 										</select>
 									</div>
 
 									<div class="mb-3">
-										<label for="column4"><?php echo lang('account_column4_text'); ?></label>
+										<label for="column4"><?php echo __("Choose column 4"); ?></label>
 										<?php if(!isset($user_column4)) { $user_column4='Band'; }?>
 										<select class="form-select" id="column4" name="user_column4">
-											<option value="Band" <?php if ($user_column4 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column4 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column4 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column4 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column4 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column4 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column4 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column4 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column4 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column4 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column4 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column4 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column4 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column4 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column4 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
+											<option value="Band" <?php if ($user_column4 == "Band") { echo " selected =\"selected\""; } ?>><?php echo __("Band"); ?></option>
+											<option value="Frequency" <?php if ($user_column4 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo __("Frequency"); ?></option>
+											<option value="Mode" <?php if ($user_column4 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo __("Mode"); ?></option>
+											<option value="RSTS" <?php if ($user_column4 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo __("RST (S)"); ?></option>
+											<option value="RSTR" <?php if ($user_column4 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo __("RST (R)"); ?></option>
+											<option value="Country" <?php if ($user_column4 == "Country") { echo " selected =\"selected\""; } ?>><?php echo __("Country"); ?></option>
+											<option value="IOTA" <?php if ($user_column4 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo __("IOTA"); ?></option>
+											<option value="SOTA" <?php if ($user_column4 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo __("SOTA"); ?></option>
+											<option value="WWFF" <?php if ($user_column4 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo __("WWFF"); ?></option>
+											<option value="POTA" <?php if ($user_column4 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo __("POTA"); ?></option>
+											<option value="State" <?php if ($user_column4 == "State") { echo " selected =\"selected\""; } ?>><?php echo __("State"); ?></option>
+											<option value="Grid" <?php if ($user_column4 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo __("Gridsquare"); ?></option>
+											<option value="Distance" <?php if ($user_column4 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo __("Distance"); ?></option>
+											<option value="Operator" <?php if ($user_column4 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo __("Operator"); ?></option>
+											<option value="Name" <?php if ($user_column4 == "Name") { echo " selected =\"selected\""; } ?>><?php echo __("Name"); ?></option>
 										</select>
 									</div>
 
 									<div class="mb-3">
-										<label for="column5"><?php echo lang('account_column5_text'); ?></label>
+										<label for="column5"><?php echo __("Choose column 5 (only for logbook)"); ?></label>
 										<?php if(!isset($user_column5)) { $user_column5='Country'; }?>
 										<select class="form-select" id="column5" name="user_column5">
 											<option value="" <?php if ($user_column5 == "") { echo " selected =\"selected\""; } ?>></option>
-											<option value="Band" <?php if ($user_column5 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column5 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column5 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column5 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column5 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column5 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column5 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column5 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column5 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column5 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column5 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column5 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column5 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column5 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
-											<option value="Location" <?php if ($user_column5 == "Location") { echo " selected =\"selected\""; } ?>><?php echo lang('wavelog_station_profile'); ?></option>
+											<option value="Band" <?php if ($user_column5 == "Band") { echo " selected =\"selected\""; } ?>><?php echo __("Band"); ?></option>
+											<option value="Frequency" <?php if ($user_column5 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo __("Frequency"); ?></option>
+											<option value="Mode" <?php if ($user_column5 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo __("Mode"); ?></option>
+											<option value="RSTS" <?php if ($user_column5 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo __("RST (S)"); ?></option>
+											<option value="RSTR" <?php if ($user_column5 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo __("RST (R)"); ?></option>
+											<option value="Country" <?php if ($user_column5 == "Country") { echo " selected =\"selected\""; } ?>><?php echo __("Country"); ?></option>
+											<option value="IOTA" <?php if ($user_column5 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo __("IOTA"); ?></option>
+											<option value="SOTA" <?php if ($user_column5 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo __("SOTA"); ?></option>
+											<option value="WWFF" <?php if ($user_column5 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo __("WWFF"); ?></option>
+											<option value="POTA" <?php if ($user_column5 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo __("POTA"); ?></option>
+											<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo __("State"); ?></option>
+											<option value="Grid" <?php if ($user_column5 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo __("Gridsquare"); ?></option>
+											<option value="Distance" <?php if ($user_column5 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo __("Distance"); ?></option>
+											<option value="Operator" <?php if ($user_column5 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo __("Operator"); ?></option>
+											<option value="Name" <?php if ($user_column5 == "Name") { echo " selected =\"selected\""; } ?>><?php echo __("Name"); ?></option>
+											<option value="Location" <?php if ($user_column5 == "Location") { echo " selected =\"selected\""; } ?>><?php echo __("Station Location"); ?></option>
 										</select>
 									</div>
 								</div>
@@ -338,68 +338,68 @@
 						<!-- QSO Logging Options -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_qso_logging_options'); ?></div>
+								<div class="card-header"><?php echo __("QSO Logging Options"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label for="logendtime"><?php echo lang('account_log_end_time'); ?></label>
+										<label for="logendtime"><?php echo __("Log End Times for QSOs Separately"); ?></label>
 										<?php if(!isset($user_qso_end_times)) { $user_qso_end_times='0'; }?>
 										<select class="form-select" id="logendtimes" name="user_qso_end_times">
-											<option value="1" <?php if ($user_qso_end_times == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_qso_end_times == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+											<option value="1" <?php if ($user_qso_end_times == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+											<option value="0" <?php if ($user_qso_end_times == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 										</select>
-										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_log_end_time_hint'); ?></small>
+										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo __("Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time."); ?></small>
 									</div>
 
 									<hr />
 									<div class="mb-3">
-										<label for="profileimages"><?php echo lang('account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'); ?></label>
+										<label for="profileimages"><?php echo __("Show profile picture of QSO partner from qrz.com/hamqth.com profile in the log QSO section."); ?></label>
 										<?php if(!isset($user_show_profile_image)) { $user_show_profile_image='0'; }?>
 										<select class="form-select" id="profileimages" name="user_show_profile_image">
-											<option value="1" <?php if ($user_show_profile_image == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_show_profile_image == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+											<option value="1" <?php if ($user_show_profile_image == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+											<option value="0" <?php if ($user_show_profile_image == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 										</select>
-										<small class="form-text text-muted"><?php echo lang('account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'); ?></small>
+										<small class="form-text text-muted"><?php echo __("Please set your qrz.com/hamqth.com credentials in the general config file."); ?></small>
 									</div>
 
 									<hr />
 									<div class="mb-3">
-										<label for="qthlookup"><?php echo lang('account_location_auto_lookup'); ?></label>
+										<label for="qthlookup"><?php echo __("Location auto lookup."); ?></label>
 										<?php if(!isset($user_qth_lookup)) { $user_qth_lookup='0'; }?>
 										<select class="form-select" id="qthlookup" name="user_qth_lookup">
-											<option value="1" <?php if ($user_qth_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_qth_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+											<option value="1" <?php if ($user_qth_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+											<option value="0" <?php if ($user_qth_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 										</select>
-										<small class="form-text text-muted"><?php echo lang('account_if_set_gridsquare_is_fetched_based_on_location_name'); ?></small>
+										<small class="form-text text-muted"><?php echo __("If set, gridsquare is fetched based on location name."); ?></small>
 									</div>
 
 									<div class="mb-3">
-										<label for="sotalookup"><?php echo lang('account_sota_auto_lookup_gridsquare_and_name_for_summit'); ?></label>
+										<label for="sotalookup"><?php echo __("SOTA auto lookup gridsquare and name for summit."); ?></label>
 										<?php if(!isset($user_sota_lookup)) { $user_sota_lookup='0'; }?>
 										<select class="form-select" id="sotalookup" name="user_sota_lookup">
-											<option value="1" <?php if ($user_sota_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_sota_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+											<option value="1" <?php if ($user_sota_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+											<option value="0" <?php if ($user_sota_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 										</select>
-										<small class="form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></small>
+										<small class="form-text text-muted"><?php echo __("If set, name and gridsquare is fetched from the API and filled in location and locator."); ?></small>
 									</div>
 
 									<div class="mb-3">
-										<label for="wwfflookup"><?php echo lang('account_wwff_auto_lookup_gridsquare_and_name_for_reference'); ?></label>
+										<label for="wwfflookup"><?php echo __("WWFF auto lookup gridsquare and name for reference."); ?></label>
 										<?php if(!isset($user_wwff_lookup)) { $user_wwff_lookup='0'; }?>
 										<select class="form-select" id="wwfflookup" name="user_wwff_lookup">
-											<option value="1" <?php if ($user_wwff_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_wwff_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+											<option value="1" <?php if ($user_wwff_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+											<option value="0" <?php if ($user_wwff_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 										</select>
-										<small class="form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></small>
+										<small class="form-text text-muted"><?php echo __("If set, name and gridsquare is fetched from the API and filled in location and locator."); ?></small>
 									</div>
 
 									<div class="mb-3">
-										<label for="potalookup"><?php echo lang('account_pota_auto_lookup_gridsquare_and_name_for_park'); ?></label>
+										<label for="potalookup"><?php echo __("POTA auto lookup gridsquare and name for park."); ?></label>
 										<?php if(!isset($user_pota_lookup)) { $user_pota_lookup='0'; }?>
 										<select class="form-select" id="potalookup" name="user_pota_lookup">
-											<option value="1" <?php if ($user_pota_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_pota_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+											<option value="1" <?php if ($user_pota_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+											<option value="0" <?php if ($user_pota_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 										</select>
-										<small class="form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></small>
+										<small class="form-text text-muted"><?php echo __("If set, name and gridsquare is fetched from the API and filled in location and locator."); ?></small>
 									</div>
 								</div>
 							</div>
@@ -410,37 +410,37 @@
 						<!-- Menu Options -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_main_menu'); ?></div>
+								<div class="card-header"><?php echo __("Menu Options"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label for="shownotes"><?php echo lang('account_show_notes_in_the_main_menu'); ?></label>
+										<label for="shownotes"><?php echo __("Show notes in the main menu."); ?></label>
 										<?php if(!isset($user_show_notes)) { $user_show_notes='0'; }?>
 										<select class="form-select" id="shownotes" name="user_show_notes">
-											<option value="1" <?php if ($user_show_notes == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_show_notes == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+											<option value="1" <?php if ($user_show_notes == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+											<option value="0" <?php if ($user_show_notes == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 										</select>
 									</div>
 
 									<hr/>
 
 									<div class="mb-3">
-										<label for="quicklog"><?php echo lang('account_quicklog_feature'); ?></label>
+										<label for="quicklog"><?php echo __("Quicklog Field"); ?></label>
 										<?php if(!isset($user_quicklog)) { $user_quicklog='0'; }?>
 										<select class="form-select" id="quicklog" name="user_quicklog">
-											<option value="1" <?php if ($user_quicklog == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_quicklog == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+											<option value="1" <?php if ($user_quicklog == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+											<option value="0" <?php if ($user_quicklog == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 										</select>
-										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_feature_hint'); ?></small>
+										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo __("With this feature, you can log callsigns using the search field in the header."); ?></small>
 									</div>
 
 									<div class="mb-3">
-										<label for="quicklog_enter"><?php echo lang('account_quicklog_enter'); ?></label>
+										<label for="quicklog_enter"><?php echo __("Quicklog - Action on press Enter"); ?></label>
 										<?php if(!isset($user_quicklog_enter)) { $user_quicklog_enter='0'; }?>
 										<select class="form-select" id="quicklog_enter" name="user_quicklog_enter">
-											<option value="0" <?php if ($user_quicklog_enter == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('account_quicklog_enter_log'); ?></option>
-											<option value="1" <?php if ($user_quicklog_enter == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('account_quicklog_enter_search'); ?></option>
+											<option value="0" <?php if ($user_quicklog_enter == 0) { echo " selected =\"selected\""; } ?>><?php echo __("Log Callsign"); ?></option>
+											<option value="1" <?php if ($user_quicklog_enter == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Search Callsign"); ?></option>
 										</select>
-										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_enter_hint'); ?></small>
+										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo __("What action should be performed when Enter is pressed in the quicklog field?"); ?></small>
 									</div>
 									<?php if ($this->session->userdata('user_id') == $this->uri->segment(3)) { ?>
 									<hr/>
@@ -514,7 +514,7 @@
 									<div class="row"> <!-- QSO (confirmed) -->
 										<div class="mb-3 col-md-4">
 											<label><?php echo $this->lang->line('account_map_qso_confirm'); ?></label>
-											<small class="form-text text-muted"><?php echo lang('account_map_qso_confirm_same_qso'); ?></small>
+											<small class="form-text text-muted"><?php echo __("(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"); ?></small>
 										</div>
 										<div class="mb-3 col-md-3">
 											<div class="icon_selectBox" data-boxcontent="qsoconfirm">
@@ -537,8 +537,8 @@
 										</div>
 										<div class="md-3 col-md-3">
 											<select class="form-select" id="user_map_gridsquare_show" name="user_map_gridsquare_show">
-												<option value="1" <?php if ($user_map_gridsquare_show == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-												<option value="0" <?php if ($user_map_gridsquare_show == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+												<option value="1" <?php if ($user_map_gridsquare_show == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+												<option value="0" <?php if ($user_map_gridsquare_show == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 											</select>
 										</div>
 									</div>
@@ -552,16 +552,16 @@
 						<!-- Previous QSL -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_previous_qsl_type'); ?></div>
+								<div class="card-header"><?php echo __("Previous QSL Type"); ?></div>
 								<div class="card-body">
 									<div class="row">
 										<div class="mb-3">
-											<label for="profileimages"><?php echo lang('account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'); ?></label>
+											<label for="profileimages"><?php echo __("Select the type of QSL to show in the previous QSOs section."); ?></label>
 											<?php if(!isset($user_previous_qsl_type)) { $user_previous_qsl_type='0'; }?>
 											<select class="form-select" id="previousqsltype" name="user_previous_qsl_type">
-												<option value="0" <?php if ($user_previous_qsl_type == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_qsl'); ?></option>
-												<option value="1" <?php if ($user_previous_qsl_type == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('lotw_short'); ?></option>
-												<option value="2" <?php if ($user_previous_qsl_type == 2) { echo " selected =\"selected\""; } ?>><?php echo lang('eqsl_short'); ?></option>
+												<option value="0" <?php if ($user_previous_qsl_type == 0) { echo " selected =\"selected\""; } ?>><?php echo __("QSL"); ?></option>
+												<option value="1" <?php if ($user_previous_qsl_type == 1) { echo " selected =\"selected\""; } ?>><?php echo __("LoTW"); ?></option>
+												<option value="2" <?php if ($user_previous_qsl_type == 2) { echo " selected =\"selected\""; } ?>><?php echo __("eQSL"); ?></option>
 												<option value="4" <?php if ($user_previous_qsl_type == 4) { echo " selected =\"selected\""; } ?>>QRZ</option>
 												<option value="8" <?php if ($user_previous_qsl_type == 8) { echo " selected =\"selected\""; } ?>>Clublog</option>
 											</select>
@@ -573,34 +573,34 @@
 						</div>
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_references_show'); ?></div>
+								<div class="card-header"><?php echo __("Show Reference Fields on QSO Tab"); ?></div>
 								<div class="card-body">
 									<div class="row">
 										<div class="mb-3">
-											<label for="references_select"><?php echo lang('account_show_references_on_1st_tab'); ?></label>
+											<label for="references_select"><?php echo __("The enabled items will be shown on the QSO tab rather than the General tab."); ?></label>
 											<div class="form-check form-switch">
 												<input name="user_iota_to_qso_tab" class="form-check-input" type="checkbox" role="switch" id="iotaToQsoTab" <?php if ($user_iota_to_qso_tab ?? false) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="iotaToQsoTab" ><?php echo lang('gen_hamradio_iota_reference'); ?></label>
+												<label class="form-check-label" for="iotaToQsoTab" ><?php echo __("IOTA Reference"); ?></label>
 											</div>
 											<div class="form-check form-switch">
 												<input name="user_sota_to_qso_tab" class="form-check-input" type="checkbox" role="switch" id="sotaToQsoTab" <?php if ($user_sota_to_qso_tab ?? false) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="sotaToQsoTab" ><?php echo lang('gen_hamradio_sota_reference'); ?></label>
+												<label class="form-check-label" for="sotaToQsoTab" ><?php echo __("SOTA Reference"); ?></label>
 											</div>
 											<div class="form-check form-switch">
 												<input name="user_wwff_to_qso_tab" class="form-check-input" type="checkbox" role="switch" id="wwffToQsoTab" <?php if ($user_wwff_to_qso_tab ?? false) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="wwffToQsoTab" ><?php echo lang('gen_hamradio_wwff_reference'); ?></label>
+												<label class="form-check-label" for="wwffToQsoTab" ><?php echo __("WWFF Reference"); ?></label>
 											</div>
 											<div class="form-check form-switch">
 												<input name="user_pota_to_qso_tab" class="form-check-input" type="checkbox" role="switch" id="potaToQsoTab" <?php if ($user_pota_to_qso_tab ?? false) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="potaToQsoTab" ><?php echo lang('gen_hamradio_pota_reference'); ?></label>
+												<label class="form-check-label" for="potaToQsoTab" ><?php echo __("POTA Reference(s)"); ?></label>
 											</div>
 											<div class="form-check form-switch">
 												<input name="user_sig_to_qso_tab" class="form-check-input" type="checkbox" role="switch" id="sigToQsoTab" <?php if ($user_sig_to_qso_tab ?? false) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="sigToQsoTab" ><?php echo lang('gen_hamradio_sig'); ?> / <?php echo lang('gen_hamradio_sig_info'); ?></label>
+												<label class="form-check-label" for="sigToQsoTab" ><?php echo __("Sig"); ?> / <?php echo __("Sig Info"); ?></label>
 											</div>
 											<div class="form-check form-switch">
 												<input name="user_dok_to_qso_tab" class="form-check-input" type="checkbox" role="switch" id="dokToQsoTab" <?php if ($user_dok_to_qso_tab ?? false) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="dokToQsoTab" ><?php echo lang('gen_hamradio_dok'); ?></label>
+												<label class="form-check-label" for="dokToQsoTab" ><?php echo __("DOK"); ?></label>
 											</div>
 										</div>
 									</div>
@@ -616,7 +616,7 @@
 		<div class="accordion-item">
 			<h2 class="accordion-header" id="panelsStayOpen-H_default_value">
 				<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_default_value" aria-expanded="false" aria-controls="panelsStayOpen-B_default_value">
-					<?php echo lang('account_default_values');?></button>
+					<?php echo __("Default Values");?></button>
 			</h2>
 			<div id="panelsStayOpen-B_default_value" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_default_value">
 				<div class="accordion-body">
@@ -624,10 +624,10 @@
 						<!-- Default -->
 						<div class="col-md">
 							<div class="card">
-								<!--<div class="card-header"><?php echo lang('account_default_band_settings'); ?></div>-->
+								<!--<div class="card-header"><?php echo __("Settings for Default Band and Confirmation"); ?></div>-->
 								<div class="card-body">
 									<div class="mb-3">
-										<label for="user_default_band"><?php echo lang('account_gridmap_default_band'); ?></label>
+										<label for="user_default_band"><?php echo __("Default Band"); ?></label>
 										<?php if(!isset($user_default_band)) { $user_default_band='All'; }?>
 										<select id="user_default_band" class="form-select" name="user_default_band">
 											<option value="All">All</option>;
@@ -637,7 +637,7 @@
 										</select>
 									</div>
 									<div class="mb-3">
-										<label class="my-1 me-2"><?php echo lang('account_qsl_settings'); ?></label>
+										<label class="my-1 me-2"><?php echo __("Default QSL-Methods"); ?></label>
 										<div class="form-check-inline">
 											<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
 											if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
@@ -646,7 +646,7 @@
 												echo ' checked';
 											}
 											echo '>'; ?>
-											<label class="form-check-label" for="user_default_confirmation_qsl"><?php echo lang('gen_hamradio_qsl'); ?></label>
+											<label class="form-check-label" for="user_default_confirmation_qsl"><?php echo __("QSL"); ?></label>
 										</div>
 										<div class="form-check-inline">
 											<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_lotw" id="user_default_confirmation_lotw"';
@@ -656,7 +656,7 @@
 												echo ' checked';
 											}
 											echo '>'; ?>
-											<label class="form-check-label" for="user_default_confirmation_lotw"><?php echo lang('lotw_short'); ?></label>
+											<label class="form-check-label" for="user_default_confirmation_lotw"><?php echo __("LoTW"); ?></label>
 										</div>
 										<div class="form-check-inline">
 											<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_eqsl" id="user_default_confirmation_eqsl"';
@@ -664,7 +664,7 @@
 												echo ' checked';
 											}
 											echo '>'; ?>
-											<label class="form-check-label" for="user_default_confirmation_eqsl"><?php echo lang('account_eqsl'); ?></label>
+											<label class="form-check-label" for="user_default_confirmation_eqsl"><?php echo __("eQSL"); ?></label>
 										</div>
 										<div class="form-check-inline">
 											<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qrz" id="user_default_confirmation_qrz"';
@@ -694,7 +694,7 @@
 		<div class="accordion-item">
 			<h2 class="accordion-header" id="panelsStayOpen-H_confirmation_account">
 				<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_confirmation_account" aria-expanded="false" aria-controls="panelsStayOpen-B_confirmation_account">
-				<?php echo lang('account_third_party_services'); ?></button>
+				<?php echo __("Third Party Services"); ?></button>
 			</h2>
 			<div id="panelsStayOpen-B_confirmation_account" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_confirmation_account">
 				<div class="accordion-body">
@@ -702,16 +702,16 @@
 						<!-- Logbook of the World -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_logbook_of_the_world'); ?></div>
+								<div class="card-header"><?php echo __("Logbook of the World"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label><?php echo lang('account_logbook_of_the_world_lotw_username'); ?></label>
+										<label><?php echo __("Logbook of The World (LoTW) Username"); ?></label>
 										<input class="form-control" type="text" name="user_lotw_name" value="<?php if(isset($user_lotw_name)) { echo $user_lotw_name; } ?>" />
 										<?php if(isset($userlotwname_error)) { echo "<small class=\"badge bg-danger\">".$userlotwname_error."</small>"; } ?>
 									</div>
 
 									<div class="mb-3">
-										<label><?php echo lang('account_logbook_of_the_world_lotw_password'); ?></label>
+										<label><?php echo __("Logbook of The World (LoTW) Password"); ?></label>
 										<div class="input-group">
 											<input class="form-control" type="password" name="user_lotw_password" value="<?php if(isset($user_lotw_password)) { echo $user_lotw_password; } ?>" />
 											<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
@@ -728,16 +728,16 @@
 						<!-- eQSL -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_eqsl'); ?></div>
+								<div class="card-header"><?php echo __("eQSL"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label><?php echo lang('account_eqslcc_username'); ?></label>
+										<label><?php echo __("eQSL.cc Username"); ?></label>
 										<input class="form-control" type="text" name="user_eqsl_name" value="<?php if(isset($user_eqsl_name)) { echo $user_eqsl_name; } ?>" />
 											<?php if(isset($eqslusername_error)) { echo "<small class=\"badge bg-danger\">".$eqslusername_error."</small>"; } ?>
 									</div>
 
 									<div class="mb-3">
-										<label><?php echo lang('account_eqslcc_password'); ?></label>
+										<label><?php echo __("eQSL.cc Password"); ?></label>
 										<div class="input-group">
 											<input class="form-control" type="password" name="user_eqsl_password" value="<?php if(isset($user_eqsl_password)) { echo $user_eqsl_password; } ?>" />
 											<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
@@ -754,17 +754,17 @@
 						<!-- Club Log -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_clublog'); ?></div>
+								<div class="card-header"><?php echo __("Club Log"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label><?php echo lang('account_clublog_email_callsign'); ?></label>
+										<label><?php echo __("Club Log Email/Callsign"); ?></label>
 										<input class="form-control" type="text" name="user_clublog_name" value="<?php if(isset($user_clublog_name)) { echo $user_clublog_name; } ?>" />
-										<small class="form-text text-muted"><?php echo lang('account_the_email_or_callsign_you_use_to_login_to_club_log'); ?></small>
+										<small class="form-text text-muted"><?php echo __("The Email or Callsign you use to login to Club Log"); ?></small>
 										<?php if(isset($userclublogname_error)) { echo "<small class=\"badge bg-danger\">".$userclublogname_error."</small>"; } ?>
 									</div>
 
 									<div class="mb-3">
-										<label><?php echo lang('account_clublog_password'); ?></label>
+										<label><?php echo __("Club Log Password"); ?></label>
 										<div class="input-group">
 											<input class="form-control" type="password" name="user_clublog_password" value="<?php if(isset($user_clublog_password)) { echo $user_clublog_password; } ?>" />
 											<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
@@ -785,7 +785,7 @@
 		<div class="accordion-item">
 			<h2 class="accordion-header" id="panelsStayOpen-H_miscellaneous">
 				<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_miscellaneous" aria-expanded="false" aria-controls="panelsStayOpen-B_miscellaneous">
-				<?php echo lang('account_miscellaneous');?></button>
+				<?php echo __("Miscellaneous");?></button>
 			</h2>
 			<div id="panelsStayOpen-B_miscellaneous" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_miscellaneous">
 				<div class="accordion-body">
@@ -793,14 +793,14 @@
 						<!-- AMSAT Upload -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_amsat_status_upload'); ?></div>
+								<div class="card-header"><?php echo __("AMSAT Status Upload"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label for="amsatsatatusupload"><?php echo lang('account_upload_status_of_sat_qsos_to'); ?> <a href="https://www.amsat.org/status/" target="_blank">https://www.amsat.org/status/</a>.</label>
+										<label for="amsatsatatusupload"><?php echo __("Upload status of SAT QSOs to"); ?> <a href="https://www.amsat.org/status/" target="_blank">https://www.amsat.org/status/</a>.</label>
 										<?php if(!isset($user_amsat_status_upload)) { $user_amsat_status_upload='0'; }?>
 										<select class="form-select" id="amsatstatusupload" name="user_amsat_status_upload">
-											<option value="1" <?php if ($user_amsat_status_upload == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_amsat_status_upload == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
+											<option value="1" <?php if ($user_amsat_status_upload == 1) { echo " selected =\"selected\""; } ?>><?php echo __("Yes"); ?></option>
+											<option value="0" <?php if ($user_amsat_status_upload == 0) { echo " selected =\"selected\""; } ?>><?php echo __("No"); ?></option>
 										</select>
 									</div>
 								</div>
@@ -810,10 +810,10 @@
 						<!-- Mastodon -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_mastodon'); ?></div>
+								<div class="card-header"><?php echo __("Mastodonserver"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-									<label><?php echo lang('account_user_mastodon'); ?></label>
+									<label><?php echo __("URL of Mastodonserver"); ?></label>
 										<input class="form-control" type="text" name="user_mastodon_url" value="<?php if(isset($user_mastodon_url)) { echo $user_mastodon_url; } ?>" />
 										<small class="form-text text-muted"><?php echo lang('account_user_mastodon_hint'); ?></a></small>
 									</div>
@@ -824,14 +824,14 @@
 						<!-- Winkeyer -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_winkeyer'); ?> <span class="badge text-bg-danger float-end"><?php echo lang('admin_experimental'); ?></span></div>
+								<div class="card-header"><?php echo __("Winkeyer"); ?> <span class="badge text-bg-danger float-end"><?php echo __("Experimental"); ?></span></div>
 								<div class="card-body">
 									<div class="mb-3">
-										<label><?php echo lang('account_winkeyer_enabled'); ?></label>
+										<label><?php echo __("Winkeyer Features Enabled"); ?></label>
 										<?php if(!isset($user_winkey)) { $user_winkey='0'; }?>
 										<select class="form-select" name="user_winkey" id="user_winkeyer">
-											<option value="0" <?php if ($user_winkey == 0) { echo 'selected="selected"'; } ?>><?php echo lang('general_word_no'); ?></option>
-											<option value="1" <?php if ($user_winkey == 1) { echo 'selected="selected"'; } ?>><?php echo lang('general_word_yes'); ?></option>
+											<option value="0" <?php if ($user_winkey == 0) { echo 'selected="selected"'; } ?>><?php echo __("No"); ?></option>
+											<option value="1" <?php if ($user_winkey == 1) { echo 'selected="selected"'; } ?>><?php echo __("Yes"); ?></option>
 										</select>
 										<small class="form-text text-muted"><?php echo lang('account_winkeyer_hint'); ?></small>
 									</div>
@@ -844,21 +844,21 @@
 						<!-- Hams.at Settings -->
 						<div class="col-md">
 							<div class="card">
-								<div class="card-header"><?php echo lang('account_hamsat'); ?></div>
+								<div class="card-header"><?php echo __("Hams.at"); ?></div>
 								<div class="card-body">
 									<div class="mb-3">
-									<label><?php echo lang('account_hamsat_private_feed_key'); ?></label>
+									<label><?php echo __("Private Feed Key"); ?></label>
 										<input class="form-control" type="text" name="user_hamsat_key" value="<?php if(isset($user_hamsat_key)) { echo $user_hamsat_key; } ?>" />
 										<small class="form-text text-muted"><?php echo lang('account_hamsat_hint'); ?></a></small>
 									</div>
 									<div class="mb-3">
-										<label><?php echo lang('account_hamsat_workable_only'); ?></label>
+										<label><?php echo __("Show Workable Passes Only"); ?></label>
 										<?php if(!isset($user_hamsat_workable_only)) { $user_hamsat_workable_only='0'; }?>
 										<select class="form-select" name="user_hamsat_workable_only" id="user_hamsat_workable_only">
-											<option value="0" <?php if ($user_hamsat_workable_only == 0) { echo 'selected="selected"'; } ?>><?php echo lang('general_word_no'); ?></option>
-											<option value="1" <?php if ($user_hamsat_workable_only == 1) { echo 'selected="selected"'; } ?>><?php echo lang('general_word_yes'); ?></option>
+											<option value="0" <?php if ($user_hamsat_workable_only == 0) { echo 'selected="selected"'; } ?>><?php echo __("No"); ?></option>
+											<option value="1" <?php if ($user_hamsat_workable_only == 1) { echo 'selected="selected"'; } ?>><?php echo __("Yes"); ?></option>
 										</select>
-										<small class="form-text text-muted"><?php echo lang('account_hamsat_workable_only_hint'); ?></small>
+										<small class="form-text text-muted"><?php echo __("If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."); ?></small>
 									</div>
 								</div>
 							</div>
@@ -870,6 +870,6 @@
 		</div>
 	</div>
 	<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
-	<button type="submit" class="btn btn-primary mb-5 mt-3"><i class="fas fa-save"></i> <?php echo lang('account_save_account_changes'); ?></button>
+	<button type="submit" class="btn btn-primary mb-5 mt-3"><i class="fas fa-save"></i> <?php echo __("Save Account"); ?></button>
 </form>
 </div>
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php
index be92c5529..ce2da3c5e 100644
--- a/application/views/user/forgot_password.php
+++ b/application/views/user/forgot_password.php
@@ -30,8 +30,8 @@ input[type="email"] {
     <div class="my-2 rounded-0 shadow-sm card mb-2 shadow-sm">
         <div class="card-body">
             <div class="text-center">
-                        <h3 class="text-center"><?php echo lang('account_forgot_password'); ?> <i class="fa fa-lock"></i></h3>
-                        <p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
+                        <h3 class="text-center"><?php echo __("Forgot Password?"); ?> <i class="fa fa-lock"></i></h3>
+                        <p><?php echo __("You can reset your password here."); ?></p>
                 <div class="panel-body">
 
                     <?php if(validation_errors() != ''): ?>
@@ -44,11 +44,11 @@ input[type="email"] {
                         <div class="mb-3">
                             <div class="input-group">
                                 <span class="input-group-addon"><i class="glyphicon glyphicon-envelope color-blue"></i></span>
-                                <input id="email" name="email" placeholder="<?php echo lang('account_email_address'); ?>" class="form-control" type="email" autofocus>
+                                <input id="email" name="email" placeholder="<?php echo __("Email Address"); ?>" class="form-control" type="email" autofocus>
                             </div>
                         </div>
                         <div class="mb-3">
-                            <input name="recover-submit" class="w-100 btn btn-primary btn-block" value="<?php echo lang('account_reset_password'); ?>" type="submit">
+                            <input name="recover-submit" class="w-100 btn btn-primary btn-block" value="<?php echo __("Reset Password"); ?>" type="submit">
                         </div>
                         <input type="hidden" class="hide" name="token" id="token" value="">
                     </form>
diff --git a/application/views/user/login.php b/application/views/user/login.php
index f939ef97a..33f3e0b7c 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -42,21 +42,21 @@ body {
 			<?php $this->form_validation->set_error_delimiters('', ''); ?>
                 <input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
                 <div>
-                    <label for="floatingInput"><strong><?php echo lang('account_username'); ?></strong></label>
-                    <input type="text" name="user_name" class="form-control" id="floatingInput" placeholder="<?php echo lang('account_username'); ?>"
+                    <label for="floatingInput"><strong><?php echo __("Username"); ?></strong></label>
+                    <input type="text" name="user_name" class="form-control" id="floatingInput" placeholder="<?php echo __("Username"); ?>"
                         value="<?php echo $this->input->post('user_name'); ?>" autofocus>
                 </div>
                 <div>
-                    <label for="floatingPassword"><strong><?php echo lang('account_password'); ?></strong></label>
+                    <label for="floatingPassword"><strong><?php echo __("Password"); ?></strong></label>
                     <input type="password" name="user_password" class="form-control" id="floatingPassword"
-                        placeholder="<?php echo lang('account_password'); ?>">
+                        placeholder="<?php echo __("Password"); ?>">
                 </div>
 
                 <div>
-                    <p><small><a class="" href="<?php echo site_url('user/forgot_password'); ?>"><?php echo lang('account_forgot_your_password'); ?></a></small></p>
+                    <p><small><a class="" href="<?php echo site_url('user/forgot_password'); ?>"><?php echo __("Forgot your password?"); ?></a></small></p>
                 </div>
 					<?php $this->load->view('layout/messages'); ?>
-                <button class="w-100 btn btn-primary" type="submit"><?php echo lang('account_login'); ?> →</button>
+                <button class="w-100 btn btn-primary" type="submit"><?php echo __("Login"); ?> →</button>
             </form>
         </div>
     </div>
diff --git a/application/views/user/main.php b/application/views/user/main.php
index d098e60dc..1a0196465 100644
--- a/application/views/user/main.php
+++ b/application/views/user/main.php
@@ -1,12 +1,12 @@
 <script>
-	var lang_admin_confirm_pwd_reset = "<?php echo lang('admin_confirm_pwd_reset'); ?>";
-	var lang_admin_user = "<?php echo lang('admin_user'); ?>";
-	var lang_gen_hamradio_callsign = "<?php echo lang('gen_hamradio_callsign'); ?>";
+	var lang_admin_confirm_pwd_reset = "<?php echo __("Do you really want to send this user a password-reset link?"); ?>";
+	var lang_admin_user = "<?php echo __("User"); ?>";
+	var lang_gen_hamradio_callsign = "<?php echo __("Callsign"); ?>";
 
-	var lang_general_word_please_wait = "<?php echo lang ('general_word_please_wait'); ?>"
+	var lang_general_word_please_wait = "<?php echo __("Please Wait ..."); ?>"
 
-	var lang_admin_email_settings_incorrect = "<?php echo lang('admin_email_settings_incorrect'); ?>";
-	var lang_admin_password_reset_processed = "<?php echo lang('admin_password_reset_processed'); ?>";
+	var lang_admin_email_settings_incorrect = "<?php echo __("Email settings are incorrect."); ?>";
+	var lang_admin_password_reset_processed = "<?php echo __("Password-reset e-mail sent to user:"); ?>";
 </script>
 <div class="container">
 
@@ -27,31 +27,31 @@
 
 	<div class="card">
 		<div class="card-header">
-			<?php echo lang('admin_user_list'); ?>
+			<?php echo __("User List"); ?>
 		</div>
 		<div class="card-body">
-			<p class="card-text"><?php echo lang('admin_user_line1'); ?></p>
-			<p class="card-text"><?php echo lang('admin_user_line2'); ?></p>
-			<p class="card-text"><?php echo lang('admin_user_line3'); ?></p>
-			<p class="card-text"><?php echo lang('admin_user_line4'); ?></p>
+			<p class="card-text"><?php echo __("Wavelog needs at least one user configured in order to operate."); ?></p>
+			<p class="card-text"><?php echo __("Users can be assigned roles which give them different permissions, such as adding QSOs to the logbook and accessing Wavelog APIs."); ?></p>
+			<p class="card-text"><?php echo __("The currently logged-in user is displayed at the upper-right of each page."); ?></p>
+			<p class="card-text"><?php echo __("With the password reset button, you can send a user an email containing a link to reset their password. To achieve this, ensure that the email settings in the global options are configured correctly."); ?></p>
 			<p>
-				<a class="btn btn-primary" href="<?php echo site_url('user/add'); ?>"><i class="fas fa-user-plus"></i> <?php echo lang('admin_create_user'); ?></a>
-				<a class="btn btn-secondary" style="float: right;" href="<?php echo site_url('user'); ?>"><i class="fas fa-sync"></i> <?php echo lang('admin_refresh_list'); ?></a>
+				<a class="btn btn-primary" href="<?php echo site_url('user/add'); ?>"><i class="fas fa-user-plus"></i> <?php echo __("Create user"); ?></a>
+				<a class="btn btn-secondary" style="float: right;" href="<?php echo site_url('user'); ?>"><i class="fas fa-sync"></i> <?php echo __("Refresh List"); ?></a>
 			</p>
 
 			<div class="table-responsive">
 				<table class="table table-striped" id="adminusertable">
 					<thead>
 						<tr>
-							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_user'); ?></th>
-							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('gen_hamradio_callsign'); ?></th>
-							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_email'); ?></th>
-							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_type'); ?></th>
-							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_last_seen'); ?></th>
+							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("User"); ?></th>
+							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("Callsign"); ?></th>
+							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("E-mail"); ?></th>
+							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("Type"); ?></th>
+							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("Last seen"); ?></th>
 							<th></th>
-							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_edit'); ?></th>
-							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_password_reset'); ?></th>
-							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_delete'); ?></th>
+							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("Edit"); ?></th>
+							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("Password Reset"); ?></th>
+							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo __("Delete"); ?></th>
 						</tr>
 					</thead>
 					<tbody>
@@ -76,17 +76,17 @@
 										echo "<a><i style=\"color: red;\" class=\"fas fa-circle\"></i> " . $row->last_seen . "</a>";
 									}
 								} else {
-									echo lang('general_word_never');
+									echo __("Never");
 								}?>
 							</td>
 							<td style="text-align: left; vertical-align: middle;">
-								<span class="badge text-bg-success"><?php echo lang('admin_station_locations'); ?>: <?php echo $row->stationcount; ?></span>
+								<span class="badge text-bg-success"><?php echo __("Locations"); ?>: <?php echo $row->stationcount; ?></span>
 								<br>
-								<span class="badge text-bg-info"><?php echo lang('admin_station_logbooks'); ?>: <?php echo $row->logbookcount; ?></span>
+								<span class="badge text-bg-info"><?php echo __("Logbooks"); ?>: <?php echo $row->logbookcount; ?></span>
 								<?php if ($row->qsocount > 0) { ?>
-									<span class="badge text-bg-light" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="<?php echo lang('admin_last_qso'); ?><br><?php echo $row->lastqso; ?>"><?php echo $row->qsocount; ?> <?php echo lang('gen_hamradio_qso'); ?></span>
+									<span class="badge text-bg-light" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="<?php echo __("Last QSO:"); ?><br><?php echo $row->lastqso; ?>"><?php echo $row->qsocount; ?> <?php echo __("QSO"); ?></span>
 								<?php } else { ?>
-									<span class="badge text-bg-light" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="<?php echo lang('admin_no_qso_in_log'); ?>"><?php echo $row->qsocount; ?> <?php echo lang('gen_hamradio_qso'); ?></span>
+									<span class="badge text-bg-light" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="<?php echo __("No QSOs in Log"); ?>"><?php echo $row->qsocount; ?> <?php echo __("QSO"); ?></span>
 								<?php } ?>
 							</td>
 							<td style="text-align: center; vertical-align: middle;"><a href="<?php echo site_url('user/edit') . "/" . $row->user_id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-user-edit"></i></a>
diff --git a/application/views/user/reset_password.php b/application/views/user/reset_password.php
index e83184c29..6f406ac43 100644
--- a/application/views/user/reset_password.php
+++ b/application/views/user/reset_password.php
@@ -5,8 +5,8 @@
               <div class="panel-body">
                 <div class="text-center">
                   <h3><i class="fa fa-lock fa-4x"></i></h3>
-                  <h2 class="text-center"><?php echo lang('account_reset_password'); ?>?</h2>
-                  <p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
+                  <h2 class="text-center"><?php echo __("Reset Password"); ?>?</h2>
+                  <p><?php echo __("You can reset your password here."); ?></p>
                   <div class="panel-body">
                     
                     <?php if(validation_errors() != ''): ?>
@@ -18,21 +18,21 @@
                     <form role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/reset_password'); ?>/<?php echo $reset_code; ?>">
 
                         <div class="mb-3 row">
-                            <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_password'); ?></label>
+                            <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo __("Password"); ?></label>
                             <div class="col-sm-10">
-                                <input type="password" name="password" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
+                                <input type="password" name="password" class="form-control" id="inputPassword" placeholder="<?php echo __("Password"); ?>">
                             </div>
                         </div>
 
                         <div class="mb-3 row">
-                            <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_confirm_password'); ?></label>
+                            <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo __("Confirm Password"); ?></label>
                             <div class="col-sm-10">
-                                <input type="password" name="password_confirm" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
+                                <input type="password" name="password_confirm" class="form-control" id="inputPassword" placeholder="<?php echo __("Password"); ?>">
                             </div>
                         </div>
 
                       <div class="mb-3">
-                        <input name="recover-submit" class="btn btn-lg btn-primary btn-block" value="<?php echo lang('account_reset_password'); ?>" type="submit">
+                        <input name="recover-submit" class="btn btn-lg btn-primary btn-block" value="<?php echo __("Reset Password"); ?>" type="submit">
                       </div>
                       
                       <input type="hidden" class="hide" name="token" id="token" value=""> 
diff --git a/application/views/version_dialog/index.php b/application/views/version_dialog/index.php
index 4ac806cef..0c78e8789 100644
--- a/application/views/version_dialog/index.php
+++ b/application/views/version_dialog/index.php
@@ -72,11 +72,11 @@
                 <?php
                 if ($versionDialogMode !== 'disabled') {
                 ?>
-                    <button class="btn btn-secondary" onclick="dismissVersionDialog()" data-bs-dismiss="modal"><?php echo lang('options_version_dialog_dismiss'); ?></button>
+                    <button class="btn btn-secondary" onclick="dismissVersionDialog()" data-bs-dismiss="modal"><?php echo __("Don't show again"); ?></button>
                 <?php
                 }
                 ?>
-                <button type="button" class="btn btn-primary" data-bs-dismiss="modal"><?php echo lang('options_version_dialog_close'); ?></button>
+                <button type="button" class="btn btn-primary" data-bs-dismiss="modal"><?php echo __("Close"); ?></button>
             </div>
         </div>
     </div>
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php
index 965df3f6a..b4d489a23 100644
--- a/application/views/view_log/index.php
+++ b/application/views/view_log/index.php
@@ -1,14 +1,14 @@
 <div class="alert alert-secondary" role="alert" style="margin-bottom: 0px !important;">
 	<div class="container">
 		<?php if ($results) { ?>
-			<p style="margin-bottom: 0px !important;"><?php echo lang('gen_hamradio_active_logbook'); ?>: <span class="badge text-bg-info ms-1"><?php echo $this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?></span><i id="directory_tooltip" data-bs-toggle="tooltip" data-bs-placement="right" class="fas fa-question-circle text-muted ms-2" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="<?php echo lang('gen_hamradio_active_logbook_hint'); ?>"></i> </p>
+			<p style="margin-bottom: 0px !important;"><?php echo __("Active Logbook"); ?>: <span class="badge text-bg-info ms-1"><?php echo $this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?></span><i id="directory_tooltip" data-bs-toggle="tooltip" data-bs-placement="right" class="fas fa-question-circle text-muted ms-2" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="<?php echo __("Displaying all QSOs of station locations which are linked to this logbook"); ?>"></i> </p>
 		<?php } ?>
 	</div>
 </div>
 
 <div class="container logbook">
 
-	<h2><?php echo lang('gen_hamradio_logbook'); ?></h2>
+	<h2><?php echo __("Logbook"); ?></h2>
 	<?php if ($this->session->flashdata('notice')) { ?>
 		<div class="alert alert-info" role="alert">
 			<?php echo $this->session->flashdata('notice'); ?>
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index f43beebcf..f8bbb692e 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -1,16 +1,16 @@
 <div class="table-responsive">
 	<table class="table table-sm table-striped table-hover">
 		<tr class="titles">
-            <td><?php echo lang('general_word_date'); ?></td>
+            <td><?php echo __("Date"); ?></td>
             <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
-            <td><?php echo lang('general_word_time'); ?></td>
+            <td><?php echo __("Time"); ?></td>
             <?php } ?>
-            <td><?php echo lang('gen_hamradio_call'); ?></td>
-            <td><?php echo lang('gen_hamradio_mode'); ?></td>
-            <td><?php echo lang('gen_hamradio_rsts'); ?></td>
-            <td><?php echo lang('gen_hamradio_rstr'); ?></td>
-            <td><?php echo lang('gen_hamradio_band'); ?></td>
-            <td><?php echo lang('general_word_country'); ?></td>
+            <td><?php echo __("Call"); ?></td>
+            <td><?php echo __("Mode"); ?></td>
+            <td><?php echo __("RST (S)"); ?></td>
+            <td><?php echo __("RST (R)"); ?></td>
+            <td><?php echo __("Band"); ?></td>
+            <td><?php echo __("Country"); ?></td>
             <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
                 <td>QSL</td>
                 <?php if($this->session->userdata('user_eqsl_name') != "") { ?>
@@ -19,7 +19,7 @@
                 <?php if($this->session->userdata('user_lotw_name') != "") { ?>
                     <td>LoTW</td>
                 <?php } ?>
-                <td><?php echo lang('gen_hamradio_station'); ?></td>
+                <td><?php echo __("Station"); ?></td>
                 <td></td>
             <?php } ?>
         </tr>
@@ -132,28 +132,28 @@
                     </a>
 
                     <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
-                        <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo lang('general_edit_qso'); ?></a>
+                        <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo __("Edit QSO"); ?></a>
 
                         <?php if($row->COL_QSL_SENT !='Y') { ?>
                             <div class="qsl_sent_<?php echo $row->COL_PRIMARY_KEY; ?>">
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_tx_bureau'); ?></a>
-                                <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_tx_direct'); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Sent (Bureau)"); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Sent (Direct)"); ?></a>
                             </div>
                         <?php } ?>
 
                         <?php if($row->COL_QSL_RCVD !='Y') { ?>
                             <div class="qsl_rcvd_<?php echo $row->COL_PRIMARY_KEY; ?>">
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_bureau'); ?></a>
-                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_direct'); ?></a>
-                                <a class="dropdown-item" href="javascript:qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i><?php echo lang('general_mark_qsl_requested'); ?></a>
-                                <a class="dropdown-item" href="javascript:qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i><?php echo lang('general_mark_qsl_not_required'); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Received (Bureau)"); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Received (Direct)"); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i><?php echo __("Mark QSL Card Requested"); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i><?php echo __("Mark QSL Card Not Required"); ?></a>
                             </div>
                         <?php } ?>
 
                     </div>
-                    <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?php echo lang('general_delete_qso'); ?></a>
+                    <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?php echo __("Delete QSO"); ?></a>
                 </div>
 			</td>
 			<?php } ?>
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index f7bab19f0..cb56477e5 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -56,11 +56,11 @@ function echo_table_col($row, $name) {
     <table style="width:100%" class="table contacttable table-striped table-hover">
         <thead>
             <tr class="titles">
-                <th><?php echo lang('general_word_date'); ?></th>
+                <th><?php echo __("Date"); ?></th>
                 <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
-                <th><?php echo lang('general_word_time'); ?></th>
+                <th><?php echo __("Time"); ?></th>
                 <?php } ?>
-                <th><?php echo lang('gen_hamradio_call'); ?></th>
+                <th><?php echo __("Call"); ?></th>
                 <?php
                 echo_table_header_col($this, $this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1'));
                 echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2'));
@@ -85,7 +85,7 @@ function echo_table_col($row, $name) {
                         <th>Clublog</th>
                     <?php } ?>
                 <?php } ?>
-                    <th><?php echo lang('gen_hamradio_station'); ?></th>
+                    <th><?php echo __("Station"); ?></th>
                 <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
                     <th></th>
                 <?php } ?>
@@ -139,16 +139,16 @@ function echo_table_col($row, $name) {
                 <span <?php if ($row->COL_QSL_SENT != "N") {
                        switch ($row->COL_QSL_SENT) {
                        case "Y":
-                          echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_sent');
+                          echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Sent");
                           break;
                        case "Q":
-                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued');
+                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued");
                           break;
                        case "R":
-                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested');
+                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested");
                           break;
                        case "I":
-                          echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore');
+                          echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)");
                           break;
                        default:
                           echo "class=\"qsl-red";
@@ -161,32 +161,32 @@ function echo_table_col($row, $name) {
                        if ($row->COL_QSL_SENT_VIA != "") {
                           switch ($row->COL_QSL_SENT_VIA) {
                              case "B":
-                                echo " (".lang('general_word_qslcard_bureau').")";
+                                echo " (".__("Bureau").")";
                                 break;
                              case "D":
-                                echo " (".lang('general_word_qslcard_direct').")";
+                                echo " (".__("Direct").")";
                                 break;
                              case "M":
-                                echo " (".lang('general_word_qslcard_via').": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")";
+                                echo " (".__("Via").": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")";
                                 break;
                              case "E":
-                                echo " (".lang('general_word_qslcard_electronic').")";
+                                echo " (".__("Electronic").")";
                                 break;
                          }
                        } ?>">&#9650;</span>
                 <span <?php if ($row->COL_QSL_RCVD != "N") {
                        switch ($row->COL_QSL_RCVD) {
                        case "Y":
-                          echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_received');
+                          echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Received");
                           break;
                        case "Q":
-                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued');
+                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued");
                           break;
                        case "R":
-                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested');
+                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested");
                           break;
                        case "I":
-                          echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore');
+                          echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)");
                           break;
                        default:
                           echo "class=\"qsl-red";
@@ -199,16 +199,16 @@ function echo_table_col($row, $name) {
                        if ($row->COL_QSL_RCVD_VIA != "") {
                           switch ($row->COL_QSL_RCVD_VIA) {
                              case "B":
-                                echo " (".lang('general_word_qslcard_bureau').")";
+                                echo " (".__("Bureau").")";
                                 break;
                              case "D":
-                                echo " (".lang('general_word_qslcard_direct').")";
+                                echo " (".__("Direct").")";
                                 break;
                              case "M":
                                 echo " (Manager)";
                                 break;
                              case "E":
-                                echo " (".lang('general_word_qslcard_electronic').")";
+                                echo " (".__("Electronic").")";
                                 break;
                          }
                        } ?>">&#9660;</span>
@@ -216,8 +216,8 @@ function echo_table_col($row, $name) {
 
                 <?php } if (strpos($this->session->userdata('user_default_confirmation'),'E') !== false && ($this->session->userdata('user_eqsl_name') != "")){ ?>
                     <td class="eqsl">
-                        <span <?php if ($row->COL_EQSL_QSL_SENT == "Y") { echo "title=\"".lang('eqsl_short')." ".lang('general_word_sent'); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
-                        <span <?php if ($row->COL_EQSL_QSL_RCVD == "Y") { echo "title=\"".lang('eqsl_short')." ".lang('general_word_received'); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
+                        <span <?php if ($row->COL_EQSL_QSL_SENT == "Y") { echo "title=\"".__("eQSL")." ".__("Sent"); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
+                        <span <?php if ($row->COL_EQSL_QSL_RCVD == "Y") { echo "title=\"".__("eQSL")." ".__("Received"); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
 			    	<?php if($row->COL_EQSL_QSL_RCVD =='Y') { ?>
                         <a class="eqsl-green" href="<?php echo site_url("eqsl/image/".$row->COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">&#9660;</a>
                     <?php } else { ?>
@@ -229,23 +229,23 @@ function echo_table_col($row, $name) {
 
                 <?php if ( strpos($this->session->userdata('user_default_confirmation'),'L') !== false && ($this->session->userdata('user_lotw_name') != "") ) { ?>
                     <td class="lotw">
-                        <span <?php if ($row->COL_LOTW_QSL_SENT == "Y") { echo "title=\"".lang('lotw_short')." ".lang('general_word_sent'); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
-                        <span <?php if ($row->COL_LOTW_QSL_RCVD == "Y") { echo "title=\"".lang('lotw_short')." ".lang('general_word_received'); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
+                        <span <?php if ($row->COL_LOTW_QSL_SENT == "Y") { echo "title=\"".__("LoTW")." ".__("Sent"); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
+                        <span <?php if ($row->COL_LOTW_QSL_RCVD == "Y") { echo "title=\"".__("LoTW")." ".__("Received"); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
                     </td>
                 <?php } ?>
 
 		<?php if ( strpos($this->session->userdata('user_default_confirmation'),'Z') !== false && ($this->session->userdata('hasQrzKey') != "") ) { ?>
                     <td class="qrz">
-                        <span <?php if ($row->COL_QRZCOM_QSO_UPLOAD_STATUS == "Y") { echo "title=\"QRZ ".lang('general_word_sent'); if ($row->COL_QRZCOM_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="qrz-<?php echo ($row->COL_QRZCOM_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">&#9650;</span>
-                        <span <?php if ($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "Y") { echo "title=\"QRZ ".lang('general_word_received'); if ($row->COL_QRZCOM_QSO_DOWNLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_DOWNLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="qrz-<?php echo ($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">&#9660;</span>
+                        <span <?php if ($row->COL_QRZCOM_QSO_UPLOAD_STATUS == "Y") { echo "title=\"QRZ ".__("Sent"); if ($row->COL_QRZCOM_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="qrz-<?php echo ($row->COL_QRZCOM_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">&#9650;</span>
+                        <span <?php if ($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "Y") { echo "title=\"QRZ ".__("Received"); if ($row->COL_QRZCOM_QSO_DOWNLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_DOWNLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="qrz-<?php echo ($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">&#9660;</span>
                     </td>
                 <?php } ?>
 
 
 		<?php if ( strpos($this->session->userdata('user_default_confirmation'),'C') !== false ) { ?>
                     <td class="clublog">
-                        <span <?php if ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS == "Y") { echo "title=\"Clublog ".lang('general_word_sent'); if ($row->COL_CLUBLOG_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="clublog-<?php echo ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">&#9650;</span>
-                        <span <?php if ($row->COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "Y") { echo "title=\"Clublog ".lang('general_word_received'); if ($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE != null) { $timestamp = strtotime($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="clublog-<?php echo ($row->COL_CLUBLOG_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">&#9660;</span>
+                        <span <?php if ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS == "Y") { echo "title=\"Clublog ".__("Sent"); if ($row->COL_CLUBLOG_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="clublog-<?php echo ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">&#9650;</span>
+                        <span <?php if ($row->COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "Y") { echo "title=\"Clublog ".__("Received"); if ($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE != null) { $timestamp = strtotime($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="clublog-<?php echo ($row->COL_CLUBLOG_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">&#9660;</span>
                     </td>
                 <?php } ?>
 
@@ -265,35 +265,35 @@ function echo_table_col($row, $name) {
                         </div>
 
                         <div class="dropdown-menu menuOnResultTab" data-bs-toggle="popover" data-bs-placement="auto" data-qsoid="qso_<?php echo $row->COL_PRIMARY_KEY; ?>">
-                            <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo lang('general_edit_qso'); ?></a>
+                            <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo __("Edit QSO"); ?></a>
 
                             <?php if($row->COL_QSL_SENT !='Y') { ?>
                                 <div class="qsl_sent_<?php echo $row->COL_PRIMARY_KEY; ?>">
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_tx_bureau'); ?></a>
-                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_tx_direct'); ?></a>
-                                    <a class="dropdown-item" href="javascript:qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_requested'); ?></a>
-                                    <a class="dropdown-item" href="javascript:qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_not_required'); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Sent (Bureau)"); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Sent (Direct)"); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Card Requested"); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Card Not Required"); ?></a>
                                 </div>
                             <?php } ?>
 
                             <?php if($row->COL_QSL_RCVD !='Y') { ?>
                                 <div class="qsl_rcvd_<?php echo $row->COL_PRIMARY_KEY; ?>">
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_bureau'); ?></a>
-                                    <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_direct'); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Received (Bureau)"); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Received (Direct)"); ?></a>
                                 </div>
                             <?php } ?>
 
                             <div class="dropdown-divider"></div>
 
-                            <a class="dropdown-item" href="https://www.qrz.com/db/<?php echo $row->COL_CALL; ?>" target="_blank"><i class="fas fa-question"></i> <?php echo lang('general_lookup_qrz'); ?></a>
+                            <a class="dropdown-item" href="https://www.qrz.com/db/<?php echo $row->COL_CALL; ?>" target="_blank"><i class="fas fa-question"></i> <?php echo __("Lookup on QRZ.com"); ?></a>
 
-                            <a class="dropdown-item" href="https://www.hamqth.com/<?php echo $row->COL_CALL; ?>" target="_blank"><i class="fas fa-question"></i> <?php echo lang('general_lookup_hamqth'); ?></a>
+                            <a class="dropdown-item" href="https://www.hamqth.com/<?php echo $row->COL_CALL; ?>" target="_blank"><i class="fas fa-question"></i> <?php echo __("Lookup on HamQTH"); ?></a>
 
                             <div class="dropdown-divider"></div>
 
-                            <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?php echo lang('general_delete_qso'); ?></a>
+                            <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?php echo __("Delete QSO"); ?></a>
                         </div>
                     </div>
                 </td>
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index ba1dc4107..cd01f89d1 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -3,10 +3,10 @@
 
     <ul style="margin-bottom: 10px;" class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item">
-            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#qsodetails" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('qso_details'); ?></a>
+            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#qsodetails" role="tab" aria-controls="table" aria-selected="true"><?php echo __("QSO Details"); ?></a>
         </li>
         <li class="nav-item">
-            <a id="station-tab" class="nav-link" data-bs-toggle="tab" href="#stationdetails" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('wavelog_station_profile'); ?></a>
+            <a id="station-tab" class="nav-link" data-bs-toggle="tab" href="#stationdetails" role="tab" aria-controls="table" aria-selected="true"><?php echo __("Station Location"); ?></a>
         </li>
         <?php
         if ($row->COL_NOTES != null) {?>
@@ -22,11 +22,11 @@
                 echo 'hidden ';
             }
                 echo 'class="qslcardtab nav-item">
-                <a class="nav-link" id="qsltab" data-bs-toggle="tab" href="#qslcard" role="tab" aria-controls="home" aria-selected="false">'. lang('general_word_qslcard') .'</a>
+                <a class="nav-link" id="qsltab" data-bs-toggle="tab" href="#qslcard" role="tab" aria-controls="home" aria-selected="false">'. __("QSL Card") .'</a>
                 </li>';
 
             echo '<li class="nav-item">
-            <a class="nav-link" id="qslmanagementtab" data-bs-toggle="tab" href="#qslupload" role="tab" aria-controls="home" aria-selected="false">'. lang('general_word_qslcard_management') .'</a>
+            <a class="nav-link" id="qslmanagementtab" data-bs-toggle="tab" href="#qslupload" role="tab" aria-controls="home" aria-selected="false">'. __("QSL Management") .'</a>
             </li>';
         }
 
@@ -68,7 +68,7 @@
 
                         ?>
 
-                        <td><?php echo lang('general_word_datetime'); ?></td>
+                        <td><?php echo __("Date/Time"); ?></td>
                         <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
                         <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date($custom_date_format, $timestamp); $timestamp = strtotime($row->COL_TIME_ON); $time_on = date('H:i', $timestamp); echo " at ".$time_on; ?>
                         <?php $timestamp = strtotime($row->COL_TIME_OFF); $time_off = date('H:i', $timestamp); if ($time_on != $time_off) { echo " - ".$time_off; } ?>
@@ -79,39 +79,39 @@
                     </tr>
 
                     <tr>
-                        <td><?php echo lang('gen_hamradio_callsign'); ?></td>
+                        <td><?php echo __("Callsign"); ?></td>
                         <td><b><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></b> <a target="_blank" href="https://www.qrz.com/db/<?php echo strtoupper($row->COL_CALL); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/qrz.png" alt="Lookup <?php echo strtoupper($row->COL_CALL); ?> on QRZ.com"></a> <a target="_blank" href="https://www.hamqth.com/<?php echo strtoupper($row->COL_CALL); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/hamqth.png" alt="Lookup <?php echo strtoupper($row->COL_CALL); ?> on HamQTH"></a> <a target="_blank" href="http://www.eqsl.cc/Member.cfm?<?php echo strtoupper($row->COL_CALL); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/eqsl.png" alt="Lookup <?php echo strtoupper($row->COL_CALL); ?> on eQSL.cc"></a> <a target="_blank" href="https://clublog.org/logsearch.php?log=<?php echo strtoupper($row->COL_CALL); ?>&call=<?php echo strtoupper($row->station_callsign); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/clublog.png" alt="Clublog Log Search"></a></td>
                     </tr>
 
                     <tr>
-                        <td><?php echo lang('gen_hamradio_band'); ?></td>
+                        <td><?php echo __("Band"); ?></td>
                         <td><?php echo $row->COL_BAND; ?></td>
                     </tr>
 
                     <?php if($this->config->item('display_freq') == true) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_frequency'); ?></td>
+                        <td><?php echo __("Frequency"); ?></td>
                         <td><?php echo $this->frequency->hz_to_mhz($row->COL_FREQ); ?></td>
                     </tr>
                     <?php if($row->COL_FREQ_RX != 0) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_frequency_rx'); ?></td>
+                        <td><?php echo __("Frequency (RX)"); ?></td>
                         <td><?php echo $this->frequency->hz_to_mhz($row->COL_FREQ_RX); ?></td>
                     </tr>
                     <?php }} ?>
 
                     <tr>
-                        <td><?php echo lang('gen_hamradio_mode'); ?></td>
+                        <td><?php echo __("Mode"); ?></td>
                         <td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
                     </tr>
 
                     <tr>
-                        <td><?php echo lang('gen_hamradio_rsts'); ?></td>
+                        <td><?php echo __("RST (S)"); ?></td>
                         <td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX) { ?>(<?php printf("%03d", $row->COL_STX);?>)<?php } ?> <?php if ($row->COL_STX_STRING) { ?>(<?php echo $row->COL_STX_STRING;?>)<?php } ?></td>
                     </tr>
 
                     <tr>
-                        <td><?php echo lang('gen_hamradio_rstr'); ?></td>
+                        <td><?php echo __("RST (R)"); ?></td>
                         <td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX) { ?>(<?php printf("%03d", $row->COL_SRX);?>)<?php } ?> <?php if ($row->COL_SRX_STRING) { ?>(<?php echo $row->COL_SRX_STRING;?>)<?php } ?></td>
                     </tr>
 
@@ -125,7 +125,7 @@
                     <?php if($row->COL_GRIDSQUARE != null && strlen($row->COL_GRIDSQUARE) >= 4) { ?>
                     <!-- Total Distance Between the Station Profile Gridsquare and Logged Square -->
                     <tr>
-                        <td><?php echo lang('general_total_distance'); //Total distance ?></td>
+                        <td><?php echo __("Total Distance"); //Total distance ?></td>
                         <td>
                             <?php
                                 // Cacluate Distance
@@ -188,7 +188,7 @@
 
                     <?php if($row->COL_NAME != null) { ?>
                     <tr>
-                        <td><?php echo lang('general_word_name'); ?></td>
+                        <td><?php echo __("Name"); ?></td>
                         <td><?php echo $row->COL_NAME; ?></td>
                     </tr>
                     <?php } ?>
@@ -196,7 +196,7 @@
                     <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
                     <?php if($row->COL_COMMENT != null) { ?>
                     <tr>
-                        <td><?php echo lang('general_word_comment'); ?></td>
+                        <td><?php echo __("Comment"); ?></td>
                         <td><?php echo $row->COL_COMMENT; ?></td>
                     </tr>
                     <?php } ?>
@@ -204,65 +204,65 @@
 
                     <?php if($row->COL_SAT_NAME != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_satellite_name'); ?></td>
+                        <td><?php echo __("Satellite Name"); ?></td>
                         <td><a href="https://db.satnogs.org/search/?q=<?php echo $row->COL_SAT_NAME; ?>" target="_blank"><?php echo $row->COL_SAT_NAME; ?></a></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_SAT_MODE != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_satellite_mode'); ?></td>
+                        <td><?php echo __("Satellite Mode"); ?></td>
                         <td><?php echo (strlen($row->COL_SAT_MODE) == 2 ? (strtoupper($row->COL_SAT_MODE[0]).'/'.strtoupper($row->COL_SAT_MODE[1])) : strtoupper($row->COL_SAT_MODE)); ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_ANT_AZ != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_ant_az'); ?></td>
+                        <td><?php echo __("Antenna Azimuth"); ?></td>
                         <td><?php echo round($row->COL_ANT_AZ, 1); ?>&deg; <span style="margin-left: 2px; display: inline-block; transform: rotate(<?php echo (-45+$row->COL_ANT_AZ); ?>deg);"><i class="fas fa-location-arrow fa-xs"></i></span></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_ANT_EL != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_ant_el'); ?></td>
+                        <td><?php echo __("Antenna Elevation"); ?></td>
                         <td><?php echo round($row->COL_ANT_EL, 1); ?>&deg; <span style="margin-left: 2px; display: inline-block; transform: rotate(<?php echo (-$row->COL_ANT_EL); ?>deg);"><i class="fas fa-arrow-right fa-xs"></i></span></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->name != null) { ?>
                     <tr>
-                        <td><?php echo lang('general_word_country'); ?></td>
-                        <td><?php echo ucwords(strtolower(($row->name)), "- (/"); if ($dxccFlag != null) { echo " ".$dxccFlag; } if ($row->end != null) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
+                        <td><?php echo __("Country"); ?></td>
+                        <td><?php echo ucwords(strtolower(($row->name)), "- (/"); if ($dxccFlag != null) { echo " ".$dxccFlag; } if ($row->end != null) { echo ' <span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>'; } ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_CONT != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_continent'); ?></td>
+                        <td><?php echo __("Continent"); ?></td>
                         <td>
                         <?php
                            switch($row->COL_CONT) {
                              case "AF":
-                               echo lang('africa');
+                               echo __("Africa");
                                break;
                              case "AN":
-                               echo lang('antarctica');
+                               echo __("Antarctica");
                                break;
                              case "AS":
-                               echo lang('asia');
+                               echo __("Asia");
                                break;
                              case "EU":
-                               echo lang('europe');
+                               echo __("Europe");
                                break;
                              case "NA":
-                               echo lang('northamerica');
+                               echo __("North America");
                                break;
                              case "OC":
-                               echo lang('oceania');
+                               echo __("Oceania");
                                break;
                              case "SA":
-                               echo lang('southamerica');
+                               echo __("South America");
                                break;
                            }
                         ?>
@@ -272,35 +272,35 @@
 
                     <?php if($row->COL_CONTEST_ID != null) { ?>
                     <tr>
-                        <td><?php echo lang('contesting_contest_name'); ?></td>
+                        <td><?php echo __("Contest Name"); ?></td>
                         <td><?php echo $row->COL_CONTEST_ID; ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_IOTA != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_iota_reference'); ?></td>
+                        <td><?php echo __("IOTA Reference"); ?></td>
                         <td><a href="https://www.iota-world.org/iotamaps/?grpref=<?php echo $row->COL_IOTA; ?>" target="_blank"><?php echo $row->COL_IOTA; ?></a></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_SOTA_REF != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_sota_reference'); ?></td>
+                        <td><?php echo __("SOTA Reference"); ?></td>
                         <td><a href="https://summits.sota.org.uk/summit/<?php echo $row->COL_SOTA_REF; ?>" target="_blank"><?php echo $row->COL_SOTA_REF; ?></a></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_WWFF_REF != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_wwff_reference'); ?></td>
+                        <td><?php echo __("WWFF Reference"); ?></td>
                         <td><a href="https://www.cqgma.org/zinfo.php?ref=<?php echo $row->COL_WWFF_REF; ?>" target="_blank"><?php echo $row->COL_WWFF_REF; ?></a></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_POTA_REF != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_pota_reference'); ?></td>
+                        <td><?php echo __("POTA Reference(s)"); ?></td>
                         <td>
                             <?php
                             $pota_refs = explode(',', $row->COL_POTA_REF);
@@ -322,14 +322,14 @@
 
                     <?php if($row->COL_SIG != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_sig'); ?></td>
+                        <td><?php echo __("Sig"); ?></td>
                         <td><?php echo $row->COL_SIG; ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_SIG_INFO != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_sig_info'); ?></td>
+                        <td><?php echo __("Sig Info"); ?></td>
                         <?php
                         switch ($row->COL_SIG) {
                         case "GMA":
@@ -348,7 +348,7 @@
 
                     <?php if($row->COL_DARC_DOK != null) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_dok'); ?></td>
+                        <td><?php echo __("DOK"); ?></td>
                         <?php if (preg_match('/^[A-Y]\d{2}$/', $row->COL_DARC_DOK)) { ?>
                         <td><a href="https://www.darc.de/<?php echo $row->COL_DARC_DOK; ?>" target="_blank"><?php echo $row->COL_DARC_DOK; ?></a></td>
                         <?php } else if (preg_match('/^DV[ABCDEFGHIKLMNOPQRSTUVWXY]$/', $row->COL_DARC_DOK)) { ?>
@@ -363,19 +363,19 @@
 
                 </table>
                 <?php if($row->COL_QSL_SENT == "Y" || $row->COL_QSL_RCVD == "Y") { ?>
-                    <h3><?php echo lang('qslcard_info'); ?></h3>
+                    <h3><?php echo __("QSL Info"); ?></h3>
 
                     <?php if($row->COL_QSL_SENT == "Y") {?>
                         <?php if ($row->COL_QSL_SENT_VIA == "B") { ?>
-                            <p><?php echo lang('qslcard_sent_bureau'); ?>
+                            <p><?php echo __("QSL Card has been sent via the bureau"); ?>
                         <?php } else if($row->COL_QSL_SENT_VIA == "D") { ?>
-                            <p><?php echo lang('qslcard_sent_direct'); ?>
+                            <p><?php echo __("QSL Card has been sent via direct"); ?>
                         <?php } else if($row->COL_QSL_SENT_VIA == "E") { ?>
-                            <p><?php echo lang('qslcard_sent_electronic'); ?>
+                            <p><?php echo __("QSL Card has been sent electronically"); ?>
                         <?php } else if($row->COL_QSL_SENT_VIA == "M") { ?>
-                            <p><?php echo lang('qslcard_sent_manager'); ?>
+                            <p><?php echo __("QSL Card has been sent via manager"); ?>
                         <?php } else { ?>
-                            <p><?php echo lang('qslcard_sent'); ?>
+                            <p><?php echo __("QSL Card has been sent"); ?>
                         <?php } ?>
                         <?php if ($row->COL_QSLSDATE != null) { ?>
                             <?php $timestamp = strtotime($row->COL_QSLSDATE); echo " (".date($custom_date_format, $timestamp).")"; ?></p>
@@ -384,15 +384,15 @@
 
                     <?php if($row->COL_QSL_RCVD == "Y") { ?>
                         <?php if ($row->COL_QSL_RCVD_VIA == "B") { ?>
-                            <p><?php echo lang('qslcard_rcvd_bureau'); ?>
+                            <p><?php echo __("QSL Card has been received via the bureau"); ?>
                         <?php } else if($row->COL_QSL_RCVD_VIA == "D") { ?>
-                            <p><?php echo lang('qslcard_rcvd_direct'); ?>
+                            <p><?php echo __("QSL Card has been received via direct"); ?>
                         <?php } else if($row->COL_QSL_RCVD_VIA == "E") { ?>
-                            <p><?php echo lang('qslcard_rcvd_electronic'); ?>
+                            <p><?php echo __("QSL Card has been received electronically"); ?>
                         <?php } else if($row->COL_QSL_RCVD_VIA == "M") { ?>
-                            <p><?php echo lang('qslcard_rcvd_manager'); ?>
+                            <p><?php echo __("QSL Card has been received via manager"); ?>
                         <?php } else { ?>
-                            <p><?php echo lang('qslcard_rcvd'); ?>
+                            <p><?php echo __("QSL Card has been received"); ?>
                         <?php } ?>
                         <?php if ($row->COL_QSLRDATE != null) { ?>
                             <?php $timestamp = strtotime($row->COL_QSLRDATE); echo " (".date($custom_date_format, $timestamp).")"; ?></p>
@@ -401,27 +401,27 @@
 
                 <?php } ?>
                     <?php if($row->lotwuser != null) { ?>
-                    <br /><p><?php echo lang('lotw_user'); ?> <a href="https://lotw.arrl.org/lotwuser/act?act=<?php echo $row->COL_CALL;?>" target="_blank"><?php echo lang('lotw_last_upload').'</a>: '; ?><?php $timestamp = strtotime($row->lastupload); echo date($custom_date_format, $timestamp); $timestamp = strtotime($row->lastupload); echo " ".date('H:i', $timestamp);?> UTC.</p>
+                    <br /><p><?php echo __("This station uses LoTW."); ?> <a href="https://lotw.arrl.org/lotwuser/act?act=<?php echo $row->COL_CALL;?>" target="_blank"><?php echo __("Last Upload").'</a>: '; ?><?php $timestamp = strtotime($row->lastupload); echo date($custom_date_format, $timestamp); $timestamp = strtotime($row->lastupload); echo " ".date('H:i', $timestamp);?> UTC.</p>
                     <?php } ?>
 
                     <?php if($row->COL_LOTW_QSL_RCVD == "Y" && $row->COL_LOTW_QSLRDATE != null) { ?>
-                    <h3><?php echo lang('lotw_short'); ?></h3>
-                    <p><?php echo lang('gen_this_qso_was_confirmed_on'); ?> <?php $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.</p>
+                    <h3><?php echo __("LoTW"); ?></h3>
+                    <p><?php echo __("This QSO was confirmed on"); ?> <?php $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.</p>
                     <?php } ?>
 
                     <?php if($row->COL_EQSL_QSL_RCVD == "Y" && $row->COL_EQSL_QSLRDATE != null) { ?>
                     <h3>eQSL</h3>
-                        <p><?php echo lang('gen_this_qso_was_confirmed_on'); ?> <?php $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.</p>
+                        <p><?php echo __("This QSO was confirmed on"); ?> <?php $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.</p>
                     <?php } ?>
 
                     <?php if($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "Y" && $row->COL_QRZCOM_QSO_DOWNLOAD_DATE != null) { ?>
                     <h3>QRZ.com</h3>
-                        <p><?php echo lang('gen_this_qso_was_confirmed_on'); ?> <?php $timestamp = strtotime($row->COL_QRZCOM_QSO_DOWNLOAD_DATE); echo date($custom_date_format, $timestamp); ?>.</p>
+                        <p><?php echo __("This QSO was confirmed on"); ?> <?php $timestamp = strtotime($row->COL_QRZCOM_QSO_DOWNLOAD_DATE); echo date($custom_date_format, $timestamp); ?>.</p>
                     <?php } ?>
 
                     <?php if($row->COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "Y" && $row->COL_CLUBLOG_QSO_DOWNLOAD_DATE != null) { ?>
                     <h3>Clublog</h3>
-                        <p><?php echo lang('gen_this_qso_was_confirmed_on'); ?> <?php $timestamp = strtotime($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE); echo date($custom_date_format, $timestamp); ?>.</p>
+                        <p><?php echo __("This QSO was confirmed on"); ?> <?php $timestamp = strtotime($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE); echo date($custom_date_format, $timestamp); ?>.</p>
                     <?php } ?>
             </div>
 
@@ -431,8 +431,8 @@
 
                     <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
                         <br>
-                            <div style="display: inline-block;"><p class="editButton"><a class="btn btn-primary" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> <?php echo lang('qso_btn_edit_qso'); ?></a></p></div>
-                            <div style="display: inline-block;"><form method="POST" action="<?php echo site_url('search'); ?>"><input type="hidden" value="<?php echo strtoupper($row->COL_CALL); ?>" name="callsign"><button class="btn btn-primary" type="submit"><i class="fas fa-eye"></i> <?php echo lang('general_more_qso'); ?></button></form></div>
+                            <div style="display: inline-block;"><p class="editButton"><a class="btn btn-primary" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> <?php echo __("Edit QSO"); ?></a></p></div>
+                            <div style="display: inline-block;"><form method="POST" action="<?php echo site_url('search'); ?>"><input type="hidden" value="<?php echo strtoupper($row->COL_CALL); ?>" name="callsign"><button class="btn btn-primary" type="submit"><i class="fas fa-eye"></i> <?php echo __("More QSOs"); ?></button></form></div>
                     <?php } ?>
 
                     <?php
@@ -500,86 +500,86 @@
         </div>
 
         <div class="tab-pane fade" id="stationdetails" role="tabpanel" aria-labelledby="table-tab">
-            <h3><?php echo lang('gen_hamradio_station') . ' ' . lang('general_word_details'); ?></h3>
+            <h3><?php echo __("Station") . ' ' . __("Details"); ?></h3>
 
             <table width="100%">
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_callsign'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("Callsign"); ?></td>
                         <td><?php echo $row->station_callsign; ?></td>
                     </tr>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('general_word_name'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("Name"); ?></td>
                         <td><?php echo $row->station_profile_name; ?></td>
                     </tr>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_gridsquare'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("Gridsquare"); ?></td>
                         <td><?php echo $row->station_gridsquare; ?></td>
                     </tr>
 
                     <?php if($row->station_city) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('general_word_city'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("City"); ?></td>
                         <td><?php echo $row->station_city; ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->station_country) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('general_word_country'); ?></td>
-                        <td><?php echo ucwords(strtolower(($row->station_country)), "- (/"); if ($row->station_end != null) echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; ?></td>
+                        <td><?php echo __("Station") . ' ' . __("Country"); ?></td>
+                        <td><?php echo ucwords(strtolower(($row->station_country)), "- (/"); if ($row->station_end != null) echo ' <span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>'; ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_OPERATOR) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_operator'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("Operator"); ?></td>
                         <td><?php echo $row->COL_OPERATOR; ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->COL_TX_PWR) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_transmit_power'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("Transmit Power (W)"); ?></td>
                         <td><?php echo $row->COL_TX_PWR; ?> W</td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->station_iota) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_iota_reference'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("IOTA Reference"); ?></td>
                         <td><?php echo $row->station_iota; ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->station_sota) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_sota_reference'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("SOTA Reference"); ?></td>
                         <td><?php echo $row->station_sota; ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->station_wwff) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_wwff_reference'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("WWFF Reference"); ?></td>
                         <td><?php echo $row->station_wwff; ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->station_pota) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_pota_reference'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("POTA Reference(s)"); ?></td>
                         <td><?php echo $row->station_pota; ?></td>
                     </tr>
                     <?php } ?>
 
                     <?php if($row->station_sig) { ?>
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_sig'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("Sig"); ?></td>
                         <td><?php echo $row->station_sig; ?></td>
                     </tr>
 
                     <tr>
-                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_sig_info'); ?></td>
+                        <td><?php echo __("Station") . ' ' . __("Sig Info"); ?></td>
                         <td><?php echo $row->station_sig_info; ?></td>
                     </tr>
                     <?php } ?>
@@ -587,7 +587,7 @@
         </div>
 
         <div class="tab-pane fade" id="notesdetails" role="tabpanel" aria-labelledby="table-tab">
-            <h3><?php echo lang('general_word_notes'); ?></h3>
+            <h3><?php echo __("Notes"); ?></h3>
             <?php if (isset($row->COL_NOTES)) { echo nl2br($row->COL_NOTES); } ?>
         </div>
 
@@ -619,7 +619,7 @@
             }
             ?>
 
-            <p><div class="alert alert-warning" role="alert"><span class="badge text-bg-warning"><?php echo lang('general_word_warning'); ?></span> <?php echo lang('gen_max_file_upload_size'); ?> <?php echo $max_upload; ?>B.</div></p>
+            <p><div class="alert alert-warning" role="alert"><span class="badge text-bg-warning"><?php echo __("Warning"); ?></span> <?php echo __("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">
@@ -627,17 +627,17 @@
                         <fieldset>
 
                             <div class="mb-3">
-                                <label for="qslcardfront"><?php echo lang('qslcard_upload_front'); ?></label>
+                                <label for="qslcardfront"><?php echo __("Uploaded QSL Card front image"); ?></label>
                                 <input class="form-control" type="file" id="qslcardfront" name="qslcardfront" accept="image/*" >
                             </div>
 
                             <input type="hidden" class="form-control" id="qsoinputid" name="qsoid" value="<?php echo $row->COL_PRIMARY_KEY; ?>">
-                            <button type="button" onclick="uploadQsl();" id="button1id"  name="button1id" class="btn btn-primary"><?php echo lang('qslcard_upload_button'); ?></button>
+                            <button type="button" onclick="uploadQsl();" id="button1id"  name="button1id" class="btn btn-primary"><?php echo __("Upload QSL Card image"); ?></button>
 
                 </div>
                 <div class="col-md">
                             <div class="mb-3">
-                                <label for="qslcardback"><?php echo lang('qslcard_upload_back'); ?></label>
+                                <label for="qslcardback"><?php echo __("Uploaded QSL Card back image"); ?></label>
                                 <input class="form-control" type="file" id="qslcardback" name="qslcardback" accept="image/*">
                             </div>
 
@@ -649,21 +649,21 @@
             <p>
             <div class="row">
                 <div class="col-md">
-                        <button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B');" id="qslrxb"  name="qslrxb" class="btn btn-sm btn-success ld-ext-right ld-ext-right-r-B"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_bureau'); ?> <div class="ld ld-ring ld-spin"></div></button>
+                        <button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B');" id="qslrxb"  name="qslrxb" class="btn btn-sm btn-success ld-ext-right ld-ext-right-r-B"><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Received (Bureau)"); ?> <div class="ld ld-ring ld-spin"></div></button>
 
-                        <button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D');" id="qslrxd"  name="qslrxd" class="btn btn-sm btn-success ld-ext-right ld-ext-right-r-D"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_direct'); ?> <div class="ld ld-ring ld-spin"></div></button>
+                        <button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D');" id="qslrxd"  name="qslrxd" class="btn btn-sm btn-success ld-ext-right ld-ext-right-r-D"><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Received (Direct)"); ?> <div class="ld ld-ring ld-spin"></div></button>
 
-                        <button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'E');" id="qslrxe"  name="qslrxe" class="btn btn-sm btn-success ld-ext-right ld-ext-right-r-E"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_electronic'); ?> <div class="ld ld-ring ld-spin"></div></button>
+                        <button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'E');" id="qslrxe"  name="qslrxe" class="btn btn-sm btn-success ld-ext-right ld-ext-right-r-E"><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Received (Electronic)"); ?> <div class="ld ld-ring ld-spin"></div></button>
                 </div>
             </div>
             <p>
             <div class="row">
                 <div class="col-md">
-                        <button type="button" onclick="qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B');" id="qsltxb"  name="qsltxb" class="btn btn-sm btn-warning ld-ext-right ld-ext-right-t-B"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_requested_bureau'); ?> <div class="ld ld-ring ld-spin"></div></button>
+                        <button type="button" onclick="qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B');" id="qsltxb"  name="qsltxb" class="btn btn-sm btn-warning ld-ext-right ld-ext-right-t-B"><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Card Requested (Bureau)"); ?> <div class="ld ld-ring ld-spin"></div></button>
 
-                        <button type="button" onclick="qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D');" id="qsltxd"  name="qsltxd" class="btn btn-sm btn-warning ld-ext-right ld-ext-right-t-D"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_requested_direct'); ?> <div class="ld ld-ring ld-spin"></div></button>
+                        <button type="button" onclick="qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D');" id="qsltxd"  name="qsltxd" class="btn btn-sm btn-warning ld-ext-right ld-ext-right-t-D"><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Card Requested (Direct)"); ?> <div class="ld ld-ring ld-spin"></div></button>
 
-                        <button type="button" onclick="qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'I');" id="qsltxi"  name="qsltxi" class="btn btn-sm btn-warning ld-ext-right ld-ext-right-ignore"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_not_required'); ?> <div class="ld ld-ring ld-spin"></div></button>
+                        <button type="button" onclick="qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'I');" id="qsltxi"  name="qsltxi" class="btn btn-sm btn-warning ld-ext-right ld-ext-right-ignore"><i class="fas fa-envelope"></i> <?php echo __("Mark QSL Card Not Required"); ?> <div class="ld ld-ring ld-spin"></div></button>
 
                 </div>
             </div>
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php
index 827f4cb85..5d2b0f484 100644
--- a/application/views/visitor/index.php
+++ b/application/views/visitor/index.php
@@ -145,12 +145,12 @@ if ($public_maps_option == 'true') { ?>
 				<table class="table table-striped table-hover">
 					<thead>
 						<tr class="titles">
-							<th><?php echo lang('general_word_date'); ?></th>
+							<th><?php echo __("Date"); ?></th>
 
 							<?php if (($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
-								<th><?php echo lang('general_word_time'); ?></th>
+								<th><?php echo __("Time"); ?></th>
 							<?php } ?>
-							<th><?php echo lang('gen_hamradio_call'); ?></th>
+							<th><?php echo __("Call"); ?></th>
 							<?php
 							echo_table_header_col($this, $this->session->userdata('user_column1') == "" ? 'Mode' : $this->session->userdata('user_column1'));
 							echo_table_header_col($this, $this->session->userdata('user_column2') == "" ? 'RSTS' : $this->session->userdata('user_column2'));
@@ -235,36 +235,36 @@ if ($public_maps_option == 'true') { ?>
 			<div class="table-responsive">
 				<table class="table table-striped">
 					<tr class="titles">
-						<td colspan="2"><i class="fas fa-chart-bar"></i> <?php echo lang('dashboard_qso_breakdown'); ?></td>
+						<td colspan="2"><i class="fas fa-chart-bar"></i> <?php echo __("QSOs Breakdown"); ?></td>
 					</tr>
 
 					<tr>
-						<td width="50%"><?php echo lang('general_word_total'); ?></td>
+						<td width="50%"><?php echo __("Total"); ?></td>
 						<td width="50%"><?php echo $total_qsos; ?></td>
 					</tr>
 
 					<tr>
-						<td width="50%"><?php echo lang('general_word_year'); ?></td>
+						<td width="50%"><?php echo __("Year"); ?></td>
 						<td width="50%"><?php echo $year_qsos; ?></td>
 					</tr>
 
 					<tr>
-						<td width="50%"><?php echo lang('general_word_month'); ?></td>
+						<td width="50%"><?php echo __("Month"); ?></td>
 						<td width="50%"><?php echo $month_qsos; ?></td>
 					</tr>
 				</table>
 
 				<table class="table table-striped">
 					<tr class="titles">
-						<td colspan="2"><i class="fas fa-globe-europe"></i> <?php echo lang('dashboard_countries_breakdown'); ?></td>
+						<td colspan="2"><i class="fas fa-globe-europe"></i> <?php echo __("Countries Breakdown"); ?></td>
 					</tr>
 
 					<tr>
-						<td width="50%"><?php echo lang('general_word_worked'); ?></td>
+						<td width="50%"><?php echo __("Worked"); ?></td>
 						<td width="50%"><?php echo $total_countries; ?></td>
 					</tr>
 					<tr>
-						<td width="50%"><a href="#" onclick="return false" title="QSL Cards / eQSL / LoTW" data-bs-toggle="tooltip"><?php echo lang('general_word_confirmed'); ?></a></td>
+						<td width="50%"><a href="#" onclick="return false" title="QSL Cards / eQSL / LoTW" data-bs-toggle="tooltip"><?php echo __("Confirmed"); ?></a></td>
 						<td width="50%">
 							<?php echo $total_countries_confirmed_paper; ?> /
 							<?php echo $total_countries_confirmed_eqsl; ?> /
@@ -273,7 +273,7 @@ if ($public_maps_option == 'true') { ?>
 					</tr>
 
 					<tr>
-						<td width="50%"><?php echo lang('general_word_needed'); ?></td>
+						<td width="50%"><?php echo __("Needed"); ?></td>
 						<td width="50%"><?php echo $total_countries_needed; ?></td>
 					</tr>
 				</table>
@@ -281,21 +281,21 @@ if ($public_maps_option == 'true') { ?>
 				<?php if ((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_rcvd != 0 || $total_qsl_requested != 0)) { ?>
 					<table class="table table-striped">
 						<tr class="titles">
-							<td colspan="2"><i class="fas fa-envelope"></i> <?php echo lang('general_word_qslcards'); ?></td>
+							<td colspan="2"><i class="fas fa-envelope"></i> <?php echo __("QSL Cards"); ?></td>
 						</tr>
 
 						<tr>
-							<td width="50%"><?php echo lang('general_word_sent'); ?></td>
+							<td width="50%"><?php echo __("Sent"); ?></td>
 							<td width="50%"><?php echo $total_qsl_sent; ?></td>
 						</tr>
 
 						<tr>
-							<td width="50%"><?php echo lang('general_word_received'); ?></td>
+							<td width="50%"><?php echo __("Received"); ?></td>
 							<td width="50%"><?php echo $total_qsl_rcvd; ?></td>
 						</tr>
 
 						<tr>
-							<td width="50%"><?php echo lang('general_word_requested'); ?></td>
+							<td width="50%"><?php echo __("Requested"); ?></td>
 							<td width="50%"><?php echo $total_qsl_requested; ?></td>
 						</tr>
 					</table>
@@ -304,16 +304,16 @@ if ($public_maps_option == 'true') { ?>
 				<?php if ((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_rcvd != 0)) { ?>
 					<table class="table table-striped">
 						<tr class="titles">
-							<td colspan="2"><i class="fas fa-address-card"></i> <?php echo lang('general_word_eqslcards'); ?></td>
+							<td colspan="2"><i class="fas fa-address-card"></i> <?php echo __("eQSL Cards"); ?></td>
 						</tr>
 
 						<tr>
-							<td width="50%"><?php echo lang('general_word_sent'); ?></td>
+							<td width="50%"><?php echo __("Sent"); ?></td>
 							<td width="50%"><?php echo $total_eqsl_sent; ?></td>
 						</tr>
 
 						<tr>
-							<td width="50%"><?php echo lang('general_word_received'); ?></td>
+							<td width="50%"><?php echo __("Received"); ?></td>
 							<td width="50%"><?php echo $total_eqsl_rcvd; ?></td>
 						</tr>
 					</table>
@@ -322,16 +322,16 @@ if ($public_maps_option == 'true') { ?>
 				<?php if ((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_lotw_sent != 0 || $total_lotw_rcvd != 0)) { ?>
 					<table class="table table-striped">
 						<tr class="titles">
-							<td colspan="2"><i class="fas fa-list"></i> <?php echo lang('general_word_lotw'); ?></td>
+							<td colspan="2"><i class="fas fa-list"></i> <?php echo __("Logbook of the World"); ?></td>
 						</tr>
 
 						<tr>
-							<td width="50%"><?php echo lang('general_word_sent'); ?></td>
+							<td width="50%"><?php echo __("Sent"); ?></td>
 							<td width="50%"><?php echo $total_lotw_sent; ?></td>
 						</tr>
 
 						<tr>
-							<td width="50%"><?php echo lang('general_word_received'); ?></td>
+							<td width="50%"><?php echo __("Received"); ?></td>
 							<td width="50%"><?php echo $total_lotw_rcvd; ?></td>
 						</tr>
 					</table>
diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php
index 1954e96c8..96ca24f7a 100644
--- a/application/views/visitor/layout/footer.php
+++ b/application/views/visitor/layout/footer.php
@@ -236,7 +236,7 @@
     <?php } ?>
     <!-- TODO: We will add Multilanguage Support for the public views later, so wie komment this out for the moment -->
     <!-- <script>
-        var lang_datatables_language = "<?php echo lang('datatables_language') ?>";
+        var lang_datatables_language = "<?php echo __("en-GB") ?>";
     </script> -->
   </body>
 </html>
diff --git a/application/views/visitor/layout/header.php b/application/views/visitor/layout/header.php
index 64dc20d88..147df0f96 100644
--- a/application/views/visitor/layout/header.php
+++ b/application/views/visitor/layout/header.php
@@ -94,10 +94,10 @@
 				$this->CI =& get_instance();
 				if ($this->CI->public_search_enabled($slug)) { ?>
 					<form method="post" name="searchForm" action="<?php echo site_url('visitor/search'); ?>" onsubmit="return validateForm()" class="d-flex align-items-center">
-						<input class="form-control me-sm-2" id="searchcall" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" <?php if (isset($callsign) && $callsign != '') { echo 'value="'.strtoupper($callsign).'"'; } ?> aria-label="Search" data-toogle="tooltip" data-bs-placement="bottom" title="Please enter a callsign!">
+						<input class="form-control me-sm-2" id="searchcall" type="search" name="callsign" placeholder="<?php echo __("Search Callsign"); ?>" <?php if (isset($callsign) && $callsign != '') { echo 'value="'.strtoupper($callsign).'"'; } ?> aria-label="Search" data-toogle="tooltip" data-bs-placement="bottom" title="Please enter a callsign!">
 						<input type="hidden" name="public_slug" value="<?php echo $slug; ?>">
-						<button title="<?php echo lang('menu_search_button'); ?>" class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i>
-							<div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo lang('menu_search_button'); ?></div>
+						<button title="<?php echo __("Search"); ?>" class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i>
+							<div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo __("Search"); ?></div>
 						</button>
 					</form>
 				<?php }
diff --git a/application/views/webadif/export.php b/application/views/webadif/export.php
index a59e69829..1c199b628 100644
--- a/application/views/webadif/export.php
+++ b/application/views/webadif/export.php
@@ -94,12 +94,12 @@
 					<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
 					<div class="row">
                     <div class="mb-3 col-md-3">
-                        <label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+                        <label for="from"><?php echo __("From date") . ": " ?></label>
                         <input name="from" id="from" type="date" class="form-control w-auto">
                     </div>
 
                     <div class="mb-3 col-md-3">
-                        <label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
+                        <label for="to"><?php echo __("To date") . ": " ?></label>
                         <input name="to" id="to" type="date" class="form-control w-auto">
                     </div>
                 </div>