Merge dev into master for a tagged 2.4.3 release

This merges development branch into master tagged for 2.4.3

application/config/autoload.php

@@ -64,7 +64,7 @@ $autoload['libraries'] = array('database', 'session', 'curl', 'OptionsLib', 'Fre
 |	$autoload['helper'] = array('url', 'file');
 */
 
-$autoload['helper'] = array('url', 'security');
+$autoload['helper'] = array('url', 'security', 'language');
 
 
 /*
@@ -96,8 +96,17 @@ $autoload['config'] = array('cloudlog', 'bands', 'lotw');
 |
 */
 
-$autoload['language'] = array('general_words');
-
+$autoload['language'] = array(
+    'account',
+    'contesting',
+    'eqsl',
+    'general_words',
+    'lotw',
+    'menu',
+    'notes',
+    'qslcard',
+    'qso',
+    );
 
 /*
 | -------------------------------------------------------------------

application/config/migration.php

@@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 121;
+$config['migration_version'] = 123;
 
 /*
 |--------------------------------------------------------------------------

application/controllers/Activated_grids.php

@@ -1,9 +1,9 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
 /*
-	
+
 	Activated_grids Controller
-		
+
 */
 
 class Activated_grids extends CI_Controller {
@@ -14,6 +14,15 @@ class Activated_grids extends CI_Controller {
     *   - Band page provide a band dropdown list
     *   - Find somewhere in the main menu to add a button to it
     */
+	function __construct()
+	{
+		parent::__construct();
+
+		// Load language files
+		$this->lang->load(array(
+			'gridsquares',
+		));
+	}
 
 
 	public function index() {
@@ -77,21 +86,19 @@ class Activated_grids extends CI_Controller {
 						if ($this->config->item('map_6digit_grids')) {
 							$grid_six = strtoupper(substr($subsquare,0,6));
 						}
-		
+
 						// Check if 2 Char is in array
-						if(!in_array($grid_two, $array_grid_2char)){
-							array_push($array_grid_2char, $grid_two);	
+						if(!in_array($grid_two, $array_confirmed_grid_2char)){
+							array_push($array_confirmed_grid_2char, $grid_two);
 						}
-		
-		
-						if(!in_array($grid_four, $array_grid_4char)){
-							array_push($array_grid_4char, $grid_four);	
+
+						if(!in_array($grid_four, $array_confirmed_grid_4char)){
+							array_push($array_confirmed_grid_4char, $grid_four);
 						}
-		
-		
+
 						if ($this->config->item('map_6digit_grids')) {
-							if(!in_array($grid_six, $array_grid_6char)){
-								array_push($array_grid_6char, $grid_six);	
+							if(!in_array($grid_six, $array_confirmed_grid_6char)){
+								array_push($array_confirmed_grid_6char, $grid_six);
 							}
 						}
 					}
@@ -103,21 +110,19 @@ class Activated_grids extends CI_Controller {
 					if ($this->config->item('map_6digit_grids')) {
 						$grid_6char_confirmed = strtoupper(substr($row->SAT_SQUARE,0,6));
 					}
-	
+
 					// Check if 2 Char is in array
 					if(!in_array($grid_2char_confirmed, $array_confirmed_grid_2char)){
-						array_push($array_confirmed_grid_2char, $grid_2char_confirmed);	
+						array_push($array_confirmed_grid_2char, $grid_2char_confirmed);
 					}
-	
-	
+
 					if(!in_array($grid_4char_confirmed, $array_confirmed_grid_4char)){
-						array_push($array_confirmed_grid_4char, $grid_4char_confirmed);	
+						array_push($array_confirmed_grid_4char, $grid_4char_confirmed);
 					}
-	
-	
+
 					if ($this->config->item('map_6digit_grids')) {
 						if(!in_array($grid_6char_confirmed, $array_confirmed_grid_6char)){
-							array_push($array_confirmed_grid_6char, $grid_6char_confirmed);	
+							array_push($array_confirmed_grid_6char, $grid_6char_confirmed);
 						}
 					}
 
@@ -144,21 +149,19 @@ class Activated_grids extends CI_Controller {
 						if ($this->config->item('map_6digit_grids')) {
 							$grid_six = strtoupper(substr($subsquare,0,6));
 						}
-		
+
 						// Check if 2 Char is in array
 						if(!in_array($grid_two, $array_grid_2char)){
-							array_push($array_grid_2char, $grid_two);	
+							array_push($array_grid_2char, $grid_two);
 						}
-		
-		
+
 						if(!in_array($grid_four, $array_grid_4char)){
-							array_push($array_grid_4char, $grid_four);	
+							array_push($array_grid_4char, $grid_four);
 						}
-		
-		
+
 						if ($this->config->item('map_6digit_grids')) {
 							if(!in_array($grid_six, $array_grid_6char)){
-								array_push($array_grid_6char, $grid_six);	
+								array_push($array_grid_6char, $grid_six);
 							}
 						}
 					}
@@ -170,21 +173,19 @@ class Activated_grids extends CI_Controller {
 					if ($this->config->item('map_6digit_grids')) {
 						$grid_six = strtoupper(substr($row->SAT_SQUARE,0,6));
 					}
-	
+
 					// Check if 2 Char is in array
 					if(!in_array($grid_two, $array_grid_2char)){
-						array_push($array_grid_2char, $grid_two);	
+						array_push($array_grid_2char, $grid_two);
 					}
-	
-	
+
 					if(!in_array($grid_four, $array_grid_4char)){
-						array_push($array_grid_4char, $grid_four);	
+						array_push($array_grid_4char, $grid_four);
 					}
-	
-	
+
 					if ($this->config->item('map_6digit_grids')) {
 						if(!in_array($grid_six, $array_grid_6char)){
-							array_push($array_grid_6char, $grid_six);	
+							array_push($array_grid_6char, $grid_six);
 						}
 					}
 
@@ -205,7 +206,6 @@ class Activated_grids extends CI_Controller {
 		    return '[' . implode(',', $temp) . ']';
 		}
 
-
 		$data['grid_2char_confirmed'] = js_array($array_confirmed_grid_2char);
 		$data['grid_4char_confirmed'] = js_array($array_confirmed_grid_4char);
 		$data['grid_6char_confirmed'] = js_array($array_confirmed_grid_6char);
@@ -219,7 +219,6 @@ class Activated_grids extends CI_Controller {
 		$this->load->view('activated_grids/index.php');
 		$this->load->view('interface_assets/footer');
 	}
-	
 
 	public function band($band)
 	{
@@ -257,16 +256,16 @@ class Activated_grids extends CI_Controller {
 
 				// Check if 2 Char is in array
 				if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
-					array_push($array_grid_2char_confirmed, $grid_2char_confirmed);	
+					array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
 				}
 
 				if(!in_array($grid_4char_confirmed, $array_grid_4char_confirmed)){
-					array_push($array_grid_4char_confirmed, $grid_4char_confirmed);	
+					array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
 				}
 
 				if ($this->config->item('map_6digit_grids')) {
 					if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
-						array_push($array_grid_6char_confirmed, $grid_6char_confirmed);	
+						array_push($array_grid_6char_confirmed, $grid_6char_confirmed);
 					}
 				}
 			}
@@ -287,18 +286,18 @@ class Activated_grids extends CI_Controller {
 
 				// Check if 2 Char is in array
 				if(!in_array($grid_two, $array_grid_2char)){
-					array_push($array_grid_2char, $grid_two);	
+					array_push($array_grid_2char, $grid_two);
 				}
 
 
 				if(!in_array($grid_four, $array_grid_4char)){
-					array_push($array_grid_4char, $grid_four);	
+					array_push($array_grid_4char, $grid_four);
 				}
 
 
 				if ($this->config->item('map_6digit_grids')) {
 					if(!in_array($grid_six, $array_grid_6char)){
-						array_push($array_grid_6char, $grid_six);	
+						array_push($array_grid_6char, $grid_six);
 					}
 				}
 

application/controllers/Dashboard.php

@@ -114,6 +114,13 @@ class Dashboard extends CI_Controller {
 
 	}
 	
+	function radio_display_component() {
+		$this->load->model('cat');
+
+		$data['radio_status'] = $this->cat->recent_status();
+		$this->load->view('components/radio_display_table', $data);
+	}
+
 	function map() {
 		$this->load->model('logbook_model');
 		

application/controllers/Eqsl.php

@@ -8,6 +8,23 @@ class eqsl extends CI_Controller {
 		$this->load->helper(array('form', 'url'));
 	}
 
+    // Default view when loading controller.
+    public function index() {
+
+        $this->lang->load('qslcard');
+        $folder_name = "assets/qslcard";
+        $data['storage_used'] = $this->sizeFormat($this->folderSize($folder_name));
+
+        // Render Page
+        $data['page_title'] = "eQSL Cards";
+
+        $this->load->model('eqsl_images');
+        $data['qslarray'] = $this->eqsl_images->eqsl_qso_list();
+
+        $this->load->view('interface_assets/header', $data);
+        $this->load->view('eqslcard/index');
+        $this->load->view('interface_assets/footer');
+    }
 	public function import() {
 		$this->load->model('user_model');
 		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
@@ -165,16 +182,16 @@ class eqsl extends CI_Controller {
 		$status = "";
 		
 		// begin script
-		$ch = curl_init(); 
+		$ch = curl_init();
 
 		// basic curl options for all requests
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); 
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_HEADER, 1);
 		
 		// use the URL we built
 		curl_setopt($ch, CURLOPT_URL, $adif);
 		
-		$result = curl_exec($ch);  
+		$result = curl_exec($ch);
 		$chi = curl_getinfo($ch);
 		curl_close($ch);
 
@@ -490,8 +507,8 @@ class eqsl extends CI_Controller {
 			$image_url = $this->electronicqsl->card_image($username, urlencode($password), $callsign, $band, $mode, $year, $month, $day, $hour, $minute);
 			$file = file_get_contents($image_url, true);
 
-			$dom = new domDocument; 
-			$dom->loadHTML($file); 
+			$dom = new domDocument;
+			$dom->loadHTML($file);
 			$dom->preserveWhiteSpace = false;
 			$images = $dom->getElementsByTagName('img');
 
@@ -500,7 +517,7 @@ class eqsl extends CI_Controller {
 				exit;
 			}
 
-			foreach ($images as $image) 
+			foreach ($images as $image)
 			{
 				header('Content-Type: image/jpg');
 				$content = file_get_contents("https://www.eqsl.cc".$image->getAttribute('src'));
@@ -522,6 +539,63 @@ class eqsl extends CI_Controller {
 
 	}
 
+	function bulk_download_image($id) {
+		$this->load->library('electronicqsl');
+		$this->load->model('Eqsl_images');
+
+		$this->load->model('logbook_model');
+		$this->load->model('user_model');
+		$qso_query = $this->logbook_model->get_qso($id);
+		$qso = $qso_query->row();
+		$qso_timestamp = strtotime($qso->COL_TIME_ON);
+		$callsign = $qso->COL_CALL;
+		$band = $qso->COL_BAND;
+		$mode = $qso->COL_MODE;
+		$year = date('Y', $qso_timestamp);
+		$month = date('m', $qso_timestamp);
+		$day = date('d', $qso_timestamp);
+		$hour = date('H', $qso_timestamp);
+		$minute = date('i', $qso_timestamp);
+
+		$query = $this->user_model->get_by_id($this->session->userdata('user_id'));
+		$q = $query->row();
+		$username = $q->user_eqsl_name;
+		$password = $q->user_eqsl_password;
+		$error = '';
+
+		$image_url = $this->electronicqsl->card_image($username, urlencode($password), $callsign, $band, $mode, $year, $month, $day, $hour, $minute);
+		$file = file_get_contents($image_url, true);
+		if (strpos($file, 'Error') !== false) {
+			$error = rtrim(preg_replace('/^\s*Error: /', '', $file));
+			return $error;
+		}
+
+		$dom = new domDocument;
+		$dom->loadHTML($file);
+		$dom->preserveWhiteSpace = false;
+		$images = $dom->getElementsByTagName('img');
+
+		if(!isset($images) || count($images) == 0) {
+			$error = "Rate Limited";
+			return $error;
+		}
+
+		foreach ($images as $image)
+		{
+			$content = file_get_contents("https://www.eqsl.cc".$image->getAttribute('src'));
+			if ($content === false) {
+				$error = "No response";
+				return $error;
+			}
+			$filename = uniqid().'.jpg';
+			if (file_put_contents('images/eqsl_card_images/' . '/'.$filename, $content) !== false) {
+				$this->Eqsl_images->save_image($id, $filename);
+			}
+		}
+		return $error;
+
+	}
+
 	public function tools() {
 		// Check logged in
 		$this->load->model('user_model');
@@ -535,6 +609,61 @@ class eqsl extends CI_Controller {
 		$this->load->view('interface_assets/footer');
 	}
 
+	public function download() {
+		// Check logged in
+		$this->load->model('user_model');
+		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
+
+		if ($this->input->post('eqsldownload') == 'download') {
+			$i = 0;
+			$this->load->model('eqslmethods_model');
+			$qslsnotdownloaded = $this->eqslmethods_model->eqsl_not_yet_downloaded();
+			$eqsl_results = array();
+			foreach ($qslsnotdownloaded->result_array() as $qsl) {
+				$result = $this->bulk_download_image($qsl['COL_PRIMARY_KEY']);
+				if ($result != '') {
+					$errors++;
+					if ($result == 'Rate Limited') {
+						break;
+					} else {
+						$eqsl_results[] = array(
+							'date' => $qsl['COL_TIME_ON'],
+							'call' => $qsl['COL_CALL'],
+							'mode' => $qsl['COL_MODE'],
+							'submode' => $qsl['COL_SUBMODE'],
+							'status' => $result,
+							'qsoid' => $qsl['COL_PRIMARY_KEY']
+						);
+						continue;
+					}
+				} else {
+					$i++;
+				}
+				if ($i > 0) {
+					sleep(15);
+				}
+			}
+			$data['eqsl_results'] = $eqsl_results;
+			$data['eqsl_stats'] = "Successfully downloaded: ".$i." / Errors: ".count($eqsl_results);
+			$data['page_title'] = "eQSL Download Information";
+
+			$this->load->view('interface_assets/header', $data);
+			$this->load->view('eqsl/result');
+			$this->load->view('interface_assets/footer');
+		} else {
+
+			$data['page_title'] = "eQSL Card Image Download";
+			$this->load->model('eqslmethods_model');
+
+			$data['custom_date_format'] = $this->session->userdata('user_date_format');
+			$data['qslsnotdownloaded'] = $this->eqslmethods_model->eqsl_not_yet_downloaded();
+
+			$this->load->view('interface_assets/header', $data);
+			$this->load->view('eqsl/download');
+			$this->load->view('interface_assets/footer');
+		}
+	}
+
 	public function mark_all_sent() {
 		// Check logged in
 		$this->load->model('user_model');
@@ -599,5 +728,49 @@ class eqsl extends CI_Controller {
 			$status = $this->uploadQso($adif, $qsl);
 		}
 	}
-	
+
+// Functions for storage, these need shifted to a libary to use across Cloudlog
+	function folderSize($dir){
+		$count_size = 0;
+		$count = 0;
+		$dir_array = scandir($dir);
+		foreach($dir_array as $key=>$filename){
+			if($filename!=".." && $filename!="."){
+				if(is_dir($dir."/".$filename)){
+					$new_foldersize = foldersize($dir."/".$filename);
+					$count_size = $count_size+ $new_foldersize;
+				}else if(is_file($dir."/".$filename)){
+					$count_size = $count_size + filesize($dir."/".$filename);
+					$count++;
+				}
+			}
+		}
+		return $count_size;
+	}
+
+	function sizeFormat($bytes){
+		$kb = 1024;
+		$mb = $kb * 1024;
+		$gb = $mb * 1024;
+		$tb = $gb * 1024;
+
+		if (($bytes >= 0) && ($bytes < $kb)) {
+			return $bytes . ' B';
+
+		} elseif (($bytes >= $kb) && ($bytes < $mb)) {
+			return ceil($bytes / $kb) . ' KB';
+
+		} elseif (($bytes >= $mb) && ($bytes < $gb)) {
+			return ceil($bytes / $mb) . ' MB';
+
+		} elseif (($bytes >= $gb) && ($bytes < $tb)) {
+			return ceil($bytes / $gb) . ' GB';
+
+		} elseif ($bytes >= $tb) {
+			return ceil($bytes / $tb) . ' TB';
+		} else {
+			return $bytes . ' B';
+		}
+	}
+
 } // end class

application/controllers/Gridsquares.php

@@ -14,6 +14,15 @@ class Gridsquares extends CI_Controller {
     *   - Band page provide a band dropdown list
     *   - Find somewhere in the main menu to add a button to it
     */
+	function __construct()
+	{
+		parent::__construct();
+
+		// Load language files
+		$this->lang->load(array(
+			'gridsquares',
+		));
+	}
 
 
 	public function index() {

application/controllers/Kmlexport.php

@@ -90,17 +90,8 @@ class Kmlexport extends CI_Controller {
 		$output .= "</Document>";
 		$output .= "</kml>";
 
-        if (!file_exists('kml')) {
-            mkdir('kml', 0755, true);
-        }
-
-		if ( ! write_file('kml/qsos.kml', $output)) {
-		     echo 'Unable to write the file. Make sure the folder KML has write permissions.';
-		}
-		else {
-		    header("Content-Disposition: attachment; filename=\"qsos.kml\"");
-			echo $output;
-		}
+		header("Content-Disposition: attachment; filename=\"qsos.kml\"");
+		echo $output;
 
 	}
-}
+}

application/controllers/Logbook.php

@@ -51,7 +51,7 @@ class Logbook extends CI_Controller {
 		$data['results'] = $this->logbook_model->get_qsos($config['per_page'],$this->uri->segment(3));
 
 		if(!$data['results']) { 
-			$this->session->set_flashdata('notice', $this->lang->line('error_no_logbook_found') . ' <a href="' . site_url('logbooks') . '" title="Station Logbooks">Station Logbooks</a>');
+			$this->session->set_flashdata('notice', lang('error_no_logbook_found') . ' <a href="' . site_url('logbooks') . '" title="Station Logbooks">Station Logbooks</a>');
 		}
 
 		// Calculate Lat/Lng from Locator to use on Maps
@@ -540,16 +540,16 @@ class Logbook extends CI_Controller {
 					}
 					switch($this->session->userdata('user_previous_qsl_type')) {
 						case 0:
-							$html .= "<td>".$this->lang->line('gen_hamradio_qsl')."</td>";
+							$html .= "<td>".lang('gen_hamradio_qsl')."</td>";
 							break;
 						case 1:
-							$html .= "<td>".$this->lang->line('lotw_short')."</td>";
+							$html .= "<td>".lang('lotw_short')."</td>";
 							break;
 						case 2:
-							$html .= "<td>".$this->lang->line('eqsl_short')."</td>";
+							$html .= "<td>".lang('eqsl_short')."</td>";
 							break;
 						default:
-							$html .= "<td>".$this->lang->line('gen_hamradio_qsl')."</td>";
+							$html .= "<td>".lang('gen_hamradio_qsl')."</td>";
 							break;
 					}
 					$html .= "<td></td>";
@@ -814,6 +814,42 @@ class Logbook extends CI_Controller {
 
 	}
 
+	function search_lotw_unconfirmed($station_id) {
+		$station_id = $this->security->xss_clean($station_id);
+
+		$this->load->model('user_model');
+
+		if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; }
+		
+		$CI =& get_instance();
+		$CI->load->model('logbooks_model');
+		$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+		
+		if (!$logbooks_locations_array) {
+			return null;
+		}
+
+		$location_list = "'".implode("','",$logbooks_locations_array)."'";
+		
+		$sql = 'select COL_CALL, COL_MODE, COL_SUBMODE, station_callsign, COL_SAT_NAME, COL_BAND, COL_TIME_ON, lotw_users.lastupload from ' . $this->config->item('table_name') . 
+		' join station_profile on ' . $this->config->item('table_name') . '.station_id = station_profile.station_id 
+		join lotw_users on ' . $this->config->item('table_name') . '.col_call = lotw_users.callsign 
+		where ' . $this->config->item('table_name') .'.station_id in ('. $location_list . ')'; 
+		
+		if ($station_id != 'All') {
+			$sql .= ' and station_profile.station_id = ' . $station_id;
+		}
+		
+		$sql .= " and COL_LOTW_QSL_RCVD <> 'Y' and " . $this->config->item('table_name') . ".COL_TIME_ON < lotw_users.lastupload";
+
+		$query = $this->db->query($sql);
+
+		$data['qsos'] = $query;
+
+		$this->load->view('search/lotw_unconfirmed_result.php', $data);
+
+	}
+
 	function search_incorrect_cq_zones($station_id) {
 		$station_id = $this->security->xss_clean($station_id);
 

application/controllers/Logbookadvanced.php

@@ -49,11 +49,35 @@ class Logbookadvanced extends CI_Controller {
 		$pageData['sats'] = $this->bands->get_worked_sats();
 		
 		$pageData['bands'] = $this->bands->get_worked_bands();
-		
+
+		$CI =& get_instance(); 
+		// Get Date format
+		if($CI->session->userdata('user_date_format')) {
+			// If Logged in and session exists
+			$pageData['custom_date_format'] = $CI->session->userdata('user_date_format');
+		} else {
+			// Get Default date format from /config/cloudlog.php
+			$pageData['custom_date_format'] = $CI->config->item('qso_date_format');
+		}
+
+		switch ($pageData['custom_date_format']) {
+			case "d/m/y": $pageData['custom_date_format'] = 'DD/MM/YY'; break;
+			case "d/m/Y": $pageData['custom_date_format'] = 'DD/MM/YYYY'; break;
+			case "m/d/y": $pageData['custom_date_format'] = 'MM/DD/YY'; break;
+			case "m/d/Y": $pageData['custom_date_format'] = 'MM/DD/YYYY'; break;
+			case "d.m.Y": $pageData['custom_date_format'] = 'DD.MM.YYYY'; break;
+			case "y/m/d": $pageData['custom_date_format'] = 'YY/MM/DD'; break;
+			case "Y-m-d": $pageData['custom_date_format'] = 'YYYY-MM-DD'; break;
+			case "M d, Y": $pageData['custom_date_format'] = 'MMM DD, YYYY'; break;
+			case "M d, y": $pageData['custom_date_format'] = 'MMM DD, YY'; break;
+			default: $pageData['custom_date_format'] = 'DD/MM/YYYY';
+		}
+
 		$footerData = [];
 		$footerData['scripts'] = [
 			'assets/js/moment.min.js',
 			'assets/js/tempusdominus-bootstrap-4.min.js',
+			'assets/js/datetime-moment.js',
 			'assets/js/sections/logbookadvanced.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/logbookadvanced.js"))
 		];
 

application/controllers/Lotw.php

@@ -156,7 +156,7 @@ class Lotw extends CI_Controller {
         	} else {
         		// Certificate is in the system time to update
 
-				$this->LotwCert->update_certificate($this->session->userdata('user_id'), $info['issued_callsign'], $info['dxcc-id'], $info['validFrom'], $info['validTo_Date'], $info['pem_key'], $info['general_cert']);
+				$this->LotwCert->update_certificate($this->session->userdata('user_id'), $info['issued_callsign'], $info['dxcc-id'], $info['validFrom'], $info['validTo_Date'], $info['qso-first-date'], $info['qso-end-date'], $info['pem_key'], $info['general_cert']);
 
         		// Cert success flash message
         		$this->session->set_flashdata('Success', $info['issued_callsign'].' Certificate Updated.');
@@ -941,6 +941,14 @@ class Lotw extends CI_Controller {
 			'UVSQ'		=>	"UVSQ-SAT",
 			'CAS-3H'	=>	"LILACSAT-2",
 			'IO-117'	=>	"GREENCUBE",
+			"TEVEL1"	=>	"TEVEL-1",
+			"TEVEL2"	=>	"TEVEL-2",
+			"TEVEL3"	=>	"TEVEL-3",
+			"TEVEL4"	=>	"TEVEL-4",
+			"TEVEL5"	=>	"TEVEL-5",
+			"TEVEL6"	=>	"TEVEL-6",
+			"TEVEL7"	=>	"TEVEL-7",
+			"TEVEL8"	=>	"TEVEL-8",
 		);
 
 		return array_search(strtoupper($satname),$arr,true);

application/controllers/Options.php

@@ -13,9 +13,18 @@ class Options extends CI_Controller {
 
 		$this->load->model('user_model');
 		if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
+
+		// Load language files
+		$this->lang->load(array(
+			'options',
+		));
+
+
 	}
 
 
+
+
 	// Default /options view just gives some text to explain the options area
     function index() {
 
@@ -24,7 +33,7 @@ class Options extends CI_Controller {
 
 		//echo $this->optionslib->get_option('theme');
 
-		$data['page_title'] = "Cloudlog Options";
+		$data['page_title'] = $this->lang->line('options_cloudlog_options');
 
 		$this->load->view('interface_assets/header', $data);
 		$this->load->view('options/index');
@@ -38,8 +47,8 @@ class Options extends CI_Controller {
 		$directory = 'application/language';
 		$data['language_options'] = array_diff(scandir($directory), array('..', '.'));
 
-		$data['page_title'] = "Cloudlog Options";
-		$data['sub_heading'] = "Appearance";
+		$data['page_title'] = $this->lang->line('options_cloudlog_options');
+		$data['sub_heading'] = $this->lang->line('options_appearance');
 
 		$this->load->model('Themes_model');
 
@@ -57,8 +66,8 @@ class Options extends CI_Controller {
 		$directory = 'application/language';
 		$data['language_options'] = array_diff(scandir($directory), array('..', '.'));
 
-		$data['page_title'] = "Cloudlog Options";
-		$data['sub_heading'] = "Appearance";
+		$data['page_title'] = $this->lang->line('options_cloudlog_options');
+		$data['sub_heading'] = $this->lang->line('options_appearance');
 
 		$this->load->helper(array('form', 'url'));
 
@@ -79,7 +88,7 @@ class Options extends CI_Controller {
 
 			// If theme update is complete set a flashsession with a success note
 			if($theme_update_status == TRUE) {
-				$this->session->set_flashdata('success', 'Theme changed to '.$this->input->post('theme'));
+				$this->session->set_flashdata('success', $this->lang->line('options_theme_changed_to').$this->input->post('theme'));
 			}
 
 			// Update theme choice within the options system
@@ -87,7 +96,7 @@ class Options extends CI_Controller {
 
 			// If theme update is complete set a flashsession with a success note
 			if($search_update_status == TRUE) {
-				$this->session->set_flashdata('success', 'Global Search changed to '.$this->input->post('globalSearch'));
+				$this->session->set_flashdata('success', $this->lang->line('options_global_search_changed_to').$this->input->post('globalSearch'));
 			}
 
 			// Update dashboard banner within the options system
@@ -95,7 +104,7 @@ class Options extends CI_Controller {
 
 			// If dashboard banner update is complete set a flashsession with a success note
 			if($dasboard_banner_update_status == TRUE) {
-				$this->session->set_flashdata('success', 'Dashboard banner changed to '.$this->input->post('dashboardBanner'));
+				$this->session->set_flashdata('success', $this->lang->line('options_dashboard_banner_changed_to').$this->input->post('dashboardBanner'));
 			}
 
 			// Update dashboard map within the options system
@@ -103,7 +112,7 @@ class Options extends CI_Controller {
 
 			// If dashboard map update is complete set a flashsession with a success note
 			if($ldashboard_map_update_status == TRUE) {
-				$this->session->set_flashdata('success', 'Dashboard map changed to '.$this->input->post('dashboardMap'));
+				$this->session->set_flashdata('success', $this->lang->line('options_dashboard_map_changed_to').$this->input->post('dashboardMap'));
 			}
 
 			// Update logbook map within the options system
@@ -111,7 +120,7 @@ class Options extends CI_Controller {
 
 			// If logbook map update is complete set a flashsession with a success note
 			if($logbook_map_update_status == TRUE) {
-				$this->session->set_flashdata('success', 'Logbook map changed to '.$this->input->post('logbookMap'));
+				$this->session->set_flashdata('success', $this->lang->line('options_logbook_map_changed_to').$this->input->post('logbookMap'));
 			}
 
 			// Update Lang choice within the options system
@@ -130,8 +139,8 @@ class Options extends CI_Controller {
 		// function used to display the /radio url
 		function radio() {
 
-			$data['page_title'] = "Cloudlog Options";
-			$data['sub_heading'] = "Radio Settings";
+			$data['page_title'] = $this->lang->line('options_cloudlog_options');
+			$data['sub_heading'] = $this->lang->line('options_radio_settings');
 
 			$this->load->view('interface_assets/header', $data);
 			$this->load->view('options/radios');
@@ -143,8 +152,8 @@ class Options extends CI_Controller {
 
 		// Get Language Options
 
-		$data['page_title'] = "Cloudlog Options";
-		$data['sub_heading'] = "Radio Settings";
+		$data['page_title'] = $this->lang->line('options_cloudlog_options');
+		$data['sub_heading'] = $this->lang->line('options_radio_settings');
 
 		$this->load->helper(array('form', 'url'));
 
@@ -165,7 +174,7 @@ class Options extends CI_Controller {
 
 			// If theme update is complete set a flashsession with a success note
 			if($radioTimeout_update == TRUE) {
-				$this->session->set_flashdata('success', 'Radio Timeout Warning changed to '.$this->input->post('radioTimeout').' seconds');
+				$this->session->set_flashdata('success', $this->lang->line('options_radio_timeout_warning_changed_to').$this->input->post('radioTimeout').' seconds');
 			}
 
 			// Redirect back to /appearance
@@ -176,8 +185,8 @@ class Options extends CI_Controller {
 	// function used to display the /appearance url
 	function email() {
 
-		$data['page_title'] = "Cloudlog Options";
-		$data['sub_heading'] = "Email";
+		$data['page_title'] = $this->lang->line('options_cloudlog_options');
+		$data['sub_heading'] = $this->lang->line('options_email');
 
 		$this->load->view('interface_assets/header', $data);
 		$this->load->view('options/email');
@@ -189,8 +198,8 @@ class Options extends CI_Controller {
 
 			// Get Language Options
 	
-			$data['page_title'] = "Cloudlog Options";
-			$data['sub_heading'] = "Email";
+			$data['page_title'] = $this->lang->line('options_cloudlog_options');
+			$data['sub_heading'] = $this->lang->line('options_email');
 	
 			$this->load->helper(array('form', 'url'));
 	
@@ -212,7 +221,7 @@ class Options extends CI_Controller {
 	
 				// If emailProtocolupdate update is complete set a flashsession with a success note
 				if($emailProtocolupdate == TRUE) {
-					$this->session->set_flashdata('success', 'Outgoing Email Protocol changed to '.$this->input->post('emailProtocol'));
+					$this->session->set_flashdata('success', $this->lang->line('options_outgoing_email_protocol_changed_to').$this->input->post('emailProtocol'));
 				}
 
 				// Update smtpEncryption choice within the options system
@@ -220,7 +229,7 @@ class Options extends CI_Controller {
 	
 				// If smtpEncryption update is complete set a flashsession with a success note
 				if($smtpEncryptionupdate == TRUE) {
-					$this->session->set_flashdata('success', 'SMTP Encryption changed to '.$this->input->post('smtpEncryption'));
+					$this->session->set_flashdata('success', $this->lang->line('options_smtp_encryption_changed_to').$this->input->post('smtpEncryption'));
 				}
 
 				// Update smtpHost choice within the options system
@@ -228,7 +237,7 @@ class Options extends CI_Controller {
 	
 				// If smtpHost update is complete set a flashsession with a success note
 				if($smtpHostupdate == TRUE) {
-					$this->session->set_flashdata('success', 'SMTP Host changed to '.$this->input->post('smtpHost'));
+					$this->session->set_flashdata('success', $this->lang->line('options_smtp_host_changed_to').$this->input->post('smtpHost'));
 				}
 
 				// Update smtpPort choice within the options system
@@ -236,7 +245,7 @@ class Options extends CI_Controller {
 	
 				// If smtpPort update is complete set a flashsession with a success note
 				if($smtpPortupdate == TRUE) {
-					$this->session->set_flashdata('success', 'SMTP Port changed to '.$this->input->post('smtpPort'));
+					$this->session->set_flashdata('success', $this->lang->line('options_smtp_port_changed_to').$this->input->post('smtpPort'));
 				}
 	
 				// Update smtpUsername choice within the options system
@@ -244,7 +253,7 @@ class Options extends CI_Controller {
 	
 				// If smtpUsername update is complete set a flashsession with a success note
 				if($smtpUsernameupdate == TRUE) {
-					$this->session->set_flashdata('success', 'SMTP Username changed to '.$this->input->post('smtpUsername'));
+					$this->session->set_flashdata('success', $this->lang->line('options_smtp_username_changed_to').$this->input->post('smtpUsername'));
 				}
 
 				// Update smtpPassword choice within the options system
@@ -252,7 +261,7 @@ class Options extends CI_Controller {
 	
 				// If smtpPassword update is complete set a flashsession with a success note
 				if($smtpPasswordupdate == TRUE) {
-					$this->session->set_flashdata('success', 'SMTP Password changed to '.$this->input->post('smtpPassword'));
+					$this->session->set_flashdata('success', $this->lang->line('options_smtp_password_changed_to').$this->input->post('smtpPassword'));
 				}
 
 				// Update emailcrlf choice within the options system
@@ -260,7 +269,7 @@ class Options extends CI_Controller {
 	
 				// If emailcrlf update is complete set a flashsession with a success note
 				if($emailcrlfupdate == TRUE) {
-					$this->session->set_flashdata('success', 'Email CRLF changed to '.$this->input->post('emailcrlf'));
+					$this->session->set_flashdata('success', $this->lang->line('options_email_crlf_changed_to').$this->input->post('emailcrlf'));
 				}
 
 				// Update emailnewline choice within the options system
@@ -268,7 +277,7 @@ class Options extends CI_Controller {
 	
 				// If emailnewline update is complete set a flashsession with a success note
 				if($emailnewlineupdate == TRUE) {
-					$this->session->set_flashdata('success', 'Email Newline changed to '.$this->input->post('emailnewline'));
+					$this->session->set_flashdata('success', $this->lang->line('options_email_newline_changed_to').$this->input->post('emailnewline'));
 				}
 	
 				// Redirect back to /appearance
@@ -278,8 +287,8 @@ class Options extends CI_Controller {
 
 		function oqrs() {
 
-			$data['page_title'] = "Cloudlog Options";
-			$data['sub_heading'] = "OQRS Options";
+			$data['page_title'] = $this->lang->line('options_cloudlog_options');
+			$data['sub_heading'] = $this->lang->line('options_oqrs');
 
 			$this->load->view('interface_assets/header', $data);
 			$this->load->view('options/oqrs');
@@ -288,8 +297,8 @@ class Options extends CI_Controller {
 
 		function oqrs_save() {
 
-		$data['page_title'] = "Cloudlog Options";
-		$data['sub_heading'] = "OQRS Options";
+		$data['page_title'] = $this->lang->line('options_cloudlog_options');
+		$data['sub_heading'] = $this->lang->line('options_oqrs');
 
 		$this->load->helper(array('form', 'url'));
 
@@ -300,7 +309,7 @@ class Options extends CI_Controller {
 		$global_oqrs_text = $this->optionslib->update('groupedSearch', $this->input->post('groupedSearch'), null);
 
 		if($global_oqrs_text == TRUE) {
-			$this->session->set_flashdata('success', 'OQRS options have been saved.');
+			$this->session->set_flashdata('success', $this->lang->line('options_oqrs_options_have_been_saved'));
 		}
 
 		redirect('/options/oqrs');

application/controllers/Search.php

@@ -80,6 +80,18 @@ class Search extends CI_Controller {
 		$this->load->view('interface_assets/footer');
 	}
 
+	// Searches for unconfirmed Lotw QSOs where QSO partner has uploaded to LoTW after the QSO date
+	public function lotw_unconfirmed() {
+		$this->load->model('stations');
+
+		$data['station_profile'] = $this->stations->all_of_user();
+		$data['page_title'] = "QSOs unconfirmed on LoTW, but the callsign has uploaded to LoTW after QSO date";
+
+		$this->load->view('interface_assets/header', $data);
+		$this->load->view('search/lotw_unconfirmed');
+		$this->load->view('interface_assets/footer');
+	}
+
     function json_result() {
           if(isset($_POST['search'])) {
 			  $result = $this->fetchQueryResult($_POST['search'], false);

application/controllers/Statistics.php

@@ -2,10 +2,22 @@
 
 class Statistics extends CI_Controller {
 
+	function __construct()
+	{
+		parent::__construct();
+
+		// Load language files
+		$this->lang->load(array(
+			'statistics',
+		));
+	}
+
+
 	public function index()
 	{
         $this->load->model('user_model');
         $this->load->model('bands');
+
         if(!$this->user_model->authorize($this->config->item('auth_mode'))) {
             if($this->user_model->validate_session()) {
                 $this->user_model->clear_session();
@@ -17,7 +29,7 @@ class Statistics extends CI_Controller {
 		// Render User Interface
 
 		// Set Page Title
-		$data['page_title'] = "Statistics";
+		$data['page_title'] = $this->lang->line('statistics_statistics');
 		$data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true);
 		
 		// Load Views

application/controllers/Update.php

@@ -287,9 +287,6 @@ class Update extends CI_Controller {
     }
 
     public function download_lotw_users() {
-
-
-
         $contents = file_get_contents('https://lotw.arrl.org/lotw-user-activity.csv', true);
 
         if($contents === FALSE) { 
@@ -306,6 +303,47 @@ class Update extends CI_Controller {
 
     }
 
+    public function lotw_users() {
+        $mtime = microtime(); 
+        $mtime = explode(" ",$mtime); 
+        $mtime = $mtime[1] + $mtime[0]; 
+        $starttime = $mtime; 
+
+        $file = 'https://lotw.arrl.org/lotw-user-activity.csv';
+
+        $handle = fopen($file, "r");
+        if ($handle === FALSE) {
+            echo "Something went wrong with fetching the LoTW uses file";
+            return;
+        }
+        $this->db->empty_table("lotw_users"); 
+        $i = 0;
+        $data = fgetcsv($handle,1000,",");
+        do {
+            if ($data[0]) {
+                $lotwdata[$i]['callsign'] = $data[0];
+                $lotwdata[$i]['lastupload'] = $data[1] . ' ' . $data[2];
+                if (($i % 2000) == 0) {
+                    $this->db->insert_batch('lotw_users', $lotwdata); 
+                    unset($lotwdata);
+                    // echo 'Record ' . $i . '<br />';
+                }
+                $i++;
+            }
+        } while ($data = fgetcsv($handle,1000,","));
+        fclose($handle);
+
+        $this->db->insert_batch('lotw_users', $lotwdata); 
+
+        $mtime = microtime(); 
+        $mtime = explode(" ",$mtime); 
+        $mtime = $mtime[1] + $mtime[0]; 
+        $endtime = $mtime; 
+        $totaltime = ($endtime - $starttime); 
+        echo "This page was created in ".$totaltime." seconds <br />"; 
+        echo "Records inserted: " . $i . " <br/>";
+    }
+
     public function lotw_check() {
         $f = fopen('./updates/lotw_users.csv', "r");
         $result = false;

application/controllers/User.php

@@ -11,6 +11,7 @@ class User extends CI_Controller {
 			'account',
 			'lotw',
 			'eqsl',
+			'admin',
 		));
 	}
 
@@ -21,7 +22,7 @@ class User extends CI_Controller {
 
 		$data['results'] = $this->user_model->users();
 
-		$data['page_title'] = "User Accounts";
+		$data['page_title'] = $this->lang->line('admin_user_accounts');
 
 		$this->load->view('interface_assets/header', $data);
 		$this->load->view('user/main');

application/controllers/User_Logbooks.php

@@ -1,21 +0,0 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Logbooks extends CI_Controller {
-
-	/* Controls ADIF Import/Export Functions */
-
-	function __construct()
-	{
-		parent::__construct();
-		$this->load->helper(array('form', 'url'));
-
-		$this->load->model('user_model');
-		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
-	}
-
-	public function index()
-    {
-    	echo 'Functions to come';
-	}
-
-}

application/controllers/Visitor.php

@@ -11,9 +11,12 @@ class Visitor extends CI_Controller {
         if($method == "config") {
             $this->$method();
         }
-        elseif($method == "map") {
+		elseif($method == "map") {
             $this->map($method);
         }
+        elseif($method == "radio_display_component") {
+            $this->radio_display_component($method);
+        }
         elseif($method == "satellites") {
             $this->satellites($method);
         }
@@ -126,6 +129,13 @@ class Visitor extends CI_Controller {
         }
 	}
 	
+	public function radio_display_component() {
+		$this->load->model('cat');
+
+		$data['radio_status'] = $this->cat->recent_status();
+		$this->load->view('components/radio_display_table', $data);
+	}
+
     public function map() {
 		$this->load->model('logbook_model');
 		

application/language/english/account_lang.php

@@ -8,3 +8,84 @@ $lang['account_column2_text'] = 'Choose column 2';
 $lang['account_column3_text'] = 'Choose column 3';
 $lang['account_column4_text'] = 'Choose column 4';
 $lang['account_column5_text'] = 'Choose column 5 (only for logbook)';
+
+$lang['account_create_user_account'] = 'Create User Account';
+$lang['account_edit_account'] = 'Edit Account';
+
+$lang['account_account_information'] = 'Account Information';
+$lang['account_username'] = 'Username';
+$lang['account_email_address'] = 'Email Address';
+$lang['account_password'] = 'Password';
+
+$lang['account_roles'] = 'Roles';
+$lang['account_user_role'] = 'User Role';
+
+$lang['account_theme'] = 'Theme';
+$lang['account_stylesheet'] = 'Stylesheet';
+
+$lang['account_personal_information'] = 'Personal Information';
+$lang['account_first_name'] = 'First Name';
+$lang['account_last_name'] = 'Last Name';
+$lang['account_callsign'] = 'Callsign';
+$lang['account_gridsquare'] = 'Gridsquare';
+
+$lang['account_cloudlog_preferences'] = 'Cloudlog Preferences';
+$lang['account_timezone'] = 'Timezone';
+$lang['account_date_format'] = 'Date Format';
+$lang['account_measurement_preference'] = 'Measurement preference';
+$lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.';
+$lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in';
+
+$lang['account_main_menu'] = 'Main Menu';
+$lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.';
+
+$lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete';
+$lang['account_location_auto_lookup'] = 'Location auto lookup.';
+$lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = 'If set, gridsquare is fetched based on location name.';
+$lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'SOTA auto lookup gridsquare and name for summit.';
+$lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'WWFF auto lookup gridsquare and name for reference.';
+$lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'POTA auto lookup gridsquare and name for park.';
+$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'If set, name and gridsquare is fetched from the API and filled in location and locator.';
+
+$lang['account_previous_qsl_type'] = 'Previous QSL Type';
+$lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Select the type of QSL to show in the previous QSOs section.';
+
+$lang['account_qrzcom_hamqthcom_images'] = 'qrz.com/hamqth.com Images';
+$lang['account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'] = 'Show profile picture of QSO partner from qrz.com/hamqth.com profile in the log QSO section.';
+$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Please set your qrz.com/hamqth.com credentials in the general config file.';
+
+$lang['account_amsat_status_upload'] = 'AMSAT Status Upload';
+$lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to';
+
+$lang['account_logbook_of_the_world'] = 'Logbook of the World';
+$lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username';
+$lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password';
+$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password';
+
+$lang['account_clublog'] = 'Club Log';
+$lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign';
+$lang['account_clublog_password'] = 'Club Log Password';
+$lang['account_the_email_or_callsign_you_use_to_login_to_club_log'] = 'The Email or Callsign you use to login to Club Log';
+
+$lang['account_eqsl'] = 'eQSL';
+$lang['account_eqsl_username'] = 'eQSL.cc Username';
+$lang['account_eqsl_password'] = 'eQSL.cc Password';
+
+$lang['account_save_account_changes'] = 'Save Account Changes';
+$lang['account_create_account'] = 'Create Account';
+
+$lang['account_delete_user_account'] = 'Delete User Account';
+$lang['account_are_you_sure_you_want_to_delete_the_user_account'] = 'Are you sure you want to delete the user account';
+$lang['account_yes_delete_this_user'] = 'Yes, delete this user';
+$lang['account_no_do_not_delete_this_user'] = 'No, do not delete this user';
+
+$lang['account_forgot_password'] = 'Forgot Password?';
+$lang['account_you_can_reset_your_password_here'] = 'You can reset your password here.';
+$lang['account_reset_password'] = 'Reset Password';
+$lang['account_the_email_field_is_required'] = 'The Email field is required';
+$lang['account_confirm_password'] = 'Confirm Password';
+
+$lang['account_forgot_your_password'] = 'Forgot your password?';
+
+$lang['account_login_to_cloudlog'] = 'Login to Cloudlog';
+$lang['account_login'] = 'Login';

application/language/english/admin_lang.php

@@ -0,0 +1,18 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['admin_user_line1'] = 'Cloudlog needs at least one user configured in order to operate.';
+$lang['admin_user_line2'] = 'Users can be assigned roles which give them different permissions, such as adding QSOs to the logbook and accessing Cloudlog APIs.';
+$lang['admin_user_line3'] = 'The currently logged-in user is displayed at the upper-right of each page.';
+
+$lang['admin_user_list'] = 'User List';
+
+$lang['admin_user'] = 'User';
+$lang['admin_email'] = 'E-mail';
+$lang['admin_type'] = 'Type';
+$lang['admin_options'] = 'Options';
+
+$lang['admin_create_user'] = 'Create user';
+$lang['admin_delete'] = 'Delete';
+$lang['admin_edit'] = 'Edit';

application/language/english/general_words_lang.php

@@ -48,6 +48,7 @@ $lang['general_word_qslcard_bureau'] = 'Bureau';
 $lang['general_word_qslcard_electronic'] = 'Electronic';
 $lang['general_word_qslcard_manager'] = 'Manager';
 $lang['general_word_qslcard_via'] = 'Via';
+$lang['general_word_eqslcard'] = 'eQSL Card';
 $lang['general_word_eqslcards'] = 'eQSL Cards';
 $lang['general_word_lotw'] = 'Logbook of the World';
 
@@ -135,3 +136,5 @@ $lang['europe'] = 'Europe';
 $lang['northamerica'] = 'North America';
 $lang['oceania'] = 'Oceania';
 $lang['southamerica'] = 'South America';
+
+$lang['gen_band_selection'] = 'Band selection';

application/language/english/gridsquares_lang.php

@@ -0,0 +1,16 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+
+
+$lang['gridsquares_gridsquare_map'] = 'Gridsquare map';
+
+$lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green';
+$lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red';
+$lang['gridsquares_activated_but_not_confirmed_is_red'] = 'Activated but not confirmed is Red';
+
+$lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'] = 'This map does not include satellite, internet or repeater QSOs';
+
+$lang['gridsquares_grid_squares'] = 'grid square';
+$lang['gridsquares_total_count'] = 'Total count';

application/language/english/lotw_lang.php

@@ -57,3 +57,6 @@ $lang['lotw_confirmed'] = 'This QSO is confirmed on LoTW';
 // LoTW Expiry
 $lang['lotw_cert_expiring'] = 'At least one of your LoTW certificates is about to expire!';
 $lang['lotw_cert_expired'] = 'At least one of your LoTW certificates is expired!';
+
+// Lotw User
+$lang['lotw_user'] = 'This station uses LoTW. The last upload was';

application/language/english/menu_lang.php

@@ -0,0 +1,81 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['menu_badge_developer_mode'] = 'Developer Mode';
+
+$lang['menu_logbook'] = 'Logbook';
+$lang['menu_overview'] = 'Overview';
+$lang['menu_advanced'] = 'Advanced';
+
+$lang['menu_qso'] = 'QSO';
+$lang['menu_live_qso'] = 'Live QSO';
+$lang['menu_post_qso'] = 'Post QSO';
+$lang['menu_live_contest_logging'] = 'Live Contest Logging';
+$lang['menu_post_contest_logging'] = 'Post Contest Logging';
+$lang['menu_view_qsl'] = 'View QSL';
+$lang['menu_view_eqsl'] = 'View eQSL';
+
+$lang['menu_notes'] = 'Notes';
+
+$lang['menu_analytics'] = 'Analytics';
+$lang['menu_statistics'] = 'Statistics';
+$lang['menu_gridsquares'] = 'Gridsquares';
+$lang['menu_activated_gridsquares'] = 'Activated Gridsquares';
+$lang['menu_gridsquare_activators'] = 'Gridsquare Activators';
+$lang['menu_distances_worked'] = 'Distances Worked';
+$lang['menu_days_with_qsos'] = 'Days with QSOs';
+$lang['menu_timeline'] = 'Timeline';
+$lang['menu_accumulated_statistics'] = 'Accumulated Statistics';
+$lang['menu_timeplotter'] = 'Timeplotter';
+$lang['menu_custom_maps'] = 'Custom Maps';
+$lang['menu_continents'] = 'Continents';
+
+$lang['menu_awards'] = 'Awards';
+$lang['menu_cq'] = 'CQ';
+$lang['menu_dok'] = 'DOK';
+$lang['menu_dxcc'] = 'DXCC';
+$lang['menu_iota'] = 'IOTA';
+$lang['menu_pota'] = 'POTA';
+$lang['menu_sig'] = 'SIG';
+$lang['menu_sota'] = 'SOTA';
+$lang['menu_us_counties'] = 'US Counties';
+$lang['menu_vucc'] = 'VUCC';
+$lang['menu_was'] = 'WAS';
+$lang['menu_wwff'] = 'WWFF';
+
+$lang['menu_admin'] = 'Admin';
+$lang['menu_user_account'] = 'User Accounts';
+$lang['menu_global_options'] = 'Global Options';
+$lang['menu_modes'] = 'Modes';
+$lang['menu_contests'] = 'Contests';
+$lang['menu_themes'] = 'Themes';
+$lang['menu_backup'] = 'Backup';
+$lang['menu_update_country_files'] = 'Update Country Files';
+$lang['menu_debug_information'] = 'Debug Information';
+
+$lang['menu_search_text'] = 'Search Callsign';
+
+$lang['menu_search_button'] = 'Search';
+$lang['menu_login_button'] = 'Login';
+
+$lang['menu_account'] = 'Account';
+$lang['menu_station_logbooks'] = 'Station Logbooks';
+$lang['menu_station_locations'] = 'Station Locations';
+$lang['menu_bands'] = 'Bands';
+$lang['menu_adif_import_export'] = 'ADIF Import / Export';
+$lang['menu_kml_export'] = 'KML Export';
+$lang['menu_dx_atlas_gridsquare_export'] = 'DX Atlas Gridsquare Export';
+$lang['menu_sota_csv_export'] = 'SOTA CSV Export';
+$lang['menu_cabrillo_export'] = 'Cabrillo Export';
+$lang['menu_oqrs_requests'] = 'OQRS Requests';
+$lang['menu_print_requested_qsls'] = 'Print Requested QSLs';
+$lang['menu_logbook_of_the_world'] = 'Logbook of the World';
+$lang['menu_eqsl_import_export'] = 'eQSL Import / Export';
+$lang['menu_qrz_logbook'] = 'QRZ Logbook';
+$lang['menu_qo_100_dx_club_upload'] = 'QO-100 Dx Club Upload';
+$lang['menu_api_keys'] = 'API Keys';
+$lang['menu_hardware_interfaces'] = 'Hardware Interfaces';
+$lang['menu_help'] = 'Help';
+$lang['menu_forum'] = 'Forum';
+$lang['menu_logout'] = 'Logout';

application/language/english/options_lang.php

@@ -0,0 +1,57 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['options_cloudlog_options'] = 'Cloudlog Options';
+$lang['options_message1'] = 'Cloudlog Options are global settings used for all users of the installation, which are overridden if there\'s a setting on a user level.';
+
+$lang['options_appearance'] = 'Appearance';
+$lang['options_theme'] = 'Theme';
+$lang['options_global_theme_choice_this_is_used_when_users_arent_logged_in'] = 'Global Theme Choice, this is used when users arent logged in.';
+$lang['options_public_search_bar'] = 'Public Search Bar';
+$lang['options_this_allows_non_logged_in_users_to_access_the_search_functions'] = 'This allows non logged in users to access the search functions.';
+$lang['options_dashboard_notification_banner'] = 'Dashboard Notification Banner';
+$lang['options_this_allows_to_disable_the_global_notification_banner_on_the_dashboard'] = 'This allows to disable the global notification banner on the dashboard.';
+$lang['options_dashboard_map'] = 'Dashboard Map';
+$lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.';
+$lang['options_logbook_map'] = 'Logbook Map';
+$lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.';
+$lang['options_theme_changed_to'] = 'Theme changed to ';
+$lang['options_global_search_changed_to'] = 'Global Search changed to ';
+$lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to ';
+$lang['options_dashboard_map_changed_to'] = 'Dashboard map changed to ';
+$lang['options_logbook_map_changed_to'] = 'Logbook map changed to ';
+
+$lang['options_radios'] = 'Radios';
+$lang['options_radio_settings'] = 'Radio Settings';
+$lang['options_radio_timeout_warning'] = 'Radio Timeout Warning';
+$lang['options_the_radio_timeout_warning_is_used_on_the_qso_entry_panel_to_alert_you_to_radio_interface_disconnects'] = 'The Radio Timeout Warning is used on the QSO entry panel to alert you to radio interface disconnects.';
+$lang['options_this_number_is_in_seconds'] = 'This number is in seconds.';
+$lang['options_radio_timeout_warning_changed_to'] = 'Radio Timeout Warning changed to ';
+
+$lang['options_email'] = 'Email';
+$lang['options_outgoing_protocol'] = 'Outgoing Protocol';
+$lang['options_smtp_encryption'] = 'SMTP Encryption';
+$lang['options_smtp_host'] = 'SMTP Host';
+$lang['options_smtp_port'] = 'SMTP Port';
+$lang['options_smtp_username'] = 'SMTP Username';
+$lang['options_smtp_password'] = 'SMTP Password';
+$lang['options_crlf'] = 'CRLF';
+$lang['options_newline'] = 'Newline';
+$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
+$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
+$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
+$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
+$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
+$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
+$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
+$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+
+$lang['options_oqrs'] = 'OQRS Options';
+$lang['options_global_text'] = 'Global text';
+$lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
+$lang['options_grouped_search'] = 'Grouped search';
+$lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
+
+$lang['options_save'] = 'Save';

application/language/english/statistics_lang.php

@@ -0,0 +1,17 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['statistics_statistics'] = 'Statistics';
+
+$lang['statistics_explore_the_logbook'] = 'Explore the logbook.';
+
+$lang['statistics_years'] = 'Years';
+$lang['statistics_mode'] = 'Mode';
+$lang['statistics_bands'] = 'Bands';
+$lang['statistics_qsos'] = 'QSOs';
+$lang['statistics_unique_callsigns'] = 'Unique callsigns';
+
+$lang['statistics_total'] = 'Total';
+
+$lang['statistics_year'] = 'Year';

application/language/german/account_lang.php

@@ -8,3 +8,84 @@ $lang['account_column2_text'] = 'Wähle Spalte 2';
 $lang['account_column3_text'] = 'Wähle Spalte 3';
 $lang['account_column4_text'] = 'Wähle Spalte 4';
 $lang['account_column5_text'] = 'Wähle Spalte 5 (nur für Logbuch)';
+
+$lang['account_create_user_account'] = 'Benutzerkonto anlegen';
+$lang['account_edit_account'] = 'Benutzerkonto editieren';
+
+$lang['account_account_information'] = 'Bnutzerkonto Informationen';
+$lang['account_username'] = 'Benutzername';
+$lang['account_email_address'] = 'Emailadresse';
+$lang['account_password'] = 'Passwort';
+
+$lang['account_roles'] = 'Rollen';
+$lang['account_user_role'] = 'Benutzerrolle';
+
+$lang['account_theme'] = 'Thema';
+$lang['account_stylesheet'] = 'Stylesheet';
+
+$lang['account_personal_information'] = 'Informationen';
+$lang['account_first_name'] = 'Vorname';
+$lang['account_last_name'] = 'Nachname';
+$lang['account_callsign'] = 'Rufzeichen';
+$lang['account_gridsquare'] = 'Planquadrat';
+
+$lang['account_cloudlog_preferences'] = 'Cloudlog Einstellungen';
+$lang['account_timezone'] = 'Zeitzone';
+$lang['account_date_format'] = 'Datumsformat';
+$lang['account_measurement_preference'] = 'Entfernungsformat';
+$lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Wähle, wie Datumsfelder angezeigt werden sollen, wenn du eingeloggt bist.';
+$lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Wähle, in welcher Einheit Entfernungen angezeigt werden sollen.';
+
+$lang['account_main_menu'] = 'Hauptmenü';
+$lang['account_show_notes_in_the_main_menu'] = 'Zeige Notizen im Hauptmenü';
+
+$lang['account_gridsquare_and_location_autocomplete'] = 'Vervollständigung von Planquadrat und Lokation';
+$lang['account_location_auto_lookup'] = 'Automatische Ermittlung der Lokation.';
+$lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = 'Wenn aktiviert, wird das Planquadrat basierend auf der Lokation ermittelt.';
+$lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'Automatische Ermittlung von Planquadrat und Lokation anhand des SOTA Gipfels.';
+$lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'Automatische Ermittlung von Planquadrat und Lokation andhand der WWFF Referenz.';
+$lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'Automatische Ermuttlung des Parknamens anhand der POTA Referenz.';
+$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'Wenn aktiviert, werden Name und Planquadrat über die API ermittelt und gesetzt.';
+
+$lang['account_previous_qsl_type'] = 'QSL Typ der vorherigen QSOs';
+$lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Wähle den QSL-Typ für die Anzeige der bereits getätigten QSOs.';
+
+$lang['account_qrzcom_hamqthcom_images'] = 'qrz.com/hamqth.com Bilder';
+$lang['account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'] = 'Zeige das Profilbild des QSO-Partners aus seinem qrz.com/hamqth.com Profil in der QSO Loggen Sektion.';
+$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Bitte qrz.com/hamqth.com Zugangsdaten in der Basiskonfigurationsdatei ablegen.';
+
+$lang['account_amsat_status_upload'] = 'AMSAT Status Upload';
+$lang['account_upload_status_of_sat_qsos_to'] = 'Status von SAT QSOs hochladen auf';
+
+$lang['account_logbook_of_the_world'] = 'Logbook of the World';
+$lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Benutzername';
+$lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Passwort';
+$lang['account_leave_blank_to_keep_existing_password'] = 'Leer lassen um das existierende Passwort zu übernehmen';
+
+$lang['account_clublog'] = 'Club Log';
+$lang['account_clublog_email_callsign'] = 'Club Log Email/Rufzeichen';
+$lang['account_clublog_password'] = 'Club Log Passwort';
+$lang['account_the_email_or_callsign_you_use_to_login_to_club_log'] = 'Die Emailadresse oder Rufzeichen, das für den Club Log Login verwendet wird';
+
+$lang['account_eqsl'] = 'eQSL';
+$lang['account_eqsl_username'] = 'eQSL.cc Benutzername';
+$lang['account_eqsl_password'] = 'eQSL.cc Passwort';
+
+$lang['account_save_account_changes'] = 'Speichere Kontoänderungen';
+$lang['account_create_account'] = 'Konto anlegen';
+
+$lang['account_delete_user_account'] = 'Benutzerkonto löschen';
+$lang['account_are_you_sure_you_want_to_delete_the_user_account'] = 'Bist du sicher, dass du das Benutzerkonto löschen willst';
+$lang['account_yes_delete_this_user'] = 'Ja, Benutzerkonto löschen';
+$lang['account_no_do_not_delete_this_user'] = 'Nein, Benutzerkonto nicht löschen';
+
+$lang['account_forgot_password'] = 'Passwort vergessen?';
+$lang['account_you_can_reset_your_password_here'] = 'Du kannst dein Passwort hier zurücksetzen.';
+$lang['account_reset_password'] = 'Passwort zurücksetzen';
+$lang['account_the_email_field_is_required'] = 'Die Emailadresse ist erforderlich';
+$lang['account_confirm_password'] = 'Bestätige Passwort';
+
+$lang['account_forgot_your_password'] = 'Passwort vergessen?';
+
+$lang['account_login_to_cloudlog'] = 'Anmeldung bei Cloudlog';
+$lang['account_login'] = 'Anmeldung';

application/language/german/admin_lang.php

@@ -0,0 +1,18 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['admin_user_line1'] = 'Es muss mindestens ein Benutzer konfiguriert sein, damit Cloudlog funktioniert.';
+$lang['admin_user_line2'] = 'Benutzer können verschiedene Rollen zugewiesen bekommen, die ihnen unterschiedliche Rechte geben wie QSOs zum Logbuch hinzuzufügen und die APIs von Cloudlog zu benutzen';
+$lang['admin_user_line3'] = 'Der aktuell angemeldete Benutzer wird oben rechts auf jeder Seite angezeigt.';
+
+$lang['admin_user_list'] = 'User List';
+
+$lang['admin_user'] = 'Benutzer';
+$lang['admin_email'] = 'Email';
+$lang['admin_type'] = 'Typ';
+$lang['admin_options'] = 'Optionen';
+
+$lang['admin_create_user'] = 'Benutzer anlegen';
+$lang['admin_delete'] = 'Löschen';
+$lang['admin_edit'] = 'Editieren';

application/language/german/general_words_lang.php

@@ -46,7 +46,9 @@ $lang['general_word_qslcards'] = 'QSL Karten';
 $lang['general_word_qslcard_direct'] = 'Direkt';
 $lang['general_word_qslcard_bureau'] = 'Büro';
 $lang['general_word_qslcard_electronic'] = 'Elektronisch';
+$lang['general_word_qslcard_manager'] = 'Manager';
 $lang['general_word_qslcard_via'] = 'Via';
+$lang['general_word_eqslcard'] = 'eQSL Karte';
 $lang['general_word_eqslcards'] = 'eQSL Karten';
 $lang['general_word_lotw'] = 'Logbook of the World';
 
@@ -125,6 +127,8 @@ $lang['gen_from_date'] = 'Ab Datum';
 
 $lang['gen_this_qso_was_confirmed_on'] = 'Dieses QSO wurde bestätigt am';
 
+$lang['error_no_logbook_found'] = 'Keine Logbücher gefunden. Du muss ein Stationslogbuch anlegen! Mach es hier:';
+
 $lang['copy_to_clipboard'] = 'In die Zwischenablage kopieren';
 
 $lang['africa'] = 'Afrika';
@@ -134,3 +138,5 @@ $lang['europe'] = 'Europa';
 $lang['northamerica'] = 'Nord-Amerika';
 $lang['oceania'] = 'Ozeanien';
 $lang['southamerica'] = 'Süd-Amerika';
+
+$lang['gen_band_selection'] = 'Bandauswahl';

application/language/german/gridsquares_lang.php

@@ -0,0 +1,14 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['gridsquares_gridsquare_map'] = 'Planquadratkarte';
+
+$lang['gridsquares_confirmed_is_green'] = 'Bestätigt ist grün';
+$lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Gearbeitet aber nicht bestätigt ist rot';
+$lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Aktiviert aber nicht bestätigt ist rot';
+
+$lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'] = 'Diese Karte beinhaltet keine Satelliten-, Internet- oder Relais-QSOs';
+
+$lang['gridsquares_grid_squares'] = 'Planquadrate';
+$lang['gridsquares_total_count'] = 'Summe';

application/language/german/lotw_lang.php

@@ -57,3 +57,6 @@ $lang['lotw_confirmed'] = 'Dieses QSO wurde via LoTW bestätigt am';
 // LoTW Expiry
 $lang['lotw_cert_expiring'] = 'Mindestens eines deiner LoTW Zertifikate läuft bald ab!';
 $lang['lotw_cert_expired'] = 'Mindestens eines deiner LoTW Zertifikate ist abgelaufen!';
+
+// Lotw User
+$lang['lotw_user'] = 'Diese Station nutzt LoTW. Der letzte Upload war am';

application/language/german/menu_lang.php

@@ -0,0 +1,81 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['menu_badge_developer_mode'] = 'Entwickler-Modus';
+
+$lang['menu_logbook'] = 'Logbuch';
+$lang['menu_overview'] = 'Übersicht';
+$lang['menu_advanced'] = 'Erweitert';
+
+$lang['menu_qso'] = 'QSO';
+$lang['menu_live_qso'] = 'Live QSO';
+$lang['menu_post_qso'] = 'Zeitversetztes QSO';
+$lang['menu_live_contest_logging'] = 'Live Contest Logging';
+$lang['menu_post_contest_logging'] = 'Zeitversetztes Contest Logging';
+$lang['menu_view_qsl'] = 'QSL Ansicht';
+$lang['menu_view_eqsl'] = 'eQSL Ansicht';
+
+$lang['menu_notes'] = 'Notizen';
+
+$lang['menu_analytics'] = 'Analysen';
+$lang['menu_statistics'] = 'Statistik';
+$lang['menu_gridsquares'] = 'Planquadrate';
+$lang['menu_activated_gridsquares'] = 'Aktivierte Planquadrate';
+$lang['menu_gridsquare_activators'] = 'Planquadrat-Aktivierer';
+$lang['menu_distances_worked'] = 'Gearbeitete Entfernungen';
+$lang['menu_days_with_qsos'] = 'Tage mit QSOs';
+$lang['menu_timeline'] = 'Zeitleiste';
+$lang['menu_accumulated_statistics'] = 'Kumulierte Statistiken';
+$lang['menu_timeplotter'] = 'Zeitplotter';
+$lang['menu_custom_maps'] = 'Benutzerdefinierte Karte';
+$lang['menu_continents'] = 'Kontinente';
+
+$lang['menu_awards'] = 'Auszeichnungen';
+$lang['menu_cq'] = 'CQ';
+$lang['menu_dok'] = 'DOK';
+$lang['menu_dxcc'] = 'DXCC';
+$lang['menu_iota'] = 'IOTA';
+$lang['menu_pota'] = 'POTA';
+$lang['menu_sig'] = 'SIG';
+$lang['menu_sota'] = 'SOTA';
+$lang['menu_us_counties'] = 'US Grafschaften';
+$lang['menu_vucc'] = 'VUCC';
+$lang['menu_was'] = 'WAS';
+$lang['menu_wwff'] = 'WWFF';
+
+$lang['menu_admin'] = 'Admin';
+$lang['menu_user_account'] = 'Benutzerkonten';
+$lang['menu_global_options'] = 'Globale Optionen';
+$lang['menu_modes'] = 'Modi';
+$lang['menu_contests'] = 'Conteste';
+$lang['menu_themes'] = 'Layouts';
+$lang['menu_backup'] = 'Backup';
+$lang['menu_update_country_files'] = 'Update Länderinformationen';
+$lang['menu_debug_information'] = 'Debug Informationen';
+
+$lang['menu_search_text'] = 'Rufzeichensuche';
+
+$lang['menu_search_button'] = 'Suche';
+$lang['menu_login_button'] = 'Login';
+
+$lang['menu_account'] = 'Konto';
+$lang['menu_station_logbooks'] = 'Stationslogbücher';
+$lang['menu_station_locations'] = 'Stationsstandorte';
+$lang['menu_bands'] = 'Bänder';
+$lang['menu_adif_import_export'] = 'ADIF Import / Export';
+$lang['menu_kml_export'] = 'KML Export';
+$lang['menu_dx_atlas_gridsquare_export'] = 'DX Atlas Planquadrat Export';
+$lang['menu_sota_csv_export'] = 'SOTA CSV Export';
+$lang['menu_cabrillo_export'] = 'Cabrillo Export';
+$lang['menu_oqrs_requests'] = 'OQRS Anforderungen';
+$lang['menu_print_requested_qsls'] = 'Druck angeforderter QSLs';
+$lang['menu_logbook_of_the_world'] = 'Logbook of the World';
+$lang['menu_eqsl_import_export'] = 'eQSL Import / Export';
+$lang['menu_qrz_logbook'] = 'QRZ Logbuch';
+$lang['menu_qo_100_dx_club_upload'] = 'QO-100 Dx Club Upload';
+$lang['menu_api_keys'] = 'API-Schlüssel';
+$lang['menu_hardware_interfaces'] = 'Hardware-Schnittstellen';
+$lang['menu_help'] = 'Hilfe';
+$lang['menu_forum'] = 'Forum';
+$lang['menu_logout'] = 'Logout';

application/language/german/options_lang.php

@@ -0,0 +1,57 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['options_cloudlog_options'] = 'Cloudlog Optionen';
+$lang['options_message1'] = 'Cloudlog Optionen sind globe Einstellungen, die für alle Benutzer der Installation genutzt werden. Sie können auf Benutzerebene überschrieben werden, wenn eine entsprechende Option auf Benutzerebene vorhanden ist.';
+
+$lang['options_appearance'] = 'Erscheinungsbild';
+$lang['options_theme'] = 'Thema';
+$lang['options_global_theme_choice_this_is_used_when_users_arent_logged_in'] = 'Globales Thema. Dies wird verwendet, wenn keine Benutzer angemeldet sind.';
+$lang['options_public_search_bar'] = 'Öffentliches Suchfeld';
+$lang['options_this_allows_non_logged_in_users_to_access_the_search_functions'] = 'Dies erlaubt nicht angemeldeten Benutzern, die Suchfunktion zu nutzen.';
+$lang['options_dashboard_notification_banner'] = 'Dashboard Benachrichtigungsbanner';
+$lang['options_this_allows_to_disable_the_global_notification_banner_on_the_dashboard'] = 'Dies ermöglicht es, die globalen Benachrichtigungsbanner auf dem Dashboard zu deaktivieren.';
+$lang['options_dashboard_map'] = 'Dashboard Karte';
+$lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'Dies erlaubt es, die Karte auf dem Dashboard rechts anzuzeigen oder zu deaktivieren.';
+$lang['options_logbook_map'] = 'Logbook Karte';
+$lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'Dies erlaubt, die Karte im Logbuch zu deaktivieren.';
+$lang['options_theme_changed_to'] = 'Thema geänder zu ';
+$lang['options_global_search_changed_to'] = 'Globale Suche geändert zu ';
+$lang['options_dashboard_banner_changed_to'] = 'Dashboard Benachrichtigungsbanner geändert zu ';
+$lang['options_dashboard_map_changed_to'] = 'Dashboard Karte geändert zu ';
+$lang['options_logbook_map_changed_to'] = 'Logbook Karte geändert zu ';
+
+$lang['options_radios'] = 'Funkgeräte';
+$lang['options_radio_settings'] = 'Funkgeräteeinstellungen';
+$lang['options_radio_timeout_warning'] = 'Funkgeräte Timeout Warnung';
+$lang['options_the_radio_timeout_warning_is_used_on_the_qso_entry_panel_to_alert_you_to_radio_interface_disconnects'] = 'Die Funkgeräte Timeout Warnung wird im QSOs Eingabepanel verwendet, um anzuzeigen, wenn die Funkgeräteschnittstelle getrennt wurde.';
+$lang['options_this_number_is_in_seconds'] = 'Die Angabe erfolgt in Sekunden.';
+$lang['options_radio_timeout_warning_changed_to'] = 'Radio Timeout Warnung geändert zu ';
+
+$lang['options_email'] = 'Email';
+$lang['options_outgoing_protocol'] = 'Protokoll für ausgehende Emails';
+$lang['options_smtp_encryption'] = 'SMTP Verschlüsselung';
+$lang['options_smtp_host'] = 'SMTP Host';
+$lang['options_smtp_port'] = 'SMTP Port';
+$lang['options_smtp_username'] = 'SMTP Benutzername';
+$lang['options_smtp_password'] = 'SMTP Passwort';
+$lang['options_crlf'] = 'CRLF';
+$lang['options_newline'] = 'Zeilenvorschub';
+$lang['options_outgoing_email_protocol_changed_to'] = 'Protokoll für ausgehende Emails geändert zu ';
+$lang['options_smtp_encryption_changed_to'] = 'SMTP Verschlüsselung geändert zu ';
+$lang['options_smtp_host_changed_to'] = 'SMTP Host geändert zu ';
+$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
+$lang['options_smtp_username_changed_to'] = 'SMTP Benutzername geändert zu ';
+$lang['options_smtp_password_changed_to'] = 'SMTP Passwort geändert zu ';
+$lang['options_email_crlf_changed_to'] = 'Email CRLF geändert zu ';
+$lang['options_email_newline_changed_to'] = 'Email Zeilenvorschub geändert zu ';
+
+$lang['options_oqrs'] = 'OQRS Optionen';
+$lang['options_global_text'] = 'Globaler Text';
+$lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Dies ist ein optionaler Text, der auf oben auf der OQRS Seite angezeigt werden kann.';
+$lang['options_grouped_search'] = 'Gruppierte Suche';
+$lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Wenn aktiviert, werden alle Stationsstandorte auf einmal durchsucht.';
+$lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
+
+$lang['options_save'] = 'Speichern';

application/language/german/statistics_lang.php

@@ -0,0 +1,17 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['statistics_statistics'] = 'Statistiken';
+
+$lang['statistics_explore_the_logbook'] = 'Logbuch untersuchen.';
+
+$lang['statistics_years'] = 'Jahre';
+$lang['statistics_mode'] = 'Modi';
+$lang['statistics_bands'] = 'Bänder';
+$lang['statistics_qsos'] = 'QSOs';
+$lang['statistics_unique_callsigns'] = 'Eindeutige Rufzeichen';
+
+$lang['statistics_total'] = 'Gesamt';
+
+$lang['statistics_year'] = 'Jahr';

application/language/russian/account_lang.php

@@ -8,3 +8,84 @@ $lang['account_column2_text'] = 'Выберите столбец 2';
 $lang['account_column3_text'] = 'Выберите столбец 3';
 $lang['account_column4_text'] = 'Выберите столбец 4';
 $lang['account_column5_text'] = 'Выберите столбец 5 (только для журнала)';
+
+$lang['account_create_user_account'] = ' Создать аккаунт пользователя';
+$lang['account_edit_account'] = 'Редактировать аккаунт';
+
+$lang['account_account_information'] = 'Информация об аккаунте';
+$lang['account_username'] = 'Имя пользователя';
+$lang['account_email_address'] = 'Адрес электронной почты';
+$lang['account_password'] = 'Пароль';
+
+$lang['account_roles'] = 'Роли';
+$lang['account_user_role'] = 'Роль пользователя';
+
+$lang['account_theme'] = 'Тема оформления';
+$lang['account_stylesheet'] = 'Шаблон';
+
+$lang['account_personal_information'] = 'Персональная информация';
+$lang['account_first_name'] = 'Имя';
+$lang['account_last_name'] = 'Фамилия';
+$lang['account_callsign'] = 'Позывной';
+$lang['account_gridsquare'] = 'QTH локатор';
+
+$lang['account_cloudlog_preferences'] = 'Настройки Cloudlog';
+$lang['account_timezone'] = 'Часовой пояс';
+$lang['account_date_format'] = 'Формат даты';
+$lang['account_measurement_preference'] = 'Единицы измерения';
+$lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Выберите представление даты для отображения в вашем аккаунте.';
+$lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Выберите единицы измерения расстояния';
+
+$lang['account_main_menu'] = 'Главное меню';
+$lang['account_show_notes_in_the_main_menu'] = 'Показывать заметки в главном меню.';
+
+$lang['account_gridsquare_and_location_autocomplete'] = 'Автозаполнение QTH локатора и местоположения';
+$lang['account_location_auto_lookup'] = 'Автозаполнение по местоположению.';
+$lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = 'Если включено, QTH локатор будет определён на основе имени местоположения.';
+$lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'Автозаполнение QTH локатора и названия саммита по SOTA';
+$lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'Автозаполнение QTH локатора и названия референции по WWFF';
+$lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'Автозаполнение QTH локатора и названия парка по POTA';
+$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'Если включено, называние и квадрат запрашиваются по API и заполняются в поля местоположение и QTH локатор.';
+
+$lang['account_previous_qsl_type'] = 'Тип предыдущего QSL';
+$lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Выберите тип QSL для отобрашения в секции предыдущих QSO.';
+
+$lang['account_qrzcom_hamqthcom_images'] = 'Изображения с qrz.com/hamqth.com';
+$lang['account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'] = 'Показать изображение профиля партнера по QSO из его профиля на qrz.com/hamqth.com в разделе QSO журнала.';
+$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Пожалуйста, укажите свои учетные данные для qrz.com/hamqth.com в общем файле конфигурации.';
+
+$lang['account_amsat_status_upload'] = 'Загрузка статуса AMSAT';
+$lang['account_upload_status_of_sat_qsos_to'] = 'Загружать статус QSO через спутники в';
+
+$lang['account_logbook_of_the_world'] = 'Logbook of the World';
+$lang['account_logbook_of_the_world_lotw_username'] = 'Логин';
+$lang['account_logbook_of_the_world_lotw_password'] = 'Пароль';
+$lang['account_leave_blank_to_keep_existing_password'] = 'Оставьте пустым для сохранения текущего пароля';
+
+$lang['account_clublog'] = 'Club Log';
+$lang['account_clublog_email_callsign'] = 'Емэйл/позывной';
+$lang['account_clublog_password'] = 'Пароль';
+$lang['account_the_email_or_callsign_you_use_to_login_to_club_log'] = 'Емэйл или позывной, которые вы используете для логина в Club Log';
+
+$lang['account_eqsl'] = 'eQSL';
+$lang['account_eqsl_username'] = 'Логин';
+$lang['account_eqsl_password'] = 'Пароль';
+
+$lang['account_save_account_changes'] = 'Сохранить изменения';
+$lang['account_create_account'] = 'Создать аккаунт';
+
+$lang['account_delete_user_account'] = 'Удалить аккаунт пользователя';
+$lang['account_are_you_sure_you_want_to_delete_the_user_account'] = 'Вы уверены в том, что вы хотите удалить аккаунт пользователя';
+$lang['account_yes_delete_this_user'] = 'Да, удалить этого пользователя';
+$lang['account_no_do_not_delete_this_user'] = 'Нет, не удалять этого пользователя';
+
+$lang['account_forgot_password'] = 'Забыли пароль?';
+$lang['account_you_can_reset_your_password_here'] = 'Вы можете сбросить свой пароль здесь.';
+$lang['account_reset_password'] = 'Сбросить пароль';
+$lang['account_the_email_field_is_required'] = 'Заполните адрес электронной почты';
+$lang['account_confirm_password'] = 'Подтвердить Пароль';
+
+$lang['account_forgot_your_password'] = 'Забыли пароль?';
+
+$lang['account_login_to_cloudlog'] = 'Вход в Cloudlog';
+$lang['account_login'] = 'Вход';

application/language/russian/admin_lang.php

@@ -0,0 +1,21 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['admin_user_line1'] = 'Для работы Cloudlog требуется хотя наличие хотя бы одного пользовательского аккаунта.';
+$lang['admin_user_line2'] = 'Пользователям могут быть назначены роли, которые предоставляют им различные права, например, добавление QSO в журнал и доступ к API Cloudlog.';
+$lang['admin_user_line3'] = 'Текущий вошедший в систему пользователь отображается в правом верхнем углу каждой страницы.';
+
+$lang['admin_user_list'] = 'Список пользователей';
+
+$lang['admin_user'] = 'Пользователь';
+$lang['admin_email'] = 'Емэйл';
+$lang['admin_type'] = 'Роль';
+$lang['admin_options'] = 'Опции';
+
+$lang['admin_create_user'] = 'Создать пользователя';
+$lang['admin_delete'] = 'Удалить';
+$lang['admin_edit'] = 'Редактировать';
+
+$lang['admin_user_accounts'] = 'Аккаунты пользователей';
+

application/language/russian/general_words_lang.php

@@ -4,7 +4,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 
 $lang['error_no_active_station_profile'] = 'Внимание: вам нужно назначить активный профиль месторасположения станции.';
 
-$lang['notice_turn_the_radio_on'] = 'За сегодня ни одного QSO; время вернуться к радио!';
+$lang['notice_turn_the_radio_on'] = 'За сегодня ни одного QSO, время вернуться к радио!';
 
 $lang['general_word_important'] = 'Важно';
 $lang['general_word_info'] = 'Информация';
@@ -48,9 +48,9 @@ $lang['general_word_qslcard_direct'] = 'Напрямую';
 $lang['general_word_qslcard_bureau'] = 'Бюро';
 $lang['general_word_qslcard_electronic'] = 'Электронное';
 $lang['general_word_qslcard_manager'] = 'Менеджер';
-$lang['general_word_qslcard_via'] = 'via';
-$lang['general_word_eqslcards'] = 'eQSL Cards';
-$lang['general_word_lotw'] = 'Logbook of the World';
+$lang['general_word_qslcard_via'] = 'через';
+$lang['general_word_eqslcards'] = 'eQSL';
+$lang['general_word_lotw'] = 'LotW';
 
 
 
@@ -97,6 +97,7 @@ $lang['gen_hamradio_logbook'] = 'Журнал';
 
 $lang['gen_hamradio_cq_zone'] = 'CQ Zone';
 $lang['gen_hamradio_dxcc'] = 'DXCC';
+$lang['gen_hamradio_deleted_dxcc'] = 'Удалённые DXCC';
 $lang['gen_hamradio_continent'] = 'Континент';
 $lang['gen_hamradio_usa_state'] = 'Штат США';
 $lang['gen_hamradio_county_reference'] = 'Графство США';
@@ -116,10 +117,10 @@ $lang['gen_hamradio_sig'] = 'Sig';
 $lang['gen_hamradio_sig_info'] = 'Sig Info';
 
 // Dashboard Words
-$lang['dashboard_you_have_had'] = 'You have had';
+$lang['dashboard_you_have_had'] = '';
 $lang['dashboard_qsos_today'] = 'QSOs сегодня!';
-$lang['dashboard_qso_breakdown'] = 'QSOs Breakdown';
-$lang['dashboard_countries_breakdown'] = 'Countries Breakdown';
+$lang['dashboard_qso_breakdown'] = 'Статистика QSO';
+$lang['dashboard_countries_breakdown'] = 'Статистика по странам';
 
 $lang['gen_from_date'] = 'Начиная с даты';
 
@@ -136,3 +137,6 @@ $lang['europe'] = 'Европа';
 $lang['northamerica'] = 'Северная Америка';
 $lang['oceania'] = 'Океания';
 $lang['southamerica'] = 'Южная Америка';
+
+
+$lang['gen_band_selection'] = 'Выбор диапазона';

application/language/russian/gridsquares_lang.php

@@ -0,0 +1,15 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+
+
+$lang['gridsquares_gridsquare_map'] = 'Выбор диапазона';
+
+$lang['gridsquares_confirmed_is_green'] = 'Подтверждённые окрашены зелёным';
+$lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Сработанные, но не подтверждённые — красным';
+
+$lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'] = 'На этой карте не отображены QSO, проведённые через спутники, интернет или репитеры';
+
+$lang['gridsquares_grid_squares'] = 'квадрат(/-а/-ов)';
+$lang['gridsquares_total_count'] = 'Всего';

application/language/russian/lotw_lang.php

@@ -6,7 +6,7 @@ $lang['lotw_short'] = 'LoTW';
 $lang['lotw_title'] = 'Logbook of the World';
 $lang['lotw_title_available_cert'] = 'Имеющиеся сертификаты';
 $lang['lotw_title_information'] = 'Информация';
-$lang['lotw_title_upload_p12_cert'] = 'Загрузка Logbook of the World .p12 сертификата';
+$lang['lotw_title_upload_p12_cert'] = 'Загрузка LotW .p12 сертификата';
 $lang['lotw_title_export_p12_file_instruction'] = 'Инструкции по экспорту .p12 файла';
 $lang['lotw_title_adif_import'] = 'Импорт ADIF';
 $lang['lotw_title_adif_import_options'] = 'Опции импорта';

application/language/russian/menu_lang.php

@@ -0,0 +1,81 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['menu_badge_developer_mode'] = 'Режим разработчика';
+
+$lang['menu_logbook'] = 'Журнал';
+$lang['menu_overview'] = 'Обычный вид';
+$lang['menu_advanced'] = 'Расширенный вид';
+
+$lang['menu_qso'] = 'QSO';
+$lang['menu_live_qso'] = 'добавить QSO';
+$lang['menu_post_qso'] = 'добавить прошедшее QSO';
+$lang['menu_live_contest_logging'] = 'Журнал соревнований';
+$lang['menu_post_contest_logging'] = 'Журнал прошедших соревнований';
+$lang['menu_view_qsl'] = 'Просмотр QSL';
+$lang['menu_view_eqsl'] = 'Просмотр eQSL';
+
+$lang['menu_notes'] = 'Заметки';
+
+$lang['menu_analytics'] = 'Аналитика';
+$lang['menu_statistics'] = 'Статистика';
+$lang['menu_gridsquares'] = 'Квадраты';
+$lang['menu_activated_gridsquares'] = 'Активированные квадраты';
+$lang['menu_gridsquare_activators'] = 'Активаторы квадратов';
+$lang['menu_distances_worked'] = 'Сработанные дистанции';
+$lang['menu_days_with_qsos'] = 'Дней с QSO';
+$lang['menu_timeline'] = 'Лента событий';
+$lang['menu_accumulated_statistics'] = 'Объединённая статистика';
+$lang['menu_timeplotter'] = 'Графики';
+$lang['menu_custom_maps'] = 'Карты';
+$lang['menu_continents'] = 'Континенты';
+
+$lang['menu_awards'] = 'Дипломы';
+$lang['menu_cq'] = 'CQ';
+$lang['menu_dok'] = 'DOK';
+$lang['menu_dxcc'] = 'DXCC';
+$lang['menu_iota'] = 'IOTA';
+$lang['menu_pota'] = 'POTA';
+$lang['menu_sig'] = 'SIG';
+$lang['menu_sota'] = 'SOTA';
+$lang['menu_us_counties'] = 'US Counties';
+$lang['menu_vucc'] = 'VUCC';
+$lang['menu_was'] = 'WAS';
+$lang['menu_wwff'] = 'WWFF';
+
+$lang['menu_admin'] = 'Администрирование';
+$lang['menu_user_account'] = 'Аккаунты пользователей';
+$lang['menu_global_options'] = 'Общие настройки';
+$lang['menu_modes'] = 'Виды модуляции';
+$lang['menu_contests'] = 'Соревнования';
+$lang['menu_themes'] = 'Темы оформления';
+$lang['menu_backup'] = 'Резервное копирование';
+$lang['menu_update_country_files'] = 'Обновить файлы стран';
+$lang['menu_debug_information'] = 'Отладочная информация';
+
+$lang['menu_search_text'] = 'Поиск позывного';
+
+$lang['menu_search_button'] = 'Поиск';
+$lang['menu_login_button'] = 'Вход';
+
+$lang['menu_account'] = 'Аккаунт';
+$lang['menu_station_logbooks'] = 'Аппаратные журналы';
+$lang['menu_station_locations'] = 'Расположения станции';
+$lang['menu_bands'] = 'Диапазоны';
+$lang['menu_adif_import_export'] = 'Импорт / экспорт ADIF';
+$lang['menu_kml_export'] = 'Экспорт KML';
+$lang['menu_dx_atlas_gridsquare_export'] = 'Экспорт квадратов DX Atlas';
+$lang['menu_sota_csv_export'] = 'Экспорт SOTA CSV';
+$lang['menu_cabrillo_export'] = 'Экспорт Cabrillo';
+$lang['menu_oqrs_requests'] = 'Запросы OQRS';
+$lang['menu_print_requested_qsls'] = 'Распечатать запрошенные QSL';
+$lang['menu_logbook_of_the_world'] = 'Logbook of the World';
+$lang['menu_eqsl_import_export'] = 'Импорт / экспорт eQSL';
+$lang['menu_qrz_logbook'] = 'QRZ Logbook';
+$lang['menu_qo_100_dx_club_upload'] = 'Загрузка в QO-100 Dx Club';
+$lang['menu_api_keys'] = 'ключи API';
+$lang['menu_hardware_interfaces'] = 'Аппаратные интерфейсы';
+$lang['menu_help'] = 'Помощь';
+$lang['menu_forum'] = 'Форум';
+$lang['menu_logout'] = 'Выход';

application/language/russian/options_lang.php

@@ -0,0 +1,57 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['options_cloudlog_options'] = 'Настройки';
+$lang['options_message1'] = 'Это глобальные настройки, используемые для всех пользователей, которые могут быть переопределены, если есть соответствующие настройки на уровне пользователя.';
+
+$lang['options_appearance'] = 'Внешний вид';
+$lang['options_theme'] = 'Тема оформления';
+$lang['options_global_theme_choice_this_is_used_when_users_arent_logged_in'] = 'Тема оформления по умолчанию, используется, когда пользователи не вошли в систему.';
+$lang['options_public_search_bar'] = 'Публично доступный поиск по журналу';
+$lang['options_this_allows_non_logged_in_users_to_access_the_search_functions'] = 'Разрешение пользователям, не вошедшим в систему, получить доступ к функциям поиска.';
+$lang['options_dashboard_notification_banner'] = 'Баннер на экране сводных данных';
+$lang['options_this_allows_to_disable_the_global_notification_banner_on_the_dashboard'] = 'Включение отображения баннера на экране сводных данных';
+$lang['options_dashboard_map'] = 'Карта на экране сводных данных';
+$lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'Включение отображения карты на экране сводных данных во всю ширину или справа';
+$lang['options_logbook_map'] = 'Карта на экране обычного вида журнала ';
+$lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'Включение отображения карты на экране обычного вида журнала.';
+$lang['options_theme_changed_to'] = 'Тема оформления переключена на ';
+$lang['options_global_search_changed_to'] = 'Публично доступный поиск переключен в состояние ';
+$lang['options_dashboard_banner_changed_to'] = 'Баннер на экране сводных данных переключен в состояние ';
+$lang['options_dashboard_map_changed_to'] = 'Карта на экране сводных данных переключена в состояние ';
+$lang['options_logbook_map_changed_to'] = 'Карта на экране обычного вида журнала переключена в состояние ';
+
+$lang['options_radios'] = 'Радиоинтерфейсы';
+$lang['options_radio_settings'] = 'Радиоинтерфейсы';
+$lang['options_radio_timeout_warning'] = 'Предупреждение о таймауте радиоинтерфейса';
+$lang['options_the_radio_timeout_warning_is_used_on_the_qso_entry_panel_to_alert_you_to_radio_interface_disconnects'] = 'Используется для отображения на панели ввода QSO предупреждения об отключении радиоинтерфейса.';
+$lang['options_this_number_is_in_seconds'] = 'Значение в секундах.';
+$lang['options_radio_timeout_warning_changed_to'] = 'Значение таймаута радиоинтерфейса изменено на ';
+
+$lang['options_email'] = 'Емэйл';
+$lang['options_outgoing_protocol'] = 'Протокол отправки емэйл';
+$lang['options_smtp_encryption'] = 'Шифрование SMTP';
+$lang['options_smtp_host'] = 'SMTP хост';
+$lang['options_smtp_port'] = 'SMTP порт';
+$lang['options_smtp_username'] = 'SMTP логин';
+$lang['options_smtp_password'] = 'SMTP пароль';
+$lang['options_crlf'] = 'CRLF';
+$lang['options_newline'] = 'Newline';
+$lang['options_outgoing_email_protocol_changed_to'] = 'Протокол отправки емэйл изменён на ';
+$lang['options_smtp_encryption_changed_to'] = 'Шифрование SMTP изменено на ';
+$lang['options_smtp_host_changed_to'] = 'SMTP хост изменён на ';
+$lang['options_smtp_port_changed_to'] = 'SMTP порт изменён на ';
+$lang['options_smtp_username_changed_to'] = 'SMTP логин изменён на ';
+$lang['options_smtp_password_changed_to'] = 'SMTP пароль изменён на ';
+$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
+$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+
+$lang['options_oqrs'] = 'OQRS';
+$lang['options_global_text'] = 'Сообщение на странице OQRS';
+$lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Необязательный текст, который может быть отображён в верхней части страницы OQRS.';
+$lang['options_grouped_search'] = 'Объединённый поиск';
+$lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Если включено, то поиск будет осуществляться во всех местоположениях станций, где активен OQRS.';
+$lang['options_oqrs_options_have_been_saved'] = 'Настройки OQRS сохранены.';
+
+$lang['options_save'] = 'Сохранить';

application/language/russian/qslcard_lang.php

@@ -10,7 +10,7 @@ $lang['qslcard_info'] = 'QSL';
 $lang['qslcard_sent'] = 'QSL карточка была отправлена';
 $lang['qslcard_sent_bureau'] = 'QSL карточка была отправлена через бюро';
 $lang['qslcard_sent_direct'] = 'QSL карточка была отправлена напрямую';
-$lang['qslcard_sent_electronic'] = 'Электроннвя QSL карточка была отправлена';
+$lang['qslcard_sent_electronic'] = 'Электронная QSL карточка была отправлена';
 $lang['qslcard_sent_manager'] = 'QSL карточка была отправлена через QSL-менеджера';
 $lang['qslcard_rcvd'] = 'QSL карточка была получена';
 $lang['qslcard_rcvd_bureau'] = 'QSL карточка была получена через бюро';

application/language/russian/statistics_lang.php

@@ -0,0 +1,17 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['statistics_statistics'] = 'Статистика';
+
+$lang['statistics_explore_the_logbook'] = 'Исследуем журнал.';
+
+$lang['statistics_years'] = 'по годам';
+$lang['statistics_mode'] = 'по видам модуляции';
+$lang['statistics_bands'] = 'по диапазонам';
+$lang['statistics_qsos'] = 'по QSO';
+$lang['statistics_unique_callsigns'] = 'по уникальным позывным';
+
+$lang['statistics_total'] = 'Всего';
+
+$lang['statistics_year'] = 'Год';

application/migrations/122_reupload_tevel.php

@@ -0,0 +1,17 @@
+<?php
+defined('BASEPATH') or exit('No direct script access allowed');
+
+class Migration_reupload_tevel extends CI_Migration
+{
+	public function up()
+	{
+        $this->db->set('COL_LOTW_QSL_SENT', 'N');
+        $this->db->like('COL_SAT_NAME', 'TEVEL', 'after');
+        $this->db->update($this->config->item('table_name'));
+	}
+
+	public function down()
+	{
+        // Not Possible
+	}
+}

application/migrations/123_add_lotw_users.php

@@ -0,0 +1,42 @@
+<?php
+defined('BASEPATH') or exit('No direct script access allowed');
+
+class Migration_add_lotw_users extends CI_Migration
+{
+	public function up()
+	{
+		if (!$this->db->table_exists('lotw_users')) {
+            $this->dbforge->add_field(array(
+                'id' => array(
+                    'type' => 'INT',
+                    'constraint' => 20,
+                    'unsigned' => TRUE,
+                    'auto_increment' => TRUE,
+                    'unique' => TRUE
+                ),
+                'callsign' => array(
+                    'type' => 'VARCHAR',
+                    'constraint' => 32,
+                    'unsigned' => TRUE,
+                ),
+                'lastupload' => array(
+                    'type' => 'datetime',
+                )
+            ));
+
+            $this->dbforge->add_key('id', TRUE);
+
+            $this->dbforge->create_table('lotw_users');
+
+            $this->db->query("ALTER TABLE lotw_users ADD INDEX `callsign` (`callsign`)");
+        }
+
+	}
+
+	public function down()
+	{
+      if ($this->db->table_exists('lotw_users')) {
+        $this->dbforge->drop_table('lotw_users');
+      }
+	}
+}

application/models/Activated_grids_model.php

@@ -11,7 +11,7 @@ class Activated_grids_model extends CI_Model {
             return null;
         }
 
-        $sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE, COL_SAT_NAME FROM '
+        $sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE FROM '
            . 'station_profile JOIN '.$this->config->item('table_name').' on '.$this->config->item('table_name').'.station_id = station_profile.station_id '
            . 'WHERE station_profile.station_gridsquare != "" AND '.$this->config->item('table_name').'.COL_SAT_NAME != ""';
 
@@ -29,7 +29,7 @@ class Activated_grids_model extends CI_Model {
 
 		$location_list = "'".implode("','",$logbooks_locations_array)."'";
 
-      $sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE, COL_SAT_NAME FROM '
+      $sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE FROM '
          . 'station_profile JOIN '.$this->config->item('table_name').' on '.$this->config->item('table_name').'.station_id = station_profile.station_id '
          . 'WHERE station_profile.station_gridsquare != "" AND '.$this->config->item('table_name').'.COL_SAT_NAME != "" '
          . 'AND (COL_LOTW_QSL_SENT = "Y" OR COL_QSL_SENT = "Y");';

application/models/Distances_model.php

@@ -256,13 +256,13 @@ class Distances_model extends CI_Model
 
         switch ($measurement_base) {
             case 'M':
-                return round(6371*$ca/1.609344);
+                return ceil(6371*$ca/1.609344);
             case 'K':
-                return round(6371*$ca);
+                return ceil(6371*$ca);
             case 'N':
-                return round(6371*$ca/1.852);
+                return ceil(6371*$ca/1.852);
             default:
-                return round(6371*$ca);
+                return ceil(6371*$ca);
         }
     }
 }

application/models/Dxcc.php

@@ -87,7 +87,7 @@ class DXCC extends CI_Model {
 				$dxccMatrix[$dxcc->adif]['name'] = ucwords(strtolower($dxcc->name), "- (/");
 				$dxccMatrix[$dxcc->adif]['Dxccprefix'] = $dxcc->prefix;
 				if ($postdata['includedeleted'])
-					$dxccMatrix[$dxcc->adif]['Deleted'] = isset($dxcc->Enddate) ? "<div class='alert-danger'>Y</div>" : '';
+					$dxccMatrix[$dxcc->adif]['Deleted'] = isset($dxcc->Enddate) ? 1 : 0;
 				$dxccMatrix[$dxcc->adif][$band] = '-';
 			}
 

application/models/Eqsl_images.php

@@ -24,6 +24,17 @@ class Eqsl_images extends CI_Model {
 		$this->db->insert('eQSL_images', $data);
 	}
 
+	function eqsl_qso_list() {
+		$this->load->model('logbooks_model');
+		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+		$this->db->select('COL_PRIMARY_KEY, qso_id, COL_CALL, COL_MODE, , COL_SUBMODE, COL_TIME_ON, COL_BAND, COL_SAT_NAME, image_file');
+		$this->db->join($this->config->item('table_name'), 'qso_id = COL_PRIMARY_KEY', 'left outer');
+		$this->db->join('station_profile', $this->config->item('table_name').'.station_id = station_profile.station_id', 'left outer');
+		$this->db->where_in('station_profile.station_id', $logbooks_locations_array);
+		$this->db->order_by('COL_TIME_ON', 'DESC');
+		return $this->db->get('eQSL_images');
+	}
+
 }
 
-?>
+?>

application/models/Eqslmethods_model.php

@@ -49,7 +49,7 @@ class Eqslmethods_model extends CI_Model {
                 array_push($logbooks_locations_array, $row->station_id);
             }
         }
-    
+
         $this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE, '.$this->config->item('table_name').'.COL_QSLMSG');
         $this->db->from('station_profile');
         $this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
@@ -63,7 +63,35 @@ class Eqslmethods_model extends CI_Model {
         $this->db->or_where($this->config->item('table_name').'.COL_EQSL_QSL_SENT', 'N');
         $this->db->group_end();
         $this->db->where_in('station_profile.station_id', $logbooks_locations_array);
-    
+
+        return $this->db->get();
+    }
+
+    // Show all QSOs whose eQSL card images we did not download yet
+    function eqsl_not_yet_downloaded($userid = null) {
+        $CI =& get_instance();
+        if ($userid == null) {
+            $CI->load->model('logbooks_model');
+            $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+        } else {
+            $stations = $this->get_all_user_locations($userid);
+            $logbooks_locations_array = array();
+            foreach ($stations->result() as $row) {
+                array_push($logbooks_locations_array, $row->station_id);
+            }
+        }
+
+        $this->db->select('station_profile.station_id, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_PROP_MODE, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE, '.$this->config->item('table_name').'.COL_QSLMSG, eQSL_images.qso_id');
+        $this->db->from('station_profile');
+        $this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
+        $this->db->join('eQSL_images','eQSL_images.qso_id = '.$this->config->item('table_name').'.COL_PRIMARY_KEY','left outer');
+        //$this->db->where("coalesce(station_profile.eqslqthnickname, '') <> ''");
+        $this->db->where($this->config->item('table_name').'.COL_CALL !=', '');
+        $this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_RCVD', 'Y');
+        $this->db->where('qso_id', NULL);
+        $this->db->where_in('station_profile.station_id', $logbooks_locations_array);
+        $this->db->order_by("COL_TIME_ON", "desc");
+
         return $this->db->get();
     }
 
@@ -165,4 +193,4 @@ class Eqslmethods_model extends CI_Model {
 
 }
 
-?>
+?>

application/models/Logbook_model.php

@@ -1295,12 +1295,13 @@ class Logbook_model extends CI_Model {
   }
 
   function get_qso($id) {
-    $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, dxcc_entities_2.name as station_country, dxcc_entities_2.end as station_end');
-    $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "- NONE -") as station_country, dxcc_entities_2.end as station_end');
+    $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "- NONE -") as station_country, dxcc_entities_2.end as station_end, eQSL_images.image_file as eqsl_image_file, lotw_users.callsign as lotwuser, lotw_users.lastupload');
     $this->db->from($this->config->item('table_name'));
     $this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
     $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id', 'left');
     $this->db->join('dxcc_entities as dxcc_entities_2', 'station_profile.station_dxcc = dxcc_entities_2.adif', 'left outer');
+    $this->db->join('eQSL_images', $this->config->item('table_name').'.COL_PRIMARY_KEY = eQSL_images.qso_id', 'left outer');
+    $this->db->join('lotw_users', $this->config->item('table_name').'.COL_CALL = lotw_users.callsign', 'left outer');
     $this->db->where('COL_PRIMARY_KEY', $id);
 
     return $this->db->get();
@@ -3794,4 +3795,4 @@ function validateADIFDate($date, $format = 'Ymd')
   $d = DateTime::createFromFormat($format, $date);
   return $d && $d->format($format) == $date;
 }
-?>
+?>

application/models/Logbookadvanced_model.php

@@ -100,6 +100,7 @@ class Logbookadvanced_model extends CI_Model {
 			FROM " . $this->config->item('table_name') . " qsos
 			INNER JOIN station_profile ON qsos.station_id=station_profile.station_id
 			LEFT OUTER JOIN dxcc_entities ON qsos.col_dxcc=dxcc_entities.adif
+			LEFT OUTER JOIN lotw_users ON qsos.col_call=lotw_users.callsign
 			WHERE station_profile.user_id =  ?
 			$where
 			ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc

application/models/LotwCert.php

@@ -54,11 +54,13 @@ class LotwCert extends CI_Model {
 		$this->db->insert('lotw_certs', $data);
 	}
 
-	function update_certificate($user_id, $callsign, $dxcc, $date_created, $date_expires, $cert_key, $general_cert) {
+	function update_certificate($user_id, $callsign, $dxcc, $date_created, $date_expires, $qso_start_date, $qso_end_date, $cert_key, $general_cert) {
 		$data = array(
 		    'cert_dxcc_id' => $dxcc,
 		    'date_created' => $date_created,
 		    'date_expires' => $date_expires,
+		    'qso_start_date' => $qso_start_date,
+		    'qso_end_date' => $qso_end_date,
 		    'cert_key' => $cert_key,
 		    'cert' => $general_cert
 		);

application/views/activated_grids/index.php

@@ -6,7 +6,7 @@
 
 	<?php if ($this->uri->segment(1) == "activated_grids" && $this->uri->segment(2) == "band") { ?>
 <form class="form-inline">
-	<label class="my-1 mr-2" for="gridsquare_bands">Band Selection</label>
+	<label class="my-1 mr-2" for="gridsquare_bands"><?php echo lang('gen_band_selection'); ?></label>
 	<select class="custom-select my-1 mr-sm-2"  id="gridsquare_bands"></select>
 </form>
 
@@ -25,14 +25,14 @@
 <div class="container">
 	<?php if ($this->uri->segment(2) == "satellites") { ?>
 		<div class="alert alert-success" role="alert">
-			Confirmed is Green <span id="confirmed_grids"></span>| Activated but not confirmed is Red <span id="activated_grids"></span>| <span id="sum_grids"></span>
+			<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_activated_but_not_confirmed_is_red'); ?> <span id="activated_grids"></span>|<span id="sum_grids"></span><br>
 		</div>
 	<?php } ?>
 
 	<?php if ($this->uri->segment(2) == "band") { ?>
 		<div class="alert alert-success" role="alert">
-			Confirmed is Green <span id="confirmed_grids"></span>| Activated but not confirmed is Red <span id="worked_grids"></span>| <span id="sum_grids"></span><br>
-			[This map does not include satellite, internet or repeater QSOs]
+			<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_activated_but_not_confirmed_is_red'); ?> <span id="activated_grids"></span>|<span id="sum_grids"></span><br>
+			[<?php echo lang('gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'); ?>]
 		</div>
 	<?php } ?>
 </div>

application/views/adif/import.php

@@ -148,7 +148,7 @@
                 <h5>Export Satellite-Only QSOs</h5>
                 <p><a href="<?php echo site_url('adif/exportsat'); ?>" title="Export All Satellite Contacts" target="_blank" class="btn-sm btn-primary">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-sm btn-primary">Export All Satellite QSOs Confirmed on LoTW</a></p>
+                <p><a href="<?php echo site_url('adif/exportsatlotw'); ?>" title="Export All Satellite QSOs Confirmed on LoTW" target="_blank" class="btn-sm btn-primary">Export All Satellite QSOs Confirmed on LoTW</a></p>
                 </div>
 
 

application/views/api/help.php

@@ -16,7 +16,7 @@
   <div class="card-body">
 	<p class="card-text">The Cloudlog API (Application Programming Interface) lets third party systems access Cloudlog 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. CloudlogCAT). Generate a read-write key if the application needs to send data to Cloudlog. Generate a read-only key if the application only needs to obtain data from Cloudlog.</p>
-   <p class="card-text"><span class="badge badge-warning">API URL</span> The API URL for this Cloudlog instance is: <span class="api-url" id="apiUrl"><a target="_blank" href="<?php echo base_url(); ?>"><?php echo base_url(); ?></a></span><span data-toggle="tooltip" data-original-title="<?php echo $this->lang->line('copy_to_clipboard'); ?>" onClick='copyApiUrl()'><i class="copy-icon fas fa-copy"></i></span></p>
+   <p class="card-text"><span class="badge badge-warning">API URL</span> The API URL for this Cloudlog instance is: <span class="api-url" id="apiUrl"><a target="_blank" href="<?php echo base_url(); ?>"><?php echo base_url(); ?></a></span><span data-toggle="tooltip" data-original-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 badge-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-toggle="tooltip" data-original-title="<?php echo $this->lang->line('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-toggle="tooltip" data-original-title="<?php echo lang('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>

application/views/awards/dxcc/index.php

@@ -198,9 +198,6 @@
                         <td>#</td>
                         <td>DXCC Name</td>
                         <td>Prefix</td>';
-        if ($this->input->post('includedeleted'))
-            echo '
-                        <td>Deleted</td>';
         foreach($bands as $band) {
             echo '<td>' . $band . '</td>';
         }
@@ -210,8 +207,14 @@
         foreach ($dxcc_array as $dxcc => $value) {      // Fills the table with the data
             echo '<tr>
                         <td>'. $i++ .'</td>';
-            foreach ($value  as $key) {
-                echo '<td style="text-align: center">' . $key . '</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 badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span></td>';
+                } else if ($name == "Deleted") {
+                   continue;
+                } else {
+                   echo '<td style="text-align: center">' . $key . '</td>';
+                }
             }
             echo '</tr>';
         }

application/views/awards/pota/index.php

@@ -17,13 +17,13 @@
 	<thead>
 		
 	<tr>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_pota_reference') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('general_word_date') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('general_word_time') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_callsign') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_band') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_rsts') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_rstr') ?></th>
+		<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>
 	</tr>
 	</thead>
 	

application/views/awards/wwff/index.php

@@ -17,13 +17,13 @@
 	<thead>
 		
 	<tr>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_wwff_reference') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('general_word_date') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('general_word_time') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_callsign') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_band') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_rsts') ?></th>
-		<th style="text-align: center"><?php echo $this->lang->line('gen_hamradio_rstr') ?></th>
+		<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>
 	</tr>
 	</thead>
 	

application/views/components/radio_display_table.php

@@ -0,0 +1,23 @@
+<?php if($radio_status->num_rows()) { ?>
+
+<table class="table table-striped">
+        <tr class="titles">
+            <td colspan="2"><i class="fas fa-broadcast-tower"></i> Radio Status</td>
+        </tr>
+
+        <?php foreach ($radio_status->result_array() as $row) { ?>
+        <tr>
+            <td><?php echo $row['radio']; ?></td>
+            <td>
+                <?php if($row['prop_mode'] == 'SAT') { ?>
+                    <?php echo $row['sat_name']; ?>
+                <?php } else { ?>
+                    <?php echo $this->frequency->hz_to_mhz($row['frequency']); ?> (<?php echo $row['mode']; ?>)
+                <?php } ?>
+            </td>
+        </tr>
+        <?php } ?>
+
+    </table>
+
+<?php } ?>

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-right" onclick="reset_contest_session()"><i class="fas fa-sync-alt"></i> <?php echo $this->lang->line('contesting_button_reset_contest_session'); ?></button>
-    <h2><?php echo $this->lang->line('contesting_page_title'); ?></h2>
+    <button type="button" class="btn btn-sm btn-warning float-right" onclick="reset_contest_session()"><i class="fas fa-sync-alt"></i> <?php echo lang('contesting_button_reset_contest_session'); ?></button>
+    <h2><?php echo lang('contesting_page_title'); ?></h2>
     <div class="row">
 
         <div class="col-sm-12 col-md-12">
@@ -8,7 +8,7 @@
                 <div class="card-body">
                     <form id="qso_input" name="qsos">
                         <div class="form-group row">
-							<label class="col-auto control-label" for="radio"><?php echo $this->lang->line('contesting_exchange_type'); ?></label>
+							<label class="col-auto control-label" for="radio"><?php echo lang('contesting_exchange_type'); ?></label>
 
 							<div class="col-auto">
 								<select class="form-control-sm" id="exchangetype" name="exchangetype">
@@ -21,7 +21,7 @@
 								</select>
 							</div>
 
-                            <label class="col-auto control-label" for="contestname"><?php echo $this->lang->line('contesting_contest_name'); ?></label>
+                            <label class="col-auto control-label" for="contestname"><?php echo lang('contesting_contest_name'); ?></label>
 
                             <div class="col-auto">
                                 <select class="form-control-sm" id="contestname" name="contestname">
@@ -34,12 +34,12 @@
 
                         <div class="form-row">
                             <div class="form-group col-md-2">
-                                <label for="start_date"><?php echo $this->lang->line('general_word_date'); ?></label>
+                                <label for="start_date"><?php echo lang('general_word_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="form-group col-md-1">
-                                <label for="start_time"><?php echo $this->lang->line('general_word_time'); ?></label>
+                                <label for="start_time"><?php echo lang('general_word_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 $this->session->userdata('start_time'); } else {echo date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> >
                             </div>
 
@@ -49,7 +49,7 @@
                             <?php } ?>
 
                             <div class="form-group col-md-2">
-                                <label for="mode"><?php echo $this->lang->line('gen_hamradio_mode'); ?></label>
+                                <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
                                 <select id="mode" class="form-control mode form-control-sm" name="mode">
                                     <?php foreach($modes->result() as $mode) {
                                             if ($mode->submode == null) {
@@ -62,7 +62,7 @@
                             </div>
 
                             <div class="form-group col-md-2">
-                                <label for="band"><?php echo $this->lang->line('gen_hamradio_band'); ?></label>
+                                <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
 
                                 <select id="band" class="form-control form-control-sm" name="band">
                                 <?php foreach($bands as $key=>$bandgroup) {
@@ -79,14 +79,14 @@
                             </div>
 
                             <div class="form-group col-md-2">
-                                <label for="frequency"><?php echo $this->lang->line('gen_hamradio_frequency'); ?></label>
+                                <label for="frequency"><?php echo lang('gen_hamradio_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="form-group col-md-2">
-                                <label for="inputRadio"><?php echo $this->lang->line('gen_hamradio_radio'); ?></label>
+                                <label for="inputRadio"><?php echo lang('gen_hamradio_radio'); ?></label>
                                 <select class="form-control form-control-sm radios" id="radio" name="radio">
-                                    <option value="0" selected="selected"><?php echo $this->lang->line('general_word_none'); ?></option>
+                                    <option value="0" selected="selected"><?php echo lang('general_word_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 } ?>
@@ -96,13 +96,13 @@
 
                         <div class="form-row">
                             <div class="form-group col-md-3">
-                                <label for="callsign"><?php echo $this->lang->line('gen_hamradio_callsign'); ?></label>
+                                <label for="callsign"><?php echo lang('gen_hamradio_callsign'); ?></label>
                                 <input type="text" class="form-control form-control-sm" id="callsign" name="callsign" required>
                                 <small id="callsign_info" class="badge badge-danger"></small>
                             </div>
 
                             <div class="form-group col-md-1">
-                                <label for="rst_sent"><?php echo $this->lang->line('gen_hamradio_rsts'); ?></label>
+                                <label for="rst_sent"><?php echo lang('gen_hamradio_rsts'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="59">
                             </div>
 
@@ -112,7 +112,7 @@
 							</div>
                             
                             <div style="display:none" class="form-group col-md-1 exchanges">
-                                <label for="exch_sent"><?php echo $this->lang->line('gen_hamradio_exchange_sent_short'); ?></label>
+                                <label for="exch_sent"><?php echo lang('gen_hamradio_exchange_sent_short'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="exch_sent" id="exch_sent" value="">
                             </div>
 
@@ -122,7 +122,7 @@
 							</div>
 
                             <div class="form-group col-md-1">
-                                <label for="rst_rcvd"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></label>
+                                <label for="rst_rcvd"><?php echo lang('gen_hamradio_rstr'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="59">
                             </div>
 
@@ -132,7 +132,7 @@
 							</div>
 							
 							<div style="display:none" class="form-group col-md-1 exchanger">
-								<label for="exch_rcvd"><?php echo $this->lang->line('gen_hamradio_exchange_rcvd_short'); ?></label>
+								<label for="exch_rcvd"><?php echo lang('gen_hamradio_exchange_rcvd_short'); ?></label>
 								<input type="text" class="form-control form-control-sm" name="exch_rcvd" id="exch_rcvd" value="">
 							</div>
 
@@ -144,18 +144,18 @@
 
                         <div class="form-row">
                             <div class="form-group col-md-5">
-                                <label for="name"><?php echo $this->lang->line('general_word_name'); ?></label>
+                                <label for="name"><?php echo lang('general_word_name'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="name" id="name" value="">
                             </div>
 
                             <div class="form-group col-md-5">
-                                <label for="comment"><?php echo $this->lang->line('general_word_comment'); ?></label>
+                                <label for="comment"><?php echo lang('general_word_comment'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="comment" id="comment" value="">
                             </div>
                         </div>
 
-                        <button type="button" class="btn btn-sm btn-light" onclick="reset_log_fields()"><i class="fas fa-sync-alt"></i> <?php echo $this->lang->line('contesting_btn_reset_qso'); ?></button>
-                        <button type="button" class="btn btn-sm btn-primary" onclick="logQso();"><i class="fas fa-save"></i> <?php echo $this->lang->line('contesting_btn_save_qso'); ?></button>
+                        <button type="button" class="btn btn-sm btn-light" onclick="reset_log_fields()"><i class="fas fa-sync-alt"></i> <?php echo lang('contesting_btn_reset_qso'); ?></button>
+                        <button type="button" class="btn btn-sm btn-primary" onclick="logQso();"><i class="fas fa-save"></i> <?php echo lang('contesting_btn_save_qso'); ?></button>
                         <div class="form-group row">
                           <div class="col-md-12">
                               <div class="form-check-inline">
@@ -172,26 +172,27 @@
 
             <!-- Callsign SCP Box -->
             <div class="card callsign-suggest">
-                <div class="card-header"><h5 class="card-title"><?php echo $this->lang->line('contesting_title_callsign_suggestions'); ?></h5></div>
+                <div class="card-header"><h5 class="card-title"><?php echo lang('contesting_title_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 $this->lang->line('contesting_title_contest_logbook'); ?></h5></div>
+                <div class="card-header"><h5 class="card-title"><?php echo lang('contesting_title_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 $this->lang->line('general_word_date'); ?>/<?php echo $this->lang->line('general_word_time'); ?></th>
-                            <th><?php echo $this->lang->line('gen_hamradio_call'); ?></th>
-                            <th><?php echo $this->lang->line('gen_hamradio_band'); ?></th>
-                            <th><?php echo $this->lang->line('gen_hamradio_mode'); ?></th>
-                            <th><?php echo $this->lang->line('gen_hamradio_rsts'); ?></th>
-                            <th><?php echo $this->lang->line('gen_hamradio_rstr'); ?></th>
-                            <th><?php echo $this->lang->line('gen_hamradio_exchange_sent_short'); ?></th>
-                            <th><?php echo $this->lang->line('gen_hamradio_exchange_rcvd_short'); ?></th>
+                            <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>Serial (S)</th>
 							<th>Serial (R)</th>
 							<th>Gridsquare</th>

application/views/csv/index.php

@@ -16,7 +16,7 @@
 			<form class="form" action="<?php echo site_url('csv/export'); ?>" method="post" enctype="multipart/form-data">
 				<div class="form-row">
 					<div class="form-group col-md-3">
-						<label for="station_profile"><?php echo $this->lang->line('cloudlog_station_profile'); ?></label>
+						<label for="station_profile"><?php echo lang('cloudlog_station_profile'); ?></label>
 						<select name="station_profile" class="station_id custom-select">
 							<option value="All">All</option>
 							<?php foreach ($station_profile->result() as $station) { ?>

application/views/dashboard/index.php

@@ -46,22 +46,22 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 ?>
 <div class="container dashboard">
 <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
-
+	
 	<?php if($this->optionslib->get_option('dashboard_banner') != "false") { ?>
 	<?php if($todays_qsos >= 1) { ?>
 		<div class="alert alert-success" role="alert">
-			  <?php echo $this->lang->line('dashboard_you_have_had'); ?> <strong><?php echo $todays_qsos; ?></strong> <?php echo $this->lang->line('dashboard_qsos_today'); ?>
+			  <?php echo lang('dashboard_you_have_had'); ?> <strong><?php echo $todays_qsos; ?></strong> <?php echo lang('dashboard_qsos_today'); ?>
 		</div>
 	<?php } else { ?>
 		<div class="alert alert-warning" role="alert">
-			  <span class="badge badge-info"><?php echo $this->lang->line('general_word_important'); ?></span> <i class="fas fa-broadcast-tower"></i> <?php echo $this->lang->line('notice_turn_the_radio_on'); ?>
+			  <span class="badge badge-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-broadcast-tower"></i> <?php echo lang('notice_turn_the_radio_on'); ?>
 		</div>
 	<?php } ?>
 	<?php } ?>
 
 	<?php if($current_active == 0) { ?>
 		<div class="alert alert-danger" role="alert">
-		  <?php echo $this->lang->line('error_no_active_station_profile'); ?>
+		  <?php echo lang('error_no_active_station_profile'); ?>
 		</div>
 	<?php } ?>
 
@@ -70,13 +70,13 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 			$current_date = date('Y-m-d H:i:s');
 			if($this->LotwCert->lotw_cert_expired($this->session->userdata('user_id'), $current_date) == true) { ?>
 			<div class="alert alert-danger" role="alert">
-				<span class="badge badge-info"><?php echo $this->lang->line('general_word_important'); ?></span> <i class="fas fa-hourglass-end"></i> <?php echo $this->lang->line('lotw_cert_expired'); ?>
+				<span class="badge badge-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-hourglass-end"></i> <?php echo lang('lotw_cert_expired'); ?>
 			</div>
 		<?php } ?>
 
 		<?php if($this->LotwCert->lotw_cert_expiring($this->session->userdata('user_id'), $current_date) == true) { ?>
 			<div class="alert alert-warning" role="alert">
-				<span class="badge badge-info"><?php echo $this->lang->line('general_word_important'); ?></span> <i class="fas fa-hourglass-half"></i> <?php echo $this->lang->line('lotw_cert_expiring'); ?>
+				<span class="badge badge-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-hourglass-half"></i> <?php echo lang('lotw_cert_expiring'); ?>
 			</div>
 		<?php } ?>
 	<?php } ?>
@@ -99,12 +99,12 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 
     		<thead>
 				<tr class="titles">
-					<th><?php echo $this->lang->line('general_word_date'); ?></th>
+					<th><?php echo lang('general_word_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 $this->lang->line('general_word_time'); ?></th>
+					<th><?php echo lang('general_word_time'); ?></th>
 					<?php } ?>
-					<th><?php echo $this->lang->line('gen_hamradio_call'); ?></th>
+					<th><?php echo lang('gen_hamradio_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'));
@@ -160,47 +160,26 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 	<?php } ?>
   	<div class="table-responsive">
 
-		<?php if($radio_status->num_rows()) { ?>
 
-			<table class="table table-striped">
-					<tr class="titles">
-						<td colspan="2"><i class="fas fa-broadcast-tower"></i> Radio Status</td>
-					</tr>
-
-					<?php foreach ($radio_status->result_array() as $row) { ?>
-					<tr>
-						<td><?php echo $row['radio']; ?></td>
-						<td>
-							<?php if($row['prop_mode'] == 'SAT') { ?>
-								<?php echo $row['sat_name']; ?>
-							<?php } else { ?>
-								<?php echo $this->frequency->hz_to_mhz($row['frequency']); ?> (<?php echo $row['mode']; ?>)
-							<?php } ?>
-						</td>
-					</tr>
-					<?php } ?>
-
-				</table>
-
-		<?php } ?>
+		<div id="radio_display" hx-get="<?php echo site_url('visitor/radio_display_component'); ?>" hx-trigger="load, every 5s"></div>
 
     	<table class="table table-striped">
 			<tr class="titles">
-				<td colspan="2"><i class="fas fa-chart-bar"></i> <?php echo $this->lang->line('dashboard_qso_breakdown'); ?></td>
+				<td colspan="2"><i class="fas fa-chart-bar"></i> <?php echo lang('dashboard_qso_breakdown'); ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_total'); ?></td>
+				<td width="50%"><?php echo lang('general_word_total'); ?></td>
 				<td width="50%"><?php echo $total_qsos; ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_year'); ?></td>
+				<td width="50%"><?php echo lang('general_word_year'); ?></td>
 				<td width="50%"><?php echo $year_qsos; ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_month'); ?></td>
+				<td width="50%"><?php echo lang('general_word_month'); ?></td>
 				<td width="50%"><?php echo $month_qsos; ?></td>
 			</tr>
 		</table>
@@ -209,15 +188,15 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 
 		<table class="table table-striped">
 			<tr class="titles">
-				<td colspan="2"><i class="fas fa-globe-europe"></i> <?php echo $this->lang->line('dashboard_countries_breakdown'); ?></td>
+				<td colspan="2"><i class="fas fa-globe-europe"></i> <?php echo lang('dashboard_countries_breakdown'); ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_worked'); ?></td>
+				<td width="50%"><?php echo lang('general_word_worked'); ?></td>
 				<td width="50%"><?php echo $total_countries; ?></td>
 			</tr>
 			<tr>
-				<td width="50%"><a href="#" onclick="return false" data-original-title="QSL Cards / eQSL / LoTW" data-toggle="tooltip"><?php echo $this->lang->line('general_word_confirmed'); ?></a></td>
+				<td width="50%"><a href="#" onclick="return false" data-original-title="QSL Cards / eQSL / LoTW" data-toggle="tooltip"><?php echo lang('general_word_confirmed'); ?></a></td>
 				<td width="50%">
 					<?php echo $total_countries_confirmed_paper; ?> /
 					<?php echo $total_countries_confirmed_eqsl; ?> /
@@ -226,7 +205,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_needed'); ?></td>
+				<td width="50%"><?php echo lang('general_word_needed'); ?></td>
 				<td width="50%"><?php echo $total_countries_needed; ?></td>
 			</tr>
 		</table>
@@ -234,21 +213,21 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 		<?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 $this->lang->line('general_word_qslcards'); ?></td>
+				<td colspan="2"><i class="fas fa-envelope"></i> <?php echo lang('general_word_qslcards'); ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_sent'); ?></td>
+				<td width="50%"><?php echo lang('general_word_sent'); ?></td>
 				<td width="50%"><?php echo $total_qsl_sent; ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_received'); ?></td>
+				<td width="50%"><?php echo lang('general_word_received'); ?></td>
 				<td width="50%"><?php echo $total_qsl_rcvd; ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_requested'); ?></td>
+				<td width="50%"><?php echo lang('general_word_requested'); ?></td>
 				<td width="50%"><?php echo $total_qsl_requested; ?></td>
 			</tr>
 		</table>
@@ -257,16 +236,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 		<?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 $this->lang->line('general_word_eqslcards'); ?></td>
+				<td colspan="2"><i class="fas fa-address-card"></i> <?php echo lang('general_word_eqslcards'); ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_sent'); ?></td>
+				<td width="50%"><?php echo lang('general_word_sent'); ?></td>
 				<td width="50%"><?php echo $total_eqsl_sent; ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_received'); ?></td>
+				<td width="50%"><?php echo lang('general_word_received'); ?></td>
 				<td width="50%"><?php echo $total_eqsl_rcvd; ?></td>
 			</tr>
 		</table>
@@ -275,16 +254,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 		<?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 $this->lang->line('general_word_lotw'); ?></td>
+				<td colspan="2"><i class="fas fa-list"></i> <?php echo lang('general_word_lotw'); ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_sent'); ?></td>
+				<td width="50%"><?php echo lang('general_word_sent'); ?></td>
 				<td width="50%"><?php echo $total_lotw_sent; ?></td>
 			</tr>
 
 			<tr>
-				<td width="50%"><?php echo $this->lang->line('general_word_received'); ?></td>
+				<td width="50%"><?php echo lang('general_word_received'); ?></td>
 				<td width="50%"><?php echo $total_lotw_rcvd; ?></td>
 			</tr>
 		</table>

application/views/debug/main.php

@@ -19,7 +19,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-toggle="tooltip" data-original-title="<?php echo $this->lang->line('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-toggle="tooltip" data-original-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>
                     </tr>
                 </table>
             </div>

application/views/distances/index.php

@@ -6,7 +6,7 @@
 
     <div id="distances_div">
         <form class="form-inline">
-            <label class="my-1 mr-2" for="distplot_bands">Band Selection</label>
+            <label class="my-1 mr-2" for="distplot_bands"><?php echo lang('gen_band_selection'); ?></label>
             <select class="custom-select my-1 mr-sm-2"  id="distplot_bands">
                 <?php if (count($sats_available) != 0) { ?>
                     <option value="sat">SAT</option>

application/views/dxatlas/index.php

@@ -16,7 +16,7 @@
 			<form class="form" action="<?php echo site_url('dxatlas/export'); ?>" method="post" enctype="multipart/form-data">
 				<div class="form-row">
 					<div class="form-group col-md-3">
-						<label for="station_profile"><?php echo $this->lang->line('cloudlog_station_profile'); ?></label>
+						<label for="station_profile"><?php echo lang('cloudlog_station_profile'); ?></label>
 						<select name="station_profile" class="station_id custom-select">
 							<option value="All">All</option>
 							<?php foreach ($station_profile->result() as $station) { ?>
@@ -62,7 +62,7 @@
 						foreach($dxcc as $d){
 							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
 							if ($d->Enddate != null) {
-								echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
+								echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
 							}
 							echo '</option>';
 						}

application/views/eqsl/analysis.php

@@ -16,6 +16,9 @@ $custom_date_format = $this->session->userdata('user_date_format');
       <li class="nav-item">
         <a class="nav-link" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
       </li>
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/download');?>">Download eQSL cards</a>
+      </li>
     </ul>
   </div>
 

application/views/eqsl/download.php

@@ -0,0 +1,82 @@
+
+<div class="container eqsl">
+<h2><?php echo $page_title; ?></h2>
+<div class="card">
+  <div class="card-header">
+  	<div class="card-title">eQSL Card Image Download</div>
+    <ul class="nav nav-tabs card-header-tabs">
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/import');?>">Download QSOs</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/Export');?>">Upload QSOs</a>
+      </li>
+	  <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link active" href="<?php echo site_url('eqsl/download');?>">Download eQSL cards</a>
+      </li>
+    </ul>
+  </div>
+
+  <div class="card-body">
+  <?php $this->load->view('layout/messages'); ?>
+
+<?php
+   if (! empty($qslsnotdownloaded->result())) {
+?>
+    	<p>Below is a table of QSOs that have been confirmed on eQSL but QSL images have not been downloaded yet.</p>
+
+
+		<table = style="width:100%" class="table-sm table table-bordered table-hover table-striped table-condensed text-center">
+			<thead><tr class="titles">
+				<th>Date</th>
+				<th>Time</th>
+				<th>Call</th>
+				<th>Mode</th>
+				<th>Submode</th>
+				<th>Band</th>
+				<th>Action</th>
+			</tr></thead><tbody>
+<?php
+foreach ($qslsnotdownloaded->result_array() as $qsl) {
+	echo "<tr>";
+	$timestamp = strtotime($qsl['COL_TIME_ON']);
+	echo "<td>".date($custom_date_format, $timestamp)."</td>";
+	echo "<td>".date('H:i', $timestamp)."</td>";
+	echo "<td>".str_replace("0","&Oslash;",$qsl['COL_CALL'])."</td>";
+	echo "<td>".$qsl['COL_MODE']."</td>";
+	if(isset($qsl['COL_SUBMODE'])) {
+		echo "<td>".$qsl['COL_SUBMODE']."</td>";
+	} else {
+		echo "<td></td>";
+	}
+	echo "<td>".$qsl['COL_BAND']."</td>";
+	echo "<td><a href=\"".site_url()."/eqsl/image/".$qsl['COL_PRIMARY_KEY']."\" data-fancybox=\"images\" data-width=\"528\" data-height=\"336\" class=\"btn btn-primary btn-sm\">View/Download</a></td>";
+}
+	echo "</tr>";
+?>
+		</tbody></table>
+		<br /><br />
+		<?php echo form_open_multipart('eqsl/download');?>
+
+			<div class="form-check">
+			  <input class="form-check-input" type="hidden" name="eqsldownload" id="download" value="download" checked />
+			  <p>Cloudlog will use the eQSL credentials from your Cloudlog user profile to connect to eQSL and download confirmations.</p>
+			</div>
+			<p><div class="alert alert-danger" role="alert">Due to a rate limit of approximately 10 seconds per eQSL picture download calling this function will take a long time to complete! Thus you may have to call this function several times depending on the amount of outstanding cards. This may run into a script timeout depending on the PHP configuration.</div></p>
+
+		<input class="btn btn-primary" type="submit" value="Download un-synced eQSL cards" />
+
+		</form>
+
+<?php
+	} else {
+		echo "<p>There are no QSOs whose eQSL card images have not yet been downloaded. Go log some more QSOs!</p>";
+	}
+?>
+</div>
+
+</div>
+</div>

application/views/eqsl/export.php

@@ -14,6 +14,9 @@
 	  <li class="nav-item">
         <a class="nav-link" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
       </li>
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/download');?>">Download eQSL cards</a>
+      </li>
     </ul>
   </div>
 

application/views/eqsl/import.php

@@ -14,6 +14,9 @@
 	  <li class="nav-item">
         <a class="nav-link" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
       </li>
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/download');?>">Download eQSL cards</a>
+      </li>
     </ul>
   </div>
   <div class="card-body">

application/views/eqsl/result.php

@@ -0,0 +1,55 @@
+
+<?php
+$custom_date_format = $this->session->userdata('user_date_format');
+?>
+<div class="container eqsl">
+<div class="card">
+  <div class="card-header">
+    <h5 class="card-title"><?php echo $page_title; ?></h5>
+    <ul class="nav nav-tabs card-header-tabs">
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/import');?>">Download QSOs</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/Export');?>">Upload QSOs</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link active" href="<?php echo site_url('eqsl/download');?>">Download eQSL cards</a>
+      </li>
+    </ul>
+  </div>
+
+	<div class="card-body">
+		<?php $this->load->view('layout/messages'); ?>
+
+			<div class="alert alert-info" role="alert">
+				<?php echo $eqsl_stats; ?>
+			</div>
+				<table width="100%">
+					<tr class="titles">
+						<td>Date</td>
+						<td>Time</td>
+						<td>Call</td>
+						<td>Mode</td>
+						<td>Submode</td>
+						<td>eQSL Status</td>
+					</tr>
+					<?php foreach ($eqsl_results as $qso) { ?>
+					<tr>
+						<?php $timestamp = strtotime($qso['date']); ?>
+						<td><?php echo date($custom_date_format, $timestamp) ?></td>
+						<td><?php echo date('H:i', $timestamp); ?></td>
+						<td><a id="edit_qso" href="javascript:displayQso(<?php echo $qso['qsoid']; ?>)"><?php echo $qso['call']; ?></a></td>
+						<td><?php echo $qso['mode']; ?></td>
+						<td><?php echo $qso['submode']; ?></td>
+						<td><?php echo $qso['status']; ?></td>
+					</tr>
+					<?php } ?>
+				</table>
+	</div>
+</div>
+
+</div>

application/views/eqsl/tools.php

@@ -15,6 +15,10 @@
       <li class="nav-item">
         <a class="nav-link active" href="<?php echo site_url('eqsl/tools');?>">Tools</a>
       </li>
+
+      <li class="nav-item">
+        <a class="nav-link" href="<?php echo site_url('eqsl/download');?>">Download eQSL cards</a>
+      </li>
     </ul>
   </div>
 

application/views/eqslcard/index.php

@@ -0,0 +1,59 @@
+<div class="container">
+
+    <br>
+
+    <h2><?php echo $this->lang->line('general_word_eqslcards'); ?></h2>
+
+    <div class="alert alert-info" role="alert">
+    <?php echo $this->lang->line('qslcard_string_your_are_using'); ?> <?php echo $storage_used; ?> <?php echo $this->lang->line('qslcard_string_disk_space'); ?>
+    </div>
+
+    <?php
+
+	if($this->session->userdata('user_date_format')) {
+		// If Logged in and session exists
+		$custom_date_format = $this->session->userdata('user_date_format');
+	} else {
+		// Get Default date format from /config/cloudlog.php
+		$custom_date_format = $this->config->item('qso_date_format');
+	}
+
+    if (is_array($qslarray->result())) {
+        echo '<table style="width:100%" class="eqsltable table table-sm table-bordered table-hover table-striped table-condensed">
+        <thead>
+        <tr>
+        <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
+        <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_mode').'</th>
+        <th style=\'text-align: center\'>'.$this->lang->line('general_word_date').'</th>
+        <th style=\'text-align: center\'>'.$this->lang->line('general_word_time').'</th>
+        <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_band').'</th>
+        <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_qsl').'</th>
+        <th style=\'text-align: center\'></th>
+        </tr>
+        </thead><tbody>';
+
+        foreach ($qslarray->result() as $qsl) {
+            echo '<tr>';
+            echo '<td style=\'text-align: center\'><a id="edit_qso" href="javascript:displayQso('.$qsl->COL_PRIMARY_KEY.')">' . $qsl->COL_CALL . '</a></td>';
+			echo '<td style=\'text-align: center\'>';
+			echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE;
+			echo '</td>';
+			echo '<td style=\'text-align: center\'>';
+			$timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp);
+			echo '</td>';
+			echo '<td style=\'text-align: center\'>';
+			$timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp);
+			echo '</td>';
+			echo '<td style=\'text-align: center\'>';
+			if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); };
+			echo '</td>';
+			echo '<td style=\'text-align: center\'>' . $qsl->image_file . '</td>';
+            echo '<td style=\'text-align: center\'><button onclick="viewEqsl(\''.$qsl->image_file.'\', \''. $qsl->COL_CALL . '\')" class="btn btn-sm btn-success">View</button></td>';
+            echo '</tr>';
+        }
+
+        echo '</tbody></table>';
+    }
+    ?>
+
+</div>

application/views/gridsquares/index.php

@@ -6,7 +6,7 @@
 
 	<?php if ($this->uri->segment(1) == "gridsquares" && $this->uri->segment(2) == "band") { ?>
 <form class="form-inline">
-	<label class="my-1 mr-2" for="gridsquare_bands">Band Selection</label>
+	<label class="my-1 mr-2" for="gridsquare_bands"><?php echo lang('gen_band_selection'); ?></label>
 	<select class="custom-select my-1 mr-sm-2"  id="gridsquare_bands"></select>
 </form>
 
@@ -25,14 +25,14 @@
 <div class="container">
 	<?php if ($this->uri->segment(2) == "satellites") { ?>
 		<div class="alert alert-success" role="alert">
-			Confirmed is Green <span id="confirmed_grids"></span>| Worked but not confirmed is Red <span id="worked_grids"></span>|<span id="sum_grids"></span>
+			<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_worked_but_not_confirmed_is_red'); ?> <span id="worked_grids"></span>|<span id="sum_grids"></span>
 		</div>
 	<?php } ?>
 
 	<?php if ($this->uri->segment(2) == "band") { ?>
 		<div class="alert alert-success" role="alert">
-			Confirmed is Green <span id="confirmed_grids"></span>| Worked but not confirmed is Red <span id="worked_grids"></span>|<span id="sum_grids"></span><br>
-			[This map does not include satellite, internet or repeater QSOs]
+			<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_worked_but_not_confirmed_is_red'); ?> <span id="worked_grids"></span>|<span id="sum_grids"></span><br>
+			[<?php echo lang('gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'); ?>]
 		</div>
 	<?php } ?>
 </div>

application/views/interface_assets/footer.php

@@ -816,6 +816,29 @@ function findduplicates(){
     });
 }
 
+function findlotwunconfirmed(){
+    event.preventDefault();
+    $('#partial_view').load(base_url+"index.php/logbook/search_lotw_unconfirmed/"+$("#station_id").val(), function() {
+        $('.qsolist').DataTable({
+            "pageLength": 25,
+            responsive: false,
+            ordering: false,
+            "scrollY":        "500px",
+            "scrollCollapse": true,
+            "paging":         false,
+            "scrollX": true,
+            dom: 'Bfrtip',
+            buttons: [
+                'csv'
+            ]
+        });
+        // change color of csv-button if dark mode is chosen
+        if (isDarkModeTheme()) {
+            $(".buttons-csv").css("color", "white");
+        }
+    });
+}
+
 function findincorrectcqzones() {
     event.preventDefault();
     $('#partial_view').load(base_url+"index.php/logbook/search_incorrect_cq_zones/"+$("#station_id").val(), function() {
@@ -1189,6 +1212,8 @@ $(document).on('keypress',function(e) {
 
 <?php } ?>
 <?php if ( $this->uri->segment(1) == "qso" || ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add")) { ?>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datetime-moment.js"></script>
     <script>
     function setRst(mode) {
         if(mode == 'JT65' || mode == 'JT65B' || mode == 'JT6C' || mode == 'JTMS' || mode == 'ISCAT' || mode == 'MSK144' || mode == 'JTMSK' || mode == 'QRA64' || mode == 'FT8' || mode == 'FT4' || mode == 'JS8' || mode == 'JT9' || mode == 'JT9-1' || mode == 'ROS'){
@@ -1255,9 +1280,12 @@ $(document).on('keypress',function(e) {
             }
           } else {
             $(".radio_timeout_error" ).remove();
-            text = '<i class="fas fa-broadcast-tower"></i><span style="margin-left:10px;"></span><b>TX:</b> '+(Math.round(parseInt(data.frequency)/1000)/1000).toFixed(3)+' MHz';
+            text = '<i class="fas fa-broadcast-tower"></i><span style="margin-left:10px;"></span><b>TX:</b> '+(Math.round(parseInt(data.frequency)/100)/10000).toFixed(4)+' MHz';
+            if(data.mode != null) {
+               text = text+'<span style="margin-left:10px"></span>'+data.mode;
+            }
             if(data.power != null && data.power != 0) {
-               text = text+'<span style="margin-left:10px"></span>'+data.power+'W';
+               text = text+'<span style="margin-left:10px"></span>'+data.power+' W';
             }
             if(data.prop_mode != null && data.prop_mode != '') {
                text = text+'<span style="margin-left:10px"></span>('+data.prop_mode;
@@ -1408,14 +1436,14 @@ $(document).ready(function(){
 
   if (grid_four_confirmed_count > 0) {
      var span = document.getElementById('confirmed_grids');
-     span.innerText = span.textContent = '('+grid_four_confirmed_count+' grid square'+(grid_four_confirmed_count != 1 ? 's' : '')+') ';
+     span.innerText = span.textContent = '('+grid_four_confirmed_count+' <?php echo lang('gridsquares_grid_squares'); ?>'+(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)+' grid square'+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') ';
+     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' : '')+') ';
   }
   var span = document.getElementById('sum_grids');
-  span.innerText = span.textContent = ' Total Count: '+grid_four_count+' grid square'+(grid_four_count != 1 ? 's' : '');
+  span.innerText = span.textContent = ' <?php echo lang('gridsquares_total_count'); ?>'+': '+grid_four_count+' <?php echo lang('gridsquares_grid_squares'); ?>'+(grid_four_count != 1 ? 's' : '');
 
   var maidenhead = L.maidenhead().addTo(map);
 
@@ -1547,14 +1575,14 @@ $(document).ready(function(){
 
   if (grid_four_confirmed_count > 0) {
      var span = document.getElementById('confirmed_grids');
-     span.innerText = span.textContent = '('+grid_four_confirmed_count+' grid square'+(grid_four_confirmed_count != 1 ? 's' : '')+') ';
+     span.innerText = span.textContent = '('+grid_four_confirmed_count+' <?php echo lang('gridsquares_grid_squares'); ?>'+(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)+' grid square'+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') ';
+     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' : '')+') ';
   }
   var span = document.getElementById('sum_grids');
-  span.innerText = span.textContent = ' Total Count: '+grid_four_count+' grid square'+(grid_four_count != 1 ? 's' : '');
+  span.innerText = span.textContent = ' <?php echo lang('gridsquares_total_count'); ?>'+': '+grid_four_count+' <?php echo lang('gridsquares_grid_squares'); ?>'+(grid_four_count != 1 ? 's' : '');
 
   var maidenhead = L.maidenhead().addTo(map);
 
@@ -2123,7 +2151,7 @@ $(document).ready(function(){
 	<script src="<?php echo base_url(); ?>assets/js/sections/timeplot.js"></script>
 <?php } ?>
 
-<?php if ($this->uri->segment(1) == "qsl") {
+<?php if ($this->uri->segment(1) == "qsl" || $this->uri->segment(1) == "eqsl") {
     	// Get Date format
 	if($this->session->userdata('user_date_format')) {
 		// If Logged in and session exists
@@ -2186,7 +2214,7 @@ $(document).ready(function(){
 function viewQsl(picture, callsign) {
             var baseURL= "<?php echo base_url();?>";
             var $textAndPic = $('<div></div>');
-                $textAndPic.append('<img class="img-fluid" style="height:auto;width:auto;"src="'+baseURL+'/assets/qslcard/'+picture+'" />');
+                $textAndPic.append('<center><img class="img-fluid w-qsl" style="height:auto;width:auto;"src="'+baseURL+'/assets/qslcard/'+picture+'" /><center>');
             var title = '';
             if (callsign == null) {
                 title = 'QSL Card';
@@ -2244,6 +2272,31 @@ function deleteQsl(id) {
             });
         }
 </script>
+<script>
+function viewEqsl(picture, callsign) {
+            var baseURL= "<?php echo base_url();?>";
+            var $textAndPic = $('<div></div>');
+                $textAndPic.append('<img class="img-fluid" style="height:auto;width:auto;"src="'+baseURL+'images/eqsl_card_images/'+picture+'" />');
+            var title = '';
+            if (callsign == null) {
+                title = 'eQSL Card';
+            } else {
+                title = 'eQSL Card for ' + callsign;
+            }
+
+            BootstrapDialog.show({
+                title: title,
+                size: BootstrapDialog.SIZE_WIDE,
+                message: $textAndPic,
+                buttons: [{
+                    label: 'Close',
+                    action: function(dialogRef){
+                        dialogRef.close();
+                    }
+                }]
+            });
+        }
+</script>
 
 <script>
   /*
@@ -2315,7 +2368,7 @@ function deleteQsl(id) {
                             '</tr>');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<div class="carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
+                        $(".carousel-inner").append('<center><div class="carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $("#qslcardfront").val(null);
                     }
                     else {
@@ -2335,7 +2388,7 @@ function deleteQsl(id) {
                         $('.qslcardtab').removeAttr('hidden');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li class="active" data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<div class="active carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
+                        $(".carousel-inner").append('<center><div class="active carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardfront").val(null);
                     }
@@ -2354,7 +2407,7 @@ function deleteQsl(id) {
                             '</tr>');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<div class="carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
+                        $(".carousel-inner").append('<center><div class="carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $("#qslcardback").val(null);
                     }
                     else {
@@ -2374,7 +2427,7 @@ function deleteQsl(id) {
                         $('.qslcardtab').removeAttr('hidden');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li class="active" data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<div class="active carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
+                        $(".carousel-inner").append('<center><div class="active carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardback").val(null);
                     }

application/views/interface_assets/header.php

@@ -51,7 +51,7 @@
 
 <nav class="navbar navbar-expand-lg navbar-light bg-light main-nav">
 <div class="container">
-		<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a> <?php if(ENVIRONMENT == "development") { ?><span class="badge badge-danger">Developer Mode</span><?php } ?>
+		<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a> <?php if(ENVIRONMENT == "development") { ?><span class="badge badge-danger"><?php echo lang('menu_badge_developer_mode'); ?></span><?php } ?>
 
 		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
 
@@ -60,123 +60,125 @@
     <ul class="navbar-nav">
       <li class="nav-item active">
         <li class="nav-item dropdown">
-           <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Logbook</a>
+           <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <?php echo lang('menu_logbook'); ?></a>
            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <a class="dropdown-item" href="<?php echo site_url('logbook');?>"><i class="fas fa-book"></i> Overview</a>
+              <a class="dropdown-item" href="<?php echo site_url('logbook');?>"><i class="fas fa-book"></i> <?php echo lang('menu_overview'); ?></a>
               <div class="dropdown-divider"></div>
-              <a class="dropdown-item" href="<?php echo site_url('logbookadvanced');?>"><i class="fas fa-book-open"></i> Advanced</a>
+              <a class="dropdown-item" href="<?php echo site_url('logbookadvanced');?>"><i class="fas fa-book-open"></i> <?php echo lang('menu_advanced'); ?></a>
            </div>
         </li>
 
         <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
         	<!-- QSO Menu Dropdown -->
         	<li class="nav-item dropdown">
-						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">QSO</a>
+						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_qso'); ?></a>
 						<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-							<a class="dropdown-item" href="<?php echo site_url('qso?manual=0');?>" title="Log Live QSOs"><i class="fas fa-list"></i> Live QSO</a>
+							<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>
 							<div class="dropdown-divider"></div>
-							<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> Post QSO</a>
+							<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>
 							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('contesting?manual=0');?>" title="Live contest QSOs"><i class="fas fa-list"></i> Live Contest Logging</a>
+							<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>
 							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('contesting?manual=1');?>" title="Post contest QSOs"><i class="fas fa-list"></i> Post Contest Logging</a>
+							<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>
 							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('qsl');?>" title="QSL"><i class="fa fa-id-card"></i> View QSL</a>
+							<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>
+							<div class="dropdown-divider"></div>
+							<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>
 						</div>
         	</li>
 
         	<!-- Notes -->
 		<?php if ($this->session->userdata('user_show_notes') == 1) { ?>
-        	<a class="nav-link" href="<?php echo site_url('notes');?>">Notes</a>
+        	<a class="nav-link" href="<?php echo site_url('notes');?>"><?php echo lang('menu_notes'); ?></a>
 		<?php } ?>
         	<li class="nav-item dropdown">
-				<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Analytics</a>
+				<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_analytics'); ?></a>
 				<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-					<a class="dropdown-item" href="<?php echo site_url('statistics');?>" title="Statistics"><i class="fas fa-chart-area"></i> Statistics</a>
+					<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>
 					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="<?php echo site_url('gridsquares');?>" title="Gridsquares"><i class="fas fa-globe-europe"></i> Gridsquares</a>
+					<a class="dropdown-item" href="<?php echo site_url('gridsquares');?>" title="Gridsquares"><i class="fas fa-globe-europe"></i> <?php echo lang('menu_gridsquares'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('activated_grids');?>" title="Activated Gridsquares"><i class="fas fa-globe-europe"></i> Activated Gridsquares</a>
+                    <a class="dropdown-item" href="<?php echo site_url('activated_grids');?>" title="Activated Gridsquares"><i class="fas fa-globe-europe"></i> <?php echo lang('menu_activated_gridsquares'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('activators');?>" title="Gridsquare Activators"><i class="fas fa-globe-europe"></i> Gridsquare Activators</a>
+                    <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>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('distances');?>" title="Distances"><i class="fas fa-chart-area"></i> Distances Worked</a>
+                    <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>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('dayswithqso');?>" title="Days with QSOs"><i class="fas fa-chart-area"></i> Days with QSOs</a>
+                    <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>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('timeline');?>" title="Timeline"><i class="fas fa-chart-area"></i> Timeline</a>
+                    <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>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('accumulated');?>" title="Accumulated Statistics"><i class="fas fa-chart-area"></i> Accumulated Statistics</a>
+                    <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>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('timeplotter');?>" title="View time when worked"><i class="fas fa-chart-area"></i> Timeplotter</a>
+                    <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>
 					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="<?php echo site_url('map/custom');?>" title="Custom Maps of QSOs"><i class="fas fa-globe-europe"></i> Custom Maps</a>
+					<a class="dropdown-item" href="<?php echo site_url('map/custom');?>" title="Custom Maps of QSOs"><i class="fas fa-globe-europe"></i> <?php echo lang('menu_custom_maps'); ?></a>
 					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="<?php echo site_url('continents');?>" title="Continents"><i class="fas fa-globe-europe"></i> Continents</a>
+					<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>
 				</div>
         	</li>
 
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Awards</a>
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_awards'); ?></a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                    <a class="dropdown-item" href="<?php echo site_url('awards/cq');?>"><i class="fas fa-trophy"></i> CQ</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/cq');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_cq'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/dok');?>"><i class="fas fa-trophy"></i> DOK</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/dok');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_dok'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/dxcc');?>"><i class="fas fa-trophy"></i> DXCC</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/dxcc');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_dxcc'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/iota');?>"><i class="fas fa-trophy"></i> IOTA</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/iota');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_iota'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/pota');?>"><i class="fas fa-trophy"></i> POTA</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/pota');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_pota'); ?></a>
 					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="<?php echo site_url('awards/sig');?>"><i class="fas fa-trophy"></i> SIG</a>
+					<a class="dropdown-item" href="<?php echo site_url('awards/sig');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_sig'); ?></a>
 					<div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/sota');?>"><i class="fas fa-trophy"></i> SOTA</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/sota');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_sota'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/counties');?>"><i class="fas fa-trophy"></i> US Counties</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/counties');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_us_counties'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/vucc');?>"><i class="fas fa-trophy"></i> VUCC</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/vucc');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_vucc'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/was');?>"><i class="fas fa-trophy"></i> WAS</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/was');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_was'); ?></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="<?php echo site_url('awards/wwff');?>"><i class="fas fa-trophy"></i> WWFF</a>
+                    <a class="dropdown-item" href="<?php echo site_url('awards/wwff');?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_wwff'); ?></a>
                 </div>
             </li>
 
 			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') == 99)) { ?>
         	<li class="nav-item dropdown">
-				<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Admin</a>
+				<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_admin'); ?></a>
 
 				<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-					<a class="dropdown-item" href="<?php echo site_url('user');?>" title="Manage user accounts"><i class="fas fa-user"></i> User Accounts</a>
+					<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>
 
 					<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> 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 lang('menu_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> 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 lang('menu_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> 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 lang('menu_contests'); ?></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> Themes</a>
+					<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>
 
 					<div class="dropdown-divider"></div>
 
-					<a class="dropdown-item" href="<?php echo site_url('backup');?>" title="Backup Cloudlog content"><i class="fas fa-save"></i> Backup</a>
+					<a class="dropdown-item" href="<?php echo site_url('backup');?>" title="Backup Cloudlog content"><i class="fas fa-save"></i> <?php echo lang('menu_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> 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 lang('menu_update_country_files'); ?></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> Debug Information</a>
+					<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>
 					
 				</div>
         	</li>
@@ -186,9 +188,9 @@
 
      <?php if($this->optionslib->get_option('global_search') != "false" || $this->session->userdata('user_type') >= 2) { ?>
 		<form method="post" action="<?php echo site_url('search'); ?>" class="form-inline">
-		<input class="form-control mr-sm-2" id="nav-bar-search-input" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search">
+		<input class="form-control mr-sm-2" id="nav-bar-search-input" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" aria-label="Search">
 
-		<button class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> Search</button>
+		<button class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> <?php echo lang('menu_search_button'); ?></button>
 		</form>
 	<?php } ?>
 
@@ -200,7 +202,7 @@
 			<input class="form-control mr-sm-2" type="text" name="user_name" placeholder="Username" aria-label="Username">
 			<input class="form-control mr-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 mr-sm-2" type="submit">Login</button>
+      <button class="btn btn-outline-success mr-sm-2" type="submit"><?php echo lang('menu_login_button'); ?></button>
 	</form>
 	<?php } ?>
 
@@ -211,25 +213,25 @@
 			<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-user"></i> <?php echo $this->session->userdata('user_callsign'); ?></a>
 
 			<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-				<a class="dropdown-item" href="<?php echo site_url('user/edit')."/".$this->session->userdata('user_id'); ?>" title="Account"><i class="fas fa-user"></i> Account</a>
+				<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>
 
-				<a class="dropdown-item" href="<?php echo site_url('logbooks');?>" title="Manage station logbooks"><i class="fas fa-home"></i> Station Logbooks</a>
+				<a class="dropdown-item" href="<?php echo site_url('logbooks');?>" title="Manage station logbooks"><i class="fas fa-home"></i> <?php echo lang('menu_station_logbooks'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('station');?>" title="Manage station locations"><i class="fas fa-home"></i> Station Locations</a>
+				<a class="dropdown-item" href="<?php echo site_url('station');?>" title="Manage station locations"><i class="fas fa-home"></i> <?php echo lang('menu_station_locations'); ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('band');?>" title="Manage Bands"><i class="fas fa-cog"></i> Bands</a>
+				<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>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" href="<?php echo site_url('adif');?>" title="Amateur Data Interchange Format (ADIF) import / export"><i class="fas fa-sync"></i> ADIF Import / Export</a>
+				<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>
 
-				<a class="dropdown-item" href="<?php echo site_url('kmlexport');?>" title="KML Export for Google Earth"><i class="fas fa-sync"></i> KML Export</a>
+				<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>
 
-				<a class="dropdown-item" href="<?php echo site_url('dxatlas');?>" title="DX Atlas Gridsquare Export"><i class="fas fa-sync"></i> DX Atlas Gridsquare Export</a>
+				<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>
 
-				<a class="dropdown-item" href="<?php echo site_url('csv');?>" title="SOTA CSV Export"><i class="fas fa-sync"></i> SOTA CSV Export</a>
+				<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>
 
-				<a class="dropdown-item" href="<?php echo site_url('cabrillo');?>" title="Cabrillo Export"><i class="fas fa-sync"></i> Cabrillo Export</a>
+				<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>
 
 				<div class="dropdown-divider"></div>
 
@@ -246,35 +248,35 @@ if ($logbooks_locations_array) {
 
 $oqrs_requests = $CI->oqrs_model->oqrs_requests($location_list);
 ?>
-				<a class="dropdown-item" href="<?php echo site_url('oqrs/requests');?>" title="OQRS Requests"><i class="fa fa-id-card"></i> OQRS Requests <?php if ($oqrs_requests > 0) { echo "<span class=\"badge badge-light\">".$oqrs_requests."</span>"; } ?></a>
+				<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) { echo "<span class=\"badge badge-light\">".$oqrs_requests."</span>"; } ?></a>
 
-				<a class="dropdown-item" href="<?php echo site_url('qslprint');?>" title="Print Requested QSLs"><i class="fas fa-print"></i> Print Requested QSLs</a>
+				<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>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" href="<?php echo site_url('lotw');?>" title="Synchronise with Logbook of the World (LoTW)"><i class="fas fa-sync"></i> Logbook of the World</a>
+				<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>
 
-				<a class="dropdown-item" href="<?php echo site_url('eqsl/import');?>" title="eQSL import / export"><i class="fas fa-sync"></i> eQSL Import / Export</a>
+				<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>
 
-                <a class="dropdown-item" href="<?php echo site_url('qrz/export');?>" title="Upload to QRZ.com logbook"><i class="fas fa-sync"></i> QRZ Logbook</a>
+                <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>
 
-				<a class="dropdown-item" href="<?php echo site_url('webadif/export');?>" title="Upload to webADIF"><i class="fas fa-sync"></i> QO-100 Dx Club Upload</a>
+				<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>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" href="<?php echo site_url('api/help');?>" title="Manage API keys"><i class="fas fa-key"></i> API Keys</a>
+				<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>
 
-				<a class="dropdown-item" href="<?php echo site_url('radio');?>" title="Interface with one or more radios"><i class="fas fa-broadcast-tower"></i> Hardware Interfaces</a>
+				<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>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/wiki" title="Help"><i class="fas fa-question"></i> Help</a>
+				<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/wiki" title="Help"><i class="fas fa-question"></i> <?php echo lang('menu_help'); ?></a>
 
-				<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/discussions" title="Forum"><i class="far fa-comment-dots"></i> Forum</a>
+				<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/discussions" title="Forum"><i class="far fa-comment-dots"></i> <?php echo lang('menu_forum'); ?></a>
 
 				<div class="dropdown-divider"></div>
 
-				<a class="dropdown-item" href="<?php echo site_url('user/logout');?>" title="Logout"><i class="fas fa-sign-out-alt"></i> Logout</a>
+				<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>
 			</div>
         </li>
     	</ul>

application/views/kml/index.php

@@ -35,7 +35,7 @@
                             foreach($dxcc as $d){
                                 echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
                                 if ($d->Enddate != null) {
-                                    echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
+                                    echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
                                 }
                                 echo '</option>';
                             }

application/views/logbookadvanced/index.php

@@ -1,3 +1,12 @@
+<script type="text/javascript">
+  /*
+  *
+  * Define custom date format
+  *
+  */
+  var custom_date_format = "<?php echo $custom_date_format ?>";
+</script>
+
 <div class="container-fluid qso_manager pt-3 pl-4 pr-4">
 	<?php if ($this->session->flashdata('message')) { ?>
 		<!-- Display Message -->

application/views/logbooks/edit.php

@@ -95,7 +95,7 @@
 						<select name="SelectedStationLocation" class="form-control" 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;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country; if ($row->dxcc_end != NULL) { echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')'; } ?>)</option>
+								<option value="<?php echo $row->station_id;?>"><?php echo $row->station_profile_name;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country; if ($row->dxcc_end != NULL) { echo ' ('.lang('gen_hamradio_deleted_dxcc').')'; } ?>)</option>
 								<?php } ?>
 							<?php } ?>
 						</select>
@@ -129,7 +129,7 @@
 							foreach ($station_locations_linked->result() as $row) {
 					?>
 					<tr>
-						<td><?php echo $row->station_profile_name;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country; if ($row->end != NULL) { echo ' <span class="badge badge-danger">'.$this->lang->line('gen_hamradio_deleted_dxcc').'</span>'; } ?>)</td>
+						<td><?php echo $row->station_profile_name;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country; if ($row->end != NULL) { echo ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?>)</td>
 						<td><a href="<?php echo site_url('logbooks/delete_relationship/'); ?><?php echo $station_logbook_details->logbook_id; ?>/<?php echo $row->station_id;?>" class="btn btn-danger"><i class="fas fa-trash-alt"></i></a></td>
 					</tr>
 					<?php

application/views/lookup/index.php

@@ -16,7 +16,7 @@
 			foreach($dxcc as $d){
 				echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
 				if ($d->Enddate != null) {
-					echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
+					echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
 				}
 				echo '</option>';
 			}

application/views/lotw/import.php

@@ -1,9 +1,9 @@
 <div class="container lotw">
 
-  <h2><?php echo $this->lang->line('lotw_title'); ?> - <?php echo $this->lang->line('lotw_title_adif_import'); ?></h2>
+  <h2><?php echo lang('lotw_title'); ?> - <?php echo lang('lotw_title_adif_import'); ?></h2>
   
 <div class="card">
-	<div class="card-header"><?php echo $this->lang->line('lotw_title_adif_import_options'); ?></div>
+	<div class="card-header"><?php echo lang('lotw_title_adif_import_options'); ?></div>
   <div class="card-body">
 
     <?php $this->load->view('layout/messages'); ?>
@@ -12,14 +12,14 @@
 
     <div class="form-check">
       <input type="radio" id="lotwimport" name="lotwimport" class="form-check-input">
-      <label class="form-check-label" for="lotwimport"><?php echo $this->lang->line('lotw_input_a_file'); ?></label>
+      <label class="form-check-label" for="lotwimport"><?php echo lang('lotw_input_a_file'); ?></label>
 
-      <p><?php echo $this->lang->line('lotw_upload_exported_adif_file_from_lotw'); ?></p>
-      <p><span class="badge badge-info"><?php echo $this->lang->line('general_word_important'); ?></span> <?php echo $this->lang->line('lotw_upload_type_must_be_adi'); ?></p>
+      <p><?php echo lang('lotw_upload_exported_adif_file_from_lotw'); ?></p>
+      <p><span class="badge badge-info"><?php echo lang('general_word_important'); ?></span> <?php echo lang('lotw_upload_type_must_be_adi'); ?></p>
       
       <div class="custom-file">
           <input type="file" class="custom-file-input" id="adiffile" name="userfile" size="20" />
-        <label class="custom-file-label" for="adiffile"><?php echo $this->lang->line('general_word_choose_file'); ?></label>
+        <label class="custom-file-label" for="adiffile"><?php echo lang('general_word_choose_file'); ?></label>
       </div>
 
     </div>
@@ -29,9 +29,9 @@
 
 		<div class="custom-control custom-radio">
 			<input type="radio" name="lotwimport" id="fetch" class="custom-control-input" value="fetch" checked="checked" />
-			<label class="custom-control-label" for="fetch"><?php echo $this->lang->line('lotw_pull_lotw_data_for_me'); ?></label>
+			<label class="custom-control-label" for="fetch"><?php echo lang('lotw_pull_lotw_data_for_me'); ?></label>
 		</div>
-      <p class="card-text"><?php echo $this->lang->line('gen_from_date'); ?>:</p>
+      <p class="card-text"><?php echo lang('gen_from_date'); ?>:</p>
       <div class="row">
           <div class="input-group date col-md-3" id="datetimepicker1" data-target-input="nearest">
               <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
@@ -45,14 +45,14 @@
           <div class="col-md-10">
               <div class="form-check-inline">
                   <input class="form-check-input" type="checkbox" name="importMissing" value="1" id="importMissing">
-                  <label class="form-check-label" for="importMissing"><?php echo $this->lang->line('lotw_import_missing_qsos_text'); ?></label>
+                  <label class="form-check-label" for="importMissing"><?php echo lang('lotw_import_missing_qsos_text'); ?></label>
               </div>
           </div>
       </div>
 
-		<p class="form-text text-muted"><?php echo $this->lang->line('lotw_report_download_overview_helptext'); ?></p>
+		<p class="form-text text-muted"><?php echo lang('lotw_report_download_overview_helptext'); ?></p>
 
-		<input class="btn btn-primary" type="submit" value="<?php echo $this->lang->line('lotw_btn_import_matches'); ?>" />
+		<input class="btn btn-primary" type="submit" value="<?php echo lang('lotw_btn_import_matches'); ?>" />
 
 	</form>
   </div>

application/views/lotw_views/index.php

@@ -1,15 +1,15 @@
 <div class="container lotw">
 <br>
-	<a class="btn btn-outline-primary btn-sm float-right" href="<?php echo site_url('/lotw/import'); ?>" role="button"><i class="fas fa-cloud-download-alt"></i> <?php echo $this->lang->line('lotw_btn_lotw_import'); ?></a>
-	<h2><?php echo $this->lang->line('lotw_title'); ?></h2>
+	<a class="btn btn-outline-primary btn-sm float-right" 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>
+	<h2><?php echo lang('lotw_title'); ?></h2>
 
 	<!-- Card Starts -->
 	<div class="card">
 		<div class="card-header">
-			<a class="btn btn-outline-success btn-sm float-right" href="<?php echo site_url('/lotw/cert_upload'); ?>" role="button"><i class="fas fa-cloud-upload-alt"></i> <?php echo $this->lang->line('lotw_btn_upload_certificate'); ?></a><i class="fab fa-expeditedssl"></i> <?php echo $this->lang->line('lotw_title_available_cert'); ?>
+			<a class="btn btn-outline-success btn-sm float-right" 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'); ?>
 		</div>
 
-		<div class="card-body">
+		<div class="lotw-cert-list">
 			<?php if(isset($error)) { ?>
 				<div class="alert alert-danger" role="alert">
 			  	<?php echo $error; ?>
@@ -28,14 +28,14 @@
 				<table class="table table-hover">
 					<thead class="thead-light">
 						<tr>
-				 			<th scope="col"><?php echo $this->lang->line('gen_hamradio_callsign'); ?></th>
-							<th scope="col"><?php echo $this->lang->line('gen_hamradio_dxcc'); ?></th>
-							<th scope="col"><?php echo $this->lang->line('lotw_qso_start_date'); ?></th>
-							<th scope="col"><?php echo $this->lang->line('lotw_qso_end_date'); ?></th>
-							<th scope="col"><?php echo $this->lang->line('lotw_date_created'); ?></th>
-							<th scope="col"><?php echo $this->lang->line('lotw_date_expires'); ?></th>
-							<th scope="col"><?php echo $this->lang->line('lotw_status'); ?></th>
-							<th scope="col"><?php echo $this->lang->line('lotw_options'); ?></th>
+				 			<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_options'); ?></th>
 						</tr>
 					</thead>
 				 
@@ -44,7 +44,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 badge-danger">'.$this->lang->line('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 badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
 								<td><?php
 									if (isset($row->qso_start_date)) {
 										$valid_qso_start = strtotime( $row->qso_start_date );
@@ -79,22 +79,22 @@
 									<?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 badge-danger"><?php echo $this->lang->line('lotw_expired'); ?></span>
+										<span class="badge badge-danger"><?php echo lang('lotw_expired'); ?></span>
 									<?php } else if ($current_date <= $row->date_expires && $current_date > $warning_date) { ?>
-										<span class="badge badge-warning"><?php echo $this->lang->line('lotw_expiring'); ?></span>
+										<span class="badge badge-warning"><?php echo lang('lotw_expiring'); ?></span>
 									<?php } else { ?>
-										<span class="badge badge-success"><?php echo $this->lang->line('lotw_valid'); ?></span>
+										<span class="badge badge-success"><?php echo lang('lotw_valid'); ?></span>
 									<?php } ?>
 
 									<?php if ($row->last_upload) {
 										$last_upload = date($this->config->item('qso_date_format').' H:i:s', strtotime( $row->last_upload )); ?>
 										<span class="badge badge-success"><?php echo $last_upload; ?></span>
 									<?php } else { ?>
-										<span class="badge badge-warning"><?php echo $this->lang->line('lotw_not_synced'); ?></span>
+										<span class="badge badge-warning"><?php echo lang('lotw_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 $this->lang->line('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 lang('lotw_btn_delete'); ?></a>
 								</td>
 							</tr>
 						<?php } ?>
@@ -105,7 +105,7 @@
 
 			<?php } else { ?>
 			<div class="alert alert-info" role="alert">
-				<?php echo $this->lang->line('lotw_no_certs_uploaded'); ?>
+				<?php echo lang('lotw_no_certs_uploaded'); ?>
 			</div>
 			<?php } ?>
 
@@ -118,11 +118,15 @@
 	<!-- Card Starts -->
 	<div class="card">
 		<div class="card-header">
-			<?php echo $this->lang->line('lotw_title_information'); ?>
+			<?php echo lang('lotw_title_information'); ?>
 		</div>
 
 		<div class="card-body">
-			<p><a class="btn btn-outline-success" href="<?php echo site_url('lotw/lotw_upload'); ?>"><?php echo $this->lang->line('lotw_btn_manual_sync'); ?></a></p>
+			<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'); ?>
+			</button>
+
+			<div id="lotw_manual_results"></div>
 		</div>
 	</div>
 

application/views/lotw_views/upload_cert.php

@@ -1,11 +1,11 @@
 <div class="container lotw">
 
-	<h2><?php echo $this->lang->line('lotw_title'); ?></h2>
+	<h2><?php echo lang('lotw_title'); ?></h2>
 
 	<!-- Card Starts -->
 	<div class="card">
 		<div class="card-header">
-			<?php echo $this->lang->line('lotw_title_upload_p12_cert'); ?>
+			<?php echo lang('lotw_title_upload_p12_cert'); ?>
 		</div>
 
 		<div class="card-body">
@@ -16,23 +16,23 @@
 	    	<?php } ?>
 
 	    	<div class="alert alert-info" role="alert">
-		    	<h5><?php echo $this->lang->line('lotw_title_export_p12_file_instruction'); ?></h5>
+		    	<h5><?php echo lang('lotw_title_export_p12_file_instruction'); ?></h5>
 
 		    	<ul>
-		    		<li><?php echo $this->lang->line('lotw_p12_export_step_one'); ?></li>
-		    		<li><?php echo $this->lang->line('lotw_p12_export_step_two'); ?></li>
-		    		<li><?php echo $this->lang->line('lotw_p12_export_step_three'); ?></li>
-		    		<li><?php echo $this->lang->line('lotw_p12_export_step_four'); ?></li>
+		    		<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>
 		    	</ul>
 	    	</div>
 
 			<?php echo form_open_multipart('lotw/do_cert_upload');?>
 				<div class="form-group">
-				    <label for="exampleFormControlFile1"><?php echo $this->lang->line('lotw_title_upload_p12_cert'); ?></label>
+				    <label for="exampleFormControlFile1"><?php echo lang('lotw_title_upload_p12_cert'); ?></label>
 				    <input type="file" name="userfile" class="form-control-file" id="exampleFormControlFile1">
 				 </div>
 
-				<button type="submit" value="upload" class="btn btn-primary"><?php echo $this->lang->line('lotw_btn_upload_file'); ?></button>
+				<button type="submit" value="upload" class="btn btn-primary"><?php echo lang('lotw_btn_upload_file'); ?></button>
 			</form>
 
 	    </div>

application/views/notes/add.php

@@ -3,13 +3,13 @@
 
 <div class="card">
   <div class="card-header">
-    <h2 class="card-title"><?php echo $this->lang->line('notes_create_note'); ?></h2>
+    <h2 class="card-title"><?php echo lang('notes_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 $this->lang->line('notes_menu_notes'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo lang('notes_menu_notes'); ?></a>
 	    </li>
 	    <li class="nav-item">
-	    	<a class="nav-link active" href="<?php echo site_url('notes/add'); ?>"><?php echo $this->lang->line('notes_create_note'); ?></a>
+	    	<a class="nav-link active" href="<?php echo site_url('notes/add'); ?>"><?php echo lang('notes_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="form-group">
-		<label for="inputTitle"><?php echo $this->lang->line('notes_input_title'); ?></label>
+		<label for="inputTitle"><?php echo lang('notes_input_title'); ?></label>
 		<input type="text" name="title" class="form-control" id="inputTitle">
 	</div>
 
 	<div class="form-group">
-	   <label for="catSelect"><?php echo $this->lang->line('notes_input_category'); ?></label>
+	   <label for="catSelect"><?php echo lang('notes_input_category'); ?></label>
 	   <select name="category" class="form-control" id="catSelect">
-	   	<option value="General" selected="selected"><?php echo $this->lang->line('notes_selection_general'); ?></option>
-		<option value="Antennas"><?php echo $this->lang->line('notes_selection_antennas'); ?></option>
-		<option value="Satellites"><?php echo $this->lang->line('notes_selection_satellites'); ?></option>
+	   	<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>
 	   </select>
 	</div>
 
 	<div class="form-group">
-		<label for="inputTitle"><?php echo $this->lang->line('notes_input_notes_content'); ?></label>
+		<label for="inputTitle"><?php echo lang('notes_input_notes_content'); ?></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 $this->lang->line('notes_input_btn_save_note'); ?></button>
+	<button type="submit" value="Submit" class="btn btn-primary"><?php echo lang('notes_input_btn_save_note'); ?></button>
 	</form>
   </div>
 </div>

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 $this->lang->line('notes_edit_note'); ?></h2>
+    <h2 class="card-title"><?php echo lang('notes_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 $this->lang->line('notes_menu_notes'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo lang('notes_menu_notes'); ?></a>
 	    </li>
 	    <li class="nav-item">
-	    	<a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo $this->lang->line('notes_create_note'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo lang('notes_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="form-group">
-		<label for="inputTitle"><?php echo $this->lang->line('notes_input_title'); ?></label>
+		<label for="inputTitle"><?php echo lang('notes_input_title'); ?></label>
 		<input type="text" name="title" class="form-control" value="<?php echo $row->title; ?>" id="inputTitle">
 	</div>
 
 	<div class="form-group">
-	   <label for="catSelect"><?php echo $this->lang->line('notes_input_category'); ?></label>
+	   <label for="catSelect"><?php echo lang('notes_input_category'); ?></label>
 	   <select name="category" class="form-control" id="catSelect">
-	    <option value="General" selected="selected"><?php echo $this->lang->line('notes_selection_general'); ?></option>
-		<option value="Antennas"><?php echo $this->lang->line('notes_selection_antennas'); ?></option>
-		<option value="Satellites"><?php echo $this->lang->line('notes_selection_satellites'); ?></option>
+	    <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>
 	   </select>
 	</div>
 
 	<div class="form-group">
-		<label for="inputTitle"><?php echo $this->lang->line('notes_input_notes_content'); ?></label>
+		<label for="inputTitle"><?php echo lang('notes_input_notes_content'); ?></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 $this->lang->line('notes_input_btn_save_note'); ?></button>
+	<button type="submit" value="Submit" class="btn btn-primary"><?php echo lang('notes_input_btn_save_note'); ?></button>
 	</form>
   </div>
 

application/views/notes/main.php

@@ -2,13 +2,13 @@
 
 	<div class="card">
 	  <div class="card-header">
-	  	<h2 class="card-title"><?php echo $this->lang->line('notes_menu_notes'); ?></h2>
+	  	<h2 class="card-title"><?php echo lang('notes_menu_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 $this->lang->line('notes_menu_notes'); ?></a>
+	        <a class="nav-link active" href="<?php echo site_url('notes'); ?>"><?php echo lang('notes_menu_notes'); ?></a>
 	      </li>
 	      <li class="nav-item">
-	        <a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo $this->lang->line('notes_create_note'); ?></a>
+	        <a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo lang('notes_create_note'); ?></a>
 	      </li>
 	    </ul>
 	  </div>
@@ -19,7 +19,7 @@
 
 				if ($notes->num_rows() > 0)
 				{
-					echo "<h3>".$this->lang->line('notes_your_notes')."</h3>";
+					echo "<h3>".lang('notes_your_notes')."</h3>";
 					echo "<ul class=\"list-group\">";
 					foreach ($notes->result() as $row)
 					{
@@ -29,7 +29,7 @@
 					}
 					echo "</ul>";
 				} else {
-					echo "<p>".$this->lang->line('notes_welcome')."</p>";
+					echo "<p>".lang('notes_welcome')."</p>";
 				}
 
 			?>

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 $this->lang->line('notes_menu_notes'); ?> - <?php echo $row->title; ?></h2>
+    		<h2 class="card-title"><?php echo lang('notes_menu_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 $this->lang->line('notes_menu_notes'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo lang('notes_menu_notes'); ?></a>
 	    </li>
 	    <li class="nav-item">
-	    	<a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo $this->lang->line('notes_create_note'); ?></a>
+	    	<a class="nav-link" href="<?php echo site_url('notes/add'); ?>"><?php echo lang('notes_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 $this->lang->line('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 lang('notes_input_btn_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 $this->lang->line('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 lang('notes_input_btn_delete_note'); ?></a>
 	    <?php } ?>
 	  </div
 >	</div>

application/views/options/appearance.php

@@ -45,7 +45,7 @@
 
                         <!-- Form options for selecting global theme choice -->
                         <div class="form-group">
-                            <label for="themeSelect">Theme</label>
+                            <label for="themeSelect"><?php echo lang('options_theme'); ?></label>
                             <select class="custom-select" id="themeSelect" name="theme" aria-describedby="themeHelp" required>
 								<?php
 								foreach ($themes as $theme) {
@@ -57,48 +57,48 @@
 								}
 								?>
                                 </select>
-                            <small id="themeHelp" class="form-text text-muted">Global Theme Choice, this is used when users arent logged in.</small>
+                            <small id="themeHelp" class="form-text text-muted"><?php echo lang('options_global_theme_choice_this_is_used_when_users_arent_logged_in'); ?></small>
                         </div>
 
                         <div class="form-group">
-                            <label for="globalSearch">Public Search Bar</label>
+                            <label for="globalSearch"><?php echo lang('options_public_search_bar'); ?></label>
                             <select class="custom-select" id="globalSearch" name="globalSearch" aria-describedby="globalSearchHelp" required>
                                 <option value='true' <?php if($this->optionslib->get_option('global_search') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
                                 <option value='false' <?php if($this->optionslib->get_option('global_search') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
                             </select>
-                            <small id="globalSearchHelp" class="form-text text-muted">This allows non logged in users to access the search functions.</small>
+                            <small id="globalSearchHelp" class="form-text text-muted"><?php echo lang('options_this_allows_non_logged_in_users_to_access_the_search_functions'); ?></small>
                         </div>
 
                         <div class="form-group">
-                            <label for="dashboardBanner">Dashboard Notification Banner</label>
+                            <label for="dashboardBanner"><?php echo lang('options_dashboard_notification_banner'); ?></label>
                             <select class="custom-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">This allows to disable the global notification banner on the dashboard.</small>
+                            <small id="dashboardBannerHelp" class="form-text text-muted"><?php echo lang('options_this_allows_to_disable_the_global_notification_banner_on_the_dashboard'); ?></small>
                         </div>
 
                         <div class="form-group">
-                            <label for="dashboardMap">Dashboard Map</label>
+                            <label for="dashboardMap"><?php echo lang('options_dashboard_map'); ?></label>
                             <select class="custom-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">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 lang('options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'); ?></small>
                         </div>
 
                         <div class="form-group">
-                            <label for="logbookMap">Logbook Map</label>
+                            <label for="logbookMap"><?php echo lang('options_logbook_map'); ?></label>
                             <select class="custom-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">This allows to disable the map in the logbook.</small>
+                            <small id="logbookMapHelp" class="form-text text-muted"><?php echo lang('options_this_allows_to_disable_the_map_in_the_logbook'); ?></small>
                         </div>
 
                         <!-- Save the Form -->
-                        <input class="btn btn-primary" type="submit" value="Save" />
+                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
                     </form>
                 </div>
             </div>

application/views/options/email.php

@@ -35,7 +35,7 @@
                     <?php echo form_open('options/email_save'); ?>
 
                         <div class="form-group">
-                            <label for="emailProtocol">Outgoing Protocol</label>
+                            <label for="emailProtocol"><?php echo lang('options_outgoing_protocol'); ?></label>
                             <select name="emailProtocol" class="form-control" 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>
@@ -43,7 +43,7 @@
                         </div>
 
                         <div class="form-group">
-                            <label for="smtpEncryption">SMTP Encryption</label>
+                            <label for="smtpEncryption"><?php echo lang('options_smtp_encryption'); ?></label>
                             <select name="smtpEncryption" class="form-control" 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>
@@ -53,49 +53,49 @@
 
 
                         <div class="form-group row">
-                            <label for="smtpHost" class="col-sm-2 col-form-label">SMTP Host</label>
+                            <label for="smtpHost" class="col-sm-2 col-form-label"><?php echo lang('options_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'); } ?>">
                             </div>
                         </div>
 
                         <div class="form-group row">
-                            <label for="smtpPort" class="col-sm-2 col-form-label">SMTP Port</label>
+                            <label for="smtpPort" class="col-sm-2 col-form-label"><?php echo lang('options_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'); } ?>">
                             </div>
                         </div>
 
                         <div class="form-group row">
-                            <label for="smtpUsername" class="col-sm-2 col-form-label">SMTP Username</label>
+                            <label for="smtpUsername" class="col-sm-2 col-form-label"><?php echo lang('options_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'); } ?>">
                             </div>
                         </div>
 
                         <div class="form-group row">
-                            <label for="smtpPassword" class="col-sm-2 col-form-label">SMTP Password</label>
+                            <label for="smtpPassword" class="col-sm-2 col-form-label"><?php echo lang('options_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'); } ?>">
                             </div>
                         </div>
 
                         <div class="form-group row">
-                            <label for="emailcrlf" class="col-sm-2 col-form-label">crlf</label>
+                            <label for="emailcrlf" class="col-sm-2 col-form-label"><?php echo lang('options_crlf'); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="emailcrlf" class="form-control" id="emailcrlf" value="<?php if($this->optionslib->get_option('emailcrlf') != "") { echo $this->optionslib->get_option('emailcrlf'); } ?>">
                             </div>
                         </div>
 
                         <div class="form-group row">
-                            <label for="emailnewline" class="col-sm-2 col-form-label">newline</label>
+                            <label for="emailnewline" class="col-sm-2 col-form-label"><?php echo lang('options_newline'); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="emailnewline" class="form-control" id="emailnewline" value="<?php if($this->optionslib->get_option('emailnewline') != "") { echo $this->optionslib->get_option('emailnewline'); } ?>">
                             </div>
                         </div>
 
                         <!-- Save the Form -->
-                        <input class="btn btn-primary" type="submit" value="Save" />
+                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
                     </form>
                 </div>
             </div>

application/views/options/index.php

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

application/views/options/oqrs.php

@@ -35,22 +35,22 @@
                     <?php echo form_open('options/oqrs_save'); ?>
 
                         <div class="form-group">
-                            <label for="globalSearch">Global text</label>
+                            <label for="globalSearch"><?php echo lang('options_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">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 lang('options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'); ?></small>
                         </div>
 
                         <div class="form-group">
-                            <label for="groupedSearch">Grouped search</label>
+                            <label for="groupedSearch"><?php echo lang('options_grouped_search'); ?></label>
                             <select name="groupedSearch" class="form-control" 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">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 lang('options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'); ?></small>
                         </div>
 
                         <!-- Save the Form -->
-                        <input class="btn btn-primary" type="submit" value="Save" />
+                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
                     </form>
                 </div>
             </div>

application/views/options/radios.php

@@ -35,14 +35,14 @@
                     <?php echo form_open('options/radio_save'); ?>
 
                         <div class="form-group">
-                            <label for="globalSearch">Radio Timeout Warning</label>
-                            <p>The Radio Timeout Warning is used on the QSO entry panel to alert you to radio interface disconnects.</p>
+                            <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>
                             <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">This number is in seconds.</small>
+                            <small id="radioTimeoutHelp" class="form-text text-muted"><?php echo lang('options_this_number_is_in_seconds'); ?></small>
                         </div>
 
                         <!-- Save the Form -->
-                        <input class="btn btn-primary" type="submit" value="Save" />
+                        <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
                     </form>
                 </div>
             </div>

application/views/options/sidebar.php

@@ -1,10 +1,10 @@
 <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'); ?>">Appearance</a></li>
-			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/radio'); ?>">Radios</a></li>
-			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/email'); ?>">Email</a></li>
-			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/oqrs'); ?>">OQRS</a></li>
+			<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>
 		</ul>
 	</div>
 </div>

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\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('general_word_date') . '</th>
-	<th style=\'text-align: center\'>'. $this->lang->line('general_word_time') .'</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_mode') . '</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_band') . '</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_station') . '</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_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-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent').$timestamp;
+				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_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 " (".$this->lang->line('general_word_qslcard_bureau').")";
+				echo " (".lang('general_word_qslcard_bureau').")";
 				break;
 			case "D":
-				echo " (".$this->lang->line('general_word_qslcard_direct').")";
+				echo " (".lang('general_word_qslcard_direct').")";
 				break;
 			case "M":
-				echo " (".$this->lang->line('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")";
+				echo " (".lang('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")";
 				break;
 			case "E":
-				echo " (".$this->lang->line('general_word_qslcard_electronic').")";
+				echo " (".lang('general_word_qslcard_electronic').")";
 				break;
 			}
 		}
@@ -89,16 +89,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_RCVD) {
 			case "Y":
-				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received').$timestamp;
+				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_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 " (".$this->lang->line('general_word_qslcard_bureau').")";
+				echo " (".lang('general_word_qslcard_bureau').")";
 				break;
 			case "D":
-				echo " (".$this->lang->line('general_word_qslcard_direct').")";
+				echo " (".lang('general_word_qslcard_direct').")";
 				break;
 			case "M":
 				echo " (Manager)";
 				break;
 			case "E":
-				echo " (".$this->lang->line('general_word_qslcard_electronic').")";
+				echo " (".lang('general_word_qslcard_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 "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent');
+				echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_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 "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received');
+				echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_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 "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent');
+				echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_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 "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received');
+				echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received');
 				if ($qsl->COL_LOTW_QSLRDATE != null) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');

application/views/qslcard/index.php

@@ -2,10 +2,10 @@
 
     <br>
 
-    <h2><?php echo $this->lang->line('general_word_qslcards'); ?></h2>
+    <h2><?php echo lang('general_word_qslcards'); ?></h2>
 
     <div class="alert alert-info" role="alert">
-    <?php echo $this->lang->line('qslcard_string_your_are_using'); ?> <?php echo $storage_used; ?> <?php echo $this->lang->line('qslcard_string_disk_space'); ?>
+    <?php echo lang('qslcard_string_your_are_using'); ?> <?php echo $storage_used; ?> <?php echo lang('qslcard_string_disk_space'); ?>
     </div>
 
     <?php
@@ -22,12 +22,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\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
-        <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_mode').'</th>
-        <th style=\'text-align: center\'>'.$this->lang->line('general_word_date').'</th>
-        <th style=\'text-align: center\'>'.$this->lang->line('general_word_time').'</th>
-        <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_band').'</th>
-        <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_qsl').'</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('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').'</th>
         <th style=\'text-align: center\'></th>
         <th style=\'text-align: center\'></th>
         <th style=\'text-align: center\'></th>

application/views/qslcard/searchresult.php

@@ -1,85 +1,85 @@
 <div class="table-responsive">
 	<table class="table table-sm table-striped table-hover">
 		<tr class="titles">
-			<td><?php echo $this->lang->line('general_word_date'); ?></td>
+			<td><?php echo lang('general_word_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 $this->lang->line('general_word_time'); ?></td>
+				<td><?php echo lang('general_word_time'); ?></td>
 			<?php } ?>
-			<td><?php echo $this->lang->line('gen_hamradio_call'); ?></td>
+			<td><?php echo lang('gen_hamradio_call'); ?></td>
 			<?php
 			echo '<td>';
 			switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
-				case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
-				case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
-				case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
-				case 'Country': echo $this->lang->line('general_word_country'); break;
-				case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
-				case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
-				case 'State': echo $this->lang->line('gen_hamradio_state'); break;
-				case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
-				case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
-				case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
-				case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
+				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 'Band': echo lang('gen_hamradio_band'); break;
+				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
+				case 'Operator': echo lang('gen_hamradio_operator'); break;
 			}
 			echo '</td>';
 			echo '<td>';
 			switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
-				case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
-				case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
-				case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
-				case 'Country': echo $this->lang->line('general_word_country'); break;
-				case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
-				case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
-				case 'State': echo $this->lang->line('gen_hamradio_state'); break;
-				case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
-				case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
-				case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
-				case 'Operator': echo $this->lang->line('gen_hamradio_band'); break;
+				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 'Band': echo lang('gen_hamradio_band'); break;
+				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
+				case 'Operator': echo lang('gen_hamradio_band'); break;
 			}
 			echo '</td>';
 			echo '<td>';
 			switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
-				case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
-				case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
-				case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
-				case 'Country': echo $this->lang->line('general_word_country'); break;
-				case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
-				case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
-				case 'State': echo $this->lang->line('gen_hamradio_state'); break;
-				case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
-				case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
-				case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
-				case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
+				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 'Band': echo lang('gen_hamradio_band'); break;
+				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
+				case 'Operator': echo lang('gen_hamradio_operator'); break;
 			}
 			echo '</td>';
 			echo '<td>';
 			switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
-				case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
-				case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
-				case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
-				case 'Country': echo $this->lang->line('general_word_country'); break;
-				case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
-				case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
-				case 'State': echo $this->lang->line('gen_hamradio_state'); break;
-				case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
-				case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
-				case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
-				case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
+				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 'Band': echo lang('gen_hamradio_band'); break;
+				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
+				case 'Operator': echo lang('gen_hamradio_operator'); break;
 			}
 			echo '</td>';
 			echo '<td>';
 			switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
-				case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
-				case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
-				case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
-				case 'Country': echo $this->lang->line('general_word_country'); break;
-				case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
-				case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
-				case 'State': echo $this->lang->line('gen_hamradio_state'); break;
-				case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
-				case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
-				case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
-				case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
+				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 'Band': echo lang('gen_hamradio_band'); break;
+				case 'Frequency': echo lang('gen_hamradio_frequency'); break;
+				case 'Operator': echo lang('gen_hamradio_operator'); break;
 			}
 			echo '</td><td></td></tr>';
 

application/views/qslprint/index.php

@@ -17,7 +17,7 @@
 	  </div>
 		<div class="card-body">
 			<form class="form" action="<?php echo site_url('adif/import'); ?>" method="post" enctype="multipart/form-data">
-				<?php echo $this->lang->line('cloudlog_station_profile'); ?>:
+				<?php echo lang('cloudlog_station_profile'); ?>:
 				<select name="station_profile" class="station_id custom-select mb-3 mr-sm-3" style="width: 20%;">
 					<option value="All">All</option>
 					<?php foreach ($station_profile->result() as $station) { ?>

application/views/qslprint/qslprint.php

@@ -16,13 +16,13 @@ if ($qsos->result() != NULL) {
 	echo '<table style="width:100%" class="table table-sm table-bordered table-hover table-striped table-condensed">
 <thead>
 <tr>
-<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
-<th style=\'text-align: center\'>' . $this->lang->line('general_word_date') . '</th>
-<th style=\'text-align: center\'>'. $this->lang->line('general_word_time') .'</th>
-<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_mode') . '</th>
-<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_band') . '</th>
-<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_qsl') . ' ' . $this->lang->line('general_word_qslcard_via') . '</th>
-<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_station') . '</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_qsl') . ' ' . lang('general_word_qslcard_via') . '</th>
+<th style=\'text-align: center\'>' . lang('gen_hamradio_station') . '</th>
 <th style=\'text-align: center\'>Sent method</th>
 <th style=\'text-align: center\'>Delete</th>
 <th style=\'text-align: center\'>QSO List</th>

application/views/qslprint/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\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('general_word_date') . '</th>
-	<th style=\'text-align: center\'>'. $this->lang->line('general_word_time') .'</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_mode') . '</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_band') . '</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_station') . '</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_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-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent').$timestamp;
+				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_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 " (".$this->lang->line('general_word_qslcard_bureau').")";
+				echo " (".lang('general_word_qslcard_bureau').")";
 				break;
 			case "D":
-				echo " (".$this->lang->line('general_word_qslcard_direct').")";
+				echo " (".lang('general_word_qslcard_direct').")";
 				break;
 			case "M":
-				echo " (".$this->lang->line('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")";
+				echo " (".lang('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")";
 				break;
 			case "E":
-				echo " (".$this->lang->line('general_word_qslcard_electronic').")";
+				echo " (".lang('general_word_qslcard_electronic').")";
 				break;
 			}
 		}
@@ -89,16 +89,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_RCVD) {
 			case "Y":
-				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received').$timestamp;
+				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_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 " (".$this->lang->line('general_word_qslcard_bureau').")";
+				echo " (".lang('general_word_qslcard_bureau').")";
 				break;
 			case "D":
-				echo " (".$this->lang->line('general_word_qslcard_direct').")";
+				echo " (".lang('general_word_qslcard_direct').")";
 				break;
 			case "M":
 				echo " (Manager)";
 				break;
 			case "E":
-				echo " (".$this->lang->line('general_word_qslcard_electronic').")";
+				echo " (".lang('general_word_qslcard_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 "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent');
+				echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_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 "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received');
+				echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_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 "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent');
+				echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_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 "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received');
+				echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received');
 				if ($qsl->COL_LOTW_QSLRDATE) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');

application/views/qso/edit_ajax.php

@@ -229,7 +229,7 @@
                                                 }
                                                 echo '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
                                                 if ($d->Enddate != null) {
-                                                    echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
+                                                    echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
                                                 }
                                                 echo '</option>';
                                             }
@@ -238,16 +238,16 @@
                                         </select>
                                     </div>
                                     <div class="form-group col-sm-6">
-                                        <label for="continent"><?php echo $this->lang->line('gen_hamradio_continent'); ?></label>
+                                        <label for="continent"><?php echo lang('gen_hamradio_continent'); ?></label>
                                         <select class="custom-select" id="continent" name="continent">
                                             <option value=""></option>
-                                            <option value="AF" <?php if($qso->COL_CONT == "AF") { echo "selected=\"selected\""; } ?>><?php echo $this->lang->line('africa'); ?></option>
-                                            <option value="AN" <?php if($qso->COL_CONT == "AN") { echo "selected=\"selected\""; } ?>><?php echo $this->lang->line('antarctica'); ?></option>
-                                            <option value="AS" <?php if($qso->COL_CONT == "AS") { echo "selected=\"selected\""; } ?>><?php echo $this->lang->line('asia'); ?></option>
-                                            <option value="EU" <?php if($qso->COL_CONT == "EU") { echo "selected=\"selected\""; } ?>><?php echo $this->lang->line('europe'); ?></option>
-                                            <option value="NA" <?php if($qso->COL_CONT == "NA") { echo "selected=\"selected\""; } ?>><?php echo $this->lang->line('northamerica'); ?></option>
-                                            <option value="OC" <?php if($qso->COL_CONT == "OC") { echo "selected=\"selected\""; } ?>><?php echo $this->lang->line('oceania'); ?></option>
-                                            <option value="SA" <?php if($qso->COL_CONT == "SA") { echo "selected=\"selected\""; } ?>><?php echo $this->lang->line('southamerica'); ?></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>
                                         </select>
                                     </div>
                                 </div>
@@ -508,9 +508,9 @@
                                         </div>
                                         <div class="form-group row">
                                              <div class="col-sm-9">
-                                                 <label for="qslmsg"><?php echo $this->lang->line('general_word_notes'); ?></label>
+                                                 <label for="qslmsg"><?php echo lang('general_word_notes'); ?></label>
                                                  <div class="alert alert-info" role="alert">
-                                                     <span class="badge badge-info"><?php echo $this->lang->line('general_word_info'); ?></span> <?php echo $this->lang->line('qsl_notes_helptext'); ?>
+                                                     <span class="badge badge-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
                                                  </div>
                                              </div>
                                              <div class="col-sm-9">

application/views/qso/index.php

@@ -10,29 +10,29 @@
       <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-toggle="tab" href="#qso" role="tab" aria-controls="qso" aria-selected="true"><?php echo $this->lang->line('gen_hamradio_qso'); ?></a>
+           <a class="nav-link active" id="qsp-tab" data-toggle="tab" href="#qso" role="tab" aria-controls="qso" aria-selected="true"><?php echo lang('gen_hamradio_qso'); ?></a>
           </li>
 
           <li class="nav-item">
-            <a class="nav-link" id="station-tab" data-toggle="tab" href="#station" role="tab" aria-controls="station" aria-selected="false"><?php echo $this->lang->line('gen_hamradio_station'); ?></a>
+            <a class="nav-link" id="station-tab" data-toggle="tab" href="#station" role="tab" aria-controls="station" aria-selected="false"><?php echo lang('gen_hamradio_station'); ?></a>
           </li>
 
           <li class="nav-item">
-            <a class="nav-link" id="general-tab" data-toggle="tab" href="#general" role="tab" aria-controls="general" aria-selected="false"><?php echo $this->lang->line('general_word_general'); ?></a>
+            <a class="nav-link" id="general-tab" data-toggle="tab" href="#general" role="tab" aria-controls="general" aria-selected="false"><?php echo lang('general_word_general'); ?></a>
           </li>
 
 <?php if ($sat_active) { ?>
           <li class="nav-item">
-            <a class="nav-link" id="satellite-tab" data-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false"><?php echo $this->lang->line('general_word_satellite_short'); ?></a>
+            <a class="nav-link" id="satellite-tab" data-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false"><?php echo lang('general_word_satellite_short'); ?></a>
           </li>
 <?php } ?>
 
           <li class="nav-item">
-            <a class="nav-link" id="notes-tab" data-toggle="tab" href="#nav-notes" role="tab" aria-controls="notes" aria-selected="false"><?php echo $this->lang->line('general_word_notes'); ?></a>
+            <a class="nav-link" id="notes-tab" data-toggle="tab" href="#nav-notes" role="tab" aria-controls="notes" aria-selected="false"><?php echo lang('general_word_notes'); ?></a>
           </li>
 
           <li class="nav-item">
-            <a class="nav-link" id="qsl-tab" data-toggle="tab" href="#qsl" role="tab" aria-controls="qsl" aria-selected="false"><?php echo $this->lang->line('gen_hamradio_qsl'); ?></a>
+            <a class="nav-link" id="qsl-tab" data-toggle="tab" href="#qsl" role="tab" aria-controls="qsl" aria-selected="false"><?php echo lang('gen_hamradio_qsl'); ?></a>
           </li>
         </ul>
       </div>
@@ -43,12 +43,12 @@
                       <!-- HTML for Date/Time -->
               <div class="form-row">
                 <div class="form-group col-md-6">
-                  <label for="start_date"><?php echo $this->lang->line('general_word_date'); ?></label>
+                  <label for="start_date"><?php echo lang('general_word_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="form-group col-md-6">
-                  <label for="start_time"><?php echo $this->lang->line('general_word_time'); ?></label>
+                  <label for="start_time"><?php echo lang('general_word_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 $this->session->userdata('start_time'); } else {echo date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?>>
                 </div>
 
@@ -63,7 +63,7 @@
               <!-- Callsign Input -->
               <div class="form-row">
                 <div class="form-group col-md-9">
-                  <label for="callsign"><?php echo $this->lang->line('gen_hamradio_callsign'); ?></label>
+                  <label for="callsign"><?php echo lang('gen_hamradio_callsign'); ?></label>
                   <input type="text" class="form-control" id="callsign" name="callsign" required>
                   <small id="callsign_info" class="badge badge-secondary"></small> <small id="lotw_info" class="badge badge-light"></small>
                 </div>
@@ -75,7 +75,7 @@
 
               <div class="form-row">
                 <div class="form-group col-md-6">
-                  <label for="mode"><?php echo $this->lang->line('gen_hamradio_mode'); ?></label>
+                  <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
                   <select id="mode" class="form-control mode form-control-sm" name="mode">
                   <?php
                       foreach($modes->result() as $mode){
@@ -90,7 +90,7 @@
                 </div>
 
                 <div class="form-group col-md-6">
-                  <label for="band"><?php echo $this->lang->line('gen_hamradio_band'); ?></label>
+                  <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
 
                   <select id="band" class="form-control form-control-sm" name="band">
                   <?php foreach($bands as $key=>$bandgroup) {
@@ -110,32 +110,32 @@
               <!-- Signal Report Information -->
               <div class="form-row">
                 <div class="form-group col-md-6">
-                  <label for="rst_sent"><?php echo $this->lang->line('gen_hamradio_rsts'); ?></label>
+                  <label for="rst_sent"><?php echo lang('gen_hamradio_rsts'); ?></label>
                   <input type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="59">
                 </div>
 
                 <div class="form-group col-md-6">
-                  <label for="rst_rcvd"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></label>
+                  <label for="rst_rcvd"><?php echo lang('gen_hamradio_rstr'); ?></label>
                   <input type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="59">
                 </div>
               </div>
 
               <div class="form-group row">
-                  <label for="name" class="col-sm-3 col-form-label"><?php echo $this->lang->line('general_word_name'); ?></label>
+                  <label for="name" class="col-sm-3 col-form-label"><?php echo lang('general_word_name'); ?></label>
                   <div class="col-sm-9">
                     <input type="text" class="form-control form-control-sm" name="name" id="name" value="">
                 </div>
               </div>
 
               <div class="form-group row">
-                <label for="qth" class="col-sm-3 col-form-label"><?php echo $this->lang->line('general_word_location'); ?></label>
+                <label for="qth" class="col-sm-3 col-form-label"><?php echo lang('general_word_location'); ?></label>
                 <div class="col-sm-9">
                     <input type="text" class="form-control form-control-sm" name="qth" id="qth" value="">
                 </div>
               </div>
 
               <div class="form-group row">
-                  <label for="locator" class="col-sm-3 col-form-label"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></label>
+                  <label for="locator" class="col-sm-3 col-form-label"><?php echo lang('gen_hamradio_gridsquare'); ?></label>
                   <div class="col-sm-9">
                     <input type="text" class="form-control form-control-sm" name="locator" id="locator" value="">
                     <small id="locator_info" class="form-text text-muted"></small>
@@ -143,7 +143,7 @@
               </div>
 
               <div class="form-group row">
-                  <label for="comment" class="col-sm-3 col-form-label"><?php echo $this->lang->line('general_word_comment'); ?></label>
+                  <label for="comment" class="col-sm-3 col-form-label"><?php echo lang('general_word_comment'); ?></label>
                   <div class="col-sm-9">
                     <input type="text" class="form-control form-control-sm" name="comment" id="comment" value="">
                 </div>
@@ -154,7 +154,7 @@
           <!-- Station Panel Data -->
           <div class="tab-pane fade" id="station" role="tabpanel" aria-labelledby="station-tab">
             <div class="form-group">
-              <label for="stationProfile"><?php echo $this->lang->line('cloudlog_station_profile'); ?></label>
+              <label for="stationProfile"><?php echo lang('cloudlog_station_profile'); ?></label>
               <select id="stationProfile" class="custom-select" name="station_profile">
                 <?php
                    $power = '';
@@ -166,9 +166,9 @@
             </div>
 
             <div class="form-group">
-              <label for="radio"><?php echo $this->lang->line('gen_hamradio_radio'); ?></label>
+              <label for="radio"><?php echo lang('gen_hamradio_radio'); ?></label>
               <select class="custom-select radios" id="radio" name="radio">
-                <option value="0" selected="selected"><?php echo $this->lang->line('general_word_none'); ?></option>
+                <option value="0" selected="selected"><?php echo lang('general_word_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 } ?>
@@ -176,17 +176,17 @@
             </div>
 
             <div class="form-group">
-              <label for="frequency"><?php echo $this->lang->line('gen_hamradio_frequency'); ?></label>
+              <label for="frequency"><?php echo lang('gen_hamradio_frequency'); ?></label>
               <input type="text" class="form-control" id="frequency" name="freq_display" value="<?php echo $this->session->userdata('freq'); ?>" />
             </div>
 
             <div class="form-group">
-              <label for="frequency_rx"><?php echo $this->lang->line('gen_hamradio_frequency_rx'); ?></label>
+              <label for="frequency_rx"><?php echo lang('gen_hamradio_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="form-group">
-                  <label for="band_rx"><?php echo $this->lang->line('gen_hamradio_band_rx'); ?></label>
+                  <label for="band_rx"><?php echo lang('gen_hamradio_band_rx'); ?></label>
 
                   <select id="band_rx" class="form-control" name="band_rx">
                     <option value="" <?php if($this->session->userdata('band_rx') == "") { echo "selected=\"selected\""; } ?>></option>
@@ -205,23 +205,23 @@
             </div>
 
             <div class="form-group">
-              <label for="transmit_power"><?php echo $this->lang->line('gen_hamradio_transmit_power'); ?></label>
+              <label for="transmit_power"><?php echo lang('gen_hamradio_transmit_power'); ?></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 $this->lang->line('qso_transmit_power_helptext'); ?></small>
+              <small id="powerHelp" class="form-text text-muted"><?php echo lang('qso_transmit_power_helptext'); ?></small>
             </div>
           </div>
 
           <!-- General Items -->
           <div class="tab-pane fade" id="general" role="tabpanel" aria-labelledby="general-tab">
               <div class="form-group">
-                  <label for="dxcc_id"><?php echo $this->lang->line('gen_hamradio_dxcc'); ?></label>
+                  <label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
                   <select class="custom-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 ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
+                              echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
                           }
                           echo '</option>';
                       }
@@ -230,20 +230,20 @@
                   </select>
               </div>
               <div class="form-group">
-                  <label for="continent"><?php echo $this->lang->line('gen_hamradio_continent'); ?></label>
+                  <label for="continent"><?php echo lang('gen_hamradio_continent'); ?></label>
                   <select class="custom-select" id="continent" name="continent">
                       <option value=""></option>
-                      <option value="AF"><?php echo $this->lang->line('africa'); ?></option>
-                      <option value="AN"><?php echo $this->lang->line('antarctica'); ?></option>
-                      <option value="AS"><?php echo $this->lang->line('asia'); ?></option>
-                      <option value="EU"><?php echo $this->lang->line('europe'); ?></option>
-                      <option value="NA"><?php echo $this->lang->line('northamerica'); ?></option>
-                      <option value="OC"><?php echo $this->lang->line('oceania'); ?></option>
-                      <option value="SA"><?php echo $this->lang->line('southamerica'); ?></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>
                   </select>
               </div>
               <div class="form-group">
-                  <label for="cqz"><?php echo $this->lang->line('gen_hamradio_cq_zone'); ?></label>
+                  <label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
                   <select class="custom-select" id="cqz" name="cqz" required>
                       <?php
                       for ($i = 0; $i<=40; $i++) {
@@ -254,7 +254,7 @@
               </div>
 
             <div class="form-group">
-              <label for="selectPropagation"><?php echo $this->lang->line('gen_hamradio_propagation_mode'); ?></label>
+              <label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
               <select class="custom-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>
@@ -279,7 +279,7 @@
             </div>
 
             <div class="form-group">
-              <label for="input_usa_state"><?php echo $this->lang->line('gen_hamradio_usa_state'); ?></label>
+              <label for="input_usa_state"><?php echo lang('gen_hamradio_usa_state'); ?></label>
               <select class="custom-select" id="input_usa_state" name="usa_state">
                 <option value=""></option>
                 <option value="AL">Alabama (AL)</option>
@@ -337,12 +337,12 @@
             </div>
 
               <div class="form-group">
-                  <label for="stationCntyInput"><?php echo $this->lang->line('gen_hamradio_county_reference'); ?></label>
+                  <label for="stationCntyInput"><?php echo lang('gen_hamradio_county_reference'); ?></label>
                   <input disabled="disabled" class="form-control" id="stationCntyInput" type="text" name="county" value="" />
               </div>
 
             <div class="form-group">
-              <label for="iota_ref"><?php echo $this->lang->line('gen_hamradio_iota_reference'); ?></label>
+              <label for="iota_ref"><?php echo lang('gen_hamradio_iota_reference'); ?></label>
                     <select class="custom-select" id="iota_ref" name="iota_ref">
                         <option value =""></option>
 
@@ -357,9 +357,9 @@
 
             <div class="form-row">
               <div class="form-group col-md-9">
-                <label for="sota_ref"><?php echo $this->lang->line('gen_hamradio_sota_reference'); ?></label>
+                <label for="sota_ref"><?php echo lang('gen_hamradio_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 $this->lang->line('qso_sota_ref_helptext'); ?></small>
+                <small id="sotaRefHelp" class="form-text text-muted"><?php echo lang('qso_sota_ref_helptext'); ?></small>
               </div>
               <div class="form-group col-md-3 align-self-center">
                 <small id="sota_info" class="badge badge-secondary"></small>
@@ -368,9 +368,9 @@
 
             <div class="form-row">
               <div class="form-group col-md-9">
-                <label for="wwff_ref"><?php echo $this->lang->line('gen_hamradio_wwff_reference'); ?></label>
+                <label for="wwff_ref"><?php echo lang('gen_hamradio_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 $this->lang->line('qso_wwff_ref_helptext'); ?></small>
+                <small id="wwffRefHelp" class="form-text text-muted"><?php echo lang('qso_wwff_ref_helptext'); ?></small>
               </div>
               <div class="form-group col-md-3 align-self-center">
                 <small id="wwff_info" class="badge badge-secondary"></small>
@@ -379,9 +379,9 @@
 
             <div class="form-row">
               <div class="form-group col-md-9">
-                <label for="pota_ref"><?php echo $this->lang->line('gen_hamradio_pota_reference'); ?></label>
+                <label for="pota_ref"><?php echo lang('gen_hamradio_pota_reference'); ?></label>
                 <input class="form-control" id="pota_ref" type="text" name="pota_ref" value="" />
-                <small id="potaRefHelp" class="form-text text-muted"><?php echo $this->lang->line('qso_pota_ref_helptext'); ?></small>
+                <small id="potaRefHelp" class="form-text text-muted"><?php echo lang('qso_pota_ref_helptext'); ?></small>
               </div>
               <div class="form-group col-md-3 align-self-center">
                 <small id="pota_info" class="badge badge-secondary"></small>
@@ -389,28 +389,28 @@
             </div>
 
             <div class="form-group">
-              <label for="sig"><?php echo $this->lang->line('gen_hamradio_sig'); ?></label>
+              <label for="sig"><?php echo lang('gen_hamradio_sig'); ?></label>
               <input class="form-control" id="sig" type="text" name="sig" value="" />
-              <small id="sigHelp" class="form-text text-muted"><?php echo $this->lang->line('qso_sig_helptext'); ?></small>
+              <small id="sigHelp" class="form-text text-muted"><?php echo lang('qso_sig_helptext'); ?></small>
             </div>
 
             <div class="form-group">
-              <label for="sig_info"><?php echo $this->lang->line('gen_hamradio_sig_info'); ?></label>
+              <label for="sig_info"><?php echo lang('gen_hamradio_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 $this->lang->line('qso_sig_info_helptext'); ?></small>
+              <small id="sigInfoHelp" class="form-text text-muted"><?php echo lang('qso_sig_info_helptext'); ?></small>
             </div>
 
             <div class="form-group">
-              <label for="darc_dok"><?php echo $this->lang->line('gen_hamradio_dok'); ?></label>
+              <label for="darc_dok"><?php echo lang('gen_hamradio_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 $this->lang->line('qso_dok_helptext'); ?></small>
+              <small id="dokHelp" class="form-text text-muted"><?php echo lang('qso_dok_helptext'); ?></small>
             </div>
           </div>
 
           <!-- Satellite Panel -->
           <div class="tab-pane fade" id="satellite" role="tabpanel" aria-labelledby="satellite-tab">
             <div class="form-group">
-              <label for="sat_name"><?php echo $this->lang->line('gen_hamradio_satellite_name'); ?></label>
+              <label for="sat_name"><?php echo lang('gen_hamradio_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'); ?>">
 
@@ -418,7 +418,7 @@
             </div>
 
             <div class="form-group">
-              <label for="sat_mode"><?php echo $this->lang->line('gen_hamradio_satellite_mode'); ?></label>
+              <label for="sat_mode"><?php echo lang('gen_hamradio_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'); ?>">
 
@@ -429,10 +429,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 badge-info"><?php echo $this->lang->line('general_word_info'); ?></span> <?php echo $this->lang->line('qso_notes_helptext'); ?>
+              <span class="badge badge-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qso_notes_helptext'); ?>
             </div>
            <div class="form-group">
-              <label for="notes"><?php echo $this->lang->line('general_word_notes'); ?></label>
+              <label for="notes"><?php echo lang('general_word_notes'); ?></label>
               <textarea  type="text" class="form-control" id="notes" name="notes" rows="10"></textarea>
             </div>
           </div>
@@ -441,43 +441,43 @@
           <div class="tab-pane fade" id="qsl" role="tabpanel" aria-labelledby="qsl-tab">
 
             <div class="form-group row">
-              <label for="sent" class="col-sm-3 col-form-label"><?php echo $this->lang->line('general_word_sent'); ?></label>
+              <label for="sent" class="col-sm-3 col-form-label"><?php echo lang('general_word_sent'); ?></label>
               <div class="col-sm-9">
                 <select class="custom-select" id="sent" name="qsl_sent">
-                  <option value="N" selected="selected"><?php echo $this->lang->line('general_word_no'); ?></option>
-                  <option value="Y"><?php echo $this->lang->line('general_word_yes'); ?></option>
-                  <option value="R"><?php echo $this->lang->line('general_word_requested'); ?></option>
-                  <option value="Q"><?php echo $this->lang->line('general_word_queued'); ?></option>
-                  <option value="I"><?php echo $this->lang->line('general_word_invalid_ignore'); ?></option>
+                  <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>
                 </select>
               </div>
             </div>
 
             <div class="form-group row">
-              <label for="sent-method" class="col-sm-3 col-form-label"><?php echo $this->lang->line('general_word_method'); ?></label>
+              <label for="sent-method" class="col-sm-3 col-form-label"><?php echo lang('general_word_method'); ?></label>
               <div class="col-sm-9">
                 <select class="custom-select" id="sent-method" name="qsl_sent_method">
-                 <option value="" selected="selected"><?php echo $this->lang->line('general_word_method'); ?></option>
-                 <option value="D"><?php echo $this->lang->line('general_word_qslcard_direct'); ?></option>
-                 <option value="B"><?php echo $this->lang->line('general_word_qslcard_bureau'); ?></option>
-                 <option value="E"><?php echo $this->lang->line('general_word_qslcard_electronic'); ?></option>
-                 <option value="M"><?php echo $this->lang->line('general_word_qslcard_manager'); ?></option>
+                 <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>
                 </select>
               </div>
             </div>
 
             <div class="form-group row">
-              <label for="qsl_via" class="col-sm-2 col-form-label"><?php echo $this->lang->line('general_word_qslcard_via'); ?></label>
+              <label for="qsl_via" class="col-sm-2 col-form-label"><?php echo lang('general_word_qslcard_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 badge-info"><?php echo $this->lang->line('general_word_info'); ?></span> <?php echo $this->lang->line('qsl_notes_helptext'); ?>
+              <span class="badge badge-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
             </div>
            <div class="form-group">
-              <label for="qslmsg"><?php echo $this->lang->line('general_word_notes'); ?></label>
+              <label for="qslmsg"><?php echo lang('general_word_notes'); ?></label>
               <textarea  type="text" class="form-control" id="qslmsg" name="qslmsg" rows="5"></textarea>
             </div>
           </div>
@@ -489,8 +489,8 @@
           <input size="20" id="country" type="hidden" name="country" value="" />
         </div>
 
-        <button type="reset" class="btn btn-light" onclick="reset_fields()"><?php echo $this->lang->line('qso_btn_reset_qso'); ?></button>
-        <button type="submit" class="btn btn-primary"><i class="fas fa-save"></i> <?php echo $this->lang->line('qso_btn_save_qso'); ?></button>
+        <button type="reset" class="btn btn-light" onclick="reset_fields()"><?php echo lang('qso_btn_reset_qso'); ?></button>
+        <button type="submit" class="btn btn-primary"><i class="fas fa-save"></i> <?php echo lang('qso_btn_save_qso'); ?></button>
       </div>
     </form>
     </div>
@@ -517,14 +517,14 @@
     </div>
 
     <div class="card callsign-suggest">
-        <div class="card-header"><h4 style="font-size: 16px; font-weight: bold;" class="card-title"><?php echo $this->lang->line('qso_title_suggestions'); ?></h4></div>
+        <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-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 $this->lang->line('qso_title_image'); ?></h4></div>
+        <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-body callsign-image">
             <div class="callsign-image-content" id="callsign-image-content">
@@ -534,7 +534,7 @@
     <?php } ?>
 
     <div class="card previous-qsos">
-      <div class="card-header"><h4 class="card-title" style="font-size: 16px; font-weight: bold;"><?php echo $this->lang->line('qso_title_previous_contacts'); ?></h4></div>
+      <div class="card-header"><h4 class="card-title" style="font-size: 16px; font-weight: bold;"><?php echo lang('qso_title_previous_contacts'); ?></h4></div>
 
         <div id="partial_view" style="font-size: 0.95rem;"></div>
 
@@ -543,15 +543,15 @@
           <div class="table-responsive" style="font-size: 0.95rem;">
             <table class="table">
               <tr class="log_title titles">
-                <td><?php echo $this->lang->line('general_word_date'); ?>/<?php echo $this->lang->line('general_word_time'); ?></td>
-                <td><?php echo $this->lang->line('gen_hamradio_call'); ?></td>
-                <td><?php echo $this->lang->line('gen_hamradio_mode'); ?></td>
-                <td><?php echo $this->lang->line('gen_hamradio_rsts'); ?></td>
-                <td><?php echo $this->lang->line('gen_hamradio_rstr'); ?></td>
+                <td><?php echo lang('general_word_date'); ?>/<?php echo lang('general_word_time'); ?></td>
+                <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>
                 <?php if ($this->session->userdata('user_column1')=='Frequency' || $this->session->userdata('user_column2')=='Frequency' || $this->session->userdata('user_column3')=='Frequency' || $this->session->userdata('user_column4')=='Frequency' || $this->session->userdata('user_column5')=='Frequency') {
-                         echo '<td>'.$this->lang->line('gen_hamradio_frequency').'</td>';
+                         echo '<td>'.lang('gen_hamradio_frequency').'</td>';
                       } else {
-                         echo '<td>'.$this->lang->line('gen_hamradio_band').'</td>';
+                         echo '<td>'.lang('gen_hamradio_band').'</td>';
                       }
                 ?>
               </tr>