From 5a99814e5a7fafe044f76fa4ca8a70702dac66f9 Mon Sep 17 00:00:00 2001 From: Emiliano Macedonio Date: Fri, 10 May 2024 17:12:26 +0200 Subject: [PATCH 01/23] Minor Correction --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a69640438..89394e873 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ sync.sh *.swp .env /node_modules +/.vs From c6716ab57af95d3f2ca8058701028b4d0663c0f6 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 14 May 2024 15:25:10 +0100 Subject: [PATCH 02/23] [WAB] Added ability to store WAB reference in Station Locations Added ability to store WAB reference in Station Locations and also its exported in ADIF with the custom tag of "APP_CLOUDLOG_MY_WAB" --- application/config/migration.php | 2 +- application/libraries/AdifHelper.php | 2 +- .../migrations/183_add_wab_to_location.php | 29 + application/models/Stations.php | 2 + application/views/interface_assets/footer.php | 85 ++- application/views/station_profile/create.php | 698 +++++++++--------- application/views/station_profile/edit.php | 13 + 7 files changed, 451 insertions(+), 380 deletions(-) create mode 100644 application/migrations/183_add_wab_to_location.php diff --git a/application/config/migration.php b/application/config/migration.php index 1d9283c0a..a4c1cf7f4 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ | */ -$config['migration_version'] = 182; +$config['migration_version'] = 183; /* |-------------------------------------------------------------------------- diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php index 22a9d02c3..3c63280da 100644 --- a/application/libraries/AdifHelper.php +++ b/application/libraries/AdifHelper.php @@ -209,7 +209,7 @@ public function getAdifLine($qso, $satellite_remap = false) { $line .= $this->getAdifFieldLine("MY_POTA_REF", $qso->station_pota); $line .= $this->getAdifFieldLine("MY_CQ_ZONE", $qso->station_cq); - + $line .= $this->getAdifFieldLine("APP_CLOUDLOG_MY_WAB", $qso->station_wab); $line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu); if($qso->state) { diff --git a/application/migrations/183_add_wab_to_location.php b/application/migrations/183_add_wab_to_location.php new file mode 100644 index 000000000..5bb574201 --- /dev/null +++ b/application/migrations/183_add_wab_to_location.php @@ -0,0 +1,29 @@ +db->field_exists('station_wab', 'station_profile')) { + // Add WAB Ref to station profile + $fields = array( + 'station_wab varchar(10) DEFAULT NULL', + ); + $this->dbforge->add_column('station_profile', $fields); + } + } + + public function down() + { + if ($this->db->field_exists('station_wab', 'station_profile')) { + $this->dbforge->drop_column('station_profile', 'station_wab'); + } + } +} diff --git a/application/models/Stations.php b/application/models/Stations.php index 4c78ec377..7cc0c85db 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -91,6 +91,7 @@ function add() { 'station_sota' => xss_clean(strtoupper($this->input->post('sota', true))), 'station_wwff' => xss_clean(strtoupper($this->input->post('wwff', true))), 'station_pota' => xss_clean(strtoupper($this->input->post('pota', true))), + 'station_wab' => xss_clean(strtoupper($this->input->post('wab', true))), 'station_sig' => xss_clean(strtoupper($this->input->post('sig', true))), 'station_sig_info' => xss_clean(strtoupper($this->input->post('sig_info', true))), 'station_callsign' => xss_clean($this->input->post('station_callsign', true)), @@ -141,6 +142,7 @@ function edit() { 'station_sota' => xss_clean($this->input->post('sota', true)), 'station_wwff' => xss_clean($this->input->post('wwff', true)), 'station_pota' => xss_clean($this->input->post('pota', true)), + 'station_wab' => xss_clean($this->input->post('wab', true)), 'station_sig' => xss_clean($this->input->post('sig', true)), 'station_sig_info' => xss_clean($this->input->post('sig_info', true)), 'station_callsign' => xss_clean($this->input->post('station_callsign', true)), diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index b07eb718c..a0b693ba4 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1602,43 +1602,45 @@ function update_stats() { // Load the external GeoJSON file $.when(wab_squares).done(function() { - var layer = L.tileLayer('optionslib->get_option('option_map_tile_server'); ?>', { - maxZoom: 18, - attribution: 'optionslib->get_option('option_map_tile_server_copyright'); ?>', - id: 'mapbox.streets' - }); + var layer = L.tileLayer('optionslib->get_option('option_map_tile_server'); ?>', { + maxZoom: 18, + attribution: 'optionslib->get_option('option_map_tile_server_copyright'); ?>', + id: 'mapbox.streets' + }); - var map = L.map('map', { - layers: [layer], - center: [54.970901, -2.457140], - zoom: 8, - minZoom: 8, - fullscreenControl: true, - fullscreenControlOptions: { - position: 'topleft' - }, - }); + var map = L.map('map', { + layers: [layer], + center: [54.970901, -2.457140], + zoom: 8, + minZoom: 8, + fullscreenControl: true, + fullscreenControlOptions: { + position: 'topleft' + }, + }); - var printer = L.easyPrint({ - tileLayer: layer, - sizeModes: ['Current'], - filename: 'myMap', - exportOnly: true, - hideControlContainer: true - }).addTo(map); + var printer = L.easyPrint({ + tileLayer: layer, + sizeModes: ['Current'], + filename: 'myMap', + exportOnly: true, + hideControlContainer: true + }).addTo(map); - /*Legend specific*/ - var legend = L.control({ position: "topright" }); + /*Legend specific*/ + var legend = L.control({ + position: "topright" + }); -legend.onAdd = function(map) { - var div = L.DomUtil.create("div", "legend"); - div.innerHTML += "

" + lang_general_word_colors + "

"; - div.innerHTML += " Confirmed Square
"; - div.innerHTML += " Unconfirmed Square
"; - return div; -}; + legend.onAdd = function(map) { + var div = L.DomUtil.create("div", "legend"); + div.innerHTML += "

" + lang_general_word_colors + "

"; + div.innerHTML += " Confirmed Square
"; + div.innerHTML += " Unconfirmed Square
"; + return div; + }; -legend.addTo(map); + legend.addTo(map); //console.log(wab_squares.responseJSON); // Add requested external GeoJSON to map @@ -3109,6 +3111,25 @@ function searchAdditionalQsos(filename) { - - - -
- - - -
-
- - num_rows() > 0) { ?> - - - - -
- -
- - - -
- -
-
- - - -
- -
- - - -
- -
- - - -
-
- -
-
- - - ".lang("gen_find_zone_part2")." ".lang("gen_find_zone_part3"); ?> -
- -
- - - ".lang("gen_find_zone_part2")." ".lang("gen_find_zone_part3"); ?> -
-
- -
- - -
- -
- -
-
- - - -
- -
- - - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - - -
- -
- - -
- -
-
- - - -
-
- - - -
-
- - -
-
- - - -
-
- - - -
-
- - -
-
- -
-
- - - +
+
+ +
+
+
+

+ + session->flashdata('notice')) { ?> +
+ session->flashdata('notice'); ?> +
+ + + load->helper('form'); ?> + + + +
+
+ + + +
+ +
+ + + + + + +
+ +
+ + + +
+
+ + num_rows() > 0) { ?> + + + + +
+ +
+ + + +
+ +
+
+ + + +
+ +
+ + + +
+ +
+ + + +
+
+ +
+
+ + + " . lang("gen_find_zone_part2") . " " . lang("gen_find_zone_part3"); ?> +
+ +
+ + + " . lang("gen_find_zone_part2") . " " . lang("gen_find_zone_part3"); ?> +
+
+ +
+ + +
+ +
+ +
+
+ + + +
+ +
+ + + + +
+ +
+ + +
-
- - + +
+ +
+ + + +
+ +
+ + + Enter your WAB Square, if you dont know it use WhatsMyLocator +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + + +
+ +
+ +
-
- -
- - -
-
- - + +
+
+ + + +
+
+ + +
+
+ + + +
+
+ + + +
+
+ + -
-
- - - -
+
+ +
+
+ + + +
+
+ + +
+
- +
+ + +
+
+ + + +
+
+ + + +
- -
-
+ + + + + -
+
- + \ No newline at end of file diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index b3a7ce254..fb4311adb 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -319,6 +319,19 @@ + +
+
+
Worked All Britain Reference
+
+
+ + station_wab; } ?>"> + Enter your WAB Square, if you dont know it use WhatsMyLocator +
+
+
+
From b0f4256713f5a9df09d64aa916947520c099618b Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 14 May 2024 18:09:37 +0100 Subject: [PATCH 03/23] Newfoundland is NF thanks to @ve1cwj --- application/views/station_profile/create.php | 2 +- application/views/station_profile/edit.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 13b445ff3..a9ce930b0 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -147,7 +147,7 @@ function validateInput(input) { - + diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index fb4311adb..75fba12fa 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -162,7 +162,7 @@ - + From 9a87ecfc804e100b424f4fea309f880b8ed8e7e1 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 14 May 2024 18:10:43 +0100 Subject: [PATCH 04/23] [Lotw] remap NL to NF --- application/controllers/Lotw.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index cb9b5a59b..39f52ae32 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -1004,6 +1004,9 @@ function lotw_ca_province_map($ca_prov) { case "QC": return "PQ"; break; + case "NL": + return "NF"; + break; default: return $ca_prov; endswitch; From 6673015af72ad35a103d8cc3af488d702a023de8 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 14 May 2024 21:47:55 +0100 Subject: [PATCH 05/23] Looks like ADIF uses NL and LoTW uses NF yay for mismatch --- application/views/station_profile/create.php | 2 +- application/views/station_profile/edit.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index a9ce930b0..13b445ff3 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -147,7 +147,7 @@ function validateInput(input) { - + diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 75fba12fa..fb4311adb 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -162,7 +162,7 @@ - + From 6076dd562063b5beb371e6a8bd4375817eeacfa4 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 15 May 2024 10:54:29 +0100 Subject: [PATCH 06/23] [Awards][GMDX] error in SQL --- application/models/Gmdxsummer_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Gmdxsummer_model.php b/application/models/Gmdxsummer_model.php index ad9ff67a1..70f6e6427 100644 --- a/application/models/Gmdxsummer_model.php +++ b/application/models/Gmdxsummer_model.php @@ -17,7 +17,7 @@ public function get_week($end_date, $band, $mode) SELECT COUNT(DISTINCT SUBSTRING(COL_GRIDSQUARE, 1, 4)) AS count FROM " . $table_name . " WHERE station_id in (" . $location_list . ") AND COL_MODE = '" . $mode . "' AND COL_BAND = '" . $band . "' - AND (COL_TIME_ON >= '2024-05-13 00:00:00' AND COL_TIME_ON <= '. $end_date .') + AND (COL_TIME_ON >= '2024-05-13 00:00:00' AND COL_TIME_ON <= '" . $end_date . "') "); return $query->row()->count; From dfa6750438a47f669716e225246f22e8bb9c0201 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 15 May 2024 14:35:08 +0100 Subject: [PATCH 07/23] [Awards] Add UK & Crown Dependencies Gridmaster Map --- application/language/bulgarian/menu_lang.php | 1 + application/language/chinese_simplified/menu_lang.php | 1 + application/language/czech/menu_lang.php | 1 + application/language/dutch/menu_lang.php | 1 + application/language/english/menu_lang.php | 1 + application/language/finnish/menu_lang.php | 1 + application/language/french/menu_lang.php | 1 + application/language/german/menu_lang.php | 1 + application/language/greek/menu_lang.php | 1 + application/language/italian/menu_lang.php | 1 + application/language/polish/menu_lang.php | 1 + application/language/russian/menu_lang.php | 1 + application/language/spanish/menu_lang.php | 1 + application/language/swedish/menu_lang.php | 1 + application/language/turkish/menu_lang.php | 1 + application/models/Gridmaster_model.php | 5 +++++ application/views/interface_assets/header.php | 2 ++ 17 files changed, 22 insertions(+) diff --git a/application/language/bulgarian/menu_lang.php b/application/language/bulgarian/menu_lang.php index f72b17e41..04b1f3847 100644 --- a/application/language/bulgarian/menu_lang.php +++ b/application/language/bulgarian/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 493198e8b..9bab65694 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "弗雷德·菲什纪念奖"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='维护'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/czech/menu_lang.php b/application/language/czech/menu_lang.php index c4ee11ce3..20b262e3f 100644 --- a/application/language/czech/menu_lang.php +++ b/application/language/czech/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/dutch/menu_lang.php b/application/language/dutch/menu_lang.php index aa8c0ea12..fcbd29e50 100644 --- a/application/language/dutch/menu_lang.php +++ b/application/language/dutch/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; diff --git a/application/language/english/menu_lang.php b/application/language/english/menu_lang.php index f505bc214..accb0dee3 100644 --- a/application/language/english/menu_lang.php +++ b/application/language/english/menu_lang.php @@ -96,3 +96,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_uk_gridmaster'] = 'UK & Crown Dependencies Gridmaster'; diff --git a/application/language/finnish/menu_lang.php b/application/language/finnish/menu_lang.php index c3de61fea..924c2e8e6 100644 --- a/application/language/finnish/menu_lang.php +++ b/application/language/finnish/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/french/menu_lang.php b/application/language/french/menu_lang.php index e1faae4d0..770255b86 100644 --- a/application/language/french/menu_lang.php +++ b/application/language/french/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 671761036..27a176b9f 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance'] = 'Wartung'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/greek/menu_lang.php b/application/language/greek/menu_lang.php index 330421094..f4f56874c 100644 --- a/application/language/greek/menu_lang.php +++ b/application/language/greek/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/italian/menu_lang.php b/application/language/italian/menu_lang.php index 3d7a07b72..f5435911f 100644 --- a/application/language/italian/menu_lang.php +++ b/application/language/italian/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Manutenzione'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/polish/menu_lang.php b/application/language/polish/menu_lang.php index 330421094..f4f56874c 100644 --- a/application/language/polish/menu_lang.php +++ b/application/language/polish/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/russian/menu_lang.php b/application/language/russian/menu_lang.php index 5c1ea02d3..34496af15 100644 --- a/application/language/russian/menu_lang.php +++ b/application/language/russian/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Обслуживание'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/spanish/menu_lang.php b/application/language/spanish/menu_lang.php index 476146973..72e8e038c 100644 --- a/application/language/spanish/menu_lang.php +++ b/application/language/spanish/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Diploma en memoria de Fred Fish"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Mantenimiento'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/swedish/menu_lang.php b/application/language/swedish/menu_lang.php index a7889b96a..09c6505e5 100644 --- a/application/language/swedish/menu_lang.php +++ b/application/language/swedish/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Underhåll'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/language/turkish/menu_lang.php b/application/language/turkish/menu_lang.php index 330421094..f4f56874c 100644 --- a/application/language/turkish/menu_lang.php +++ b/application/language/turkish/menu_lang.php @@ -95,3 +95,4 @@ $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_uk_gridmaster'] = 'UK Gridmaster'; \ No newline at end of file diff --git a/application/models/Gridmaster_model.php b/application/models/Gridmaster_model.php index b8f1c5522..e4773f0db 100644 --- a/application/models/Gridmaster_model.php +++ b/application/models/Gridmaster_model.php @@ -62,6 +62,11 @@ class Gridmaster_model extends CI_Model { private $lx_lon = 6; private $lx_zoom = 8; + private $uk_grids = ['IN89', 'IO77', 'IO69', 'IO79', 'JO00', 'JO01', 'JO02', 'JO03', 'IN79', 'IO90', 'IO91', 'IO92', 'IO93', 'IO94', 'IO95', 'IO97', 'IO99', 'IP90', 'IO80', 'IO81', 'IO82', 'IO83', 'IO84', 'IO85', 'IO86', 'IO86', 'IO87', 'IO88', 'IO89', 'IP80', 'IO70', 'IO71', 'IO72', 'IO73', 'IO74', 'IO75', 'IO76', 'IO78', 'IN69', 'IO64', 'IO65', 'IO66', 'IO67', 'IO68', 'IO57', 'IO54']; + private $uk_lat = 52.33; + private $uk_lon = 1.27; + private $uk_zoom = 6; + function get_lotw($dxcc) { $CI =& get_instance(); $CI->load->model('logbooks_model'); diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 7617ed9af..a09b8396d 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -158,6 +158,8 @@
    • +
    +
    • From c350ce7364b72fa05d60edd9c32268785329384c Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 15 May 2024 15:05:36 +0100 Subject: [PATCH 08/23] Forgot to add Les Minquiers south of Jersey --- application/models/Gridmaster_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Gridmaster_model.php b/application/models/Gridmaster_model.php index e4773f0db..99c7debf5 100644 --- a/application/models/Gridmaster_model.php +++ b/application/models/Gridmaster_model.php @@ -62,7 +62,7 @@ class Gridmaster_model extends CI_Model { private $lx_lon = 6; private $lx_zoom = 8; - private $uk_grids = ['IN89', 'IO77', 'IO69', 'IO79', 'JO00', 'JO01', 'JO02', 'JO03', 'IN79', 'IO90', 'IO91', 'IO92', 'IO93', 'IO94', 'IO95', 'IO97', 'IO99', 'IP90', 'IO80', 'IO81', 'IO82', 'IO83', 'IO84', 'IO85', 'IO86', 'IO86', 'IO87', 'IO88', 'IO89', 'IP80', 'IO70', 'IO71', 'IO72', 'IO73', 'IO74', 'IO75', 'IO76', 'IO78', 'IN69', 'IO64', 'IO65', 'IO66', 'IO67', 'IO68', 'IO57', 'IO54']; + private $uk_grids = ['IN88', 'IN89', 'IO77', 'IO69', 'IO79', 'JO00', 'JO01', 'JO02', 'JO03', 'IN79', 'IO90', 'IO91', 'IO92', 'IO93', 'IO94', 'IO95', 'IO97', 'IO99', 'IP90', 'IO80', 'IO81', 'IO82', 'IO83', 'IO84', 'IO85', 'IO86', 'IO86', 'IO87', 'IO88', 'IO89', 'IP80', 'IO70', 'IO71', 'IO72', 'IO73', 'IO74', 'IO75', 'IO76', 'IO78', 'IN69', 'IO64', 'IO65', 'IO66', 'IO67', 'IO68', 'IO57', 'IO54']; private $uk_lat = 52.33; private $uk_lon = 1.27; private $uk_zoom = 6; From 025b1de9fd16dd940eb4e7da62497ba8fb4c5343 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 15 May 2024 16:18:32 +0100 Subject: [PATCH 09/23] [QSO View] If WAB Ref is inc in the Station Location show it in the tab --- application/views/view_log/qso.php | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 66152f81f..cf66154f3 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -1,6 +1,5 @@ num_rows() > 0) { foreach ($query->result() as $row) { ?>
    -
    From bfca0459dbed03a5e6da2814e78ab8322ab62f4d Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 15 May 2024 22:24:39 +0100 Subject: [PATCH 10/23] [eQSL] Cleaned up code formatting --- application/controllers/Eqsl.php | 367 +++++++++++++++++-------------- 1 file changed, 198 insertions(+), 169 deletions(-) diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index 152588676..91dd36c55 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -1,46 +1,53 @@ -load->helper(array('form', 'url')); } - // Default view when loading controller. - public function index() { + // Default view when loading controller. + public function index() + { - $this->lang->load('qslcard'); + $this->lang->load('qslcard'); $this->load->helper('storage'); - $folder_name = "images/eqsl_card_images"; - $data['storage_used'] = sizeFormat(folderSize($folder_name)); + $folder_name = "images/eqsl_card_images"; + $data['storage_used'] = sizeFormat(folderSize($folder_name)); - // Render Page - $data['page_title'] = "eQSL Cards"; + // Render Page + $data['page_title'] = "eQSL Cards"; - $this->load->model('eqsl_images'); - $data['qslarray'] = $this->eqsl_images->eqsl_qso_list(); + $this->load->model('eqsl_images'); + $data['qslarray'] = $this->eqsl_images->eqsl_qso_list(); - $this->load->view('interface_assets/header', $data); - $this->load->view('eqslcard/index'); - $this->load->view('interface_assets/footer'); - } - public function import() { + $this->load->view('interface_assets/header', $data); + $this->load->view('eqslcard/index'); + $this->load->view('interface_assets/footer'); + } + public function import() + { $this->load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + if (!$this->user_model->authorize(2)) { + $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); + redirect('dashboard'); + } $this->load->model('stations'); $data['station_profile'] = $this->stations->all_of_user(); - $active_station_id = $this->stations->find_active(); - $station_profile = $this->stations->profile($active_station_id); + $active_station_id = $this->stations->find_active(); + $station_profile = $this->stations->profile($active_station_id); $data['active_station_info'] = $station_profile->row(); // Check if eQSL Nicknames have been defined $this->load->model('eqslmethods_model'); $eqsl_locations = $this->eqslmethods_model->all_of_user_with_eqsl_nick_defined(); - if($eqsl_locations->num_rows() == 0) { + if ($eqsl_locations->num_rows() == 0) { $this->session->set_flashdata('error', 'eQSL Nicknames in Station Profiles aren\'t defined!'); } @@ -53,8 +60,7 @@ public function import() { $this->load->library('upload', $config); $eqsl_results = array(); - if ($this->input->post('eqslimport') == 'fetch') - { + if ($this->input->post('eqslimport') == 'fetch') { $this->load->library('EqslImporter'); // Get credentials for eQSL @@ -63,13 +69,12 @@ public function import() { $eqsl_password = $q->user_eqsl_password; // Validate that eQSL credentials are not empty - if ($eqsl_password == '') - { + if ($eqsl_password == '') { $this->session->set_flashdata('warning', 'You have not defined your eQSL.cc credentials!'); redirect('eqsl/import'); } - $eqsl_force_from_date = (!$this->input->post('eqsl_force_from_date')=="")?$this->input->post('eqsl_force_from_date'):""; + $eqsl_force_from_date = (!$this->input->post('eqsl_force_from_date') == "") ? $this->input->post('eqsl_force_from_date') : ""; foreach ($eqsl_locations->result_array() as $eqsl_location) { $this->eqslimporter->from_callsign_and_QTH( $eqsl_location['station_callsign'], @@ -81,11 +86,10 @@ public function import() { $eqsl_results[] = $this->eqslimporter->fetch($eqsl_password, $eqsl_force_from_date); } } elseif ($this->input->post('eqslimport') == 'upload') { - $station_id4upload=$this->input->post('station_profile'); + $station_id4upload = $this->input->post('station_profile'); if ($this->stations->check_station_is_accessible($station_id4upload)) { - $station_callsign=$this->stations->profile($station_id4upload)->row()->station_callsign; - if ( ! $this->upload->do_upload()) - { + $station_callsign = $this->stations->profile($station_id4upload)->row()->station_callsign; + if (!$this->upload->do_upload()) { $data['page_title'] = "eQSL Import"; $data['error'] = $this->upload->display_errors(); @@ -98,12 +102,12 @@ public function import() { $data = array('upload_data' => $this->upload->data()); $this->load->library('EqslImporter'); - $this->eqslimporter->from_file('./uploads/'.$data['upload_data']['file_name'], $station_callsign, $station_id4upload); + $this->eqslimporter->from_file('./uploads/' . $data['upload_data']['file_name'], $station_callsign, $station_id4upload); $eqsl_results[] = $this->eqslimporter->import(); } } else { - log_message('error',$station_id4upload." is not valid for user!"); + log_message('error', $station_id4upload . " is not valid for user!"); } } else { $data['page_title'] = "eQSL Import"; @@ -123,41 +127,45 @@ public function import() { $this->load->view('interface_assets/footer'); } // end function - public function export() { + public function export() + { $this->load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + if (!$this->user_model->authorize(2)) { + $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); + redirect('dashboard'); + } // Check if eQSL Nicknames have been defined - $this->load->model('stations'); - if($this->stations->are_eqsl_nicks_defined() == 0) { - $this->session->set_flashdata('error', 'eQSL Nicknames in Station Profiles aren\'t defined!'); - } + $this->load->model('stations'); + if ($this->stations->are_eqsl_nicks_defined() == 0) { + $this->session->set_flashdata('error', 'eQSL Nicknames in Station Profiles aren\'t defined!'); + } ini_set('memory_limit', '-1'); set_time_limit(0); $this->load->model('eqslmethods_model'); - + $data['page_title'] = "eQSL QSO Upload"; $custom_date_format = $this->session->userdata('user_date_format'); - + if ($this->input->post('eqslexport') == "export") { // Get credentials for eQSL $query = $this->user_model->get_by_id($this->session->userdata('user_id')); $q = $query->row(); $data['user_eqsl_name'] = $q->user_eqsl_name; $data['user_eqsl_password'] = $q->user_eqsl_password; - + // Validate that eQSL credentials are not empty - if ($data['user_eqsl_name'] == '' || $data['user_eqsl_password'] == '') - { - $this->session->set_flashdata('warning', 'You have not defined your eQSL.cc credentials!'); redirect('eqsl/import'); + if ($data['user_eqsl_name'] == '' || $data['user_eqsl_password'] == '') { + $this->session->set_flashdata('warning', 'You have not defined your eQSL.cc credentials!'); + redirect('eqsl/import'); } $rows = ''; // Grab the list of QSOs to send information about // perform an HTTP get on each one, and grab the status back $qslsnotsent = $this->eqslmethods_model->eqsl_not_yet_sent(); - + foreach ($qslsnotsent->result_array() as $qsl) { $rows .= ""; // eQSL username changes for linked account. @@ -165,21 +173,21 @@ public function export() { // the password, however, is always the same as the main account $data['user_eqsl_name'] = $qsl['station_callsign']; $adif = $this->generateAdif($qsl, $data); - + $status = $this->uploadQso($adif, $qsl); - + $timestamp = strtotime($qsl['COL_TIME_ON']); - $rows .= "".date($custom_date_format, $timestamp).""; - $rows .= "".date('H:i', $timestamp).""; - $rows .= "".str_replace("0","Ø",$qsl['COL_CALL']).""; - $rows .= "".$qsl['COL_MODE'].""; - if(isset($qsl['COL_SUBMODE'])) { - $rows .= "".$qsl['COL_SUBMODE'].""; + $rows .= "" . date($custom_date_format, $timestamp) . ""; + $rows .= "" . date('H:i', $timestamp) . ""; + $rows .= "" . str_replace("0", "Ø", $qsl['COL_CALL']) . ""; + $rows .= "" . $qsl['COL_MODE'] . ""; + if (isset($qsl['COL_SUBMODE'])) { + $rows .= "" . $qsl['COL_SUBMODE'] . ""; } else { $rows .= ""; } - $rows .= "".$qsl['COL_BAND'].""; - $rows .= "".$status.""; + $rows .= "" . $qsl['COL_BAND'] . ""; + $rows .= "" . $status . ""; } $rows .= ""; $data['eqsl_table'] = $this->generateResultTable($custom_date_format, $rows); @@ -189,26 +197,27 @@ public function export() { $data['eqsl_table'] = $this->writeEqslNotSent($qslsnotsent->result_array(), $custom_date_format); } } - + $this->load->view('interface_assets/header', $data); $this->load->view('eqsl/export'); $this->load->view('interface_assets/footer'); } - function uploadQso($adif, $qsl) { + function uploadQso($adif, $qsl) + { $this->load->model('eqslmethods_model'); $status = ""; - + // begin script $ch = curl_init(); // basic curl options for all requests curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_HEADER, 1); - + // use the URL we built curl_setopt($ch, CURLOPT_URL, $adif); - + $result = curl_exec($ch); $chi = curl_getinfo($ch); curl_close($ch); @@ -221,21 +230,23 @@ function uploadQso($adif, $qsl) { Warning: Y=2013 M=08 D=11 F6ARS 15M JT65 Bad record: Duplicate Result: 0 out of 1 records added -> Dupe, OM! */ - + if ($chi['http_code'] == "200") { if (stristr($result, "Result: 1 out of 1 records added")) { $status = "Sent"; $this->eqslmethods_model->eqsl_mark_sent($qsl['COL_PRIMARY_KEY']); } else { if (stristr($result, "Error: No match on eQSL_User/eQSL_Pswd")) { - $this->session->set_flashdata('warning', 'Your eQSL username and/or password is incorrect.'); redirect('eqsl/export'); + $this->session->set_flashdata('warning', 'Your eQSL username and/or password is incorrect.'); + redirect('eqsl/export'); } else { if (stristr($result, "Result: 0 out of 0 records added")) { - $this->session->set_flashdata('warning', 'Something went wrong with eQSL.cc!'); redirect('eqsl/export'); + $this->session->set_flashdata('warning', 'Something went wrong with eQSL.cc!'); + redirect('eqsl/export'); } else { if (stristr($result, "Bad record: Duplicate")) { $status = "Duplicate"; - + # Mark the QSL as sent if this is a dupe. $this->eqslmethods_model->eqsl_mark_sent($qsl['COL_PRIMARY_KEY']); } @@ -244,14 +255,17 @@ function uploadQso($adif, $qsl) { } } else { if ($chi['http_code'] == "500") { - $this->session->set_flashdata('warning', 'eQSL.cc is experiencing issues. Please try exporting QSOs later.'); redirect('eqsl/export'); + $this->session->set_flashdata('warning', 'eQSL.cc is experiencing issues. Please try exporting QSOs later.'); + redirect('eqsl/export'); } else { if ($chi['http_code'] == "400") { - $this->session->set_flashdata('warning', 'There was an error in one of the QSOs. You might want to manually upload them.'); redirect('eqsl/export'); + $this->session->set_flashdata('warning', 'There was an error in one of the QSOs. You might want to manually upload them.'); + redirect('eqsl/export'); $status = "Error"; } else { if ($chi['http_code'] == "404") { - $this->session->set_flashdata('warning', 'It seems that the eQSL site has changed. Please open up an issue on GitHub.'); redirect('eqsl/export'); + $this->session->set_flashdata('warning', 'It seems that the eQSL site has changed. Please open up an issue on GitHub.'); + redirect('eqsl/export'); } } } @@ -260,18 +274,19 @@ function uploadQso($adif, $qsl) { return $status; } - function generateResultTable($custom_date_format, $rows) { + function generateResultTable($custom_date_format, $rows) + { $table = ''; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= $rows; $table .= "
    DateTimeCallModeSubmodeBandStatus
    DateTimeCallModeSubmodeBandStatus
    "; @@ -279,14 +294,15 @@ function generateResultTable($custom_date_format, $rows) { } // Build out the ADIF info string according to specs https://eqsl.cc/qslcard/ADIFContentSpecs.cfm - function generateAdif($qsl, $data) { - $COL_QSO_DATE = date('Ymd',strtotime($qsl['COL_TIME_ON'])); - $COL_TIME_ON = date('Hi',strtotime($qsl['COL_TIME_ON'])); - + function generateAdif($qsl, $data) + { + $COL_QSO_DATE = date('Ymd', strtotime($qsl['COL_TIME_ON'])); + $COL_TIME_ON = date('Hi', strtotime($qsl['COL_TIME_ON'])); + # Set up the single record file $adif = "https://www.eqsl.cc/qslcard/importADIF.cfm?"; $adif .= "ADIFData=CloudlogUpload%20"; - + /* Handy reference of escaping chars "<" = 3C ">" = 3E @@ -297,7 +313,7 @@ function generateAdif($qsl, $data) { "." = 2E "&" = 26 */ - + $adif .= "%3C"; $adif .= "ADIF%5FVER"; $adif .= "%3A"; @@ -305,7 +321,7 @@ function generateAdif($qsl, $data) { $adif .= "%3E"; $adif .= "1%2E00 "; $adif .= "%20"; - + $adif .= "%3C"; $adif .= "EQSL%5FUSER"; $adif .= "%3A"; @@ -313,7 +329,7 @@ function generateAdif($qsl, $data) { $adif .= "%3E"; $adif .= $data['user_eqsl_name']; $adif .= "%20"; - + $adif .= "%3C"; $adif .= "EQSL%5FPSWD"; $adif .= "%3A"; @@ -321,11 +337,11 @@ function generateAdif($qsl, $data) { $adif .= "%3E"; $adif .= urlencode($data['user_eqsl_password']); $adif .= "%20"; - + $adif .= "%3C"; $adif .= "EOH"; $adif .= "%3E"; - + # Lay out the required fields $adif .= "%3C"; $adif .= "QSO%5FDATE"; @@ -334,7 +350,7 @@ function generateAdif($qsl, $data) { $adif .= "%3E"; $adif .= $COL_QSO_DATE; $adif .= "%20"; - + $adif .= "%3C"; $adif .= "TIME%5FON"; $adif .= "%3A"; @@ -342,7 +358,7 @@ function generateAdif($qsl, $data) { $adif .= "%3E"; $adif .= $COL_TIME_ON; $adif .= "%20"; - + $adif .= "%3C"; $adif .= "CALL"; $adif .= "%3A"; @@ -350,7 +366,7 @@ function generateAdif($qsl, $data) { $adif .= "%3E"; $adif .= $qsl['COL_CALL']; $adif .= "%20"; - + $adif .= "%3C"; $adif .= "MODE"; $adif .= "%3A"; @@ -358,15 +374,15 @@ function generateAdif($qsl, $data) { $adif .= "%3E"; $adif .= $qsl['COL_MODE']; $adif .= "%20"; - - if(isset($qsl['COL_SUBMODE'])) { - $adif .= "%3C"; - $adif .= "SUBMODE"; - $adif .= "%3A"; - $adif .= strlen($qsl['COL_SUBMODE']); - $adif .= "%3E"; - $adif .= $qsl['COL_SUBMODE']; - $adif .= "%20"; + + if (isset($qsl['COL_SUBMODE'])) { + $adif .= "%3C"; + $adif .= "SUBMODE"; + $adif .= "%3A"; + $adif .= strlen($qsl['COL_SUBMODE']); + $adif .= "%3E"; + $adif .= $qsl['COL_SUBMODE']; + $adif .= "%20"; } $adif .= "%3C"; @@ -376,9 +392,9 @@ function generateAdif($qsl, $data) { $adif .= "%3E"; $adif .= $qsl['COL_BAND']; $adif .= "%20"; - + # End all the required fields - + // adding RST_Sent $adif .= "%3C"; $adif .= "RST%5FSENT"; @@ -389,7 +405,7 @@ function generateAdif($qsl, $data) { $adif .= "%20"; // adding prop mode if it isn't blank - if ($qsl['COL_PROP_MODE']){ + if ($qsl['COL_PROP_MODE']) { $adif .= "%3C"; $adif .= "PROP%5FMODE"; $adif .= "%3A"; @@ -400,7 +416,7 @@ function generateAdif($qsl, $data) { } // adding sat name if it isn't blank - if ($qsl['COL_SAT_NAME'] != ''){ + if ($qsl['COL_SAT_NAME'] != '') { $adif .= "%3C"; $adif .= "SAT%5FNAME"; $adif .= "%3A"; @@ -411,7 +427,7 @@ function generateAdif($qsl, $data) { } // adding sat mode if it isn't blank - if ($qsl['COL_SAT_MODE'] != ''){ + if ($qsl['COL_SAT_MODE'] != '') { $adif .= "%3C"; $adif .= "SAT%5FMODE"; $adif .= "%3A"; @@ -422,18 +438,18 @@ function generateAdif($qsl, $data) { } // adding qslmsg if it isn't blank - if ($qsl['COL_QSLMSG'] != ''){ - $qsl['COL_QSLMSG'] = str_replace(array(chr(10),chr(13)),array(' ',' '),$qsl['COL_QSLMSG']); + if ($qsl['COL_QSLMSG'] != '') { + $qsl['COL_QSLMSG'] = str_replace(array(chr(10), chr(13)), array(' ', ' '), $qsl['COL_QSLMSG']); $adif .= "%3C"; $adif .= "QSLMSG"; $adif .= "%3A"; $adif .= strlen($qsl['COL_QSLMSG']); $adif .= "%3E"; - $adif .= str_replace('&','%26',$qsl['COL_QSLMSG']); + $adif .= str_replace('&', '%26', $qsl['COL_QSLMSG']); $adif .= "%20"; } - if ($qsl['eqslqthnickname'] != ''){ + if ($qsl['eqslqthnickname'] != '') { $adif .= "%3C"; $adif .= "APP%5FEQSL%5FQTH%5FNICKNAME"; $adif .= "%3A"; @@ -444,7 +460,7 @@ function generateAdif($qsl, $data) { } // adding sat mode if it isn't blank - if ($qsl['station_gridsquare'] != ''){ + if ($qsl['station_gridsquare'] != '') { $adif .= "%3C"; $adif .= "MY%5FGRIDSQUARE"; $adif .= "%3A"; @@ -458,41 +474,41 @@ function generateAdif($qsl, $data) { $adif .= "%3C"; $adif .= "EOR"; $adif .= "%3E"; - + # Make sure we don't have any spaces $adif = str_replace(" ", '%20', $adif); return $adif; } - function writeEqslNotSent($qslsnotsent, $custom_date_format) { + function writeEqslNotSent($qslsnotsent, $custom_date_format) + { $table = ''; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - - foreach ($qslsnotsent as $qsl) - { + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + + foreach ($qslsnotsent as $qsl) { $table .= ""; - $timestamp = strtotime($qsl['COL_TIME_ON']); - $table .= ""; - $table .= ""; - $table .= ""; - $table .= ""; - - if(isset($qsl['COL_SUBMODE'])) { - $table .= ""; - } else { - $table .= ""; - } - $table .= ""; - $table .= ""; + $timestamp = strtotime($qsl['COL_TIME_ON']); + $table .= ""; + $table .= ""; + $table .= ""; + $table .= ""; + + if (isset($qsl['COL_SUBMODE'])) { + $table .= ""; + } else { + $table .= ""; + } + $table .= ""; + $table .= ""; $table .= ""; } $table .= "
    DateTimeCallModeSubmodeBandeQSL QTH Nickname
    DateTimeCallModeSubmodeBandeQSL QTH Nickname
    ".date($custom_date_format, $timestamp)."".date('H:i', $timestamp)."" . str_replace("0","Ø",strtoupper($qsl['COL_CALL'])) . "".$qsl['COL_MODE']."".$qsl['COL_SUBMODE']."".$qsl['COL_BAND']."".$qsl['eqslqthnickname']."" . date($custom_date_format, $timestamp) . "" . date('H:i', $timestamp) . "" . str_replace("0", "Ø", strtoupper($qsl['COL_CALL'])) . "" . $qsl['COL_MODE'] . "" . $qsl['COL_SUBMODE'] . "" . $qsl['COL_BAND'] . "" . $qsl['eqslqthnickname'] . "
    "; @@ -500,11 +516,12 @@ function writeEqslNotSent($qslsnotsent, $custom_date_format) { return $table; } - function image($id) { + function image($id) + { $this->load->library('electronicqsl'); $this->load->model('Eqsl_images'); - if($this->Eqsl_images->get_image($id) == "No Image") { + if ($this->Eqsl_images->get_image($id) == "No Image") { $this->load->model('logbook_model'); $this->load->model('user_model'); $qso_query = $this->logbook_model->get_qso($id); @@ -532,34 +549,33 @@ function image($id) { $dom->preserveWhiteSpace = false; $images = $dom->getElementsByTagName('img'); - if(!isset($images) || count($images) == 0) { + if (!isset($images) || count($images) == 0) { echo "Rate Limited"; exit; } - foreach ($images as $image) - { + foreach ($images as $image) { header('Content-Type: image/jpg'); - $content = file_get_contents("https://www.eqsl.cc".$image->getAttribute('src')); + $content = file_get_contents("https://www.eqsl.cc" . $image->getAttribute('src')); if ($content === false) { echo "No response"; exit; } echo $content; - $filename = uniqid().'.jpg'; - if (file_put_contents('images/eqsl_card_images/' . '/'.$filename, $content) !== false) { + $filename = uniqid() . '.jpg'; + if (file_put_contents('images/eqsl_card_images/' . '/' . $filename, $content) !== false) { $this->Eqsl_images->save_image($id, $filename); } } } else { header('Content-Type: image/jpg'); - $image_url = base_url('images/eqsl_card_images/'.$this->Eqsl_images->get_image($id)); + $image_url = base_url('images/eqsl_card_images/' . $this->Eqsl_images->get_image($id)); header('Location: ' . $image_url); } - } - function bulk_download_image($id) { + function bulk_download_image($id) + { $this->load->library('electronicqsl'); $this->load->model('Eqsl_images'); @@ -595,31 +611,33 @@ function bulk_download_image($id) { $dom->preserveWhiteSpace = false; $images = $dom->getElementsByTagName('img'); - if(!isset($images) || count($images) == 0) { + if (!isset($images) || count($images) == 0) { $error = "Rate Limited"; return $error; } - foreach ($images as $image) - { - $content = file_get_contents("https://www.eqsl.cc".$image->getAttribute('src')); + foreach ($images as $image) { + $content = file_get_contents("https://www.eqsl.cc" . $image->getAttribute('src')); if ($content === false) { $error = "No response"; return $error; } - $filename = uniqid().'.jpg'; - if (file_put_contents('images/eqsl_card_images/' . '/'.$filename, $content) !== false) { + $filename = uniqid() . '.jpg'; + if (file_put_contents('images/eqsl_card_images/' . '/' . $filename, $content) !== false) { $this->Eqsl_images->save_image($id, $filename); } } return $error; - } - public function tools() { + public function tools() + { // Check logged in $this->load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + if (!$this->user_model->authorize(2)) { + $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); + redirect('dashboard'); + } $data['page_title'] = "eQSL Tools"; @@ -629,11 +647,15 @@ public function tools() { $this->load->view('interface_assets/footer'); } - public function download() { + public function download() + { // Check logged in $this->load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - $errors=0; + if (!$this->user_model->authorize(2)) { + $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); + redirect('dashboard'); + } + $errors = 0; if ($this->input->post('eqsldownload') == 'download') { $i = 0; @@ -665,7 +687,7 @@ public function download() { } } $data['eqsl_results'] = $eqsl_results; - $data['eqsl_stats'] = "Successfully downloaded: ".$i." / Errors: ".count($eqsl_results); + $data['eqsl_stats'] = "Successfully downloaded: " . $i . " / Errors: " . count($eqsl_results); $data['page_title'] = "eQSL Download Information"; $this->load->view('interface_assets/header', $data); @@ -685,11 +707,15 @@ public function download() { } } - public function mark_all_sent() { + public function mark_all_sent() + { // Check logged in $this->load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - + if (!$this->user_model->authorize(2)) { + $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); + redirect('dashboard'); + } + // mark all eqsls as sent $this->load->model('eqslmethods_model'); $this->eqslmethods_model->mark_all_as_sent(); @@ -702,7 +728,8 @@ public function mark_all_sent() { /* * Used for CRON job */ - public function sync() { + public function sync() + { ini_set('memory_limit', '-1'); set_time_limit(0); $this->load->model('eqslmethods_model'); @@ -715,7 +742,8 @@ public function sync() { } } - public function downloadUser($userid, $username, $password) { + public function downloadUser($userid, $username, $password) + { $this->load->library('EqslImporter'); $this->load->model('eqslmethods_model'); @@ -736,17 +764,18 @@ public function downloadUser($userid, $username, $password) { } } - function uploadUser($userid, $username, $password) { + function uploadUser($userid, $username, $password) + { $data['user_eqsl_name'] = $this->security->xss_clean($username); $data['user_eqsl_password'] = $this->security->xss_clean($password); $clean_userid = $this->security->xss_clean($userid); - + $qslsnotsent = $this->eqslmethods_model->eqsl_not_yet_sent($clean_userid); foreach ($qslsnotsent->result_array() as $qsl) { $data['user_eqsl_name'] = $qsl['station_callsign']; $adif = $this->generateAdif($qsl, $data); - + $status = $this->uploadQso($adif, $qsl); } } From 16b2e65137e8f5c0a1111713bc7cf08686d5e4af Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 15 May 2024 22:36:07 +0100 Subject: [PATCH 11/23] Add extra error --- application/controllers/Lotw.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index 39f52ae32..cf892a4d6 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -315,6 +315,8 @@ public function lotw_upload() { //with the error message. if(curl_errno($ch)){ throw new Exception(curl_error($ch)); + // Upload of TQ8 Failed for unknown reason + echo $station_profile->station_callsign." (".$station_profile->station_profile_name.") Upload Failed"."
    "; } $pos = strpos($result, ""); From 24f59af0d15b34bb647e272eedbecf63a1475b9f Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 15 May 2024 22:36:37 +0100 Subject: [PATCH 12/23] Update Lotw.php --- application/controllers/Lotw.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index cf892a4d6..8b9ccfc98 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -315,6 +315,7 @@ public function lotw_upload() { //with the error message. if(curl_errno($ch)){ throw new Exception(curl_error($ch)); + // Upload of TQ8 Failed for unknown reason echo $station_profile->station_callsign." (".$station_profile->station_profile_name.") Upload Failed"."
    "; } From f5c08712b8aa4093874c0e358481da15cdaa57a3 Mon Sep 17 00:00:00 2001 From: Emiliano Macedonio Date: Thu, 16 May 2024 11:33:01 +0200 Subject: [PATCH 13/23] Grammar and translation corrections --- application/language/italian/account_lang.php | 10 ++-- application/language/italian/adif_lang.php | 14 ++--- application/language/italian/awards_lang.php | 2 +- application/language/italian/export_lang.php | 4 +- application/language/italian/filter_lang.php | 2 +- .../language/italian/general_words_lang.php | 8 +-- application/language/italian/menu_lang.php | 12 ++-- application/language/italian/options_lang.php | 36 ++++++------ application/language/italian/qso_lang.php | 8 +-- application/language/italian/station_lang.php | 56 +++++++++---------- 10 files changed, 76 insertions(+), 76 deletions(-) diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index bf5a2678c..107a304df 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -41,7 +41,7 @@ $lang['account_log_end_time'] = 'Salva Tempo Fine QSO Separatamente'; $lang['account_log_end_time_hint'] = 'Scegli Si se vuoi salvare il tempo di inizio e fine QSO separatamente. Se imposti \'No\' il tempo di inizio e fine sarà lo stesso.'; $lang['account_quicklog_feature'] = "Log Rapido"; -$lang['account_quicklog_feature_hint'] = "Con questa funzionalità potrai salvare il nominativo cercando nell\'intestazione."; +$lang['account_quicklog_feature_hint'] = "Con questa funzionalità potrai salvare il nominativo cercando nell'intestazione."; $lang['account_quicklog_enter'] = "Log Rapido - Azione premendo Invio"; $lang['account_quicklog_enter_hint'] = "Quale azione vuoi eseguire quando viene premuto Invio nel Log Rapido?"; $lang['account_quicklog_enter_log'] = "Registro Nominativo"; @@ -55,13 +55,13 @@ $lang['account_main_menu'] = 'Menu Opzioni'; $lang['account_show_notes_in_the_main_menu'] = 'Visualizza le note nel menu principale.'; -$lang['account_gridsquare_and_location_autocomplete'] = 'Completamento automatico Griglia e Posizione'; -$lang['account_location_auto_lookup'] = 'Ricerca automatica della posizione.'; -$lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = 'Se impostato, la Griglia viene recuperata in base al nome della posizione.'; +$lang['account_gridsquare_and_location_autocomplete'] = 'Completamento automatico Griglia e Luogo'; +$lang['account_location_auto_lookup'] = 'Ricerca automatica del luogo.'; +$lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = 'Se impostato, la Griglia viene recuperata in base al nome del luogo.'; $lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'Ricerca automatica di Griglia e vetta per SOTA.'; $lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'Ricerca automatica di Griglia e nome referenza per WWFF.'; $lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'Ricerca automatica di Griglia e parco per POTA.'; -$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'Se impostati, nome e griglia vengono recuperati dall\'API e compilati con posizione e locatore.'; +$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'Se impostati, nome e griglia vengono recuperati dall\'API e compilati con luogo e locatore.'; $lang['account_previous_qsl_type'] = 'Previous QSL Type'; $lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Seleziona il tipo di QSL da mostrare nella precedente sezione QSO.'; diff --git a/application/language/italian/adif_lang.php b/application/language/italian/adif_lang.php index bfd6dd6dd..2f5adc2a3 100644 --- a/application/language/italian/adif_lang.php +++ b/application/language/italian/adif_lang.php @@ -26,13 +26,13 @@ // $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'] = "Seleziona la posizione della stazione"; +$lang['adif_select_stationlocation'] = "Seleziona il luogo della stazione"; // $lang['gen_hamradio_callsign'] --> application/language/english/general_words_lang.php // The File Input is translated by the Browser $lang['adif_file_label'] = "File ADIF"; -$lang['adif_hint_no_info_in_file'] = "Selezionare se l\'ADIF importato non contiene queste informazioni."; +$lang['adif_hint_no_info_in_file'] = "Selezionare se l'ADIF importato non contiene queste informazioni."; $lang['adif_import_dup'] = "Importa QSO duplicati"; $lang['adif_mark_imported_lotw'] = "Segna i QSO importati come caricati su LoTW"; @@ -40,13 +40,13 @@ $lang['adif_mark_imported_qrz'] = "Segna i QSO importati come caricati su QRZ.com"; $lang['adif_mark_imported_clublog'] = "Segna i QSO importati come caricati su Clublog"; -$lang['adif_dxcc_from_adif'] = "Utilizza le informazioni DXCC dell\'ADIF"; +$lang['adif_dxcc_from_adif'] = "Utilizza le informazioni DXCC dell'ADIF"; $lang['adif_dxcc_from_adif_hint'] = "Se non selezionato, Cloudlog tenterà di determinare automaticamente le informazioni DXCC."; -$lang['adif_always_use_login_call_as_op'] = "Utilizza sempre il nominativo di login come nome dell\'operatore durante l\'importazione"; +$lang['adif_always_use_login_call_as_op'] = "Utilizza sempre il nominativo di login come nome dell'operatore durante l'importazione"; -$lang['adif_ignore_station_call'] = "Ignora il nominativo della stazione durante l\'importazione"; -$lang['adif_ignore_station_call_hint'] = "Se selezionato, Cloudlog tenterà di importare tutti i QSO dell\'ADIF, indipendentemente dal fatto che corrispondano alla posizione della stazione scelta."; +$lang['adif_ignore_station_call'] = "Ignora il nominativo della stazione durante l'importazione"; +$lang['adif_ignore_station_call_hint'] = "Se selezionato, Cloudlog tenterà di importare tutti i QSO dell'ADIF, indipendentemente dal fatto che corrispondano al luogo della stazione scelta."; $lang['adif_upload'] = "Carica"; @@ -57,7 +57,7 @@ */ $lang['adif_export_take_it_anywhere'] = "Porta il tuo file di Log ovunque!"; -$lang['adif_export_take_it_anywhere_hint'] = "L\'esportazione di ADIF ti consente di importare contatti in applicazioni di terze parti come LoTW, Awards o semplicemente per conservare un backup."; +$lang['adif_export_take_it_anywhere_hint'] = "L'esportazione di ADIF ti consente di importare contatti in applicazioni di terze parti come LoTW, Awards o semplicemente per conservare un backup."; $lang['adif_mark_exported_lotw'] = "Segna i QSO esportati come caricati su LoTW"; diff --git a/application/language/italian/awards_lang.php b/application/language/italian/awards_lang.php index dd3d83016..cbbae7731 100644 --- a/application/language/italian/awards_lang.php +++ b/application/language/italian/awards_lang.php @@ -121,7 +121,7 @@ $lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; $lang['awards_us_gridmaster_description_ln2'] = "Il GridMaster Award è il premio AMSAT più prestigioso, introdotto per la prima volta nel 2014 da Star Comm Group. È disponibile per tutti gli operatori radioamatori di tutto il mondo che riescono a lavorare su tutti i 488 quadrati della griglia negli Stati Uniti tramite satellite e può fornire conferme QSL per ciascun contatto."; -$lang['awards_us_gridmaster_description_ln3'] = "Informazioni ufficiali dal sito web: è necessario stabilire una comunicazione bidirezionale tramite satellite amatoriale con ciascuna griglia. Non è richiesto alcun rapporto di segnale minimo. I contatti devono essere effettuati dalla stessa posizione o da località di cui nessuna distante più di 200 chilometri L\'attestazione del richiedente nella domanda di premio serve come dichiarazione di osservanza la regola della distanza. Gli individui possono richiedere e ottenere più premi GridMaster se ottenuti da un'altra posizione, che si trova in un diverso cerchio di 200 chilometri."; +$lang['awards_us_gridmaster_description_ln3'] = "Informazioni ufficiali dal sito web: è necessario stabilire una comunicazione bidirezionale tramite satellite amatoriale con ciascuna griglia. Non è richiesto alcun rapporto di segnale minimo. I contatti devono essere effettuati dallo stesso luogo o da località di cui nessuna distante più di 200 chilometri.L\'attestazione del richiedente nella domanda di premio serve come dichiarazione di osservanza la regola della distanza. Gli individui possono richiedere e ottenere più premi GridMaster se ottenuti da un luogo diveerso, che si trova in un raggio maggiore di 200 chilometri."; $lang['awards_us_gridmaster_description_ln4'] = "Questa mappa mostra solo i QSO effettuati su SAT."; /* diff --git a/application/language/italian/export_lang.php b/application/language/italian/export_lang.php index 33037c8c1..fb215f5ec 100644 --- a/application/language/italian/export_lang.php +++ b/application/language/italian/export_lang.php @@ -9,7 +9,7 @@ */ $lang['export_kml_header'] = "Esportazione KML"; -$lang['export_kml_description'] = "Esporta il tuo diario di bordo in un file KML per utilizzarlo in Google Earth."; +$lang['export_kml_description'] = "Esporta il tuo registro in un file KML per utilizzarlo in Google Earth."; $lang['export_kml_grisquare_warning'] = "Verranno esportati solo i QSO con una griglia definita!"; @@ -42,7 +42,7 @@ $lang['export_cabrillo_header'] = "Esportazione Cabrillo"; $lang['export_cabrillo_description'] = "Esporta un concorso in un registro Cabrillo"; -$lang['export_cabrillo_select_station'] = "Seleziona posizione stazione:"; +$lang['export_cabrillo_select_station'] = "Seleziona il luogo della stazione:"; $lang['export_cabrillo_proceed'] = "Procedi"; $lang['export_cabrillo_select_year'] = "Seleziona anno"; $lang['export_cabrillo_select_contest'] = "Seleziona concorso"; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index b73497678..eb0265688 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -29,7 +29,7 @@ $lang['filter_quicksearch_w_sel'] = 'Ricerca rapida con selezionato: '; $lang['filter_search_callsign'] = 'Cerca Nominativo'; $lang['filter_search_dxcc'] = 'Cerca DXCC'; -$lang['filter_search_state'] = 'Cerca Nazione'; +$lang['filter_search_state'] = 'Cerca US Stato'; $lang['filter_search_gridsquare'] = 'Cerca in Griglia'; $lang['filter_search_cq_zone'] = 'Cerca zona CQ'; $lang['filter_search_mode'] = 'Cerca Modo'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index 5e55a218d..f4c226c55 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -42,7 +42,7 @@ $lang['general_word_satellite'] = 'Satellite'; $lang['general_word_satellite_short'] = 'Sabato'; $lang['general_word_notes'] = 'Nota'; -$lang['general_word_country'] = 'Paese'; +$lang['general_word_country'] = 'Nazione'; $lang['general_word_city'] = 'Città'; $lang['general_word_total'] = 'Totale'; @@ -128,7 +128,7 @@ $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Modo'; -$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth'; +$lang['gen_hamradio_ant_az'] = 'Antenna Azimut'; $lang['gen_hamradio_ant_el'] = 'Antenna Elevazione'; $lang['gen_hamradio_rst_sent'] = 'Inviato'; $lang['gen_hamradio_rst_rcvd'] = 'Ricevuto'; @@ -222,8 +222,8 @@ $lang['dashboard_php_version_warning'] = 'Devi aggiornare la tua versione PHP. La versione minima è 7.4. La tua versione è'; $lang['dashboard_country_files_warning'] = 'Devi aggiornare i file dei paesi! Vai qui per farlo!'; -$lang['dashboard_locations_warning'] = 'Non hai posizioni delle stazioni. Vai qui per crearlo!'; -$lang['dashboard_logbooks_warning'] = 'Non hai il registro della stazione. Vai qui per crearlo!'; +$lang['dashboard_locations_warning'] = 'Non hai luoghi delle stazioni. Vai qui per crearlo!'; +$lang['dashboard_logbooks_warning'] = 'Non hai il registro di stazione. Vai qui per crearlo!'; $lang['hams_at_no_activations_found'] = 'Nessuna attivazione imminente trovata. Per favore controllare più tardi.'; $lang['datatables_language'] = "it-IT"; diff --git a/application/language/italian/menu_lang.php b/application/language/italian/menu_lang.php index 3d7a07b72..9650f2b06 100644 --- a/application/language/italian/menu_lang.php +++ b/application/language/italian/menu_lang.php @@ -14,7 +14,7 @@ $lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Contest QSO Live'; $lang['menu_post_contest_logging'] = 'Registra QSO Contest'; -$lang['menu_bandmap'] = 'Mappa Bande'; +$lang['menu_bandmap'] = 'DXCluster'; $lang['menu_view_qsl'] = 'Visualizza le cartoline QSL'; $lang['menu_view_eqsl'] = 'Visualizza le cartoline eQSL'; $lang['menu_view_sstv'] = 'Visualizza immagini SSTV'; @@ -45,7 +45,7 @@ $lang['menu_pota'] = 'POTA'; $lang['menu_sig'] = 'SIG'; $lang['menu_sota'] = 'SOTA'; -$lang['menu_us_counties'] = 'US Counties'; +$lang['menu_us_counties'] = 'Contee US'; $lang['menu_us_gridmaster'] = 'US Gridmaster'; $lang['menu_vucc'] = 'VUCC'; $lang['menu_waja'] = 'WAJA'; @@ -55,12 +55,12 @@ $lang['menu_admin'] = 'Amministratore'; $lang['menu_user_account'] = 'Account utente'; $lang['menu_global_options'] = 'Opzioni globali'; -$lang['menu_modes'] = 'Modalità'; +$lang['menu_modes'] = 'Modi'; $lang['menu_contests'] = 'Contest'; $lang['menu_themes'] = 'Temi'; $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Aggiorna file paese'; -$lang['menu_debug_information'] = 'Informazioni sul debug'; +$lang['menu_debug_information'] = 'Informazioni di debug'; $lang['menu_search_text'] = 'Cerca nominativo'; $lang['menu_search_text_quicklog'] = "Aggiungi/Cerca nominativo"; @@ -70,8 +70,8 @@ $lang['menu_login_button'] = 'Accedi'; $lang['menu_account'] = 'Account'; -$lang['menu_station_logbooks'] = 'Registro della stazione'; -$lang['menu_station_locations'] = 'Posizioni delle stazioni'; +$lang['menu_station_logbooks'] = 'Registro di stazione'; +$lang['menu_station_locations'] = 'Luoghi delle stazioni'; $lang['menu_bands'] = 'Bande'; $lang['menu_adif_import_export'] = 'Importa/esporta ADIF'; $lang['menu_kml_export'] = 'Esportazione KML'; diff --git a/application/language/italian/options_lang.php b/application/language/italian/options_lang.php index b4d111d2e..949836ad9 100644 --- a/application/language/italian/options_lang.php +++ b/application/language/italian/options_lang.php @@ -10,17 +10,17 @@ $lang['options_global_theme_choice_this_is_used_when_users_arent_logged_in'] = 'Scelta tema globale, viene utilizzato quando gli utenti non hanno effettuato l\'accesso.'; $lang['options_public_search_bar'] = 'Barra di ricerca pubblica'; $lang['options_this_allows_non_logged_in_users_to_access_the_search_functions'] = 'Ciò consente agli utenti non registrati di accedere alle funzioni di ricerca.'; -$lang['options_dashboard_notification_banner'] = 'Banner di notifica del dashboard'; -$lang['options_this_allows_to_disable_the_global_notification_banner_on_the_dashboard'] = 'Ciò consente di disabilitare il banner di notifica globale sul dashboard.'; -$lang['options_dashboard_map'] = 'Mappa dashboard'; -$lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'Ciò consente di disabilitare o posizionare a destra la mappa sul dashboard.'; -$lang['options_logbook_map'] = 'Mappa del Registro'; +$lang['options_dashboard_notification_banner'] = 'Banner di notifica sulla dashboard'; +$lang['options_this_allows_to_disable_the_global_notification_banner_on_the_dashboard'] = 'Ciò consente di disabilitare il banner di notifica globale sulla dashboard.'; +$lang['options_dashboard_map'] = 'Mappa nella dashboard'; +$lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'Ciò consente di disabilitare o posizionare a destra la mappa sulla dashboard.'; +$lang['options_logbook_map'] = 'Mappa nel Registro'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'Ciò permette di disabilitare la mappa nel registro.'; $lang['options_theme_changed_to'] = 'Tema cambiato in '; $lang['options_global_search_changed_to'] = 'La ricerca globale è cambiata in '; -$lang['options_dashboard_banner_changed_to'] = 'Banner del dashboard cambiato in '; -$lang['options_dashboard_map_changed_to'] = 'La mappa del dashboard è cambiata in '; -$lang['options_logbook_map_changed_to'] = 'La mappa del Registro è cambiata in '; +$lang['options_dashboard_banner_changed_to'] = 'Banner della dashboard è cambiato in '; +$lang['options_dashboard_map_changed_to'] = 'La mappa nella dashboard è cambiata in '; +$lang['options_logbook_map_changed_to'] = 'La mappa nel Registro è cambiata in '; $lang['options_radios'] = 'Radio'; $lang['options_radio_settings'] = 'Impostazioni Radio'; @@ -42,14 +42,14 @@ $lang['options_mail_settings_failed'] = "Qualcosa è andato storto durante il salvataggio delle impostazioni. Riprova."; $lang['options_outgoing_protocol_hint'] = "Il protocollo che verrà utilizzato per inviare le email."; $lang['options_smtp_encryption_hint'] = "Scegli se le email devono essere inviate con TLS o SSL."; -$lang['options_email_address_hint'] = "L\'indirizzo email da cui vengono inviate le email, ad esempio 'cloudlog@example.com'"; -$lang['options_email_sender_name_hint'] = "Il nome del mittente dell\'email, ad esempio 'Cloudlog'"; +$lang['options_email_address_hint'] = "L'indirizzo email da cui vengono inviate le email, ad esempio 'cloudlog@example.com'"; +$lang['options_email_sender_name_hint'] = "Il nome del mittente dell'email, ad esempio 'Cloudlog'"; $lang['options_smtp_host_hint'] = "Il nome host del server di posta, ad esempio 'mail.example.com' (senza 'ssl://' o 'tls://')"; $lang['options_smtp_port_hint'] = "La porta SMTP del server di posta, ad esempio se viene utilizzato TLS -> '587', se viene utilizzato SSL -> '465'"; -$lang['options_smtp_username_hint'] = "Il nome utente per accedere al server di posta, solitamente questo è l\'indirizzo email utilizzato."; +$lang['options_smtp_username_hint'] = "Il nome utente per accedere al server di posta, solitamente questo è l'indirizzo email utilizzato."; $lang['options_smtp_password_hint'] = "La password per accedere al server di posta."; $lang['options_send_testmail'] = "Invia mail di prova"; -$lang['options_send_testmail_hint'] = "L\'e-mail verrà inviata all\'indirizzo definito nelle impostazioni del tuo account."; +$lang['options_send_testmail_hint'] = "L'e-mail verrà inviata all'indirizzo definito nelle impostazioni del tuo account."; $lang['options_send_testmail_failed'] = "Testmail fallito. Qualcosa è andato storto."; $lang['options_send_testmail_success'] = "MAIL di prova inviata. Le impostazioni email sembrano corrette."; @@ -57,9 +57,9 @@ $lang['options_global_text'] = 'Testo globale'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Questo testo è un testo opzionale che può essere visualizzato in cima alla pagina OQRS.'; $lang['options_grouped_search'] = 'Ricerca raggruppata'; -$lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Quando è attivo, tutte le posizioni delle stazioni con OQRS attivo verranno cercate contemporaneamente.'; -$lang['options_grouped_search_show_station_name'] = "Mostra il nome della posizione della stazione nei risultati di ricerca raggruppati"; -$lang['options_grouped_search_show_station_name_hint'] = "Se la ricerca raggruppata è attiva, puoi decidere se il nome della posizione della stazione deve essere mostrato nella tabella dei risultati."; +$lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Quando è attivo, tutti luoghi delle stazioni con OQRS attivo verranno cercate contemporaneamente.'; +$lang['options_grouped_search_show_station_name'] = "Mostra il nome del luogo della stazione nei risultati di ricerca raggruppati"; +$lang['options_grouped_search_show_station_name_hint'] = "Se la ricerca raggruppata è attiva, puoi decidere se il nome del luogo della stazione deve essere mostrato nella tabella dei risultati."; $lang['options_oqrs_options_have_been_saved'] = 'Le opzioni OQRS sono state salvate.'; $lang['options_dxcluster'] = 'DXCluster'; @@ -80,14 +80,14 @@ $lang['options_version_dialog_dismiss'] = "Non mostrare più"; $lang['options_version_dialog_settings'] = "Impostazioni informazioni sulla versione"; $lang['options_version_dialog_header'] = "Intestazione informazioni sulla versione"; -$lang['options_version_dialog_header_hint'] = "Puoi cambiare l\'intestazione della finestra di dialogo delle informazioni sulla versione."; +$lang['options_version_dialog_header_hint'] = "Puoi cambiare l'intestazione della finestra di dialogo delle informazioni sulla versione."; $lang['options_version_dialog_header_changed_to'] = "Intestazione delle informazioni sulla versione modificata in"; $lang['options_version_dialog_mode'] = "Modalità informazioni sulla versione"; $lang['options_version_dialog_mode_release_notes'] = "Solo note di rilascio"; $lang['options_version_dialog_mode_custom_text'] = "Solo testo personalizzato"; $lang['options_version_dialog_mode_both'] = "Note sulla versione e testo personalizzato"; $lang['options_version_dialog_mode_disabled'] = "Disabilitato"; -$lang['options_version_dialog_mode_hint'] = "Le informazioni sulla versione vengono mostrate a ogni utente. L\'utente ha la possibilità di chiudere la finestra di dialogo dopo averla letta. Seleziona se vuoi mostrare solo le note di rilascio (recuperate da github), solo il testo personalizzato o entrambi."; +$lang['options_version_dialog_mode_hint'] = "Le informazioni sulla versione vengono mostrate a ogni utente. L'utente ha la possibilità di chiudere la finestra di dialogo dopo averla letta. Seleziona se vuoi mostrare solo le note di rilascio (recuperate da github), solo il testo personalizzato o entrambi."; $lang['options_version_dialog_custom_text'] = "Testo personalizzato informazioni sulla versione"; $lang['options_version_dialog_custom_text_hint'] = "Questo è il testo personalizzato che viene mostrato nella finestra di dialogo."; $lang['options_version_dialog_mode_changed_to'] = "La modalità Informazioni sulla versione è cambiata in"; @@ -105,7 +105,7 @@ // Bands $lang['options_bands'] = "Bande"; -$lang['options_bands_text_ln1'] = "Utilizzando l\'elenco delle bande puoi controllare quali bande verranno visualizzate quando crei un nuovo QSO."; +$lang['options_bands_text_ln1'] = "Utilizzando l'elenco delle bande puoi controllare quali bande verranno visualizzate quando crei un nuovo QSO."; $lang['options_bands_text_ln2'] = "Le bande attive verranno mostrate nel menu a discesa 'Banda' del QSO, mentre le bande inattive saranno nascoste e non potranno essere selezionate."; $lang['options_bands_create'] = "Crea una band"; $lang['options_bands_edit'] = "Modifica banda"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index f6363daf2..4b7554305 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -25,7 +25,7 @@ $lang['qso_dok_helptext'] = 'Per esempio: Q03'; -$lang['qso_notes_helptext'] = 'Il contenuto della nota viene utilizzato solo all interno di Cloudlog e non viene esportato in altri servizi.'; +$lang['qso_notes_helptext'] = 'Il contenuto della nota viene utilizzato solo all\'interno di Cloudlog e non viene esportato in altri servizi.'; $lang['qsl_notes_helptext'] = 'Il contenuto di questa nota è esportato a servizi QSL come eqsl.cc.'; $lang['qso_eqsl_qslmsg_helptext'] = "Ottieni il messaggio predefinito per eQSL, per questa stazione."; @@ -60,8 +60,8 @@ $lang['qso_simplefle_qso_date'] = "Data del QSO"; $lang['qso_simplefle_operator'] = "Operatore"; $lang['qso_simplefle_operator_hint'] = "es. OK2CQR"; -$lang['qso_simplefle_station_call_location'] = "Chiamata/Posizione della stazione"; -$lang['qso_simplefle_station_call_location_hint'] = "Se operi da una nuova posizione, crea prima un nuovo Posizione stazione"; +$lang['qso_simplefle_station_call_location'] = "Chiamata/Luogo della stazione"; +$lang['qso_simplefle_station_call_location_hint'] = "Se operi da una nuovo Luogo, crea prima un nuovo Luoghi delle stazioni"; $lang['qso_simplefle_utc_time'] = "Ora UTC attuale"; $lang['qso_simplefle_enter_the_data'] = "Inserisci i dati"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Chiudi e carica dati di esempio"; @@ -71,7 +71,7 @@ $lang['qso_simplefle_refs_hint'] = "I Ref possono essere SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Manca la banda!"; -$lang['qso_simplefle_error_mode'] = "Modalità mancante!"; +$lang['qso_simplefle_error_mode'] = "Modo mancante!"; $lang['qso_simplefle_error_time'] = "L'ora non è impostata!"; $lang['qso_simplefle_error_stationcall'] = "Chiamata stazione non selezionata"; $lang['qso_simplefle_error_operator'] = "Il campo 'Operatore' è vuoto"; diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index e10688bef..24549eac8 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -8,35 +8,35 @@ ___________________________________________________________________________________________ */ -$lang['station_logbooks'] = "Registri della stazione"; -$lang['station_logbooks_description_header'] = "Cosa sono i registri della stazione"; -$lang['station_logbooks_description_text'] = "I registri delle stazioni ti consentono di raggruppare le posizioni delle stazioni, questo ti consente di vedere tutte le posizioni in una sessione dalle aree del registro alle analisi. Ottimo per quando operi in più posizioni ma fanno parte di lo stesso Circolo DXCC o VUCC."; -$lang['station_logbooks_create'] = "Crea registro della stazione"; +$lang['station_logbooks'] = "Registri di stazione"; +$lang['station_logbooks_description_header'] = "Cosa sono i registri di stazione"; +$lang['station_logbooks_description_text'] = "I registri delle stazioni ti consentono di raggruppare diversi luoghi delle stazioni, questo ti consente di vedere tutte le località in una sessione dalle aree del registro alle analisi. Ottimo per quando operi da più postazioni che fanno parte dello stesso DXCC o VUCC Circle."; +$lang['station_logbooks_create'] = "Crea registro di stazione"; $lang['station_logbooks_status'] = "Stato"; $lang['station_logbooks_link'] = "Collegamento"; $lang['station_logbooks_public_search'] = "Ricerca pubblica"; $lang['station_logbooks_set_active'] = "Imposta come registro attivo"; -$lang['station_logbooks_active_logbook'] = "Diario di bordo attivo"; -$lang['station_logbooks_edit_logbook'] = "Modifica registro della stazione"; // Verrà generata la frase completa "Modifica registro stazione: [Nome registro]" -$lang['station_logbooks_confirm_delete'] = "Sei sicuro di voler eliminare il seguente registro della stazione? Devi ricollegare tutte le posizioni collegate qui a un altro registro della stazione.: "; +$lang['station_logbooks_active_logbook'] = "Registro attivo"; +$lang['station_logbooks_edit_logbook'] = "Modifica registro di stazione"; // Verrà generata la frase completa "Modifica registro stazione: [Nome registro]" +$lang['station_logbooks_confirm_delete'] = "Sei sicuro di voler eliminare il seguente registro di stazione? Dovrai successivamente ricollegare tutti i luoghi delle stazioni esistenti ad un altro registro di stazione.: "; $lang['station_logbooks_view_public'] = "Visualizza la pagina pubblica del registro: "; -$lang['station_logbooks_create_name'] = "Nome registro della stazione"; -$lang['station_logbooks_create_name_hint'] = "Puoi chiamare qualsiasi cosa il diario di bordo della stazione."; -$lang['station_logbooks_edit_name_hint'] = "Nome breve per il registro della stazione. Ad esempio: Home Log (IO87IP)"; +$lang['station_logbooks_create_name'] = "Nome registro di stazione"; +$lang['station_logbooks_create_name_hint'] = "Puoi dare qualsiasi nome al registro di stazione."; +$lang['station_logbooks_edit_name_hint'] = "Nome breve per il registro di stazione. Ad esempio: Home Log (IO87IP)"; $lang['station_logbooks_edit_name_update'] = "Aggiorna nome registro stazione"; $lang['station_logbooks_public_slug'] = "Slug pubblico"; -$lang['station_logbooks_public_slug_hint'] = "L\'impostazione di uno slug pubblico ti consente di condividere il tuo diario di bordo con chiunque tramite un indirizzo web personalizzato, questo slug può contenere solo lettere e numeri."; +$lang['station_logbooks_public_slug_hint'] = "L'impostazione di uno slug pubblico ti consente di condividere il tuo registro con chiunque tramite un indirizzo web personalizzato, questo slug può contenere solo lettere e numeri."; $lang['station_logbooks_public_slug_format1'] = "Più tardi apparirà così:"; $lang['station_logbooks_public_slug_format2'] = "[il tuo slug]"; $lang['station_logbooks_public_slug_input'] = "Digita la scelta Slug pubblica"; $lang['station_logbooks_public_slug_visit'] = "Visita la pagina pubblica"; -$lang['station_logbooks_public_search_hint'] = "L\'abilitazione della funzione di ricerca pubblica offre una casella di input per la ricerca sulla pagina del registro pubblico accessibile tramite slug pubblico. La ricerca copre solo questo registro."; +$lang['station_logbooks_public_search_hint'] = "L'abilitazione della funzione di ricerca pubblica offre una casella di input per la ricerca sulla pagina del registro pubblico accessibile tramite slug pubblico. La ricerca copre solo questo registro."; $lang['station_logbooks_public_search_enabled'] = "Ricerca pubblica abilitata"; -$lang['station_logbooks_select_avail_loc'] = "Seleziona le posizioni delle stazioni disponibili"; -$lang['station_logbooks_link_loc'] = "Posizione collegamento"; -$lang['station_logbooks_linked_loc'] = "Posizioni collegate"; -$lang['station_logbooks_no_linked_loc'] = "Nessuna posizione collegata"; -$lang['station_logbooks_unlink_station_location'] = "Scollega posizione stazione"; +$lang['station_logbooks_select_avail_loc'] = "Seleziona i luoghi di stazione disponibili"; +$lang['station_logbooks_link_loc'] = "Luogo collegamento"; +$lang['station_logbooks_linked_loc'] = "Luoghi collegate"; +$lang['station_logbooks_no_linked_loc'] = "Nessun luogo collegato"; +$lang['station_logbooks_unlink_station_location'] = "Scollega luogo di stazione"; @@ -46,20 +46,20 @@ ___________________________________________________________________________________________ */ -$lang['station_location'] = 'Posizione della stazione'; -$lang['station_location_plural'] = "Posizioni delle stazioni"; -$lang['station_location_header_ln1'] = 'Le posizioni delle stazioni definiscono le posizioni operative, come il tuo QTH, un QTH di amici o una stazione portatile.'; +$lang['station_location'] = 'Luogo di stazione'; +$lang['station_location_plural'] = "Luoghi di stazione"; +$lang['station_location_header_ln1'] = 'I Luoghi di stazione definiscono le posizioni operative, come il tuo QTH, un QTH di amici o una stazione portatile.'; $lang['station_location_header_ln2'] = 'Simile ai registri, il profilo di una stazione tiene insieme una serie di QSO.'; $lang['station_location_header_ln3'] = 'Può essere attiva solo una stazione alla volta. Nella tabella sottostante questa è mostrata con il badge -Stazione attiva-.'; -$lang['station_location_create_header'] = 'Crea posizione stazione'; -$lang['station_location_create'] = 'Crea una posizione della stazione'; -$lang['station_location_edit'] = 'Modifica posizione stazione: '; +$lang['station_location_create_header'] = 'Crea Luogo di stazione'; +$lang['station_location_create'] = 'Crea una luogo di stazione'; +$lang['station_location_edit'] = 'Modifica luogo di stazione: '; $lang['station_location_updated_suff'] = 'Aggiornato.'; -$lang['station_location_warning'] = 'Attenzione: è necessario impostare la posizione della stazione attiva. Vai su Segnale di chiamata->Posizione della stazione per selezionarne uno.'; +$lang['station_location_warning'] = 'Attenzione: è necessario impostare il luogo della stazione attiva. Vai su Segnale di chiamata->Posizione della stazione per selezionarne uno.'; $lang['station_location_reassign_at'] = 'Per favore riassegnali a '; $lang['station_location_warning_reassign'] = 'A causa dei recenti cambiamenti all\'interno di Cloudlog è necessario riassegnare i QSO ai profili della stazione.'; $lang['station_location_name'] = 'Nome profilo'; -$lang['station_location_name_hint'] = 'Nome breve per la posizione della stazione. Ad esempio: Casa (IO87IP)'; +$lang['station_location_name_hint'] = 'Nome breve per il luogo della stazione. Ad esempio: Casa (IO87IP)'; $lang['station_location_callsign'] = 'Nominativo della stazione'; $lang['station_location_callsign_hint'] = 'Nominativo della stazione. Ad esempio: 2M0SQL/P'; $lang['station_location_power'] = 'Potenza della stazione (W)'; @@ -74,7 +74,7 @@ $lang['station_location_confirm_del_stationlocation_qso'] = 'Questo cancellerà tutti i QSO all\'interno di questo profilo della stazione?'; $lang['station_location_dxcc'] = 'Stazione DXCC'; $lang['station_location_dxcc_hint'] = 'Entità DXCC della stazione. Ad esempio: Scozia'; -$lang['station_location_dxcc_warning'] = "Fermati qui per un momento. Il DXCC scelto è obsoleto e non più valido. Controlla quale DXCC per questa particolare posizione è quello corretto. Se sei sicuro, ignora questo avviso."; +$lang['station_location_dxcc_warning'] = "Fermati qui per un momento. Il DXCC scelto è obsoleto e non più valido. Controlla quale DXCC per questo particolare luogo è quello corretto. Se sei sicuro, ignora questo avviso."; $lang['station_location_city'] = 'Città stazione'; $lang['station_location_city_hint'] = 'Città della stazione. Ad esempio: Inverness'; $lang['station_location_state'] = 'Stato della stazione'; @@ -96,7 +96,7 @@ $lang['station_location_signature_info_hint'] = "Informazioni sulla firma della stazione (ad esempio DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'Il nickname QTH configurato nel tuo profilo eQSL'; $lang['station_location_eqsl_defaultqslmsg'] = "QSLMSG predefinito"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "Definisci un messaggio predefinito che verrà popolato e inviato per ogni QSO per questa posizione della stazione."; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Definisci un messaggio predefinito che verrà popolato e inviato per ogni QSO da questo luogo di stazione."; $lang['station_location_qrz_subscription'] = 'Abbonamento richiesto'; $lang['station_location_qrz_hint'] = "Trova la tua chiave API nella pagina delle impostazioni del registro di QRZ.com"; $lang['station_location_qrz_realtime_upload'] = 'Caricamento in tempo reale del registro di QRZ.com'; @@ -109,7 +109,7 @@ $lang['station_location_qo100_realtime_upload'] = "Caricamento in tempo reale di QO-100 Dx Club"; $lang['station_location_oqrs_enabled'] = "OQRS abilitato"; $lang['station_location_oqrs_email_alert'] = "Avviso e-mail OQRS"; -$lang['station_location_oqrs_email_hint'] = "Assicurati che l\'e-mail sia impostata nelle opzioni di amministrazione e globali."; +$lang['station_location_oqrs_email_hint'] = "Assicurati che l'e-mail sia impostata nelle opzioni di amministrazione e globali."; $lang['station_location_oqrs_text'] = "Testo OQRS"; $lang['station_location_oqrs_text_hint'] = "Alcune informazioni che vuoi aggiungere riguardo alla QSL."; $lang['station_location_clublog_realtime_upload']='Caricamento in tempo reale di ClubLog'; From 9691a8bc3a476bbe96c85b510c81977b18383931 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 16 May 2024 13:58:58 +0100 Subject: [PATCH 14/23] [Dashboard] Reload the Logbook Table every 5 seconds This reloads the logbook table on the dashboard every 5 seconds as mentioned in #3105 --- application/controllers/Dashboard.php | 18 ++ .../components/dashboard_logbook_table.php | 211 ++++++++++++++++++ application/views/dashboard/index.php | 63 +----- 3 files changed, 230 insertions(+), 62 deletions(-) create mode 100644 application/views/components/dashboard_logbook_table.php diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index ef1f4015e..b91822134 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -188,6 +188,24 @@ public function index() } } + public function logbook_display_component() { + $this->load->model('user_model'); + + if ($this->user_model->validate_session() == 0) { + // User is not logged in + } else { + $this->load->model('logbook_model'); + $this->load->model('logbooks_model'); + } + + // Get Logbook Locations + $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + + // Get the last 20 QSOs + $data['last_five_qsos'] = $this->logbook_model->get_last_qsos('20', $logbooks_locations_array); + $this->load->view('components/dashboard_logbook_table', $data); + } + function radio_display_component() { $this->load->model('cat'); diff --git a/application/views/components/dashboard_logbook_table.php b/application/views/components/dashboard_logbook_table.php new file mode 100644 index 000000000..e3dd96ed1 --- /dev/null +++ b/application/views/components/dashboard_logbook_table.php @@ -0,0 +1,211 @@ +' . $ctx->lang->line('gen_hamradio_mode') . ''; + break; + case 'RSTS': + echo '' . $ctx->lang->line('gen_hamradio_rsts') . ''; + break; + case 'RSTR': + echo '' . $ctx->lang->line('gen_hamradio_rstr') . ''; + break; + case 'Country': + echo '' . $ctx->lang->line('general_word_country') . ''; + break; + case 'IOTA': + echo '' . $ctx->lang->line('gen_hamradio_iota') . ''; + break; + case 'SOTA': + echo '' . $ctx->lang->line('gen_hamradio_sota') . ''; + break; + case 'WWFF': + echo '' . $ctx->lang->line('gen_hamradio_wwff') . ''; + break; + case 'POTA': + echo '' . $ctx->lang->line('gen_hamradio_pota') . ''; + break; + case 'State': + echo '' . $ctx->lang->line('gen_hamradio_state') . ''; + break; + case 'Grid': + echo '' . $ctx->lang->line('gen_hamradio_gridsquare') . ''; + break; + case 'Distance': + echo '' . $ctx->lang->line('gen_hamradio_distance') . ''; + break; + case 'Band': + echo '' . $ctx->lang->line('gen_hamradio_band') . ''; + break; + case 'Frequency': + echo '' . $ctx->lang->line('gen_hamradio_frequency') . ''; + break; + case 'Operator': + echo '' . $ctx->lang->line('gen_hamradio_operator') . ''; + break; + case 'Name': + echo '' . $ctx->lang->line('general_word_name') . ''; + break; + } +} + +function echo_table_col($row, $name) +{ + $ci = &get_instance(); + switch ($name) { + case 'Mode': + echo ''; + echo $row->COL_SUBMODE == null ? $row->COL_MODE : $row->COL_SUBMODE . ''; + break; + case 'RSTS': + echo '' . $row->COL_RST_SENT; + if ($row->COL_STX) { + echo ' COL_CONTEST_ID : "n/a") . '" class="badge text-bg-light">'; + printf("%03d", $row->COL_STX); + echo ''; + } + if ($row->COL_STX_STRING) { + echo ' COL_CONTEST_ID : "n/a") . '" class="badge text-bg-light">' . $row->COL_STX_STRING . ''; + } + echo ''; + break; + case 'RSTR': + echo '' . $row->COL_RST_RCVD; + if ($row->COL_SRX) { + echo ' COL_CONTEST_ID : "n/a") . '" class="badge text-bg-light">'; + printf("%03d", $row->COL_SRX); + echo ''; + } + if ($row->COL_SRX_STRING) { + echo ' COL_CONTEST_ID : "n/a") . '" class="badge text-bg-light">' . $row->COL_SRX_STRING . ''; + } + echo ''; + break; + case 'Country': + echo '' . ucwords(strtolower(($row->COL_COUNTRY))); + if ($row->end != NULL) echo ' ' . $ci->lang->line('gen_hamradio_deleted_dxcc') . '' . ''; + break; + case 'IOTA': + echo '' . ($row->COL_IOTA) . ''; + break; + case 'SOTA': + echo '' . ($row->COL_SOTA_REF) . ''; + break; + case 'WWFF': + echo '' . ($row->COL_WWFF_REF) . ''; + break; + case 'POTA': + echo '' . ($row->COL_POTA_REF) . ''; + break; + case 'Grid': + echo ''; + echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); + echo ''; + break; + case 'Distance': + echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ''; + break; + case 'Band': + echo ''; + if ($row->COL_SAT_NAME != null) { + echo '' . $row->COL_SAT_NAME . ''; + } else { + echo strtolower($row->COL_BAND); + } + echo ''; + break; + case 'Frequency': + echo ''; + if ($row->COL_SAT_NAME != null) { + echo '' . $row->COL_SAT_NAME . ''; + } else { + if ($row->COL_FREQ != null) { + echo $ci->frequency->hz_to_mhz($row->COL_FREQ); + } else { + echo strtolower($row->COL_BAND); + } + } + echo ''; + break; + case 'State': + echo '' . ($row->COL_STATE) . ''; + break; + case 'Operator': + echo '' . ($row->COL_OPERATOR) . ''; + break; + case 'Name': + echo '' . ($row->COL_NAME) . ''; + break; + } +} + +function echoQrbCalcLink($mygrid, $grid, $vucc) +{ + if (!empty($grid)) { + echo $grid . ' '; + } else if (!empty($vucc)) { + echo $vucc . ' '; + } +} +?> +
    + + + + + + + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> + + + + session->userdata('user_column1') == "" ? 'Mode' : $this->session->userdata('user_column1')); + echo_table_header_col($this, $this->session->userdata('user_column2') == "" ? 'RSTS' : $this->session->userdata('user_column2')); + echo_table_header_col($this, $this->session->userdata('user_column3') == "" ? 'RSTR' : $this->session->userdata('user_column3')); + echo_table_header_col($this, $this->session->userdata('user_column4') == "" ? 'Band' : $this->session->userdata('user_column4')); + ?> + + + + 0) { + foreach ($last_five_qsos->result() as $row) { ?> + COL_PRIMARY_KEY . '" class="tr' . ($i & 1) . '">'; ?> + + session->userdata('user_date_format')) { + // If Logged in and session exists + $custom_date_format = $this->session->userdata('user_date_format'); + } else { + // Get Default date format from /config/cloudlog.php + $custom_date_format = $this->config->item('qso_date_format'); + } + + ?> + + + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> + + + + + session->userdata('user_column1') == "" ? 'Mode' : $this->session->userdata('user_column1')); + echo_table_col($row, $this->session->userdata('user_column2') == "" ? 'RSTS' : $this->session->userdata('user_column2')); + echo_table_col($row, $this->session->userdata('user_column3') == "" ? 'RSTR' : $this->session->userdata('user_column3')); + echo_table_col($row, $this->session->userdata('user_column4') == "" ? 'Band' : $this->session->userdata('user_column4')); + ?> + + +
    COL_TIME_ON); + echo date($custom_date_format, $timestamp); ?>COL_TIME_ON); + echo date('H:i', $timestamp); ?> + COL_CALL)); ?> +
    \ No newline at end of file diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 99b49f88b..56e885ab2 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -222,68 +222,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
    - -
    - - - - - - - config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - - - - session->userdata('user_column1') == "" ? 'Mode' : $this->session->userdata('user_column1')); - echo_table_header_col($this, $this->session->userdata('user_column2') == "" ? 'RSTS' : $this->session->userdata('user_column2')); - echo_table_header_col($this, $this->session->userdata('user_column3') == "" ? 'RSTR' : $this->session->userdata('user_column3')); - echo_table_header_col($this, $this->session->userdata('user_column4') == "" ? 'Band' : $this->session->userdata('user_column4')); - ?> - - - - 0) { - foreach ($last_five_qsos->result() as $row) { ?> - COL_PRIMARY_KEY . '" class="tr' . ($i & 1) . '">'; ?> - - session->userdata('user_date_format')) { - // If Logged in and session exists - $custom_date_format = $this->session->userdata('user_date_format'); - } else { - // Get Default date format from /config/cloudlog.php - $custom_date_format = $this->config->item('qso_date_format'); - } - - ?> - - - config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - - - - - session->userdata('user_column1') == "" ? 'Mode' : $this->session->userdata('user_column1')); - echo_table_col($row, $this->session->userdata('user_column2') == "" ? 'RSTS' : $this->session->userdata('user_column2')); - echo_table_col($row, $this->session->userdata('user_column3') == "" ? 'RSTR' : $this->session->userdata('user_column3')); - echo_table_col($row, $this->session->userdata('user_column4') == "" ? 'Band' : $this->session->userdata('user_column4')); - ?> - - -
    COL_TIME_ON); - echo date($custom_date_format, $timestamp); ?>COL_TIME_ON); - echo date('H:i', $timestamp); ?> - COL_CALL)); ?> -
    -
    +
    From 84dbe80ff2e478fa5b10ba418abbbdfe65489874 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 16 May 2024 14:46:24 +0100 Subject: [PATCH 15/23] [Dashboard] Loads QSOs with red icons and reloads every 5secs Adds to #3105 TODO - this doesnt listen to the user options --- application/views/interface_assets/footer.php | 59 +++++++++++++++++-- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index a0b693ba4..61c6a4359 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -805,7 +805,6 @@ function showActivatorsMap(call, count, grids) { uri->segment(1) == "" || $this->uri->segment(1) == "dashboard") { ?> - From 0335d42c1c842325aeadfa9e9014eafce2cf5e14 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 16 May 2024 15:10:09 +0100 Subject: [PATCH 16/23] Update footer.php --- application/views/interface_assets/footer.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 61c6a4359..89dc6fc8b 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -831,17 +831,21 @@ function showActivatorsMap(call, count, grids) { $(document).ready(function() { config->item('map_gridsquares') != FALSE) { ?> - var grid = "Yes"; + var ShowGrid = "Yes"; - var grid = "No"; + var ShowGrid = "No"; + + var map = L.map('map').setView([q_lat, q_lng], q_zoom); - L.tileLayer(osmUrl, { + var osm = new L.tileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmCopyright }).addTo(map); + map.addLayer(osm); + var printer = L.easyPrint({ sizeModes: ['Current'], filename: 'myMap', @@ -849,12 +853,8 @@ function showActivatorsMap(call, count, grids) { hideControlContainer: true }).addTo(map); - var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(map); - var markers = {}; - // Load maidenhead grid squares as a layer control - function loadMarkers() { fetch(qso_loc) .then(response => response.json()) From 4182b67471e908e311342b244c63bf70f8ec0605 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 16 May 2024 15:36:50 +0100 Subject: [PATCH 17/23] Update footer.php --- application/views/interface_assets/footer.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 89dc6fc8b..a519925b7 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -838,20 +838,20 @@ function showActivatorsMap(call, count, grids) { - var map = L.map('map').setView([q_lat, q_lng], q_zoom); + var dashmap = L.map('map').setView([q_lat, q_lng], q_zoom); var osm = new L.tileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmCopyright - }).addTo(map); + }).addTo(dashmap); - map.addLayer(osm); + dashmap.addLayer(osm); var printer = L.easyPrint({ sizeModes: ['Current'], filename: 'myMap', exportOnly: true, hideControlContainer: true - }).addTo(map); + }).addTo(dashmap); var markers = {}; @@ -866,13 +866,13 @@ function loadMarkers() { if (!markers[key]) { L.marker([marker.lat, marker.lng], { icon: redIconImg - }).addTo(map) + }).addTo(dashmap) .bindPopup(marker.html); } }); Object.keys(markers).forEach(key => { if (!newMarkers[key]) { - map.removeLayer(markers[key]); + dashmap.removeLayer(markers[key]); } }); markers = newMarkers; @@ -882,6 +882,7 @@ function loadMarkers() { loadMarkers(); setInterval(loadMarkers, 5000); + var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(dashmap); }); From 9ee947fbc3d2964c1488a4dd8a5f15875d465796 Mon Sep 17 00:00:00 2001 From: Hakan at robin Date: Thu, 16 May 2024 22:26:53 +0100 Subject: [PATCH 18/23] Added missing Turkish translations to date --- application/language/turkish/account_lang.php | 207 ++++++------ application/language/turkish/admin_lang.php | 115 ++++--- application/language/turkish/awards_lang.php | 188 +++++------ .../language/turkish/contesting_lang.php | 37 +- application/language/turkish/export_lang.php | 90 +++-- application/language/turkish/filter_lang.php | 319 +++++++++--------- .../language/turkish/general_words_lang.php | 152 ++++----- .../language/turkish/gridsquares_lang.php | 68 ++-- application/language/turkish/lotw_lang.php | 14 +- application/language/turkish/menu_lang.php | 136 ++++---- application/language/turkish/options_lang.php | 219 ++++++------ application/language/turkish/qslcard_lang.php | 53 ++- application/language/turkish/qso_lang.php | 149 ++++---- application/language/turkish/sstv_lang.php | 4 +- application/language/turkish/station_lang.php | 197 ++++++----- .../language/turkish/statistics_lang.php | 67 ++-- 16 files changed, 995 insertions(+), 1020 deletions(-) diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 1a332cd45..742d74779 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -1,6 +1,6 @@ https://radiosocial.de"; -$lang['account_mastodon'] = 'Mastodonserver'; -$lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_user_mastodon_hint'] = "Main URL of your Mastodon server, e.g. https://radiosocial.de"; - -$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; -$lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Methods'; +$lang['account_default_band_settings'] = 'Varsayılan Bant ve Onay Ayarları'; +$lang['account_gridmap_default_band'] = 'Varsayılan Bant'; +$lang['account_qsl_settings'] = 'Varsayılan QSL Yöntemleri'; $lang['account_winkeyer'] = 'Winkeyer'; -$lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; -$lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; +$lang['account_winkeyer_hint'] = "Cloudlog'daki Winkeyer desteği oldukça deneyseldir, Etkinleştirmeden önce https adresindeki wiki'yi okuyun: //github.com/magicbug/Cloudlog/wiki/Winkey."; +$lang['account_winkeyer_enabled'] = "Winkeyer Özellikleri Etkin"; -$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'] = "Harita Ayarları"; +$lang['account_map_qso_by_default'] = "QSO (varsayılan olarak)"; +$lang['account_map_qso_confirm'] = "QSO (onaylandı)"; +$lang['account_map_qso_confirm_same_qso'] = "('Hayır' ise, ".$lang['account_map_qso_by_default']." olarak görüntülenir.)"; -$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'] = "Genel Bilgi"; +$lang['account_qso_logging_options'] = "QSO Günlük Kaydı Seçenekleri"; +$lang['account_third_party_services'] = "Üçüncü Taraf Hizmetleri"; +$lang['account_default_values'] = "Varsayılan Değerler"; +$lang['account_miscellaneous'] = "Çeşitli"; $lang['account_hamsat'] = "Hams.at"; -$lang['account_hamsat_private_feed_key'] = "Private Feed Key"; -$lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; -$lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_private_feed_key'] = "Gizli Yayın Anahtarı"; +$lang['account_hamsat_hint'] = "https://hams.at/users/settings."; +$lang['account_hamsat_workable_only'] = "Yalnızca Uygulanabilir Geçişleri Göster"; diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php index 13890cc92..afc64ea6e 100644 --- a/application/language/turkish/admin_lang.php +++ b/application/language/turkish/admin_lang.php @@ -1,60 +1,59 @@ CQ Magazine."; +$lang['awards_cq_description_ln1'] = "CQ Magazine WAZ Ödülü"; +$lang['awards_cq_description_ln2'] = "CQ Magazine, ABD'de bulunmaktadır ve dünyadaki en popüler amatör radyo dergilerinden biridir. Dergi ilk olarak Ocak 1945'te çıkmıştır ve ödüllere ve amatör radyonun pratik yönlerine odaklanmaktadır." ; +$lang['awards_cq_description_ln3'] = "WAZ Ödülü, 'Tüm Bölgelerde Çalışıldı' anlamına gelir ve ilgili onayla birlikte 40 CQ Bölgesinin tamamıyla telsiz bağlantısı gerektirir."; +$lang['awards_cq_description_ln4'] = "Tüm bilgileri ve kuralları CQ Dergisi."; /* ___________________________________________________________________________________________ -DOK -- Use all 4 Lines of Text +DOK - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_dok_description_ln1'] = "DOK Award"; -$lang['awards_dok_description_ln2'] = "Germany extends over 630 km from East to West and nearly 900 km from North to South. Around 70,000 of Germany's 82 million inhabitants are licensed hams, with more than 40,000 of them being members of DARC. DOK is a system that provides individual local chapters with an identifier and means 'Deutscher Ortsverband Kenner' (English: 'German Local Association Identifier')."; -$lang['awards_dok_description_ln3'] = "The DOK consists of a letter for the district and a two-digit number for the local chapter, like P03 Friedrichshafen (city of the 'Hamradio exhibition') or F41 Baunatal (location of the DARC headquarters). Note: A zero in a DOK is a common mistake, often being logged as the letter O."; -$lang['awards_dok_description_ln4'] = "This information is provided by the DARC website. Information about the DOK Awards and its rules can be found here."; - +$lang['awards_dok_description_ln1'] = "DOK Ödülü"; +$lang['awards_dok_description_ln2'] = "Almanya, Doğudan Batıya 630 km ve Kuzeyden Güneye yaklaşık 900 km uzanıyor. Almanya'nın 82 milyon sakininin yaklaşık 70.000'i lisanslı jambondur ve bunların 40.000'den fazlası DARC üyesidir. DOK bireysel yerel bölümlere bir tanımlayıcı sağlayan bir sistemdir ve 'Deutscher Ortsverband Kenner' (İngilizce: 'Alman Yerel Birlik Tanımlayıcısı') anlamına gelir."; +$lang['awards_dok_description_ln3'] = "DOK, bölge için bir harf ve yerel bölüm için iki haneli bir sayıdan oluşur, örneğin P03 Friedrichshafen ('Hamradio sergisi' şehri) veya F41 Baunatal (DARC genel merkezinin yeri) ) Not: DOK'taki sıfır yaygın bir hatadır ve genellikle O harfi olarak kaydedilir."; +$lang['awards_dok_description_ln4'] = "Bu bilgi DARC web sitesi. DOK Ödülleri ve kuralları hakkında bilgiyi buraya."; /* ___________________________________________________________________________________________ -DXCC -- Use all 4 Lines of Text +DXCC - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_dxcc_description_ln1'] = "DXCC Award"; -$lang['awards_dxcc_description_ln2'] = "DXCC stands for 'DX Century Club,' an award based on worked countries. The DXCC List is based on an article created in 1935 by Clinton B. DeSoto, W1CBD, titled 'How to Count Countries Worked, A New DX Scoring System'."; -$lang['awards_dxcc_description_ln3'] = "You can find all information about the DXCC Award on the ARRL website."; -$lang['awards_dxcc_description_ln4'] = "Important Note: Over time, the criteria for the DXCC List have changed. The List remains unchanged until an entity no longer satisfies the criteria under which it was added, at which time it is moved to the Deleted List. You will find Deleted DXCC entities also in the lists on Cloudlog. Be aware that these DXCC entities are outdated and no longer valid."; +$lang['awards_dxcc_description_ln1'] = "DXCC Ödülü"; +$lang['awards_dxcc_description_ln2'] = "DXCC, çalışılan ülkelere dayalı bir ödül olan 'DX Century Club' anlamına gelir. DXCC Listesi, 1935'te Clinton B. DeSoto, W1CBD tarafından oluşturulan 'Çalışılan Ülkeler Nasıl Sayılır, Yeni Bir DX Puanlama Sistemi'."; +$lang['awards_dxcc_description_ln3'] = "DXCC Ödülü ile ilgili tüm bilgileri ARRL web sitesinde."; +$lang['awards_dxcc_description_ln4'] = "Önemli Not: Zaman içinde, DXCC Listesinin kriterleri değişti. Bir varlık, eklendiği kriterleri artık karşılamayana kadar Liste değişmeden kalır ve bu sırada listeye taşınır. Silinen Liste. Silinen DXCC varlıklarını Cloudlog'daki listelerde de bulacaksınız. Bu DXCC varlıklarının güncelliğini yitirdiğini ve artık geçerli olmadığını unutmayın."; /* ___________________________________________________________________________________________ -FFMA -- Use all 4 Lines of Text +FFMA - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_ffma_description_ln1'] = "Fred Fish Memorial Award"; -$lang['awards_ffma_description_ln2'] = "The Fred Fish Memorial Award was created in honor of Fred Fish, W5FF (SK), who was the first amateur to have worked and confirmed all 488 Maidenhead grid squares in the 48 contiguous United States on 6 Meters."; -$lang['awards_ffma_description_ln3'] = "The award will be given to any amateur who can duplicate W5FF's accomplishment."; -$lang['awards_ffma_description_ln4'] = "For more information, you can visit this link: https://www.arrl.org/ffma."; - +$lang['awards_ffma_description_ln1'] = "Fred Fish Anma Ödülü"; +$lang['awards_ffma_description_ln2'] = "Fred Fish Memorial Ödülü, 6'da 48 bitişik Amerika Birleşik Devletleri'ndeki 488 Maidenhead Kılavuz karesinin tamamını çalıştıran ve onaylayan ilk amatör olan W5FF (SK) Fred Fish'in onuruna oluşturuldu. Metre."; +$lang['awards_ffma_description_ln3'] = "Ödül, W5FF'nin başarısını kopyalayabilen her amatöre verilecektir."; +$lang['awards_ffma_description_ln4'] = "Daha fazla bilgi için şu bağlantıyı ziyaret edebilirsiniz: https://www.arrl. org/ffma."; /* ___________________________________________________________________________________________ -IOTA -- Use all 4 Lines of Text +IOTA – 4 Satır Metnin Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_iota_description_ln1'] = "IOTA Awards"; -$lang['awards_iota_description_ln2'] = "IOTA is an exciting and innovative activity program that has captured the interest of thousands of radio amateurs worldwide. Established in 1964, it promotes radio contacts with stations located on islands around the world to enhance the experience of all those active on the amateur bands. To achieve this, it draws on the widespread mystique surrounding islands."; -$lang['awards_iota_description_ln3'] = "It is administered by Islands On The Air (IOTA) Ltd (referred to as IOTA Management) in partnership with the Radio Society of Great Britain (RSGB). IOTA Management has grouped the world's islands into approximately 1200 'IOTA groups,' each having varying numbers of 'counters,' which are qualifying islands. These listings are published in the IOTA Directory and on the IOTA website. The objective for the IOTA Island Chaser is to make radio contact with at least one counter in as many of these groups as possible. The program has a well-defined set of rules and encourages friendly competition among chasers by publishing participant performance in an Honor Roll and annual listings, as well as recognizing it with certificates and prestigious awards."; -$lang['awards_iota_description_ln4'] = "You can also find this information on the IOTA WORLD website."; +$lang['awards_iota_description_ln1'] = "IOTA Ödülleri"; +$lang['awards_iota_description_ln2'] = "IOTA, dünya çapında binlerce radyo amatörünün ilgisini çeken heyecan verici ve yenilikçi bir aktivite programıdır. 1964 yılında kurulan bu program, radyo deneyimini geliştirmek için dünya çapındaki adalarda bulunan istasyonlarla radyo bağlantılarını teşvik etmektedir. Amatör gruplarda aktif olan herkes bunu başarmak için çevredeki adaların yaygın gizeminden yararlanıyor."; +$lang['awards_iota_description_ln3'] = "Büyük Britanya Radyo Topluluğu (RSGB) ortaklığında Islands On The Air (IOTA) Ltd (IOTA Yönetimi olarak anılır) tarafından yönetilmektedir. IOTA Yönetimi dünyadaki adaları yaklaşık olarak gruplandırmıştır. Her biri farklı sayıda 'sayaçlara' sahip olan ve uygun adalar olan 1200 'IOTA grubu' Bu listeler IOTA Rehberinde ve IOTA web sitesinde yayınlanır. IOTA Ada Avcısının amacı en az bir kişiyle telsiz bağlantısı kurmaktır. Program, iyi tanımlanmış bir dizi kurala sahip ve katılımcıların performansını bir Onur Listesinde ve yıllık listelerde yayınlayarak, ayrıca sertifikalar ve prestijli ödüllerle ödüllendirerek avcılar arasında dostça rekabeti teşvik ediyor." ; +$lang['awards_iota_description_ln4'] = "Bu bilgiyi IOTA WORLD web sitesinde de bulabilirsiniz." ; /* ___________________________________________________________________________________________ -POTA -- Use all 4 Lines of Text +POTA - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_pota_description_ln1'] = "POTA Awards"; -$lang['awards_pota_description_ln2'] = "Parks on the Air® (POTA) started in early 2017 when the ARRL's National Parks on the Air special event ended. A group of volunteers wanted to continue the fun beyond the one-year event, and thus, POTA was born."; -$lang['awards_pota_description_ln3'] = "POTA works similarly to SOTA, with Activators and Hunters. For the awards, there are several categories based on the number of parks, geographic areas, and more."; -$lang['awards_pota_description_ln4'] = "For more information about the available awards and categories, please visit the Parks on the Air® website."; +$lang['awards_pota_description_ln1'] = "POTA Ödülleri"; +$lang['awards_pota_description_ln2'] = "Parks on the Air® (POTA), ARRL'nin Ulusal Parklar on the Air özel etkinliğinin sona ermesiyle 2017'nin başlarında başladı. Bir grup gönüllü, eğlenceyi bir yıllık etkinliğin ötesinde de sürdürmek istedi ve böylece POTA doğdu."; +$lang['awards_pota_description_ln3'] = "POTA, Aktivatörler ve Avcılar ile SOTA'ya benzer şekilde çalışır. Ödüller için park sayısına, coğrafi bölgelere ve daha fazlasına dayalı çeşitli kategoriler vardır."; +$lang['awards_pota_description_ln4'] = "Mevcut ödüller ve kategoriler hakkında daha fazla bilgi için lütfen Yayındaki Parklar sayfasını ziyaret edin ® web sitesi."; /* ___________________________________________________________________________________________ -SIG -- Use all 4 Lines of Text +SIG - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_sig_description_ln1'] = "SIG Information"; -$lang['awards_sig_description_ln2'] = "The SIG or Signature Category provides the possibility to use any kind of 'Award Signature' for awards that are not implemented in Cloudlog."; -$lang['awards_sig_description_ln3'] = "The reason for this is that the common ADIF format provides only a few dedicated fields for certain awards. SIG still makes it possible to use and evaluate all other types of signature markers."; -$lang['awards_sig_description_ln4'] = "In the QSO processing, you will find two fields: 'SIG' contains the actual marker, which is also visible in the award evaluation, and 'SIG INFO,' which contains a description of the signature. Both fields are freely customizable."; - +$lang['awards_sig_description_ln1'] = "SIG Bilgileri"; +$lang['awards_sig_description_ln2'] = "SIG veya İmza Kategorisi, Cloudlog'da uygulanmayan ödüller için her türlü 'Ödül İmzasını' kullanma olanağı sağlar."; +$lang['awards_sig_description_ln3'] = "Bunun nedeni, ortak ADIF formatının belirli ödüller için yalnızca birkaç ayrılmış alan sağlamasıdır. SIG, diğer tüm imza işaretleyici türlerinin kullanılmasını ve değerlendirilmesini hâlâ mümkün kılmaktadır."; +$lang['awards_sig_description_ln4'] = "QSO işleminde iki alan bulacaksınız: 'SIG', ödül değerlendirmesinde de görülebilen asıl işaretçiyi içerir ve 'SIG INFO', imzanın açıklamasını içerir Her iki alan da serbestçe özelleştirilebilir."; /* ___________________________________________________________________________________________ -SOTA -- Use all 4 Lines of Text +SOTA - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_sota_description_ln1'] = "SOTA Awards"; -$lang['awards_sota_description_ln2'] = "SOTA (Summits On The Air) is an award scheme for radio amateurs that encourages portable operation in mountainous areas."; -$lang['awards_sota_description_ln3'] = "It is fully operational in nearly a hundred countries worldwide. Each country has its own Association that defines the recognized SOTA summits within that Association. Each summit earns the activators and chasers a score related to the height of the summit. Certificates are available for various scores, leading to the prestigious 'Mountain Goat' and 'Shack Sloth' trophies. An Honor Roll for Activators and Chasers is maintained in the SOTA online database."; -$lang['awards_sota_description_ln4'] = "For more information, please visit: https://www.sota.org.uk/."; +$lang['awards_sota_description_ln1'] = "SOTA Ödülleri"; +$lang['awards_sota_description_ln2'] = "SOTA (Canlı Zirveler), radyo amatörlerine yönelik, dağlık bölgelerde taşınabilir çalışmayı teşvik eden bir ödül programıdır."; +$lang['awards_sota_description_ln3'] = "Dünya çapında neredeyse yüze yakın ülkede tamamen faaliyet göstermektedir. Her ülkenin, bu Dernek içindeki tanınan SOTA zirvelerini tanımlayan kendi Birliği vardır. Her zirve, etkinleştiricilere ve takipçilere yüksekliğine bağlı olarak bir puan kazandırır. Zirvede, prestijli 'Dağ Keçisi' ve 'Kulübe Tembelliği' ödüllerini kazandıran çeşitli puanlar için sertifikalar mevcuttur. Aktivatörler ve Kovalayıcılar için bir Onur Listesi SOTA çevrimiçi veritabanında tutulmaktadır."; +$lang['awards_sota_description_ln4'] = "Daha fazla bilgi için lütfen şu adresi ziyaret edin: https://www.sota.org. İngiltere/."; /* ___________________________________________________________________________________________ -US Counties -- Use all 4 Lines of Text +ABD İlçeleri - 4 Satır Metnin Tümünü Kullanın ___________________________________________________________________________________________ */ -$lang['awards_counties_description_ln1'] = "US County Award"; -$lang['awards_counties_description_ln2'] = "The United States of America Counties Award (USA-CA), sponsored by CQ magazine, is issued for confirmed two-way radio contacts with specified numbers of U.S. counties under rules and conditions you can find here."; -$lang['awards_counties_description_ln3'] = "USA-CA is available to all licensed amateurs worldwide and is issued to individuals for all county contacts made, regardless of callsigns used, operating locations, or dates."; -$lang['awards_counties_description_ln4'] = "Special USA-CA awards are also available to SWLs on a heard basis."; - +$lang['awards_counties_description_ln1'] = "ABD Eyalet Ödülü"; +$lang['awards_counties_description_ln2'] = "CQ dergisi sponsorluğunda Amerika Birleşik Devletleri Eyaletleri Ödülü (USA-CA), bulabileceğiniz kurallar ve koşullar altında belirli sayıda ABD eyaletiyle onaylanmış iki yönlü telsiz bağlantıları için verilir < a href='https://cq-amateur-radio.com/cq_awards/cq_usa_ca_awards/cq_usa_ca_awards.html' target='_blank'>buraya."; +$lang['awards_counties_description_ln3'] = "USA-CA, dünya çapındaki tüm lisanslı amatörlerin kullanımına açıktır ve kullanılan çağrı işaretlerine, çalışma yerlerine veya tarihlere bakılmaksızın, ilçede kurulan tüm bağlantılar için bireylere verilir."; +$lang['awards_counties_description_ln4'] = "Özel ABD-CA ödülleri ayrıca SWL'ler için de dinlenme esasına göre mevcuttur."; /* ___________________________________________________________________________________________ -US Gridmaster -- Use all 4 Lines of Text +US Gridmaster - Metnin 4 Satırının Tümünü Kullanın ___________________________________________________________________________________________ */ -$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "ABD Gridmaster Ödülü"; +$lang['awards_us_gridmaster_description_ln2'] = "GridMaster Ödülü, ilk olarak 2014 yılında Star Comm Group tarafından tanıtılan en prestijli AMSAT ödülüdür. ABD'deki 488 Kılavuz karesinin tamamını çalışmayı başaran dünya çapındaki tüm amatör radyo operatörlerine açıktır. uydu ve her kişi için QSL onayları sağlayabilir."; +$lang['awards_us_gridmaster_description_ln3'] = "web sitesinden alınan resmi bilgi: İki yönlü iletişim kurulmalı Her bir şebeke ile amatör uydu aracılığıyla, minimum sinyal raporuna gerek yoktur. Temasların aynı yerden veya aralarında 200 kilometreden fazla mesafe bulunmayan yerlerden yapılması gerekmektedir. mesafe kuralı: Bireyler, 200 kilometrelik farklı bir daire içindeki başka bir yerden birden fazla GridMaster ödülüne başvurabilir ve ödül alabilirler."; +$lang['awards_us_gridmaster_description_ln4'] = "Bu harita yalnızca SAT üzerinde çalışan QSO'ları gösterir."; /* ___________________________________________________________________________________________ -JA Gridmaster -- Use all 4 Lines of Text +JA Gridmaster - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; -$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; -$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Ödülü"; +$lang['awards_ja_gridmaster_description_ln2'] = "Tıpkı ABD Gridmaster'ı gibi bu Ödül de Japonya'nın tüm gridsquare'lerinde çalışmaya dayanmaktadır."; +$lang['awards_ja_gridmaster_description_ln3'] = "Bu ödülle ilgili ek bilgiler ve kurallar halen beklemededir."; $lang['awards_ja_gridmaster_description_ln4'] = ""; - - /* ___________________________________________________________________________________________ -VUCC -- Use all 4 Lines of Text +VUCC - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award"; -$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band."; -$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: Click here."; -$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant."; +$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Yüzyıl Kulübü Ödülü"; +$lang['awards_vucc_description_ln2'] = "VHF/UHF Century Club Ödülü, istenilen bantta üzerinde çalışılan ve onaylanan minimum sayıda kareye verilir."; +$lang['awards_vucc_description_ln3'] = "Resmi bilgiler ve kurallar bu belgede bulunabilir: Buraya tıklayın ."; +$lang['awards_vucc_description_ln4'] = "Yalnızca VHF/UHF bantları uygundur."; /* ___________________________________________________________________________________________ -WAS -- Use all 4 Lines of Text +WAS - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_was_description_ln1'] = "WAS Award"; -$lang['awards_was_description_ln2'] = "ARRL's most popular award is the Worked All States Award. Thousands upon thousands of awards have been issued to hams around the world. In ARRL's 101st year, they have redesigned the certificates and the program in hopes of streamlining and improving the award program."; -$lang['awards_was_description_ln3'] = "The WAS (Worked All States) Award is available to all amateurs worldwide who submit proof with written confirmation of contacts with each of the 50 states of the United States of America. Amateurs in the U.S. and its possessions must be members of ARRL to apply for a WAS. Applicants from outside the U.S. are exempt from this requirement."; -$lang['awards_was_description_ln4'] = "All information and rules for the ARRL WAS Award can be found here."; +$lang['awards_was_description_ln1'] = "WAS Ödülü"; +$lang['awards_was_description_ln2'] = "ARRL'nin en popüler ödülü, Çalışılan Tüm Eyaletler Ödülü'dür. Dünya çapında amatörlere binlerce ve binlerce ödül verilmiştir. ARRL'nin 101. yılında, sertifikaları ve programı yeniden tasarladılar. ödül programının düzenlenmesi ve iyileştirilmesi."; +$lang['awards_was_description_ln3'] = "WAS (Tüm Eyaletlerde Çalışıldı) Ödülü, Amerika Birleşik Devletleri'nin 50 eyaletinin her biriyle iletişimlerinin yazılı onayını içeren kanıt sunan dünya çapındaki tüm amatörlere açıktır. ABD'deki ve ABD'deki amatörler ABD dışından başvuranlar bu şarttan muaftır."; +$lang['awards_was_description_ln4'] = "ARRL WAS Ödülüne ilişkin tüm bilgi ve kuralları burada bulabilirsiniz. "; /* ___________________________________________________________________________________________ -WWFF -- Use all 4 Lines of Text +WWFF -- Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"; -$lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; -$lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; -$lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; +$lang['awards_wwff_description_ln1'] = "WWFF - Dünya Çapında Bitki ve Hayvan Ödülü"; +$lang['awards_wwff_description_ln2'] = "WWFF, Amatör Radyoda Dünya Çapında Flora ve Fauna, lisanslı amatör radyo operatörlerini barakalarından ayrılmaya ve dünya çapında Korunan Flora ve Fauna alanlarında (PFF) taşınabilir olarak çalışmaya teşvik eder."; +$lang['awards_wwff_description_ln3'] = "Dünya çapında 26.000'den fazla Korunan Bitki ve Hayvan (PFF) alanı WWFF Dizininde zaten kayıtlı. Avcılar ve Aktivatörler hem küresel hem de ulusal düzeyde renkli ödüller için başvurabilirler."; +$lang['awards_wwff_description_ln4'] = "Daha fazla bilgi için lütfen şu adresi ziyaret edin: https://wwff.co/awards/."; /* ___________________________________________________________________________________________ -WAJA -- Use all 4 Lines of Text +WAJA - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; -$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; -$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; +$lang['awards_waja_description_ln1'] = "WAJA - Tüm Japonya Eyaletlerinde Çalıştı Ödülü"; +$lang['awards_waja_description_ln2'] = "WAJA, Amatör Radyoda Tüm Japonya vilayetlerinde Çalıştı, lisanslı amatör radyo operatörlerini Japonya'daki tüm vilayetlerde çalışmaya teşvik ediyor."; +$lang['awards_waja_description_ln3'] = "Japonya'nın 47 vilayetinin her birinde bulunan amatör bir istasyonla iletişime geçtiği (duyduğu) ve QSL kartı aldığı iddia edilebilir. QSL kartlarının bir listesi WAJA sırasına göre düzenlenmelidir ( HAJA) referans numarası, ancak il adları atlanabilir."; +$lang['awards_waja_description_ln4'] = "Daha fazla bilgi için lütfen şu adresi ziyaret edin: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; - /* + /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB - Metnin 3 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; -$lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; -$lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_waja_description_ln1'] = "WAB - Tüm Britanya'da Çalıştı Ödülü"; +$lang['awards_wab_description_ln2'] = "Amatör Radyo Tüm Britanya'da Çalıştı (WAB) Ödülü, amatör radyo topluluğu içinde Birleşik Krallık genelindeki iletişim başarılarını kutlayan prestijli bir tanınma programıdır. WAB Ödülü programı radyo operatörlerini istasyonlarla iletişim kurmaya teşvik eder Britanya'nın farklı bölgelerinde bulunan, dostluğu teşvik eden ve radyo iletişim becerilerini destekleyen WAB Ödülünü kazanmak için, katılımcıların Ordnance Survey Kılavuz kareleri tarafından tanımlanan belirli WAB alanlarında bulunan istasyonlarla başarılı radyo bağlantıları kurmaları gerekir. İngiltere, İskoçya, Galler ve bazı açık deniz adaları da dahil olmak üzere Büyük Britanya'nın."; +$lang['awards_wab_description_ln3'] = "WAB Ödülü programındaki katılımcılar, radyo bağlantıları sırasında konumları, sinyal güçleri ve WAB kare referansı gibi bilgileri paylaşırlar. Puanlar, atanmış farklı puan değerleri ile, iletişim kurulan istasyonun konumuna göre verilir. Başarılı bağlantılardan puan toplayarak, telsiz operatörleri, her biri amatör telsiz yolculuklarında önemli bir dönüm noktasını temsil eden çeşitli ödül seviyelerinde ilerleyebilirler. WAB Ödülü, yalnızca telsiz operatörlerinin özveri ve becerilerini ödüllendirmektedir. coğrafi çeşitliliği teşvik eder ve amatör radyo aracılığıyla Britanya'nın her yerindeki zengin dokuların keşfedilmesini teşvik eder."; +$lang['awards_waja_description_ln4'] = "Daha fazla bilgi için lütfen şu adresi ziyaret edin: https://wab.intermip.net /default.php."; diff --git a/application/language/turkish/contesting_lang.php b/application/language/turkish/contesting_lang.php index aab3bd346..0e58e6059 100644 --- a/application/language/turkish/contesting_lang.php +++ b/application/language/turkish/contesting_lang.php @@ -2,22 +2,22 @@ defined('BASEPATH') OR exit('Doğrudan komut dosyası erişimine izin verilmez'); -$lang['contesting_page_title'] = 'Contest Logging'; +$lang['contesting_page_title'] = 'Yarışma Kayıtları'; $lang['contesting_button_reset_contest_session'] = 'Yarışma oturumunu baştan başlat'; -$lang['contesting_operator_callsign'] = 'Operator Callsign'; +$lang['contesting_operator_callsign'] = 'Operatör Çağrı kodu'; $lang['contesting_exchange_type'] = 'Haberleşme Tipi'; $lang['contesting_exchange_type_serial'] = 'Seri numarası'; -$lang['contesting_exchange_type_none'] = 'None'; -$lang['contesting_exchange_type_exchange'] = 'Exchange'; -$lang['contesting_exchange_type_gridsquare'] = 'Gridsquare'; +$lang['contesting_exchange_type_none'] = 'Hiçbiri'; +$lang['contesting_exchange_type_exchange'] = 'Değiş tokuş'; +$lang['contesting_exchange_type_gridsquare'] = 'Kılavuz karesi '; $lang['contesting_exchange_type_other'] = 'Diğer'; -$lang['contesting_exchange_type_serial_exchange'] = 'Serial + Exchange'; -$lang['contesting_exchange_type_serial_gridsquare'] = 'Serial + Gridsquare'; -$lang['contesting_exchange_serial_s'] = 'Serial (S)'; -$lang['contesting_exchange_serial_r'] = 'Serial (R)'; -$lang['contesting_exchange_gridsquare_s'] = 'Gridsquare (S)'; -$lang['contesting_exchange_gridsquare_r'] = 'Gridsquare (R)'; +$lang['contesting_exchange_type_serial_exchange'] = 'Seri + değiş tokuş'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Seri + Kılavuz karesi'; +$lang['contesting_exchange_serial_s'] = 'Seri (S)'; +$lang['contesting_exchange_serial_r'] = 'Seri (R)'; +$lang['contesting_exchange_gridsquare_s'] = ' Kılavuz karesi (S)'; +$lang['contesting_exchange_gridsquare_r'] = ' Kılavuz karesi (R)'; $lang['contesting_contest_name'] = 'Yarışma İsmi'; @@ -27,12 +27,11 @@ $lang['contesting_title_callsign_suggestions'] = 'Çağrı Kodu Önerileri'; $lang['contesting_title_contest_logbook'] = 'Yarışma kayıt defteri'; -$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!'; -$lang['contesting_copy_exch_to_none'] = 'Copy received exchange to no additional field in the database!'; -$lang['contesting_copy_exch_to_power'] = 'Copy received exchange to RX-Power field in the database!'; -$lang['contesting_copy_exch_to_state'] = 'Copy received exchange to US-State field in the database!'; -$lang['contesting_copy_exch_to_age'] = 'Copy received exchange to Age field in the database!'; -$lang['contesting_copy_exch_to_name'] = 'Copy received exchange to Name field in the database!'; -$lang['contesting_copy_exch_to_locator'] = 'Copy received exchange to Locator field in the database!'; - +$lang['contesting_copy_exch_to_dok'] = 'Alınan değiş tokuşu veritabanındaki DOK alanına kopyalayın!'; +$lang['contesting_copy_exch_to_none'] = 'Alınan değiş tokuşu veritabanındaki hiçbir ek alana kopyala!'; +$lang['contesting_copy_exch_to_power'] = 'Alınan değiş tokuşu veritabanındaki RX-Power alanına kopyalayın!'; +$lang['contesting_copy_exch_to_state'] = 'Alınan değiş tokuşu veri tabanındaki ABD-Eyalet alanına kopyala!'; +$lang['contesting_copy_exch_to_age'] = 'Alınan değiş tokuşu veritabanındaki Yaş alanına kopyala!'; +$lang['contesting_copy_exch_to_name'] = 'Alınan değiş tokuşu veritabanındaki Ad alanına kopyala!'; +$lang['contesting_copy_exch_to_locator'] = 'Alınan değiş tokuşu veritabanındaki Konum Belirleyici alanına kopyalayın!'; diff --git a/application/language/turkish/export_lang.php b/application/language/turkish/export_lang.php index dd3d81f86..3dd982cbb 100644 --- a/application/language/turkish/export_lang.php +++ b/application/language/turkish/export_lang.php @@ -1,75 +1,73 @@ application/language/english/general_words_lang.php -// $lang['general_word_yes'] --> application/language/english/general_words_lang.php -// $lang['general_word_no'] --> application/language/english/general_words_lang.php -// $lang['general_word_requested'] --> application/language/english/general_words_lang.php -// $lang['general_word_queued'] --> application/language/english/general_words_lang.php -// $lang['general_word_invalid_ignore'] --> application/language/english/general_words_lang.php -$lang['filter_qsl_verified'] = 'Verified'; - -// $lang['general_word_qslcard_bureau'] --> application/language/english/general_words_lang.php -// $lang['general_word_qslcard_direct'] --> application/language/english/general_words_lang.php -// $lang['general_word_qslcard_electronic'] --> application/language/english/general_words_lang.php -// $lang['general_word_qslcard_manager'] --> application/language/english/general_words_lang.php - -/* -___________________________________________________________________________________________ -General Filters -___________________________________________________________________________________________ -*/ - -$lang['filter_general_from'] = 'From'; -$lang['filter_general_to'] = 'to'; -// $lang['gen_hamradio_de'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_dx'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_dxcc'] --> application/language/english/general_words_lang.php -$lang['filter_general_none'] = '- NONE - (e.g. /MM, /AM)'; -// $lang['gen_hamradio_state'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_gridsquare'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_mode'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_band'] --> application/language/english/general_words_lang.php - -$lang['filter_general_propagation'] = 'Propagation'; -// $lang['gen_hamradio_cq_zone'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_iota'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_sota'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php - -/* -___________________________________________________________________________________________ -Actions -___________________________________________________________________________________________ -*/ - -$lang['filter_actions_w_selected'] = 'With selected: '; -$lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; -$lang['filter_actions_not_sent'] = 'Not Sent'; -$lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; -$lang['filter_actions_create_adif'] = 'Create ADIF'; -$lang['filter_actions_print_label'] = 'Print Label'; -$lang['filter_actions_start_print_title'] = 'Print Labels'; -$lang['filter_actions_print_include_via'] = "Include Via"; -$lang['filter_actions_print_include_grid'] = 'Include Grid?'; -$lang['filter_actions_start_print'] = 'Start printing at?'; -$lang['filter_actions_print'] = 'Print'; -$lang['filter_actions_qsl_slideshow'] = 'QSL Slideshow'; -$lang['filter_actions_delete'] = 'Delete'; -$lang['filter_actions_delete_warning'] = "Warning! Are you sure you want to delete the marked QSO(s)?"; - - -/* -___________________________________________________________________________________________ -Options -___________________________________________________________________________________________ -*/ - -$lang['filter_options_title'] = 'Options for the Advanced Logbook'; -$lang['filter_options_column'] = 'Column'; -$lang['filter_options_show'] = 'Show'; -// $lang['general_word_datetime'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_de'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_dx'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_mode'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_rsts'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_rstr'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_band'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_myrefs'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_refs'] --> application/language/english/general_words_lang.php -// $lang['general_word_name'] --> application/language/english/general_words_lang.php -// $lang['filter_qsl_via'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_qsl'] --> application/language/english/general_words_lang.php -// $lang['lotw_short'] --> application/language/english/lotw_lang.php -// $lang['eqsl_short'] --> application/language/english/eqsl_lang.php -// $lang['gen_hamradio_qslmsg'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_dxcc'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_state'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_cq_zone'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_iota'] --> application/language/english/general_words_lang.php -// $lang['gen_hamradio_sota'] --> application/language/english/general_words_lang.php -// $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_options_close'] = 'Close'; \ No newline at end of file + uygulama/dil/english/general_words_lang.php +// $lang['general_word_yes'] --> uygulama/dil/english/general_words_lang.php +// $lang['general_word_no'] --> uygulama/dil/english/general_words_lang.php +// $lang['general_word_requested'] --> uygulama/dil/english/general_words_lang.php +// $lang['general_word_queued'] --> uygulama/dil/english/general_words_lang.php +// $lang['general_word_invalid_ignore'] --> uygulama/dil/english/general_words_lang.php +$lang['filter_qsl_verified'] = 'Doğrulandı'; + +// $lang['general_word_qslcard_bureau'] --> uygulama/dil/english/general_words_lang.php +// $lang['general_word_qslcard_direct'] --> uygulama/dil/english/general_words_lang.php +// $lang['general_word_qslcard_electronic'] --> uygulama/dil/english/general_words_lang.php +// $lang['general_word_qslcard_manager'] --> uygulama/dil/english/general_words_lang.php +/* +___________________________________________________________________________________________ +General Filters +___________________________________________________________________________________________ +*/ + +$lang['filter_general_from'] = 'From'; +$lang['filter_general_to'] = 'to'; +// $lang['gen_hamradio_de'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_dx'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_dxcc'] --> application/language/english/general_words_lang.php +$lang['filter_general_none'] = '- NONE - (e.g. /MM, /AM)'; +// $lang['gen_hamradio_state'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_gridsquare'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_mode'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_band'] --> application/language/english/general_words_lang.php + +$lang['filter_general_propagation'] = 'Yayılma'; +// $lang['gen_hamradio_cq_zone'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_iota'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_sota'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php + +/* +___________________________________________________________________________________________ +Actions +___________________________________________________________________________________________ +*/ +$lang['filter_actions_w_selected'] = 'Seçiliyken: '; +$lang['filter_actions_update_f_callbook'] = 'Arama Defterinden Güncelle'; +$lang['filter_actions_queue_bureau'] = 'Bürodan Kuyruk'; +$lang['filter_actions_queue_direct'] = 'Doğrudan Kuyruk'; +$lang['filter_actions_queue_electronic'] = 'Elektronik Sıra'; +$lang['filter_actions_sent_bureau'] = 'Gönderildi (Büro)'; +$lang['filter_actions_sent_direct'] = 'Gönderildi (Doğrudan)'; +$lang['filter_actions_sent_electronic'] = 'Gönderildi (Elektronik)'; +$lang['filter_actions_not_sent'] = 'Gönderilmedi'; +$lang['filter_actions_qsl_n_required'] = 'QSL Gerekli Değil'; +$lang['filter_actions_recv_bureau'] = 'Alındı (Büro)'; +$lang['filter_actions_recv_direct'] = 'Alındı (Doğrudan)'; +$lang['filter_actions_recv_electronic'] = 'Alındı (Elektronik)'; +$lang['filter_actions_create_adif'] = 'ADIF Oluştur'; +$lang['filter_actions_print_label'] = 'Etiketi Yazdır'; +$lang['filter_actions_start_print_title'] = 'Etiketleri Yazdır'; +$lang['filter_actions_print_include_via'] = "Şununla Ekle"; +$lang['filter_actions_print_include_grid'] = 'Kılavuz karesi dahil edilsin mi?'; +$lang['filter_actions_start_print'] = 'Yazdırmaya şu saatte başlansın mı?'; +$lang['filter_actions_print'] = 'Yazdır'; +$lang['filter_actions_qsl_slideshow'] = 'QSL Slayt Gösterisi'; +$lang['filter_actions_delete'] = 'Sil'; +$lang['filter_actions_delete_warning'] = "Uyarı! İşaretli QSO'ları silmek istediğinizden emin misiniz?"; + + +/* +___________________________________________________________________________________________ +Seçenekler +___________________________________________________________________________________________ +*/ + +$lang['filter_options_title'] = 'Gelişmiş Kayıt Defteri Seçenekleri'; +$lang['filter_options_column'] = 'Sütun'; +$lang['filter_options_show'] = 'Göster'; +// $lang['general_word_datetime'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_de'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_dx'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_mode'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_rsts'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_rstr'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_band'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_myrefs'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_refs'] --> uygulama/dil/english/general_words_lang.php +// $lang['general_word_name'] --> uygulama/dil/english/general_words_lang.php +// $lang['filter_qsl_via'] --> application/language/english/general_words_lang.php +// $lang['gen_hamradio_qsl'] --> uygulama/dil/english/general_words_lang.php +// $lang['lotw_short'] --> uygulama/dil/english/lotw_lang.php +// $lang['eqsl_short'] --> uygulama/dil/english/eqsl_lang.php +// $lang['gen_hamradio_qslmsg'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_dxcc'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_state'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_cq_zone'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_iota'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_sota'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_wwff'] --> uygulama/dil/english/general_words_lang.php +// $lang['gen_hamradio_pota'] --> uygulama/dil/english/general_words_lang.php +// $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Arama Operatörü'; +$lang['filter_options_close'] = 'Kapat'; +$lang['filter_options_close'] = 'Close'; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 2bafe1637..166ad3f59 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -7,32 +7,32 @@ $lang['notice_turn_the_radio_on'] = 'Bu gün hiç bir QSO yapmadınız. Telsizi açmanın zamanı geldi!'; $lang['general_word_important'] = 'Önemli'; -$lang['general_word_warning'] = 'Warning'; -$lang['general_word_danger'] = 'DANGER'; -$lang['general_word_maintenance'] = 'Maintenance'; +$lang['general_word_warning'] = 'Uyarı'; +$lang['general_word_danger'] = 'TEHLİKE!'; +$lang['general_word_maintenance'] = 'Bakım Onarım'; $lang['general_word_info'] = 'Bilgiler'; $lang['general_word_choose_file'] = 'Dosya seç'; -$lang['general_word_next'] = 'Next'; +$lang['general_word_next'] = 'Sonraki'; $lang['general_word_previous'] = 'Previous'; -$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_cancel'] = "İptal"; $lang['general_word_ok'] = "OK"; -$lang['general_word_attention'] = "Attention"; -$lang['general_word_enabled'] = "Enabled"; +$lang['general_word_attention'] = "Dillat"; +$lang['general_word_enabled'] = "Etkinleştirildi"; $lang['general_word_disabled'] = "Disabled"; -$lang['general_word_export'] = "Export"; -$lang['general_word_import'] = "Import"; -$lang['general_word_count'] = "Count"; -$lang['general_word_filtering_on'] = "Filtering on"; -$lang['general_word_not_display'] = "Not display"; -$lang['general_word_icon'] = "Icon"; -$lang['general_word_never'] = "Never"; +$lang['general_word_export'] = "Dışa Aktar"; +$lang['general_word_import'] = "İçe Aktar"; +$lang['general_word_count'] = "Miktar"; +$lang['general_word_filtering_on'] = "Filtrele"; +$lang['general_word_not_display'] = "Gösterme"; +$lang['general_word_icon'] = "Ikon"; +$lang['general_word_never'] = "Asla"; $lang['general_word_date'] = 'Tarih'; -$lang['general_word_startdate'] = "Start Date"; -$lang['general_word_enddate'] = "End Date"; +$lang['general_word_startdate'] = "Başlama Tarihi"; +$lang['general_word_enddate'] = "Sonum Tarihi"; $lang['general_word_time'] = 'Saat'; -$lang['general_word_time_on'] = 'Time on'; -$lang['general_word_time_off'] = 'Time off'; +$lang['general_word_time_on'] = 'Açılma Zamanı'; +$lang['general_word_time_off'] = 'Kapanma Zamanı'; $lang['general_word_datetime'] = 'Tarih/Saat'; $lang['general_word_none'] = 'Hiçbiri'; $lang['general_word_name'] = 'İsim'; @@ -43,33 +43,32 @@ $lang['general_word_satellite_short'] = 'Uydu'; $lang['general_word_notes'] = 'Notlar'; $lang['general_word_country'] = 'Ülke'; -$lang['general_word_city'] = 'City'; +$lang['general_word_city'] = 'Şehir'; $lang['general_word_total'] = 'Toplam'; $lang['general_word_year'] = 'Yıl'; $lang['general_word_month'] = 'Ay'; -$lang['general_word_day'] = "Day"; -$lang['general_word_days'] = "Days"; +$lang['general_word_day'] = "Gün"; +$lang['general_word_days'] = "Günler"; -$lang['general_word_colors'] = "Colors"; -$lang['general_word_light'] = "Light/Laser"; +$lang['general_word_colors'] = "Renkler"; +$lang['general_word_light'] = "Işık/Laser"; $lang['general_word_worked'] = 'Çalışılanlar'; $lang['general_word_worked_not_confirmed'] = "Worked not confirmed"; -$lang['general_word_not_worked'] = "Not worked"; +$lang['general_word_not_worked'] = "Çalışılmayan"; $lang['general_word_confirmed'] = 'Onaylanan'; -$lang['general_word_confirmation'] = "Confirmation"; +$lang['general_word_confirmation'] = "Onay"; $lang['general_word_needed'] = 'İstenenler'; -$lang['general_word_all'] = 'All'; +$lang['general_word_all'] = 'Hepsi'; $lang['general_word_no'] = 'Hayır'; $lang['general_word_yes'] = 'Evet'; $lang['general_word_method'] = 'Metod'; - $lang['general_word_sent'] = 'Gönderilen'; $lang['general_word_received'] = 'Gelen'; $lang['general_word_requested'] = 'İstenen'; $lang['general_word_queued'] = 'Sıralanan'; -$lang['general_word_table'] = "Table"; +$lang['general_word_table'] = "Tablo"; $lang['general_word_invalid_ignore'] = 'Geçersiz (Yok say)'; $lang['general_word_qslcard'] = 'QSL Kartı'; $lang['general_word_qslcard_management'] = 'QSL Yönetimi'; @@ -82,20 +81,20 @@ $lang['general_word_eqslcard'] = 'eQSL Card'; $lang['general_word_eqslcards'] = 'eQSL Kartları'; $lang['general_word_sstv_management'] = 'SSTV Management'; -$lang['general_word_sstvimages'] = 'SSTV Images'; +$lang['general_word_sstvimages'] = 'SSTV Resimleri'; $lang['general_sstv_upload'] = 'Uploaded SSTV images'; -$lang['general_sstv_upload_button'] = 'Upload SSTV image(s)'; +$lang['general_sstv_upload_button'] = 'SSTV resimlerini yükle'; $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; -$lang['general_word_details'] = 'Details'; -$lang['general_word_qso_data'] = 'QSO Data'; +$lang['general_word_details'] = 'Detaylar'; +$lang['general_word_qso_data'] = 'QSO Datası'; $lang['general_edit_qso'] = 'QSO değiştirme'; -$lang['general_mark_qsl_rx_bureau'] = 'QSL\'i alındı Olarak İşaretle (Ofis)'; +$lang['general_mark_qsl_rx_bureau'] = 'QSL\'i alındı Olarak İşaretle (Büro)'; $lang['general_mark_qsl_rx_direct'] = 'QSL\'i alındı Olarak İşaretle (Doğrudan)'; +$lang['general_mark_qsl_tx_bureau'] = 'QSL\'i Gönderildi Olarak İşaretle (Büro)'; $lang['general_mark_qsl_rx_electronic'] = 'QSL\'i alındı Olarak İşaretle (Elektronik)'; -$lang['general_mark_qsl_tx_bureau'] = 'QSL\'i Gönderildi Olarak İşaretle (Ofis)'; $lang['general_mark_qsl_tx_direct'] = 'QSL\'i Gönderildi Olarak İşaretle (Doğrudan)'; $lang['general_mark_qsl_requested'] = 'QSL\'i gerektiği gibi işaretleyin'; $lang['general_mark_qsl_requested_bureau'] = 'QSL\'i gerektiği gibi işaretleyin'; @@ -103,15 +102,15 @@ $lang['general_mark_qsl_not_required'] = 'QSL\'i gerekli değil olarak işaretleyin'; $lang['general_delete_qso'] = 'QSO\'yu sil'; -$lang['general_more_qso'] = 'More QSOs'; +$lang['general_more_qso'] = 'Daha QSOlar'; -$lang['general_lookup_qrz'] = 'Lookup on QRZ.com'; -$lang['general_lookup_hamqth'] = 'Lookup on HamQTH'; +$lang['general_lookup_qrz'] = "QRZ.com\'dan bak"; +$lang['general_lookup_hamqth'] = "HamQTH\'den bak"; $lang['general_total_distance'] = 'Topam mesafe'; // PHP Upload Warning -$lang['gen_max_file_upload_size'] = 'Maximum file upload size is '; +$lang['gen_max_file_upload_size'] = 'En fazla dosya boyu '; // Cloudlog Terms $lang['cloudlog_station_profile'] = 'İstasyon Konumu'; @@ -128,25 +127,25 @@ $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Mod'; -$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth'; -$lang['gen_hamradio_ant_el'] = 'Antenna Elevation'; +$lang['gen_hamradio_ant_az'] = 'Anten Azimutu'; +$lang['gen_hamradio_ant_el'] = 'Antenna Yüksekliği'; $lang['gen_hamradio_rst_sent'] = 'Gönderilen'; $lang['gen_hamradio_rst_rcvd'] = 'Alınan'; $lang['gen_hamradio_band'] = 'Bant'; -$lang['gen_hamradio_bandgroup'] = "Bandgroup"; +$lang['gen_hamradio_bandgroup'] = "Bant grubu"; $lang['gen_hamradio_band_rx'] = 'Bant (RX)'; $lang['gen_hamradio_frequency'] = 'Frekans'; $lang['gen_hamradio_frequency_rx'] = 'Frekans (RX)'; $lang['gen_hamradio_radio'] = 'Telsiz'; $lang['gen_hamradio_rsts'] = 'RST (G)'; $lang['gen_hamradio_rstr'] = 'RST (A)'; -$lang['gen_hamradio_refs'] = 'Refs'; -$lang['gen_hamradio_myrefs'] = 'My Refs'; +$lang['gen_hamradio_refs'] = 'Referanslar'; +$lang['gen_hamradio_myrefs'] = 'Benim referanslarım'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (G)'; $lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (A)'; $lang['gen_hamradio_qsl'] = 'QSL'; -$lang['gen_hamradio_qsltype'] = "QSL Type"; -$lang['gen_hamradio_qslvia'] = 'QSL via'; +$lang['gen_hamradio_qsltype'] = "QSL Tipi"; +$lang['gen_hamradio_qslvia'] = 'QSL üstünden'; $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Konum kodu'; $lang['gen_hamradio_transmit_power'] = 'Yayın Gücü (W)'; @@ -156,14 +155,14 @@ $lang['gen_hamradio_satellite_mode'] = 'Uydu Modu'; $lang['gen_hamradio_logbook'] = 'Kayıt defteri'; -$lang['gen_hamradio_award'] = "Award"; +$lang['gen_hamradio_award'] = "Ödüller"; -$lang['gen_hamradio_zones'] = 'Zones'; +$lang['gen_hamradio_zones'] = 'Alanlar'; $lang['gen_hamradio_cq_zone'] = 'CQ Alanı'; -$lang['gen_hamradio_itu_zone'] = 'ITU Zone'; +$lang['gen_hamradio_itu_zone'] = 'ITU Alanı'; $lang['gen_hamradio_dxcc'] = 'DXCC'; -$lang['gen_hamradio_deleted_dxcc'] = 'Deleted DXCC'; -$lang['gen_hamradio_continent'] = 'Continent'; +$lang['gen_hamradio_deleted_dxcc'] = 'Silinen DXCC'; +$lang['gen_hamradio_continent'] = 'Kıta'; $lang['gen_hamradio_usa_state'] = 'ABD Eyaleti'; $lang['gen_hamradio_county_reference'] = 'ABD İlçesi'; $lang['gen_hamradio_iota_reference'] = 'IOTA Referansı'; @@ -177,29 +176,29 @@ $lang['gen_hamradio_wwff'] = 'WWFF'; $lang['gen_hamradio_pota'] = 'POTA'; $lang['gen_hamradio_gridsquare'] = 'Pafta'; -$lang['gen_hamradio_get_gridsquare'] = 'Get Gridsquare'; -$lang['gen_hamradio_gridsquare_show'] = "Show Locator"; -$lang['gen_hamradio_latitude'] = "Latitude"; -$lang['gen_hamradio_longitude'] = "Longitude"; -$lang['gen_hamradio_bearing'] = "Bearing"; -$lang['gen_hamradio_distance'] = 'Distance'; +$lang['gen_hamradio_get_gridsquare'] = 'Paftayı bul'; +$lang['gen_hamradio_gridsquare_show'] = "Konumu göster"; +$lang['gen_hamradio_latitude'] = "Enlem"; +$lang['gen_hamradio_longitude'] = "Boylam"; +$lang['gen_hamradio_bearing'] = "Yön"; +$lang['gen_hamradio_distance'] = 'Mesafe'; $lang['gen_hamradio_operator'] = 'Operatör'; $lang['gen_hamradio_sig'] = 'İmza'; $lang['gen_hamradio_sig_info'] = 'İmza bilgisi'; // Find your CQ/ITU Zone -$lang['gen_find_zone_cq_part1'] = "If you don't know your CQ Zone then"; -$lang['gen_find_zone_itu_part1'] = "If you don't know your ITU Zone then"; -$lang['gen_find_zone_part2'] = "click here"; -$lang['gen_find_zone_part3'] = "to find it!"; +$lang['gen_find_zone_cq_part1'] = "Eğer CQ Alanınızı bilmiyorsanız"; +$lang['gen_find_zone_itu_part1'] = "Eğer ITU Alanınızı bilmiyorsanız"; +$lang['gen_find_zone_part2'] = "bulmak için buraya"; +$lang['gen_find_zone_part3'] = "basın!"; // Dashboard Words $lang['dashboard_you_have_had'] = 'Bu gün'; $lang['dashboard_qsos_today'] = 'QSO Yaptınız!'; $lang['dashboard_qso_breakdown'] = 'QSO\'ların Analizi'; $lang['dashboard_countries_breakdown'] = 'Ülke Analizi'; -$lang['gen_to_date'] = 'To date'; +$lang['gen_to_date'] = 'Tarihe'; $lang['gen_from_date'] = 'Tarihten itibaren'; @@ -208,23 +207,22 @@ $lang['error_no_logbook_found'] = 'Kayıt defteri bulunamadı. İstasyon Kayıt Defterleri altında bir kayıt defteri tanızlamanız lazım! Buradan yapın:'; $lang['copy_to_clipboard'] = 'Panoya kopyala'; +$lang['africa'] = 'Afrika'; +$lang['antarctica'] = 'Antartika'; +$lang['asia'] = 'Asya'; +$lang['europe'] = 'Avrupa'; +$lang['northamerica'] = 'Kuzey Amerika'; +$lang['oceania'] = 'Okyanusya'; +$lang['southamerica'] = 'Güney America'; -$lang['africa'] = 'Africa'; -$lang['antarctica'] = 'Antarctica'; -$lang['asia'] = 'Asia'; -$lang['europe'] = 'Europe'; -$lang['northamerica'] = 'North America'; -$lang['oceania'] = 'Oceania'; -$lang['southamerica'] = 'South America'; - -$lang['gen_band_selection'] = 'Band selection'; -$lang['general_word_today'] = 'Today'; +$lang['gen_band_selection'] = 'Band seçimi'; +$lang['general_word_today'] = 'Bugün'; -$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is'; -$lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; -$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; -$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; +$lang['dashboard_php_version_warning'] = "PHP sürümünüzü yükseltmeniz gerekiyor. Minimum sürüm 7.4'tür. Sürümünüz şu:"; +$lang['dashboard_country_files_warning'] = 'Ülke dosyalarını yenilemeniz lazım! Yapmak için buraya/a> gidin!'; +$lang['dashboard_locations_warning'] = 'İstasyon lokasyonunuz yok. Buraya here gidip yaratın!'; +$lang['dashboard_logbooks_warning'] = 'İstasyon Kayıt kitabınız yok. Buraya here gidip yaratın!'; -$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; +$lang['hams_at_no_activations_found'] = 'Yakın gelecekte aktivasyon bulunamadı. Sonra tekrar deneyin.'; -$lang['datatables_language'] = "en-GB"; +$lang['datatables_language'] = "tr-TR"; diff --git a/application/language/turkish/gridsquares_lang.php b/application/language/turkish/gridsquares_lang.php index 07bc32c96..044f20f21 100644 --- a/application/language/turkish/gridsquares_lang.php +++ b/application/language/turkish/gridsquares_lang.php @@ -1,36 +1,36 @@ '587', if SSL is used -> '465'"; -$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used."; -$lang['options_smtp_password_hint'] = "The password to log in to the mail server."; -$lang['options_send_testmail'] = "Send Test-Mail"; -$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings."; -$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong."; -$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct."; - -$lang['options_oqrs'] = 'OQRS Options'; -$lang['options_global_text'] = 'Global text'; -$lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; -$lang['options_grouped_search'] = 'Grouped search'; -$lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; -$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; -$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; -$lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; +$lang['options_email'] = 'E-posta'; +$lang['options_outgoing_protocol'] = 'Giden Protokol'; +$lang['options_smtp_encryption'] = 'SMTP Şifrelemesi'; +$lang['options_email_address'] = 'E-posta Adresi'; +$lang['options_email_sender_name'] = 'E-posta Gönderenin Adı'; +$lang['options_smtp_host'] = 'SMTP Ana Bilgisayarı'; +$lang['options_smtp_port'] = 'SMTP Bağlantı Noktası'; +$lang['options_smtp_username'] = 'SMTP Kullanıcı Adı'; +$lang['options_smtp_password'] = 'SMTP Şifresi'; +$lang['options_mail_settings_saved'] = "Ayarlar başarıyla kaydedildi."; +$lang['options_mail_settings_failed'] = "Ayarlar kaydedilirken bir şeyler ters gitti. Tekrar deneyin."; +$lang['options_outgoing_protocol_hint'] = "E-posta göndermek için kullanılacak protokol."; +$lang['options_smtp_encryption_hint'] = "E-postaların TLS ile mi yoksa SSL ile mi gönderileceğini seçin."; +$lang['options_email_address_hint'] = "E-postaların gönderildiği e-posta adresi, örneğin 'cloudlog@example.com'"; +$lang['options_email_sender_name_hint'] = "E-postayı gönderenin adı, örneğin 'Cloudlog'"; +$lang['options_smtp_host_hint'] = "Posta sunucusunun ana bilgisayar adı, örneğin 'mail.example.com' ('ssl://' veya 'tls://' olmadan)"; +$lang['options_smtp_port_hint'] = "Posta sunucusunun SMTP bağlantı noktası, örneğin TLS kullanılıyorsa -> '587', SSL kullanılıyorsa -> '465'"; +$lang['options_smtp_username_hint'] = "Posta sunucusuna giriş yapmak için kullanılan kullanıcı adı, genellikle kullanılan e-posta adresidir."; +$lang['options_smtp_password_hint'] = "Posta sunucusuna giriş yapmak için gereken şifre."; +$lang['options_send_testmail'] = "Test Postası Gönder"; +$lang['options_send_testmail_hint'] = "Eposta, hesap ayarlarınızda tanımlanan adrese gönderilecektir."; +$lang['options_send_testmail_failed'] = "Test postası başarısız oldu. Bir şeyler ters gitti."; +$lang['options_send_testmail_success'] = "Test postası gönderildi. E-posta ayarları doğru görünüyor."; +$lang['options_oqrs'] = 'OQRS Seçenekleri'; +$lang['options_global_text'] = 'Genel metin'; +$lang['options_this_text_is_an_opsiyonel_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Bu metin, OQRS sayfasının üstünde görüntülenebilecek isteğe bağlı bir metindir.'; +$lang['options_grouped_search'] = 'Gruplandırılmış arama'; +$lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Bu açık olduğunda, OQRS aktif olan tüm istasyon konumları aynı anda aranacaktır.'; +$lang['options_grouped_search_show_station_name'] = "Gruplandırılmış arama sonuçlarında istasyon konumu adını göster"; +$lang['options_grouped_search_show_station_name_hint'] = "Gruplandırılmış arama AÇIK ise, istasyon konumunun adının sonuçlar tablosunda gösterilip gösterilmeyeceğine karar verebilirsiniz."; +$lang['options_oqrs_options_have_been_saved'] = 'OQRS seçenekleri kaydedildi.'; $lang['options_dxcluster'] = 'DXCluster'; -$lang['options_dxcluster_provider'] = 'Provider of DXClusterCache'; -$lang['options_dxcluster_longtext'] = 'The Provider of the DXCluster-Cache. You can set up your own Cache with DXClusterAPI or use a public one'; -$lang['options_dxcluster_hint'] = 'URL of the DXCluster-Cache. e.g. https://dxc.jo30.de/dxcache'; +$lang['options_dxcluster_provider'] = 'DXClusterCache Sağlayıcısı'; +$lang['options_dxcluster_longtext'] = 'DXCluster-Cache Sağlayıcısı. DXClusterAPI ile kendi Önbelleğinizi oluşturabilir veya herkese açık bir önbellek kullanabilirsiniz'; +$lang['options_dxcluster_hint'] = "DXCluster-Cache'in URL'si. Örneğin. https://dxc.jo30.de/dxcache"; $lang['options_dxcluster_settings'] = 'DXCluster'; -$lang['options_dxcache_url_changed_to'] = 'DXCluster Cache URL changed to '; -$lang['options_dxcluster_maxage'] = 'Maximum Age of spots taken care of'; -$lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will be taken care at bandplan/lookup'; -$lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; -$lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; -$lang['options_dxcluster_decont_changed_to']='de continent changed to '; -$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; +$lang['options_dxcache_url_changed_to'] = "DXCluster Önbellek URL'si değiştirildi"; +$lang['options_dxcluster_maxage'] = 'Dikkate alınan noktaların Maksimum Yaşı'; +$lang['options_dxcluster_maxage_hint'] = 'Bant planında/aramada dikkate alınacak noktaların Dakika Cinsinden Yaşı'; +$lang['options_dxcluster_decont'] = 'Aşağıdaki kıtadan tespit edilen noktaları göster'; +$lang['options_dxcluster_maxage_changed_to']="Noktaların maksimum yaşı değiştirildi"; +$lang['options_dxcluster_decont_changed_to']="kıta olarak değiştirildi"; +$lang['options_dxcluster_decont_hint']='Yalnızca bu kıtadaki gözcülerin noktaları gösteriliyor'; -$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 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"; -$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'] = "Sürüm Bilgisi"; +$lang['options_version_dialog_close'] = "Kapat"; +$lang['options_version_dialog_dismiss'] = "Bir daha gösterme"; +$lang['options_version_dialog_settings'] = "Sürüm Bilgisi Ayarları"; +$lang['options_version_dialog_header'] = "Sürüm Bilgisi Başlığı"; +$lang['options_version_dialog_header_hint'] = "Sürüm bilgisi iletişim kutusunun başlığını değiştirebilirsiniz."; +$lang['options_version_dialog_header_changed_to'] = "Sürüm Bilgisi Başlığı şu şekilde değiştirildi"; +$lang['options_version_dialog_mode'] = "Sürüm Bilgisi Modu"; +$lang['options_version_dialog_mode_release_notes'] = "Yalnızca Sürüm Notları"; +$lang['options_version_dialog_mode_custom_text'] = "Yalnızca Özel Metin"; +$lang['options_version_dialog_mode_both'] = "Sürüm Notları ve Özel Metin"; +$lang['options_version_dialog_mode_disabled'] = "Devre Dışı"; +$lang['options_version_dialog_mode_hint'] = "Sürüm Bilgisi her kullanıcıya gösterilir. Kullanıcının, iletişim kutusunu okuduktan sonra kapatma seçeneği vardır. Yalnızca sürüm notlarını (githubdan alınan), yalnızca özel metni göstermek istiyorsanız seçin ya da her ikisini."; +$lang['options_version_dialog_custom_text'] = "Sürüm Bilgisi Özel Metni"; +$lang['options_version_dialog_custom_text_hint'] = "Bu, iletişim kutusunda gösterilen özel metindir."; +$lang['options_version_dialog_mode_changed_to'] = "Sürüm Bilgisi Modu şu şekilde değiştirildi"; +$lang['options_version_dialog_custom_text_saved'] = "Sürüm Bilgisi Özel Metni kaydedildi!"; +$lang['options_version_dialog_success_show_all'] = "Sürüm Bilgisi tüm kullanıcılara yeniden gösterilecek"; +$lang['options_version_dialog_success_hide_all'] = "Sürüm Bilgisi hiçbir kullanıcıya gösterilmeyecek"; +$lang['options_version_dialog_show_hide'] = "Tüm Kullanıcılar için Sürüm Bilgisi İletişim Kutusunu Göster/Gizle"; +$lang['options_version_dialog_show_all'] = "Tüm Kullanıcılar için Göster"; +$lang['options_version_dialog_hide_all'] = "Tüm Kullanıcılar için Gizle"; +$lang['options_version_dialog_show_all_hint'] = "Bu, bir sonraki sayfa yeniden yüklemelerinde tüm kullanıcılara sürüm iletişim kutusunu otomatik olarak gösterecektir."; +$lang['options_version_dialog_hide_all_hint'] = "Bu, tüm kullanıcılar için sürüm iletişim kutusunun otomatik olarak açılmasını devre dışı bırakacaktır."; -$lang['options_save'] = 'Save'; +$lang['options_save'] = 'Kaydet'; -// Bands +// Bantlar -$lang['options_bands'] = "Bands"; -$lang['options_bands_text_ln1'] = "Using the band list you can control which bands are shown when creating a new QSO."; -$lang['options_bands_text_ln2'] = "Active bands will be shown in the QSO 'Band' drop-down, while inactive bands will be hidden and cannot be selected."; -$lang['options_bands_create'] = "Create a band"; -$lang['options_bands_edit'] = "Edit Band"; -$lang['options_bands_activate_all'] = "Activate All"; -$lang['options_bands_activateall_warning'] = "Warning! Are you sure you want to activate all bands?"; -$lang['options_bands_deactivate_all'] = "Deactivate All"; -$lang['options_bands_deactivateall_warning'] = "Warning! Are you sure you want to deactivate all bands?"; +$lang['options_bands'] = "Bantlar"; +$lang['options_bands_text_ln1'] = "Bant listesini kullanarak yeni bir QSO oluştururken hangi bantların gösterileceğini kontrol edebilirsiniz."; +$lang['options_bands_text_ln2'] = "Aktif bantlar QSO 'Bant' açılır menüsünde gösterilecek, aktif olmayan bantlar ise gizlenecek ve seçilemeyecek."; +$lang['options_bands_create'] = "Bir grup oluşturun"; +$lang['options_bands_edit'] = "Bandı Düzenle"; +$lang['options_bands_activate_all'] = "Tümünü Etkinleştir"; +$lang['options_bands_activateall_warning'] = "Uyarı! Tüm bantları etkinleştirmek istediğinizden emin misiniz?"; +$lang['options_bands_deactivate_all'] = "Tümünü Devre Dışı Bırak"; +$lang['options_bands_deactivateall_warning'] = "Uyarı! Tüm bantları devre dışı bırakmak istediğinizden emin misiniz?"; $lang['options_bands_ssb_qrg'] = "SSB QRG"; -$lang['options_bands_ssb_qrg_hint'] = "Frequency for SSB QRG in band (must be in Hz)"; -$lang['options_bands_data_qrg'] = "DATA QRG"; -$lang['options_bands_data_qrg_hint'] = "Frequency for DATA QRG in band (must be in Hz)"; +$lang['options_bands_ssb_qrg_hint'] = "Banttaki SSB QRG frekansı (Hz cinsinden olmalıdır)"; +$lang['options_bands_data_qrg'] = "VERİ QRG"; +$lang['options_bands_data_qrg_hint'] = "Banttaki DATA QRG frekansı (Hz cinsinden olmalıdır)"; $lang['options_bands_cw_qrg'] = "CW QRG"; -$lang['options_bands_cw_qrg_hint'] = "Frequency for CW QRG in band (must be in Hz)"; - -$lang['options_bands_name_band'] = "Name of Band (E.g. 20m)"; -$lang['options_bands_name_bandgroup'] = "Name of bandgroup (E.g. hf, vhf, uhf, shf)"; -$lang['options_bands_delete_warning'] = "Warning! Are you sure you want to delete the following band: "; +$lang['options_bands_cw_qrg_hint'] = "Banttaki CW QRG frekansı (Hz cinsinden olmalıdır)"; +$lang['options_bands_name_band'] = "Bant Adı (Örn. 20m)"; +$lang['options_bands_name_bandgroup'] = "Bant grubunun adı (Örn. hf, vhf, uhf, shf)"; +$lang['options_bands_delete_warning'] = "Uyarı! Aşağıdaki bandı silmek istediğinizden emin misiniz: "; diff --git a/application/language/turkish/qslcard_lang.php b/application/language/turkish/qslcard_lang.php index 9e0fc6d76..f808d6c46 100644 --- a/application/language/turkish/qslcard_lang.php +++ b/application/language/turkish/qslcard_lang.php @@ -1,39 +1,38 @@ here."; -$lang['qso_simplefle_qso_data'] = "QSO Data"; -$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; -$lang['qso_simplefle_qso_list'] = "QSO List"; -$lang['qso_simplefle_qso_list_total'] = "Total"; -$lang['qso_simplefle_qso_date'] = "QSO Date"; -$lang['qso_simplefle_operator'] = "Operator"; -$lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; -$lang['qso_simplefle_station_call_location'] = "Station Call/Location"; -$lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; -$lang['qso_simplefle_utc_time'] = "Current UTC Time"; -$lang['qso_simplefle_enter_the_data'] = "Enter the Data"; -$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_reload'] = "Reload QSO List"; -$lang['qso_simplefle_save'] = "Save in Cloudlog"; -$lang['qso_simplefle_clear'] = "Clear Logging Session"; -$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; - -$lang['qso_simplefle_error_band'] = "Band is missing!"; -$lang['qso_simplefle_error_mode'] = "Mode is missing!"; -$lang['qso_simplefle_error_time'] = "Time is not set!"; -$lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; -$lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; -$lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; -$lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; -$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; -$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; -$lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; -$lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; -$lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; -$lang['qso_simplefle_error_date'] = "Invalid date"; - -$lang['qso_simplefle_syntax_help_button'] = "Syntax Help"; -$lang['qso_simplefle_syntax_help_title'] = "Syntax for FLE"; -$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; -$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; -$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; -$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; -$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; -$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; -$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; -$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; - +$lang['qso_btn_edit_qso'] = 'QSO\'yu düzenleyin'; +$lang['qso_delete_warning'] = "Uyarı! QSO'yu silmek istediğinizden emin misiniz?"; + +// QSO Ayrıntıları + +$lang['qso_details'] = 'QSO ayrıntıları'; + +$lang['fav_add'] = 'Favorilere Bant/Mod Ekle'; +$lang['qso_operator_callsign'] = 'Operatör Çağrı İmzası'; +// Basit FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "Bu nedir?"; +$lang['qso_simplefle_info_ln1'] = "Basit Hızlı Günlük Girişi (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Hızlı Günlük Girişi' veya basitçe 'FLE', QSO'ları çok hızlı ve verimli bir şekilde günlüğe kaydeden bir sistemdir. Söz dizimi nedeniyle, çok az sayıda QSO'yu günlüğe kaydetmek için yalnızca minimum düzeyde giriş gerekir mümkün olduğunca çaba sarf edin."; +$lang['qso_simplefle_info_ln3'] = "FLE, orijinal olarak DF3CB tarafından yazılmıştır. Web sitesinde Windows için bir program sunmaktadır. Basit FLE, DF3CB'nin FLE'sini temel alarak OK2CQR tarafından yazılmıştır ve QSO'ları kaydetmek için bir web arayüzü sağlar."; +$lang['qso_simplefle_info_ln4'] = "Kağıt günlüklerinizi bir dış mekan oturumundan içe aktarmanız gerekiyorsa yaygın bir kullanım durumudur ve artık SimpleFLE, Cloudlog'da da mevcuttur. Sözdizimi ve FLE'nin nasıl çalıştığı hakkında bilgi şu adreste bulunabilir: buraya."; +$lang['qso_simplefle_qso_data'] = "QSO Verisi"; +$lang['qso_simplefle_qso_date_hint'] = "Tarih seçmezseniz bugünün tarihi kullanılacaktır."; +$lang['qso_simplefle_qso_list'] = "QSO Listesi"; +$lang['qso_simplefle_qso_list_total'] = "Toplam"; +$lang['qso_simplefle_qso_date'] = "QSO Tarihi"; +$lang['qso_simplefle_operator'] = "Operatör"; +$lang['qso_simplefle_operator_hint'] = "örn. OK2CQR"; +$lang['qso_simplefle_station_call_location'] = "İstasyon Çağrısı/Konumu"; +$lang['qso_simplefle_station_call_location_hint'] = "Yeni bir konumdan işlem yaptıysanız, önce yeni bir İstasyon Konumu oluşturun."; +$lang['qso_simplefle_utc_time'] = "Geçerli UTC Saati"; +$lang['qso_simplefle_enter_the_data'] = "Verileri Girin"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Örnek Veriyi Kapat ve Yükle"; +$lang['qso_simplefle_reload'] = "QSO Listesini Yeniden Yükle"; +$lang['qso_simplefle_save'] = "Cloudlog'a Kaydet"; +$lang['qso_simplefle_clear'] = "Günlük Oturumunu Temizle"; +$lang['qso_simplefle_refs_hint'] = "Referanslar SOTA, IOTA, POTA veya WWFF"; + +$lang['qso_simplefle_error_band'] = "Bant eksik!"; +$lang['qso_simplefle_error_mode'] = "Mod eksik!"; +$lang['qso_simplefle_error_time'] = "Zaman ayarlı değil!"; +$lang['qso_simplefle_error_stationcall'] = "İstasyon Çağrısı seçilmedi"; +$lang['qso_simplefle_error_operator'] = "'Operatör' Alanı boş"; +$lang['qso_simplefle_warning_reset'] = "Uyarı! Gerçekten her şeyi sıfırlamak istiyor musunuz?"; +$lang['qso_simplefle_warning_missing_band_mode'] = "Uyarı! QSO Listesini günlüğe kaydedemezsiniz çünkü bazı QSO'larda tanımlanmış bant ve/veya mod yoktur!"; +$lang['qso_simplefle_warning_missing_time'] = "Uyarı! QSO Listesini günlüğe kaydedemezsiniz çünkü bazı QSO'ların tanımlanmış bir zamanı yoktur!"; +$lang['qso_simplefle_warning_example_data'] = "Dikkat! Veri Alanı örnek veriler içerir. İlk Kayıt Oturumunu Temizleyin!"; +$lang['qso_simplefle_confirm_save_to_log'] = "Bu QSO'yu Günlüğe eklemek ve oturumu temizlemek istediğinizden emin misiniz?"; +$lang['qso_simplefle_success_save_to_log_header'] = "QSO Günlüğe Kaydedildi!"; +$lang['qso_simplefle_success_save_to_log'] = "QSO, kayıt defterine başarıyla kaydedildi!"; +$lang['qso_simplefle_error_date'] = "Geçersiz tarih"; + +$lang['qso_simplefle_syntax_help_button'] = "Söz Dizimi Yardımı"; +$lang['qso_simplefle_syntax_help_title'] = "FLE için Sözdizimi"; +$lang['qso_simplefle_syntax_help_ln1'] = "QSO'yu günlüğe kaydetmeye başlamadan önce lütfen temel kurallara dikkat edin."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Her yeni QSO yeni bir satırda olmalıdır."; +$lang['qso_simplefle_syntax_help_ln3'] = "- Her yeni satıra yalnızca önceki QSO'dan değişen verileri yazın."; +$lang['qso_simplefle_syntax_help_ln4'] = "Başlamak için soldaki formu tarih, istasyon çağrısı ve operatörün çağrısıyla birlikte doldurduğunuzdan emin olun. Ana veriler bandı (veya MHz cinsinden QRG'yi, örneğin '7.145) içerir. '), mod ve zaman. Zamandan sonra, aslında çağrı işareti olan ilk QSO'yu sağlarsınız."; +$lang['qso_simplefle_syntax_help_ln5'] = "Örneğin, 20m SSB'de 2M0SQL ile 21:34 (UTC)'de başlayan bir QSO."; +$lang['qso_simplefle_syntax_help_ln6'] = "Eğer herhangi bir RST bilgisi sağlamazsanız, sözdizimi 59'u (veri için 599) kullanacaktır. Bir sonraki QSO'muz her iki tarafta da 59 değildi, dolayısıyla bilgileri gönderilen RST ile sağlıyoruz ilki, ilk QSO'dan 2 dakika sonraydı."; +$lang['qso_simplefle_syntax_help_ln7'] = "İlk QSO 21:34'teydi, ikincisi ise 2 dakika sonra 21:36'daydı. Burada değişen tek veri bu olduğu için 6 yazdık. Bant ve mod hakkında bilgiler değişmediğinden bu veriler atlandı."; +$lang['qso_simplefle_syntax_help_ln8'] = "14 Mayıs 2021 saat 21:40'taki bir sonraki QSO'muz için bandı 40m olarak değiştirdik ancak hala SSB'deyiz. RST bilgisi verilmemişse sözdizimi her yeni QSO için 59'u kullanacak Bu nedenle iki gün sonra tam olarak aynı saatte gerçekleşen başka bir QSO'yu ekleyebiliriz. Tarih YYYY-AA-GG biçiminde olmalıdır."; +$lang['qso_simplefle_syntax_help_ln9'] = "Sözdizimi hakkında daha fazla bilgi için lütfen DF3CB web sitesine bakın ."; diff --git a/application/language/turkish/sstv_lang.php b/application/language/turkish/sstv_lang.php index 72c4c7d0d..ccb0ceafc 100644 --- a/application/language/turkish/sstv_lang.php +++ b/application/language/turkish/sstv_lang.php @@ -1,5 +1,5 @@ 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 click here!"; -$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 IOTA World website."; -$lang['station_location_sota_hint_ln1'] = "Station SOTA reference. You can look up SOTA references at the SOTA Maps website."; -$lang['station_location_wwff_hint_ln1'] = "Station WWFF reference. You can look up WWFF references at the GMA Map website."; -$lang['station_location_pota_hint_ln1'] = "Station POTA reference. You can look up POTA references at the POTA Map 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 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_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 HRDLog.net Userprofile page"; -$lang['station_location_qo100_hint'] = "Create your API key on 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'] = 'İstasyon Konumu'; +$lang['station_location_plural'] = "İstasyon Konumları"; +$lang['station_location_header_ln1'] = "İstasyon Konumları, sizin QTH'niz, bir arkadaşınızın QTH'si veya taşınabilir bir istasyon gibi çalışma konumlarını tanımlar."; +$lang['station_location_header_ln2'] = "Kayıt defterlerine benzer şekilde, istasyon profili bir dizi QSO'yu bir arada tutar."; +$lang['station_location_header_ln3'] = 'Aynı anda yalnızca bir istasyon etkin olabilir. Aşağıdaki tabloda bu, -Aktif İstasyon- etiketiyle gösterilmektedir.'; +$lang['station_location_create_header'] = 'İstasyon Konumunu Oluşturun'; +$lang['station_location_create'] = 'Bir İstasyon Konumu Oluşturun'; +$lang['station_location_edit'] = 'İstasyon Konumunu Düzenle: '; +$lang['station_location_updated_suff'] = ' Güncellendi.'; +$lang['station_location_warning'] = "Dikkat: Aktif bir istasyon konumu ayarlamanız gerekiyor. Birini seçmek için Çağrı İşareti->İstasyon Konumu'na gidin."; +$lang['station_location_resign_at'] = 'Lütfen bunları şu adrese yeniden atayın'; +$lang['station_location_warning_resign'] = "Cloudlog'daki son değişiklikler nedeniyle QSO'ları istasyon profillerinize yeniden atamanız gerekiyor."; +$lang['station_location_name'] = 'Profil Adı'; +$lang['station_location_name_hint'] = 'İstasyon konumunun kısa adı. Örneğin: Ev (IO87IP)'; +$lang['station_location_callsign'] = 'İstasyon Çağrı İşareti'; +$lang['station_location_callsign_hint'] = 'İstasyon çağrı işareti. Örneğin: 2M0SQL/P'; +$lang['station_location_power'] = 'İstasyon Gücü (W)'; +$lang['station_location_power_hint'] = 'Watt cinsinden varsayılan istasyon gücü. CAT tarafından üzerine yazıldı.'; +$lang['station_location_emptylog'] = 'Günlüğü Boşalt'; +$lang['station_location_confirm_active'] = 'Aşağıdaki istasyonu aktif istasyon yapmak istediğinizden emin misiniz: '; +$lang['station_location_set_active'] = 'Etkin Olarak Ayarla'; +$lang['station_location_active'] = 'Aktif İstasyon'; +$lang['station_location_claim_ownership'] = 'Sahiplik Talebi'; +$lang['station_location_confirm_del_qso'] = "Bu istasyon profilindeki tüm QSO'ları silmek istediğinizden emin misiniz?"; +$lang['station_location_confirm_del_stationlocation'] = 'İstasyon profilini silmek istediğinizden emin misiniz?'; +$lang['station_location_confirm_del_stationlocation_qso'] = "Bu, bu istasyon profilindeki tüm QSO'ları silecek mi?"; +$lang['station_location_dxcc'] = 'DXCC İstasyonu'; +$lang['station_location_dxcc_hint'] = 'İstasyon DXCC varlığı. Örneğin: İskoçya'; +$lang['station_location_dxcc_warning'] = "Burada bir dakika durun. Seçtiğiniz DXCC'nin tarihi geçmiş ve artık geçerli değil. Bu konum için hangi DXCC'nin doğru olduğunu kontrol edin. Eminseniz bu uyarıyı dikkate almayın."; +$lang['station_location_city'] = 'İstasyon Şehri'; +$lang['station_location_city_hint'] = 'İstasyon şehri. Örneğin: Inverness'; +$lang['station_location_state'] = 'İstasyon Durumu'; +$lang['station_location_state_hint'] = 'İstasyon durumu. Yalnızca belirli ülkeler için geçerlidir. Uygun değilse boş bırakın.'; +$lang['station_location_county'] = 'İstasyon İlçesi'; +$lang['station_location_county_hint'] = 'İstasyon İlçesi (Yalnızca ABD/Alaska/Hawaii için kullanılır).'; +$lang['station_location_gridsquare'] = 'İstasyon Izgara Meydanı'; +$lang['station_location_gridsquare_hint_ln1'] = "İstasyon kare kare. Örneğin: IO87IP. Izgara karenizi bilmiyorsanız burayı tıklayın!"; +$lang['station_location_gridsquare_hint_ln2'] = "Eğer bir ızgara çizgisi üzerinde bulunuyorsanız, virgüllerle ayrılmış birden fazla ızgara karesi girin. Örneğin: IO77,IO78,IO87,IO88."; +$lang['station_location_iota_hint_ln1'] = "İstasyon IOTA referansı. Örneğin: EU-005"; +$lang['station_location_iota_hint_ln2'] = "IOTA referanslarını IOTA World web sitesi."; +$lang['station_location_sota_hint_ln1'] = "İstasyon SOTA referansı. SOTA referanslarını SOTA Haritaları web sitesinde arayabilirsiniz. ."; +$lang['station_location_wwff_hint_ln1'] = "İstasyon WWFF referansı. WWFF referanslarını GMA Haritası web sitesi."; +$lang['station_location_pota_hint_ln1'] = "İstasyon POTA referansı. POTA referanslarını POTA Haritası web sitesi."; +$lang['station_location_signature'] = "İmza"; +$lang['station_location_signature_name'] = "İmza Adı"; +$lang['station_location_signature_name_hint'] = "İstasyon İmzası (örn. GMA).."; +$lang['station_location_signature_info'] = "İmza Bilgileri"; +$lang['station_location_signature_info_hint'] = "İstasyon İmza Bilgisi (örn. DA/NW-357)."; +$lang['station_location_eqsl_hint'] = 'eQSL Profilinizde yapılandırılan QTH Takma Adı'; +$lang['station_location_eqsl_defaultqslmsg'] = "Varsayılan QSLMSG"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Bu istasyon konumu için her QSO için doldurulacak ve gönderilecek varsayılan bir mesaj tanımlayın.";$lang['station_location_qrz_subscription'] = 'Abonelik Gerekli'; +$lang['station_location_qrz_hint'] = "API anahtarınızı QRZ.com Kayıt Defteri ayarları sayfasında bulun"; +$lang['station_location_qrz_realtime_upload'] = 'QRZ.com Kayıt Defteri Gerçek Zamanlı Yükleme'; +$lang['station_location_hrdlog_username'] = "HRDLog.net Kullanıcı Adı"; +$lang['station_location_hrdlog_username_hint'] = "HRDlog.net'te kayıtlı olduğunuz kullanıcı adı (genellikle çağrı kodunuz)."; +$lang['station_location_hrdlog_code'] = "HRDLog.net API Anahtarı"; +$lang['station_location_hrdlog_realtime_upload'] = "HRDLog.net Kayıt Defteri Gerçek Zamanlı Yükleme"; +$lang['station_location_hrdlog_code_hint'] = "API Kodunuzu HRDLog.net Kullanıcı Profili sayfasında oluşturun"; +$lang['station_location_qo100_hint'] = "API anahtarınızı QO-100 Dx Club'ınızın profil sayfasında oluşturun"; +$lang['station_location_qo100_realtime_upload'] = "QO-100 Dx Club Gerçek Zamanlı Yükleme"; +$lang['station_location_oqrs_enabled'] = "OQRS Etkin"; +$lang['station_location_oqrs_email_alert'] = "OQRS E-posta uyarısı"; +$lang['station_location_oqrs_email_hint'] = "Yönetici ve genel seçenekler altında e-postanın ayarlandığından emin olun."; +$lang['station_location_oqrs_text'] = "OQRS Metni"; +$lang['station_location_oqrs_text_hint'] = "QSL'leme ile ilgili eklemek istediğiniz bazı bilgiler."; +$lang['station_location_clublog_realtime_upload']='ClubLog Gerçek Zamanlı Yükleme'; diff --git a/application/language/turkish/statistics_lang.php b/application/language/turkish/statistics_lang.php index c995c0f2a..845318ed8 100644 --- a/application/language/turkish/statistics_lang.php +++ b/application/language/turkish/statistics_lang.php @@ -1,60 +1,59 @@ Your furthest contact was with"; -$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; -$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; -$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; -$lang['statistics_distances_qsos_with'] = "QSOs with"; -$lang['statistics_distances_and_band'] = "and band"; +$lang['statistics_distances_worked'] = "Çalışılan Mesafeler"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "kişiler planlandı.
    En uzak bağlantınız şununlaydı"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "gridsquare'de"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "mesafe şuydu"; +$lang['statistics_distances_number_of_qsos'] = "QSO sayısı"; +$lang['statistics_distances_callsigns_worked'] = "Çağrı işaretleri çalıştı (en fazla 5 tane gösterildi)"; +$lang['statistics_distances_qsos_with'] = "QSO'lar ile"; +$lang['statistics_distances_and_band'] = "ve bant"; /* * -* Timeline +* Zaman çizelgesi * */ -$lang['statistics_timeline'] = "Timeline"; +$lang['statistics_timeline'] = "Zaman Çizelgesi"; /* * -* Days with QSO +* QSO'lu günler * */ -$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'] = "Her yıl QSO'ların olduğu gün sayısı"; +$lang['statistics_days_with_qso_short'] = "QSO'lu Günler"; +$lang['statistics_dwq_longest_streak_in_log'] = "Günlükteki QSO'larla en uzun seri"; +$lang['statistics_dwq_longest_streak_in_log_hint'] = "Maksimum en uzun 10 seri gösteriliyor!"; +$lang['statistics_dwq_streak_continuous_days'] = "Seri (QSO'larla sürekli günler)"; +$lang['statistics_dwq_current_streak_in_log'] = "Günlükte QSO'ların bulunduğu mevcut seri"; +$lang['statistics_dwq_current_streak_continuous_days'] = "Geçerli seri (QSO'larla sürekli günler)"; +$lang['statistics_dwq_make_qso_to_extend_streak'] = "Eğer bugün QSO yaparsanız serinizi uzatmaya devam edebilirsiniz... yoksa mevcut seriniz bozulur!"; +$lang['statistics_dwq_no_current_streak'] = "Geçerli seri bulunamadı!"; From f603bf6b48157443c29c67aa461d2c3152791ffc Mon Sep 17 00:00:00 2001 From: cats-shadow Date: Fri, 17 May 2024 15:01:22 +0300 Subject: [PATCH 19/23] russian translation update --- application/language/russian/account_lang.php | 8 +++--- .../language/russian/contesting_lang.php | 26 +++++++++---------- application/language/russian/export_lang.php | 8 +++--- .../language/russian/general_words_lang.php | 18 ++++++------- application/language/russian/menu_lang.php | 8 +++--- application/language/russian/options_lang.php | 2 +- application/language/russian/qso_lang.php | 6 ++--- application/language/russian/sstv_lang.php | 2 +- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index dbf3b32d1..ac7811744 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -130,7 +130,7 @@ $lang['account_miscellaneous'] = "Разное"; $lang['account_hamsat'] = "Hams.at"; -$lang['account_hamsat_private_feed_key'] = "Private Feed Key"; -$lang['account_hamsat_hint'] = "See your profile at     https://hams.at/users/settings."; -$lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; -$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; +$lang['account_hamsat_private_feed_key'] = "Частный ключ RSS потока"; +$lang['account_hamsat_hint'] = "Ключ можно найти в вашем профиле по ссылке https://hams.at/users/settings."; +$lang['account_hamsat_workable_only'] = "Показывать только те витки, в которых возможно проведение QSO"; +$lang['account_hamsat_workable_only_hint'] = "Если включено, то будут показаны только те витки, в которых возможно проведение QSO, основываясь на квадрате, указанном в вашем аккаунте hams.at. Требует указания частного ключа RSS потока."; diff --git a/application/language/russian/contesting_lang.php b/application/language/russian/contesting_lang.php index f6638ae7c..cddebdc76 100644 --- a/application/language/russian/contesting_lang.php +++ b/application/language/russian/contesting_lang.php @@ -7,15 +7,15 @@ $lang['contesting_operator_callsign'] = 'Позывной оператора'; $lang['contesting_exchange_type'] = 'Тип обмена'; -$lang['contesting_exchange_type_serial'] = 'Номер'; +$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_gridsquare'] = 'Номер + Квадрат'; -$lang['contesting_exchange_serial_s'] = 'Номер (TX)'; -$lang['contesting_exchange_serial_r'] = 'Номер (RX)'; +$lang['contesting_exchange_type_serial_exchange'] = 'Порядковый номер + контрольный номер'; +$lang['contesting_exchange_type_serial_gridsquare'] = 'Порядковый номер + Квадрат'; +$lang['contesting_exchange_serial_s'] = 'Порядковый номер (TX)'; +$lang['contesting_exchange_serial_r'] = 'Порядковый номер (RX)'; $lang['contesting_exchange_gridsquare_s'] = 'Квадрат (TX)'; $lang['contesting_exchange_gridsquare_r'] = 'Квадрат (RX)'; @@ -27,12 +27,12 @@ $lang['contesting_title_callsign_suggestions'] = 'Предложение позывных'; $lang['contesting_title_contest_logbook'] = 'Журнал контеста'; -$lang['contesting_copy_exch_to_dok'] = 'Копировать принятую контроль в поле DOK базы данных!'; -$lang['contesting_copy_exch_to_none'] = 'Копировать принятую контроль в поле no additional базы данных!'; -$lang['contesting_copy_exch_to_power'] = 'Копировать принятую контроль в поле RX-Power базы данных!'; -$lang['contesting_copy_exch_to_state'] = 'Копировать принятую контроль в поле US-State базы данных!'; -$lang['contesting_copy_exch_to_age'] = 'Копировать принятую контроль в поле Age базы данных!'; -$lang['contesting_copy_exch_to_name'] = 'Копировать принятую контроль в поле Name базы данных!'; -$lang['contesting_copy_exch_to_locator'] = 'Копировать принятую контроль в поле Locator базы данных!'; +$lang['contesting_copy_exch_to_dok'] = 'Копировать принятый контрольный номер в поле DOK базы данных!'; +$lang['contesting_copy_exch_to_none'] = 'Копировать принятый контрольный номер в поле no additional базы данных!'; +$lang['contesting_copy_exch_to_power'] = 'Копировать принятый контрольный номер в поле RX-Power базы данных!'; +$lang['contesting_copy_exch_to_state'] = 'Копировать принятый контрольный номер в поле US-State базы данных!'; +$lang['contesting_copy_exch_to_age'] = 'Копировать принятый контрольный номер в поле Age базы данных!'; +$lang['contesting_copy_exch_to_name'] = 'Копировать принятый контрольный номер в поле Name базы данных!'; +$lang['contesting_copy_exch_to_locator'] = 'Копировать принятый контрольный номер в поле Locator базы данных!'; diff --git a/application/language/russian/export_lang.php b/application/language/russian/export_lang.php index 2c8b9273c..89aa75e23 100644 --- a/application/language/russian/export_lang.php +++ b/application/language/russian/export_lang.php @@ -47,7 +47,7 @@ $lang['export_cabrillo_select_year'] = "Выберите год"; $lang['export_cabrillo_select_contest'] = "Выберите контест"; $lang['export_cabrillo_select_date_range'] = "Выберите диапазон дат"; -$lang['export_cabrillo_club'] = "Клую"; +$lang['export_cabrillo_club'] = "Клуб"; $lang['export_cabrillo_cat_operator'] = "Категория оператора"; $lang['export_cabrillo_cat_operator_single_op'] = "Один оператор"; $lang['export_cabrillo_cat_operator_multi_op'] = "Много операторов"; @@ -55,13 +55,13 @@ $lang['export_cabrillo_cat_assisted'] = "Категория Assisted"; $lang['export_cabrillo_cat_assisted_not_ass'] = "Not Assisted"; $lang['export_cabrillo_cat_assisted_ass'] = "Assisted"; -$lang['export_cabrillo_cat_band'] = "Категория диапаон"; -$lang['export_cabrillo_cat_band_arrl_vhf'] = "VHF-3-BAND and VHF-FM-ONLY (ARRL VHF Contests only)"; +$lang['export_cabrillo_cat_band'] = "Категория диапазон"; +$lang['export_cabrillo_cat_band_arrl_vhf'] = "VHF-3-BAND and VHF-FM-ONLY (только для VHF контестов ARRL)"; $lang['export_cabrillo_cat_mode'] = "Категория вид модуляции"; $lang['export_cabrillo_cat_power'] = "Категория мощность"; $lang['export_cabrillo_cat_station'] = "Категория станция"; $lang['export_cabrillo_cat_transmitter'] = "Категория передатчик"; -$lang['export_cabrillo_cat_overlay'] = "Category Overlay"; +$lang['export_cabrillo_cat_overlay'] = "Категория Overlay"; $lang['export_cabrillo_operators'] = "Операторы"; $lang['export_cabrillo_soapbox'] = "Soapbox"; $lang['export_cabrillo_address'] = "Адрес"; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index bb95754ed..0bb111709 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -82,10 +82,10 @@ $lang['general_word_qslcard_via'] = 'через'; $lang['general_word_eqslcard'] = 'eQSL Card'; $lang['general_word_eqslcards'] = 'eQSL'; -$lang['general_word_sstv_management'] = 'SSTV Management'; -$lang['general_word_sstvimages'] = 'SSTV Images'; -$lang['general_sstv_upload'] = 'Uploaded SSTV images'; -$lang['general_sstv_upload_button'] = 'Upload SSTV image(s)'; +$lang['general_word_sstv_management'] = 'SSTV менеджмент'; +$lang['general_word_sstvimages'] = 'Изображения SSTV'; +$lang['general_sstv_upload'] = 'Загруженные изображения SSTV'; +$lang['general_sstv_upload_button'] = 'Загрзка изображений SSTV'; $lang['general_word_lotw'] = 'Logbook of the World'; $lang['general_word_lotw_short'] = 'LoTW'; @@ -101,10 +101,10 @@ $lang['general_mark_qsl_requested'] = 'Отметить запрос QSL-карточки'; $lang['general_mark_qsl_requested_bureau'] = 'Отметить запрос QSL-карточки (через бюро)'; $lang['general_mark_qsl_requested_direct'] = 'Отметить запрос QSL-карточки (напрямую)'; -$lang['general_mark_qsl_not_required'] = 'Отметить QSL-карточка не требуется'; +$lang['general_mark_qsl_not_required'] = 'Отметить, что QSL-карточка не требуется'; $lang['general_delete_qso'] = 'Удалить QSO'; -$lang['general_more_qso'] = 'Больше QSO'; +$lang['general_more_qso'] = 'Ещё QSO'; $lang['general_lookup_qrz'] = 'Поиск в QRZ.com'; $lang['general_lookup_hamqth'] = 'Поиск в HamQTH'; @@ -178,7 +178,7 @@ $lang['gen_hamradio_wwff'] = 'WWFF'; $lang['gen_hamradio_pota'] = 'POTA'; $lang['gen_hamradio_get_gridsquare'] = 'Получить квадрат'; -$lang['gen_hamradio_gridsquare_show'] = "Show Locator"; +$lang['gen_hamradio_gridsquare_show'] = "Показать квадрат"; $lang['gen_hamradio_latitude'] = "Широта"; $lang['gen_hamradio_longitude'] = "Долгота"; $lang['gen_hamradio_bearing'] = "Направление"; @@ -199,7 +199,7 @@ $lang['dashboard_you_have_had'] = ''; $lang['dashboard_qsos_today'] = 'QSOs сегодня!'; $lang['dashboard_qso_breakdown'] = 'Статистика QSO'; -$lang['gen_to_date'] = 'To date'; +$lang['gen_to_date'] = 'До даты'; $lang['dashboard_countries_breakdown'] = 'Статистика по странам'; $lang['gen_from_date'] = 'Начиная с даты'; @@ -228,4 +228,4 @@ $lang['hams_at_no_activations_found'] = 'не найдены предстоящие активации. Проверьте позже.'; -$lang['datatables_language'] = "en-GB"; +$lang['datatables_language'] = "ru-RU"; diff --git a/application/language/russian/menu_lang.php b/application/language/russian/menu_lang.php index 34496af15..e3f1a6b14 100644 --- a/application/language/russian/menu_lang.php +++ b/application/language/russian/menu_lang.php @@ -9,15 +9,15 @@ $lang['menu_advanced'] = 'Расширенный вид'; $lang['menu_qso'] = 'QSO'; -$lang['menu_live_qso'] = 'добавить QSO'; -$lang['menu_post_qso'] = 'добавить прошедшее QSO'; -$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; +$lang['menu_live_qso'] = 'Добавить QSO'; +$lang['menu_post_qso'] = 'Добавить прошедшее QSO'; +$lang['menu_fast_log_entry'] = "Простая быстрая запись в журнал"; $lang['menu_live_contest_logging'] = 'Журнал соревнований'; $lang['menu_post_contest_logging'] = 'Журнал прошедших соревнований'; $lang['menu_bandmap'] = 'План диапазонов'; $lang['menu_view_qsl'] = 'Просмотр QSL'; $lang['menu_view_eqsl'] = 'Просмотр eQSL'; -$lang['menu_view_sstv'] = 'View SSTV Images'; +$lang['menu_view_sstv'] = 'Просмотр SSTV изображений'; $lang['menu_notes'] = 'Заметки'; diff --git a/application/language/russian/options_lang.php b/application/language/russian/options_lang.php index 1903d41b0..82e4be45d 100644 --- a/application/language/russian/options_lang.php +++ b/application/language/russian/options_lang.php @@ -73,7 +73,7 @@ $lang['options_dxcluster_decont'] = 'Отображать споты, которые присланы с континента '; $lang['options_dxcluster_maxage_changed_to']='Максимальный возраст спотов изменён на '; $lang['options_dxcluster_decont_changed_to']='континент изменён на '; -$lang['options_dxcluster_decont_hint']='Бубт показаны споты только от споттеров с указанного континента'; +$lang['options_dxcluster_decont_hint']='Будут показаны споты только от споттеров с указанного континента'; $lang['options_version_dialog'] = "Информация о версии"; $lang['options_version_dialog_close'] = "Закрыть"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 66ae5c593..0f85c55f4 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -50,8 +50,8 @@ // Simple FLE (FastLogEntry) $lang['qso_simplefle_info'] = "Что это?"; -$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; -$lang['qso_simplefle_info_ln2'] = "Fast Log Entry, или просто FLE, - это система, позволяющая очень быстро и эффективно регистрировать QSO. Благодаря своему синтаксису, для регистрации большого количества QSO требуется минимум вводных данных при минимальных усилиях."; +$lang['qso_simplefle_info_ln1'] = "Простая быстрая запись в журнал (FLE)"; +$lang['qso_simplefle_info_ln2'] = "Быстрая запись в журнал (Fast Log Entry), или просто FLE, - это система, позволяющая очень быстро и эффективно регистрировать QSO. Благодаря своему синтаксису, для регистрации большого количества QSO требуется минимум вводных данных при минимальных усилиях."; $lang['qso_simplefle_info_ln3'] = "Изначально FLE была написана DF3CB. На своем сайте он предлагает программу для Windows. Программа Simple FLE была написана OK2CQR на основе FLE от DF3CB и предоставляет веб-интерфейс для регистрации QSO."; $lang['qso_simplefle_info_ln4'] = "Часто используется для импорта бумажных журналов из открытых сессий, и теперь SimpleFLE также доступен в Cloudlog. Информацию о синтаксисе и принципах работы FLE можно найти здесь."; $lang['qso_simplefle_qso_data'] = "Данные QSOa"; @@ -68,7 +68,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Закройте и загрузите образец данных"; $lang['qso_simplefle_reload'] = "Перезагрузить список QSO"; $lang['qso_simplefle_save'] = "Сохранить в Cloudlog"; -$lang['qso_simplefle_clear'] = "Очистить сессию логгирования"; +$lang['qso_simplefle_clear'] = "Очистить сессию записи"; $lang['qso_simplefle_refs_hint'] = "Референции могут быть: SOTA, IOTA, POTA или WWFF"; $lang['qso_simplefle_error_band'] = "Отсутствует диапазон!"; diff --git a/application/language/russian/sstv_lang.php b/application/language/russian/sstv_lang.php index 72c4c7d0d..0a8aa5b06 100644 --- a/application/language/russian/sstv_lang.php +++ b/application/language/russian/sstv_lang.php @@ -2,4 +2,4 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['sstv_string_disk_space'] = 'of disk space to store SSTV image assets'; \ No newline at end of file +$lang['sstv_string_disk_space'] = 'дискового пространства для хранения изображений SSTV'; \ No newline at end of file From e8ff967a2feb79d38161e110f2138c73d4b9d2df Mon Sep 17 00:00:00 2001 From: cats-shadow Date: Fri, 17 May 2024 16:28:08 +0300 Subject: [PATCH 20/23] Fixed the behavior of the dashboard map according to the appearance settings. --- application/views/dashboard/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 56e885ab2..688bbf2c8 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -213,7 +213,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
    -config->item('option_dashboard_map ') != "false" && $this->config->item('option_dashboard_map ') != "map_at_right") { ?> +optionslib->get_option('dashboard_map') != "false") && ($this->optionslib->get_option('dashboard_map') != "map_at_right")) { ?>
    @@ -226,7 +226,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
    - config->item('dashboard_map') == "map_at_right") { ?> + optionslib->get_option('dashboard_map') == "map_at_right") { ?>
    From 1cf2b3cd4153226af73b742bf418d50df9ff31ff Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Sun, 19 May 2024 17:50:10 +0100 Subject: [PATCH 21/23] Update footer.php --- application/views/interface_assets/footer.php | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index a519925b7..145affaa6 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -836,22 +836,27 @@ function showActivatorsMap(call, count, grids) { var ShowGrid = "No"; + var layer = L.tileLayer(osmUrl, { + maxZoom: 18, + attribution: osmCopyright, + }); - - var dashmap = L.map('map').setView([q_lat, q_lng], q_zoom); - - var osm = new L.tileLayer(osmUrl, {minZoom: 1, maxZoom: 12, - attribution: osmCopyright - }).addTo(dashmap); - - dashmap.addLayer(osm); + var map = L.map('map', { + layers: [layer], + center: [q_lat, q_lng], + zoom: q_zoom, + fullscreenControl: true, + fullscreenControlOptions: { + position: 'topleft' + }, + }); - var printer = L.easyPrint({ + /*var printer = L.easyPrint({ sizeModes: ['Current'], filename: 'myMap', exportOnly: true, hideControlContainer: true - }).addTo(dashmap); + }).addTo(map);*/ var markers = {}; @@ -866,13 +871,13 @@ function loadMarkers() { if (!markers[key]) { L.marker([marker.lat, marker.lng], { icon: redIconImg - }).addTo(dashmap) + }).addTo(map) .bindPopup(marker.html); } }); Object.keys(markers).forEach(key => { if (!newMarkers[key]) { - dashmap.removeLayer(markers[key]); + map.removeLayer(markers[key]); } }); markers = newMarkers; @@ -882,7 +887,6 @@ function loadMarkers() { loadMarkers(); setInterval(loadMarkers, 5000); - var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(dashmap); }); From 3788a84ee9634ab9b855b03539a47e78ca66fa6f Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 20 May 2024 15:57:58 +0100 Subject: [PATCH 22/23] [Dashboard] Map now follows user selection for showing icon and colour Visual decision to not show home marker or locs on the dashboard --- application/views/interface_assets/footer.php | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 145affaa6..ce10ab4a9 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -806,6 +806,37 @@ function showActivatorsMap(call, count, grids) { uri->segment(1) == "" || $this->uri->segment(1) == "dashboard") { ?> + + + +