diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php index dcd12e7ac..9c795660e 100644 --- a/application/controllers/Satellite.php +++ b/application/controllers/Satellite.php @@ -547,4 +547,43 @@ class Satellite extends CI_Controller { $this->load->view('satellite/satinfo', $data); } + + public function editTleDialog() { + if($this->session->userdata('user_date_format')) { + // If Logged in and session exists + $custom_date_format = $this->session->userdata('user_date_format'); + } else { + // Get Default date format from /config/wavelog.php + $custom_date_format = $this->config->item('qso_date_format'); + } + + $data['custom_date_format'] = $custom_date_format; + + $id = $this->security->xss_clean($this->input->post('id', true)); + $this->load->model('satellite_model'); + + $data['satinfo'] = $this->satellite_model->getsatellite($id)->result(); + $data['tleinfo'] = $this->satellite_model->get_tle($data['satinfo'][0]->name); + + $this->load->view('satellite/tleinfo', $data); + } + + public function deleteTle() { + if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); } + + $id = $this->input->post('id', true); + $this->load->model('satellite_model'); + + $data['satinfo'] = $this->satellite_model->deleteTle($id); + } + + public function saveTle() { + if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); } + + $id = $this->input->post('id', true); + $tle = $this->input->post('tle', true); + $this->load->model('satellite_model'); + + $this->satellite_model->saveTle($id, $tle); + } } diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index def342402..78b8a2f2d 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-03-31 11:52+0000\n" +"POT-Creation-Date: 2025-04-04 05:15+0000\n" "PO-Revision-Date: 2024-11-01 08:53+0000\n" "Last-Translator: Plamen Panteleev \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin \n" "Language-Team: Czech \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -115,6 +115,8 @@ msgstr "" #: application/controllers/Satellite.php:132 #: application/controllers/Satellite.php:146 #: application/controllers/Satellite.php:164 +#: application/controllers/Satellite.php:572 +#: application/controllers/Satellite.php:581 #: application/controllers/Sattimers.php:9 #: application/controllers/Search.php:13 #: application/controllers/Simplefle.php:7 @@ -706,7 +708,7 @@ msgid "Email settings not configured." msgstr "E-Mail-Einstellungen nicht konfiguriert." #: application/controllers/Club.php:227 application/views/api/index.php:68 -#: application/views/satellite/index.php:79 +#: application/views/satellite/index.php:94 #: application/views/satellite/satinfo.php:51 msgid "Unknown" msgstr "Unbekannt" @@ -1235,7 +1237,7 @@ msgstr "QSL" #: application/views/qslprint/qsolist.php:169 #: application/views/qslprint/qsolist.php:184 #: application/views/qso/edit_ajax.php:425 -#: application/views/satellite/index.php:41 +#: application/views/satellite/index.php:56 #: application/views/satellite/satinfo.php:13 #: application/views/search/search_result_ajax.php:298 #: application/views/search/search_result_ajax.php:313 @@ -2138,7 +2140,7 @@ msgstr "Standardgerät (klicken zum freigeben)" #: application/views/labels/index.php:47 application/views/labels/index.php:83 #: application/views/logbookadvanced/index.php:619 #: application/views/mode/index.php:64 application/views/satellite/edit.php:56 -#: application/views/satellite/index.php:43 +#: application/views/satellite/index.php:58 #: application/views/search/stored_queries.php:21 #: application/views/stationsetup/stationsetup.php:128 #: application/views/stationsetup/stationsetup.php:165 @@ -2164,7 +2166,7 @@ msgstr "Bearbeiten" #: application/views/oqrs/showrequests.php:71 #: application/views/qslcard/index.php:65 #: application/views/satellite/edit.php:57 -#: application/views/satellite/index.php:44 +#: application/views/satellite/index.php:59 #: application/views/search/stored_queries.php:22 #: application/views/stationsetup/stationsetup.php:33 #: application/views/stationsetup/stationsetup.php:137 @@ -3178,7 +3180,7 @@ msgid "unconfirmed" msgstr "nicht bestätigt" #: application/models/Logbook_model.php:4691 -#: application/views/satellite/index.php:67 +#: application/views/satellite/index.php:82 #: application/views/satellite/satinfo.php:41 #: application/views/view_log/qso.php:287 msgid "unknown" @@ -3775,7 +3777,7 @@ msgstr "Satellit" #: application/views/logbookadvanced/index.php:264 #: application/views/satellite/create.php:35 #: application/views/satellite/edit.php:19 -#: application/views/satellite/index.php:39 +#: application/views/satellite/index.php:54 #: application/views/satellite/satinfo.php:12 #: application/views/statistics/antennaanalytics.php:60 #: application/views/statistics/antennaanalytics.php:101 @@ -6514,8 +6516,8 @@ msgstr "" #: application/views/satellite/create.php:75 #: application/views/satellite/edit.php:31 #: application/views/satellite/edit.php:34 -#: application/views/satellite/index.php:73 -#: application/views/satellite/index.php:86 +#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:101 #: application/views/satellite/satinfo.php:45 #: application/views/search/result.php:74 #: application/views/station_profile/create.php:209 @@ -6571,8 +6573,8 @@ msgstr "Ja" #: application/views/satellite/create.php:76 #: application/views/satellite/edit.php:32 #: application/views/satellite/edit.php:35 -#: application/views/satellite/index.php:76 -#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:91 +#: application/views/satellite/index.php:103 #: application/views/satellite/satinfo.php:48 #: application/views/search/result.php:76 #: application/views/station_profile/create.php:210 @@ -9188,7 +9190,7 @@ msgstr "Globale Optionen" #: application/views/interface_assets/header.php:296 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 -#: application/views/satellite/index.php:25 +#: application/views/satellite/index.php:40 #: application/views/statistics/index.php:50 #: application/views/statistics/index.php:111 msgid "Satellites" @@ -9662,7 +9664,7 @@ msgstr "Clublog empfangen" #: application/views/logbookadvanced/edit.php:85 #: application/views/satellite/edit.php:51 -#: application/views/satellite/index.php:40 +#: application/views/satellite/index.php:55 msgid "SAT Mode" msgstr "SAT Modus" @@ -10306,7 +10308,7 @@ msgid "Import LoTW Matches" msgstr "Importiere LoTW-Übereinstimmungen" #: application/views/lotw/satupdate.php:7 -#: application/views/satellite/index.php:38 +#: application/views/satellite/index.php:53 msgid "Display Name" msgstr "Anzeigename" @@ -12050,7 +12052,7 @@ msgstr "Anzeige- bzw. Klartextname des Satelliten" #: application/views/satellite/create.php:28 #: application/views/satellite/edit.php:12 -#: application/views/satellite/index.php:37 +#: application/views/satellite/index.php:52 msgid "LoTW Name" msgstr "LoTW Name" @@ -12139,19 +12141,19 @@ msgstr "Satellit speichern" msgid "Add satellite mode" msgstr "Satellitenmodus hinzufügen" -#: application/views/satellite/index.php:29 +#: application/views/satellite/index.php:44 msgid "Add a satellite" msgstr "Satellit hinzufügen" -#: application/views/satellite/index.php:30 +#: application/views/satellite/index.php:45 msgid "Sync Satellites from LoTW" msgstr "Synchronisiere Satelliten aus dem LoTW" -#: application/views/satellite/index.php:31 +#: application/views/satellite/index.php:46 msgid "Update Satellite TLE" msgstr "Satellitenbahnelemente (TLE) aktualisieren" -#: application/views/satellite/index.php:42 +#: application/views/satellite/index.php:57 msgid "TLE" msgstr "TLE" @@ -12241,7 +12243,7 @@ msgstr "min" #: application/views/satellite/satinfo.php:14 msgid "TLE date" -msgstr "" +msgstr "TLE-Datum" #: application/views/satellite/skedtable.php:6 msgid "Grid" @@ -12266,6 +12268,14 @@ msgstr "" "Keine sich überschneidenden Überflüge gefunden. Bitte überprüfe die " "Parameter." +#: application/views/satellite/tleinfo.php:8 +msgid "Delete TLE" +msgstr "TLE löschen" + +#: application/views/satellite/tleinfo.php:11 +msgid "Add TLE" +msgstr "TLE hinzufügen" + #: application/views/sattimers/index.php:15 #, php-format msgid "" diff --git a/application/locale/el_GR/LC_MESSAGES/messages.po b/application/locale/el_GR/LC_MESSAGES/messages.po index 42e0c19de..5aaae78d2 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: 2025-03-31 11:52+0000\n" +"POT-Creation-Date: 2025-04-04 05:15+0000\n" "PO-Revision-Date: 2024-11-19 01:22+0000\n" "Last-Translator: Fabian Berg \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Estonian \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" @@ -103,6 +103,8 @@ msgstr "" #: application/controllers/Satellite.php:132 #: application/controllers/Satellite.php:146 #: application/controllers/Satellite.php:164 +#: application/controllers/Satellite.php:572 +#: application/controllers/Satellite.php:581 #: application/controllers/Sattimers.php:9 #: application/controllers/Search.php:13 #: application/controllers/Simplefle.php:7 @@ -695,7 +697,7 @@ msgid "Email settings not configured." msgstr "Paramètres de messagerie non configurés." #: application/controllers/Club.php:227 application/views/api/index.php:68 -#: application/views/satellite/index.php:79 +#: application/views/satellite/index.php:94 #: application/views/satellite/satinfo.php:51 msgid "Unknown" msgstr "Inconnu" @@ -1228,7 +1230,7 @@ msgstr "QSL" #: application/views/qslprint/qsolist.php:169 #: application/views/qslprint/qsolist.php:184 #: application/views/qso/edit_ajax.php:425 -#: application/views/satellite/index.php:41 +#: application/views/satellite/index.php:56 #: application/views/satellite/satinfo.php:13 #: application/views/search/search_result_ajax.php:298 #: application/views/search/search_result_ajax.php:313 @@ -2133,7 +2135,7 @@ msgstr "Par défaut (cliquez pour libérer)" #: application/views/labels/index.php:47 application/views/labels/index.php:83 #: application/views/logbookadvanced/index.php:619 #: application/views/mode/index.php:64 application/views/satellite/edit.php:56 -#: application/views/satellite/index.php:43 +#: application/views/satellite/index.php:58 #: application/views/search/stored_queries.php:21 #: application/views/stationsetup/stationsetup.php:128 #: application/views/stationsetup/stationsetup.php:165 @@ -2159,7 +2161,7 @@ msgstr "Editer" #: application/views/oqrs/showrequests.php:71 #: application/views/qslcard/index.php:65 #: application/views/satellite/edit.php:57 -#: application/views/satellite/index.php:44 +#: application/views/satellite/index.php:59 #: application/views/search/stored_queries.php:22 #: application/views/stationsetup/stationsetup.php:33 #: application/views/stationsetup/stationsetup.php:137 @@ -3171,7 +3173,7 @@ msgid "unconfirmed" msgstr "non confirmé" #: application/models/Logbook_model.php:4691 -#: application/views/satellite/index.php:67 +#: application/views/satellite/index.php:82 #: application/views/satellite/satinfo.php:41 #: application/views/view_log/qso.php:287 msgid "unknown" @@ -3767,7 +3769,7 @@ msgstr "Satellite" #: application/views/logbookadvanced/index.php:264 #: application/views/satellite/create.php:35 #: application/views/satellite/edit.php:19 -#: application/views/satellite/index.php:39 +#: application/views/satellite/index.php:54 #: application/views/satellite/satinfo.php:12 #: application/views/statistics/antennaanalytics.php:60 #: application/views/statistics/antennaanalytics.php:101 @@ -6502,8 +6504,8 @@ msgstr "" #: application/views/satellite/create.php:75 #: application/views/satellite/edit.php:31 #: application/views/satellite/edit.php:34 -#: application/views/satellite/index.php:73 -#: application/views/satellite/index.php:86 +#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:101 #: application/views/satellite/satinfo.php:45 #: application/views/search/result.php:74 #: application/views/station_profile/create.php:209 @@ -6559,8 +6561,8 @@ msgstr "Oui" #: application/views/satellite/create.php:76 #: application/views/satellite/edit.php:32 #: application/views/satellite/edit.php:35 -#: application/views/satellite/index.php:76 -#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:91 +#: application/views/satellite/index.php:103 #: application/views/satellite/satinfo.php:48 #: application/views/search/result.php:76 #: application/views/station_profile/create.php:210 @@ -9042,7 +9044,7 @@ msgstr "" #: application/views/interface_assets/header.php:296 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 -#: application/views/satellite/index.php:25 +#: application/views/satellite/index.php:40 #: application/views/statistics/index.php:50 #: application/views/statistics/index.php:111 msgid "Satellites" @@ -9509,7 +9511,7 @@ msgstr "" #: application/views/logbookadvanced/edit.php:85 #: application/views/satellite/edit.php:51 -#: application/views/satellite/index.php:40 +#: application/views/satellite/index.php:55 msgid "SAT Mode" msgstr "" @@ -10152,7 +10154,7 @@ msgid "Import LoTW Matches" msgstr "Import LoTW correspondants" #: application/views/lotw/satupdate.php:7 -#: application/views/satellite/index.php:38 +#: application/views/satellite/index.php:53 msgid "Display Name" msgstr "" @@ -11791,7 +11793,7 @@ msgstr "" #: application/views/satellite/create.php:28 #: application/views/satellite/edit.php:12 -#: application/views/satellite/index.php:37 +#: application/views/satellite/index.php:52 msgid "LoTW Name" msgstr "" @@ -11877,19 +11879,19 @@ msgstr "" msgid "Add satellite mode" msgstr "" -#: application/views/satellite/index.php:29 +#: application/views/satellite/index.php:44 msgid "Add a satellite" msgstr "" -#: application/views/satellite/index.php:30 +#: application/views/satellite/index.php:45 msgid "Sync Satellites from LoTW" msgstr "" -#: application/views/satellite/index.php:31 +#: application/views/satellite/index.php:46 msgid "Update Satellite TLE" msgstr "" -#: application/views/satellite/index.php:42 +#: application/views/satellite/index.php:57 msgid "TLE" msgstr "" @@ -12002,6 +12004,14 @@ msgstr "" msgid "No overlapping passes found. Please check the input parameters." msgstr "" +#: application/views/satellite/tleinfo.php:8 +msgid "Delete TLE" +msgstr "" + +#: application/views/satellite/tleinfo.php:11 +msgid "Add TLE" +msgstr "" + #: application/views/sattimers/index.php:15 #, php-format msgid "" diff --git a/application/locale/hr/LC_MESSAGES/messages.po b/application/locale/hr/LC_MESSAGES/messages.po index e495f86c8..e99be8fc4 100644 --- a/application/locale/hr/LC_MESSAGES/messages.po +++ b/application/locale/hr/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-03-31 11:52+0000\n" +"POT-Creation-Date: 2025-04-04 05:15+0000\n" "PO-Revision-Date: 2024-11-23 16:17+0000\n" "Last-Translator: Fabian Berg \n" "Language-Team: Croatian \n" "Language-Team: Hungarian \n" "Language-Team: Italian \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" "Language-Team: Dutch \n" @@ -99,6 +99,8 @@ msgstr "" #: application/controllers/Satellite.php:132 #: application/controllers/Satellite.php:146 #: application/controllers/Satellite.php:164 +#: application/controllers/Satellite.php:572 +#: application/controllers/Satellite.php:581 #: application/controllers/Sattimers.php:9 #: application/controllers/Search.php:13 #: application/controllers/Simplefle.php:7 @@ -689,7 +691,7 @@ msgid "Email settings not configured." msgstr "E-mailinstellingen niet geconfigureerd." #: application/controllers/Club.php:227 application/views/api/index.php:68 -#: application/views/satellite/index.php:79 +#: application/views/satellite/index.php:94 #: application/views/satellite/satinfo.php:51 msgid "Unknown" msgstr "Onbekend" @@ -1219,7 +1221,7 @@ msgstr "QSL" #: application/views/qslprint/qsolist.php:169 #: application/views/qslprint/qsolist.php:184 #: application/views/qso/edit_ajax.php:425 -#: application/views/satellite/index.php:41 +#: application/views/satellite/index.php:56 #: application/views/satellite/satinfo.php:13 #: application/views/search/search_result_ajax.php:298 #: application/views/search/search_result_ajax.php:313 @@ -1855,7 +1857,7 @@ msgstr "Vermeldenswaardige Radiozendamateurs" #: application/controllers/Options.php:152 msgid "Hams-Of-Note URL changed to " -msgstr "" +msgstr "URL van de Vermeldenswaardige Radiozendamateurs-lijst gewijzigd naar " #: application/controllers/Options.php:188 msgid "de continent changed to " @@ -2124,7 +2126,7 @@ msgstr "Standaard (klik om vrij te geven)" #: application/views/labels/index.php:47 application/views/labels/index.php:83 #: application/views/logbookadvanced/index.php:619 #: application/views/mode/index.php:64 application/views/satellite/edit.php:56 -#: application/views/satellite/index.php:43 +#: application/views/satellite/index.php:58 #: application/views/search/stored_queries.php:21 #: application/views/stationsetup/stationsetup.php:128 #: application/views/stationsetup/stationsetup.php:165 @@ -2150,7 +2152,7 @@ msgstr "Bewerken" #: application/views/oqrs/showrequests.php:71 #: application/views/qslcard/index.php:65 #: application/views/satellite/edit.php:57 -#: application/views/satellite/index.php:44 +#: application/views/satellite/index.php:59 #: application/views/search/stored_queries.php:22 #: application/views/stationsetup/stationsetup.php:33 #: application/views/stationsetup/stationsetup.php:137 @@ -3156,7 +3158,7 @@ msgid "unconfirmed" msgstr "onbevestigd" #: application/models/Logbook_model.php:4691 -#: application/views/satellite/index.php:67 +#: application/views/satellite/index.php:82 #: application/views/satellite/satinfo.php:41 #: application/views/view_log/qso.php:287 msgid "unknown" @@ -3752,7 +3754,7 @@ msgstr "Satelliet" #: application/views/logbookadvanced/index.php:264 #: application/views/satellite/create.php:35 #: application/views/satellite/edit.php:19 -#: application/views/satellite/index.php:39 +#: application/views/satellite/index.php:54 #: application/views/satellite/satinfo.php:12 #: application/views/statistics/antennaanalytics.php:60 #: application/views/statistics/antennaanalytics.php:101 @@ -6484,8 +6486,8 @@ msgstr "" #: application/views/satellite/create.php:75 #: application/views/satellite/edit.php:31 #: application/views/satellite/edit.php:34 -#: application/views/satellite/index.php:73 -#: application/views/satellite/index.php:86 +#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:101 #: application/views/satellite/satinfo.php:45 #: application/views/search/result.php:74 #: application/views/station_profile/create.php:209 @@ -6541,8 +6543,8 @@ msgstr "Ja" #: application/views/satellite/create.php:76 #: application/views/satellite/edit.php:32 #: application/views/satellite/edit.php:35 -#: application/views/satellite/index.php:76 -#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:91 +#: application/views/satellite/index.php:103 #: application/views/satellite/satinfo.php:48 #: application/views/search/result.php:76 #: application/views/station_profile/create.php:210 @@ -9149,7 +9151,7 @@ msgstr "Globale opties" #: application/views/interface_assets/header.php:296 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 -#: application/views/satellite/index.php:25 +#: application/views/satellite/index.php:40 #: application/views/statistics/index.php:50 #: application/views/statistics/index.php:111 msgid "Satellites" @@ -9623,7 +9625,7 @@ msgstr "Clublog ontvangen" #: application/views/logbookadvanced/edit.php:85 #: application/views/satellite/edit.php:51 -#: application/views/satellite/index.php:40 +#: application/views/satellite/index.php:55 msgid "SAT Mode" msgstr "SAT-modus" @@ -10269,7 +10271,7 @@ msgid "Import LoTW Matches" msgstr "Importeer LoTW-overeenkomsten" #: application/views/lotw/satupdate.php:7 -#: application/views/satellite/index.php:38 +#: application/views/satellite/index.php:53 msgid "Display Name" msgstr "Weergavenaam" @@ -12008,7 +12010,7 @@ msgstr "Weergavenaam / duidelijke naam van de satelliet" #: application/views/satellite/create.php:28 #: application/views/satellite/edit.php:12 -#: application/views/satellite/index.php:37 +#: application/views/satellite/index.php:52 msgid "LoTW Name" msgstr "LoTW-naam" @@ -12097,19 +12099,19 @@ msgstr "Satelliet opslaan" msgid "Add satellite mode" msgstr "Satellietmodus toevoegen" -#: application/views/satellite/index.php:29 +#: application/views/satellite/index.php:44 msgid "Add a satellite" msgstr "Voeg een satelliet toe" -#: application/views/satellite/index.php:30 +#: application/views/satellite/index.php:45 msgid "Sync Satellites from LoTW" msgstr "Satellieten synchroniseren van LoTW" -#: application/views/satellite/index.php:31 +#: application/views/satellite/index.php:46 msgid "Update Satellite TLE" msgstr "Satelliet TLE bijwerken" -#: application/views/satellite/index.php:42 +#: application/views/satellite/index.php:57 msgid "TLE" msgstr "TLE" @@ -12199,7 +12201,7 @@ msgstr "min" #: application/views/satellite/satinfo.php:14 msgid "TLE date" -msgstr "" +msgstr "TLE datum" #: application/views/satellite/skedtable.php:6 msgid "Grid" @@ -12222,6 +12224,14 @@ msgstr "Sked LOS Tijd" msgid "No overlapping passes found. Please check the input parameters." msgstr "Geen overlappende passages gevonden. Controleer de invoerparameters." +#: application/views/satellite/tleinfo.php:8 +msgid "Delete TLE" +msgstr "" + +#: application/views/satellite/tleinfo.php:11 +msgid "Add TLE" +msgstr "" + #: application/views/sattimers/index.php:15 #, php-format msgid "" diff --git a/application/locale/pl_PL/LC_MESSAGES/messages.po b/application/locale/pl_PL/LC_MESSAGES/messages.po index 917093c55..6fcde34cf 100644 --- a/application/locale/pl_PL/LC_MESSAGES/messages.po +++ b/application/locale/pl_PL/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-03-31 11:52+0000\n" +"POT-Creation-Date: 2025-04-04 05:15+0000\n" "PO-Revision-Date: 2025-01-30 21:18+0000\n" "Last-Translator: Maciej SP2FE \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Russian \n" @@ -100,6 +100,8 @@ msgstr "" #: application/controllers/Satellite.php:132 #: application/controllers/Satellite.php:146 #: application/controllers/Satellite.php:164 +#: application/controllers/Satellite.php:572 +#: application/controllers/Satellite.php:581 #: application/controllers/Sattimers.php:9 #: application/controllers/Search.php:13 #: application/controllers/Simplefle.php:7 @@ -691,7 +693,7 @@ msgid "Email settings not configured." msgstr "Параметры электронной почты не настроены." #: application/controllers/Club.php:227 application/views/api/index.php:68 -#: application/views/satellite/index.php:79 +#: application/views/satellite/index.php:94 #: application/views/satellite/satinfo.php:51 msgid "Unknown" msgstr "Неизвестно" @@ -836,7 +838,7 @@ msgstr "Не работает" #: application/controllers/Csv.php:20 application/views/csv/index.php:3 #: application/views/interface_assets/header.php:443 msgid "SOTA CSV Export" -msgstr "Экспорт SOTA CSV" +msgstr "Экспорт SOTA в CSV" #: application/controllers/Dashboard.php:130 #: application/controllers/Visitor.php:134 @@ -1222,7 +1224,7 @@ msgstr "QSL" #: application/views/qslprint/qsolist.php:169 #: application/views/qslprint/qsolist.php:184 #: application/views/qso/edit_ajax.php:425 -#: application/views/satellite/index.php:41 +#: application/views/satellite/index.php:56 #: application/views/satellite/satinfo.php:13 #: application/views/search/search_result_ajax.php:298 #: application/views/search/search_result_ajax.php:313 @@ -1853,11 +1855,11 @@ msgstr "Настройки сохранены" #: application/controllers/Options.php:137 #: application/views/options/sidebar.php:12 msgid "Hams Of Note" -msgstr "" +msgstr "Заметки о корреспондентах" #: application/controllers/Options.php:152 msgid "Hams-Of-Note URL changed to " -msgstr "" +msgstr "URL \"Заметок о корреспондентах\" изменен на " #: application/controllers/Options.php:188 msgid "de continent changed to " @@ -2127,7 +2129,7 @@ msgstr "По умолчанию (нажмите, чтобы освободить #: application/views/labels/index.php:47 application/views/labels/index.php:83 #: application/views/logbookadvanced/index.php:619 #: application/views/mode/index.php:64 application/views/satellite/edit.php:56 -#: application/views/satellite/index.php:43 +#: application/views/satellite/index.php:58 #: application/views/search/stored_queries.php:21 #: application/views/stationsetup/stationsetup.php:128 #: application/views/stationsetup/stationsetup.php:165 @@ -2153,7 +2155,7 @@ msgstr "Редактировать" #: application/views/oqrs/showrequests.php:71 #: application/views/qslcard/index.php:65 #: application/views/satellite/edit.php:57 -#: application/views/satellite/index.php:44 +#: application/views/satellite/index.php:59 #: application/views/search/stored_queries.php:22 #: application/views/stationsetup/stationsetup.php:33 #: application/views/stationsetup/stationsetup.php:137 @@ -2602,7 +2604,7 @@ msgstr "Обновление спутников для LoTW" #: application/controllers/Update.php:498 msgid "Update of Hams of Note" -msgstr "" +msgstr "Обновить \"Заметки о корреспондентах\"" #: application/controllers/User.php:50 #: application/views/interface_assets/header.php:288 @@ -3157,7 +3159,7 @@ msgid "unconfirmed" msgstr "не подтверждено" #: application/models/Logbook_model.php:4691 -#: application/views/satellite/index.php:67 +#: application/views/satellite/index.php:82 #: application/views/satellite/satinfo.php:41 #: application/views/view_log/qso.php:287 msgid "unknown" @@ -3754,7 +3756,7 @@ msgstr "Спутник" #: application/views/logbookadvanced/index.php:264 #: application/views/satellite/create.php:35 #: application/views/satellite/edit.php:19 -#: application/views/satellite/index.php:39 +#: application/views/satellite/index.php:54 #: application/views/satellite/satinfo.php:12 #: application/views/statistics/antennaanalytics.php:60 #: application/views/statistics/antennaanalytics.php:101 @@ -5641,7 +5643,7 @@ msgid "" "there are several categories based on the number of parks, geographic areas, " "and more." msgstr "" -"POTA работает так же, как и SOTA, с Активаторами и Охотниками. Есть " +"POTA устроено так же, как и SOTA, с Активаторами и Охотниками. Есть " "несколько категорий дипломов, основанных на количестве парков, " "географических районах и т. д." @@ -6488,8 +6490,8 @@ msgstr "" #: application/views/satellite/create.php:75 #: application/views/satellite/edit.php:31 #: application/views/satellite/edit.php:34 -#: application/views/satellite/index.php:73 -#: application/views/satellite/index.php:86 +#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:101 #: application/views/satellite/satinfo.php:45 #: application/views/search/result.php:74 #: application/views/station_profile/create.php:209 @@ -6545,8 +6547,8 @@ msgstr "Да" #: application/views/satellite/create.php:76 #: application/views/satellite/edit.php:32 #: application/views/satellite/edit.php:35 -#: application/views/satellite/index.php:76 -#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:91 +#: application/views/satellite/index.php:103 #: application/views/satellite/satinfo.php:48 #: application/views/search/result.php:76 #: application/views/station_profile/create.php:210 @@ -7452,7 +7454,7 @@ msgstr "Экспорт вашего журнала для загрузки в SO #: application/views/csv/index.php:11 msgid "Only QSOs with SOTA information will be exported!" -msgstr "Только QSO с информацией SOTA будут экспортированы!" +msgstr "Будут экспортированы только QSO с информацией SOTA!" #: application/views/csv/index.php:92 application/views/dxatlas/index.php:92 #: application/views/eqsl/download.php:43 @@ -8110,7 +8112,7 @@ msgstr "Обновление TLE" #: application/views/debug/index.php:563 msgid "Hams Of Note update" -msgstr "" +msgstr "Обновление \"Заметок о корреспондентах\"" #: application/views/debug/index.php:572 msgid "QSO-DB Maintenance" @@ -9165,7 +9167,7 @@ msgstr "Общие настройки" #: application/views/interface_assets/header.php:296 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 -#: application/views/satellite/index.php:25 +#: application/views/satellite/index.php:40 #: application/views/statistics/index.php:50 #: application/views/statistics/index.php:111 msgid "Satellites" @@ -9289,6 +9291,8 @@ msgstr "Выберите профиль QTH" #: application/views/interface_assets/header.php:552 msgid "You miss station-locations here? Go to stationsetup and fav them" msgstr "" +"Не видите нужных профилей QTH? Перейдите в \"Настройки станции\" и добавьте " +"их в избранное" #: application/views/interface_assets/header.php:589 msgid "Extras" @@ -9637,7 +9641,7 @@ msgstr "Получено из Clublog" #: application/views/logbookadvanced/edit.php:85 #: application/views/satellite/edit.php:51 -#: application/views/satellite/index.php:40 +#: application/views/satellite/index.php:55 msgid "SAT Mode" msgstr "Спутниковый режим" @@ -10283,7 +10287,7 @@ msgid "Import LoTW Matches" msgstr "Импортировать совпадения с LoTW" #: application/views/lotw/satupdate.php:7 -#: application/views/satellite/index.php:38 +#: application/views/satellite/index.php:53 msgid "Display Name" msgstr "Отображаемое название" @@ -10750,7 +10754,7 @@ msgstr "Емэйл будет отпрален на адрес, указанны #: application/views/options/hon.php:38 msgid "Provider for Hams Of Note" -msgstr "" +msgstr "Провайдер \"Заметок о корреспондентах\"" #: application/views/options/hon.php:39 #, php-format @@ -10758,15 +10762,17 @@ msgid "" "The URL which provides the Hams Of Note List. See example and how it works " "here %s" msgstr "" +"URL, которая предоставляет список \"Заметок о корреспондентах\". Пример и " +"как это работает, смотри здесь %s" #: application/views/options/hon.php:39 msgid "Wiki" -msgstr "" +msgstr "Вики" #: application/views/options/hon.php:41 #, php-format msgid "URL of the Hams Of Note List. e.g. %s" -msgstr "" +msgstr "URL списка \"Заметок о корреспондентах\", например, %s" #: application/views/options/index.php:13 msgid "" @@ -11388,75 +11394,75 @@ msgstr "" #: application/views/qso/award_tabs.php:2 msgid "Showing summary for DXCC" -msgstr "" +msgstr "Показ сводки по DXCC" #: application/views/qso/award_tabs.php:3 msgid "Showing summary for US State" -msgstr "" +msgstr "Показ сводки по штатам США" #: application/views/qso/award_tabs.php:4 msgid "Showing summary for CQ zone" -msgstr "" +msgstr "Показ сводки по зонам CQ" #: application/views/qso/award_tabs.php:5 msgid "Showing summary for WWFF" -msgstr "" +msgstr "Показ сводки по WWFF" #: application/views/qso/award_tabs.php:6 msgid "Showing summary for POTA" -msgstr "" +msgstr "Показ сводки по POTA" #: application/views/qso/award_tabs.php:7 msgid "Showing summary for SOTA" -msgstr "" +msgstr "Показ сводки по SOTA" #: application/views/qso/award_tabs.php:8 msgid "Showing summary for IOTA" -msgstr "" +msgstr "Показ сводки по IOTA" #: application/views/qso/award_tabs.php:9 msgid "Showing summary for continent" -msgstr "" +msgstr "Показ сводки по континентам" #: application/views/qso/award_tabs.php:10 msgid "Showing summary for gridsquare" -msgstr "" +msgstr "Показ сводки для квадратам" #: application/views/qso/award_tabs.php:11 msgid "State input needs to be filled to show a summary!" -msgstr "" +msgstr "Для показа сводки нужно заполнить штат!" #: application/views/qso/award_tabs.php:12 msgid "SOTA input needs to be filled to show a summary!" -msgstr "" +msgstr "Для показа сводки нужно заполнить SOTA!" #: application/views/qso/award_tabs.php:13 msgid "POTA input needs to be filled to show a summary!" -msgstr "" +msgstr "Для показа сводки нужно заполнить POTA!" #: application/views/qso/award_tabs.php:14 msgid "IOTA input needs to be filled to show a summary!" -msgstr "" +msgstr "Для показа сводки нужно заполнить IOTA!" #: application/views/qso/award_tabs.php:15 msgid "WWFF input needs to be filled to show a summary!" -msgstr "" +msgstr "Для показа сводки нужно заполнить WWFF!" #: application/views/qso/award_tabs.php:16 msgid "Gridsquare input needs to be filled to show a summary!" -msgstr "" +msgstr "Для показа сводки нужно заполнить квадрат!" #: application/views/qso/award_tabs.php:17 msgid "Summary only shows for the first POTA entered." -msgstr "" +msgstr "Сводка отображается только для первого введенного POTA." #: application/views/qso/award_tabs.php:18 msgid "Summary only shows for the first gridsquare entered." -msgstr "" +msgstr "Сводка отображается только для первого введенного квадрата." #: application/views/qso/award_tabs.php:19 msgid "Summary only shows for US states." -msgstr "" +msgstr "Сводка отображается только для штатов США." #: application/views/qso/components/share_modal.php:3 msgid "Post on X" @@ -12014,7 +12020,7 @@ msgstr "Отображаемое / открытое название спутн #: application/views/satellite/create.php:28 #: application/views/satellite/edit.php:12 -#: application/views/satellite/index.php:37 +#: application/views/satellite/index.php:52 msgid "LoTW Name" msgstr "Название для LoTW" @@ -12102,19 +12108,19 @@ msgstr "Сохранить спутник" msgid "Add satellite mode" msgstr "Добавить вид модуляции (для спутника)" -#: application/views/satellite/index.php:29 +#: application/views/satellite/index.php:44 msgid "Add a satellite" msgstr "Добавить спутник" -#: application/views/satellite/index.php:30 +#: application/views/satellite/index.php:45 msgid "Sync Satellites from LoTW" msgstr "Синхронизировать спутники с LoTW" -#: application/views/satellite/index.php:31 +#: application/views/satellite/index.php:46 msgid "Update Satellite TLE" msgstr "Обновить TLE" -#: application/views/satellite/index.php:42 +#: application/views/satellite/index.php:57 msgid "TLE" msgstr "TLE" @@ -12204,7 +12210,7 @@ msgstr "мин" #: application/views/satellite/satinfo.php:14 msgid "TLE date" -msgstr "" +msgstr "Дата TLE" #: application/views/satellite/skedtable.php:6 msgid "Grid" @@ -12228,6 +12234,14 @@ msgid "No overlapping passes found. Please check the input parameters." msgstr "" "Перекрывающихся орбит не найдено. Пожалуйста, проверьте исходные параметры." +#: application/views/satellite/tleinfo.php:8 +msgid "Delete TLE" +msgstr "" + +#: application/views/satellite/tleinfo.php:11 +msgid "Add TLE" +msgstr "" + #: application/views/sattimers/index.php:15 #, php-format msgid "" @@ -12611,7 +12625,7 @@ msgstr "Референции" #: application/views/simplefle/index.php:174 #, php-format msgid "The Refs can be either %sS%sOTA, %sI%sOTA, %sP%sOTA, or %sW%sWFF" -msgstr "Рефы могут быть либо %sS%sOTA, %sI%sOTA, %sP%sOTA, либо %sW%sWFF" +msgstr "Референции могут быть %sS%sOTA, %sI%sOTA, %sP%sOTA, либо %sW%sWFF" #: application/views/simplefle/index.php:181 msgid "Reload QSO List" @@ -13837,7 +13851,7 @@ msgstr "Если включено, квадрат будет определён #: application/views/user/edit.php:407 msgid "SOTA auto lookup gridsquare and name for summit." -msgstr "Автозаполнение квадрата и названия саммита SOTA." +msgstr "Автозаполнение квадрата и названия SOTA." #: application/views/user/edit.php:413 application/views/user/edit.php:423 #: application/views/user/edit.php:433 diff --git a/application/locale/sl/LC_MESSAGES/messages.po b/application/locale/sl/LC_MESSAGES/messages.po index 6ea6d76a4..5864b237c 100644 --- a/application/locale/sl/LC_MESSAGES/messages.po +++ b/application/locale/sl/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-03-31 11:52+0000\n" +"POT-Creation-Date: 2025-04-04 05:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -95,6 +95,8 @@ msgstr "" #: application/controllers/Satellite.php:132 #: application/controllers/Satellite.php:146 #: application/controllers/Satellite.php:164 +#: application/controllers/Satellite.php:572 +#: application/controllers/Satellite.php:581 #: application/controllers/Sattimers.php:9 #: application/controllers/Search.php:13 #: application/controllers/Simplefle.php:7 @@ -681,7 +683,7 @@ msgid "Email settings not configured." msgstr "" #: application/controllers/Club.php:227 application/views/api/index.php:68 -#: application/views/satellite/index.php:79 +#: application/views/satellite/index.php:94 #: application/views/satellite/satinfo.php:51 msgid "Unknown" msgstr "" @@ -1197,7 +1199,7 @@ msgstr "" #: application/views/qslprint/qsolist.php:169 #: application/views/qslprint/qsolist.php:184 #: application/views/qso/edit_ajax.php:425 -#: application/views/satellite/index.php:41 +#: application/views/satellite/index.php:56 #: application/views/satellite/satinfo.php:13 #: application/views/search/search_result_ajax.php:298 #: application/views/search/search_result_ajax.php:313 @@ -2093,7 +2095,7 @@ msgstr "" #: application/views/labels/index.php:47 application/views/labels/index.php:83 #: application/views/logbookadvanced/index.php:619 #: application/views/mode/index.php:64 application/views/satellite/edit.php:56 -#: application/views/satellite/index.php:43 +#: application/views/satellite/index.php:58 #: application/views/search/stored_queries.php:21 #: application/views/stationsetup/stationsetup.php:128 #: application/views/stationsetup/stationsetup.php:165 @@ -2119,7 +2121,7 @@ msgstr "" #: application/views/oqrs/showrequests.php:71 #: application/views/qslcard/index.php:65 #: application/views/satellite/edit.php:57 -#: application/views/satellite/index.php:44 +#: application/views/satellite/index.php:59 #: application/views/search/stored_queries.php:22 #: application/views/stationsetup/stationsetup.php:33 #: application/views/stationsetup/stationsetup.php:137 @@ -3082,7 +3084,7 @@ msgid "unconfirmed" msgstr "" #: application/models/Logbook_model.php:4691 -#: application/views/satellite/index.php:67 +#: application/views/satellite/index.php:82 #: application/views/satellite/satinfo.php:41 #: application/views/view_log/qso.php:287 msgid "unknown" @@ -3680,7 +3682,7 @@ msgstr "" #: application/views/logbookadvanced/index.php:264 #: application/views/satellite/create.php:35 #: application/views/satellite/edit.php:19 -#: application/views/satellite/index.php:39 +#: application/views/satellite/index.php:54 #: application/views/satellite/satinfo.php:12 #: application/views/statistics/antennaanalytics.php:60 #: application/views/statistics/antennaanalytics.php:101 @@ -6165,8 +6167,8 @@ msgstr "" #: application/views/satellite/create.php:75 #: application/views/satellite/edit.php:31 #: application/views/satellite/edit.php:34 -#: application/views/satellite/index.php:73 -#: application/views/satellite/index.php:86 +#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:101 #: application/views/satellite/satinfo.php:45 #: application/views/search/result.php:74 #: application/views/station_profile/create.php:209 @@ -6222,8 +6224,8 @@ msgstr "" #: application/views/satellite/create.php:76 #: application/views/satellite/edit.php:32 #: application/views/satellite/edit.php:35 -#: application/views/satellite/index.php:76 -#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:91 +#: application/views/satellite/index.php:103 #: application/views/satellite/satinfo.php:48 #: application/views/search/result.php:76 #: application/views/station_profile/create.php:210 @@ -8680,7 +8682,7 @@ msgstr "" #: application/views/interface_assets/header.php:296 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 -#: application/views/satellite/index.php:25 +#: application/views/satellite/index.php:40 #: application/views/statistics/index.php:50 #: application/views/statistics/index.php:111 msgid "Satellites" @@ -9145,7 +9147,7 @@ msgstr "" #: application/views/logbookadvanced/edit.php:85 #: application/views/satellite/edit.php:51 -#: application/views/satellite/index.php:40 +#: application/views/satellite/index.php:55 msgid "SAT Mode" msgstr "" @@ -9781,7 +9783,7 @@ msgid "Import LoTW Matches" msgstr "" #: application/views/lotw/satupdate.php:7 -#: application/views/satellite/index.php:38 +#: application/views/satellite/index.php:53 msgid "Display Name" msgstr "" @@ -11416,7 +11418,7 @@ msgstr "" #: application/views/satellite/create.php:28 #: application/views/satellite/edit.php:12 -#: application/views/satellite/index.php:37 +#: application/views/satellite/index.php:52 msgid "LoTW Name" msgstr "" @@ -11502,19 +11504,19 @@ msgstr "" msgid "Add satellite mode" msgstr "" -#: application/views/satellite/index.php:29 +#: application/views/satellite/index.php:44 msgid "Add a satellite" msgstr "" -#: application/views/satellite/index.php:30 +#: application/views/satellite/index.php:45 msgid "Sync Satellites from LoTW" msgstr "" -#: application/views/satellite/index.php:31 +#: application/views/satellite/index.php:46 msgid "Update Satellite TLE" msgstr "" -#: application/views/satellite/index.php:42 +#: application/views/satellite/index.php:57 msgid "TLE" msgstr "" @@ -11627,6 +11629,14 @@ msgstr "" msgid "No overlapping passes found. Please check the input parameters." msgstr "" +#: application/views/satellite/tleinfo.php:8 +msgid "Delete TLE" +msgstr "" + +#: application/views/satellite/tleinfo.php:11 +msgid "Add TLE" +msgstr "" + #: application/views/sattimers/index.php:15 #, php-format msgid "" diff --git a/application/locale/sq/LC_MESSAGES/messages.po b/application/locale/sq/LC_MESSAGES/messages.po index 38b89054c..3553ce2c3 100644 --- a/application/locale/sq/LC_MESSAGES/messages.po +++ b/application/locale/sq/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-03-31 11:52+0000\n" +"POT-Creation-Date: 2025-04-04 05:15+0000\n" "PO-Revision-Date: 2024-08-17 10:49+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" -"Language-Team: Chinese (Simplified Han script) \n" +"Language-Team: Chinese (Simplified Han script) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,6 +104,8 @@ msgstr "" #: application/controllers/Satellite.php:132 #: application/controllers/Satellite.php:146 #: application/controllers/Satellite.php:164 +#: application/controllers/Satellite.php:572 +#: application/controllers/Satellite.php:581 #: application/controllers/Sattimers.php:9 #: application/controllers/Search.php:13 #: application/controllers/Simplefle.php:7 @@ -691,7 +693,7 @@ msgid "Email settings not configured." msgstr "电子邮箱没有设置。" #: application/controllers/Club.php:227 application/views/api/index.php:68 -#: application/views/satellite/index.php:79 +#: application/views/satellite/index.php:94 #: application/views/satellite/satinfo.php:51 msgid "Unknown" msgstr "未知" @@ -1212,7 +1214,7 @@ msgstr "QSL" #: application/views/qslprint/qsolist.php:169 #: application/views/qslprint/qsolist.php:184 #: application/views/qso/edit_ajax.php:425 -#: application/views/satellite/index.php:41 +#: application/views/satellite/index.php:56 #: application/views/satellite/satinfo.php:13 #: application/views/search/search_result_ajax.php:298 #: application/views/search/search_result_ajax.php:313 @@ -2107,7 +2109,7 @@ msgstr "默认（点击释放）" #: application/views/labels/index.php:47 application/views/labels/index.php:83 #: application/views/logbookadvanced/index.php:619 #: application/views/mode/index.php:64 application/views/satellite/edit.php:56 -#: application/views/satellite/index.php:43 +#: application/views/satellite/index.php:58 #: application/views/search/stored_queries.php:21 #: application/views/stationsetup/stationsetup.php:128 #: application/views/stationsetup/stationsetup.php:165 @@ -2133,7 +2135,7 @@ msgstr "编辑" #: application/views/oqrs/showrequests.php:71 #: application/views/qslcard/index.php:65 #: application/views/satellite/edit.php:57 -#: application/views/satellite/index.php:44 +#: application/views/satellite/index.php:59 #: application/views/search/stored_queries.php:22 #: application/views/stationsetup/stationsetup.php:33 #: application/views/stationsetup/stationsetup.php:137 @@ -3100,7 +3102,7 @@ msgid "unconfirmed" msgstr "未确认" #: application/models/Logbook_model.php:4691 -#: application/views/satellite/index.php:67 +#: application/views/satellite/index.php:82 #: application/views/satellite/satinfo.php:41 #: application/views/view_log/qso.php:287 msgid "unknown" @@ -3695,7 +3697,7 @@ msgstr "卫星" #: application/views/logbookadvanced/index.php:264 #: application/views/satellite/create.php:35 #: application/views/satellite/edit.php:19 -#: application/views/satellite/index.php:39 +#: application/views/satellite/index.php:54 #: application/views/satellite/satinfo.php:12 #: application/views/statistics/antennaanalytics.php:60 #: application/views/statistics/antennaanalytics.php:101 @@ -6295,8 +6297,8 @@ msgstr "" #: application/views/satellite/create.php:75 #: application/views/satellite/edit.php:31 #: application/views/satellite/edit.php:34 -#: application/views/satellite/index.php:73 -#: application/views/satellite/index.php:86 +#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:101 #: application/views/satellite/satinfo.php:45 #: application/views/search/result.php:74 #: application/views/station_profile/create.php:209 @@ -6352,8 +6354,8 @@ msgstr "是" #: application/views/satellite/create.php:76 #: application/views/satellite/edit.php:32 #: application/views/satellite/edit.php:35 -#: application/views/satellite/index.php:76 -#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:91 +#: application/views/satellite/index.php:103 #: application/views/satellite/satinfo.php:48 #: application/views/search/result.php:76 #: application/views/station_profile/create.php:210 @@ -8867,7 +8869,7 @@ msgstr "全局选项" #: application/views/interface_assets/header.php:296 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 -#: application/views/satellite/index.php:25 +#: application/views/satellite/index.php:40 #: application/views/statistics/index.php:50 #: application/views/statistics/index.php:111 msgid "Satellites" @@ -9332,7 +9334,7 @@ msgstr "Clublog 已收到" #: application/views/logbookadvanced/edit.php:85 #: application/views/satellite/edit.php:51 -#: application/views/satellite/index.php:40 +#: application/views/satellite/index.php:55 msgid "SAT Mode" msgstr "卫星模式" @@ -9970,7 +9972,7 @@ msgid "Import LoTW Matches" msgstr "导入 LoTW 匹配" #: application/views/lotw/satupdate.php:7 -#: application/views/satellite/index.php:38 +#: application/views/satellite/index.php:53 msgid "Display Name" msgstr "显示名称" @@ -11619,7 +11621,7 @@ msgstr "显示/明文卫星名称" #: application/views/satellite/create.php:28 #: application/views/satellite/edit.php:12 -#: application/views/satellite/index.php:37 +#: application/views/satellite/index.php:52 msgid "LoTW Name" msgstr "LoTW 名称" @@ -11706,19 +11708,19 @@ msgstr "保存卫星" msgid "Add satellite mode" msgstr "添加卫星模式" -#: application/views/satellite/index.php:29 +#: application/views/satellite/index.php:44 msgid "Add a satellite" msgstr "添加卫星" -#: application/views/satellite/index.php:30 +#: application/views/satellite/index.php:45 msgid "Sync Satellites from LoTW" msgstr "从 LoTW 同步卫星" -#: application/views/satellite/index.php:31 +#: application/views/satellite/index.php:46 msgid "Update Satellite TLE" msgstr "更新星历" -#: application/views/satellite/index.php:42 +#: application/views/satellite/index.php:57 msgid "TLE" msgstr "TLE" @@ -11831,6 +11833,14 @@ msgstr "预计信号消失时间" msgid "No overlapping passes found. Please check the input parameters." msgstr "未发现重叠传输。请检查输入参数。" +#: application/views/satellite/tleinfo.php:8 +msgid "Delete TLE" +msgstr "" + +#: application/views/satellite/tleinfo.php:11 +msgid "Add TLE" +msgstr "" + #: application/views/sattimers/index.php:15 #, php-format msgid "" diff --git a/application/models/Cat.php b/application/models/Cat.php index 212e04dbe..5ad805dec 100644 --- a/application/models/Cat.php +++ b/application/models/Cat.php @@ -24,10 +24,16 @@ // Let's keep uplink_freq, downlink_freq, uplink_mode and downlink_mode for backward compatibility $data = array( 'prop_mode' => $prop_mode, - 'power' => $result['power'] ?? NULL, 'sat_name' => $result['sat_name'] ?? NULL, 'timestamp' => $timestamp, ); + + if ( (isset($result['power'])) && ($result['power'] != "NULL") && ($result['power'] != '') && (is_numeric($result['power']))) { + $data['power'] = $result['power']; + } else { + unset($data['power']); // Do not update power since it isn't provided or not numeric + } + if ( (isset($result['frequency'])) && ($result['frequency'] != "NULL") && ($result['frequency'] != '') && (is_numeric($result['frequency']))) { $data['frequency'] = $result['frequency']; } else { @@ -37,6 +43,7 @@ unset($data['frequency']); // Do not update Frequency since it wasn't provided } } + if (isset($result['mode']) && $result['mode'] != "NULL") { $data['mode'] = $result['mode']; } else { diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 92ea11a41..cba2d9c1c 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -4207,7 +4207,7 @@ class Logbook_model extends CI_Model { qslrdate, qslsdate */ - if (isset($record['qslrdate'])) { + if (($record['qslrdate'] ?? '') != '') { if (validateADIFDate($record['qslrdate']) == true) { $input_qslrdate = $record['qslrdate']; } else { @@ -4218,7 +4218,7 @@ class Logbook_model extends CI_Model { $input_qslrdate = NULL; } - if (isset($record['qslsdate'])) { + if (($record['qslsdate'] ?? '') != '') { if (validateADIFDate($record['qslsdate']) == true) { $input_qslsdate = $record['qslsdate']; } else { @@ -4279,7 +4279,7 @@ class Logbook_model extends CI_Model { if ($markClublog != NULL) { $input_clublog_qslsdate = $date = date("Y-m-d H:i:s", strtotime("now")); - } elseif (isset($record['clublog_qso_upload_date'])) { + } elseif (($record['clublog_qso_upload_date'] ?? '') != '') { if (validateADIFDate($record['clublog_qso_upload_date']) == true) { $input_clublog_qslsdate = $record['clublog_qso_upload_date']; } else { @@ -4299,7 +4299,7 @@ class Logbook_model extends CI_Model { $input_lotw_qsl_rcvd = NULL; } - if (isset($record['lotw_qslrdate'])) { + if (($record['lotw_qslrdate'] ?? '') != '') { if (validateADIFDate($record['lotw_qslrdate']) == true) { $input_lotw_qslrdate = $record['lotw_qslrdate']; } else { @@ -4320,7 +4320,7 @@ class Logbook_model extends CI_Model { if ($markLotw != NULL) { $input_lotw_qslsdate = $date = date("Y-m-d H:i:s", strtotime("now")); - } elseif (isset($record['lotw_qslsdate'])) { + } elseif (($record['lotw_qslsdate'] ?? '') != '') { if (validateADIFDate($record['lotw_qslsdate']) == true) { $input_lotw_qslsdate = $record['lotw_qslsdate']; } else { diff --git a/application/models/Satellite_model.php b/application/models/Satellite_model.php index 1adb85a86..899ce0ad7 100644 --- a/application/models/Satellite_model.php +++ b/application/models/Satellite_model.php @@ -62,6 +62,33 @@ class Satellite_model extends CI_Model { $this->db->delete('satellite', array('id' => $clean_id)); } + + function deleteTle($id) { + // Delete TLE + $this->db->delete('tle', array('satelliteid' => $id)); + } + + function saveTle($id, $tle) { + $tlelines = explode("\n", trim($tle)); // Trim to remove extra spaces or newlines + $lineCount = count($tlelines); + + if ($lineCount === 3) { + $tleline1 = trim($tlelines[1]); // First data line + $tleline2 = trim($tlelines[2]); // Second data line + } else { + $tleline1 = trim($tlelines[0]); + $tleline2 = trim($tlelines[1]); + } + + $data = array( + 'satelliteid' => $id, + 'tle' => $tleline1 . "\n" . $tleline2, + ); + $this->db->insert('tle', $data); + $insert_id = $this->db->insert_id(); + return $insert_id; + } + function deleteSatMode($id) { // Clean ID $clean_id = $this->security->xss_clean($id); @@ -162,7 +189,7 @@ class Satellite_model extends CI_Model { } function get_tle($sat) { - $this->db->select('satellite.name AS satellite, tle.tle'); + $this->db->select('satellite.name AS satellite, tle.tle, tle.updated'); $this->db->join('tle', 'satellite.id = tle.satelliteid'); $this->db->where('name', $sat); $query = $this->db->get('satellite'); diff --git a/application/views/satellite/index.php b/application/views/satellite/index.php index 107a75211..f55b9159c 100644 --- a/application/views/satellite/index.php +++ b/application/views/satellite/index.php @@ -1,3 +1,18 @@ +

@@ -83,9 +98,9 @@ ?> '; if ($sat->updated != null) { - echo 'updated)) . '">'.__("Yes").''; + echo ''; } else { - echo ''.__("No").''; + echo ''; } echo ''; diff --git a/application/views/satellite/tleinfo.php b/application/views/satellite/tleinfo.php new file mode 100644 index 000000000..2140672cb --- /dev/null +++ b/application/views/satellite/tleinfo.php @@ -0,0 +1,13 @@ + + +
+name . ' (last updated: ' . date($custom_date_format . " H:i", strtotime($tleinfo->updated)) . ')' ; + echo '

' . $tleinfo->tle . '
'; + echo ''; + } else { + echo 'No TLE information found for ' . $satinfo[0]->name; + echo '

'; + } ?> +
diff --git a/assets/js/sections/satellite.js b/assets/js/sections/satellite.js index 35c131026..7dc054318 100644 --- a/assets/js/sections/satellite.js +++ b/assets/js/sections/satellite.js @@ -30,6 +30,153 @@ $(document).ready(function () { return $("' + + '
' + + '
' + ); +} function createSatelliteDialog() { $.ajax({ diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot index 175781ed1..28343f088 100644 --- a/assets/lang_src/messages.pot +++ b/assets/lang_src/messages.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-03-31 11:52+0000\n" +"POT-Creation-Date: 2025-04-04 05:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -94,6 +94,8 @@ msgstr "" #: application/controllers/Satellite.php:132 #: application/controllers/Satellite.php:146 #: application/controllers/Satellite.php:164 +#: application/controllers/Satellite.php:572 +#: application/controllers/Satellite.php:581 #: application/controllers/Sattimers.php:9 #: application/controllers/Search.php:13 #: application/controllers/Simplefle.php:7 @@ -680,7 +682,7 @@ msgid "Email settings not configured." msgstr "" #: application/controllers/Club.php:227 application/views/api/index.php:68 -#: application/views/satellite/index.php:79 +#: application/views/satellite/index.php:94 #: application/views/satellite/satinfo.php:51 msgid "Unknown" msgstr "" @@ -1196,7 +1198,7 @@ msgstr "" #: application/views/qslprint/qsolist.php:169 #: application/views/qslprint/qsolist.php:184 #: application/views/qso/edit_ajax.php:425 -#: application/views/satellite/index.php:41 +#: application/views/satellite/index.php:56 #: application/views/satellite/satinfo.php:13 #: application/views/search/search_result_ajax.php:298 #: application/views/search/search_result_ajax.php:313 @@ -2092,7 +2094,7 @@ msgstr "" #: application/views/labels/index.php:47 application/views/labels/index.php:83 #: application/views/logbookadvanced/index.php:619 #: application/views/mode/index.php:64 application/views/satellite/edit.php:56 -#: application/views/satellite/index.php:43 +#: application/views/satellite/index.php:58 #: application/views/search/stored_queries.php:21 #: application/views/stationsetup/stationsetup.php:128 #: application/views/stationsetup/stationsetup.php:165 @@ -2118,7 +2120,7 @@ msgstr "" #: application/views/oqrs/showrequests.php:71 #: application/views/qslcard/index.php:65 #: application/views/satellite/edit.php:57 -#: application/views/satellite/index.php:44 +#: application/views/satellite/index.php:59 #: application/views/search/stored_queries.php:22 #: application/views/stationsetup/stationsetup.php:33 #: application/views/stationsetup/stationsetup.php:137 @@ -3081,7 +3083,7 @@ msgid "unconfirmed" msgstr "" #: application/models/Logbook_model.php:4691 -#: application/views/satellite/index.php:67 +#: application/views/satellite/index.php:82 #: application/views/satellite/satinfo.php:41 #: application/views/view_log/qso.php:287 msgid "unknown" @@ -3677,7 +3679,7 @@ msgstr "" #: application/views/logbookadvanced/index.php:264 #: application/views/satellite/create.php:35 #: application/views/satellite/edit.php:19 -#: application/views/satellite/index.php:39 +#: application/views/satellite/index.php:54 #: application/views/satellite/satinfo.php:12 #: application/views/statistics/antennaanalytics.php:60 #: application/views/statistics/antennaanalytics.php:101 @@ -6162,8 +6164,8 @@ msgstr "" #: application/views/satellite/create.php:75 #: application/views/satellite/edit.php:31 #: application/views/satellite/edit.php:34 -#: application/views/satellite/index.php:73 -#: application/views/satellite/index.php:86 +#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:101 #: application/views/satellite/satinfo.php:45 #: application/views/search/result.php:74 #: application/views/station_profile/create.php:209 @@ -6219,8 +6221,8 @@ msgstr "" #: application/views/satellite/create.php:76 #: application/views/satellite/edit.php:32 #: application/views/satellite/edit.php:35 -#: application/views/satellite/index.php:76 -#: application/views/satellite/index.php:88 +#: application/views/satellite/index.php:91 +#: application/views/satellite/index.php:103 #: application/views/satellite/satinfo.php:48 #: application/views/search/result.php:76 #: application/views/station_profile/create.php:210 @@ -8675,7 +8677,7 @@ msgstr "" #: application/views/interface_assets/header.php:296 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 -#: application/views/satellite/index.php:25 +#: application/views/satellite/index.php:40 #: application/views/statistics/index.php:50 #: application/views/statistics/index.php:111 msgid "Satellites" @@ -9140,7 +9142,7 @@ msgstr "" #: application/views/logbookadvanced/edit.php:85 #: application/views/satellite/edit.php:51 -#: application/views/satellite/index.php:40 +#: application/views/satellite/index.php:55 msgid "SAT Mode" msgstr "" @@ -9776,7 +9778,7 @@ msgid "Import LoTW Matches" msgstr "" #: application/views/lotw/satupdate.php:7 -#: application/views/satellite/index.php:38 +#: application/views/satellite/index.php:53 msgid "Display Name" msgstr "" @@ -11411,7 +11413,7 @@ msgstr "" #: application/views/satellite/create.php:28 #: application/views/satellite/edit.php:12 -#: application/views/satellite/index.php:37 +#: application/views/satellite/index.php:52 msgid "LoTW Name" msgstr "" @@ -11497,19 +11499,19 @@ msgstr "" msgid "Add satellite mode" msgstr "" -#: application/views/satellite/index.php:29 +#: application/views/satellite/index.php:44 msgid "Add a satellite" msgstr "" -#: application/views/satellite/index.php:30 +#: application/views/satellite/index.php:45 msgid "Sync Satellites from LoTW" msgstr "" -#: application/views/satellite/index.php:31 +#: application/views/satellite/index.php:46 msgid "Update Satellite TLE" msgstr "" -#: application/views/satellite/index.php:42 +#: application/views/satellite/index.php:57 msgid "TLE" msgstr "" @@ -11622,6 +11624,14 @@ msgstr "" msgid "No overlapping passes found. Please check the input parameters." msgstr "" +#: application/views/satellite/tleinfo.php:8 +msgid "Delete TLE" +msgstr "" + +#: application/views/satellite/tleinfo.php:11 +msgid "Add TLE" +msgstr "" + #: application/views/sattimers/index.php:15 #, php-format msgid ""