diff --git a/README.md b/README.md index defe920c8..defb6c53f 100644 --- a/README.md +++ b/README.md @@ -52,11 +52,11 @@ Wavelog-support can be reached by creating an issue here at github. If you've an Special thanks to our contributors, who are part of Wavelog by improving code! -[F4ANS](https://github.com/abarrau), [DG0TM](https://github.com/dg0tm), [DG9VH](https://github.com/dg9vh), [DJ3CE](https://github.com/dj3ce), [R1BLH](https://github.com/r1blh), [BG2ELG](https://github.com/violarulan), [DF1ASH](https://github.com/derFogel), [DB4SCW](https://github.com/DB4SCW), [VE2HEW](https://github.com/anthonydiiorio) +[F4ANS](https://github.com/abarrau), [DG0TM](https://github.com/dg0tm), [DG9VH](https://github.com/dg9vh), [DJ3CE](https://github.com/dj3ce), [R1BLH](https://github.com/r1blh), [BG2ELG](https://github.com/violarulan), [DF1ASH](https://github.com/derFogel), [DB4SCW](https://github.com/DB4SCW), [VE2HEW](https://github.com/anthonydiiorio), [OK1GOD](https://github.com/filipmelik), [DJ1PW](https://github.com/winnieXY) Translators: -[Ondřej Koloničný (OK1CDJ)](https://translate.wavelog.org/user/ok1cdj/), [Michael Skolsky (R1BLH)](https://translate.wavelog.org/user/R1BLH/), [Karuru (BG2ELG)](https://translate.wavelog.org/user/viola/), [Byt3](https://translate.wavelog.org/user/205er/), [BG6HJE](https://translate.wavelog.org/user/BG6HJE/), [Francisco (F4VSE)](https://translate.wavelog.org/user/kikosgc/), [Kim (DG9VH)](https://translate.wavelog.org/user/dg9vh/), [Casper van Lieburg (PA7DX)](https://translate.wavelog.org/user/pa7dx/), [Halil AYYILDIZ (TA2LG)](https://translate.wavelog.org/user/TA2LG/), [Michal Šiman](https://translate.wavelog.org/user/michalsiman/), [DN4BS](https://github.com/dn4bs), [Luca (IU2FRL)](https://translate.wavelog.org/user/iu2frl/), [Dragan Đorđević (4O4A)](https://translate.wavelog.org/user/4o4a/), [Dren Imeraj (Z63DRI)](https://translate.wavelog.org/user/Dren/) +[Ondřej Koloničný (OK1CDJ)](https://translate.wavelog.org/user/ok1cdj/), [Michael Skolsky (R1BLH)](https://translate.wavelog.org/user/R1BLH/), [Karuru (BG2ELG)](https://translate.wavelog.org/user/viola/), [Byt3](https://translate.wavelog.org/user/205er/), [BG6HJE](https://translate.wavelog.org/user/BG6HJE/), [Francisco (F4VSE)](https://translate.wavelog.org/user/kikosgc/), [Kim (DG9VH)](https://translate.wavelog.org/user/dg9vh/), [Casper van Lieburg (PA7DX)](https://translate.wavelog.org/user/pa7dx/), [Halil AYYILDIZ (TA2LG)](https://translate.wavelog.org/user/TA2LG/), [Michal Šiman](https://translate.wavelog.org/user/michalsiman/), [DN4BS](https://github.com/dn4bs), [Luca (IU2FRL)](https://translate.wavelog.org/user/iu2frl/), [Dragan Đorđević (4O4A)](https://translate.wavelog.org/user/4o4a/), [Dren Imeraj (Z63DRI)](https://translate.wavelog.org/user/Dren/), [Filip Melik (OK1GOD)](https://translate.wavelog.org/user/filipmelik/) If you would like to contribute in any way to Wavelog, it is most appreciated. This has been developed in free time, help coding new features or writing documentation is always useful. diff --git a/application/controllers/Cron.php b/application/controllers/Cron.php index a6594ca9e..c25735eb8 100644 --- a/application/controllers/Cron.php +++ b/application/controllers/Cron.php @@ -89,7 +89,10 @@ class cron extends CI_Controller { echo "CRON: " . $cron->id . " -> is due: " . $isdue_result . "\n"; echo "CRON: " . $cron->id . " -> RUNNING...\n"; - $url = base_url() . $cron->function; + $url = local_url() . $cron->function; + if (ENVIRONMENT == "development") { + echo "CRON: " . $cron->id . " -> URL: " . $url . "\n"; + } $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); diff --git a/application/controllers/Timeline.php b/application/controllers/Timeline.php index d0acdbe5e..af30bc277 100644 --- a/application/controllers/Timeline.php +++ b/application/controllers/Timeline.php @@ -3,117 +3,130 @@ defined('BASEPATH') OR exit('No direct script access allowed'); class Timeline extends CI_Controller { - function __construct() - { - parent::__construct(); + function __construct() { + parent::__construct(); - $this->load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); } - } + $this->load->model('user_model'); + if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); } + } - public function index() - { - // Render Page - $data['page_title'] = __("Timeline"); + public function index() { + // Render Page + $data['page_title'] = __("Timeline"); - $this->load->model('Timeline_model'); + $this->load->model('Timeline_model'); - if ($this->input->post('band') != NULL) { // Band is not set when page first loads. - $band = $this->input->post('band'); - } - else { - $band = 'All'; - } + if ($this->input->post('band') != NULL) { // Band is not set when page first loads. + $band = $this->security->xss_clean($this->input->post('band')); + } else { + $band = 'All'; + } - if ($this->input->post('mode') != NULL) { - $mode = $this->input->post('mode'); - } - else { - $mode = 'All'; - } + if (($this->input->post('propmode') != NULL) && ($this->input->post('propmode') != '0')) { // Set, but not "All" + $propmode = $this->security->xss_clean($this->input->post('propmode')); + } else { + if (($this->session->userdata('user_default_band') == 'SAT') && ($this->input->post('propmode') == NULL)){ // Not set, and empty and default is SAT? + $propmode='SAT'; + } else { // Not set and empty and no SAT as default? + $propmode = 'All'; + } + } - if ($this->input->post('award') != NULL) { - $award = $this->input->post('award'); - } - else { - $award = 'dxcc'; - } + if ($this->input->post('mode') != NULL) { + $mode = $this->security->xss_clean($this->input->post('mode')); + } else { + $mode = 'All'; + } - if ($this->input->post('qsl') != NULL) { - $qsl = $this->input->post('qsl'); - } - else { - $qsl = '0'; - } + if ($this->input->post('award') != NULL) { + $award = $this->security->xss_clean($this->input->post('award')); + } else { + $award = 'dxcc'; + } - if ($this->input->post('lotw') != NULL) { - $lotw = $this->input->post('lotw'); - } - else { - $lotw = '0'; - } + if ($this->input->post('qsl') != NULL) { + $qsl = $this->security->xss_clean($this->input->post('qsl')); + } else { + $qsl = '0'; + } - if ($this->input->post('eqsl') != NULL) { - $eqsl = $this->input->post('eqsl'); - } - else { - $eqsl = '0'; - } + if ($this->input->post('lotw') != NULL) { + $lotw = $this->security->xss_clean($this->input->post('lotw')); + } else { + $lotw = '0'; + } - $this->load->model('modes'); - $this->load->model('bands'); + if ($this->input->post('clublog') != NULL) { + $clublog = $this->security->xss_clean($this->input->post('clublog')); + } else { + $clublog = '0'; + } - $data['modes'] = $this->modes->active(); + if ($this->input->post('eqsl') != NULL) { + $eqsl = $this->security->xss_clean($this->input->post('eqsl')); + } else { + $eqsl = '0'; + } - $data['timeline_array'] = $this->Timeline_model->get_timeline($band, $mode, $award, $qsl, $lotw, $eqsl); - $data['worked_bands'] = $this->bands->get_worked_bands(); - $data['bandselect'] = $band; - $data['modeselect'] = $mode; + $this->load->model('modes'); + $this->load->model('bands'); - $this->load->view('interface_assets/header', $data); - $this->load->view('timeline/index'); - $this->load->view('interface_assets/footer'); - } + $data['modes'] = $this->modes->active(); - public function details() { - $this->load->model('logbook_model'); - $this->load->model('timeline_model'); + $data['timeline_array'] = $this->Timeline_model->get_timeline($band, $mode, $propmode, $award, $qsl, $lotw, $eqsl, $clublog); + $data['worked_bands'] = $this->bands->get_worked_bands(); + $data['bandselect'] = $band; + $data['modeselect'] = $mode; + $data['propmode'] = $propmode; + $data['user_default_band'] = $this->session->userdata('user_default_band'); - $querystring = str_replace('"', "", $this->input->post("Querystring")); + $footerData['scripts'] = [ 'assets/js/sections/timeline.js?' ]; + $this->load->view('interface_assets/header', $data); + $this->load->view('timeline/index'); + $this->load->view('interface_assets/footer', $footerData); + } - $band = str_replace('"', "", $this->input->post("Band")); - $mode = str_replace('"', "", $this->input->post("Mode")); - $type = str_replace('"', "", $this->input->post("Type")); - $data['results'] = $this->timeline_model->timeline_qso_details($querystring, $band, $mode, $type); + public function details() { + $this->load->model('logbook_model'); + $this->load->model('timeline_model'); + + $querystring = str_replace('"', "", $this->security->xss_clean($this->input->post("Querystring"))); + + $band = str_replace('"', "", $this->security->xss_clean($this->input->post("Band"))); + $mode = str_replace('"', "", $this->security->xss_clean($this->input->post("Mode"))); + $type = str_replace('"', "", $this->security->xss_clean($this->input->post("Type"))); + $propmode = str_replace('"', "", $this->security->xss_clean($this->input->post("Propmode"))); + + $data['results'] = $this->timeline_model->timeline_qso_details($querystring, $band, $propmode, $mode, $type); - switch($type) { - case 'dxcc': $country = $this->logbook_model->get_entity($querystring); - $data['page_title'] = __("Log View")." - DXCC"; - $data['filter'] = "country ". $country['name']; - break; - case 'was' : $data['page_title'] = __("Log View")." - WAS"; - $data['filter'] = "state ". $querystring; - break; - case 'iota': $data['page_title'] = __("Log View")." - IOTA"; - $data['filter'] = "iota ". $querystring; - break; - case 'waz' : $data['page_title'] = __("Log View")." - WAZ"; - $data['filter'] = "CQ zone ". $querystring; - break; - case 'vucc' : $data['page_title'] = __("Log View")." - VUCC"; - $data['filter'] = "Gridsquare ". $querystring; - break; - case 'waja' : $data['page_title'] = __("Log View")." - WAJA"; - $data['filter'] = "WAJA ". $querystring; - break; - } + switch($type) { + case 'dxcc': $country = $this->logbook_model->get_entity($querystring); + $data['page_title'] = __("Log View")." - DXCC"; + $data['filter'] = "country ". $country['name']; + break; + case 'was' : $data['page_title'] = __("Log View")." - WAS"; + $data['filter'] = "state ". $querystring; + break; + case 'iota': $data['page_title'] = __("Log View")." - IOTA"; + $data['filter'] = "iota ". $querystring; + break; + case 'waz' : $data['page_title'] = __("Log View")." - WAZ"; + $data['filter'] = "CQ zone ". $querystring; + break; + case 'vucc' : $data['page_title'] = __("Log View")." - VUCC"; + $data['filter'] = "Gridsquare ". $querystring; + break; + case 'waja' : $data['page_title'] = __("Log View")." - WAJA"; + $data['filter'] = "WAJA ". $querystring; + break; + } - if ($band != "All") { - $data['filter'] .= " and " . $band; - } + if ($band != "All") { + $data['filter'] .= " and " . $band; + } - $this->load->view('timeline/details', $data); - } + $this->load->view('timeline/details', $data); + } } diff --git a/application/libraries/Qra.php b/application/libraries/Qra.php index d14e0ceb1..081092104 100644 --- a/application/libraries/Qra.php +++ b/application/libraries/Qra.php @@ -50,7 +50,7 @@ class Qra { // Feed in Lat Longs plus the unit type try { - $total_distance = distance($my[0], $my[1], $stn[0], $stn[1], $unit); + $total_distance = calc_distance($my[0], $my[1], $stn[0], $stn[1], $unit); } catch (Exception $e) { @@ -128,7 +128,7 @@ class Qra { } - function distance($lat1, $lon1, $lat2, $lon2, $unit = 'M') { + function calc_distance($lat1, $lon1, $lat2, $lon2, $unit = 'M') { $theta = $lon1 - $lon2; $dist = sin(deg2rad($lat1)) * sin(deg2rad($lat2)) + cos(deg2rad($lat1)) * cos(deg2rad($lat2)) * cos(deg2rad($theta)); $dist = acos($dist); @@ -147,7 +147,7 @@ class Qra { } function bearing($lat1, $lon1, $lat2, $lon2, $unit = 'M') { - $dist = distance($lat1, $lon1, $lat2, $lon2, $unit); + $dist = calc_distance($lat1, $lon1, $lat2, $lon2, $unit); $dist = round($dist, 0); $bearing = get_bearing($lat1, $lon1, $lat2, $lon2); diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 7f883bd12..fe3e35da0 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-22 13:37+0000\n" +"POT-Creation-Date: 2024-08-25 17:03+0000\n" "PO-Revision-Date: 2024-08-17 10:46+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin , 2024. # Michal Šiman , 2024. +# Filip Melik , 2024. msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-22 13:37+0000\n" -"PO-Revision-Date: 2024-08-17 10:47+0000\n" -"Last-Translator: Michal Šiman \n" +"POT-Creation-Date: 2024-08-25 17:03+0000\n" +"PO-Revision-Date: 2024-08-25 10:43+0000\n" +"Last-Translator: Filip Melik \n" "Language-Team: Czech \n" "Language: cs_CZ\n" @@ -17,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 5.6.2\n" +"X-Generator: Weblate 5.7\n" #: application/controllers/Accumulated.php:13 #: application/controllers/Activators.php:13 @@ -36,7 +37,7 @@ msgstr "" #: application/controllers/Components.php:13 #: application/controllers/Contestcalendar.php:15 #: application/controllers/Contesting.php:14 -#: application/controllers/Cron.php:26 application/controllers/Cron.php:149 +#: application/controllers/Cron.php:26 application/controllers/Cron.php:152 #: application/controllers/Csv.php:8 application/controllers/Csv.php:31 #: application/controllers/Dayswithqso.php:11 #: application/controllers/Debug.php:10 @@ -77,7 +78,7 @@ msgstr "" #: application/controllers/Station.php:17 #: application/controllers/Stationsetup.php:15 #: application/controllers/Themes.php:17 -#: application/controllers/Timeline.php:11 +#: application/controllers/Timeline.php:10 #: application/controllers/Timeplotter.php:11 #: application/controllers/Update.php:24 application/controllers/Update.php:273 #: application/controllers/Update.php:284 @@ -89,7 +90,7 @@ msgstr "" #: application/controllers/User.php:1247 #: application/controllers/User_options.php:9 msgid "You're not allowed to do that!" -msgstr "" +msgstr "Přístup odepřen!" #: application/controllers/Accumulated.php:21 #: application/views/interface_assets/header.php:150 @@ -305,12 +306,12 @@ msgid "Log View - VUCC" msgstr "" #: application/controllers/Awards.php:453 -#: application/controllers/Timeline.php:92 -#: application/controllers/Timeline.php:95 -#: application/controllers/Timeline.php:98 -#: application/controllers/Timeline.php:101 -#: application/controllers/Timeline.php:104 -#: application/controllers/Timeline.php:107 +#: application/controllers/Timeline.php:105 +#: application/controllers/Timeline.php:108 +#: application/controllers/Timeline.php:111 +#: application/controllers/Timeline.php:114 +#: application/controllers/Timeline.php:117 +#: application/controllers/Timeline.php:120 msgid "Log View" msgstr "Zobrazení deníku" @@ -564,30 +565,30 @@ msgstr "Kontinenty" msgid "Cron Manager" msgstr "" -#: application/controllers/Cron.php:141 application/views/cron/edit.php:5 +#: application/controllers/Cron.php:144 application/views/cron/edit.php:5 msgid "Edit Cronjob" msgstr "" -#: application/controllers/Cron.php:261 +#: application/controllers/Cron.php:264 #: application/views/interface_assets/footer.php:36 msgid "OK" msgstr "" -#: application/controllers/Cron.php:265 +#: application/controllers/Cron.php:268 #, php-format msgid "" "Last run occurred more than %s seconds ago.%sPlease check your master cron! " "It should run every minute (* * * * *)." msgstr "" -#: application/controllers/Cron.php:268 +#: application/controllers/Cron.php:271 #, php-format msgid "" "Last run occurred more than %s minutes ago.%sSeems like your Mastercron " "isn't running!%sIt should run every minute (* * * * *)." msgstr "" -#: application/controllers/Cron.php:273 application/views/cron/index.php:29 +#: application/controllers/Cron.php:276 application/views/cron/index.php:29 msgctxt "Master Cron" msgid "Not running" msgstr "" @@ -987,6 +988,7 @@ msgstr "" #: application/views/logbookadvanced/useroptions.php:74 #: application/views/search/search_result_ajax.php:124 #: application/views/station_profile/edit.php:352 +#: application/views/timeline/index.php:68 #: application/views/update/index.php:20 application/views/user/edit.php:566 #: application/views/user/edit.php:683 #: application/views/view_log/partial/log_ajax.php:83 @@ -1048,7 +1050,7 @@ msgstr "" #: application/views/search/lotw_unconfirmed_result.php:8 #: application/views/search/result_search.php:7 #: application/views/search/search_result_ajax.php:4 -#: application/views/simplefle/index.php:144 +#: application/views/simplefle/index.php:150 #: application/views/statistics/custom.php:60 #: application/views/statistics/custom_result.php:62 #: application/views/statistics/custom_result.php:88 @@ -1082,7 +1084,7 @@ msgstr "Režim" #: application/views/qso/components/previous_contacts.php:79 #: application/views/qso/edit_ajax.php:142 application/views/qso/index.php:177 #: application/views/search/search_result_ajax.php:5 -#: application/views/simplefle/index.php:145 +#: application/views/simplefle/index.php:151 #: application/views/user/edit.php:230 application/views/user/edit.php:252 #: application/views/user/edit.php:274 application/views/user/edit.php:296 #: application/views/user/edit.php:319 @@ -1109,7 +1111,7 @@ msgstr "" #: application/views/qso/components/previous_contacts.php:80 #: application/views/qso/edit_ajax.php:147 application/views/qso/index.php:182 #: application/views/search/search_result_ajax.php:6 -#: application/views/simplefle/index.php:146 +#: application/views/simplefle/index.php:152 #: application/views/user/edit.php:231 application/views/user/edit.php:253 #: application/views/user/edit.php:275 application/views/user/edit.php:297 #: application/views/user/edit.php:320 @@ -1132,7 +1134,7 @@ msgstr "" #: application/views/search/search_result_ajax.php:7 #: application/views/stationsetup/stationsetup.php:124 #: application/views/statistics/custom_result.php:92 -#: application/views/timeline/index.php:118 application/views/user/edit.php:232 +#: application/views/timeline/index.php:151 application/views/user/edit.php:232 #: application/views/user/edit.php:254 application/views/user/edit.php:276 #: application/views/user/edit.php:298 application/views/user/edit.php:321 #: application/views/view_log/partial/log.php:13 @@ -1162,7 +1164,7 @@ msgstr "Země" #: application/views/qso/edit_ajax.php:318 #: application/views/search/search_result_ajax.php:8 #: application/views/station_profile/edit.php:215 -#: application/views/timeline/index.php:202 application/views/user/edit.php:233 +#: application/views/timeline/index.php:235 application/views/user/edit.php:233 #: application/views/user/edit.php:255 application/views/user/edit.php:277 #: application/views/user/edit.php:299 application/views/user/edit.php:322 #: application/views/view_log/partial/log_ajax.php:8 @@ -1190,7 +1192,7 @@ msgstr "" #: application/views/qslcard/searchresult.php:82 #: application/views/qso/components/previous_contacts.php:86 #: application/views/search/search_result_ajax.php:12 -#: application/views/timeline/index.php:177 application/views/user/edit.php:237 +#: application/views/timeline/index.php:210 application/views/user/edit.php:237 #: application/views/user/edit.php:259 application/views/user/edit.php:281 #: application/views/user/edit.php:303 application/views/user/edit.php:326 #: application/views/view_log/partial/log_ajax.php:12 @@ -1226,9 +1228,9 @@ msgstr "Stát" #: application/views/search/cqzones_result.php:12 #: application/views/search/result.php:33 #: application/views/search/search_result_ajax.php:13 -#: application/views/simplefle/index.php:147 +#: application/views/simplefle/index.php:153 #: application/views/stationsetup/stationsetup.php:125 -#: application/views/timeline/index.php:257 application/views/user/edit.php:130 +#: application/views/timeline/index.php:290 application/views/user/edit.php:130 #: application/views/user/edit.php:238 application/views/user/edit.php:260 #: application/views/user/edit.php:282 application/views/user/edit.php:304 #: application/views/user/edit.php:327 application/views/user/profile.php:34 @@ -1319,7 +1321,7 @@ msgstr "Vzdálenost" #: application/views/search/lotw_unconfirmed_result.php:9 #: application/views/search/result_search.php:10 #: application/views/search/search_result_ajax.php:15 -#: application/views/simplefle/index.php:143 +#: application/views/simplefle/index.php:149 #: application/views/stationsetup/exportmapoptions.php:31 #: application/views/statistics/custom.php:53 #: application/views/statistics/custom_result.php:55 @@ -1397,7 +1399,7 @@ msgstr "Operátor" #: application/views/stationsetup/linkedlocations.php:17 #: application/views/stationsetup/linkedlocations.php:45 #: application/views/stationsetup/stationsetup.php:150 -#: application/views/timeline/index.php:134 +#: application/views/timeline/index.php:167 #: application/views/timeplotter/index.php:33 #: application/views/view_log/partial/log_ajax.php:29 #: application/views/view_log/qso.php:236 @@ -1728,7 +1730,7 @@ msgstr "" #: application/views/logbookadvanced/index.php:527 #: application/views/lotw_views/index.php:43 #: application/views/simplefle/index.php:20 -#: application/views/simplefle/index.php:171 +#: application/views/simplefle/index.php:177 #: application/views/stationsetup/exportmapoptions.php:5 #: application/views/statistics/custom.php:31 #: application/views/statistics/custom_result.php:33 @@ -1752,10 +1754,10 @@ msgstr "" #: application/controllers/Radio.php:105 #: application/controllers/Stationsetup.php:372 #: application/views/api/help.php:61 application/views/contesting/add.php:62 -#: application/views/interface_assets/footer.php:2334 -#: application/views/interface_assets/footer.php:2352 -#: application/views/interface_assets/footer.php:2373 -#: application/views/interface_assets/footer.php:2391 +#: application/views/interface_assets/footer.php:2337 +#: application/views/interface_assets/footer.php:2355 +#: application/views/interface_assets/footer.php:2376 +#: application/views/interface_assets/footer.php:2394 #: application/views/labels/index.php:48 application/views/labels/index.php:84 #: application/views/logbookadvanced/index.php:519 #: application/views/lotw_views/index.php:114 @@ -2061,7 +2063,7 @@ msgstr "" msgid "Edit Theme" msgstr "" -#: application/controllers/Timeline.php:17 +#: application/controllers/Timeline.php:15 #: application/views/interface_assets/header.php:148 #: application/views/timeline/index.php:2 msgid "Timeline" @@ -2508,8 +2510,8 @@ msgstr "" #: application/views/gridmap/index.php:41 #: application/views/gridmap/index.php:70 #: application/views/gridmap/index.php:83 -#: application/views/interface_assets/footer.php:1446 -#: application/views/interface_assets/footer.php:1585 +#: application/views/interface_assets/footer.php:1448 +#: application/views/interface_assets/footer.php:1587 #: application/views/kml/index.php:21 application/views/kml/index.php:33 #: application/views/kml/index.php:49 application/views/kml/index.php:67 #: application/views/kml/index.php:79 @@ -2540,6 +2542,7 @@ msgstr "" #: application/views/stationsetup/exportmapoptions.php:33 #: application/views/timeline/index.php:10 #: application/views/timeline/index.php:22 +#: application/views/timeline/index.php:77 #: application/views/timeplotter/index.php:17 #: application/views/timeplotter/index.php:27 #: application/views/timeplotter/index.php:47 @@ -2598,13 +2601,13 @@ msgstr "" #: application/views/logbookadvanced/useroptions.php:17 #: application/views/lookup/index.php:63 #: application/views/stationsetup/exportmapoptions.php:6 -#: application/views/timeline/index.php:72 -#: application/views/timeline/index.php:137 -#: application/views/timeline/index.php:164 -#: application/views/timeline/index.php:189 -#: application/views/timeline/index.php:218 -#: application/views/timeline/index.php:243 -#: application/views/timeline/index.php:270 +#: application/views/timeline/index.php:105 +#: application/views/timeline/index.php:170 +#: application/views/timeline/index.php:197 +#: application/views/timeline/index.php:222 +#: application/views/timeline/index.php:251 +#: application/views/timeline/index.php:276 +#: application/views/timeline/index.php:303 #: application/views/timeplotter/index.php:59 msgid "Show" msgstr "" @@ -2722,7 +2725,7 @@ msgstr "" #: application/views/awards/was/index.php:200 #: application/views/awards/wwff/index.php:64 #: application/views/public_search/empty.php:3 -#: application/views/qrz/export.php:64 application/views/timeline/index.php:102 +#: application/views/qrz/export.php:64 application/views/timeline/index.php:135 msgid "Nothing found!" msgstr "" @@ -2755,7 +2758,7 @@ msgstr "" #: application/views/search/lotw_unconfirmed.php:33 #: application/views/search/lotw_unconfirmed_result.php:6 #: application/views/search/result.php:11 -#: application/views/simplefle/index.php:142 +#: application/views/simplefle/index.php:148 #: application/views/station_profile/edit.php:63 #: application/views/stationsetup/linkedlocations.php:17 #: application/views/user/edit.php:123 application/views/user/index.php:4 @@ -2769,12 +2772,12 @@ msgid "Count" msgstr "" #: application/views/activators/index.php:101 -#: application/views/timeline/index.php:121 -#: application/views/timeline/index.php:153 -#: application/views/timeline/index.php:178 -#: application/views/timeline/index.php:205 -#: application/views/timeline/index.php:232 -#: application/views/timeline/index.php:258 +#: application/views/timeline/index.php:154 +#: application/views/timeline/index.php:186 +#: application/views/timeline/index.php:211 +#: application/views/timeline/index.php:238 +#: application/views/timeline/index.php:265 +#: application/views/timeline/index.php:291 msgid "Show QSO's" msgstr "" @@ -2839,16 +2842,16 @@ msgstr "" #: application/views/search/cqzones_result.php:7 #: application/views/search/result_search.php:4 #: application/views/search/search_result_ajax.php:89 -#: application/views/simplefle/index.php:140 +#: application/views/simplefle/index.php:146 #: application/views/statistics/custom.php:38 #: application/views/statistics/custom_result.php:40 #: application/views/statistics/custom_result.php:85 -#: application/views/timeline/index.php:116 -#: application/views/timeline/index.php:151 -#: application/views/timeline/index.php:176 -#: application/views/timeline/index.php:201 -#: application/views/timeline/index.php:230 -#: application/views/timeline/index.php:255 +#: application/views/timeline/index.php:149 +#: application/views/timeline/index.php:184 +#: application/views/timeline/index.php:209 +#: application/views/timeline/index.php:234 +#: application/views/timeline/index.php:263 +#: application/views/timeline/index.php:288 #: application/views/view_log/partial/log.php:4 #: application/views/view_log/partial/log_ajax.php:57 #: application/views/visitor/index.php:147 @@ -2875,9 +2878,9 @@ msgstr "Datum" #: application/views/search/cqzones_result.php:8 #: application/views/search/result_search.php:5 #: application/views/search/search_result_ajax.php:91 -#: application/views/simplefle/index.php:141 +#: application/views/simplefle/index.php:147 #: application/views/statistics/custom_result.php:86 -#: application/views/timeline/index.php:256 +#: application/views/timeline/index.php:289 #: application/views/timeplotter/index.php:5 #: application/views/view_log/partial/log.php:6 #: application/views/view_log/partial/log_ajax.php:59 @@ -3016,7 +3019,7 @@ msgstr "" #: application/views/adif/import.php:152 #: application/views/interface_assets/footer.php:32 #: application/views/interface_assets/footer.php:501 -#: application/views/interface_assets/footer.php:2130 +#: application/views/interface_assets/footer.php:2133 msgid "DANGER" msgstr "" @@ -3279,8 +3282,7 @@ msgstr "" #: application/views/oqrs/showrequests.php:91 #: application/views/sattimers/index.php:39 #: application/views/stationsetup/stationsetup.php:31 -#: application/views/timeline/index.php:119 -#: application/views/update/index.php:30 +#: application/views/timeline/index.php:152 msgid "Status" msgstr "Stav" @@ -3439,7 +3441,7 @@ msgstr "" #: application/views/search/cqzones_result.php:13 #: application/views/station_profile/create.php:113 #: application/views/station_profile/edit.php:153 -#: application/views/timeline/index.php:231 +#: application/views/timeline/index.php:264 #: application/views/timeplotter/index.php:44 msgid "CQ Zone" msgstr "CQ zóna" @@ -3548,7 +3550,7 @@ msgstr "" #: application/views/awards/cq/index.php:56 #: application/views/awards/itu/index.php:56 -#: application/views/interface_assets/footer.php:2109 +#: application/views/interface_assets/footer.php:2112 #: application/views/qso/edit_ajax.php:378 #: application/views/view_log/qso.php:25 msgid "QSL Card" @@ -3818,8 +3820,8 @@ msgstr "" #: application/views/awards/dxcc/index.php:226 #: application/views/awards/iota/index.php:170 -#: application/views/timeline/index.php:117 -#: application/views/timeline/index.php:204 +#: application/views/timeline/index.php:150 +#: application/views/timeline/index.php:237 msgid "Prefix" msgstr "" @@ -3988,7 +3990,7 @@ msgstr "" #: application/views/search/search_result_ajax.php:19 #: application/views/stationsetup/stationsetup.php:30 #: application/views/themes/index.php:82 -#: application/views/timeline/index.php:203 application/views/user/edit.php:241 +#: application/views/timeline/index.php:236 application/views/user/edit.php:241 #: application/views/user/edit.php:263 application/views/user/edit.php:285 #: application/views/user/edit.php:307 application/views/user/edit.php:330 #: application/views/view_log/partial/log_ajax.php:19 @@ -4308,7 +4310,7 @@ msgid "Show WAJA Map" msgstr "" #: application/views/awards/waja/index.php:154 -#: application/views/timeline/index.php:152 +#: application/views/timeline/index.php:185 msgid "Prefecture" msgstr "" @@ -5197,6 +5199,7 @@ msgstr "Šíření signálu" #: application/views/gridmap/index.php:44 application/views/kml/index.php:80 #: application/views/logbookadvanced/index.php:219 #: application/views/qso/edit_ajax.php:192 application/views/qso/index.php:404 +#: application/views/timeline/index.php:80 msgctxt "Propagation Mode" msgid "Aircraft Scatter" msgstr "" @@ -5205,6 +5208,7 @@ msgstr "" #: application/views/gridmap/index.php:45 application/views/kml/index.php:81 #: application/views/logbookadvanced/index.php:220 #: application/views/qso/edit_ajax.php:193 application/views/qso/index.php:405 +#: application/views/timeline/index.php:81 msgctxt "Propagation Mode" msgid "Aurora" msgstr "" @@ -5213,6 +5217,7 @@ msgstr "" #: application/views/gridmap/index.php:46 application/views/kml/index.php:82 #: application/views/logbookadvanced/index.php:221 #: application/views/qso/edit_ajax.php:194 application/views/qso/index.php:406 +#: application/views/timeline/index.php:82 msgctxt "Propagation Mode" msgid "Aurora-E" msgstr "" @@ -5221,6 +5226,7 @@ msgstr "" #: application/views/gridmap/index.php:47 application/views/kml/index.php:83 #: application/views/logbookadvanced/index.php:222 #: application/views/qso/edit_ajax.php:195 application/views/qso/index.php:407 +#: application/views/timeline/index.php:83 msgctxt "Propagation Mode" msgid "Back scatter" msgstr "" @@ -5229,6 +5235,7 @@ msgstr "" #: application/views/gridmap/index.php:48 application/views/kml/index.php:84 #: application/views/logbookadvanced/index.php:223 #: application/views/qso/edit_ajax.php:196 application/views/qso/index.php:408 +#: application/views/timeline/index.php:84 msgctxt "Propagation Mode" msgid "EchoLink" msgstr "" @@ -5237,6 +5244,7 @@ msgstr "" #: application/views/gridmap/index.php:49 application/views/kml/index.php:85 #: application/views/logbookadvanced/index.php:224 #: application/views/qso/edit_ajax.php:197 application/views/qso/index.php:409 +#: application/views/timeline/index.php:85 msgctxt "Propagation Mode" msgid "Earth-Moon-Earth" msgstr "" @@ -5245,6 +5253,7 @@ msgstr "" #: application/views/gridmap/index.php:50 application/views/kml/index.php:86 #: application/views/logbookadvanced/index.php:225 #: application/views/qso/edit_ajax.php:198 application/views/qso/index.php:410 +#: application/views/timeline/index.php:86 msgctxt "Propagation Mode" msgid "Sporadic E" msgstr "" @@ -5253,6 +5262,7 @@ msgstr "" #: application/views/gridmap/index.php:51 application/views/kml/index.php:87 #: application/views/logbookadvanced/index.php:226 #: application/views/qso/edit_ajax.php:199 application/views/qso/index.php:411 +#: application/views/timeline/index.php:87 msgctxt "Propagation Mode" msgid "Field Aligned Irregularities" msgstr "" @@ -5261,6 +5271,7 @@ msgstr "" #: application/views/gridmap/index.php:52 application/views/kml/index.php:88 #: application/views/logbookadvanced/index.php:227 #: application/views/qso/edit_ajax.php:200 application/views/qso/index.php:412 +#: application/views/timeline/index.php:88 msgctxt "Propagation Mode" msgid "F2 Reflection" msgstr "" @@ -5269,6 +5280,7 @@ msgstr "" #: application/views/gridmap/index.php:53 application/views/kml/index.php:89 #: application/views/logbookadvanced/index.php:228 #: application/views/qso/edit_ajax.php:201 application/views/qso/index.php:413 +#: application/views/timeline/index.php:89 msgctxt "Propagation Mode" msgid "Internet-assisted" msgstr "" @@ -5277,6 +5289,7 @@ msgstr "" #: application/views/gridmap/index.php:54 application/views/kml/index.php:90 #: application/views/logbookadvanced/index.php:229 #: application/views/qso/edit_ajax.php:202 application/views/qso/index.php:414 +#: application/views/timeline/index.php:90 msgctxt "Propagation Mode" msgid "Ionoscatter" msgstr "" @@ -5285,6 +5298,7 @@ msgstr "" #: application/views/gridmap/index.php:55 application/views/kml/index.php:91 #: application/views/logbookadvanced/index.php:230 #: application/views/qso/edit_ajax.php:203 application/views/qso/index.php:415 +#: application/views/timeline/index.php:91 msgctxt "Propagation Mode" msgid "IRLP" msgstr "" @@ -5293,6 +5307,7 @@ msgstr "" #: application/views/gridmap/index.php:56 application/views/kml/index.php:92 #: application/views/logbookadvanced/index.php:231 #: application/views/qso/edit_ajax.php:204 application/views/qso/index.php:416 +#: application/views/timeline/index.php:92 msgctxt "Propagation Mode" msgid "Meteor scatter" msgstr "" @@ -5301,6 +5316,7 @@ msgstr "" #: application/views/gridmap/index.php:57 application/views/kml/index.php:93 #: application/views/logbookadvanced/index.php:232 #: application/views/qso/edit_ajax.php:205 application/views/qso/index.php:417 +#: application/views/timeline/index.php:93 msgctxt "Propagation Mode" msgid "Terrestrial or atmospheric repeater or transponder" msgstr "" @@ -5309,6 +5325,7 @@ msgstr "" #: application/views/gridmap/index.php:58 application/views/kml/index.php:94 #: application/views/logbookadvanced/index.php:233 #: application/views/qso/edit_ajax.php:206 application/views/qso/index.php:418 +#: application/views/timeline/index.php:94 msgctxt "Propagation Mode" msgid "Rain scatter" msgstr "" @@ -5317,6 +5334,7 @@ msgstr "" #: application/views/gridmap/index.php:59 application/views/kml/index.php:95 #: application/views/logbookadvanced/index.php:234 #: application/views/qso/edit_ajax.php:207 application/views/qso/index.php:419 +#: application/views/timeline/index.php:95 msgctxt "Propagation Mode" msgid "Satellite" msgstr "Satelit" @@ -5325,6 +5343,7 @@ msgstr "Satelit" #: application/views/gridmap/index.php:60 application/views/kml/index.php:96 #: application/views/logbookadvanced/index.php:235 #: application/views/qso/edit_ajax.php:208 application/views/qso/index.php:420 +#: application/views/timeline/index.php:96 msgctxt "Propagation Mode" msgid "Trans-equatorial" msgstr "" @@ -5333,6 +5352,7 @@ msgstr "" #: application/views/gridmap/index.php:61 application/views/kml/index.php:97 #: application/views/logbookadvanced/index.php:236 #: application/views/qso/edit_ajax.php:209 application/views/qso/index.php:421 +#: application/views/timeline/index.php:97 msgctxt "Propagation Mode" msgid "Tropospheric ducting" msgstr "" @@ -5545,7 +5565,7 @@ msgstr "" #: application/views/dayswithqso/index.php:58 #: application/views/dayswithqso/index.php:86 #: application/views/dayswithqso/index.php:108 -#: application/views/timeline/index.php:120 +#: application/views/timeline/index.php:153 msgid "End Date" msgstr "" @@ -6184,10 +6204,10 @@ msgid "QSL Date" msgstr "" #: application/views/eqslcard/index.php:60 -#: application/views/interface_assets/footer.php:2335 -#: application/views/interface_assets/footer.php:2353 -#: application/views/interface_assets/footer.php:2374 -#: application/views/interface_assets/footer.php:2392 +#: application/views/interface_assets/footer.php:2338 +#: application/views/interface_assets/footer.php:2356 +#: application/views/interface_assets/footer.php:2377 +#: application/views/interface_assets/footer.php:2395 #: application/views/qslcard/index.php:66 #: application/views/view_log/qso.php:614 msgid "View" @@ -6198,10 +6218,12 @@ msgstr "" #: application/views/logbookadvanced/index.php:215 #: application/views/logbookadvanced/index.php:609 #: application/views/logbookadvanced/useroptions.php:118 +#: application/views/timeline/index.php:74 msgid "Propagation" msgstr "" #: application/views/gridmap/index.php:42 +#: application/views/timeline/index.php:79 msgid "None/Empty" msgstr "" @@ -6444,57 +6466,57 @@ msgstr "" msgid "You're not logged in. Please %slogin%s" msgstr "" -#: application/views/interface_assets/footer.php:1373 -#: application/views/interface_assets/footer.php:1377 -#: application/views/interface_assets/footer.php:1380 -#: application/views/interface_assets/footer.php:1517 -#: application/views/interface_assets/footer.php:1521 -#: application/views/interface_assets/footer.php:1524 +#: application/views/interface_assets/footer.php:1375 +#: application/views/interface_assets/footer.php:1379 +#: application/views/interface_assets/footer.php:1382 +#: application/views/interface_assets/footer.php:1519 +#: application/views/interface_assets/footer.php:1523 +#: application/views/interface_assets/footer.php:1526 msgid "grid square" msgstr "lokátor" -#: application/views/interface_assets/footer.php:1380 -#: application/views/interface_assets/footer.php:1524 +#: application/views/interface_assets/footer.php:1382 +#: application/views/interface_assets/footer.php:1526 msgid "Total count" msgstr "Celkový počet" -#: application/views/interface_assets/footer.php:2111 +#: application/views/interface_assets/footer.php:2114 msgid "QSL Card for " msgstr "" -#: application/views/interface_assets/footer.php:2131 +#: application/views/interface_assets/footer.php:2134 msgid "Warning! Are you sure you want to delete this QSL card?" msgstr "" -#: application/views/interface_assets/footer.php:2171 +#: application/views/interface_assets/footer.php:2174 #: application/views/view_log/qso.php:42 msgid "eQSL Card" msgstr "eQSL karta" -#: application/views/interface_assets/footer.php:2173 +#: application/views/interface_assets/footer.php:2176 msgid "eQSL Card for " msgstr "" -#: application/views/interface_assets/footer.php:2346 -#: application/views/interface_assets/footer.php:2385 +#: application/views/interface_assets/footer.php:2349 +#: application/views/interface_assets/footer.php:2388 #: application/views/view_log/qso.php:604 msgid "QSL image file" msgstr "" -#: application/views/interface_assets/footer.php:2365 +#: application/views/interface_assets/footer.php:2368 msgid "Front QSL Card:" msgstr "" -#: application/views/interface_assets/footer.php:2403 +#: application/views/interface_assets/footer.php:2406 msgid "Back QSL Card:" msgstr "" -#: application/views/interface_assets/footer.php:2414 -#: application/views/interface_assets/footer.php:2439 +#: application/views/interface_assets/footer.php:2417 +#: application/views/interface_assets/footer.php:2442 msgid "Add additional QSOs to a QSL Card" msgstr "" -#: application/views/interface_assets/footer.php:2450 +#: application/views/interface_assets/footer.php:2453 msgid "Something went wrong. Please try again!" msgstr "" @@ -8469,7 +8491,7 @@ msgid "Remove" msgstr "" #: application/views/qslprint/qslprint.php:33 -#: application/views/simplefle/index.php:133 +#: application/views/simplefle/index.php:139 msgid "QSO List" msgstr "" @@ -8648,7 +8670,7 @@ msgstr "" msgid "TimeOff is less than TimeOn" msgstr "" -#: application/views/qso/index.php:5 application/views/qso/index.php:690 +#: application/views/qso/index.php:5 application/views/qso/index.php:696 msgid "Previous Contacts" msgstr "Předchozí spojení" @@ -8762,19 +8784,35 @@ msgstr "" msgid "Connect" msgstr "" -#: application/views/qso/index.php:663 +#: application/views/qso/index.php:656 +msgid "Stop" +msgstr "" + +#: application/views/qso/index.php:657 +msgid "Tune" +msgstr "" + +#: application/views/qso/index.php:658 +msgid "Stop Tune" +msgstr "" + +#: application/views/qso/index.php:664 +msgid "CW Speed" +msgstr "" + +#: application/views/qso/index.php:669 msgid "Send" msgstr "" -#: application/views/qso/index.php:673 +#: application/views/qso/index.php:679 msgid "Suggestions" msgstr "Návrhy" -#: application/views/qso/index.php:680 +#: application/views/qso/index.php:686 msgid "Profile Picture" msgstr "" -#: application/views/qso/index.php:704 +#: application/views/qso/index.php:710 msgid "Max. 5 previous contacts are shown" msgstr "" @@ -9163,7 +9201,7 @@ msgid "" msgstr "" #: application/views/simplefle/index.php:17 -#: application/views/simplefle/index.php:170 +#: application/views/simplefle/index.php:176 msgid "Syntax Help" msgstr "" @@ -9273,24 +9311,24 @@ msgstr "" msgid "Enter the Data" msgstr "" -#: application/views/simplefle/index.php:148 +#: application/views/simplefle/index.php:154 msgid "Refs" msgstr "" -#: application/views/simplefle/index.php:160 +#: application/views/simplefle/index.php:166 #, php-format msgid "The Refs can be either %sS%sOTA, %sI%sOTA, %sP%sOTA, or %sW%sWFF" msgstr "" -#: application/views/simplefle/index.php:167 +#: application/views/simplefle/index.php:173 msgid "Reload QSO List" msgstr "" -#: application/views/simplefle/index.php:168 +#: application/views/simplefle/index.php:174 msgid "Save in Wavelog" msgstr "" -#: application/views/simplefle/index.php:169 +#: application/views/simplefle/index.php:175 msgid "Clear Logging Session" msgstr "" @@ -10069,6 +10107,10 @@ msgstr "" msgid "Add a Theme" msgstr "" +#: application/views/timeline/index.php:78 +msgid "All but SAT" +msgstr "" + #: application/views/timeplotter/index.php:2 msgid "contacts were plotted" msgstr "" @@ -10117,6 +10159,10 @@ msgstr "" msgid "Update DXCC Data" msgstr "" +#: application/views/update/index.php:30 +msgid "Status:" +msgstr "" + #: application/views/update/index.php:34 msgid "Apply DXCC Data to Logbook" msgstr "" @@ -10130,37 +10176,37 @@ msgid "" "\t\t\t\t\t\t\tand update existing metadata as well, in case it has changed." msgstr "" -#: application/views/update/index.php:40 +#: application/views/update/index.php:45 msgid "Check QSOs missing DXCC data" msgstr "" -#: application/views/update/index.php:42 application/views/update/index.php:62 +#: application/views/update/index.php:54 application/views/update/index.php:95 msgid "Re-check all QSOs in logbook" msgstr "" -#: application/views/update/index.php:45 +#: application/views/update/index.php:59 msgid "Apply Continent Data to Logbook" msgstr "" -#: application/views/update/index.php:47 +#: application/views/update/index.php:61 msgid "" "This function can be used to update QSO continent information for all QSOs " "in Wavelog missing that information." msgstr "" -#: application/views/update/index.php:49 +#: application/views/update/index.php:68 msgid "Check QSOs missing continent data" msgstr "" -#: application/views/update/index.php:59 +#: application/views/update/index.php:80 msgid "Here you can update QSOs with missing distance information." msgstr "" -#: application/views/update/index.php:60 +#: application/views/update/index.php:86 msgid "Update distance data" msgstr "" -#: application/views/update/index.php:61 +#: application/views/update/index.php:89 msgid "" "Use the following button to update the distance information for all your " "QSOs. Depending on the number of QSOs this might take some time to execute. " diff --git a/application/locale/de_DE/LC_MESSAGES/messages.mo b/application/locale/de_DE/LC_MESSAGES/messages.mo index 2a34294f1..4e3e3a437 100644 Binary files a/application/locale/de_DE/LC_MESSAGES/messages.mo and b/application/locale/de_DE/LC_MESSAGES/messages.mo differ diff --git a/application/locale/de_DE/LC_MESSAGES/messages.po b/application/locale/de_DE/LC_MESSAGES/messages.po index e39337e02..1f153fc6d 100644 --- a/application/locale/de_DE/LC_MESSAGES/messages.po +++ b/application/locale/de_DE/LC_MESSAGES/messages.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-22 13:37+0000\n" -"PO-Revision-Date: 2024-08-22 13:37+0000\n" -"Last-Translator: Fabian Berg \n" +"POT-Creation-Date: 2024-08-25 17:03+0000\n" +"PO-Revision-Date: 2024-08-25 13:06+0000\n" +"Last-Translator: Florian Wolters \n" "Language-Team: German \n" "Language: de_DE\n" @@ -45,7 +45,7 @@ msgstr "" #: application/controllers/Components.php:13 #: application/controllers/Contestcalendar.php:15 #: application/controllers/Contesting.php:14 -#: application/controllers/Cron.php:26 application/controllers/Cron.php:149 +#: application/controllers/Cron.php:26 application/controllers/Cron.php:152 #: application/controllers/Csv.php:8 application/controllers/Csv.php:31 #: application/controllers/Dayswithqso.php:11 #: application/controllers/Debug.php:10 @@ -86,7 +86,7 @@ msgstr "" #: application/controllers/Station.php:17 #: application/controllers/Stationsetup.php:15 #: application/controllers/Themes.php:17 -#: application/controllers/Timeline.php:11 +#: application/controllers/Timeline.php:10 #: application/controllers/Timeplotter.php:11 #: application/controllers/Update.php:24 application/controllers/Update.php:273 #: application/controllers/Update.php:284 @@ -314,12 +314,12 @@ msgid "Log View - VUCC" msgstr "Log Ansicht – VUCC" #: application/controllers/Awards.php:453 -#: application/controllers/Timeline.php:92 -#: application/controllers/Timeline.php:95 -#: application/controllers/Timeline.php:98 -#: application/controllers/Timeline.php:101 -#: application/controllers/Timeline.php:104 -#: application/controllers/Timeline.php:107 +#: application/controllers/Timeline.php:105 +#: application/controllers/Timeline.php:108 +#: application/controllers/Timeline.php:111 +#: application/controllers/Timeline.php:114 +#: application/controllers/Timeline.php:117 +#: application/controllers/Timeline.php:120 msgid "Log View" msgstr "Log-Ansicht" @@ -573,16 +573,16 @@ msgstr "Kontinente" msgid "Cron Manager" msgstr "Cron-Manager" -#: application/controllers/Cron.php:141 application/views/cron/edit.php:5 +#: application/controllers/Cron.php:144 application/views/cron/edit.php:5 msgid "Edit Cronjob" msgstr "Bearbeite Cronjob" -#: application/controllers/Cron.php:261 +#: application/controllers/Cron.php:264 #: application/views/interface_assets/footer.php:36 msgid "OK" msgstr "OK" -#: application/controllers/Cron.php:265 +#: application/controllers/Cron.php:268 #, php-format msgid "" "Last run occurred more than %s seconds ago.%sPlease check your master cron! " @@ -591,7 +591,7 @@ msgstr "" "Letzte Ausführung fand vor mehr als %s Sekunden statt.%sBitte überprüfe " "deinen Master-Cron! Er sollte jede Minute laufen (* * * * *)." -#: application/controllers/Cron.php:268 +#: application/controllers/Cron.php:271 #, php-format msgid "" "Last run occurred more than %s minutes ago.%sSeems like your Mastercron " @@ -600,7 +600,7 @@ msgstr "" "Letzter Ausführung fand vor mehr als %s Minuten statt.%sEs scheint, als ob " "dein Mastercron nicht läuft!%sEr sollte jede Minute laufen (* * * * *)." -#: application/controllers/Cron.php:273 application/views/cron/index.php:29 +#: application/controllers/Cron.php:276 application/views/cron/index.php:29 msgctxt "Master Cron" msgid "Not running" msgstr "Läuft nicht" @@ -1007,6 +1007,7 @@ msgstr "eQSL" #: application/views/logbookadvanced/useroptions.php:74 #: application/views/search/search_result_ajax.php:124 #: application/views/station_profile/edit.php:352 +#: application/views/timeline/index.php:68 #: application/views/update/index.php:20 application/views/user/edit.php:566 #: application/views/user/edit.php:683 #: application/views/view_log/partial/log_ajax.php:83 @@ -1068,7 +1069,7 @@ msgstr "Clublog" #: application/views/search/lotw_unconfirmed_result.php:8 #: application/views/search/result_search.php:7 #: application/views/search/search_result_ajax.php:4 -#: application/views/simplefle/index.php:144 +#: application/views/simplefle/index.php:150 #: application/views/statistics/custom.php:60 #: application/views/statistics/custom_result.php:62 #: application/views/statistics/custom_result.php:88 @@ -1102,7 +1103,7 @@ msgstr "Mode" #: application/views/qso/components/previous_contacts.php:79 #: application/views/qso/edit_ajax.php:142 application/views/qso/index.php:177 #: application/views/search/search_result_ajax.php:5 -#: application/views/simplefle/index.php:145 +#: application/views/simplefle/index.php:151 #: application/views/user/edit.php:230 application/views/user/edit.php:252 #: application/views/user/edit.php:274 application/views/user/edit.php:296 #: application/views/user/edit.php:319 @@ -1129,7 +1130,7 @@ msgstr "RST (S)" #: application/views/qso/components/previous_contacts.php:80 #: application/views/qso/edit_ajax.php:147 application/views/qso/index.php:182 #: application/views/search/search_result_ajax.php:6 -#: application/views/simplefle/index.php:146 +#: application/views/simplefle/index.php:152 #: application/views/user/edit.php:231 application/views/user/edit.php:253 #: application/views/user/edit.php:275 application/views/user/edit.php:297 #: application/views/user/edit.php:320 @@ -1152,7 +1153,7 @@ msgstr "RST (R)" #: application/views/search/search_result_ajax.php:7 #: application/views/stationsetup/stationsetup.php:124 #: application/views/statistics/custom_result.php:92 -#: application/views/timeline/index.php:118 application/views/user/edit.php:232 +#: application/views/timeline/index.php:151 application/views/user/edit.php:232 #: application/views/user/edit.php:254 application/views/user/edit.php:276 #: application/views/user/edit.php:298 application/views/user/edit.php:321 #: application/views/view_log/partial/log.php:13 @@ -1182,7 +1183,7 @@ msgstr "Land" #: application/views/qso/edit_ajax.php:318 #: application/views/search/search_result_ajax.php:8 #: application/views/station_profile/edit.php:215 -#: application/views/timeline/index.php:202 application/views/user/edit.php:233 +#: application/views/timeline/index.php:235 application/views/user/edit.php:233 #: application/views/user/edit.php:255 application/views/user/edit.php:277 #: application/views/user/edit.php:299 application/views/user/edit.php:322 #: application/views/view_log/partial/log_ajax.php:8 @@ -1210,7 +1211,7 @@ msgstr "IOTA" #: application/views/qslcard/searchresult.php:82 #: application/views/qso/components/previous_contacts.php:86 #: application/views/search/search_result_ajax.php:12 -#: application/views/timeline/index.php:177 application/views/user/edit.php:237 +#: application/views/timeline/index.php:210 application/views/user/edit.php:237 #: application/views/user/edit.php:259 application/views/user/edit.php:281 #: application/views/user/edit.php:303 application/views/user/edit.php:326 #: application/views/view_log/partial/log_ajax.php:12 @@ -1246,9 +1247,9 @@ msgstr "Staat" #: application/views/search/cqzones_result.php:12 #: application/views/search/result.php:33 #: application/views/search/search_result_ajax.php:13 -#: application/views/simplefle/index.php:147 +#: application/views/simplefle/index.php:153 #: application/views/stationsetup/stationsetup.php:125 -#: application/views/timeline/index.php:257 application/views/user/edit.php:130 +#: application/views/timeline/index.php:290 application/views/user/edit.php:130 #: application/views/user/edit.php:238 application/views/user/edit.php:260 #: application/views/user/edit.php:282 application/views/user/edit.php:304 #: application/views/user/edit.php:327 application/views/user/profile.php:34 @@ -1339,7 +1340,7 @@ msgstr "Distanz" #: application/views/search/lotw_unconfirmed_result.php:9 #: application/views/search/result_search.php:10 #: application/views/search/search_result_ajax.php:15 -#: application/views/simplefle/index.php:143 +#: application/views/simplefle/index.php:149 #: application/views/stationsetup/exportmapoptions.php:31 #: application/views/statistics/custom.php:53 #: application/views/statistics/custom_result.php:55 @@ -1417,7 +1418,7 @@ msgstr "Operator" #: application/views/stationsetup/linkedlocations.php:17 #: application/views/stationsetup/linkedlocations.php:45 #: application/views/stationsetup/stationsetup.php:150 -#: application/views/timeline/index.php:134 +#: application/views/timeline/index.php:167 #: application/views/timeplotter/index.php:33 #: application/views/view_log/partial/log_ajax.php:29 #: application/views/view_log/qso.php:236 @@ -1750,7 +1751,7 @@ msgstr "Zeitstempel" #: application/views/logbookadvanced/index.php:527 #: application/views/lotw_views/index.php:43 #: application/views/simplefle/index.php:20 -#: application/views/simplefle/index.php:171 +#: application/views/simplefle/index.php:177 #: application/views/stationsetup/exportmapoptions.php:5 #: application/views/statistics/custom.php:31 #: application/views/statistics/custom_result.php:33 @@ -1774,10 +1775,10 @@ msgstr "Standardgerät (klicken zum freigeben)" #: application/controllers/Radio.php:105 #: application/controllers/Stationsetup.php:372 #: application/views/api/help.php:61 application/views/contesting/add.php:62 -#: application/views/interface_assets/footer.php:2334 -#: application/views/interface_assets/footer.php:2352 -#: application/views/interface_assets/footer.php:2373 -#: application/views/interface_assets/footer.php:2391 +#: application/views/interface_assets/footer.php:2337 +#: application/views/interface_assets/footer.php:2355 +#: application/views/interface_assets/footer.php:2376 +#: application/views/interface_assets/footer.php:2394 #: application/views/labels/index.php:48 application/views/labels/index.php:84 #: application/views/logbookadvanced/index.php:519 #: application/views/lotw_views/index.php:114 @@ -2094,7 +2095,7 @@ msgstr "Erstelle Theme" msgid "Edit Theme" msgstr "Bearbeite Theme" -#: application/controllers/Timeline.php:17 +#: application/controllers/Timeline.php:15 #: application/views/interface_assets/header.php:148 #: application/views/timeline/index.php:2 msgid "Timeline" @@ -2559,8 +2560,8 @@ msgstr "Differenz" #: application/views/gridmap/index.php:41 #: application/views/gridmap/index.php:70 #: application/views/gridmap/index.php:83 -#: application/views/interface_assets/footer.php:1446 -#: application/views/interface_assets/footer.php:1585 +#: application/views/interface_assets/footer.php:1448 +#: application/views/interface_assets/footer.php:1587 #: application/views/kml/index.php:21 application/views/kml/index.php:33 #: application/views/kml/index.php:49 application/views/kml/index.php:67 #: application/views/kml/index.php:79 @@ -2591,6 +2592,7 @@ msgstr "Differenz" #: application/views/stationsetup/exportmapoptions.php:33 #: application/views/timeline/index.php:10 #: application/views/timeline/index.php:22 +#: application/views/timeline/index.php:77 #: application/views/timeplotter/index.php:17 #: application/views/timeplotter/index.php:27 #: application/views/timeplotter/index.php:47 @@ -2649,13 +2651,13 @@ msgstr "Zeitraum" #: application/views/logbookadvanced/useroptions.php:17 #: application/views/lookup/index.php:63 #: application/views/stationsetup/exportmapoptions.php:6 -#: application/views/timeline/index.php:72 -#: application/views/timeline/index.php:137 -#: application/views/timeline/index.php:164 -#: application/views/timeline/index.php:189 -#: application/views/timeline/index.php:218 -#: application/views/timeline/index.php:243 -#: application/views/timeline/index.php:270 +#: application/views/timeline/index.php:105 +#: application/views/timeline/index.php:170 +#: application/views/timeline/index.php:197 +#: application/views/timeline/index.php:222 +#: application/views/timeline/index.php:251 +#: application/views/timeline/index.php:276 +#: application/views/timeline/index.php:303 #: application/views/timeplotter/index.php:59 msgid "Show" msgstr "Anzeigen" @@ -2773,7 +2775,7 @@ msgstr "Minimale Anzahl" #: application/views/awards/was/index.php:200 #: application/views/awards/wwff/index.php:64 #: application/views/public_search/empty.php:3 -#: application/views/qrz/export.php:64 application/views/timeline/index.php:102 +#: application/views/qrz/export.php:64 application/views/timeline/index.php:135 msgid "Nothing found!" msgstr "Nichts gefunden!" @@ -2806,7 +2808,7 @@ msgstr "Nichts gefunden!" #: application/views/search/lotw_unconfirmed.php:33 #: application/views/search/lotw_unconfirmed_result.php:6 #: application/views/search/result.php:11 -#: application/views/simplefle/index.php:142 +#: application/views/simplefle/index.php:148 #: application/views/station_profile/edit.php:63 #: application/views/stationsetup/linkedlocations.php:17 #: application/views/user/edit.php:123 application/views/user/index.php:4 @@ -2820,12 +2822,12 @@ msgid "Count" msgstr "Zähler" #: application/views/activators/index.php:101 -#: application/views/timeline/index.php:121 -#: application/views/timeline/index.php:153 -#: application/views/timeline/index.php:178 -#: application/views/timeline/index.php:205 -#: application/views/timeline/index.php:232 -#: application/views/timeline/index.php:258 +#: application/views/timeline/index.php:154 +#: application/views/timeline/index.php:186 +#: application/views/timeline/index.php:211 +#: application/views/timeline/index.php:238 +#: application/views/timeline/index.php:265 +#: application/views/timeline/index.php:291 msgid "Show QSO's" msgstr "Zeige QSOs" @@ -2890,16 +2892,16 @@ msgstr "Die Informationen zum DOK im Logbuch weichen von denen im DCL ab" #: application/views/search/cqzones_result.php:7 #: application/views/search/result_search.php:4 #: application/views/search/search_result_ajax.php:89 -#: application/views/simplefle/index.php:140 +#: application/views/simplefle/index.php:146 #: application/views/statistics/custom.php:38 #: application/views/statistics/custom_result.php:40 #: application/views/statistics/custom_result.php:85 -#: application/views/timeline/index.php:116 -#: application/views/timeline/index.php:151 -#: application/views/timeline/index.php:176 -#: application/views/timeline/index.php:201 -#: application/views/timeline/index.php:230 -#: application/views/timeline/index.php:255 +#: application/views/timeline/index.php:149 +#: application/views/timeline/index.php:184 +#: application/views/timeline/index.php:209 +#: application/views/timeline/index.php:234 +#: application/views/timeline/index.php:263 +#: application/views/timeline/index.php:288 #: application/views/view_log/partial/log.php:4 #: application/views/view_log/partial/log_ajax.php:57 #: application/views/visitor/index.php:147 @@ -2926,9 +2928,9 @@ msgstr "Datum" #: application/views/search/cqzones_result.php:8 #: application/views/search/result_search.php:5 #: application/views/search/search_result_ajax.php:91 -#: application/views/simplefle/index.php:141 +#: application/views/simplefle/index.php:147 #: application/views/statistics/custom_result.php:86 -#: application/views/timeline/index.php:256 +#: application/views/timeline/index.php:289 #: application/views/timeplotter/index.php:5 #: application/views/view_log/partial/log.php:6 #: application/views/view_log/partial/log_ajax.php:59 @@ -3072,7 +3074,7 @@ msgstr "" #: application/views/adif/import.php:152 #: application/views/interface_assets/footer.php:32 #: application/views/interface_assets/footer.php:501 -#: application/views/interface_assets/footer.php:2130 +#: application/views/interface_assets/footer.php:2133 msgid "DANGER" msgstr "GEFAHR" @@ -3364,8 +3366,7 @@ msgstr "Berechtigungen" #: application/views/oqrs/showrequests.php:91 #: application/views/sattimers/index.php:39 #: application/views/stationsetup/stationsetup.php:31 -#: application/views/timeline/index.php:119 -#: application/views/update/index.php:30 +#: application/views/timeline/index.php:152 msgid "Status" msgstr "Status" @@ -3532,7 +3533,7 @@ msgstr "Gesamt" #: application/views/search/cqzones_result.php:13 #: application/views/station_profile/create.php:113 #: application/views/station_profile/edit.php:153 -#: application/views/timeline/index.php:231 +#: application/views/timeline/index.php:264 #: application/views/timeplotter/index.php:44 msgid "CQ Zone" msgstr "CQ-Zone" @@ -3647,7 +3648,7 @@ msgstr "QSO mit QSL-Typ anzeigen" #: application/views/awards/cq/index.php:56 #: application/views/awards/itu/index.php:56 -#: application/views/interface_assets/footer.php:2109 +#: application/views/interface_assets/footer.php:2112 #: application/views/qso/edit_ajax.php:378 #: application/views/view_log/qso.php:25 msgid "QSL Card" @@ -3936,8 +3937,8 @@ msgstr "DXCC Name" #: application/views/awards/dxcc/index.php:226 #: application/views/awards/iota/index.php:170 -#: application/views/timeline/index.php:117 -#: application/views/timeline/index.php:204 +#: application/views/timeline/index.php:150 +#: application/views/timeline/index.php:237 msgid "Prefix" msgstr "Präfix" @@ -4151,7 +4152,7 @@ msgstr "Zeige IOTA Karte" #: application/views/search/search_result_ajax.php:19 #: application/views/stationsetup/stationsetup.php:30 #: application/views/themes/index.php:82 -#: application/views/timeline/index.php:203 application/views/user/edit.php:241 +#: application/views/timeline/index.php:236 application/views/user/edit.php:241 #: application/views/user/edit.php:263 application/views/user/edit.php:285 #: application/views/user/edit.php:307 application/views/user/edit.php:330 #: application/views/view_log/partial/log_ajax.php:19 @@ -4524,7 +4525,7 @@ msgid "Show WAJA Map" msgstr "Zeige WAJA-Karte" #: application/views/awards/waja/index.php:154 -#: application/views/timeline/index.php:152 +#: application/views/timeline/index.php:185 msgid "Prefecture" msgstr "Präfektur" @@ -5467,6 +5468,7 @@ msgstr "Propagation" #: application/views/gridmap/index.php:44 application/views/kml/index.php:80 #: application/views/logbookadvanced/index.php:219 #: application/views/qso/edit_ajax.php:192 application/views/qso/index.php:404 +#: application/views/timeline/index.php:80 msgctxt "Propagation Mode" msgid "Aircraft Scatter" msgstr "Flugzeug-Scatter" @@ -5475,6 +5477,7 @@ msgstr "Flugzeug-Scatter" #: application/views/gridmap/index.php:45 application/views/kml/index.php:81 #: application/views/logbookadvanced/index.php:220 #: application/views/qso/edit_ajax.php:193 application/views/qso/index.php:405 +#: application/views/timeline/index.php:81 msgctxt "Propagation Mode" msgid "Aurora" msgstr "Aurora" @@ -5483,6 +5486,7 @@ msgstr "Aurora" #: application/views/gridmap/index.php:46 application/views/kml/index.php:82 #: application/views/logbookadvanced/index.php:221 #: application/views/qso/edit_ajax.php:194 application/views/qso/index.php:406 +#: application/views/timeline/index.php:82 msgctxt "Propagation Mode" msgid "Aurora-E" msgstr "Aurora-E" @@ -5491,6 +5495,7 @@ msgstr "Aurora-E" #: application/views/gridmap/index.php:47 application/views/kml/index.php:83 #: application/views/logbookadvanced/index.php:222 #: application/views/qso/edit_ajax.php:195 application/views/qso/index.php:407 +#: application/views/timeline/index.php:83 msgctxt "Propagation Mode" msgid "Back scatter" msgstr "Rückwärts-Scatter" @@ -5499,6 +5504,7 @@ msgstr "Rückwärts-Scatter" #: application/views/gridmap/index.php:48 application/views/kml/index.php:84 #: application/views/logbookadvanced/index.php:223 #: application/views/qso/edit_ajax.php:196 application/views/qso/index.php:408 +#: application/views/timeline/index.php:84 msgctxt "Propagation Mode" msgid "EchoLink" msgstr "EchoLink" @@ -5507,6 +5513,7 @@ msgstr "EchoLink" #: application/views/gridmap/index.php:49 application/views/kml/index.php:85 #: application/views/logbookadvanced/index.php:224 #: application/views/qso/edit_ajax.php:197 application/views/qso/index.php:409 +#: application/views/timeline/index.php:85 msgctxt "Propagation Mode" msgid "Earth-Moon-Earth" msgstr "Erde-Mond-Erde" @@ -5515,6 +5522,7 @@ msgstr "Erde-Mond-Erde" #: application/views/gridmap/index.php:50 application/views/kml/index.php:86 #: application/views/logbookadvanced/index.php:225 #: application/views/qso/edit_ajax.php:198 application/views/qso/index.php:410 +#: application/views/timeline/index.php:86 msgctxt "Propagation Mode" msgid "Sporadic E" msgstr "Sporadic E" @@ -5523,6 +5531,7 @@ msgstr "Sporadic E" #: application/views/gridmap/index.php:51 application/views/kml/index.php:87 #: application/views/logbookadvanced/index.php:226 #: application/views/qso/edit_ajax.php:199 application/views/qso/index.php:411 +#: application/views/timeline/index.php:87 msgctxt "Propagation Mode" msgid "Field Aligned Irregularities" msgstr "feldausgerichtete Irregularitäten" @@ -5531,6 +5540,7 @@ msgstr "feldausgerichtete Irregularitäten" #: application/views/gridmap/index.php:52 application/views/kml/index.php:88 #: application/views/logbookadvanced/index.php:227 #: application/views/qso/edit_ajax.php:200 application/views/qso/index.php:412 +#: application/views/timeline/index.php:88 msgctxt "Propagation Mode" msgid "F2 Reflection" msgstr "F2-Reflexion" @@ -5539,6 +5549,7 @@ msgstr "F2-Reflexion" #: application/views/gridmap/index.php:53 application/views/kml/index.php:89 #: application/views/logbookadvanced/index.php:228 #: application/views/qso/edit_ajax.php:201 application/views/qso/index.php:413 +#: application/views/timeline/index.php:89 msgctxt "Propagation Mode" msgid "Internet-assisted" msgstr "Internet-gestützt" @@ -5547,6 +5558,7 @@ msgstr "Internet-gestützt" #: application/views/gridmap/index.php:54 application/views/kml/index.php:90 #: application/views/logbookadvanced/index.php:229 #: application/views/qso/edit_ajax.php:202 application/views/qso/index.php:414 +#: application/views/timeline/index.php:90 msgctxt "Propagation Mode" msgid "Ionoscatter" msgstr "Ionoscatter" @@ -5555,6 +5567,7 @@ msgstr "Ionoscatter" #: application/views/gridmap/index.php:55 application/views/kml/index.php:91 #: application/views/logbookadvanced/index.php:230 #: application/views/qso/edit_ajax.php:203 application/views/qso/index.php:415 +#: application/views/timeline/index.php:91 msgctxt "Propagation Mode" msgid "IRLP" msgstr "IRLP" @@ -5563,6 +5576,7 @@ msgstr "IRLP" #: application/views/gridmap/index.php:56 application/views/kml/index.php:92 #: application/views/logbookadvanced/index.php:231 #: application/views/qso/edit_ajax.php:204 application/views/qso/index.php:416 +#: application/views/timeline/index.php:92 msgctxt "Propagation Mode" msgid "Meteor scatter" msgstr "Meteor-Scatter" @@ -5571,6 +5585,7 @@ msgstr "Meteor-Scatter" #: application/views/gridmap/index.php:57 application/views/kml/index.php:93 #: application/views/logbookadvanced/index.php:232 #: application/views/qso/edit_ajax.php:205 application/views/qso/index.php:417 +#: application/views/timeline/index.php:93 msgctxt "Propagation Mode" msgid "Terrestrial or atmospheric repeater or transponder" msgstr "Terrestrische oder atmosphärische Repeater oder Transponder" @@ -5579,6 +5594,7 @@ msgstr "Terrestrische oder atmosphärische Repeater oder Transponder" #: application/views/gridmap/index.php:58 application/views/kml/index.php:94 #: application/views/logbookadvanced/index.php:233 #: application/views/qso/edit_ajax.php:206 application/views/qso/index.php:418 +#: application/views/timeline/index.php:94 msgctxt "Propagation Mode" msgid "Rain scatter" msgstr "Regen-Scatter" @@ -5587,6 +5603,7 @@ msgstr "Regen-Scatter" #: application/views/gridmap/index.php:59 application/views/kml/index.php:95 #: application/views/logbookadvanced/index.php:234 #: application/views/qso/edit_ajax.php:207 application/views/qso/index.php:419 +#: application/views/timeline/index.php:95 msgctxt "Propagation Mode" msgid "Satellite" msgstr "Satellit" @@ -5595,6 +5612,7 @@ msgstr "Satellit" #: application/views/gridmap/index.php:60 application/views/kml/index.php:96 #: application/views/logbookadvanced/index.php:235 #: application/views/qso/edit_ajax.php:208 application/views/qso/index.php:420 +#: application/views/timeline/index.php:96 msgctxt "Propagation Mode" msgid "Trans-equatorial" msgstr "Transequatorial" @@ -5603,6 +5621,7 @@ msgstr "Transequatorial" #: application/views/gridmap/index.php:61 application/views/kml/index.php:97 #: application/views/logbookadvanced/index.php:236 #: application/views/qso/edit_ajax.php:209 application/views/qso/index.php:421 +#: application/views/timeline/index.php:97 msgctxt "Propagation Mode" msgid "Tropospheric ducting" msgstr "troposphärisches Ducting" @@ -5820,7 +5839,7 @@ msgstr "Startdatum" #: application/views/dayswithqso/index.php:58 #: application/views/dayswithqso/index.php:86 #: application/views/dayswithqso/index.php:108 -#: application/views/timeline/index.php:120 +#: application/views/timeline/index.php:153 msgid "End Date" msgstr "Enddatum" @@ -6505,10 +6524,10 @@ msgid "QSL Date" msgstr "QSL-Datum" #: application/views/eqslcard/index.php:60 -#: application/views/interface_assets/footer.php:2335 -#: application/views/interface_assets/footer.php:2353 -#: application/views/interface_assets/footer.php:2374 -#: application/views/interface_assets/footer.php:2392 +#: application/views/interface_assets/footer.php:2338 +#: application/views/interface_assets/footer.php:2356 +#: application/views/interface_assets/footer.php:2377 +#: application/views/interface_assets/footer.php:2395 #: application/views/qslcard/index.php:66 #: application/views/view_log/qso.php:614 msgid "View" @@ -6519,10 +6538,12 @@ msgstr "Ansicht" #: application/views/logbookadvanced/index.php:215 #: application/views/logbookadvanced/index.php:609 #: application/views/logbookadvanced/useroptions.php:118 +#: application/views/timeline/index.php:74 msgid "Propagation" msgstr "Ausbreitungsart" #: application/views/gridmap/index.php:42 +#: application/views/timeline/index.php:79 msgid "None/Empty" msgstr "Keine/Leer" @@ -6781,57 +6802,57 @@ msgstr "Planquadrate: " msgid "You're not logged in. Please %slogin%s" msgstr "Du bist nicht eingeloggt. Bitte %slogge dich ein%s" -#: application/views/interface_assets/footer.php:1373 -#: application/views/interface_assets/footer.php:1377 -#: application/views/interface_assets/footer.php:1380 -#: application/views/interface_assets/footer.php:1517 -#: application/views/interface_assets/footer.php:1521 -#: application/views/interface_assets/footer.php:1524 +#: application/views/interface_assets/footer.php:1375 +#: application/views/interface_assets/footer.php:1379 +#: application/views/interface_assets/footer.php:1382 +#: application/views/interface_assets/footer.php:1519 +#: application/views/interface_assets/footer.php:1523 +#: application/views/interface_assets/footer.php:1526 msgid "grid square" msgstr "Planquadrate" -#: application/views/interface_assets/footer.php:1380 -#: application/views/interface_assets/footer.php:1524 +#: application/views/interface_assets/footer.php:1382 +#: application/views/interface_assets/footer.php:1526 msgid "Total count" msgstr "Summe" -#: application/views/interface_assets/footer.php:2111 +#: application/views/interface_assets/footer.php:2114 msgid "QSL Card for " msgstr "QSL-Karte für " -#: application/views/interface_assets/footer.php:2131 +#: application/views/interface_assets/footer.php:2134 msgid "Warning! Are you sure you want to delete this QSL card?" msgstr "Warnung! Bist du sicher, dass du diese QSL-Karte löschen möchtest?" -#: application/views/interface_assets/footer.php:2171 +#: application/views/interface_assets/footer.php:2174 #: application/views/view_log/qso.php:42 msgid "eQSL Card" msgstr "eQSL-Karte" -#: application/views/interface_assets/footer.php:2173 +#: application/views/interface_assets/footer.php:2176 msgid "eQSL Card for " msgstr "eQSL-Karte für " -#: application/views/interface_assets/footer.php:2346 -#: application/views/interface_assets/footer.php:2385 +#: application/views/interface_assets/footer.php:2349 +#: application/views/interface_assets/footer.php:2388 #: application/views/view_log/qso.php:604 msgid "QSL image file" msgstr "QSL-Bilddatei" -#: application/views/interface_assets/footer.php:2365 +#: application/views/interface_assets/footer.php:2368 msgid "Front QSL Card:" msgstr "Vorderseite QSL-Karte:" -#: application/views/interface_assets/footer.php:2403 +#: application/views/interface_assets/footer.php:2406 msgid "Back QSL Card:" msgstr "Rückseite QSL-Karte:" -#: application/views/interface_assets/footer.php:2414 -#: application/views/interface_assets/footer.php:2439 +#: application/views/interface_assets/footer.php:2417 +#: application/views/interface_assets/footer.php:2442 msgid "Add additional QSOs to a QSL Card" msgstr "Weitere QSOs zu einer QSL-Karte hinzufügen" -#: application/views/interface_assets/footer.php:2450 +#: application/views/interface_assets/footer.php:2453 msgid "Something went wrong. Please try again!" msgstr "Etwas ist schiefgelaufen. Bitte versuche es erneut!" @@ -8876,7 +8897,7 @@ msgid "Remove" msgstr "Entfernen" #: application/views/qslprint/qslprint.php:33 -#: application/views/simplefle/index.php:133 +#: application/views/simplefle/index.php:139 msgid "QSO List" msgstr "QSO Liste" @@ -9058,7 +9079,7 @@ msgstr "Änderungen speichern" msgid "TimeOff is less than TimeOn" msgstr "Endzeit ist vor der Startzeit" -#: application/views/qso/index.php:5 application/views/qso/index.php:690 +#: application/views/qso/index.php:5 application/views/qso/index.php:696 msgid "Previous Contacts" msgstr "Vorherige Kontakte" @@ -9174,19 +9195,35 @@ msgstr "Winkey" msgid "Connect" msgstr "Verbinden" -#: application/views/qso/index.php:663 +#: application/views/qso/index.php:656 +msgid "Stop" +msgstr "Stop" + +#: application/views/qso/index.php:657 +msgid "Tune" +msgstr "Abstimmen" + +#: application/views/qso/index.php:658 +msgid "Stop Tune" +msgstr "Abstimmen stoppen" + +#: application/views/qso/index.php:664 +msgid "CW Speed" +msgstr "CW Geschwindigkeit" + +#: application/views/qso/index.php:669 msgid "Send" msgstr "Senden" -#: application/views/qso/index.php:673 +#: application/views/qso/index.php:679 msgid "Suggestions" msgstr "Vorschläge" -#: application/views/qso/index.php:680 +#: application/views/qso/index.php:686 msgid "Profile Picture" msgstr "Profilbild" -#: application/views/qso/index.php:704 +#: application/views/qso/index.php:710 msgid "Max. 5 previous contacts are shown" msgstr "Es werden maximal 5 Kontakte angezeigt" @@ -9597,7 +9634,7 @@ msgstr "" "die Syntax und wie FLE funktioniert findest du %s." #: application/views/simplefle/index.php:17 -#: application/views/simplefle/index.php:170 +#: application/views/simplefle/index.php:176 msgid "Syntax Help" msgstr "Syntax-Hilfe" @@ -9717,25 +9754,25 @@ msgstr "" msgid "Enter the Data" msgstr "Gibt hier die Daten ein" -#: application/views/simplefle/index.php:148 +#: application/views/simplefle/index.php:154 msgid "Refs" msgstr "Refs" -#: application/views/simplefle/index.php:160 +#: application/views/simplefle/index.php:166 #, php-format msgid "The Refs can be either %sS%sOTA, %sI%sOTA, %sP%sOTA, or %sW%sWFF" msgstr "" "Die Refs können entweder %sS%sOTA, %sI%sOTA, %sP%sOTA oder %sW%sWFF sein" -#: application/views/simplefle/index.php:167 +#: application/views/simplefle/index.php:173 msgid "Reload QSO List" msgstr "Aktualisiere QSO-Liste" -#: application/views/simplefle/index.php:168 +#: application/views/simplefle/index.php:174 msgid "Save in Wavelog" msgstr "Speichere in Wavelog" -#: application/views/simplefle/index.php:169 +#: application/views/simplefle/index.php:175 msgid "Clear Logging Session" msgstr "Lösche QSO-Daten" @@ -10598,6 +10635,10 @@ msgstr "Bitte bearbeiten" msgid "Add a Theme" msgstr "Ein Theme hinzufügen" +#: application/views/timeline/index.php:78 +msgid "All but SAT" +msgstr "" + #: application/views/timeplotter/index.php:2 msgid "contacts were plotted" msgstr "Kontakte wurden geplotted" @@ -10651,6 +10692,10 @@ msgstr "Überprüft auf neue DXCC-Daten" msgid "Update DXCC Data" msgstr "DXCC-Daten aktualisieren" +#: application/views/update/index.php:30 +msgid "Status:" +msgstr "" + #: application/views/update/index.php:34 msgid "Apply DXCC Data to Logbook" msgstr "DXCC-Daten auf das Logbuch anwenden" @@ -10670,19 +10715,19 @@ msgstr "" "und auch bestehende DXCC aktualisiert werden sollen, falls sich etwas " "geändert hat." -#: application/views/update/index.php:40 +#: application/views/update/index.php:45 msgid "Check QSOs missing DXCC data" msgstr "Überprüft QSOs auf fehlende DXCC-Daten" -#: application/views/update/index.php:42 application/views/update/index.php:62 +#: application/views/update/index.php:54 application/views/update/index.php:95 msgid "Re-check all QSOs in logbook" msgstr "Alle QSOs in Logbuch nochmal überprüfen" -#: application/views/update/index.php:45 +#: application/views/update/index.php:59 msgid "Apply Continent Data to Logbook" msgstr "Kontinent-Daten auf Logbuch anwenden" -#: application/views/update/index.php:47 +#: application/views/update/index.php:61 msgid "" "This function can be used to update QSO continent information for all QSOs " "in Wavelog missing that information." @@ -10690,20 +10735,20 @@ msgstr "" "Diese Funktion kann verwendet werden, um QSO-Kontinent-Informationen bei " "allen QSOs in Wavelog zu aktualisieren, bei denen diese Informationen fehlen." -#: application/views/update/index.php:49 +#: application/views/update/index.php:68 msgid "Check QSOs missing continent data" msgstr "Überprüft QSOs auf fehlende Kontinent-Daten" -#: application/views/update/index.php:59 +#: application/views/update/index.php:80 msgid "Here you can update QSOs with missing distance information." msgstr "" "Hier kannst du QSOs mit fehlenden Entfernungsinformationen aktualisieren." -#: application/views/update/index.php:60 +#: application/views/update/index.php:86 msgid "Update distance data" msgstr "Entfernungsdaten aktualisieren" -#: application/views/update/index.php:61 +#: application/views/update/index.php:89 msgid "" "Use the following button to update the distance information for all your " "QSOs. Depending on the number of QSOs this might take some time to execute. " diff --git a/application/locale/el_GR/LC_MESSAGES/messages.po b/application/locale/el_GR/LC_MESSAGES/messages.po index a3c66ac1f..85a57d575 100644 --- a/application/locale/el_GR/LC_MESSAGES/messages.po +++ b/application/locale/el_GR/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-22 13:37+0000\n" +"POT-Creation-Date: 2024-08-25 17:03+0000\n" "PO-Revision-Date: 2024-08-17 10:47+0000\n" "Last-Translator: Fabian Berg \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Finnish \n" -"Language-Team: French \n" +"Language-Team: French \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +38,7 @@ msgstr "" #: application/controllers/Components.php:13 #: application/controllers/Contestcalendar.php:15 #: application/controllers/Contesting.php:14 -#: application/controllers/Cron.php:26 application/controllers/Cron.php:149 +#: application/controllers/Cron.php:26 application/controllers/Cron.php:152 #: application/controllers/Csv.php:8 application/controllers/Csv.php:31 #: application/controllers/Dayswithqso.php:11 #: application/controllers/Debug.php:10 @@ -79,7 +79,7 @@ msgstr "" #: application/controllers/Station.php:17 #: application/controllers/Stationsetup.php:15 #: application/controllers/Themes.php:17 -#: application/controllers/Timeline.php:11 +#: application/controllers/Timeline.php:10 #: application/controllers/Timeplotter.php:11 #: application/controllers/Update.php:24 application/controllers/Update.php:273 #: application/controllers/Update.php:284 @@ -307,12 +307,12 @@ msgid "Log View - VUCC" msgstr "Vue du journal - VUCC" #: application/controllers/Awards.php:453 -#: application/controllers/Timeline.php:92 -#: application/controllers/Timeline.php:95 -#: application/controllers/Timeline.php:98 -#: application/controllers/Timeline.php:101 -#: application/controllers/Timeline.php:104 -#: application/controllers/Timeline.php:107 +#: application/controllers/Timeline.php:105 +#: application/controllers/Timeline.php:108 +#: application/controllers/Timeline.php:111 +#: application/controllers/Timeline.php:114 +#: application/controllers/Timeline.php:117 +#: application/controllers/Timeline.php:120 msgid "Log View" msgstr "Vue du journal" @@ -566,16 +566,16 @@ msgstr "Continents" msgid "Cron Manager" msgstr "Gestion des Cron" -#: application/controllers/Cron.php:141 application/views/cron/edit.php:5 +#: application/controllers/Cron.php:144 application/views/cron/edit.php:5 msgid "Edit Cronjob" msgstr "Modifier les traitements Cron" -#: application/controllers/Cron.php:261 +#: application/controllers/Cron.php:264 #: application/views/interface_assets/footer.php:36 msgid "OK" msgstr "OK" -#: application/controllers/Cron.php:265 +#: application/controllers/Cron.php:268 #, php-format msgid "" "Last run occurred more than %s seconds ago.%sPlease check your master cron! " @@ -584,7 +584,7 @@ msgstr "" "La dernière exécution a eu lieu il y a plus de %s secondes.%sVeuillez " "vérifier votre cron maître ! Il devrait s'exécuter chaque minute (* * * * *)." -#: application/controllers/Cron.php:268 +#: application/controllers/Cron.php:271 #, php-format msgid "" "Last run occurred more than %s minutes ago.%sSeems like your Mastercron " @@ -594,7 +594,7 @@ msgstr "" "votre Mastercron ne fonctionne pas !%sIl devrait s'exécuter chaque minute (* " "* * * *)." -#: application/controllers/Cron.php:273 application/views/cron/index.php:29 +#: application/controllers/Cron.php:276 application/views/cron/index.php:29 msgctxt "Master Cron" msgid "Not running" msgstr "Ne fonctionne pas" @@ -1004,6 +1004,7 @@ msgstr "eQSL" #: application/views/logbookadvanced/useroptions.php:74 #: application/views/search/search_result_ajax.php:124 #: application/views/station_profile/edit.php:352 +#: application/views/timeline/index.php:68 #: application/views/update/index.php:20 application/views/user/edit.php:566 #: application/views/user/edit.php:683 #: application/views/view_log/partial/log_ajax.php:83 @@ -1065,7 +1066,7 @@ msgstr "Clublog" #: application/views/search/lotw_unconfirmed_result.php:8 #: application/views/search/result_search.php:7 #: application/views/search/search_result_ajax.php:4 -#: application/views/simplefle/index.php:144 +#: application/views/simplefle/index.php:150 #: application/views/statistics/custom.php:60 #: application/views/statistics/custom_result.php:62 #: application/views/statistics/custom_result.php:88 @@ -1099,7 +1100,7 @@ msgstr "Mode" #: application/views/qso/components/previous_contacts.php:79 #: application/views/qso/edit_ajax.php:142 application/views/qso/index.php:177 #: application/views/search/search_result_ajax.php:5 -#: application/views/simplefle/index.php:145 +#: application/views/simplefle/index.php:151 #: application/views/user/edit.php:230 application/views/user/edit.php:252 #: application/views/user/edit.php:274 application/views/user/edit.php:296 #: application/views/user/edit.php:319 @@ -1126,7 +1127,7 @@ msgstr "RST (E)" #: application/views/qso/components/previous_contacts.php:80 #: application/views/qso/edit_ajax.php:147 application/views/qso/index.php:182 #: application/views/search/search_result_ajax.php:6 -#: application/views/simplefle/index.php:146 +#: application/views/simplefle/index.php:152 #: application/views/user/edit.php:231 application/views/user/edit.php:253 #: application/views/user/edit.php:275 application/views/user/edit.php:297 #: application/views/user/edit.php:320 @@ -1149,7 +1150,7 @@ msgstr "RST (R)" #: application/views/search/search_result_ajax.php:7 #: application/views/stationsetup/stationsetup.php:124 #: application/views/statistics/custom_result.php:92 -#: application/views/timeline/index.php:118 application/views/user/edit.php:232 +#: application/views/timeline/index.php:151 application/views/user/edit.php:232 #: application/views/user/edit.php:254 application/views/user/edit.php:276 #: application/views/user/edit.php:298 application/views/user/edit.php:321 #: application/views/view_log/partial/log.php:13 @@ -1179,7 +1180,7 @@ msgstr "Pays" #: application/views/qso/edit_ajax.php:318 #: application/views/search/search_result_ajax.php:8 #: application/views/station_profile/edit.php:215 -#: application/views/timeline/index.php:202 application/views/user/edit.php:233 +#: application/views/timeline/index.php:235 application/views/user/edit.php:233 #: application/views/user/edit.php:255 application/views/user/edit.php:277 #: application/views/user/edit.php:299 application/views/user/edit.php:322 #: application/views/view_log/partial/log_ajax.php:8 @@ -1207,7 +1208,7 @@ msgstr "IOTA" #: application/views/qslcard/searchresult.php:82 #: application/views/qso/components/previous_contacts.php:86 #: application/views/search/search_result_ajax.php:12 -#: application/views/timeline/index.php:177 application/views/user/edit.php:237 +#: application/views/timeline/index.php:210 application/views/user/edit.php:237 #: application/views/user/edit.php:259 application/views/user/edit.php:281 #: application/views/user/edit.php:303 application/views/user/edit.php:326 #: application/views/view_log/partial/log_ajax.php:12 @@ -1243,9 +1244,9 @@ msgstr "Etat" #: application/views/search/cqzones_result.php:12 #: application/views/search/result.php:33 #: application/views/search/search_result_ajax.php:13 -#: application/views/simplefle/index.php:147 +#: application/views/simplefle/index.php:153 #: application/views/stationsetup/stationsetup.php:125 -#: application/views/timeline/index.php:257 application/views/user/edit.php:130 +#: application/views/timeline/index.php:290 application/views/user/edit.php:130 #: application/views/user/edit.php:238 application/views/user/edit.php:260 #: application/views/user/edit.php:282 application/views/user/edit.php:304 #: application/views/user/edit.php:327 application/views/user/profile.php:34 @@ -1336,7 +1337,7 @@ msgstr "Distance" #: application/views/search/lotw_unconfirmed_result.php:9 #: application/views/search/result_search.php:10 #: application/views/search/search_result_ajax.php:15 -#: application/views/simplefle/index.php:143 +#: application/views/simplefle/index.php:149 #: application/views/stationsetup/exportmapoptions.php:31 #: application/views/statistics/custom.php:53 #: application/views/statistics/custom_result.php:55 @@ -1414,7 +1415,7 @@ msgstr "Opérateur" #: application/views/stationsetup/linkedlocations.php:17 #: application/views/stationsetup/linkedlocations.php:45 #: application/views/stationsetup/stationsetup.php:150 -#: application/views/timeline/index.php:134 +#: application/views/timeline/index.php:167 #: application/views/timeplotter/index.php:33 #: application/views/view_log/partial/log_ajax.php:29 #: application/views/view_log/qso.php:236 @@ -1749,7 +1750,7 @@ msgstr "" #: application/views/logbookadvanced/index.php:527 #: application/views/lotw_views/index.php:43 #: application/views/simplefle/index.php:20 -#: application/views/simplefle/index.php:171 +#: application/views/simplefle/index.php:177 #: application/views/stationsetup/exportmapoptions.php:5 #: application/views/statistics/custom.php:31 #: application/views/statistics/custom_result.php:33 @@ -1773,10 +1774,10 @@ msgstr "Par défaut (cliquez pour libérer)" #: application/controllers/Radio.php:105 #: application/controllers/Stationsetup.php:372 #: application/views/api/help.php:61 application/views/contesting/add.php:62 -#: application/views/interface_assets/footer.php:2334 -#: application/views/interface_assets/footer.php:2352 -#: application/views/interface_assets/footer.php:2373 -#: application/views/interface_assets/footer.php:2391 +#: application/views/interface_assets/footer.php:2337 +#: application/views/interface_assets/footer.php:2355 +#: application/views/interface_assets/footer.php:2376 +#: application/views/interface_assets/footer.php:2394 #: application/views/labels/index.php:48 application/views/labels/index.php:84 #: application/views/logbookadvanced/index.php:519 #: application/views/lotw_views/index.php:114 @@ -2088,7 +2089,7 @@ msgstr "Créer un thème" msgid "Edit Theme" msgstr "Modifier le thème" -#: application/controllers/Timeline.php:17 +#: application/controllers/Timeline.php:15 #: application/views/interface_assets/header.php:148 #: application/views/timeline/index.php:2 msgid "Timeline" @@ -2234,8 +2235,8 @@ msgid "" "encryption_key in your config.php file first!" msgstr "" "Vous ne pouvez actuellement pas usurper l'identité d'un autre utilisateur. " -"Veuillez d'abord changer la clé de chiffrement dans votre fichier config.php " -"!" +"Veuillez d'abord changer la clé de chiffrement dans votre fichier config." +"php !" #: application/controllers/User.php:1206 msgid "Invalid Hash" @@ -2556,8 +2557,8 @@ msgstr "Différence" #: application/views/gridmap/index.php:41 #: application/views/gridmap/index.php:70 #: application/views/gridmap/index.php:83 -#: application/views/interface_assets/footer.php:1446 -#: application/views/interface_assets/footer.php:1585 +#: application/views/interface_assets/footer.php:1448 +#: application/views/interface_assets/footer.php:1587 #: application/views/kml/index.php:21 application/views/kml/index.php:33 #: application/views/kml/index.php:49 application/views/kml/index.php:67 #: application/views/kml/index.php:79 @@ -2588,6 +2589,7 @@ msgstr "Différence" #: application/views/stationsetup/exportmapoptions.php:33 #: application/views/timeline/index.php:10 #: application/views/timeline/index.php:22 +#: application/views/timeline/index.php:77 #: application/views/timeplotter/index.php:17 #: application/views/timeplotter/index.php:27 #: application/views/timeplotter/index.php:47 @@ -2646,13 +2648,13 @@ msgstr "Période" #: application/views/logbookadvanced/useroptions.php:17 #: application/views/lookup/index.php:63 #: application/views/stationsetup/exportmapoptions.php:6 -#: application/views/timeline/index.php:72 -#: application/views/timeline/index.php:137 -#: application/views/timeline/index.php:164 -#: application/views/timeline/index.php:189 -#: application/views/timeline/index.php:218 -#: application/views/timeline/index.php:243 -#: application/views/timeline/index.php:270 +#: application/views/timeline/index.php:105 +#: application/views/timeline/index.php:170 +#: application/views/timeline/index.php:197 +#: application/views/timeline/index.php:222 +#: application/views/timeline/index.php:251 +#: application/views/timeline/index.php:276 +#: application/views/timeline/index.php:303 #: application/views/timeplotter/index.php:59 msgid "Show" msgstr "Afficher" @@ -2770,7 +2772,7 @@ msgstr "Nbre d'activation minimum" #: application/views/awards/was/index.php:200 #: application/views/awards/wwff/index.php:64 #: application/views/public_search/empty.php:3 -#: application/views/qrz/export.php:64 application/views/timeline/index.php:102 +#: application/views/qrz/export.php:64 application/views/timeline/index.php:135 msgid "Nothing found!" msgstr "Rien trouvé !" @@ -2803,7 +2805,7 @@ msgstr "Rien trouvé !" #: application/views/search/lotw_unconfirmed.php:33 #: application/views/search/lotw_unconfirmed_result.php:6 #: application/views/search/result.php:11 -#: application/views/simplefle/index.php:142 +#: application/views/simplefle/index.php:148 #: application/views/station_profile/edit.php:63 #: application/views/stationsetup/linkedlocations.php:17 #: application/views/user/edit.php:123 application/views/user/index.php:4 @@ -2817,12 +2819,12 @@ msgid "Count" msgstr "Nombre" #: application/views/activators/index.php:101 -#: application/views/timeline/index.php:121 -#: application/views/timeline/index.php:153 -#: application/views/timeline/index.php:178 -#: application/views/timeline/index.php:205 -#: application/views/timeline/index.php:232 -#: application/views/timeline/index.php:258 +#: application/views/timeline/index.php:154 +#: application/views/timeline/index.php:186 +#: application/views/timeline/index.php:211 +#: application/views/timeline/index.php:238 +#: application/views/timeline/index.php:265 +#: application/views/timeline/index.php:291 msgid "Show QSO's" msgstr "Afficher les QSO" @@ -2887,16 +2889,16 @@ msgstr "Différence de données DOK entre votre journal de travail et DCL" #: application/views/search/cqzones_result.php:7 #: application/views/search/result_search.php:4 #: application/views/search/search_result_ajax.php:89 -#: application/views/simplefle/index.php:140 +#: application/views/simplefle/index.php:146 #: application/views/statistics/custom.php:38 #: application/views/statistics/custom_result.php:40 #: application/views/statistics/custom_result.php:85 -#: application/views/timeline/index.php:116 -#: application/views/timeline/index.php:151 -#: application/views/timeline/index.php:176 -#: application/views/timeline/index.php:201 -#: application/views/timeline/index.php:230 -#: application/views/timeline/index.php:255 +#: application/views/timeline/index.php:149 +#: application/views/timeline/index.php:184 +#: application/views/timeline/index.php:209 +#: application/views/timeline/index.php:234 +#: application/views/timeline/index.php:263 +#: application/views/timeline/index.php:288 #: application/views/view_log/partial/log.php:4 #: application/views/view_log/partial/log_ajax.php:57 #: application/views/visitor/index.php:147 @@ -2923,9 +2925,9 @@ msgstr "Date" #: application/views/search/cqzones_result.php:8 #: application/views/search/result_search.php:5 #: application/views/search/search_result_ajax.php:91 -#: application/views/simplefle/index.php:141 +#: application/views/simplefle/index.php:147 #: application/views/statistics/custom_result.php:86 -#: application/views/timeline/index.php:256 +#: application/views/timeline/index.php:289 #: application/views/timeplotter/index.php:5 #: application/views/view_log/partial/log.php:6 #: application/views/view_log/partial/log_ajax.php:59 @@ -3071,7 +3073,7 @@ msgstr "" #: application/views/adif/import.php:152 #: application/views/interface_assets/footer.php:32 #: application/views/interface_assets/footer.php:501 -#: application/views/interface_assets/footer.php:2130 +#: application/views/interface_assets/footer.php:2133 msgid "DANGER" msgstr "DANGER" @@ -3361,8 +3363,7 @@ msgstr "Autorisations" #: application/views/oqrs/showrequests.php:91 #: application/views/sattimers/index.php:39 #: application/views/stationsetup/stationsetup.php:31 -#: application/views/timeline/index.php:119 -#: application/views/update/index.php:30 +#: application/views/timeline/index.php:152 msgid "Status" msgstr "Statut" @@ -3531,7 +3532,7 @@ msgstr "Total" #: application/views/search/cqzones_result.php:13 #: application/views/station_profile/create.php:113 #: application/views/station_profile/edit.php:153 -#: application/views/timeline/index.php:231 +#: application/views/timeline/index.php:264 #: application/views/timeplotter/index.php:44 msgid "CQ Zone" msgstr "Zone CQ" @@ -3551,6 +3552,10 @@ msgid "" "radio magazines in the world. The magazine first appeared in January 1945 " "and focuses on awards and the practical aspects of amateur radio." msgstr "" +"Le magazine CQ est situé aux États-Unis et est l'un des magazines de radio " +"amateur les plus populaires au monde. Le magazine est apparu pour la " +"première fois en janvier 1945 et se concentre sur les récompenses et les " +"aspects pratiques de la radio amateur." #: application/views/awards/cq/index.php:22 msgid "" @@ -3563,6 +3568,8 @@ msgstr "" msgctxt "uses 'CQ Magazine'" msgid "You can find all the information and rules on the Website of the %s." msgstr "" +"Vous pouvez trouver toutes les informations et les règles sur le site Web du " +"%s." #: application/views/awards/cq/index.php:25 msgid "Awards - CQ Magazine WAZ" @@ -3636,11 +3643,11 @@ msgstr "Voir les 'non réalisés'" #: application/views/awards/waja/index.php:51 #: application/views/awards/was/index.php:51 msgid "Show QSO with QSL Type" -msgstr "" +msgstr "Afficher QSO avec type QSL" #: application/views/awards/cq/index.php:56 #: application/views/awards/itu/index.php:56 -#: application/views/interface_assets/footer.php:2109 +#: application/views/interface_assets/footer.php:2112 #: application/views/qso/edit_ajax.php:378 #: application/views/view_log/qso.php:25 msgid "QSL Card" @@ -3677,7 +3684,7 @@ msgstr "Voir la carte" #: application/views/awards/waja/index.php:128 #: application/views/awards/was/index.php:124 msgid "Table" -msgstr "" +msgstr "Table" #: application/views/awards/cq/index.php:127 #: application/views/awards/dok/index.php:128 @@ -3747,6 +3754,12 @@ msgid "" "'Deutscher Ortsverband Kenner' (English: 'German Local Association " "Identifier')." msgstr "" +"L'Allemagne s'étend sur plus de 630 km d'est en ouest et près de 900 km du " +"nord au sud. Environ 70 000 des 82 millions d'habitants de l'Allemagne sont " +"des radioamateurs licenciés, dont plus de 40 000 sont membres du DARC. Le " +"DOK est un système qui fournit aux sections locales individuelles un " +"identifiant et signifie 'Deutscher Ortsverband Kenner' (en anglais : 'German " +"Local Association Identifier')." #: application/views/awards/dok/index.php:9 msgid "" @@ -3755,10 +3768,14 @@ msgid "" "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." msgstr "" +"Le DOK se compose d'une lettre pour le district et d'un numéro à deux " +"chiffres pour le chapitre local, comme P03 Friedrichshafen (ville de " +"l'exposition 'Hamradio') ou F41 Baunatal (siège du DARC). Remarque : Un zéro " +"dans un DOK est une erreur courante, souvent enregistré comme la lettre O." #: application/views/awards/dok/index.php:10 msgid "DARC website" -msgstr "" +msgstr "Site web du DARC" #: application/views/awards/dok/index.php:10 #, php-format @@ -3767,14 +3784,16 @@ msgid "" "This information is provided by the %s. Information about the DOK Awards and " "its rules can be found %s." msgstr "" +"Ces informations sont fournies par le %s. Les informations sur les DOK " +"Awards et leurs règles peuvent être trouvées %s." #: application/views/awards/dok/index.php:20 msgid "DOK / SDOK" -msgstr "" +msgstr "DOK / SDOK" #: application/views/awards/dok/index.php:23 msgid "DOK + SDOK" -msgstr "" +msgstr "DOK + SDOK" #: application/views/awards/dok/index.php:37 #: application/views/awards/dxcc/index.php:39 @@ -3785,7 +3804,7 @@ msgstr "" #: application/views/awards/waja/index.php:33 #: application/views/awards/was/index.php:33 msgid "Worked / Confirmed" -msgstr "" +msgstr "Travaillé / Confirmé" #: application/views/awards/dok/index.php:80 #: application/views/awards/dxcc/index.php:120 @@ -3796,7 +3815,7 @@ msgstr "" #: application/views/awards/waja/index.php:80 #: application/views/awards/was/index.php:76 msgid "Every band" -msgstr "" +msgstr "Chaque bande" #: application/views/awards/dxcc/index.php:14 msgid "DXCC Award" @@ -3804,7 +3823,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:15 msgid "'How to Count Countries Worked, A New DX Scoring System'" -msgstr "" +msgstr "'Comment compter les pays contactés, un nouveau système de score DX'" #: application/views/awards/dxcc/index.php:15 #, php-format @@ -3813,15 +3832,19 @@ msgid "" "DXCC List is based on an article created in 1935 by Clinton B. DeSoto, " "W1CBD, titled %s." msgstr "" +"DXCC signifie 'DX Century Club', une récompense basée sur les pays " +"contactés. La liste DXCC est basée sur un article créé en 1935 par Clinton " +"B. DeSoto, W1CBD, intitulé %s." #: application/views/awards/dxcc/index.php:16 msgid "ARRL website" -msgstr "" +msgstr "Site web de l'ARRL" #: application/views/awards/dxcc/index.php:16 #, php-format msgid "You can find all information about the DXCC Award on the %s." msgstr "" +"Vous pouvez trouver toutes les informations sur le DXCC Award sur le %s." #: application/views/awards/dxcc/index.php:17 msgid "" @@ -3831,11 +3854,17 @@ msgid "" "will find Deleted DXCC entities also in the lists on Wavelog. Be aware that " "these DXCC entities are outdated and no longer valid." msgstr "" +"Note importante : Au fil du temps, les critères pour la liste DXCC ont " +"changé. La liste reste inchangée jusqu'à ce qu'une entité ne satisfasse plus " +"aux critères sous lesquels elle a été ajoutée, moment où elle est déplacée " +"vers la liste des entités supprimées. Vous trouverez également des entités " +"DXCC supprimées dans les listes sur Wavelog. Soyez conscient que ces entités " +"DXCC sont obsolètes et ne sont plus valides." #: application/views/awards/dxcc/index.php:32 #: application/views/awards/iota/index.php:33 msgid "Include deleted" -msgstr "" +msgstr "Inclure supprimé" #: application/views/awards/dxcc/index.php:87 #: application/views/awards/iota/index.php:61 @@ -3871,7 +3900,7 @@ msgstr "Asie" #: application/views/qso/edit_ajax.php:245 application/views/qso/index.php:383 #: application/views/view_log/qso.php:256 msgid "Europe" -msgstr "" +msgstr "Europe" #: application/views/awards/dxcc/index.php:103 #: application/views/awards/iota/index.php:77 @@ -3902,16 +3931,16 @@ msgstr "Océanie" #: application/views/awards/dxcc/index.php:189 msgid "Show DXCC Map" -msgstr "" +msgstr "Afficher la carte DXCC" #: application/views/awards/dxcc/index.php:225 msgid "DXCC Name" -msgstr "" +msgstr "Nom DXCC" #: application/views/awards/dxcc/index.php:226 #: application/views/awards/iota/index.php:170 -#: application/views/timeline/index.php:117 -#: application/views/timeline/index.php:204 +#: application/views/timeline/index.php:150 +#: application/views/timeline/index.php:237 msgid "Prefix" msgstr "Préfix" @@ -4080,7 +4109,7 @@ msgstr "" #: application/views/search/search_result_ajax.php:19 #: application/views/stationsetup/stationsetup.php:30 #: application/views/themes/index.php:82 -#: application/views/timeline/index.php:203 application/views/user/edit.php:241 +#: application/views/timeline/index.php:236 application/views/user/edit.php:241 #: application/views/user/edit.php:263 application/views/user/edit.php:285 #: application/views/user/edit.php:307 application/views/user/edit.php:330 #: application/views/view_log/partial/log_ajax.php:19 @@ -4400,7 +4429,7 @@ msgid "Show WAJA Map" msgstr "" #: application/views/awards/waja/index.php:154 -#: application/views/timeline/index.php:152 +#: application/views/timeline/index.php:185 msgid "Prefecture" msgstr "" @@ -5297,6 +5326,7 @@ msgstr "Mode Propagation" #: application/views/gridmap/index.php:44 application/views/kml/index.php:80 #: application/views/logbookadvanced/index.php:219 #: application/views/qso/edit_ajax.php:192 application/views/qso/index.php:404 +#: application/views/timeline/index.php:80 msgctxt "Propagation Mode" msgid "Aircraft Scatter" msgstr "" @@ -5305,6 +5335,7 @@ msgstr "" #: application/views/gridmap/index.php:45 application/views/kml/index.php:81 #: application/views/logbookadvanced/index.php:220 #: application/views/qso/edit_ajax.php:193 application/views/qso/index.php:405 +#: application/views/timeline/index.php:81 msgctxt "Propagation Mode" msgid "Aurora" msgstr "" @@ -5313,6 +5344,7 @@ msgstr "" #: application/views/gridmap/index.php:46 application/views/kml/index.php:82 #: application/views/logbookadvanced/index.php:221 #: application/views/qso/edit_ajax.php:194 application/views/qso/index.php:406 +#: application/views/timeline/index.php:82 msgctxt "Propagation Mode" msgid "Aurora-E" msgstr "" @@ -5321,6 +5353,7 @@ msgstr "" #: application/views/gridmap/index.php:47 application/views/kml/index.php:83 #: application/views/logbookadvanced/index.php:222 #: application/views/qso/edit_ajax.php:195 application/views/qso/index.php:407 +#: application/views/timeline/index.php:83 msgctxt "Propagation Mode" msgid "Back scatter" msgstr "" @@ -5329,6 +5362,7 @@ msgstr "" #: application/views/gridmap/index.php:48 application/views/kml/index.php:84 #: application/views/logbookadvanced/index.php:223 #: application/views/qso/edit_ajax.php:196 application/views/qso/index.php:408 +#: application/views/timeline/index.php:84 msgctxt "Propagation Mode" msgid "EchoLink" msgstr "" @@ -5337,6 +5371,7 @@ msgstr "" #: application/views/gridmap/index.php:49 application/views/kml/index.php:85 #: application/views/logbookadvanced/index.php:224 #: application/views/qso/edit_ajax.php:197 application/views/qso/index.php:409 +#: application/views/timeline/index.php:85 msgctxt "Propagation Mode" msgid "Earth-Moon-Earth" msgstr "" @@ -5345,6 +5380,7 @@ msgstr "" #: application/views/gridmap/index.php:50 application/views/kml/index.php:86 #: application/views/logbookadvanced/index.php:225 #: application/views/qso/edit_ajax.php:198 application/views/qso/index.php:410 +#: application/views/timeline/index.php:86 msgctxt "Propagation Mode" msgid "Sporadic E" msgstr "" @@ -5353,6 +5389,7 @@ msgstr "" #: application/views/gridmap/index.php:51 application/views/kml/index.php:87 #: application/views/logbookadvanced/index.php:226 #: application/views/qso/edit_ajax.php:199 application/views/qso/index.php:411 +#: application/views/timeline/index.php:87 msgctxt "Propagation Mode" msgid "Field Aligned Irregularities" msgstr "" @@ -5361,6 +5398,7 @@ msgstr "" #: application/views/gridmap/index.php:52 application/views/kml/index.php:88 #: application/views/logbookadvanced/index.php:227 #: application/views/qso/edit_ajax.php:200 application/views/qso/index.php:412 +#: application/views/timeline/index.php:88 msgctxt "Propagation Mode" msgid "F2 Reflection" msgstr "" @@ -5369,6 +5407,7 @@ msgstr "" #: application/views/gridmap/index.php:53 application/views/kml/index.php:89 #: application/views/logbookadvanced/index.php:228 #: application/views/qso/edit_ajax.php:201 application/views/qso/index.php:413 +#: application/views/timeline/index.php:89 msgctxt "Propagation Mode" msgid "Internet-assisted" msgstr "" @@ -5377,6 +5416,7 @@ msgstr "" #: application/views/gridmap/index.php:54 application/views/kml/index.php:90 #: application/views/logbookadvanced/index.php:229 #: application/views/qso/edit_ajax.php:202 application/views/qso/index.php:414 +#: application/views/timeline/index.php:90 msgctxt "Propagation Mode" msgid "Ionoscatter" msgstr "" @@ -5385,6 +5425,7 @@ msgstr "" #: application/views/gridmap/index.php:55 application/views/kml/index.php:91 #: application/views/logbookadvanced/index.php:230 #: application/views/qso/edit_ajax.php:203 application/views/qso/index.php:415 +#: application/views/timeline/index.php:91 msgctxt "Propagation Mode" msgid "IRLP" msgstr "" @@ -5393,6 +5434,7 @@ msgstr "" #: application/views/gridmap/index.php:56 application/views/kml/index.php:92 #: application/views/logbookadvanced/index.php:231 #: application/views/qso/edit_ajax.php:204 application/views/qso/index.php:416 +#: application/views/timeline/index.php:92 msgctxt "Propagation Mode" msgid "Meteor scatter" msgstr "" @@ -5401,6 +5443,7 @@ msgstr "" #: application/views/gridmap/index.php:57 application/views/kml/index.php:93 #: application/views/logbookadvanced/index.php:232 #: application/views/qso/edit_ajax.php:205 application/views/qso/index.php:417 +#: application/views/timeline/index.php:93 msgctxt "Propagation Mode" msgid "Terrestrial or atmospheric repeater or transponder" msgstr "" @@ -5409,6 +5452,7 @@ msgstr "" #: application/views/gridmap/index.php:58 application/views/kml/index.php:94 #: application/views/logbookadvanced/index.php:233 #: application/views/qso/edit_ajax.php:206 application/views/qso/index.php:418 +#: application/views/timeline/index.php:94 msgctxt "Propagation Mode" msgid "Rain scatter" msgstr "" @@ -5417,6 +5461,7 @@ msgstr "" #: application/views/gridmap/index.php:59 application/views/kml/index.php:95 #: application/views/logbookadvanced/index.php:234 #: application/views/qso/edit_ajax.php:207 application/views/qso/index.php:419 +#: application/views/timeline/index.php:95 msgctxt "Propagation Mode" msgid "Satellite" msgstr "" @@ -5425,6 +5470,7 @@ msgstr "" #: application/views/gridmap/index.php:60 application/views/kml/index.php:96 #: application/views/logbookadvanced/index.php:235 #: application/views/qso/edit_ajax.php:208 application/views/qso/index.php:420 +#: application/views/timeline/index.php:96 msgctxt "Propagation Mode" msgid "Trans-equatorial" msgstr "" @@ -5433,6 +5479,7 @@ msgstr "" #: application/views/gridmap/index.php:61 application/views/kml/index.php:97 #: application/views/logbookadvanced/index.php:236 #: application/views/qso/edit_ajax.php:209 application/views/qso/index.php:421 +#: application/views/timeline/index.php:97 msgctxt "Propagation Mode" msgid "Tropospheric ducting" msgstr "" @@ -5647,7 +5694,7 @@ msgstr "Date début" #: application/views/dayswithqso/index.php:58 #: application/views/dayswithqso/index.php:86 #: application/views/dayswithqso/index.php:108 -#: application/views/timeline/index.php:120 +#: application/views/timeline/index.php:153 msgid "End Date" msgstr "Date fin" @@ -6289,10 +6336,10 @@ msgid "QSL Date" msgstr "" #: application/views/eqslcard/index.php:60 -#: application/views/interface_assets/footer.php:2335 -#: application/views/interface_assets/footer.php:2353 -#: application/views/interface_assets/footer.php:2374 -#: application/views/interface_assets/footer.php:2392 +#: application/views/interface_assets/footer.php:2338 +#: application/views/interface_assets/footer.php:2356 +#: application/views/interface_assets/footer.php:2377 +#: application/views/interface_assets/footer.php:2395 #: application/views/qslcard/index.php:66 #: application/views/view_log/qso.php:614 msgid "View" @@ -6303,10 +6350,12 @@ msgstr "" #: application/views/logbookadvanced/index.php:215 #: application/views/logbookadvanced/index.php:609 #: application/views/logbookadvanced/useroptions.php:118 +#: application/views/timeline/index.php:74 msgid "Propagation" msgstr "" #: application/views/gridmap/index.php:42 +#: application/views/timeline/index.php:79 msgid "None/Empty" msgstr "" @@ -6549,57 +6598,57 @@ msgstr "" msgid "You're not logged in. Please %slogin%s" msgstr "" -#: application/views/interface_assets/footer.php:1373 -#: application/views/interface_assets/footer.php:1377 -#: application/views/interface_assets/footer.php:1380 -#: application/views/interface_assets/footer.php:1517 -#: application/views/interface_assets/footer.php:1521 -#: application/views/interface_assets/footer.php:1524 +#: application/views/interface_assets/footer.php:1375 +#: application/views/interface_assets/footer.php:1379 +#: application/views/interface_assets/footer.php:1382 +#: application/views/interface_assets/footer.php:1519 +#: application/views/interface_assets/footer.php:1523 +#: application/views/interface_assets/footer.php:1526 msgid "grid square" msgstr "Grilles des Locators" -#: application/views/interface_assets/footer.php:1380 -#: application/views/interface_assets/footer.php:1524 +#: application/views/interface_assets/footer.php:1382 +#: application/views/interface_assets/footer.php:1526 msgid "Total count" msgstr "Total" -#: application/views/interface_assets/footer.php:2111 +#: application/views/interface_assets/footer.php:2114 msgid "QSL Card for " msgstr "" -#: application/views/interface_assets/footer.php:2131 +#: application/views/interface_assets/footer.php:2134 msgid "Warning! Are you sure you want to delete this QSL card?" msgstr "" -#: application/views/interface_assets/footer.php:2171 +#: application/views/interface_assets/footer.php:2174 #: application/views/view_log/qso.php:42 msgid "eQSL Card" msgstr "Carte eQSL" -#: application/views/interface_assets/footer.php:2173 +#: application/views/interface_assets/footer.php:2176 msgid "eQSL Card for " msgstr "" -#: application/views/interface_assets/footer.php:2346 -#: application/views/interface_assets/footer.php:2385 +#: application/views/interface_assets/footer.php:2349 +#: application/views/interface_assets/footer.php:2388 #: application/views/view_log/qso.php:604 msgid "QSL image file" msgstr "" -#: application/views/interface_assets/footer.php:2365 +#: application/views/interface_assets/footer.php:2368 msgid "Front QSL Card:" msgstr "" -#: application/views/interface_assets/footer.php:2403 +#: application/views/interface_assets/footer.php:2406 msgid "Back QSL Card:" msgstr "" -#: application/views/interface_assets/footer.php:2414 -#: application/views/interface_assets/footer.php:2439 +#: application/views/interface_assets/footer.php:2417 +#: application/views/interface_assets/footer.php:2442 msgid "Add additional QSOs to a QSL Card" msgstr "" -#: application/views/interface_assets/footer.php:2450 +#: application/views/interface_assets/footer.php:2453 msgid "Something went wrong. Please try again!" msgstr "" @@ -8569,7 +8618,7 @@ msgid "Remove" msgstr "Enlever" #: application/views/qslprint/qslprint.php:33 -#: application/views/simplefle/index.php:133 +#: application/views/simplefle/index.php:139 msgid "QSO List" msgstr "" @@ -8748,7 +8797,7 @@ msgstr "" msgid "TimeOff is less than TimeOn" msgstr "Heure de fin inférieure à celle de début" -#: application/views/qso/index.php:5 application/views/qso/index.php:690 +#: application/views/qso/index.php:5 application/views/qso/index.php:696 msgid "Previous Contacts" msgstr "Contacts précédents" @@ -8864,19 +8913,35 @@ msgstr "" msgid "Connect" msgstr "" -#: application/views/qso/index.php:663 +#: application/views/qso/index.php:656 +msgid "Stop" +msgstr "" + +#: application/views/qso/index.php:657 +msgid "Tune" +msgstr "" + +#: application/views/qso/index.php:658 +msgid "Stop Tune" +msgstr "" + +#: application/views/qso/index.php:664 +msgid "CW Speed" +msgstr "" + +#: application/views/qso/index.php:669 msgid "Send" msgstr "" -#: application/views/qso/index.php:673 +#: application/views/qso/index.php:679 msgid "Suggestions" msgstr "" -#: application/views/qso/index.php:680 +#: application/views/qso/index.php:686 msgid "Profile Picture" msgstr "" -#: application/views/qso/index.php:704 +#: application/views/qso/index.php:710 msgid "Max. 5 previous contacts are shown" msgstr "" @@ -9265,7 +9330,7 @@ msgid "" msgstr "" #: application/views/simplefle/index.php:17 -#: application/views/simplefle/index.php:170 +#: application/views/simplefle/index.php:176 msgid "Syntax Help" msgstr "" @@ -9375,24 +9440,24 @@ msgstr "" msgid "Enter the Data" msgstr "" -#: application/views/simplefle/index.php:148 +#: application/views/simplefle/index.php:154 msgid "Refs" msgstr "" -#: application/views/simplefle/index.php:160 +#: application/views/simplefle/index.php:166 #, php-format msgid "The Refs can be either %sS%sOTA, %sI%sOTA, %sP%sOTA, or %sW%sWFF" msgstr "" -#: application/views/simplefle/index.php:167 +#: application/views/simplefle/index.php:173 msgid "Reload QSO List" msgstr "" -#: application/views/simplefle/index.php:168 +#: application/views/simplefle/index.php:174 msgid "Save in Wavelog" msgstr "" -#: application/views/simplefle/index.php:169 +#: application/views/simplefle/index.php:175 msgid "Clear Logging Session" msgstr "" @@ -10178,6 +10243,10 @@ msgstr "" msgid "Add a Theme" msgstr "" +#: application/views/timeline/index.php:78 +msgid "All but SAT" +msgstr "" + #: application/views/timeplotter/index.php:2 msgid "contacts were plotted" msgstr "" @@ -10226,6 +10295,10 @@ msgstr "" msgid "Update DXCC Data" msgstr "" +#: application/views/update/index.php:30 +msgid "Status:" +msgstr "" + #: application/views/update/index.php:34 msgid "Apply DXCC Data to Logbook" msgstr "" @@ -10239,37 +10312,37 @@ msgid "" "\t\t\t\t\t\t\tand update existing metadata as well, in case it has changed." msgstr "" -#: application/views/update/index.php:40 +#: application/views/update/index.php:45 msgid "Check QSOs missing DXCC data" msgstr "" -#: application/views/update/index.php:42 application/views/update/index.php:62 +#: application/views/update/index.php:54 application/views/update/index.php:95 msgid "Re-check all QSOs in logbook" msgstr "" -#: application/views/update/index.php:45 +#: application/views/update/index.php:59 msgid "Apply Continent Data to Logbook" msgstr "" -#: application/views/update/index.php:47 +#: application/views/update/index.php:61 msgid "" "This function can be used to update QSO continent information for all QSOs " "in Wavelog missing that information." msgstr "" -#: application/views/update/index.php:49 +#: application/views/update/index.php:68 msgid "Check QSOs missing continent data" msgstr "" -#: application/views/update/index.php:59 +#: application/views/update/index.php:80 msgid "Here you can update QSOs with missing distance information." msgstr "" -#: application/views/update/index.php:60 +#: application/views/update/index.php:86 msgid "Update distance data" msgstr "" -#: application/views/update/index.php:61 +#: application/views/update/index.php:89 msgid "" "Use the following button to update the distance information for all your " "QSOs. Depending on the number of QSOs this might take some time to execute. " diff --git a/application/locale/hr/LC_MESSAGES/messages.po b/application/locale/hr/LC_MESSAGES/messages.po index 017d4af29..1f4a16647 100644 --- a/application/locale/hr/LC_MESSAGES/messages.po +++ b/application/locale/hr/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-22 13:37+0000\n" +"POT-Creation-Date: 2024-08-25 17:03+0000\n" "PO-Revision-Date: 2024-08-17 10:49+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Croatian \n" "Language-Team: Italian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" @@ -37,7 +37,7 @@ msgstr "" #: application/controllers/Components.php:13 #: application/controllers/Contestcalendar.php:15 #: application/controllers/Contesting.php:14 -#: application/controllers/Cron.php:26 application/controllers/Cron.php:149 +#: application/controllers/Cron.php:26 application/controllers/Cron.php:152 #: application/controllers/Csv.php:8 application/controllers/Csv.php:31 #: application/controllers/Dayswithqso.php:11 #: application/controllers/Debug.php:10 @@ -78,7 +78,7 @@ msgstr "" #: application/controllers/Station.php:17 #: application/controllers/Stationsetup.php:15 #: application/controllers/Themes.php:17 -#: application/controllers/Timeline.php:11 +#: application/controllers/Timeline.php:10 #: application/controllers/Timeplotter.php:11 #: application/controllers/Update.php:24 application/controllers/Update.php:273 #: application/controllers/Update.php:284 @@ -306,12 +306,12 @@ msgid "Log View - VUCC" msgstr "Visualização do log - VUCC" #: application/controllers/Awards.php:453 -#: application/controllers/Timeline.php:92 -#: application/controllers/Timeline.php:95 -#: application/controllers/Timeline.php:98 -#: application/controllers/Timeline.php:101 -#: application/controllers/Timeline.php:104 -#: application/controllers/Timeline.php:107 +#: application/controllers/Timeline.php:105 +#: application/controllers/Timeline.php:108 +#: application/controllers/Timeline.php:111 +#: application/controllers/Timeline.php:114 +#: application/controllers/Timeline.php:117 +#: application/controllers/Timeline.php:120 msgid "Log View" msgstr "Ver log" @@ -565,16 +565,16 @@ msgstr "Continentes" msgid "Cron Manager" msgstr "Gestor Cron" -#: application/controllers/Cron.php:141 application/views/cron/edit.php:5 +#: application/controllers/Cron.php:144 application/views/cron/edit.php:5 msgid "Edit Cronjob" msgstr "Editar Cronjob" -#: application/controllers/Cron.php:261 +#: application/controllers/Cron.php:264 #: application/views/interface_assets/footer.php:36 msgid "OK" msgstr "OK" -#: application/controllers/Cron.php:265 +#: application/controllers/Cron.php:268 #, php-format msgid "" "Last run occurred more than %s seconds ago.%sPlease check your master cron! " @@ -583,7 +583,7 @@ msgstr "" "A última execução ocorreu há mais de %s segundos.%sPor favor, verifique o " "seu cron master! Deve ser executado a cada minuto (* * * * *)." -#: application/controllers/Cron.php:268 +#: application/controllers/Cron.php:271 #, php-format msgid "" "Last run occurred more than %s minutes ago.%sSeems like your Mastercron " @@ -592,7 +592,7 @@ msgstr "" "A última execução ocorreu há mais de %s minutos.%sParece que o seu " "Mastercron não está a correr!%sDeveria correr a cada minuto (* * * * *)." -#: application/controllers/Cron.php:273 application/views/cron/index.php:29 +#: application/controllers/Cron.php:276 application/views/cron/index.php:29 msgctxt "Master Cron" msgid "Not running" msgstr "Não está a funcionar" @@ -1000,6 +1000,7 @@ msgstr "eQSL" #: application/views/logbookadvanced/useroptions.php:74 #: application/views/search/search_result_ajax.php:124 #: application/views/station_profile/edit.php:352 +#: application/views/timeline/index.php:68 #: application/views/update/index.php:20 application/views/user/edit.php:566 #: application/views/user/edit.php:683 #: application/views/view_log/partial/log_ajax.php:83 @@ -1061,7 +1062,7 @@ msgstr "Clublog" #: application/views/search/lotw_unconfirmed_result.php:8 #: application/views/search/result_search.php:7 #: application/views/search/search_result_ajax.php:4 -#: application/views/simplefle/index.php:144 +#: application/views/simplefle/index.php:150 #: application/views/statistics/custom.php:60 #: application/views/statistics/custom_result.php:62 #: application/views/statistics/custom_result.php:88 @@ -1095,7 +1096,7 @@ msgstr "Modo" #: application/views/qso/components/previous_contacts.php:79 #: application/views/qso/edit_ajax.php:142 application/views/qso/index.php:177 #: application/views/search/search_result_ajax.php:5 -#: application/views/simplefle/index.php:145 +#: application/views/simplefle/index.php:151 #: application/views/user/edit.php:230 application/views/user/edit.php:252 #: application/views/user/edit.php:274 application/views/user/edit.php:296 #: application/views/user/edit.php:319 @@ -1122,7 +1123,7 @@ msgstr "RST (E)" #: application/views/qso/components/previous_contacts.php:80 #: application/views/qso/edit_ajax.php:147 application/views/qso/index.php:182 #: application/views/search/search_result_ajax.php:6 -#: application/views/simplefle/index.php:146 +#: application/views/simplefle/index.php:152 #: application/views/user/edit.php:231 application/views/user/edit.php:253 #: application/views/user/edit.php:275 application/views/user/edit.php:297 #: application/views/user/edit.php:320 @@ -1145,7 +1146,7 @@ msgstr "RST (R)" #: application/views/search/search_result_ajax.php:7 #: application/views/stationsetup/stationsetup.php:124 #: application/views/statistics/custom_result.php:92 -#: application/views/timeline/index.php:118 application/views/user/edit.php:232 +#: application/views/timeline/index.php:151 application/views/user/edit.php:232 #: application/views/user/edit.php:254 application/views/user/edit.php:276 #: application/views/user/edit.php:298 application/views/user/edit.php:321 #: application/views/view_log/partial/log.php:13 @@ -1175,7 +1176,7 @@ msgstr "País" #: application/views/qso/edit_ajax.php:318 #: application/views/search/search_result_ajax.php:8 #: application/views/station_profile/edit.php:215 -#: application/views/timeline/index.php:202 application/views/user/edit.php:233 +#: application/views/timeline/index.php:235 application/views/user/edit.php:233 #: application/views/user/edit.php:255 application/views/user/edit.php:277 #: application/views/user/edit.php:299 application/views/user/edit.php:322 #: application/views/view_log/partial/log_ajax.php:8 @@ -1203,7 +1204,7 @@ msgstr "IOTA" #: application/views/qslcard/searchresult.php:82 #: application/views/qso/components/previous_contacts.php:86 #: application/views/search/search_result_ajax.php:12 -#: application/views/timeline/index.php:177 application/views/user/edit.php:237 +#: application/views/timeline/index.php:210 application/views/user/edit.php:237 #: application/views/user/edit.php:259 application/views/user/edit.php:281 #: application/views/user/edit.php:303 application/views/user/edit.php:326 #: application/views/view_log/partial/log_ajax.php:12 @@ -1239,9 +1240,9 @@ msgstr "Estado" #: application/views/search/cqzones_result.php:12 #: application/views/search/result.php:33 #: application/views/search/search_result_ajax.php:13 -#: application/views/simplefle/index.php:147 +#: application/views/simplefle/index.php:153 #: application/views/stationsetup/stationsetup.php:125 -#: application/views/timeline/index.php:257 application/views/user/edit.php:130 +#: application/views/timeline/index.php:290 application/views/user/edit.php:130 #: application/views/user/edit.php:238 application/views/user/edit.php:260 #: application/views/user/edit.php:282 application/views/user/edit.php:304 #: application/views/user/edit.php:327 application/views/user/profile.php:34 @@ -1332,7 +1333,7 @@ msgstr "Distância" #: application/views/search/lotw_unconfirmed_result.php:9 #: application/views/search/result_search.php:10 #: application/views/search/search_result_ajax.php:15 -#: application/views/simplefle/index.php:143 +#: application/views/simplefle/index.php:149 #: application/views/stationsetup/exportmapoptions.php:31 #: application/views/statistics/custom.php:53 #: application/views/statistics/custom_result.php:55 @@ -1410,7 +1411,7 @@ msgstr "Operador" #: application/views/stationsetup/linkedlocations.php:17 #: application/views/stationsetup/linkedlocations.php:45 #: application/views/stationsetup/stationsetup.php:150 -#: application/views/timeline/index.php:134 +#: application/views/timeline/index.php:167 #: application/views/timeplotter/index.php:33 #: application/views/view_log/partial/log_ajax.php:29 #: application/views/view_log/qso.php:236 @@ -1745,7 +1746,7 @@ msgstr "Registo de data e hora" #: application/views/logbookadvanced/index.php:527 #: application/views/lotw_views/index.php:43 #: application/views/simplefle/index.php:20 -#: application/views/simplefle/index.php:171 +#: application/views/simplefle/index.php:177 #: application/views/stationsetup/exportmapoptions.php:5 #: application/views/statistics/custom.php:31 #: application/views/statistics/custom_result.php:33 @@ -1769,10 +1770,10 @@ msgstr "Predefinição (clique para libertar)" #: application/controllers/Radio.php:105 #: application/controllers/Stationsetup.php:372 #: application/views/api/help.php:61 application/views/contesting/add.php:62 -#: application/views/interface_assets/footer.php:2334 -#: application/views/interface_assets/footer.php:2352 -#: application/views/interface_assets/footer.php:2373 -#: application/views/interface_assets/footer.php:2391 +#: application/views/interface_assets/footer.php:2337 +#: application/views/interface_assets/footer.php:2355 +#: application/views/interface_assets/footer.php:2376 +#: application/views/interface_assets/footer.php:2394 #: application/views/labels/index.php:48 application/views/labels/index.php:84 #: application/views/logbookadvanced/index.php:519 #: application/views/lotw_views/index.php:114 @@ -2088,7 +2089,7 @@ msgstr "Criar Tema" msgid "Edit Theme" msgstr "Editar Tema" -#: application/controllers/Timeline.php:17 +#: application/controllers/Timeline.php:15 #: application/views/interface_assets/header.php:148 #: application/views/timeline/index.php:2 msgid "Timeline" @@ -2555,8 +2556,8 @@ msgstr "Diferença" #: application/views/gridmap/index.php:41 #: application/views/gridmap/index.php:70 #: application/views/gridmap/index.php:83 -#: application/views/interface_assets/footer.php:1446 -#: application/views/interface_assets/footer.php:1585 +#: application/views/interface_assets/footer.php:1448 +#: application/views/interface_assets/footer.php:1587 #: application/views/kml/index.php:21 application/views/kml/index.php:33 #: application/views/kml/index.php:49 application/views/kml/index.php:67 #: application/views/kml/index.php:79 @@ -2587,6 +2588,7 @@ msgstr "Diferença" #: application/views/stationsetup/exportmapoptions.php:33 #: application/views/timeline/index.php:10 #: application/views/timeline/index.php:22 +#: application/views/timeline/index.php:77 #: application/views/timeplotter/index.php:17 #: application/views/timeplotter/index.php:27 #: application/views/timeplotter/index.php:47 @@ -2645,13 +2647,13 @@ msgstr "Período" #: application/views/logbookadvanced/useroptions.php:17 #: application/views/lookup/index.php:63 #: application/views/stationsetup/exportmapoptions.php:6 -#: application/views/timeline/index.php:72 -#: application/views/timeline/index.php:137 -#: application/views/timeline/index.php:164 -#: application/views/timeline/index.php:189 -#: application/views/timeline/index.php:218 -#: application/views/timeline/index.php:243 -#: application/views/timeline/index.php:270 +#: application/views/timeline/index.php:105 +#: application/views/timeline/index.php:170 +#: application/views/timeline/index.php:197 +#: application/views/timeline/index.php:222 +#: application/views/timeline/index.php:251 +#: application/views/timeline/index.php:276 +#: application/views/timeline/index.php:303 #: application/views/timeplotter/index.php:59 msgid "Show" msgstr "Mostrar" @@ -2769,7 +2771,7 @@ msgstr "Contagem mínima" #: application/views/awards/was/index.php:200 #: application/views/awards/wwff/index.php:64 #: application/views/public_search/empty.php:3 -#: application/views/qrz/export.php:64 application/views/timeline/index.php:102 +#: application/views/qrz/export.php:64 application/views/timeline/index.php:135 msgid "Nothing found!" msgstr "Nada encontrado!" @@ -2802,7 +2804,7 @@ msgstr "Nada encontrado!" #: application/views/search/lotw_unconfirmed.php:33 #: application/views/search/lotw_unconfirmed_result.php:6 #: application/views/search/result.php:11 -#: application/views/simplefle/index.php:142 +#: application/views/simplefle/index.php:148 #: application/views/station_profile/edit.php:63 #: application/views/stationsetup/linkedlocations.php:17 #: application/views/user/edit.php:123 application/views/user/index.php:4 @@ -2816,12 +2818,12 @@ msgid "Count" msgstr "Contagem" #: application/views/activators/index.php:101 -#: application/views/timeline/index.php:121 -#: application/views/timeline/index.php:153 -#: application/views/timeline/index.php:178 -#: application/views/timeline/index.php:205 -#: application/views/timeline/index.php:232 -#: application/views/timeline/index.php:258 +#: application/views/timeline/index.php:154 +#: application/views/timeline/index.php:186 +#: application/views/timeline/index.php:211 +#: application/views/timeline/index.php:238 +#: application/views/timeline/index.php:265 +#: application/views/timeline/index.php:291 msgid "Show QSO's" msgstr "Mostrar contactos" @@ -2886,16 +2888,16 @@ msgstr "Há dados diferentes para DOK no teu log em comparação com DCL." #: application/views/search/cqzones_result.php:7 #: application/views/search/result_search.php:4 #: application/views/search/search_result_ajax.php:89 -#: application/views/simplefle/index.php:140 +#: application/views/simplefle/index.php:146 #: application/views/statistics/custom.php:38 #: application/views/statistics/custom_result.php:40 #: application/views/statistics/custom_result.php:85 -#: application/views/timeline/index.php:116 -#: application/views/timeline/index.php:151 -#: application/views/timeline/index.php:176 -#: application/views/timeline/index.php:201 -#: application/views/timeline/index.php:230 -#: application/views/timeline/index.php:255 +#: application/views/timeline/index.php:149 +#: application/views/timeline/index.php:184 +#: application/views/timeline/index.php:209 +#: application/views/timeline/index.php:234 +#: application/views/timeline/index.php:263 +#: application/views/timeline/index.php:288 #: application/views/view_log/partial/log.php:4 #: application/views/view_log/partial/log_ajax.php:57 #: application/views/visitor/index.php:147 @@ -2922,9 +2924,9 @@ msgstr "Data" #: application/views/search/cqzones_result.php:8 #: application/views/search/result_search.php:5 #: application/views/search/search_result_ajax.php:91 -#: application/views/simplefle/index.php:141 +#: application/views/simplefle/index.php:147 #: application/views/statistics/custom_result.php:86 -#: application/views/timeline/index.php:256 +#: application/views/timeline/index.php:289 #: application/views/timeplotter/index.php:5 #: application/views/view_log/partial/log.php:6 #: application/views/view_log/partial/log_ajax.php:59 @@ -3065,7 +3067,7 @@ msgstr "Usar sempre o indicativo de login como nome do operador na importação" #: application/views/adif/import.php:152 #: application/views/interface_assets/footer.php:32 #: application/views/interface_assets/footer.php:501 -#: application/views/interface_assets/footer.php:2130 +#: application/views/interface_assets/footer.php:2133 msgid "DANGER" msgstr "PERIGO" @@ -3355,8 +3357,7 @@ msgstr "Permissões" #: application/views/oqrs/showrequests.php:91 #: application/views/sattimers/index.php:39 #: application/views/stationsetup/stationsetup.php:31 -#: application/views/timeline/index.php:119 -#: application/views/update/index.php:30 +#: application/views/timeline/index.php:152 msgid "Status" msgstr "Estado" @@ -3524,7 +3525,7 @@ msgstr "Total" #: application/views/search/cqzones_result.php:13 #: application/views/station_profile/create.php:113 #: application/views/station_profile/edit.php:153 -#: application/views/timeline/index.php:231 +#: application/views/timeline/index.php:264 #: application/views/timeplotter/index.php:44 msgid "CQ Zone" msgstr "Zona CQ" @@ -3639,7 +3640,7 @@ msgstr "Mostrar contactos com tipo de QSL" #: application/views/awards/cq/index.php:56 #: application/views/awards/itu/index.php:56 -#: application/views/interface_assets/footer.php:2109 +#: application/views/interface_assets/footer.php:2112 #: application/views/qso/edit_ajax.php:378 #: application/views/view_log/qso.php:25 msgid "QSL Card" @@ -3930,8 +3931,8 @@ msgstr "Nome do DXCC" #: application/views/awards/dxcc/index.php:226 #: application/views/awards/iota/index.php:170 -#: application/views/timeline/index.php:117 -#: application/views/timeline/index.php:204 +#: application/views/timeline/index.php:150 +#: application/views/timeline/index.php:237 msgid "Prefix" msgstr "Prefixo" @@ -4141,7 +4142,7 @@ msgstr "Mostrar mapa IOTA" #: application/views/search/search_result_ajax.php:19 #: application/views/stationsetup/stationsetup.php:30 #: application/views/themes/index.php:82 -#: application/views/timeline/index.php:203 application/views/user/edit.php:241 +#: application/views/timeline/index.php:236 application/views/user/edit.php:241 #: application/views/user/edit.php:263 application/views/user/edit.php:285 #: application/views/user/edit.php:307 application/views/user/edit.php:330 #: application/views/view_log/partial/log_ajax.php:19 @@ -4515,7 +4516,7 @@ msgid "Show WAJA Map" msgstr "Mostrar mapa WAJA" #: application/views/awards/waja/index.php:154 -#: application/views/timeline/index.php:152 +#: application/views/timeline/index.php:185 msgid "Prefecture" msgstr "Prefeitura" @@ -5452,6 +5453,7 @@ msgstr "Modo de Propagação" #: application/views/gridmap/index.php:44 application/views/kml/index.php:80 #: application/views/logbookadvanced/index.php:219 #: application/views/qso/edit_ajax.php:192 application/views/qso/index.php:404 +#: application/views/timeline/index.php:80 msgctxt "Propagation Mode" msgid "Aircraft Scatter" msgstr "Aircraft Scatter" @@ -5460,6 +5462,7 @@ msgstr "Aircraft Scatter" #: application/views/gridmap/index.php:45 application/views/kml/index.php:81 #: application/views/logbookadvanced/index.php:220 #: application/views/qso/edit_ajax.php:193 application/views/qso/index.php:405 +#: application/views/timeline/index.php:81 msgctxt "Propagation Mode" msgid "Aurora" msgstr "Aurora" @@ -5468,6 +5471,7 @@ msgstr "Aurora" #: application/views/gridmap/index.php:46 application/views/kml/index.php:82 #: application/views/logbookadvanced/index.php:221 #: application/views/qso/edit_ajax.php:194 application/views/qso/index.php:406 +#: application/views/timeline/index.php:82 msgctxt "Propagation Mode" msgid "Aurora-E" msgstr "Aurora-E" @@ -5476,6 +5480,7 @@ msgstr "Aurora-E" #: application/views/gridmap/index.php:47 application/views/kml/index.php:83 #: application/views/logbookadvanced/index.php:222 #: application/views/qso/edit_ajax.php:195 application/views/qso/index.php:407 +#: application/views/timeline/index.php:83 msgctxt "Propagation Mode" msgid "Back scatter" msgstr "Back scatter" @@ -5484,6 +5489,7 @@ msgstr "Back scatter" #: application/views/gridmap/index.php:48 application/views/kml/index.php:84 #: application/views/logbookadvanced/index.php:223 #: application/views/qso/edit_ajax.php:196 application/views/qso/index.php:408 +#: application/views/timeline/index.php:84 msgctxt "Propagation Mode" msgid "EchoLink" msgstr "EchoLink" @@ -5492,6 +5498,7 @@ msgstr "EchoLink" #: application/views/gridmap/index.php:49 application/views/kml/index.php:85 #: application/views/logbookadvanced/index.php:224 #: application/views/qso/edit_ajax.php:197 application/views/qso/index.php:409 +#: application/views/timeline/index.php:85 msgctxt "Propagation Mode" msgid "Earth-Moon-Earth" msgstr "Terra-Lua-Terra" @@ -5500,6 +5507,7 @@ msgstr "Terra-Lua-Terra" #: application/views/gridmap/index.php:50 application/views/kml/index.php:86 #: application/views/logbookadvanced/index.php:225 #: application/views/qso/edit_ajax.php:198 application/views/qso/index.php:410 +#: application/views/timeline/index.php:86 msgctxt "Propagation Mode" msgid "Sporadic E" msgstr "Esporádico E" @@ -5508,6 +5516,7 @@ msgstr "Esporádico E" #: application/views/gridmap/index.php:51 application/views/kml/index.php:87 #: application/views/logbookadvanced/index.php:226 #: application/views/qso/edit_ajax.php:199 application/views/qso/index.php:411 +#: application/views/timeline/index.php:87 msgctxt "Propagation Mode" msgid "Field Aligned Irregularities" msgstr "Irregularidades Alinhadas ao Campo" @@ -5516,6 +5525,7 @@ msgstr "Irregularidades Alinhadas ao Campo" #: application/views/gridmap/index.php:52 application/views/kml/index.php:88 #: application/views/logbookadvanced/index.php:227 #: application/views/qso/edit_ajax.php:200 application/views/qso/index.php:412 +#: application/views/timeline/index.php:88 msgctxt "Propagation Mode" msgid "F2 Reflection" msgstr "Reflexão F2" @@ -5524,6 +5534,7 @@ msgstr "Reflexão F2" #: application/views/gridmap/index.php:53 application/views/kml/index.php:89 #: application/views/logbookadvanced/index.php:228 #: application/views/qso/edit_ajax.php:201 application/views/qso/index.php:413 +#: application/views/timeline/index.php:89 msgctxt "Propagation Mode" msgid "Internet-assisted" msgstr "Assistido pela Internet" @@ -5532,6 +5543,7 @@ msgstr "Assistido pela Internet" #: application/views/gridmap/index.php:54 application/views/kml/index.php:90 #: application/views/logbookadvanced/index.php:229 #: application/views/qso/edit_ajax.php:202 application/views/qso/index.php:414 +#: application/views/timeline/index.php:90 msgctxt "Propagation Mode" msgid "Ionoscatter" msgstr "Ionoscatter" @@ -5540,6 +5552,7 @@ msgstr "Ionoscatter" #: application/views/gridmap/index.php:55 application/views/kml/index.php:91 #: application/views/logbookadvanced/index.php:230 #: application/views/qso/edit_ajax.php:203 application/views/qso/index.php:415 +#: application/views/timeline/index.php:91 msgctxt "Propagation Mode" msgid "IRLP" msgstr "IRLP" @@ -5548,6 +5561,7 @@ msgstr "IRLP" #: application/views/gridmap/index.php:56 application/views/kml/index.php:92 #: application/views/logbookadvanced/index.php:231 #: application/views/qso/edit_ajax.php:204 application/views/qso/index.php:416 +#: application/views/timeline/index.php:92 msgctxt "Propagation Mode" msgid "Meteor scatter" msgstr "Dispersão meteorítica" @@ -5556,6 +5570,7 @@ msgstr "Dispersão meteorítica" #: application/views/gridmap/index.php:57 application/views/kml/index.php:93 #: application/views/logbookadvanced/index.php:232 #: application/views/qso/edit_ajax.php:205 application/views/qso/index.php:417 +#: application/views/timeline/index.php:93 msgctxt "Propagation Mode" msgid "Terrestrial or atmospheric repeater or transponder" msgstr "Repetidor ou transponder terrestre ou atmosférico" @@ -5564,6 +5579,7 @@ msgstr "Repetidor ou transponder terrestre ou atmosférico" #: application/views/gridmap/index.php:58 application/views/kml/index.php:94 #: application/views/logbookadvanced/index.php:233 #: application/views/qso/edit_ajax.php:206 application/views/qso/index.php:418 +#: application/views/timeline/index.php:94 msgctxt "Propagation Mode" msgid "Rain scatter" msgstr "Dispersão de chuva" @@ -5572,6 +5588,7 @@ msgstr "Dispersão de chuva" #: application/views/gridmap/index.php:59 application/views/kml/index.php:95 #: application/views/logbookadvanced/index.php:234 #: application/views/qso/edit_ajax.php:207 application/views/qso/index.php:419 +#: application/views/timeline/index.php:95 msgctxt "Propagation Mode" msgid "Satellite" msgstr "Satélite" @@ -5580,6 +5597,7 @@ msgstr "Satélite" #: application/views/gridmap/index.php:60 application/views/kml/index.php:96 #: application/views/logbookadvanced/index.php:235 #: application/views/qso/edit_ajax.php:208 application/views/qso/index.php:420 +#: application/views/timeline/index.php:96 msgctxt "Propagation Mode" msgid "Trans-equatorial" msgstr "Trans-equatorial" @@ -5588,6 +5606,7 @@ msgstr "Trans-equatorial" #: application/views/gridmap/index.php:61 application/views/kml/index.php:97 #: application/views/logbookadvanced/index.php:236 #: application/views/qso/edit_ajax.php:209 application/views/qso/index.php:421 +#: application/views/timeline/index.php:97 msgctxt "Propagation Mode" msgid "Tropospheric ducting" msgstr "Ducting troposférico" @@ -5803,7 +5822,7 @@ msgstr "Data de Início" #: application/views/dayswithqso/index.php:58 #: application/views/dayswithqso/index.php:86 #: application/views/dayswithqso/index.php:108 -#: application/views/timeline/index.php:120 +#: application/views/timeline/index.php:153 msgid "End Date" msgstr "Data de Fim" @@ -6490,10 +6509,10 @@ msgid "QSL Date" msgstr "Data QSL" #: application/views/eqslcard/index.php:60 -#: application/views/interface_assets/footer.php:2335 -#: application/views/interface_assets/footer.php:2353 -#: application/views/interface_assets/footer.php:2374 -#: application/views/interface_assets/footer.php:2392 +#: application/views/interface_assets/footer.php:2338 +#: application/views/interface_assets/footer.php:2356 +#: application/views/interface_assets/footer.php:2377 +#: application/views/interface_assets/footer.php:2395 #: application/views/qslcard/index.php:66 #: application/views/view_log/qso.php:614 msgid "View" @@ -6504,10 +6523,12 @@ msgstr "Vista" #: application/views/logbookadvanced/index.php:215 #: application/views/logbookadvanced/index.php:609 #: application/views/logbookadvanced/useroptions.php:118 +#: application/views/timeline/index.php:74 msgid "Propagation" msgstr "Propagação" #: application/views/gridmap/index.php:42 +#: application/views/timeline/index.php:79 msgid "None/Empty" msgstr "Nenhum/Vazio" @@ -6767,57 +6788,57 @@ msgstr "Grelhas: " msgid "You're not logged in. Please %slogin%s" msgstr "Não tem sessão iniciada. Por favor %slogin%s" -#: application/views/interface_assets/footer.php:1373 -#: application/views/interface_assets/footer.php:1377 -#: application/views/interface_assets/footer.php:1380 -#: application/views/interface_assets/footer.php:1517 -#: application/views/interface_assets/footer.php:1521 -#: application/views/interface_assets/footer.php:1524 +#: application/views/interface_assets/footer.php:1375 +#: application/views/interface_assets/footer.php:1379 +#: application/views/interface_assets/footer.php:1382 +#: application/views/interface_assets/footer.php:1519 +#: application/views/interface_assets/footer.php:1523 +#: application/views/interface_assets/footer.php:1526 msgid "grid square" msgstr "quadrícula" -#: application/views/interface_assets/footer.php:1380 -#: application/views/interface_assets/footer.php:1524 +#: application/views/interface_assets/footer.php:1382 +#: application/views/interface_assets/footer.php:1526 msgid "Total count" msgstr "Número total" -#: application/views/interface_assets/footer.php:2111 +#: application/views/interface_assets/footer.php:2114 msgid "QSL Card for " msgstr "Cartão QSL para " -#: application/views/interface_assets/footer.php:2131 +#: application/views/interface_assets/footer.php:2134 msgid "Warning! Are you sure you want to delete this QSL card?" msgstr "Aviso! Tem a certeza de que quer eliminar este cartão QSL?" -#: application/views/interface_assets/footer.php:2171 +#: application/views/interface_assets/footer.php:2174 #: application/views/view_log/qso.php:42 msgid "eQSL Card" msgstr "Cartão eQSL" -#: application/views/interface_assets/footer.php:2173 +#: application/views/interface_assets/footer.php:2176 msgid "eQSL Card for " msgstr "Cartão eQSL para " -#: application/views/interface_assets/footer.php:2346 -#: application/views/interface_assets/footer.php:2385 +#: application/views/interface_assets/footer.php:2349 +#: application/views/interface_assets/footer.php:2388 #: application/views/view_log/qso.php:604 msgid "QSL image file" msgstr "Ficheiro de imagem QSL" -#: application/views/interface_assets/footer.php:2365 +#: application/views/interface_assets/footer.php:2368 msgid "Front QSL Card:" msgstr "Frente do Cartão QSL:" -#: application/views/interface_assets/footer.php:2403 +#: application/views/interface_assets/footer.php:2406 msgid "Back QSL Card:" msgstr "Parte traseira do Cartão QSL:" -#: application/views/interface_assets/footer.php:2414 -#: application/views/interface_assets/footer.php:2439 +#: application/views/interface_assets/footer.php:2417 +#: application/views/interface_assets/footer.php:2442 msgid "Add additional QSOs to a QSL Card" msgstr "Adicionar QSOs adicionais a um Cartão QSL" -#: application/views/interface_assets/footer.php:2450 +#: application/views/interface_assets/footer.php:2453 msgid "Something went wrong. Please try again!" msgstr "Algo correu mal. Por favor, tente novamente!" @@ -8872,7 +8893,7 @@ msgid "Remove" msgstr "Remover" #: application/views/qslprint/qslprint.php:33 -#: application/views/simplefle/index.php:133 +#: application/views/simplefle/index.php:139 msgid "QSO List" msgstr "Lista de contacto" @@ -9054,7 +9075,7 @@ msgstr "Guardar alterações" msgid "TimeOff is less than TimeOn" msgstr "O tempo de inatividade é menor que o tempo de atividade" -#: application/views/qso/index.php:5 application/views/qso/index.php:690 +#: application/views/qso/index.php:5 application/views/qso/index.php:696 msgid "Previous Contacts" msgstr "Contactos anteriores" @@ -9170,19 +9191,35 @@ msgstr "Winkey" msgid "Connect" msgstr "Conectar" -#: application/views/qso/index.php:663 +#: application/views/qso/index.php:656 +msgid "Stop" +msgstr "Parar" + +#: application/views/qso/index.php:657 +msgid "Tune" +msgstr "Sintonizar" + +#: application/views/qso/index.php:658 +msgid "Stop Tune" +msgstr "Parar Sintonização" + +#: application/views/qso/index.php:664 +msgid "CW Speed" +msgstr "Velocidade CW" + +#: application/views/qso/index.php:669 msgid "Send" msgstr "Enviar" -#: application/views/qso/index.php:673 +#: application/views/qso/index.php:679 msgid "Suggestions" msgstr "Sugestões" -#: application/views/qso/index.php:680 +#: application/views/qso/index.php:686 msgid "Profile Picture" msgstr "Foto de Perfil" -#: application/views/qso/index.php:704 +#: application/views/qso/index.php:710 msgid "Max. 5 previous contacts are shown" msgstr "São apresentados no máximo 5 contactos anteriores" @@ -9591,7 +9628,7 @@ msgstr "" "em %s." #: application/views/simplefle/index.php:17 -#: application/views/simplefle/index.php:170 +#: application/views/simplefle/index.php:176 msgid "Syntax Help" msgstr "Ajuda de Sintaxe" @@ -9711,24 +9748,24 @@ msgstr "Este é o indicativo do operador. Sem qualquer prefixo ou sufixo." msgid "Enter the Data" msgstr "Introduzir os dados" -#: application/views/simplefle/index.php:148 +#: application/views/simplefle/index.php:154 msgid "Refs" msgstr "Referências" -#: application/views/simplefle/index.php:160 +#: application/views/simplefle/index.php:166 #, php-format msgid "The Refs can be either %sS%sOTA, %sI%sOTA, %sP%sOTA, or %sW%sWFF" msgstr "As Refs podem ser %sS%sOTA, %sI%sOTA, %sP%sOTA, ou %sW%sWFF" -#: application/views/simplefle/index.php:167 +#: application/views/simplefle/index.php:173 msgid "Reload QSO List" msgstr "Recarregar Lista de contactos" -#: application/views/simplefle/index.php:168 +#: application/views/simplefle/index.php:174 msgid "Save in Wavelog" msgstr "Guardar no Wavelog" -#: application/views/simplefle/index.php:169 +#: application/views/simplefle/index.php:175 msgid "Clear Logging Session" msgstr "Limpar Sessão de Registo" @@ -10589,6 +10626,10 @@ msgstr "Por favor, edite" msgid "Add a Theme" msgstr "Adicionar um tema" +#: application/views/timeline/index.php:78 +msgid "All but SAT" +msgstr "" + #: application/views/timeplotter/index.php:2 msgid "contacts were plotted" msgstr "os contactos foram traçados" @@ -10641,6 +10682,10 @@ msgstr "Verificar atualizações de dados DXCC" msgid "Update DXCC Data" msgstr "Atualizar dados DXCC" +#: application/views/update/index.php:30 +msgid "Status:" +msgstr "" + #: application/views/update/index.php:34 msgid "Apply DXCC Data to Logbook" msgstr "Aplicar dados DXCC ao Logbook" @@ -10659,19 +10704,19 @@ msgstr "" "estão em falta com os metadados DXCC ou verificar novamente todo o logbook\n" "\t\t\t\t\t\t\te atualizar também os metadados existentes, caso tenham mudado." -#: application/views/update/index.php:40 +#: application/views/update/index.php:45 msgid "Check QSOs missing DXCC data" msgstr "Verificar contactos sem dados DXCC" -#: application/views/update/index.php:42 application/views/update/index.php:62 +#: application/views/update/index.php:54 application/views/update/index.php:95 msgid "Re-check all QSOs in logbook" msgstr "Verificar novamente todos os contactos no logbook" -#: application/views/update/index.php:45 +#: application/views/update/index.php:59 msgid "Apply Continent Data to Logbook" msgstr "Aplicar dados do continente ao logbook" -#: application/views/update/index.php:47 +#: application/views/update/index.php:61 msgid "" "This function can be used to update QSO continent information for all QSOs " "in Wavelog missing that information." @@ -10679,19 +10724,19 @@ msgstr "" "Esta função pode ser utilizada para atualizar a informação do continente do " "contacto para todos os contactos no Wavelog que não tenham essa informação." -#: application/views/update/index.php:49 +#: application/views/update/index.php:68 msgid "Check QSOs missing continent data" msgstr "Verificar contactos sem dados do continente" -#: application/views/update/index.php:59 +#: application/views/update/index.php:80 msgid "Here you can update QSOs with missing distance information." msgstr "Aqui pode atualizar contactos com informação de distância em falta." -#: application/views/update/index.php:60 +#: application/views/update/index.php:86 msgid "Update distance data" msgstr "Atualizar dados de distância" -#: application/views/update/index.php:61 +#: application/views/update/index.php:89 msgid "" "Use the following button to update the distance information for all your " "QSOs. Depending on the number of QSOs this might take some time to execute. " diff --git a/application/locale/ru_RU/LC_MESSAGES/messages.po b/application/locale/ru_RU/LC_MESSAGES/messages.po index 1371128c2..1b20e3c74 100644 --- a/application/locale/ru_RU/LC_MESSAGES/messages.po +++ b/application/locale/ru_RU/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-22 13:37+0000\n" +"POT-Creation-Date: 2024-08-25 17:03+0000\n" "PO-Revision-Date: 2024-08-20 05:18+0000\n" "Last-Translator: Michael Skolsky \n" "Language-Team: Russian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified) load->model('logbooks_model'); - $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + + $clean_postdata = $this->security->xss_clean($postdata); + + $this->load->model('logbooks_model'); + $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); if (!$logbooks_locations_array) { header('Content-Type: application/json'); @@ -28,20 +30,20 @@ class Distances_model extends CI_Model $this->db->join('satellite', 'satellite.name = '.$this->config->item('table_name').'.COL_SAT_NAME', 'left outer'); $this->db->where('LENGTH(col_gridsquare) >', 0); - if ($postdata['band'] != 'All') { - if ($postdata['band'] == 'sat') { - $this->db->where('col_prop_mode', $postdata['band']); - if ($postdata['sat'] != 'All') { - $this->db->where('col_sat_name', $postdata['sat']); + if ($clean_postdata['band'] != 'All') { + if ($clean_postdata['band'] == 'sat') { + $this->db->where('col_prop_mode', $clean_postdata['band']); + if ($clean_postdata['sat'] != 'All') { + $this->db->where('col_sat_name', $clean_postdata['sat']); } } else { - $this->db->where('col_band', $postdata['band']); + $this->db->where('col_band', $clean_postdata['band']); } } - if ($postdata['orbit'] != 'All') { - $this->db->where('satellite.orbit', $postdata['orbit']); + if ($clean_postdata['orbit'] != 'All') { + $this->db->where('satellite.orbit', $clean_postdata['orbit']); } $this->db->where('station_id', $station_id); @@ -231,9 +233,8 @@ class Distances_model extends CI_Model */ public function qso_details($distance, $band, $sat){ $distarray = $this->getdistparams($distance); - $CI =& get_instance(); - $CI->load->model('logbooks_model'); - $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + $this->load->model('logbooks_model'); + $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); $this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer'); diff --git a/application/models/Timeline_model.php b/application/models/Timeline_model.php index c8c41326c..703f76ba5 100644 --- a/application/models/Timeline_model.php +++ b/application/models/Timeline_model.php @@ -1,237 +1,272 @@ load->model('logbooks_model'); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); - if (!$logbooks_locations_array) { - return null; - } + if (!$logbooks_locations_array) { + return null; + } $location_list = "'".implode("','",$logbooks_locations_array)."'"; - switch ($award) { - case 'dxcc': $result = $this->get_timeline_dxcc($band, $mode, $location_list, $qsl, $lotw, $eqsl); break; - case 'was': $result = $this->get_timeline_was($band, $mode, $location_list, $qsl, $lotw, $eqsl); break; - case 'iota': $result = $this->get_timeline_iota($band, $mode, $location_list, $qsl, $lotw, $eqsl); break; - case 'waz': $result = $this->get_timeline_waz($band, $mode, $location_list, $qsl, $lotw, $eqsl); break; - case 'vucc': $result = $this->get_timeline_vucc($band, $mode, $location_list, $qsl, $lotw, $eqsl); break; - case 'waja': $result = $this->get_timeline_waja($band, $mode, $location_list, $qsl, $lotw, $eqsl); break; - } + switch ($award) { + case 'dxcc': $result = $this->get_timeline_dxcc($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog); break; + case 'was': $result = $this->get_timeline_was($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog); break; + case 'iota': $result = $this->get_timeline_iota($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog); break; + case 'waz': $result = $this->get_timeline_waz($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog); break; + case 'vucc': $result = $this->get_timeline_vucc($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog); break; + case 'waja': $result = $this->get_timeline_waja($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog); break; + } - return $result; - } + return $result; + } - public function get_timeline_dxcc($band, $mode, $location_list, $qsl, $lotw, $eqsl) { + public function get_timeline_dxcc($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog) { $binding = []; - $sql = "select min(date(COL_TIME_ON)) date, prefix, col_country, end, adif from " - .$this->config->item('table_name'). " thcv - join dxcc_entities on thcv.col_dxcc = dxcc_entities.adif - where station_id in (" . $location_list . ")"; + $sql = "select min(date(COL_TIME_ON)) date, prefix, col_country, end, adif from " + .$this->config->item('table_name'). " thcv + join dxcc_entities on thcv.col_dxcc = dxcc_entities.adif + where station_id in (" . $location_list . ")"; - if ($band != 'All') { - if ($band == 'SAT') { - $sql .= " and col_prop_mode = ?"; + if ($band == 'SAT') { // Left for compatibility reasons + $sql .= " and col_prop_mode = ?"; + $binding[] = $band; + } else { // Not SAT + if ($band != 'All') { // Band set? Take care of it + $sql .= " and col_band = ?"; $binding[] = $band; - } - else { - $sql .= " and col_prop_mode !='SAT'"; - $sql .= " and col_band = ?"; - $binding[] = $band; - } - } + } + if ( $propmode == 'NoSAT' ) { // All without SAT + $sql .= " and col_prop_mode !='SAT'"; + } elseif ($propmode == 'None') { // Empty Propmode + $sql .= " and (trim(col_prop_mode)='' or col_prop_mode is null)"; + } elseif ($propmode == 'All') { // Dont care for propmode + ; // No Prop-Filter + } else { // Propmode set, take care of it + $sql .= " and col_prop_mode = ?"; + $binding[] = $propmode; + } + } - if ($mode != 'All') { - $sql .= " and col_mode = ?"; + if ($mode != 'All') { + $sql .= " and col_mode = ?"; $binding[] = $mode; - } + } - $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl); + $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog); - $sql .= " group by col_dxcc, col_country - order by date desc"; + $sql .= " group by col_dxcc, col_country + order by date desc"; - $query = $this->db->query($sql, $binding); + $query = $this->db->query($sql, $binding); - return $query->result(); - } + return $query->result(); + } - public function get_timeline_waja($band, $mode, $location_list, $qsl, $lotw, $eqsl) { + public function get_timeline_waja($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog) { $binding = []; - $sql = "select min(date(COL_TIME_ON)) date, col_state from " - .$this->config->item('table_name'). " thcv - where station_id in (" . $location_list . ")"; + $sql = "select min(date(COL_TIME_ON)) date, col_state from " + .$this->config->item('table_name'). " thcv + where station_id in (" . $location_list . ")"; - if ($band != 'All') { - if ($band == 'SAT') { - $sql .= " and col_prop_mode = ?"; + if ($band == 'SAT') { // Left for compatibility reasons + $sql .= " and col_prop_mode = ?"; + $binding[] = $band; + } else { // Not SAT + if ($band != 'All') { // Band set? Take care of it + $sql .= " and col_band = ?"; $binding[] = $band; - } - else { - $sql .= " and col_prop_mode !='SAT'"; - $sql .= " and col_band = ?"; - $binding[] = $band; - } - } + } + if ( $propmode == 'NoSAT' ) { // All without SAT + $sql .= " and col_prop_mode !='SAT'"; + } elseif ($propmode == 'None') { // Empty Propmode + $sql .= " and (trim(col_prop_mode)='' or col_prop_mode is null)"; + } elseif ($propmode == 'All') { // Dont care for propmode + ; // No Prop-Filter + } else { // Propmode set, take care of it + $sql .= " and col_prop_mode = ?"; + $binding[] = $propmode; + } + } - if ($mode != 'All') { - $sql .= " and col_mode = ?"; + + if ($mode != 'All') { + $sql .= " and col_mode = ?"; $binding[] = $mode; - } + } - $sql .= " and COL_DXCC = '339' and trim(coalesce(COL_STATE,'')) != '' "; + $sql .= " and COL_DXCC = '339' and trim(coalesce(COL_STATE,'')) != '' "; - $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl); + $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog); - $sql .= " group by col_state - order by date desc"; + $sql .= " group by col_state + order by date desc"; - $query = $this->db->query($sql, $binding); + $query = $this->db->query($sql, $binding); - return $query->result(); - } + return $query->result(); + } - public function get_timeline_was($band, $mode, $location_list, $qsl, $lotw, $eqsl) { + public function get_timeline_was($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog) { $binding = []; - $sql = "select min(date(COL_TIME_ON)) date, col_state from " - .$this->config->item('table_name'). " thcv - where station_id in (" . $location_list . ")"; + $sql = "select min(date(COL_TIME_ON)) date, col_state from " + .$this->config->item('table_name'). " thcv + where station_id in (" . $location_list . ")"; - if ($band != 'All') { - if ($band == 'SAT') { - $sql .= " and col_prop_mode = ?"; + if ($band == 'SAT') { // Left for compatibility reasons + $sql .= " and col_prop_mode = ?"; + $binding[] = $band; + } else { // Not SAT + if ($band != 'All') { // Band set? Take care of it + $sql .= " and col_band = ?"; $binding[] = $band; - } - else { - $sql .= " and col_prop_mode !='SAT'"; - $sql .= " and col_band = ?"; - $binding[] = $band; - } - } + } + if ( $propmode == 'NoSAT' ) { // All without SAT + $sql .= " and col_prop_mode !='SAT'"; + } elseif ($propmode == 'None') { // Empty Propmode + $sql .= " and (trim(col_prop_mode)='' or col_prop_mode is null)"; + } elseif ($propmode == 'All') { // Dont care for propmode + ; // No Prop-Filter + } else { // Propmode set, take care of it + $sql .= " and col_prop_mode = ?"; + $binding[] = $propmode; + } + } - if ($mode != 'All') { - $sql .= " and col_mode = ?"; + if ($mode != 'All') { + $sql .= " and col_mode = ?"; $binding[] = $mode; - } + } - $sql .= " and COL_DXCC in ('291', '6', '110')"; - $sql .= " and COL_STATE in ('AK','AL','AR','AZ','CA','CO','CT','DE','FL','GA','HI','IA','ID','IL','IN','KS','KY','LA','MA','MD','ME','MI','MN','MO','MS','MT','NC','ND','NE','NH','NJ','NM','NV','NY','OH','OK','OR','PA','RI','SC','SD','TN','TX','UT','VA','VT','WA','WI','WV','WY')"; + $sql .= " and COL_DXCC in ('291', '6', '110')"; + $sql .= " and COL_STATE in ('AK','AL','AR','AZ','CA','CO','CT','DE','FL','GA','HI','IA','ID','IL','IN','KS','KY','LA','MA','MD','ME','MI','MN','MO','MS','MT','NC','ND','NE','NH','NJ','NM','NV','NY','OH','OK','OR','PA','RI','SC','SD','TN','TX','UT','VA','VT','WA','WI','WV','WY')"; - $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl); + $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog); - $sql .= " group by col_state - order by date desc"; + $sql .= " group by col_state + order by date desc"; - $query = $this->db->query($sql, $binding); + $query = $this->db->query($sql, $binding); - return $query->result(); - } + return $query->result(); + } - public function get_timeline_iota($band, $mode, $location_list, $qsl, $lotw, $eqsl) { + public function get_timeline_iota($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog) { $binding = []; - $sql = "select min(date(COL_TIME_ON)) date, col_iota, name, prefix from " - .$this->config->item('table_name'). " thcv - join iota on thcv.col_iota = iota.tag - where station_id in (" . $location_list . ")"; + $sql = "select min(date(COL_TIME_ON)) date, col_iota, name, prefix from " + .$this->config->item('table_name'). " thcv + join iota on thcv.col_iota = iota.tag + where station_id in (" . $location_list . ")"; - if ($band != 'All') { - if ($band == 'SAT') { - $sql .= " and col_prop_mode = ?"; + if ($band == 'SAT') { // Left for compatibility reasons + $sql .= " and col_prop_mode = ?"; + $binding[] = $band; + } else { // Not SAT + if ($band != 'All') { // Band set? Take care of it + $sql .= " and col_band = ?"; $binding[] = $band; - } - else { - $sql .= " and col_prop_mode !='SAT'"; - $sql .= " and col_band = ?"; - $binding[] = $band; - } - } + } + if ( $propmode == 'NoSAT' ) { // All without SAT + $sql .= " and col_prop_mode !='SAT'"; + } elseif ($propmode == 'None') { // Empty Propmode + $sql .= " and (trim(col_prop_mode)='' or col_prop_mode is null)"; + } elseif ($propmode == 'All') { // Dont care for propmode + ; // No Prop-Filter + } else { // Propmode set, take care of it + $sql .= " and col_prop_mode = ?"; + $binding[] = $propmode; + } + } - if ($mode != 'All') { - $sql .= " and col_mode = ?"; + + if ($mode != 'All') { + $sql .= " and col_mode = ?"; $binding[] = $mode; - } + } - $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl); + $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog); - $sql .= " and col_iota <> '' group by col_iota, name, prefix - order by date desc"; + $sql .= " and col_iota <> '' group by col_iota, name, prefix + order by date desc"; - $query = $this->db->query($sql, $binding); + $query = $this->db->query($sql, $binding); - return $query->result(); - } + return $query->result(); + } - public function get_timeline_waz($band, $mode, $location_list, $qsl, $lotw, $eqsl) { + public function get_timeline_waz($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog) { $binding = []; - $sql = "select min(date(COL_TIME_ON)) date, col_cqz from " - .$this->config->item('table_name'). " thcv - where station_id in (" . $location_list . ")"; + $sql = "select min(date(COL_TIME_ON)) date, col_cqz from " + .$this->config->item('table_name'). " thcv + where station_id in (" . $location_list . ")"; - if ($band != 'All') { - if ($band == 'SAT') { - $sql .= " and col_prop_mode = ?"; + if ($band == 'SAT') { // Left for compatibility reasons + $sql .= " and col_prop_mode = ?"; + $binding[] = $band; + } else { // Not SAT + if ($band != 'All') { // Band set? Take care of it + $sql .= " and col_band = ?"; $binding[] = $band; - } - else { - $sql .= " and col_prop_mode !='SAT'"; - $sql .= " and col_band = ?"; - $binding[] = $band; - } - } + } + if ( $propmode == 'NoSAT' ) { // All without SAT + $sql .= " and col_prop_mode !='SAT'"; + } elseif ($propmode == 'None') { // Empty Propmode + $sql .= " and (trim(col_prop_mode)='' or col_prop_mode is null)"; + } elseif ($propmode == 'All') { // Dont care for propmode + ; // No Prop-Filter + } else { // Propmode set, take care of it + $sql .= " and col_prop_mode = ?"; + $binding[] = $propmode; + } + } - if ($mode != 'All') { - $sql .= " and col_mode = ?"; + + if ($mode != 'All') { + $sql .= " and col_mode = ?"; $binding[] = $mode; - } + } - $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl); + $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog); - $sql .= " and col_cqz <> '' group by col_cqz - order by date desc"; + $sql .= " and col_cqz <> '' group by col_cqz + order by date desc"; - $query = $this->db->query($sql, $binding); + $query = $this->db->query($sql, $binding); - return $query->result(); - } + return $query->result(); + } // Adds confirmation to query - function addQslToQuery($qsl, $lotw, $eqsl) { + function addQslToQuery($qsl, $lotw, $eqsl, $clublog) { $sql = ''; - if ($lotw == 1 and $qsl == 0 and $eqsl == 0) { - $sql .= " and col_lotw_qsl_rcvd = 'Y'"; - } + if ( (($lotw ?? 0) != 0) || (($qsl ?? 0) != 0) || (($eqsl ?? 0) != 0) || (($clublog ?? 0) != 0) ) { + $sql .= 'and ('; - if ($qsl == 1 and $lotw == 0 and $eqsl == 0) { - $sql .= " and col_qsl_rcvd = 'Y'"; - } + if ($lotw ?? 0 == 1) { + $sql .= "col_lotw_qsl_rcvd = 'Y' or"; + } - if ($eqsl == 1 and $lotw == 0 and $qsl == 0) { - $sql .= " and col_eqsl_qsl_rcvd = 'Y'"; - } + if ($qsl ?? 0 == 1) { + $sql .= " col_qsl_rcvd = 'Y' or"; + } - if ($lotw == 1 and $qsl == 1 and $eqsl == 0) { - $sql .= " and (col_lotw_qsl_rcvd = 'Y' or col_qsl_rcvd = 'Y')"; - } + if ($eqsl ?? 0 == 1) { + $sql .= " col_eqsl_qsl_rcvd = 'Y' or"; + } - if ($qsl == 1 and $lotw == 0 and $eqsl == 1) { - $sql .= " and (col_qsl_rcvd = 'Y' or col_eqsl_qsl_rcvd = 'Y')"; - } - - if ($eqsl == 1 and $lotw == 1 and $qsl == 0) { - $sql .= " and (col_eqsl_qsl_rcvd = 'Y' or col_lotw_qsl_rcvd = 'Y')"; - } - - if ($qsl == 1 && $lotw == 1 && $eqsl == 1) { - $sql .= " and (col_qsl_rcvd = 'Y' or col_lotw_qsl_rcvd = 'Y' or col_eqsl_qsl_rcvd = 'Y')"; - } + if ($clublog ?? 0 == 1) { + $sql .= " col_clublog_qso_download_status = 'Y' or"; + } + $sql.=' 1=0)'; + } return $sql; } - public function timeline_qso_details($querystring, $band, $mode, $type){ + public function timeline_qso_details($querystring, $band, $propmode, $mode, $type){ $this->load->model('logbooks_model'); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); @@ -239,128 +274,156 @@ class Timeline_model extends CI_Model $this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer'); $this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer'); - if ($band != 'All') { - if ($band == 'SAT') { - $this->db->where('col_prop_mode', $band); - } else { - $this->db->where('COL_PROP_MODE !=', 'SAT'); - $this->db->where('col_band', $band); - } - } + if ($band == 'SAT') { // Left for compatibility reasons + $this->db->where('col_prop_mode', $band); + } else { // Not SAT + if ($band != 'All') { // Band set? Take care of it + $this->db->where('col_band', $band); + } + if ( $propmode == 'NoSAT' ) { // All without SAT + $this->db->where('col_prop_mode !=', 'SAT'); + } elseif ($propmode == 'None') { // Empty Propmode + $sql .= " and (trim(col_prop_mode)='' or col_prop_mode is null)"; + $this->db->group_start(); + $this->db->where('trim(col_prop_mode)', ''); + $this->db->or_where('col_prop_mode is null'); + $this->db->group_end(); + } elseif ($propmode == 'All') { // Dont care for propmode + ; // No Prop-Filter + } else { // Propmode set, take care of it + $this->db->where('col_prop_mode', $propmode); + } + } - if ($mode != 'All') { - $this->db->where('col_mode', $mode); - } + if ($mode != 'All') { + $this->db->where('col_mode', $mode); + } - $this->db->where_in('station_profile.station_id', $logbooks_locations_array); + $this->db->where_in('station_profile.station_id', $logbooks_locations_array); - switch($type) { - case 'dxcc': $this->db->where('COL_DXCC', $querystring); break; - case 'was': $this->db->where('COL_STATE', $querystring); break; - case 'iota': $this->db->where('COL_IOTA', $querystring); break; - case 'waz': $this->db->where('COL_CQZ', $querystring); break; - case 'vucc': $this->db->group_start(); $this->db->like('COL_GRIDSQUARE', $querystring); $this->db->or_like('COL_VUCC_GRIDS',$querystring); $this->db->group_end();break; - case 'waja': $this->db->where('COL_STATE', $querystring); break; - } - $this->db->order_by('COL_TIME_ON', 'DESC'); + switch($type) { + case 'dxcc': $this->db->where('COL_DXCC', $querystring); break; + case 'was': $this->db->where('COL_STATE', $querystring); $this->db->where("COL_DXCC in ('291', '6', '110')"); break; + case 'iota': $this->db->where('COL_IOTA', $querystring); break; + case 'waz': $this->db->where('COL_CQZ', $querystring); break; + case 'vucc': $this->db->group_start(); $this->db->like('COL_GRIDSQUARE', $querystring); $this->db->or_like('COL_VUCC_GRIDS',$querystring); $this->db->group_end();break; + case 'waja': $this->db->where('COL_STATE', $querystring); $this->db->where('COL_DXCC','339'); break; + } + $this->db->order_by('COL_TIME_ON', 'DESC'); - return $this->db->get($this->config->item('table_name')); - } + return $this->db->get($this->config->item('table_name')); + } - public function get_timeline_vucc($band, $mode, $location_list, $qsl, $lotw, $eqsl) { - $timeline = array(); + public function get_timeline_vucc($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog) { + $timeline = array(); - $col_gridsquare = $this->get_gridsquare($band, $mode, $location_list, $qsl, $lotw, $eqsl); + $col_gridsquare = $this->get_gridsquare($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog); - foreach ($col_gridsquare as $grid) { - $timeline[] = array( - 'gridsquare' => $grid->gridsquare, - 'date' => $grid->date); - } + foreach ($col_gridsquare as $grid) { + $timeline[] = array( + 'gridsquare' => $grid->gridsquare, + 'date' => $grid->date); + } - $col_vucc_grids = $this->get_vucc_grids($band, $mode, $location_list, $qsl, $lotw, $eqsl); + $col_vucc_grids = $this->get_vucc_grids($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog); - foreach ($col_vucc_grids as $gridSplit) { - $grids = explode(",", $gridSplit->gridsquare); - foreach($grids as $key) { - $grid_four = strtoupper(substr(trim($key),0,4)); - if (!array_search($grid_four, array_column($timeline, 'gridsquare'))) { - $timeline[] = array( - 'gridsquare' => $grid_four, - 'date' => $gridSplit->date); - } - } - } - usort($timeline, function($a, $b) { - return $b['date'] <=> $a['date']; - }); + foreach ($col_vucc_grids as $gridSplit) { + $grids = explode(",", $gridSplit->gridsquare); + foreach($grids as $key) { + $grid_four = strtoupper(substr(trim($key),0,4)); + if (!array_search($grid_four, array_column($timeline, 'gridsquare'))) { + $timeline[] = array( + 'gridsquare' => $grid_four, + 'date' => $gridSplit->date); + } + } + } + usort($timeline, function($a, $b) { + return $b['date'] <=> $a['date']; + }); - return $timeline; - } + return $timeline; + } - public function get_gridsquare($band, $mode, $location_list, $qsl, $lotw, $eqsl) { + public function get_gridsquare($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog) { $binding = []; - $sql = "select min(COL_TIME_ON) date, upper(substring(col_gridsquare, 1, 4)) gridsquare from " - .$this->config->item('table_name'). " thcv - where station_id in (" . $location_list . ")"; + $sql = "select min(COL_TIME_ON) date, upper(substring(col_gridsquare, 1, 4)) gridsquare from " + .$this->config->item('table_name'). " thcv + where station_id in (" . $location_list . ")"; - if ($band != 'All') { - if ($band == 'SAT') { - $sql .= " and col_prop_mode = ?"; + if ($band == 'SAT') { // Left for compatibility reasons + $sql .= " and col_prop_mode = ?"; + $binding[] = $band; + } else { // Not SAT + if ($band != 'All') { // Band set? Take care of it + $sql .= " and col_band = ?"; $binding[] = $band; - } - else { - $sql .= " and col_prop_mode !='SAT'"; - $sql .= " and col_band = ?"; - $binding[] = $band; - } - } + } + if ( $propmode == 'NoSAT' ) { // All without SAT + $sql .= " and col_prop_mode !='SAT'"; + } elseif ($propmode == 'None') { // Empty Propmode + $sql .= " and (trim(col_prop_mode)='' or col_prop_mode is null)"; + } elseif ($propmode == 'All') { // Dont care for propmode + ; // No Prop-Filter + } else { // Propmode set, take care of it + $sql .= " and col_prop_mode = ?"; + $binding[] = $propmode; + } + } - if ($mode != 'All') { - $sql .= " and col_mode = ?"; + if ($mode != 'All') { + $sql .= " and col_mode = ?"; $binding[] = $mode; - } + } - $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl); + $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog); - $sql .= " and col_gridsquare <> '' group by upper(substring(col_gridsquare, 1, 4)) - order by date desc"; + $sql .= " and col_gridsquare <> '' group by upper(substring(col_gridsquare, 1, 4)) + order by date desc"; - $query = $this->db->query($sql, $binding); + $query = $this->db->query($sql, $binding); - return $query->result(); - } + return $query->result(); + } - public function get_vucc_grids($band, $mode, $location_list, $qsl, $lotw, $eqsl) { + public function get_vucc_grids($band, $mode, $propmode, $location_list, $qsl, $lotw, $eqsl, $clublog) { $binding = []; - $sql = "select COL_TIME_ON as date, upper(col_vucc_grids) gridsquare from " - .$this->config->item('table_name'). " thcv - where station_id in (" . $location_list . ")"; + $sql = "select COL_TIME_ON as date, upper(col_vucc_grids) gridsquare from " + .$this->config->item('table_name'). " thcv + where station_id in (" . $location_list . ")"; - if ($band != 'All') { - if ($band == 'SAT') { - $sql .= " and col_prop_mode = ?"; + if ($band == 'SAT') { // Left for compatibility reasons + $sql .= " and col_prop_mode = ?"; + $binding[] = $band; + } else { // Not SAT + if ($band != 'All') { // Band set? Take care of it + $sql .= " and col_band = ?"; $binding[] = $band; - } - else { - $sql .= " and col_prop_mode !='SAT'"; - $sql .= " and col_band = ?"; - $binding[] = $band; - } - } + } + if ( $propmode == 'NoSAT' ) { // All without SAT + $sql .= " and col_prop_mode !='SAT'"; + } elseif ($propmode == 'None') { // Empty Propmode + $sql .= " and (trim(col_prop_mode)='' or col_prop_mode is null)"; + } elseif ($propmode == 'All') { // Dont care for propmode + ; // No Prop-Filter + } else { // Propmode set, take care of it + $sql .= " and col_prop_mode = ?"; + $binding[] = $propmode; + } + } - if ($mode != 'All') { - $sql .= " and col_mode = ?"; + if ($mode != 'All') { + $sql .= " and col_mode = ?"; $binding[] = $mode; - } + } - $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl); + $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog); - $sql .= " and col_vucc_grids <> ''"; + $sql .= " and col_vucc_grids <> ''"; - $query = $this->db->query($sql, $binding); + $query = $this->db->query($sql, $binding); - return $query->result(); - } + return $query->result(); + } } diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 488ff4e82..900adeba9 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1288,15 +1288,17 @@ $($('#callsign')).on('keypress',function(e) {