2.6.4

2024-02-15 13:35:52 +00:00 · 2024-02-15 13:35:52 +00:00 · 85022afc2e
commit 85022afc2e
--- a/README.md
+++ b/README.md
@ -45,7 +45,7 @@ When submitting PRs please make sure code is commented and includes one feature

 ## Credits

-Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K0SKW), Andy (GI0VGV), Tobias (DL4TMA), Tony (G0WFV), Kim (DG9VH), Michael (G7VJR), Andreas (LA8AJA), Matthias (DL9MJ), Thomas (DO2TWE), Pat (KT3PJ), Flo (DF2ET), Joerg (DJ7NT) and Fabian (HB9HIL) for contributing code or help to Cloudlog.
+Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K0SKW), Andy (GI0VGV), Sarah (DM4NA), Tony (G0WFV), Kim (DG9VH), Michael (G7VJR), Andreas (LA8AJA), Matthias (DL9MJ), Thomas (DO2TWE), Pat (KT3PJ), Flo (DF2ET), Joerg (DJ7NT) and Fabian (HB9HIL) for contributing code or help to Cloudlog.

 ## Patreons & Donors

--- a/application/config/migration.php
+++ b/application/config/migration.php
@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
 |
 */

-$config['migration_version'] = 170;
+$config['migration_version'] = 171;

 /*
 |--------------------------------------------------------------------------
--- a/application/controllers/Components.php
+++ b/application/controllers/Components.php
@ -15,7 +15,7 @@ class Components extends CI_Controller {

    public function index() {
        $this->load->model('stations');
-        $url = 'https://oscarwatch.org/scripts/hamsat_json.php';
+        $url = 'https://hams.at/api/alerts/upcoming';
        $json = file_get_contents($url);
        $data['rovedata'] = json_decode($json, true);
        $data['gridsquare'] = strtoupper($this->stations->find_gridsquare());
--- a/application/controllers/Eqsl.php
+++ b/application/controllers/Eqsl.php
@ -40,8 +40,7 @@ class eqsl extends CI_Controller {
 		$this->load->model('eqslmethods_model');
 		$eqsl_locations = $this->eqslmethods_model->all_of_user_with_eqsl_nick_defined();
 		if($eqsl_locations->num_rows() == 0) {
-			show_error("eQSL Nicknames in Station Profiles aren't defined");
-			exit;
+			$this->session->set_flashdata('error', 'eQSL Nicknames in Station Profiles aren\'t defined!');
 		}

 		ini_set('memory_limit', '-1');
@ -74,10 +73,11 @@ class eqsl extends CI_Controller {
 				$this->eqslimporter->from_callsign_and_QTH(
 					$eqsl_location['station_callsign'],
 					$eqsl_location['eqslqthnickname'],
-					$config['upload_path']
+					$config['upload_path'],
+					$eqsl_location['station_id']
 				);

-				$eqsl_results[] = $this->eqslimporter->fetch($eqsl_password,$eqsl_force_from_date);
+				$eqsl_results[] = $this->eqslimporter->fetch($eqsl_password, $eqsl_force_from_date);
 			}
 		} elseif ($this->input->post('eqslimport') == 'upload') {
 			$station_id4upload=$this->input->post('station_profile');
@ -97,7 +97,7 @@ class eqsl extends CI_Controller {
 					$data = array('upload_data' => $this->upload->data());

 					$this->load->library('EqslImporter');
-					$this->eqslimporter->from_file('./uploads/'.$data['upload_data']['file_name'],$station_callsign);
+					$this->eqslimporter->from_file('./uploads/'.$data['upload_data']['file_name'], $station_callsign, $station_id4upload);

 					$eqsl_results[] = $this->eqslimporter->import();
 				}
@ -129,8 +129,7 @@ class eqsl extends CI_Controller {
 		// Check if eQSL Nicknames have been defined
 			$this->load->model('stations');
 			if($this->stations->are_eqsl_nicks_defined() == 0) {
-				show_error('eQSL Nicknames in Station Profiles arent defined');
-				exit;
+				$this->session->set_flashdata('error', 'eQSL Nicknames in Station Profiles aren\'t defined!');
 			}

 		ini_set('memory_limit', '-1');
@ -728,7 +727,8 @@ class eqsl extends CI_Controller {
 			$this->eqslimporter->from_callsign_and_QTH(
 				$eqsl_location['station_callsign'],
 				$eqsl_location['eqslqthnickname'],
-				$config['upload_path']
+				$config['upload_path'],
+				$eqsl_location['station_id']
 			);

 			$eqsl_results[] = $this->eqslimporter->fetch($password);
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@ -839,7 +839,7 @@ class User extends CI_Controller {
 				// Send email with reset code and first Name of the User

 				$this->data['reset_code'] = $reset_code;
-				$this->data['user_firstname'] = $data->user_firstname; // We can call the user by his first name in the E-Mail
+				$this->data['user_firstname'] = $data->user_firstname; // We can call the user by their first name in the E-Mail
 				$this->data['user_callsign'] = $data->user_callsign;
 				$this->data['user_name'] = $data->user_name;
 				$this->load->library('email');
--- a/application/language/bulgarian/options_lang.php
+++ b/application/language/bulgarian/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/chinese_simplified/admin_lang.php
+++ b/application/language/chinese_simplified/admin_lang.php
@ -54,7 +54,7 @@ $lang['admin_contest_name_of_contest'] = '竞赛 名称';
 $lang['admin_contest_name_of_adif'] = '竞赛 在 ADIF 中的名称';
 $lang['admin_contest_edit_active_hint'] = '如果要列在竞赛列表中，则设置为启用';
 $lang['admin_contest_edit_update_contest'] = '更新竞赛';
-$lang['admin_contest_deletion_warning'] = '注意！您确定要删除以下竞赛吗：';
-$lang['admin_contest_active_all_warning'] = '注意！您确定要启用所有竞赛吗？';
-$lang['admin_contest_deactive_all_warning'] = '注意！您确定要停用所有竞赛吗？';
+$lang['admin_contest_deletion_warning'] = '警告！您确定要删除以下竞赛吗：';
+$lang['admin_contest_active_all_warning'] = '警告！您确定要启用所有竞赛吗？';
+$lang['admin_contest_deactive_all_warning'] = '警告！您确定要停用所有竞赛吗？';

--- a/application/language/chinese_simplified/contesting_lang.php
+++ b/application/language/chinese_simplified/contesting_lang.php
@ -14,10 +14,10 @@ $lang['contesting_exchange_type_gridsquare'] = '网格座标';
 $lang['contesting_exchange_type_other'] = '其他';
 $lang['contesting_exchange_type_serial_exchange'] = '序列编号 + 交换信息';
 $lang['contesting_exchange_type_serial_gridsquare'] = '序列编号 + 网格座标';
-$lang['contesting_exchange_serial_s'] = '序列编号 (S)';
-$lang['contesting_exchange_serial_r'] = '序列编号 (R)';
-$lang['contesting_exchange_gridsquare_s'] = '网格座标 (S)';
-$lang['contesting_exchange_gridsquare_r'] = '网格座标 (R)';
+$lang['contesting_exchange_serial_s'] = '序列编号 (发)';
+$lang['contesting_exchange_serial_r'] = '序列编号 (收)';
+$lang['contesting_exchange_gridsquare_s'] = '网格座标 (发)';
+$lang['contesting_exchange_gridsquare_r'] = '网格座标 (收)';

 $lang['contesting_contest_name'] = '竞赛名称';

--- a/application/language/chinese_simplified/filter_lang.php
+++ b/application/language/chinese_simplified/filter_lang.php
@ -45,15 +45,15 @@ QSL Filters
 ___________________________________________________________________________________________
 */

-$lang['filter_qsl_sent'] = 'QSL 发送';
-$lang['filter_qsl_recv'] = 'QSL 接收';
+$lang['filter_qsl_sent'] = 'QSL 发送状态';
+$lang['filter_qsl_recv'] = 'QSL 接收状态';
 $lang['filter_qsl_sent_method'] = 'QSL 发送方式';
 $lang['filter_qsl_recv_method'] = 'QSL 接收方式';
-$lang['filter_lotw_sent'] = 'LoTW 发送';
-$lang['filter_lotw_recv'] = 'LoTW 接收';
-$lang['filter_eqsl_sent'] = 'eQSL 发送';
-$lang['filter_eqsl_recv'] = 'eQSL 接收';
-$lang['filter_qsl_via'] = 'QSL 通过';
+$lang['filter_lotw_sent'] = 'LoTW 发送状态';
+$lang['filter_lotw_recv'] = 'LoTW 接收状态';
+$lang['filter_eqsl_sent'] = 'eQSL 发送状态';
+$lang['filter_eqsl_recv'] = 'eQSL 接收状态';
+$lang['filter_qsl_via'] = '通过（via）……发送QSL';
 $lang['filter_qsl_images'] = 'QSL 图片';

 // $lang['general_word_all']                --> application/language/english/general_words_lang.php
@ -156,5 +156,5 @@ $lang['filter_options_show'] = '显示';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
-$lang['filter_search_operator']='Search Operator';
+$lang['filter_search_operator']='搜素操作员';
 $lang['filter_options_close'] = '关闭';
--- a/application/language/chinese_simplified/general_words_lang.php
+++ b/application/language/chinese_simplified/general_words_lang.php
@ -76,16 +76,16 @@ $lang['general_word_qslcard_management'] = 'QSL 管理';
 $lang['general_word_qslcards'] = 'QSL 卡片';
 $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'] = '通过';
+$lang['general_word_qslcard_electronic'] = '电子卡片';
+$lang['general_word_qslcard_manager'] = '卡片管理员';
+$lang['general_word_qslcard_via'] = '通过（via）';
 $lang['general_word_eqslcard'] = '电子 QSL 卡片';
 $lang['general_word_eqslcards'] = 'eQSL 卡片';
 $lang['general_word_lotw'] = 'Logbook of the World（LoTW）';
 $lang['general_word_lotw_short'] = 'LoTW';

-$lang['general_word_details'] = '详细';
-$lang['general_word_qso_data'] = 'QSO 数据';
+$lang['general_word_details'] = '详细信息';
+$lang['general_word_qso_data'] = 'QSO 信息';

 $lang['general_edit_qso'] = '编辑 QSO';
 $lang['general_mark_qsl_rx_bureau'] = '标记 已收到的QSL (卡片局)';
@ -124,20 +124,20 @@ $lang['gen_hamradio_suffix'] = "后缀";
 $lang['gen_hamradio_mode'] = '模式';
 $lang['gen_hamradio_de'] = '本台呼号(De)';
 $lang['gen_hamradio_dx'] = '对方呼号(Dx)';
-$lang['gen_hamradio_rst_sent'] = 'Sent RST';
-$lang['gen_hamradio_rst_rcvd'] = 'Rcvd RST';
+$lang['gen_hamradio_rst_sent'] = '发送 信号报告（RST）';
+$lang['gen_hamradio_rst_rcvd'] = '接收 信号报告（RST）';
 $lang['gen_hamradio_band'] = '频段';
 $lang['gen_hamradio_bandgroup'] = "波段";
-$lang['gen_hamradio_band_rx'] = '频段 (RX)';
+$lang['gen_hamradio_band_rx'] = '接收频段 (RX)';
 $lang['gen_hamradio_frequency'] = '频率';
-$lang['gen_hamradio_frequency_rx'] = '频率 (RX)';
+$lang['gen_hamradio_frequency_rx'] = '接收频率 (RX)';
 $lang['gen_hamradio_radio'] = '电台';
 $lang['gen_hamradio_rsts'] = '信号报告 (发)';
 $lang['gen_hamradio_rstr'] = '信号报告 (收)';
 $lang['gen_hamradio_refs'] = '对方网格';
-$lang['gen_hamradio_myrefs'] = '电台网格';
-$lang['gen_hamradio_exchange_sent_short'] = '信号交换 (发)';
-$lang['gen_hamradio_exchange_rcvd_short'] = '信号交换 (收)';
+$lang['gen_hamradio_myrefs'] = '我的网格';
+$lang['gen_hamradio_exchange_sent_short'] = '信号报告交换 (发)';
+$lang['gen_hamradio_exchange_rcvd_short'] = '信号报告交换 (收)';
 $lang['gen_hamradio_qsl'] = 'QSL';
 $lang['gen_hamradio_qsltype'] = "QSL 类型";
 $lang['gen_hamradio_qslvia'] = 'QSL via';
--- a/application/language/chinese_simplified/qso_lang.php
+++ b/application/language/chinese_simplified/qso_lang.php
@ -90,10 +90,10 @@ $lang['qso_simplefle_syntax_help_title'] = "FLE 语法帮助";
 $lang['qso_simplefle_syntax_help_ln1'] = "FLE 语法是一种简单的语法，用于快速记录 QSO。它的工作原理是，您只需输入每个 QSO 的更改部分。";
 $lang['qso_simplefle_syntax_help_ln2'] = "在每一行上，只写与上一个 QSO 不同的数据。";
 $lang['qso_simplefle_syntax_help_ln3'] = "例如，如果您在 20m 上与 DF3CB 进行了两次 QSO，您可以这样写：";
-$lang['qso_simplefle_syntax_help_ln4'] = "如果您不提供任何 RST 信息，语法将使用 59 (599 用于数据)。我们的下一个 QSO 不是双方都是 59，所以我们首先提供发送的 RST 信息。它比第一个 QSO 晚了 2 分钟。";
-$lang['qso_simplefle_syntax_help_ln5'] = "第一个 QSO 是在 21:34，第二个 QSO 在 21:36，比第一个 QSO 晚了 2 分钟。我们写下 6，因为这是这里唯一改变的数据。关于波段和模式的信息没有改变，因此省略了这些数据。";
-$lang['qso_simplefle_syntax_help_ln6'] = "我们的下一个 QSO 是在 2021 年 5 月 14 日的 21:40，我们将波段更改为 40m，但仍然在 SSB 上。如果没有给出 RST 信息，语法将为每个新的 QSO 使用 59。因此，我们可以添加另一个 QSO，它在两天后的同一时间发生。日期必须是 YYYY-MM-DD 格式。";
-$lang['qso_simplefle_syntax_help_ln7'] = "有关语法的更多信息，请查看 DF3CB 的网站<a href='https://df3cb.com/fle/documentation/' target='_blank'>此处</a>。";
-$lang['qso_simplefle_syntax_help_ln8'] = "";
-$lang['qso_simplefle_syntax_help_ln9'] = "";
+$lang['qso_simplefle_syntax_help_ln4'] = "";
+$lang['qso_simplefle_syntax_help_ln5'] = "如果您不提供任何 RST 信息，语法将使用 59 (599 用于数据)。我们的下一个 QSO 不是双方都是 59，所以我们首先提供发送的 RST 信息。它比第一个 QSO 晚了 2 分钟。";
+$lang['qso_simplefle_syntax_help_ln6'] = "第一个 QSO 是在 21:34，第二个 QSO 在 21:36，比第一个 QSO 晚了 2 分钟。我们写下 6，因为这是这里唯一改变的数据。关于波段和模式的信息没有改变，因此省略了这些数据。";
+$lang['qso_simplefle_syntax_help_ln7'] = "";
+$lang['qso_simplefle_syntax_help_ln8'] = "我们的下一个 QSO 是在 2021 年 5 月 14 日的 21:40，我们将波段更改为 40m，但仍然在 SSB 上。如果没有给出 RST 信息，语法将为每个新的 QSO 使用 59。因此，我们可以添加另一个 QSO，它在两天后的同一时间发生。日期必须是 YYYY-MM-DD 格式。";
+$lang['qso_simplefle_syntax_help_ln9'] = "有关语法的更多信息，请查看 DF3CB 的网站<a href='https://df3cb.com/fle/documentation/' target='_blank'>此处</a>。";
    
--- a/application/language/chinese_simplified/station_lang.php
+++ b/application/language/chinese_simplified/station_lang.php
@ -27,12 +27,12 @@ $lang['station_logbooks_edit_name_update'] = "更新台站日志名称";
 $lang['station_logbooks_public_slug'] = "自定义日志链接";
 $lang['station_logbooks_public_slug_hint'] = "通过自定义日志链接，你可以通过此链接让别人访问你的日志";
 $lang['station_logbooks_public_slug_format1'] = "他将会看起来像这样：";
-$lang['station_logbooks_public_slug_format2'] = "[your slug]";
-$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice";
-$lang['station_logbooks_public_slug_visit'] = "Visit Public Page";
-$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook.";
-$lang['station_logbooks_public_search_enabled'] = "Public search enabled";
-$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations";
+$lang['station_logbooks_public_slug_format2'] = "[你的日志]";
+$lang['station_logbooks_public_slug_input'] = "输入公共日志选项";
+$lang['station_logbooks_public_slug_visit'] = "访问公开日志页面";
+$lang['station_logbooks_public_search_hint'] = "启用公共搜索功能可在通过公共 slug 访问的公共日志页面上提供搜索输入框。 搜索仅涵盖此日志。";
+$lang['station_logbooks_public_search_enabled'] = "启用公共搜索";
+$lang['station_logbooks_select_avail_loc'] = "选择可用的台站位置";
 $lang['station_logbooks_link_loc'] = "链接的台站位置";
 $lang['station_logbooks_linked_loc'] = "已链接的台站位置";
 $lang['station_logbooks_no_linked_loc'] = "未链接的台站位置";
@ -46,72 +46,72 @@ Station Locations
 ___________________________________________________________________________________________
 */

-$lang['station_location'] = 'Station Location';
-$lang['station_location_plural'] = "Station Locations";
-$lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.';
-$lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.';
-$lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.';
-$lang['station_location_create_header'] = 'Create Station Location';
-$lang['station_location_create'] = 'Create a Station Location';
-$lang['station_location_edit'] = 'Edit Station Location: ';
-$lang['station_location_updated_suff'] = ' Updated.';
-$lang['station_location_warning'] = 'Attention: You need to set an active station location. Go to Callsign->Station Location to select one.';
-$lang['station_location_reassign_at'] = 'Please reassign them at ';
-$lang['station_location_warning_reassign'] = 'Due to recent changes within Cloudlog you need to reassign QSOs to your station profiles.';
-$lang['station_location_name'] = 'Profile Name';
-$lang['station_location_name_hint'] = 'Shortname for the station location. For example: Home (IO87IP)';
-$lang['station_location_callsign'] = 'Station Callsign';
-$lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P';
-$lang['station_location_power'] = 'Station Power (W)';
-$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.';
-$lang['station_location_emptylog'] = 'Empty Log';
-$lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: ';
-$lang['station_location_set_active'] = 'Set Active';
-$lang['station_location_active'] = 'Active Station';
-$lang['station_location_claim_ownership'] = 'Claim Ownership';
-$lang['station_location_confirm_del_qso'] = 'Are you sure you want to delete all QSOs within this station profile?';
-$lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want delete station profile  ';
-$lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?';
-$lang['station_location_dxcc'] = 'Station DXCC';
-$lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland';
-$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning.";
-$lang['station_location_city'] = 'Station City';
-$lang['station_location_city_hint'] = 'Station city. For example: Inverness';
-$lang['station_location_state'] = 'Station State';
-$lang['station_location_state_hint'] = 'Station state. Applies to certain countries only. Leave blank if not applicable.';
-$lang['station_location_county'] = 'Station County';
-$lang['station_location_county_hint'] = 'Station County (Only used for USA/Alaska/Hawaii).';
-$lang['station_location_gridsquare'] = 'Station Gridsquare';
-$lang['station_location_gridsquare_hint_ln1'] = "Station gridsquare. For example: IO87IP. If you don't know your grid square then <a href='https://zone-check.eu/?m=loc' target='_blank'>click here</a>!";
-$lang['station_location_gridsquare_hint_ln2'] = "If you are located on a grid line, enter multiple grid squares separated with commas. For example: IO77,IO78,IO87,IO88.";
-$lang['station_location_iota_hint_ln1'] = "Station IOTA reference. For example: EU-005";
-$lang['station_location_iota_hint_ln2'] = "You can look up IOTA references at the <a target='_blank' href='https://www.iota-world.org/iota-directory/annex-f-short-title-iota-reference-number-list.html'>IOTA World</a> website.";
-$lang['station_location_sota_hint_ln1'] = "Station SOTA reference. You can look up SOTA references at the <a target='_blank' href='https://www.sotamaps.org/'>SOTA Maps</a> website.";
-$lang['station_location_wwff_hint_ln1'] = "Station WWFF reference. You can look up WWFF references at the <a target='_blank' href='https://www.cqgma.org/mvs/'>GMA Map</a> website.";
-$lang['station_location_pota_hint_ln1'] = "Station POTA reference. You can look up POTA references at the <a target='_blank' href='https://pota.app/#/map/'>POTA Map</a> website.";
-$lang['station_location_signature'] = "Signature";
-$lang['station_location_signature_name'] = "Signature Name";
-$lang['station_location_signature_name_hint'] = "Station Signature (e.g. GMA)..";
-$lang['station_location_signature_info'] = "Signature Information";
-$lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357).";
-$lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile';
-$lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG";
-$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location.";
-$lang['station_location_qrz_subscription'] = 'Subscription Required';
-$lang['station_location_qrz_hint'] = "Find your API key on <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
-$lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';
-$lang['station_location_hrdlog_username'] = "HRDLog.net Username";
-$lang['station_location_hrdlog_username_hint'] = "The username you are registered with at HRDlog.net (usually your callsign).";
+$lang['station_location'] = '台站地址';
+$lang['station_location_plural'] = "台站地址";
+$lang['station_location_header_ln1'] = '台站地址定义的是操作位置，例如您的 QTH、朋友的 QTH 或野外架台的地址。';
+$lang['station_location_header_ln2'] = '与日志类似，台站地址配置将一组 QSO 保存在一起。';
+$lang['station_location_header_ln3'] = '一次只能有一个台站地址处于活动状态。 在下表中，这显示为带有“活动站”（"Active Station"）标识。';
+$lang['station_location_create_header'] = '创建台站地址';
+$lang['station_location_create'] = '新建台站地址';
+$lang['station_location_edit'] = '编辑台站地址';
+$lang['station_location_updated_suff'] = '已更新';
+$lang['station_location_warning'] = '注意：您需要设置活动的电台站位置（QTH）。 前往呼号->电台位置选择一个。';
+$lang['station_location_reassign_at'] = '请在这里重新分配：';
+$lang['station_location_warning_reassign'] = '由于 Cloudlog 中最近发生的变化，您需要将 QSO 重新分配给您的电台站配置文件。';
+$lang['station_location_name'] = '个人资料名称';
+$lang['station_location_name_hint'] = '台站位置的简称。 例如：学校（PN35GT）';
+$lang['station_location_callsign'] = '电台站的呼号';
+$lang['station_location_callsign_hint'] = '电台的呼号。 例如：B1/BG2FFJ';
+$lang['station_location_power'] = '电台功率';
+$lang['station_location_power_hint'] = '默认的电台功率（以瓦特为单位）。 这个设置会被从电台 CAT 读取到的数据所覆盖。';
+$lang['station_location_emptylog'] = '空日志';
+$lang['station_location_confirm_active'] = '您确定要将以下电台站位置设为活动的（在用的）电台站位置吗：';
+$lang['station_location_set_active'] = '设置为活动电台站位置';
+$lang['station_location_active'] = '活动的电台站';
+$lang['station_location_claim_ownership'] = '认领所有权';
+$lang['station_location_confirm_del_qso'] = '您确定要删除此电台配置文件中的所有 QSO 吗？';
+$lang['station_location_confirm_del_stationlocation'] = '您确定要删除电台配置文件吗 ';
+$lang['station_location_confirm_del_stationlocation_qso'] = '这将会删除该电台配置文件中的所有 QSO，确定删除 ？';
+$lang['station_location_dxcc'] = '电台站的 DXCC 实体';
+$lang['station_location_dxcc_hint'] = '电台站的 DXCC 实体。 例如：中国大陆';
+$lang['station_location_dxcc_warning'] = "等一下。 您选择的 DXCC 已过时并且不再有效。 检查一下您要选择的位置所属的 DXCC 哪一个是正确的。 如果您确定没选错，我就要选这个，请忽略此警告。";
+$lang['station_location_city'] = '电台站的城市';
+$lang['station_location_city_hint'] = '电台站的城市。 例如：长春';
+$lang['station_location_state'] = '电台站的州/省份';
+$lang['station_location_state_hint'] = '电台站的省份。 仅适用于某些国家。，如果不适用则留空。如：吉林';
+$lang['station_location_county'] = '电台站的县/区';
+$lang['station_location_county_hint'] = '电台站的县/区。（仅用于美国/阿拉斯加/夏威夷）。';
+$lang['station_location_gridsquare'] = '电台站的网格方格（梅登海德网格）';
+$lang['station_location_gridsquare_hint_ln1'] = "电台站所属的网格。 例如：PN35GT。 如果您不知道自己的网格，请<a href='https://zone-check.eu/?m=loc' target='_blank'>点击此处</a>！";
+$lang['station_location_gridsquare_hint_ln2'] = "如果您正好位于网格线上，请输入多个网格方块，并用逗号分隔。 例如：PN24、PN34、PN23、PN33。";
+$lang['station_location_iota_hint_ln1'] = "电台站的IOTA编号。 例如：BY-001";
+$lang['station_location_iota_hint_ln2'] = "您可以在 <a target='_blank' href='https://www.iota-world.org/iota-directory/annex-f-short-title-iota-reference-number-list.html'>IOTA World</a> 网站查找 IOTA 编号。";
+$lang['station_location_sota_hint_ln1'] = "电台站内的 SOTA 编号. 您可以在 <a target='_blank' href='https://www.sotamaps.org/'>SOTA 地图</a> 网站查找 SOTA 编号。";
+$lang['station_location_wwff_hint_ln1'] = "电台站内的 WWFF 编号. 您可以在 <a target='_blank' href='https://www.cqgma.org/mvs/'>GMA 地图</a> 网站查找 WWFF 编号。";
+$lang['station_location_pota_hint_ln1'] = "电台站内的 POTA 编号. 您可以在 <a target='_blank' href='https://pota.app/#/map/'>POTA 地图</a> 网站查找 POTA 编号。";
+$lang['station_location_signature'] = "签名";
+$lang['station_location_signature_name'] = "签名名称";
+$lang['station_location_signature_name_hint'] = "电台签名（例如 GMA）..";
+$lang['station_location_signature_info'] = "签名信息";
+$lang['station_location_signature_info_hint'] = "电台签名信息（例如 DA/NW-357）。";
+$lang['station_location_eqsl_hint'] = '在您的 eQSL 配置文件中配置的 QTH 昵称';
+$lang['station_location_eqsl_defaultqslmsg'] = "默认的QSL信息";
+$lang['station_location_eqsl_defaultqslmsg_hint'] = "该设置将为此电台站站位置的每个 QSO 设置一个默认填充和发送的消息。";
+$lang['station_location_qrz_subscription'] = '需要 QRZ.com 的订阅';
+$lang['station_location_qrz_hint'] = "在 <a href='https://logbook.qrz.com/logbook' target='_blank'>QRZ.com的日志簿界面查找您的API KEY。";
+$lang['station_location_qrz_realtime_upload'] = 'QRZ.com 日志簿实时上传';
+$lang['station_location_hrdlog_username'] = "HRDLog.net 用户名";
+$lang['station_location_hrdlog_username_hint'] = "您在 HRDlog.net 注册时使用的用户名（通常是您的呼号）。";
 $lang['station_location_hrdlog_code'] = "HRDLog.net API Key";
-$lang['station_location_hrdlog_realtime_upload'] = "HRDLog.net Logbook Realtime Upload";
-$lang['station_location_hrdlog_code_hint'] = "Create your API Code on <a href='http://www.hrdlog.net/EditUser.aspx' target='_blank'>HRDLog.net Userprofile page";
-$lang['station_location_qo100_hint'] = "Create your API key on <a href='https://qo100dx.club' target='_blank'>your QO-100 Dx Club's profile page";
-$lang['station_location_qo100_realtime_upload'] = "QO-100 Dx Club Realtime Upload";
-$lang['station_location_oqrs_enabled'] = "OQRS Enabled";
-$lang['station_location_oqrs_email_alert'] = "OQRS Email alert";
-$lang['station_location_oqrs_email_hint'] = "Make sure email is set up under admin and global options.";
-$lang['station_location_oqrs_text'] = "OQRS Text";
-$lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing.";
-$lang['station_location_clublog_realtime_upload']='ClubLog Realtime Upload';
+$lang['station_location_hrdlog_realtime_upload'] = "HRDLog.net 日志簿实时上传";
+$lang['station_location_hrdlog_code_hint'] = "在 <a href='http://www.hrdlog.net/EditUser.aspx' target='_blank'>hrdlog.net的用户资料页面创建你的API key。";
+$lang['station_location_qo100_hint'] = "在 <a href='https://qo100dx.club' target='_blank'>qo100dx.club的用户资料页面创建你的API key";
+$lang['station_location_qo100_realtime_upload'] = "QO-100 DX Club 实时上传";
+$lang['station_location_oqrs_enabled'] = "OQRS 启用";
+$lang['station_location_oqrs_email_alert'] = "OQRS 邮件提醒";
+$lang['station_location_oqrs_email_hint'] = "请确保已经和在管理-全局选项下设置了电子邮件。";
+$lang['station_location_oqrs_text'] = "OQRS 提示文本";
+$lang['station_location_oqrs_text_hint'] = "您想要的添加一些有关 QSL'ing 的信息。";
+$lang['station_location_clublog_realtime_upload']='ClubLog 日志实时上传';


--- a/application/language/czech/options_lang.php
+++ b/application/language/czech/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/dutch/options_lang.php
+++ b/application/language/dutch/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/english/options_lang.php
+++ b/application/language/english/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/finnish/options_lang.php
+++ b/application/language/finnish/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/french/options_lang.php
+++ b/application/language/french/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/greek/options_lang.php
+++ b/application/language/greek/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/italian/options_lang.php
+++ b/application/language/italian/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/polish/options_lang.php
+++ b/application/language/polish/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/russian/account_lang.php
+++ b/application/language/russian/account_lang.php
@ -77,10 +77,10 @@ $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'] = 'Clublog';
 $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_the_email_or_callsign_you_use_to_login_to_club_log'] = 'Емэйл или позывной, которые вы используете для логина в Clublog';

 $lang['account_eqsl'] = 'eQSL';
 $lang['account_eqslcc_username'] = 'Логин';
@ -117,13 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer';
 $lang['account_winkeyer_hint'] = "Поддержка Winkeyer в Cloudlog в стадии эксперимента, прочитайте сначала вики (<a href='https://github.com/magicbug/Cloudlog/wiki/Winkey' target='_blank'>https://github.com/magicbug/Cloudlog/wiki/Winkey</a>) перед включением.";
 $lang['account_winkeyer_enabled'] = "Функционал Winkeyer включен";

-$lang['account_map_params'] = "Map Settings";
-$lang['account_map_qso_by_default'] = "QSO (by default)";
-$lang['account_map_qso_confirm'] = "QSO (confirmed)";
-$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")";
+$lang['account_map_params'] = "Настройки карты";
+$lang['account_map_qso_by_default'] = "QSO (по умолчанию)";
+$lang['account_map_qso_confirm'] = "QSO (подтверждённые)";
+$lang['account_map_qso_confirm_same_qso'] = "(Если 'Нет', отображаются как ".$lang['account_map_qso_by_default'].")";

-$lang['account_general_information'] = "General Information";
-$lang['account_qso_logging_options'] = "QSO Logging Options";
-$lang['account_third_party_services'] = "Third Party Services";
-$lang['account_default_values'] = "Default Values";
-$lang['account_miscellaneous'] = "Miscellaneous";
+$lang['account_general_information'] = "Основные данные";
+$lang['account_qso_logging_options'] = "Настройки записи QSO";
+$lang['account_third_party_services'] = "Сторонние сервисы";
+$lang['account_default_values'] = "Значения по умолчанию";
+$lang['account_miscellaneous'] = "Разное";
--- a/application/language/russian/adif_lang.php
+++ b/application/language/russian/adif_lang.php
@ -26,7 +26,7 @@ $lang['adif_alert_log_files_type'] = "Лог-файлы должны иметь
 // $lang['general_word_warning']            --> application/language/english/general_words_lang.php "PHP Upload Warning"
 // $lang['gen_max_file_upload_size']        --> application/language/english/general_words_lang.php "PHP Upload Warning"

-$lang['adif_select_stationlocation'] = "Выберите расположение станции";
+$lang['adif_select_stationlocation'] = "Выберите местоположение станции";
 // $lang['gen_hamradio_callsign']           --> application/language/english/general_words_lang.php

 // The File Input is translated by the Browser
@ -46,7 +46,7 @@ $lang['adif_dxcc_from_adif_hint'] = "Если не отмечено, Cloudlog б
 $lang['adif_always_use_login_call_as_op'] = "Всегда использовать позывной (логин) как имя оператора при импорте";

 $lang['adif_ignore_station_call'] = "Игнорировать позывной станции при импорте";
-$lang['adif_ignore_station_call_hint'] = "Если отмечено, Cloudlog попытается импортировать <b>все</b> QSO из ADIF, независимо от соответствия из выбранному расположению станции.";
+$lang['adif_ignore_station_call_hint'] = "Если отмечено, Cloudlog попытается импортировать <b>все</b> QSO из ADIF, независимо от соответствия из выбранному местоположению станции.";

 $lang['adif_upload'] = "Загрузить";

--- a/application/language/russian/admin_lang.php
+++ b/application/language/russian/admin_lang.php
@ -5,32 +5,32 @@ 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_line4'] = "With the password reset button, you can send a user an email containing a link to reset their password. To achieve this, ensure that the email settings in the global options are configured correctly.";
+$lang['admin_user_line4'] = "При помощи кнопки сброса пароля вы можете отправить пользователю емэйл с ссылкой для сброса пароля. Для правильной работы необходима корректная конфигурация емэйл в общих настройках.";

 $lang['admin_user_list'] = 'Список пользователей';

 $lang['admin_user'] = 'Пользователь';
 $lang['admin_email'] = 'Емэйл';
 $lang['admin_type'] = 'Роль';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_login'] = "Последний логин";
 $lang['admin_options'] = 'Опции';

 $lang['admin_create_user'] = 'Создать пользователя';
 $lang['admin_delete'] = 'Удалить';
-$lang['admin_remove'] = "Remove";
+$lang['admin_remove'] = "Убрать";
 $lang['admin_edit'] = 'Редактировать';
-$lang['admin_create'] = 'Create';
-$lang['admin_update'] = 'Update';
-$lang['admin_copy'] = 'Copy';
-$lang['admin_save'] = 'Save';
-$lang['admin_close'] = 'Close';
+$lang['admin_create'] = 'Создать';
+$lang['admin_update'] = 'Обновить';
+$lang['admin_copy'] = 'Скопировать';
+$lang['admin_save'] = 'Сохранить';
+$lang['admin_close'] = 'Закрыть';
 $lang['admin_user_accounts'] = 'Аккаунты пользователей';
 $lang['admin_danger'] = 'ОПАСНО!';
 $lang['admin_experimental'] = "Экспериментально";
-$lang['admin_password_reset'] = "Password Reset";
+$lang['admin_password_reset'] = "Сброс пароля";

-$lang['admin_email_settings_incorrect'] = "Email settings are incorrect.";
-$lang['admin_password_reset_processed'] = "Password Reset E-Mail sent.";
+$lang['admin_email_settings_incorrect'] = "Настройки емэйл некорректны.";
+$lang['admin_password_reset_processed'] = "Емэйл для сброса пароля отправлен.";


 // Contest Menu
--- a/application/language/russian/contesting_lang.php
+++ b/application/language/russian/contesting_lang.php
@ -9,10 +9,10 @@ $lang['contesting_operator_callsign'] = 'Позывной оператора';
 $lang['contesting_exchange_type'] = 'Тип обмена';
 $lang['contesting_exchange_type_serial'] = 'Номер';
 $lang['contesting_exchange_type_none'] = 'нет';
-$lang['contesting_exchange_type_exchange'] = 'Обмен';
+$lang['contesting_exchange_type_exchange'] = 'Контроль';
 $lang['contesting_exchange_type_gridsquare'] = 'Квадрат';
 $lang['contesting_exchange_type_other'] = 'Другой';
-$lang['contesting_exchange_type_serial_exchange'] = 'Номер + Обмен';
+$lang['contesting_exchange_type_serial_exchange'] = 'Номер + контроль';
 $lang['contesting_exchange_type_serial_gridsquare'] = 'Номер + Квадрат';
 $lang['contesting_exchange_serial_s'] = 'Номер (TX)';
 $lang['contesting_exchange_serial_r'] = 'Номер (RX)';
@ -27,6 +27,6 @@ $lang['contesting_btn_save_qso'] = 'Сохранить QSO';
 $lang['contesting_title_callsign_suggestions'] = 'Предложение позывных';
 $lang['contesting_title_contest_logbook'] = 'Журнал контеста';

-$lang['contesting_copy_exch_to_dok'] = 'Копировать принятый обмен в поле DOK базы данных!';
+$lang['contesting_copy_exch_to_dok'] = 'Копировать принятую контроль в поле DOK базы данных!';


--- a/application/language/russian/general_words_lang.php
+++ b/application/language/russian/general_words_lang.php
@ -2,7 +2,7 @@

 defined('BASEPATH') OR exit('No direct script access allowed');

-$lang['error_no_active_station_profile'] = 'Внимание: вам нужно назначить активный профиль месторасположения станции.';
+$lang['error_no_active_station_profile'] = 'Внимание: вам нужно назначить активное местоположение станции.';

 $lang['notice_turn_the_radio_on'] = 'За сегодня ни одного QSO, время вернуться к радио!';

@ -23,9 +23,9 @@ $lang['general_word_export'] = "Экспорт";
 $lang['general_word_import'] = "Импорт";
 $lang['general_word_count'] = "Счётчик";
 $lang['general_word_filtering_on'] = "Отфильтровано по";
-$lang['general_word_not_display'] = "Not display";
-$lang['general_word_icon'] = "Icon";
-$lang['general_word_never'] = "Never";
+$lang['general_word_not_display'] = "Не отображать";
+$lang['general_word_icon'] = "Иконка";
+$lang['general_word_never'] = "Никогда";

 $lang['general_word_date'] = 'Дата';
 $lang['general_word_startdate'] = "Дата начала";
@ -43,13 +43,13 @@ $lang['general_word_satellite'] = 'Спутник';
 $lang['general_word_satellite_short'] = 'Спутн.';
 $lang['general_word_notes'] = 'Заметки';
 $lang['general_word_country'] = 'Страна';
-$lang['general_word_city'] = 'City';
+$lang['general_word_city'] = 'Город';

 $lang['general_word_total'] = 'Всего';
 $lang['general_word_year'] = 'Год';
 $lang['general_word_month'] = 'Месяц';
-$lang['general_word_day'] = "Day";
-$lang['general_word_days'] = "Days";
+$lang['general_word_day'] = "День";
+$lang['general_word_days'] = "Дней";

 $lang['general_word_colors'] = "Цвета";
 $lang['general_word_light'] = "Свет/лазер";
@ -57,7 +57,7 @@ $lang['general_word_worked'] = 'Сработано';
 $lang['general_word_worked_not_confirmed'] = "Сработано, не подтверждено";
 $lang['general_word_not_worked'] = "Не сработано";
 $lang['general_word_confirmed'] = 'Подтверждено';
-$lang['general_word_confirmation'] = "Пожтверждение";
+$lang['general_word_confirmation'] = "Подтверждение";
 $lang['general_word_needed'] = 'Необходимо';

 $lang['general_word_all'] = 'Все';
@ -86,7 +86,7 @@ $lang['general_word_lotw'] = 'Logbook of the World';
 $lang['general_word_lotw_short'] = 'LoTW';

 $lang['general_word_qso_data'] = 'Данные QSO';
-$lang['general_word_details'] = 'Подробно';
+$lang['general_word_details'] = 'детально';

 $lang['general_edit_qso'] = 'Редактировать QSO';
 $lang['general_mark_qsl_rx_bureau'] = 'Отметить QSL полученной (через бюро)';
@ -111,12 +111,12 @@ $lang['general_total_distance'] = 'Суммарная дистанция';
 $lang['gen_max_file_upload_size'] = 'Максимальный размер загружаемого файла ';

 // Cloudlog Terms
-$lang['cloudlog_station_profile'] = 'Месторасположение станции';
+$lang['cloudlog_station_profile'] = 'Местоположение станции';

 $lang['gen_hamradio_cq'] = "CQ";
 // ham radio terms
 $lang['gen_hamradio_qso'] = 'QSO';
-$lang['gen_hamradio_station'] = 'Станция';
+$lang['gen_hamradio_station'] = 'Местоположение';

 $lang['gen_hamradio_call'] = 'Позывной';
 $lang['gen_hamradio_prefix'] = "Префикс";
--- a/application/language/russian/menu_lang.php
+++ b/application/language/russian/menu_lang.php
@ -62,15 +62,15 @@ $lang['menu_update_country_files'] = 'Обновить файлы стран';
 $lang['menu_debug_information'] = 'Отладочная информация';

 $lang['menu_search_text'] = 'Поиск позывного';
-$lang['menu_search_text_quicklog'] = "Add/Search Callsign";
+$lang['menu_search_text_quicklog'] = "Добавить/Найти позывной";

 $lang['menu_search_button'] = 'Поиск';
-$lang['menu_search_button_qicksearch_log'] = "Log";
+$lang['menu_search_button_qicksearch_log'] = "Журнал";
 $lang['menu_login_button'] = 'Вход';

 $lang['menu_account'] = 'Аккаунт';
-$lang['menu_station_logbooks'] = 'Аппаратные журналы';
-$lang['menu_station_locations'] = 'Расположения станции';
+$lang['menu_station_logbooks'] = 'Журналы';
+$lang['menu_station_locations'] = 'Местоположения станции';
 $lang['menu_bands'] = 'Диапазоны';
 $lang['menu_adif_import_export'] = 'Импорт / экспорт ADIF';
 $lang['menu_kml_export'] = 'Экспорт KML';
--- a/application/language/russian/options_lang.php
+++ b/application/language/russian/options_lang.php
@ -75,30 +75,30 @@ $lang['options_dxcluster_maxage_changed_to']='Максимальный возр
 $lang['options_dxcluster_decont_changed_to']='континент изменён на ';
 $lang['options_dxcluster_decont_hint']='Бубт показаны споты только от споттеров с указанного континента';

-$lang['options_version_dialog'] = "Version Info";
-$lang['options_version_dialog_close'] = "Close";
-$lang['options_version_dialog_dismiss'] = "Don't show again";
-$lang['options_version_dialog_settings'] = "Version Info Settings";
-$lang['options_version_dialog_header'] = "Version Info Header";
-$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
-$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
-$lang['options_version_dialog_mode'] = "Version Info Mode";
-$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
-$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
-$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
-$lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
-$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
-$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
-$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
-$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
-$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
-$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
-$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
-$lang['options_version_dialog_show_all'] = "Show for all Users";
-$lang['options_version_dialog_hide_all'] = "Hide for all Users";
-$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
-$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
+$lang['options_version_dialog'] = "Информация о версии";
+$lang['options_version_dialog_close'] = "Закрыть";
+$lang['options_version_dialog_dismiss'] = "Не показывать сновва";
+$lang['options_version_dialog_settings'] = "Настройики отображения информации о версии";
+$lang['options_version_dialog_header'] = "Заголовок диалога отображения информации о версии";
+$lang['options_version_dialog_header_hint'] = "Вы можете изменить заголовок диалога отображения информации о версии.";
+$lang['options_version_dialog_header_changed_to'] = "Заголовок диалога отображения информации о версии изменён на";
+$lang['options_version_dialog_mode'] = "Режим отображения информации о версии";
+$lang['options_version_dialog_mode_release_notes'] = "Только информация о релизе";
+$lang['options_version_dialog_mode_custom_text'] = "Только настраиваемый текст";
+$lang['options_version_dialog_mode_both'] = "Информация о релизе и настраиваемый текст";
+$lang['options_version_dialog_mode_disabled'] = "Отключено";
+$lang['options_version_dialog_mode_hint'] = "Информация о версии показывается каждому пользователю. Пользователь имеет возможность отключить диалог после прочтения. Выберите что вы хотите показывать: только информацию о релизе (полученную с Github), только настраиваемый текст или оба варианта.";
+$lang['options_version_dialog_custom_text'] = "Настраиваемый текст об информации о версии";
+$lang['options_version_dialog_custom_text_hint'] = "Это настраиваемый текст, который будет отображаться в диалоге.";
+$lang['options_version_dialog_mode_changed_to'] = "Режим отображения информации о версии изменён на";
+$lang['options_version_dialog_custom_text_saved'] = "Настраиваемый текст сохранён!";
+$lang['options_version_dialog_success_show_all'] = "Информация о версии будет показана всем пользователям снова";
+$lang['options_version_dialog_success_hide_all'] = "Информация о версии не будет показана никому";
+$lang['options_version_dialog_show_hide'] = "Показать/скрыть отображение диалога информации о версии для всех пользователей";
+$lang['options_version_dialog_show_all'] = "Показать всем пользователям";
+$lang['options_version_dialog_hide_all'] = "Скрыть от всех пользователей";
+$lang['options_version_dialog_show_all_hint'] = "Это покажет диалог информации о версии всем пользователям автоматически при обновлении ими страницы.";
+$lang['options_version_dialog_hide_all_hint'] = "Это отключит автоматическое отображение диалога информации о версии для всех пользователей.";

 $lang['options_save'] = 'Сохранить';

--- a/application/language/russian/qslcard_lang.php
+++ b/application/language/russian/qslcard_lang.php
@ -23,17 +23,17 @@ $lang['qslcard_upload_back'] = 'Загруженное изображение о

 $lang['qslcard_upload_button'] = 'Загрузить изображение для QSL карточки';

-$lang['qslcard_qslprint_header'] = "Export Requested QSLs for Printing";
-$lang['qslcard_qslprint_text_line1'] = "Here you can export requested QSLs as CSV or ADIF files for printing and, optionally, mark them as sent.";
-$lang['qslcard_qslprint_text_line2'] = "Requested QSLs are any QSOs with a value of 'Requested' or 'Queued' in their 'QSL Sent' field.";
-$lang['qslcard_qslprint_send_method'] = "Send Method";
-$lang['qslcard_qslprint_mark_as_sent'] = "Mark as sent";
-$lang['qslcard_qslprint_mark_selected_as_printed'] = "Mark selected QSOs as printed";
-$lang['qslcard_qslprint_remove_selected_from_queue'] = "Remove selected QSOs from the queue";
-$lang['qslcard_qslprint_export_csv'] = "Export requested QSLs to CSV-file";
-$lang['qslcard_qslprint_export_adif'] = "Export requested QSLs to ADIF-file";
-$lang['qslcard_qslprint_mark_requested_as_sent'] = "Mark requested QSLs as sent";
-$lang['qslcard_qslprint_no_qsls_found'] = "No QSLs to print were found!";
-$lang['qslcard_qslprint_add_to_queue'] = "Add to print queue";
-$lang['qslcard_qslprint_no_additional_qso_found'] = "No additional QSO's were found. That means they are probably already in the queue.";
+$lang['qslcard_qslprint_header'] = "Экспортировать запрошенные QSL для печати";
+$lang['qslcard_qslprint_text_line1'] = "Здесь вы можете экспортировать запрошенные QSL в файлы формата CSV или ADIF для печати и, при желании, отметить их, как отправленные.";
+$lang['qslcard_qslprint_text_line2'] = "Запрошенные QSL это QSOs c значениями 'Запрошено' или 'В очереди' в поле 'QSL отправлено'";
+$lang['qslcard_qslprint_send_method'] = "Метод отправки";
+$lang['qslcard_qslprint_mark_as_sent'] = "Отметить как отправленное";
+$lang['qslcard_qslprint_mark_selected_as_printed'] = "Отметить выбранные QSO как отпечатанные";
+$lang['qslcard_qslprint_remove_selected_from_queue'] = "Убрать выбранные QSO из очереди";
+$lang['qslcard_qslprint_export_csv'] = "Экспортировать запрошенные QSL в файл CSV";
+$lang['qslcard_qslprint_export_adif'] = "Экспортировать запрошенные QSL в файл ADIF";
+$lang['qslcard_qslprint_mark_requested_as_sent'] = "Отметить запрошенные QSL как отправденные";
+$lang['qslcard_qslprint_no_qsls_found'] = "QSL для печати не найдены!";
+$lang['qslcard_qslprint_add_to_queue'] = "Добавить в очередь печати";
+$lang['qslcard_qslprint_no_additional_qso_found'] = "Дополнительных QSO не найдено, возможно они уже в очереди печати.";

--- a/application/language/russian/qso_lang.php
+++ b/application/language/russian/qso_lang.php
@ -6,12 +6,12 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 $lang['qso_title_qso_map'] = 'Карта QSO';
 $lang['qso_title_suggestions'] = 'Предложения';
 $lang['qso_title_previous_contacts'] = 'Предыдущие контакты';
-$lang['qso_title_times_worked_before'] = "times worked before";
-$lang['qso_title_image'] = 'Profile Picture';
-$lang['qso_previous_max_shown'] = "Max. 5 previous contacts are shown";
+$lang['qso_title_times_worked_before'] = "раз сработано раньше";
+$lang['qso_title_image'] = 'Изображение профиля';
+$lang['qso_previous_max_shown'] = "Отображается до 5 предыдущих QSO";

 // Quicklog on Dashboard
-$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign';
+$lang['qso_quicklog_enter_callsign'] = 'Для быстрой записи в журнал введите позывной';

 // Input Help Text on the /QSO Display
 $lang['qso_transmit_power_helptext'] = 'Укажите мощность в Ваттах (только цифры).';
@ -28,10 +28,10 @@ $lang['qso_dok_helptext'] = 'Например: Q03';
 $lang['qso_notes_helptext'] = 'Содержание заметки используется только Cloudlog и не экспортируется на другие сервисы.';
 $lang['qsl_notes_helptext'] = 'СОдержимое этой заметки экспортируется в QSL сервисы, к примеру, eqsl.cc и т.п.';

-$lang['qso_eqsl_qslmsg_helptext'] = "Get the default message for eQSL, for this station.";
+$lang['qso_eqsl_qslmsg_helptext'] = "Сообщение в eQSL по умолчанию для этой станции.";

 // error text //
-$lang['qso_error_timeoff_less_timeon'] = "TimeOff is less than TimeOn";
+$lang['qso_error_timeoff_less_timeon'] = "Время окончания раньше, чем время начала";

 // Button Text on /qso Display

@ -42,7 +42,7 @@ $lang['qso_delete_warning'] = "Предупреждение! Вы уверены

 // QSO Details

-$lang['qso_details'] = 'Детали QSO';
+$lang['qso_details'] = 'Основная информация';

 $lang['fav_add'] = 'Добавить диапазон/вид модуляции в избранное';
 $lang['qso_operator_callsign'] = 'Позывной оператора';
@ -61,8 +61,8 @@ $lang['qso_simplefle_qso_list_total'] = "Всего";
 $lang['qso_simplefle_qso_date'] = "Дата QSO";
 $lang['qso_simplefle_operator'] = "Оператор";
 $lang['qso_simplefle_operator_hint'] = "к примеру, OK2CQR";
-$lang['qso_simplefle_station_call_location'] = "Позывной/расположение станции";
-$lang['qso_simplefle_station_call_location_hint'] = "Если вы работаете из нового расположения станции, сначала создайте его здесь: <a href=". site_url('station') . ">Расположение станции</a>";
+$lang['qso_simplefle_station_call_location'] = "Позывной/Местоположение станции";
+$lang['qso_simplefle_station_call_location_hint'] = "Если вы работаете из нового местоположения станции, сначала создайте его здесь: <a href=". site_url('station') . ">Местоположение станции</a>";
 $lang['qso_simplefle_utc_time'] = "Текущее время UTC";
 $lang['qso_simplefle_enter_the_data'] = "Введите данные";
 $lang['qso_simplefle_syntax_help_close_w_sample'] = "Закройте и загрузите образец данных";
--- a/application/language/russian/station_lang.php
+++ b/application/language/russian/station_lang.php
@ -8,22 +8,22 @@ Station Logbooks
 ___________________________________________________________________________________________
 */

-$lang['station_logbooks'] = "Журналы станции";
-$lang['station_logbooks_description_header'] = "Что такое журнал станции";
-$lang['station_logbooks_description_text'] = "Журналы станции позволяют вам группировать расположения станции, это позволяет вам видеть все расположения станции в одном журнале для аналитики. Удобно если вы работает из нескольких расположений, но все они -- часть одного и того же DXCC или VUCC Circle.";
-$lang['station_logbooks_create'] = "Создать журнал станции";
+$lang['station_logbooks'] = "Журналы";
+$lang['station_logbooks_description_header'] = "Что такое журнал";
+$lang['station_logbooks_description_text'] = "Журналы позволяют вам группировать местоположения станции, это позволяет вам видеть все местоположения станции в одном журнале для аналитики. Удобно если вы работает из нескольких местоположений, но все они -- часть одного и того же DXCC или VUCC Circle.";
+$lang['station_logbooks_create'] = "Создать журнал";
 $lang['station_logbooks_status'] = "Статус";
 $lang['station_logbooks_link'] = "Ссылка";
 $lang['station_logbooks_public_search'] = "Публичный поиск";
 $lang['station_logbooks_set_active'] = "Установить как активный журнал";
 $lang['station_logbooks_active_logbook'] = "Активный журнал";
 $lang['station_logbooks_edit_logbook'] = "Редактировать журнал";    // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]'
-$lang['station_logbooks_confirm_delete'] = "Вы уверены, что хотите удалить следующий журнал? Вы должны связать все привязанные к нему расположения станций к другим журналам.: ";
+$lang['station_logbooks_confirm_delete'] = "Вы уверены, что хотите удалить следующий журнал? Вы должны связать все привязанные к нему местоположения станций к другим журналам.: ";
 $lang['station_logbooks_view_public'] = "Просмотр публичной страницы журнала: ";
 $lang['station_logbooks_create_name'] = "Имя журнала";
-$lang['station_logbooks_create_name_hint'] = "Вы можете назвать журнал станции как угодно.";
-$lang['station_logbooks_edit_name_hint'] = "Короткое название для журнала станции, например: Home Log (IO87IP)";
-$lang['station_logbooks_edit_name_update'] = "Обновить имя журнала станции";
+$lang['station_logbooks_create_name_hint'] = "Вы можете назвать журнал как угодно.";
+$lang['station_logbooks_edit_name_hint'] = "Короткое название для журнала, например: Home Log (IO87IP)";
+$lang['station_logbooks_edit_name_update'] = "Обновить имя журнала";
 $lang['station_logbooks_public_slug'] = "Публичная метка";
 $lang['station_logbooks_public_slug_hint'] = "Установка публичной метки позволит вам поделиться вашим журналом, используя веб-ссылку, это имя должно содержать только буквы и цифры.";
 $lang['station_logbooks_public_slug_format1'] = "Ссылка будет выглядеть так:";
@ -32,11 +32,11 @@ $lang['station_logbooks_public_slug_input'] = "Введите публичную
 $lang['station_logbooks_public_slug_visit'] = "Посетите публичную страницу";
 $lang['station_logbooks_public_search_hint'] = "Включение функции публичного поиска открывает поле ввода для поиска на странице публичного журнала, доступ к которой осуществляется по публичной метке. Поиск производится только в данном журнале.";
 $lang['station_logbooks_public_search_enabled'] = "Публичный поиск включен";
-$lang['station_logbooks_select_avail_loc'] = "Выберите доступное расположение станции";
-$lang['station_logbooks_link_loc'] = "Привяжите расположение";
-$lang['station_logbooks_linked_loc'] = "Привязанные расположения";
-$lang['station_logbooks_no_linked_loc'] = "Нет привязанных расположений";
-$lang['station_logbooks_unlink_station_location'] = "Unlink Station Location";
+$lang['station_logbooks_select_avail_loc'] = "Выберите доступное местоположение станции";
+$lang['station_logbooks_link_loc'] = "Привяжите местоположение станции";
+$lang['station_logbooks_linked_loc'] = "Привязанные местоположения станции";
+$lang['station_logbooks_no_linked_loc'] = "Нет привязанных местоположений станции";
+$lang['station_logbooks_unlink_station_location'] = "Отвязать местоположение станции";



@ -46,32 +46,32 @@ Station Locations
 ___________________________________________________________________________________________
 */

-$lang['station_location'] = 'Расположение станции';
-$lang['station_location_plural'] = "Расположения станции";
-$lang['station_location_header_ln1'] = 'Расположения станции определяют места работы, например, ваш QTH, QTH друзей или портативная станция.';
-$lang['station_location_header_ln2'] = 'Также, как и журнал, профиль станции хранит в одном месте набор QSO.';
-$lang['station_location_header_ln3'] = 'Только одна станция может быть активно в каждый момент. В таблице ниже она отмечена меткой -Активная станция-.';
-$lang['station_location_create_header'] = 'Создать расположение станции';
-$lang['station_location_create'] = 'Создать расположение станции';
-$lang['station_location_edit'] = 'Редактировать расположение станции: ';
+$lang['station_location'] = 'Местоположение станции';
+$lang['station_location_plural'] = "Местоположения станции";
+$lang['station_location_header_ln1'] = 'Местоположения станции определяют места работы, например, ваш QTH, QTH друзей или портативная станция.';
+$lang['station_location_header_ln2'] = 'Местоположение станции хранит в одном месте набор QSO, журнал хранит набор местоположений станции.';
+$lang['station_location_header_ln3'] = 'Только одно местоположение станция может быть активно в каждый момент. В таблице ниже она отмечена меткой "Активное".';
+$lang['station_location_create_header'] = 'Создать местоположение станции';
+$lang['station_location_create'] = 'Создать местоположение станции';
+$lang['station_location_edit'] = 'Редактировать местоположение станции: ';
 $lang['station_location_updated_suff'] = ' Обновлено.';
-$lang['station_location_warning'] = 'Внимание. Вам нужно установить активное расположение станции. Перейдите в меню Позывной->Расположение станции, чтобы выбрать.';
+$lang['station_location_warning'] = 'Внимание. Вам нужно установить активное местоположение станции. Перейдите в меню Позывной->Местоположение станции, чтобы выбрать.';
 $lang['station_location_reassign_at'] = 'Пожалуйста, переназначьте их в ';
-$lang['station_location_warning_reassign'] = 'Из-за недавних изменений в Cloudlog вам нужно переназначить QSO вашим профилям станции.';
+$lang['station_location_warning_reassign'] = 'Из-за недавних изменений в Cloudlog вам нужно переназначить QSO вашим сестоположениям станции.';
 $lang['station_location_name'] = 'Название профиля';
-$lang['station_location_name_hint'] = 'Короткое название профиля расположения станции, к примеру: Home (IO87IP)';
+$lang['station_location_name_hint'] = 'Короткое название местоположения станции, к примеру: Home (IO87IP)';
 $lang['station_location_callsign'] = 'Позывной станции';
 $lang['station_location_callsign_hint'] = 'Позывной станции, например: 2M0SQL/P';
 $lang['station_location_power'] = 'Мощность станции (Вт)';
 $lang['station_location_power_hint'] = 'Мощность станции по умолчанию в Вт. Перезаписывается данными из CAT.';
 $lang['station_location_emptylog'] = 'Очистить лог';
-$lang['station_location_confirm_active'] = 'Вы уверены, что хотите сделать эту станцию активой: ';
-$lang['station_location_set_active'] = 'Установить активной';
-$lang['station_location_active'] = 'Активная станция';
+$lang['station_location_confirm_active'] = 'Вы уверены, что хотите сделать это местоположение станции активным: ';
+$lang['station_location_set_active'] = 'Установить активным';
+$lang['station_location_active'] = 'Активное';
 $lang['station_location_claim_ownership'] = 'Заявить собственность';
-$lang['station_location_confirm_del_qso'] = 'Вы уверены, что хотите удалить все QSO из этого профиля станции?';
-$lang['station_location_confirm_del_stationlocation'] = 'Вы уверены, что хотите удалить профиль станции  ';
-$lang['station_location_confirm_del_stationlocation_qso'] = ', это удалит все QSO, содержащиеся в этом профиле станции?';
+$lang['station_location_confirm_del_qso'] = 'Вы уверены, что хотите удалить все QSO из этого местоположения станции?';
+$lang['station_location_confirm_del_stationlocation'] = 'Вы уверены, что хотите удалить местоположение станции  ';
+$lang['station_location_confirm_del_stationlocation_qso'] = ', это удалит все QSO, содержащиеся в этом местоположении станции?';
 $lang['station_location_dxcc'] = 'DXCC';
 $lang['station_location_dxcc_hint'] = 'DXCC станции, к примеру: Scotland';
 $lang['station_location_dxcc_warning'] = "Остановитесь на мгновение. Выбранный вами DXCC устарел и больше не действителен. Проверьте, какой DXCC для данного конкретного места является правильным. Если вы уверены, проигнорируйте это предупреждение.";
@ -93,23 +93,23 @@ $lang['station_location_signature'] = "Подпись";
 $lang['station_location_signature_name'] = "Имя подписи";
 $lang['station_location_signature_name_hint'] = "Подпись станции (т.е. GMA)..";
 $lang['station_location_signature_info'] = "Информация о подписи";
-$lang['station_location_signature_info_hint'] = "Информация о подписис станции (т.е. DA/NW-357).";
+$lang['station_location_signature_info_hint'] = "Информация о подписи станции (т.е. DA/NW-357).";
 $lang['station_location_eqsl_hint'] = 'Название профиля, который сконфигурирован в eQSL для данного QTH';
-$lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG";
-$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location.";
+$lang['station_location_eqsl_defaultqslmsg'] = "Сообшение в eQSL по умолчанию";
+$lang['station_location_eqsl_defaultqslmsg_hint'] = "Задайте сообщение по умолчанию, которое будет отправлено в eQSL для данного местоположения станции.";
 $lang['station_location_qrz_subscription'] = 'Требуется подписка';
 $lang['station_location_qrz_hint'] = "Ваш ключ API находится на  <a href='https://logbook.qrz.com/logbook' target='_blank'>странице настроек журнала QRZ.com";
 $lang['station_location_qrz_realtime_upload'] = 'Загрузка в журнал QRZ.com в реальном времени';
-$lang['station_location_hrdlog_username'] = "HRDLog.net Username";
-$lang['station_location_hrdlog_username_hint'] = "The username you are registered with at HRDlog.net (usually your callsign).";
-$lang['station_location_hrdlog_code'] = "HRDLog.net API Key";
+$lang['station_location_hrdlog_username'] = "Имя пользователя HRDLog.net";
+$lang['station_location_hrdlog_username_hint'] = "Имя пользователя, под которым вы зарегистрированы на HRDlog.net (обычно это -- ваш позывной).";
+$lang['station_location_hrdlog_code'] = "Ключ API HRDLog.net";
 $lang['station_location_hrdlog_realtime_upload'] = "Загрузка в журнал HRDLog.net в реальном времени";
 $lang['station_location_hrdlog_code_hint'] = "Создайте свой код к API наn <a href='http://www.hrdlog.net/EditUser.aspx' target='_blank'>странице профиля пользователя HRDLog.net";
 $lang['station_location_qo100_hint'] = "Создайте свой ключ API на <a href='https://qo100dx.club' target='_blank'>странице вашего профиля в QO-100 Dx Club";
 $lang['station_location_qo100_realtime_upload'] = "Загрузка QO-100 Dx Club в реальном времени";
 $lang['station_location_oqrs_enabled'] = "OQRS включен";
-$lang['station_location_oqrs_email_alert'] = "Оповещение о OQRS о емэйл";
+$lang['station_location_oqrs_email_alert'] = "Оповещение о OQRS по емэйл";
 $lang['station_location_oqrs_email_hint'] = "Убедитесь, что емэйл сконфигурирован администратором в общих настройках.";
 $lang['station_location_oqrs_text'] = "Текст OQRS";
 $lang['station_location_oqrs_text_hint'] = "Информация, которую вы хотите добавить, касающаяся QSL.";
-$lang['station_location_clublog_realtime_upload']='ClubLog Realtime Upload';
+$lang['station_location_clublog_realtime_upload']="Загрузка в ClubLog в реальном времени";
--- a/application/language/russian/statistics_lang.php
+++ b/application/language/russian/statistics_lang.php
@ -48,13 +48,13 @@ $lang['statistics_timeline'] = "Лента времени";
 *
 */

-$lang['statistics_days_with_qso'] = "Number of days with QSOs each year";
-$lang['statistics_days_with_qso_short'] = "Days with QSOs";
-$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log";
-$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!";
-$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)";
-$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log";
-$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)";
-$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!";
-$lang['statistics_dwq_no_current_streak'] = "No current streak found!";
+$lang['statistics_days_with_qso'] = "Количество дней с QSO в каждом году";
+$lang['statistics_days_with_qso_short'] = "Дней с QSO";
+$lang['statistics_dwq_longest_streak_in_log'] = "Самый длинный интервал дней с QSO в журнале";
+$lang['statistics_dwq_longest_streak_in_log_hint'] = "Отображаются 10 самых длинных интервалов!";
+$lang['statistics_dwq_streak_continuous_days'] = "Интервал (непрерывных дней с QSO)";
+$lang['statistics_dwq_current_streak_in_log'] = "Текущий интервал дней с QSO в журнале";
+$lang['statistics_dwq_current_streak_continuous_days'] = "Текущий интервал (непрерывных дней с QSO)";
+$lang['statistics_dwq_make_qso_to_extend_streak'] = "Если вы проведёте QSO сегодня, вы можете удлинить текущий интерывл дней с QSO... иначе текущий интервал будет прерван!";
+$lang['statistics_dwq_no_current_streak'] = "Текущий интервал не найден!";

--- a/application/language/swedish/options_lang.php
+++ b/application/language/swedish/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/language/turkish/options_lang.php
+++ b/application/language/turkish/options_lang.php
@ -87,7 +87,7 @@ $lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
 $lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
 $lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
 $lang['options_version_dialog_mode_disabled'] = "Disabled";
-$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
+$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after they read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
 $lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
 $lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
 $lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
--- a/application/libraries/EqslImporter.php
+++ b/application/libraries/EqslImporter.php
@ -8,6 +8,7 @@ class EqslImporter
 	private $callsign;
 	private $qth_nickname;
 	private $adif_file;
+	private $station_id;

 	// CodeIgniter super-ojbect
 	private $CI;
@ -26,24 +27,26 @@ class EqslImporter
 		$this->adif_file = $adif_file;
 	}

-	public function from_callsign_and_QTH($callsign, $qth, $upload_path) {
+	public function from_callsign_and_QTH($callsign, $qth, $upload_path, $station_id) {
 		$this->init(
 			$qth . " - " . $callsign,
-			self::safe_filepath($callsign, $qth, $upload_path)
+			self::safe_filepath($callsign, $qth, $upload_path, $station_id)
 		);

 		$this->callsign = $callsign;
 		$this->qth_nickname = $qth;
+		$this->station_id = $station_id;
 	}

-	public function from_file($adif_file,$station_callsign) {
+	public function from_file($adif_file, $station_callsign, $station_id) {
 		$this->init('ADIF upload', $adif_file);
-		$this->callsign=$station_callsign;
+		$this->callsign = $station_callsign;
+		$this->station_id = $station_id;
 	}

 	// generate a sanitized file name from a callsign and a QTH nickname
-	private static function safe_filepath($callsign, $qth, $upload_path) {
-		$eqsl_id = $callsign . '-' . $qth;
+	private static function safe_filepath($callsign, $qth, $upload_path, $station_id) {
+		$eqsl_id = sprintf('%s-%s_%03d', $callsign, $qth, $station_id);

 		// Replace anything which isn't a word, whitespace, number or any of the following caracters -_~,;[](). with a '.'
 		$eqsl_id = mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '.', $eqsl_id);
@ -53,7 +56,7 @@ class EqslImporter
 	}

 	// Download confirmed QSO from eQSL inbox and import them
-	public function fetch($password, $eqsl_force_from_date="") {
+	public function fetch($password, $eqsl_force_from_date = false) {
 		if (empty($password) || empty($this->callsign)) {
 			return $this->result('Missing username and/or password');
 		}
@ -137,7 +140,8 @@ class EqslImporter
 		$query = $this->CI->db->query('SELECT eqsl_rcvd_mark FROM config');
 		$q = $query->row();
 		$config['eqsl_rcvd_mark'] = $q->eqsl_rcvd_mark;
-		$station_callsign=$this->callsign;
+		$station_callsign = $this->callsign;
+		$station_id = $this->station_id;

 		$this->CI->adif_parser->load_from_file($this->adif_file);
 		$this->CI->adif_parser->initialize();
@ -156,14 +160,14 @@ class EqslImporter
 				$record['qsl_sent'] = $config['eqsl_rcvd_mark'];
 			}

-			$status = $this->CI->logbook_model->import_check($time_on, $record['call'], $record['band'], $record['mode'],$station_callsign);
+			$status = $this->CI->logbook_model->import_check($time_on, $record['call'], $record['band'], $record['mode'], $station_callsign, $station_id);
 			$qsoid = 0;
 			if ($status[0] == "Found") {
 				$qsoid = $status[1];
-				$dupe = $this->CI->eqslmethods_model->eqsl_dupe_check($time_on, $record['call'], $record['band'], $record['mode'],$config['eqsl_rcvd_mark'],$station_callsign);
+				$dupe = $this->CI->eqslmethods_model->eqsl_dupe_check($time_on, $record['call'], $record['band'], $record['mode'], $config['eqsl_rcvd_mark'], $station_callsign, $station_id);
 				if ($dupe == false) {
 					$updated += 1;
-					$eqsl_status = $this->CI->eqslmethods_model->eqsl_update($time_on, $record['call'], $record['band'], $record['mode'], $config['eqsl_rcvd_mark'],$station_callsign);
+					$eqsl_status = $this->CI->eqslmethods_model->eqsl_update($time_on, $record['call'], $record['band'], $record['mode'], $config['eqsl_rcvd_mark'], $station_callsign, $station_id);
 				} else {
 					$dupes += 1;
 					$eqsl_status = "Already received an eQSL for this QSO.";
--- a/application/migrations/171_tag_2_6_4
+++ b/application/migrations/171_tag_2_6_4
@ -0,0 +1,30 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+*   Tag Cloudlog as 2.6.4
+*/
+
+class Migration_tag_2_6_4 extends CI_Migration {
+
+    public function up()
+    {
+    
+        // Tag Cloudlog 2.6.3
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.6.4'));
+
+        // Trigger Version Info Dialog
+        $this->db->where('option_type', 'version_dialog');
+        $this->db->where('option_name', 'confirmed');
+        $this->db->update('user_options', array('option_value' => 'false'));
+
+    }
+
+    public function down()
+    {
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.6.3'));
+    }
+}
--- a/application/models/Cq.php
+++ b/application/models/Cq.php
@ -2,21 +2,6 @@

 class CQ extends CI_Model{

-    function get_zones(){
-        $CI =& get_instance();
-        $CI->load->model('Stations');
-        $station_id = $CI->Stations->find_active();
-
-        $data = $this->db->query(
-            "select COL_CQZ, count(COL_CQZ)
-            from ".$this->config->item('table_name')."
-            where COL_CQZ is not null and station_id = ".$station_id."
-            group by COL_CQZ order by COL_CQZ"
-        );
-
-        return $data->result();
-    }
-
    function get_cq_array($bands, $postdata, $location_list) {
        $cqZ = array(); // Used for keeping track of which states that are not worked

@ -95,7 +80,7 @@ class CQ extends CI_Model{
     */
    function getCQWorked($location_list, $band, $postdata) {
        $sql = "SELECT distinct col_cqz FROM " . $this->config->item('table_name') . " thcv
-        where station_id in (" . $location_list . ") and col_cqz <> ''";
+        where station_id in (" . $location_list . ") and col_cqz <= 40 and col_cqz <> ''";

 		if ($postdata['mode'] != 'All') {
 			$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
@ -128,7 +113,7 @@ class CQ extends CI_Model{
     */
    function getCQConfirmed($location_list, $band, $postdata) {
        $sql = "SELECT distinct col_cqz FROM " . $this->config->item('table_name') . " thcv
-            where station_id in (" . $location_list . ") and col_cqz <> ''";
+            where station_id in (" . $location_list . ") and col_cqz <= 40 and col_cqz <> ''";

 		if ($postdata['mode'] != 'All') {
 			$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
@ -199,7 +184,7 @@ class CQ extends CI_Model{
    function getSummaryByBand($band, $postdata, $location_list) {
        $sql = "SELECT count(distinct thcv.col_cqz) as count FROM " . $this->config->item('table_name') . " thcv";

-        $sql .= " where station_id in (" . $location_list . ') and col_cqz > 0';
+        $sql .= " where station_id in (" . $location_list . ') and col_cqz <= 40 and col_cqz > 0';

        if ($band == 'SAT') {
            $sql .= " and thcv.col_prop_mode ='" . $band . "'";
@ -207,9 +192,9 @@ class CQ extends CI_Model{
            $this->load->model('bands');

 			$bandslots = $this->bands->get_worked_bands('cq');
-	
+
 			$bandslots_list = "'".implode("','",$bandslots)."'";
-			
+
 			$sql .= " and thcv.col_band in (" . $bandslots_list . ")" .
 					" and thcv.col_prop_mode !='SAT'";
        } else {
@ -229,7 +214,7 @@ class CQ extends CI_Model{
    function getSummaryByBandConfirmed($band, $postdata, $location_list){
        $sql = "SELECT count(distinct thcv.col_cqz) as count FROM " . $this->config->item('table_name') . " thcv";

-        $sql .= " where station_id in (" . $location_list . ') and col_cqz > 0';
+        $sql .= " where station_id in (" . $location_list . ') and col_cqz <= 40 and col_cqz > 0';

        if ($band == 'SAT') {
            $sql .= " and thcv.col_prop_mode ='" . $band . "'";
@ -237,9 +222,9 @@ class CQ extends CI_Model{
            $this->load->model('bands');

 			$bandslots = $this->bands->get_worked_bands('cq');
-	
+
 			$bandslots_list = "'".implode("','",$bandslots)."'";
-			
+
 			$sql .= " and thcv.col_band in (" . $bandslots_list . ")" .
 					" and thcv.col_prop_mode !='SAT'";
        } else {
--- a/application/models/Eqslmethods_model.php
+++ b/application/models/Eqslmethods_model.php
@ -122,7 +122,7 @@ class Eqslmethods_model extends CI_Model {
 		$this->db->where('eqslqthnickname IS NOT NULL');
 		$this->db->where('eqslqthnickname !=', '');
 		$this->db->from('station_profile');
-		$this->db->select('station_callsign, eqslqthnickname');
+		$this->db->select('station_callsign, eqslqthnickname, station_id');
 		$this->db->distinct(TRUE);

 		return $this->db->get();
@ -156,9 +156,10 @@ class Eqslmethods_model extends CI_Model {
    }

    // Update a QSO with eQSL QSL info
-    // We could also probably use this use this: https://eqsl.cc/qslcard/VerifyQSO.txt
+    // We could also probably use this:
+    // https://eqsl.cc/qslcard/VerifyQSO.txt
    // https://www.eqsl.cc/qslcard/ImportADIF.txt
-    function eqsl_update($datetime, $callsign, $band, $mode, $qsl_status,$station_callsign) {
+    function eqsl_update($datetime, $callsign, $band, $mode, $qsl_status, $station_callsign, $station_id) {
        $data = array(
            'COL_EQSL_QSLRDATE' => date('Y-m-d H:i:s'), // eQSL doesn't give us a date, so let's use current
            'COL_EQSL_QSL_RCVD' => $qsl_status
@ -170,6 +171,7 @@ class Eqslmethods_model extends CI_Model {
 	$this->db->where('COL_STATION_CALLSIGN', $station_callsign);
        $this->db->where('COL_BAND', $band);
        $this->db->where('COL_MODE', $mode);
+        $this->db->where('station_id', $station_id);

        $this->db->update($this->config->item('table_name'), $data);

@ -177,7 +179,7 @@ class Eqslmethods_model extends CI_Model {
    }

    // Determine if we've already received an eQSL for this QSO
-    function eqsl_dupe_check($datetime, $callsign, $band, $mode, $qsl_status,$station_callsign) {
+    function eqsl_dupe_check($datetime, $callsign, $band, $mode, $qsl_status, $station_callsign, $station_id) {
        $this->db->select('COL_EQSL_QSLRDATE');
        $this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )');
        $this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 15 MINUTE )');
@ -186,6 +188,7 @@ class Eqslmethods_model extends CI_Model {
        $this->db->where('COL_MODE', $mode);
 	$this->db->where('COL_STATION_CALLSIGN', $station_callsign);
        $this->db->where('COL_EQSL_QSL_RCVD', $qsl_status);
+        $this->db->where('station_id', $station_id);
        $this->db->limit(1);
    
        $query = $this->db->get($this->config->item('table_name'));
--- a/application/models/Gridmap_model.php
+++ b/application/models/Gridmap_model.php
@ -177,7 +177,10 @@ class Gridmap_model extends CI_Model {
 		    $sql .= " or col_qrzcom_qso_download_status = 'Y'";
 	    }
 	    if ($sql != '') {
-		    $sql='and (1=0 '.$sql.')';
+		    $sql=' and (1=0 '.$sql.')';
+	    }
+	    if ($sql == '') {
+		    $sql=' and 1=0';
 	    }
 	    return $sql;
    }
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
--- a/application/views/components/hamsat/table.php
+++ b/application/views/components/hamsat/table.php
@ -21,7 +21,7 @@
            </tr>
        </thead>
        <tbody>
-            <?php foreach ($rovedata as $rove) : ?>
+            <?php foreach ($rovedata['data'] as $rove) : ?>
                <tr>
                    <td>
                        <?php
@ -37,18 +37,18 @@

                        ?>

-                        <?php $timestamp = strtotime($rove['date']);
+                        <?php $timestamp = strtotime($rove['aos_at']);
                           echo date($custom_date_format, $timestamp); ?>

                    </td>
                    <td>
-                        <?php echo $rove['start_time']." - ".$rove['end_time']; ?>
+                        <?php echo date("H:i:s", $timestamp)." - ".date("H:i:s", strtotime($rove['los_at'])); ?>
                    </td>
                    <td>
                        <?php
                        $CI = &get_instance();
-			$CI->load->model('logbooks_model');
-			$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+                        $CI->load->model('logbooks_model');
+                        $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
                        $CI->load->model('logbook_model');
                        $call_worked = $CI->logbook_model->check_if_callsign_worked_in_logbook($rove['callsign'], $logbooks_locations_array, "SAT");
                        if ($call_worked != 0) {
@ -60,48 +60,54 @@
                    </td>
                    <td>
                        <?php
-                        echo xss_clean($rove['comment']);
+                        echo xss_clean($rove['comment'] ?? '-');
                        ?>
                    </td>
-                    <td><span data-bs-toggle="tooltip" title="<?php echo $rove['frequency']; ?> - <?php echo $rove['mode']; ?>"><?= $rove['satellite'] ?></span></td>
+                    <?php
+                       $direction = '';
+                       if ($rove['mhz_direction'] == 'up') {
+                          $direction = '&uarr;';
+                       } else if ($rove['mhz_direction'] == 'down') {
+                          $direction = '&darr;';
+                       }
+                       $modeclass = '';
+                       if ($rove['mode'] == 'SSB' || $rove['mode'] == 'CW') {
+                          $modeclass = 'hamsatBgLin';
+                       } else if ($rove['mode'] == 'Data') {
+                          $modeclass = 'hamsatBgData';
+                       } else if ($rove['mode'] == 'FM') {
+                          $modeclass = 'hamsatBgFm';
+                       }
+
+                    ?>
+                    <td><span data-bs-toggle="tooltip" title="<?php if ($rove['mhz'] != '') { printf("%.3f", $rove['mhz']); echo " ".$direction ?? ''; } ?>"><?= $rove['satellite']['name'] ?></span> <span title="<?php echo $rove['mode']; ?>" class="badge <?php echo $modeclass; ?>"><?php echo $rove['mode']; ?></span></td>
                    <td>


                        <?php
-
                        // Load the logbook model and call check_if_grid_worked_in_logbook
-                        if (strpos($rove['gridsquare'], '/') !== false) {
-                           $grids = explode('/', $rove['gridsquare']);
-                           foreach ($grids as $grid) {
-                           $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($grid, null, "SAT");
-                              if ($worked != 0) {
-                                  echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">" . $grid . "</span>";
-                              } else {
-                                  echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">" . $grid . "</span>";
-                              }
-                           }
-                        } else {
-                           $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($rove['gridsquare'], null, "SAT");
+                        foreach ($rove['grids'] as $grid) {
+                        $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($grid, null, "SAT");
                           if ($worked != 0) {
-                               echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">" . $rove['gridsquare'] . "</span>";
+                               echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">" . $grid . "</span>";
                           } else {
-                               echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">" . $rove['gridsquare'] . "</span>";
+                               echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">" . $grid . "</span>";
                           }
                        }
                        ?>


                    </td>
-                    <td><a href="<?php echo $rove['track_link']; ?>" target="_blank">Track</a></td>
+                    <td><a href="<?php echo $rove['url']; ?>" target="_blank">Track</a></td>
                    <?php
-                        $sat = $rove['satellite'];
-                        switch (strtoupper($rove['satellite'])) {
+                        $sat = $rove['satellite']['name'];
+                        switch (strtoupper($rove['satellite']['name'])) {
                        case "GREENCUBE":
                           $sat = 'IO-117';
                           break;
                        }
                    ?>
-                    <td><a href="https://sat.fg8oj.com/sked.php?s%5B%5D=<?php echo $sat; ?>&l=<?php echo strtoupper($gridsquare); ?>&el1=0&l2=<?php echo $rove['gridsquare']; ?>&el2=0&duration=1&start=0&OK=Search" target="_blank">Sked</a></td>
+                    <td><a href="https://sat.fg8oj.com/sked.php?s%5B%5D=<?php echo $sat; ?>&l=<?php echo strtoupper($gridsquare); ?>&el1=0&l2=<?php echo $rove['grids'][0]; ?>&el2=0&duration=1&start=0&OK=Search" target="_blank">Sked</a></td>
                </tr>
            <?php endforeach; ?>
        </tbody>
--- a/application/views/eqsl/import.php
+++ b/application/views/eqsl/import.php
@ -31,20 +31,18 @@
 			  </label>
 			  <br>
 			  <p>Upload the Exported ADIF file from eQSL from the <a href="https://eqsl.cc/qslcard/DownloadInBox.cfm" target="_blank">Download Inbox</a> page, to mark QSOs as confirmed on eQSL.</p>
-					<p><span class="label important">Important</span> Log files must have the file type .adi</p>
-					<input type="file" name="userfile" size="20" />
-			  <br/><br/>
 			<p>Choose Station(location) eQSL File belongs to:</p>
                    <select name="station_profile" class="form-select mb-2 me-sm-2" style="width: 20%;">
                    <option value="0">Select Station Location</option>
-                    <?php foreach ($station_profile->result() as $station) { ?>
+                    <?php foreach ($station_profile->result() as $station) {
+                            if($station->eqslqthnickname) { ?>
                    <option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) { echo " selected =\"selected\""; } ?>>Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name.") eQSL: ".$station->eqslqthnickname; ?></option>
-                    <?php } ?>
+                    <?php } } ?>
                    </select>
+                    <p><span class="label important">Important</span>Log files must have the file type .adi</p>
+                    <input type="file" name="userfile" size="20" />
 			</div>
-
-			<br><br>
-			
+			<hr class="divider">
 			<div class="form-check">
 			  <input class="form-check-input" type="radio" name="eqslimport" id="fetch" value="fetch"  checked="checked"/>
 			  <label class="form-check-label" for="exampleRadios1">Import directly from eQSL</label>
@ -58,8 +56,7 @@
 		         	<div class="mb-3 col-sm-5" style="vertical-align:middle;"><label class="form-label"><?php echo "(Select a date, only if you want to force an import with an older date)"; //$this->lang->line(''); ?></label></div>
 				</div>
 			</div>
-
-			<br>
+			<hr class="divider">
 			<div class="mb-3"><input class="btn btn-primary" type="submit" value="Import eQSL QSO Matches" /></div>
 		</form>
  </div>
--- a/application/views/sattimers/index.php
+++ b/application/views/sattimers/index.php
@ -32,10 +32,10 @@ var custom_date_format = "<?php echo $custom_date_format ?>";
                <th>Time(d)-Out</th>
                <th>AOS</th>
                <th>LOS</th>
-                <th>AOS Azimuth</th>
-                <th>LOS Azimuth</th>
-                <th>Max Elevation</th>
-                <th>Duration</th>
+                <th style="text-align: center !important">AOS Azimuth</th>
+                <th style="text-align: center !important">LOS Azimuth</th>
+                <th style="text-align: center !important">Max Elevation</th>
+                <th style="text-align: center !important">Duration</th>
                <th></th>
            </tr>
        </thead>
@ -49,10 +49,10 @@ var custom_date_format = "<?php echo $custom_date_format ?>";
                <td><span id="tevel<?php echo $i; ?>Timeout">...</span></td>
                <td><span id="tevel<?php echo $i; ?>AosTime"><?php echo date('H:i:s', $activation['aos_time']); ?></span></td>
                <td><span id="tevel<?php echo $i; ?>LosTime"><?php echo date('H:i:s', $activation['los_time']); ?></span></td>
-                <td><span id="tevel<?php echo $i; ?>Aos"><?php echo $activation['aos']; ?>°</span></td>
-                <td><span id="tevel<?php echo $i; ?>Los"><?php echo $activation['los']; ?>°</span></td>
-                <td><span id="tevel<?php echo $i; ?>MaxEl"><?php echo $activation['max_elev']; ?>°</span></td>
-                <td><span id="tevel<?php echo $i; ?>Duration"><?php echo $activation['duration_min']; ?> min</span></td>
+                <td align="right"><span id="tevel<?php echo $i; ?>Aos"><?php echo $activation['aos']; ?>°</span><span style="margin-left: 10px; display: inline-block; transform: rotate(<?php echo (-45+$activation['aos']); ?>deg);"><i class="fas fa-location-arrow fa-xs"></i></span></td>
+                <td align="right"><span id="tevel<?php echo $i; ?>Los"><?php echo $activation['los']; ?>°</span><span style="margin-left: 10px; display: inline-block; transform: rotate(<?php echo (-45+$activation['los']); ?>deg);"><i class="fas fa-location-arrow fa-xs"></i></span></td>
+                <td align="right"><span id="tevel<?php echo $i; ?>MaxEl"><?php echo $activation['max_elev']; ?>°</span><span style="margin-left: 10px; display: inline-block; transform: rotate(-<?php echo ($activation['max_elev']); ?>deg);"><i class="fas fa-arrow-right fa-xs"></i></span></td>
+                <td align="right"><span id="tevel<?php echo $i; ?>Duration"><?php echo $activation['duration_min']; ?> min</span></td>
                <td>
                <?php
                   if (strpos($activation['sat'], 'TEVEL') !== false) {
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@ -499,6 +499,20 @@
                    </tr>
                    <?php } ?>

+                    <?php if($row->COL_MY_IOTA) { ?>
+                    <tr>
+                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_iota_reference'); ?></td>
+                        <td><?php echo $row->COL_MY_IOTA; ?></td>
+                    </tr>
+                    <?php } ?>
+
+                    <?php if($row->COL_MY_SOTA_REF) { ?>
+                    <tr>
+                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_sota_reference'); ?></td>
+                        <td><?php echo $row->COL_MY_SOTA_REF; ?></td>
+                    </tr>
+                    <?php } ?>
+
                    <?php if($row->COL_MY_WWFF_REF) { ?>
                    <tr>
                        <td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_wwff_reference'); ?></td>
--- a/application/views/visitor/index.php
+++ b/application/views/visitor/index.php
@ -48,6 +48,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 </div>

 <!-- Map -->
+<!-- qrz.com blocks JavaScript when embedding Cloudlog. Map display doesn't work without JS. -->
+<noscript><style> #map { display: none } </style></noscript>
 <div id="map" class="map-leaflet" style="width: 100%; height: 350px"></div>

 <div id="container" style="padding-top: 0px; margin-top: 5px;" class="container dashboard">
--- a/assets/css/default/overrides.css
+++ b/assets/css/default/overrides.css
@ -60,4 +60,4 @@ thead > tr > td {

 .dxccsummaryheader:after {
 	background-image: linear-gradient(to right, black 0, black 12ch, black 12ch, black 100%);
-}
+}
--- a/assets/css/general.css
+++ b/assets/css/general.css
@ -767,4 +767,19 @@ label {

 .dxccsummaryheaderopened:after {
 	content: "\2796"; /* Unicode character for "minus" sign (-) */
-}
+}
+
+.hamsatBgLin {
+	background-color: rgb(224 242 254) !important;
+	--bs-badge-color: rgb(2 132 199) !important;
+}
+
+.hamsatBgData {
+	background-color: rgb(250 232 255) !important;
+	--bs-badge-color: rgb(192 38 211) !important;
+}
+
+.hamsatBgFm {
+	background-color: rgb(254 243 199) !important;
+	--bs-badge-color: rgb(217 119 6) !important;
+}
--- a/src/QSLManager/QSO.php
+++ b/src/QSLManager/QSO.php
@ -194,7 +194,7 @@ class QSO
 		$this->lotw = $this->getLotwString($data, $custom_date_format);
 		$this->eqsl = $this->getEqslString($data, $custom_date_format);

-		$this->cqzone = ($data['COL_CQZ'] === null) ? '' : '<a href="javascript:spawnLookupModal('.$data['COL_CQZ'].',\'cq\');">'.$data['COL_CQZ'].'</a>';
+		$this->cqzone = ($data['COL_CQZ'] === null) ? '' : $this->geCqLink($data['COL_CQZ']);
 		$this->state = ($data['COL_STATE'] === null) ? '' :$data['COL_STATE'];
 		$this->dxcc = (($data['name'] ?? null) === null) ? '- NONE -' : '<a href="javascript:spawnLookupModal('.$data['COL_DXCC'].',\'dxcc\');">'.ucwords(strtolower($data['name']), "- (/").'</a>';
 		$this->iota = ($data['COL_IOTA'] === null) ? '' : $this->getIotaLink($data['COL_IOTA']);
@ -209,6 +209,18 @@ class QSO
 		$this->operator = ($data['COL_OPERATOR'] === null) ? '' :$data['COL_OPERATOR'];
 	}

+	/**
+	 * @return string
+	 */
+	function geCqLink($cqz): string
+	{
+		$cqz_link = '';
+		if ($cqz <= '40') {
+			return '<a href="javascript:spawnLookupModal('.$cqz.',\'cq\');">'.$cqz.'</a>';
+		}
+		return $cqz;
+	}
+
 	/**
 	 * @return string
 	 */
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@ -1059,7 +1059,7 @@ class CI_Email {
 	 *
 	 * Provides the raw message for use in plain-text headers of
 	 * HTML-formatted emails.
-	 * If the user hasn't specified his own alternative message
+	 * If the user hasn't specified their own alternative message
 	 * it creates one by stripping the HTML
 	 *
 	 * @return	string