diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 9ee36bd55..f7347e415 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: 2026-03-03 13:55+0000\n" +"POT-Creation-Date: 2026-03-05 07:40+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: Greek \n" "Language-Team: Spanish \n" "Language-Team: Estonian \n" "Language-Team: Finnish \n" "Language-Team: Croatian \n" "Language-Team: Hungarian \n" "Language-Team: Armenian \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Russian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified Han script) col_band])) { - continue; - } - - $cqZ[$cq->col_cqz]['count']++; // Count each cq zone - - // Check if confirmed based on the confirmation types selected in postdata - $isConfirmed = false; - $confirmationLetters = ''; - if (isset($postdata['qsl']) && $postdata['qsl'] == 1 && $cq->qsl == 1) { - $isConfirmed = true; - $confirmationLetters .= 'Q'; - } - if (isset($postdata['lotw']) && $postdata['lotw'] == 1 && $cq->lotw == 1) { - $isConfirmed = true; - $confirmationLetters .= 'L'; - } - if (isset($postdata['eqsl']) && $postdata['eqsl'] == 1 && $cq->eqsl == 1) { - $isConfirmed = true; - $confirmationLetters .= 'E'; - } - if (isset($postdata['qrz']) && $postdata['qrz'] == 1 && $cq->qrz == 1) { - $isConfirmed = true; - $confirmationLetters .= 'Z'; - } - if (isset($postdata['clublog']) && $postdata['clublog'] == 1 && $cq->clublog == 1) { - $isConfirmed = true; - $confirmationLetters .= 'C'; - } - - if ($isConfirmed) { - $bandCq[$cq->col_cqz][$cq->col_band] = '
col_cqz) . '","' . $cq->col_band . '","All", "All","'. $postdata['mode'] . '","CQZone","'.$qsl.'")\'>' . $confirmationLetters . '
'; - // Track confirmed zones for summary - if (!isset($confirmedZones[$cq->col_band][$cq->col_cqz])) { - $confirmedZones[$cq->col_band][$cq->col_cqz] = true; - $summary['confirmed'][$cq->col_band]++; + if ($postdata['band'] == 'SAT') { + foreach ($cqdata_sat as $cq) { + if (($postdata['band'] != 'SAT') && ($band == 'SAT')) { + continue; } - } else { - if ($postdata['worked'] != NULL) { - $bandCq[$cq->col_cqz][$cq->col_band] = '
col_cqz) . '","' . $cq->col_band . '","All", "All","'. $postdata['mode'] . '","CQZone","")\'>W
'; + // Skip if this band is not in our requested bands list + if (!isset($validBands[$cq->col_band])) { + continue; } - } - // Track worked zones for summary - if (!isset($workedZones[$cq->col_band][$cq->col_cqz])) { - $workedZones[$cq->col_band][$cq->col_cqz] = true; - $summary['worked'][$cq->col_band]++; + $cqZ[$cq->col_cqz]['count']++; // Count each cq zone + + // Check if confirmed based on the confirmation types selected in postdata + $isConfirmed = false; + $confirmationLetters = ''; + if (isset($postdata['qsl']) && $postdata['qsl'] == 1 && $cq->qsl == 1) { + $isConfirmed = true; + $confirmationLetters .= 'Q'; + } + if (isset($postdata['lotw']) && $postdata['lotw'] == 1 && $cq->lotw == 1) { + $isConfirmed = true; + $confirmationLetters .= 'L'; + } + if (isset($postdata['eqsl']) && $postdata['eqsl'] == 1 && $cq->eqsl == 1) { + $isConfirmed = true; + $confirmationLetters .= 'E'; + } + if (isset($postdata['qrz']) && $postdata['qrz'] == 1 && $cq->qrz == 1) { + $isConfirmed = true; + $confirmationLetters .= 'Z'; + } + if (isset($postdata['clublog']) && $postdata['clublog'] == 1 && $cq->clublog == 1) { + $isConfirmed = true; + $confirmationLetters .= 'C'; + } + + if ($isConfirmed) { + $bandCq[$cq->col_cqz][$cq->col_band] = '
col_cqz) . '","' . $cq->col_band . '","All", "All","'. $postdata['mode'] . '","CQZone","'.$qsl.'")\'>' . $confirmationLetters . '
'; + // Track confirmed zones for summary + if (!isset($confirmedZones[$cq->col_band][$cq->col_cqz])) { + $confirmedZones[$cq->col_band][$cq->col_cqz] = true; + $summary['confirmed'][$cq->col_band]++; + } + } else { + if ($postdata['worked'] != NULL) { + $bandCq[$cq->col_cqz][$cq->col_band] = '
col_cqz) . '","' . $cq->col_band . '","All", "All","'. $postdata['mode'] . '","CQZone","")\'>W
'; + } + } + + // Track worked zones for summary + if (!isset($workedZones[$cq->col_band][$cq->col_cqz])) { + $workedZones[$cq->col_band][$cq->col_cqz] = true; + $summary['worked'][$cq->col_band]++; + } } } diff --git a/application/models/Itu.php b/application/models/Itu.php index ddc623000..f88dfdf1b 100644 --- a/application/models/Itu.php +++ b/application/models/Itu.php @@ -17,6 +17,9 @@ class ITU extends CI_Model{ // Initialize all bands to dash foreach ($bands as $band) { + if (($postdata['band'] != 'SAT') && ($band == 'SAT')) { + continue; + } for ($i = 1; $i <= 90; $i++) { $bandItu[$i][$band] = '-'; // Sets all to dash to indicate no result } @@ -24,6 +27,9 @@ class ITU extends CI_Model{ // Initialize summary counters only for the bands passed in foreach ($bands as $band) { + if (($postdata['band'] != 'SAT') && ($band == 'SAT')) { + continue; + } $summary['worked'][$band] = 0; $summary['confirmed'][$band] = 0; } @@ -80,7 +86,9 @@ class ITU extends CI_Model{ $summary['confirmed'][$itu->col_band]++; } } else { - $bandItu[$itu->col_ituz][$itu->col_band] = '
col_ituz) . '","' . $itu->col_band . '","All", "All","'. $postdata['mode'] . '","ITUZone","")\'>W
'; + if ($postdata['worked'] != NULL) { + $bandItu[$itu->col_ituz][$itu->col_band] = '
col_ituz) . '","' . $itu->col_band . '","All", "All","'. $postdata['mode'] . '","ITUZone","")\'>W
'; + } } // Track worked zones for summary @@ -90,53 +98,60 @@ class ITU extends CI_Model{ } } - foreach ($itudata_sat as $itu) { - // Skip if this band is not in our requested bands list - if (!isset($validBands[$itu->col_band])) { - continue; - } - - $ituZ[$itu->col_ituz]['count']++; // Count each itu zone - - // Check if confirmed based on the confirmation types selected in postdata - $isConfirmed = false; - $confirmationLetters = ''; - if (isset($postdata['qsl']) && $postdata['qsl'] == 1 && $itu->qsl == 1) { - $isConfirmed = true; - $confirmationLetters .= 'Q'; - } - if (isset($postdata['lotw']) && $postdata['lotw'] == 1 && $itu->lotw == 1) { - $isConfirmed = true; - $confirmationLetters .= 'L'; - } - if (isset($postdata['eqsl']) && $postdata['eqsl'] == 1 && $itu->eqsl == 1) { - $isConfirmed = true; - $confirmationLetters .= 'E'; - } - if (isset($postdata['qrz']) && $postdata['qrz'] == 1 && $itu->qrz == 1) { - $isConfirmed = true; - $confirmationLetters .= 'Z'; - } - if (isset($postdata['clublog']) && $postdata['clublog'] == 1 && $itu->clublog == 1) { - $isConfirmed = true; - $confirmationLetters .= 'C'; - } - - if ($isConfirmed) { - $bandItu[$itu->col_ituz][$itu->col_band] = '
col_ituz) . '","' . $itu->col_band . '","All", "All","'. $postdata['mode'] . '","ITUZone","'.$qsl.'")\'>' . $confirmationLetters . '
'; - // Track confirmed zones for summary - if (!isset($confirmedZones[$itu->col_band][$itu->col_ituz])) { - $confirmedZones[$itu->col_band][$itu->col_ituz] = true; - $summary['confirmed'][$itu->col_band]++; + if ($postdata['band'] == 'SAT') { + foreach ($itudata_sat as $itu) { + if (($postdata['band'] != 'SAT') && ($band == 'SAT')) { + continue; + } + // Skip if this band is not in our requested bands list + if (!isset($validBands[$itu->col_band])) { + continue; } - } else { - $bandItu[$itu->col_ituz][$itu->col_band] = '
col_ituz) . '","' . $itu->col_band . '","All", "All","'. $postdata['mode'] . '","ITUZone","")\'>W
'; - } - // Track worked zones for summary - if (!isset($workedZones[$itu->col_band][$itu->col_ituz])) { - $workedZones[$itu->col_band][$itu->col_ituz] = true; - $summary['worked'][$itu->col_band]++; + $ituZ[$itu->col_ituz]['count']++; // Count each itu zone + + // Check if confirmed based on the confirmation types selected in postdata + $isConfirmed = false; + $confirmationLetters = ''; + if (isset($postdata['qsl']) && $postdata['qsl'] == 1 && $itu->qsl == 1) { + $isConfirmed = true; + $confirmationLetters .= 'Q'; + } + if (isset($postdata['lotw']) && $postdata['lotw'] == 1 && $itu->lotw == 1) { + $isConfirmed = true; + $confirmationLetters .= 'L'; + } + if (isset($postdata['eqsl']) && $postdata['eqsl'] == 1 && $itu->eqsl == 1) { + $isConfirmed = true; + $confirmationLetters .= 'E'; + } + if (isset($postdata['qrz']) && $postdata['qrz'] == 1 && $itu->qrz == 1) { + $isConfirmed = true; + $confirmationLetters .= 'Z'; + } + if (isset($postdata['clublog']) && $postdata['clublog'] == 1 && $itu->clublog == 1) { + $isConfirmed = true; + $confirmationLetters .= 'C'; + } + + if ($isConfirmed) { + $bandItu[$itu->col_ituz][$itu->col_band] = '
col_ituz) . '","' . $itu->col_band . '","All", "All","'. $postdata['mode'] . '","ITUZone","'.$qsl.'")\'>' . $confirmationLetters . '
'; + // Track confirmed zones for summary + if (!isset($confirmedZones[$itu->col_band][$itu->col_ituz])) { + $confirmedZones[$itu->col_band][$itu->col_ituz] = true; + $summary['confirmed'][$itu->col_band]++; + } + } else { + if ($postdata['worked'] != NULL) { + $bandItu[$itu->col_ituz][$itu->col_band] = '
col_ituz) . '","' . $itu->col_band . '","All", "All","'. $postdata['mode'] . '","ITUZone","")\'>W
'; + } + } + + // Track worked zones for summary + if (!isset($workedZones[$itu->col_band][$itu->col_ituz])) { + $workedZones[$itu->col_band][$itu->col_ituz] = true; + $summary['worked'][$itu->col_band]++; + } } } @@ -144,25 +159,25 @@ class ITU extends CI_Model{ $totalWorkedZones = []; $totalConfirmedZones = []; foreach ($workedZones as $band => $zones) { - // Skip SAT for totals - if ($band === 'SAT') { - continue; - } foreach ($zones as $zone => $true) { if (!isset($totalWorkedZones[$zone])) { $totalWorkedZones[$zone] = true; + if ($band === 'SAT') { + continue; + } + $totalWorkedZonesExSat[$zone] = true; // For calculating total worked excluding SAT $summary['worked']['Total']++; } } } foreach ($confirmedZones as $band => $zones) { - // Skip SAT for totals - if ($band === 'SAT') { - continue; - } foreach ($zones as $zone => $true) { if (!isset($totalConfirmedZones[$zone])) { $totalConfirmedZones[$zone] = true; + if ($band === 'SAT') { + continue; + } + $totalConfirmedZonesExSat[$zone] = true; // For calculating total worked excluding SAT $summary['confirmed']['Total']++; } } @@ -204,9 +219,9 @@ class ITU extends CI_Model{ } } else { for ($i = 1; $i <= 90; $i++) { - if (isset($totalConfirmedZones[$i])) { + if (isset($totalConfirmedZonesExSat[$i])) { $mapZones[$i-1] = 'C'; // Confirmed - } else if (isset($totalWorkedZones[$i])) { + } else if (isset($totalWorkedZonesExSat[$i])) { $mapZones[$i-1] = 'W'; // Worked but not confirmed } else { $mapZones[$i-1] = '-'; // Not worked diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 9232e3c22..a5edce4c8 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -543,9 +543,29 @@ class Logbook_model extends CI_Model { break; case 'CQZone': $this->db->where('COL_CQZ', $searchphrase); + if ($band == 'SAT' && $type == 'CQZone') { + if ($sat != 'All' && $sat != null) { + $this->db->where("COL_SAT_NAME", $sat); + } + if ($orbit != 'All' && $orbit != null) { + $this->db->where("satellite.orbit", $orbit); + } + } else { + $this->db->where("COL_PROP_MODE !=", "SAT"); + } break; case 'ITU': $this->db->where('COL_ITUZ', $searchphrase); + if ($band == 'SAT' && $type == 'ITU') { + if ($sat != 'All' && $sat != null) { + $this->db->where("COL_SAT_NAME", $sat); + } + if ($orbit != 'All' && $orbit != null) { + $this->db->where("satellite.orbit", $orbit); + } + } else { + $this->db->where("COL_PROP_MODE !=", "SAT"); + } break; case 'WAS': $this->db->where('COL_STATE', $searchphrase); @@ -2929,7 +2949,7 @@ class Logbook_model extends CI_Model { // Cache the complete data for each callsign/dxcc/continent (both in-memory and file) // OPTIMIZATION: Batch file cache writes if enabled to reduce I/O operations $file_cache_batch = []; - + // Store worked items with their band/mode data foreach ($call_data as $callsign => $data) { $cache_key = "{$logbook_ids_key}|call|{$callsign}"; diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index 7d06f01cf..ccd28efb8 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -132,7 +132,7 @@
- + input->post('band', TRUE) == $band) echo ' selected'; @@ -194,6 +205,9 @@ # " . __("ITU Zone") . ""; foreach($bands as $band) { + if (($posted_band != 'SAT') && ($band == 'SAT')) { + continue; + } echo '' . $band . ''; } echo ' @@ -215,59 +229,42 @@ "; - $addsat=''; foreach($bands as $band) { - if ($band != 'SAT') { - echo '' . $band . ''; - } else { - $addsat='' . $band . ''; + if (($posted_band != 'SAT') && ($band == 'SAT')) { + continue; } + echo '' . $band . ''; } if ($posted_band != 'SAT') { echo '' . __("Total (ex SAT)") . ''; } - if (count($bands) > 1) { - echo ''; - } - echo $addsat; echo " " . __("Total worked") . ""; - $sat_value = ''; foreach ($itu_summary['worked'] as $ituz => $value) { if ($posted_band == 'SAT' && $ituz == 'Total') { continue; } if ($ituz == 'SAT') { - $sat_value = '' . $value . ''; + echo '' . $value . ''; } else { echo '' . $value . ''; } } - if (count($bands) > 1) { - echo ''; - } - echo $sat_value; echo " " . __("Total confirmed") . ""; - $sat_value = ''; foreach ($itu_summary['confirmed'] as $ituz => $value) { if ($posted_band == 'SAT' && $ituz == 'Total') { continue; } if ($ituz == 'SAT') { - $sat_value = '' . $value . ''; + echo '' . $value . ''; } else { echo '' . $value . ''; } } - if (count($bands) > 1) { - echo ''; - } - echo $sat_value; - echo '
'; diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot index 277f77301..269acfc0e 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: 2026-03-03 13:55+0000\n" +"POT-Creation-Date: 2026-03-05 07:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -413,9 +413,11 @@ msgid "and" msgstr "" #: application/controllers/Awards.php:578 +#: application/views/awards/cq/index.php:135 #: application/views/awards/dxcc/index.php:32 #: application/views/awards/dxcc/index.php:176 #: application/views/awards/iota/index.php:123 +#: application/views/awards/itu/index.php:137 #: application/views/awards/wpx/index.php:81 msgid "Every band (w/o SAT)" msgstr "" @@ -601,7 +603,7 @@ msgid "WAP" msgstr "" #: application/controllers/Awards.php:2131 -#: application/views/awards/itu/index.php:23 +#: application/views/awards/itu/index.php:34 msgid "ITU Zones" msgstr "" @@ -792,7 +794,7 @@ msgstr "" #: application/views/awards/dok/index.php:72 #: application/views/awards/dxcc/index.php:133 #: application/views/awards/iota/index.php:80 -#: application/views/awards/itu/index.php:117 +#: application/views/awards/itu/index.php:128 #: application/views/awards/jcc/index.php:70 #: application/views/awards/pl_polska/index.php:84 #: application/views/awards/wab/index.php:106 @@ -1377,7 +1379,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:121 #: application/views/awards/helvetia/index.php:63 #: application/views/awards/iota/index.php:68 -#: application/views/awards/itu/index.php:105 +#: application/views/awards/itu/index.php:116 #: application/views/awards/jcc/index.php:58 #: application/views/awards/pl_polska/index.php:72 #: application/views/awards/rac/index.php:54 @@ -1419,7 +1421,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:125 #: application/views/awards/helvetia/index.php:67 #: application/views/awards/iota/index.php:72 -#: application/views/awards/itu/index.php:109 +#: application/views/awards/itu/index.php:120 #: application/views/awards/jcc/index.php:62 #: application/views/awards/pl_polska/index.php:76 #: application/views/awards/rac/index.php:58 @@ -1465,7 +1467,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:219 #: application/views/awards/helvetia/index.php:91 #: application/views/awards/iota/index.php:134 -#: application/views/awards/itu/index.php:136 +#: application/views/awards/itu/index.php:147 #: application/views/awards/jcc/index.php:90 #: application/views/awards/rac/index.php:82 #: application/views/awards/sig/qso_list.php:12 @@ -1786,7 +1788,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:173 #: application/views/awards/helvetia/index.php:77 #: application/views/awards/iota/index.php:120 -#: application/views/awards/itu/index.php:123 +#: application/views/awards/itu/index.php:134 #: application/views/awards/jcc/index.php:76 #: application/views/awards/pota/index.php:36 #: application/views/awards/rac/index.php:68 @@ -3509,105 +3511,105 @@ msgstr "" msgid "Station not accessible" msgstr "" -#: application/models/Logbook_model.php:1321 +#: application/models/Logbook_model.php:1341 msgid "Station ID not allowed" msgstr "" -#: application/models/Logbook_model.php:1326 +#: application/models/Logbook_model.php:1346 msgid "No Call given" msgstr "" -#: application/models/Logbook_model.php:1396 -#: application/models/Logbook_model.php:1600 +#: application/models/Logbook_model.php:1416 +#: application/models/Logbook_model.php:1620 msgid "DXCC has to be Numeric" msgstr "" -#: application/models/Logbook_model.php:4727 +#: application/models/Logbook_model.php:4747 #, php-format msgid "Wrong station callsign %s while importing QSO with %s for %s: SKIPPED" msgstr "" -#: application/models/Logbook_model.php:4741 +#: application/models/Logbook_model.php:4761 msgid "" "You tried to import a QSO without valid date. This QSO wasn't imported. It's " "invalid" msgstr "" -#: application/models/Logbook_model.php:4750 +#: application/models/Logbook_model.php:4770 msgid "QSO on" msgstr "" -#: application/models/Logbook_model.php:4750 +#: application/models/Logbook_model.php:4770 msgid "" "You tried to import a QSO without any given CALL. This QSO wasn't imported. " "It's invalid" msgstr "" -#: application/models/Logbook_model.php:4799 +#: application/models/Logbook_model.php:4819 #, php-format msgid "" "QSO on %s: You tried to import a QSO without any given Band. This QSO wasn't " "imported. It's invalid" msgstr "" -#: application/models/Logbook_model.php:5072 +#: application/models/Logbook_model.php:5092 msgid "the qslrdate is invalid (YYYYMMDD)" msgstr "" -#: application/models/Logbook_model.php:5083 +#: application/models/Logbook_model.php:5103 msgid "the qslsdate is invalid (YYYYMMDD)" msgstr "" -#: application/models/Logbook_model.php:5144 +#: application/models/Logbook_model.php:5164 msgid "the clublog_qso_upload_date is invalid (YYYYMMDD)" msgstr "" -#: application/models/Logbook_model.php:5517 +#: application/models/Logbook_model.php:5537 #: application/views/simplefle/index.php:41 msgid "Duplicate for" msgstr "" -#: application/models/Logbook_model.php:5582 -#: application/models/Logbook_model.php:5677 +#: application/models/Logbook_model.php:5602 +#: application/models/Logbook_model.php:5697 msgid "QSO could not be matched" msgstr "" -#: application/models/Logbook_model.php:5590 +#: application/models/Logbook_model.php:5610 msgid "confirmed by LoTW/Clublog/eQSL/Contest" msgstr "" -#: application/models/Logbook_model.php:5596 +#: application/models/Logbook_model.php:5616 msgid "confirmed by award manager" msgstr "" -#: application/models/Logbook_model.php:5600 +#: application/models/Logbook_model.php:5620 msgid "confirmed by cross-check of DCL data" msgstr "" -#: application/models/Logbook_model.php:5604 +#: application/models/Logbook_model.php:5624 msgid "confirmation pending" msgstr "" -#: application/models/Logbook_model.php:5607 +#: application/models/Logbook_model.php:5627 msgid "unconfirmed" msgstr "" -#: application/models/Logbook_model.php:5610 +#: application/models/Logbook_model.php:5630 #: application/views/satellite/index.php:82 #: application/views/satellite/satinfo.php:41 #: application/views/view_log/qso.php:305 msgid "unknown" msgstr "" -#: application/models/Logbook_model.php:5680 +#: application/models/Logbook_model.php:5700 msgid "POTA reference already in log" msgstr "" -#: application/models/Logbook_model.php:5683 +#: application/models/Logbook_model.php:5703 msgid "QSO updated" msgstr "" -#: application/models/Logbook_model.php:6080 +#: application/models/Logbook_model.php:6100 #: application/views/activated_gridmap/index.php:114 #: application/views/awards/ffma/index.php:42 #: application/views/awards/gridmaster/index.php:58 @@ -3758,7 +3760,6 @@ msgstr "" #: application/views/activated_gridmap/index.php:45 #: application/views/activators/index.php:13 #: application/views/adif/import.php:262 -#: application/views/awards/cq/index.php:135 #: application/views/awards/cq/index.php:148 #: application/views/awards/dok/index.php:95 #: application/views/awards/dxcc/index.php:190 @@ -3766,8 +3767,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:222 #: application/views/awards/helvetia/index.php:94 #: application/views/awards/iota/index.php:137 -#: application/views/awards/itu/index.php:126 -#: application/views/awards/itu/index.php:139 +#: application/views/awards/itu/index.php:150 #: application/views/awards/jcc/index.php:93 #: application/views/awards/rac/index.php:85 #: application/views/awards/wab/index.php:26 @@ -4198,7 +4198,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:43 #: application/views/awards/helvetia/index.php:116 #: application/views/awards/iota/index.php:159 -#: application/views/awards/itu/index.php:37 +#: application/views/awards/itu/index.php:48 #: application/views/awards/jcc/index.php:115 #: application/views/awards/pl_polska/index.php:93 #: application/views/awards/rac/index.php:107 @@ -4293,7 +4293,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:129 #: application/views/awards/helvetia/index.php:71 #: application/views/awards/iota/index.php:76 -#: application/views/awards/itu/index.php:113 +#: application/views/awards/itu/index.php:124 #: application/views/awards/jcc/index.php:66 #: application/views/awards/pl_polska/index.php:80 #: application/views/awards/rac/index.php:62 @@ -4351,11 +4351,11 @@ msgstr "" #: application/views/awards/73on73/index.php:66 #: application/views/awards/counties/details.php:27 #: application/views/awards/counties/index.php:47 -#: application/views/awards/cq/index.php:286 +#: application/views/awards/cq/index.php:272 #: application/views/awards/dok/index.php:197 #: application/views/awards/helvetia/index.php:204 #: application/views/awards/iota/index.php:302 -#: application/views/awards/itu/index.php:277 +#: application/views/awards/itu/index.php:274 #: application/views/awards/jcc/index.php:238 #: application/views/awards/pl_polska/index.php:377 #: application/views/awards/pota/index.php:68 @@ -5235,8 +5235,8 @@ msgstr "" #: application/views/awards/helvetia/index.php:30 #: application/views/awards/iota/index.php:17 #: application/views/awards/iota/index.php:25 -#: application/views/awards/itu/index.php:22 -#: application/views/awards/itu/index.php:30 +#: application/views/awards/itu/index.php:33 +#: application/views/awards/itu/index.php:41 #: application/views/awards/jcc/index.php:16 #: application/views/awards/jcc/index.php:24 #: application/views/awards/pl_polska/index.php:36 @@ -5451,7 +5451,7 @@ msgstr "" #: application/views/awards/cq/index.php:45 #: application/views/awards/dxcc/index.php:42 -#: application/views/awards/itu/index.php:36 +#: application/views/awards/itu/index.php:47 #: application/views/awards/wpx/index.php:13 #: application/views/gridmap/index.php:19 #: application/views/logbookadvanced/index.php:294 @@ -5465,7 +5465,7 @@ msgstr "" #: application/views/awards/cq/index.php:55 #: application/views/awards/dxcc/index.php:52 -#: application/views/awards/itu/index.php:46 +#: application/views/awards/itu/index.php:57 #: application/views/gridmap/index.php:28 #: application/views/logbookadvanced/index.php:300 #: application/views/statistics/index.php:54 @@ -5474,7 +5474,7 @@ msgstr "" #: application/views/awards/cq/index.php:57 #: application/views/awards/dxcc/index.php:54 -#: application/views/awards/itu/index.php:48 +#: application/views/awards/itu/index.php:59 #: application/views/contestcalendar/index.php:45 #: application/views/dashboard/index.php:360 #: application/views/dashboard/index.php:387 @@ -5488,7 +5488,7 @@ msgstr "" #: application/views/awards/cq/index.php:58 #: application/views/awards/dxcc/index.php:55 -#: application/views/awards/itu/index.php:49 +#: application/views/awards/itu/index.php:60 #: application/views/gridmap/index.php:32 #: application/views/logbookadvanced/index.php:303 #: application/views/statistics/index.php:57 @@ -5497,7 +5497,7 @@ msgstr "" #: application/views/awards/cq/index.php:59 #: application/views/awards/dxcc/index.php:56 -#: application/views/awards/itu/index.php:50 +#: application/views/awards/itu/index.php:61 #: application/views/gridmap/index.php:33 #: application/views/logbookadvanced/index.php:304 #: application/views/statistics/index.php:58 @@ -5506,7 +5506,7 @@ msgstr "" #: application/views/awards/cq/index.php:60 #: application/views/awards/dxcc/index.php:57 -#: application/views/awards/itu/index.php:51 +#: application/views/awards/itu/index.php:62 #: application/views/gridmap/index.php:34 #: application/views/logbookadvanced/index.php:305 #: application/views/statistics/index.php:59 @@ -5515,7 +5515,7 @@ msgstr "" #: application/views/awards/cq/index.php:61 #: application/views/awards/dxcc/index.php:58 -#: application/views/awards/itu/index.php:52 +#: application/views/awards/itu/index.php:63 #: application/views/gridmap/index.php:35 #: application/views/logbookadvanced/index.php:306 #: application/views/statistics/index.php:60 @@ -5524,7 +5524,7 @@ msgstr "" #: application/views/awards/cq/index.php:62 #: application/views/awards/dxcc/index.php:59 -#: application/views/awards/itu/index.php:53 +#: application/views/awards/itu/index.php:64 #: application/views/gridmap/index.php:36 #: application/views/logbookadvanced/index.php:307 #: application/views/statistics/index.php:61 @@ -5533,7 +5533,7 @@ msgstr "" #: application/views/awards/cq/index.php:63 #: application/views/awards/dxcc/index.php:60 -#: application/views/awards/itu/index.php:54 +#: application/views/awards/itu/index.php:65 #: application/views/gridmap/index.php:37 #: application/views/logbookadvanced/index.php:308 #: application/views/statistics/index.php:62 @@ -5542,7 +5542,7 @@ msgstr "" #: application/views/awards/cq/index.php:64 #: application/views/awards/dxcc/index.php:61 -#: application/views/awards/itu/index.php:55 +#: application/views/awards/itu/index.php:66 #: application/views/logbookadvanced/index.php:309 #: application/views/statistics/index.php:63 msgid "Last Year" @@ -5550,7 +5550,7 @@ msgstr "" #: application/views/awards/cq/index.php:65 #: application/views/awards/dxcc/index.php:62 -#: application/views/awards/itu/index.php:56 +#: application/views/awards/itu/index.php:67 #: application/views/gridmap/index.php:38 #: application/views/interface_assets/footer.php:52 #: application/views/logbookadvanced/index.php:310 @@ -5560,7 +5560,7 @@ msgstr "" #: application/views/awards/cq/index.php:70 #: application/views/awards/dxcc/index.php:67 -#: application/views/awards/itu/index.php:61 +#: application/views/awards/itu/index.php:72 #: application/views/dxcalendar/index.php:9 #: application/views/gridmap/index.php:44 #: application/views/statistics/index.php:68 @@ -5569,7 +5569,7 @@ msgstr "" #: application/views/awards/cq/index.php:78 #: application/views/awards/dxcc/index.php:75 -#: application/views/awards/itu/index.php:69 +#: application/views/awards/itu/index.php:80 #: application/views/dxcalendar/index.php:10 #: application/views/gridmap/index.php:48 #: application/views/statistics/index.php:72 @@ -5577,7 +5577,7 @@ msgid "Date to" msgstr "" #: application/views/awards/cq/index.php:88 -#: application/views/awards/itu/index.php:79 +#: application/views/awards/itu/index.php:90 #: application/views/awards/wab/list.php:6 #: application/views/awards/wac/index.php:23 #: application/views/awards/wpx/wpx_details.php:24 @@ -5591,7 +5591,7 @@ msgid "Confirmed" msgstr "" #: application/views/awards/cq/index.php:88 -#: application/views/awards/itu/index.php:79 +#: application/views/awards/itu/index.php:90 #: application/views/awards/wac/index.php:23 #: application/views/bandmap/list.php:87 application/views/bandmap/list.php:298 #: application/views/dashboard/index.php:338 @@ -5606,7 +5606,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:99 #: application/views/awards/helvetia/index.php:41 #: application/views/awards/iota/index.php:46 -#: application/views/awards/itu/index.php:83 +#: application/views/awards/itu/index.php:94 #: application/views/awards/jcc/index.php:36 #: application/views/awards/rac/index.php:32 #: application/views/awards/wac/index.php:27 @@ -5623,7 +5623,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:103 #: application/views/awards/helvetia/index.php:45 #: application/views/awards/iota/index.php:50 -#: application/views/awards/itu/index.php:87 +#: application/views/awards/itu/index.php:98 #: application/views/awards/jcc/index.php:40 #: application/views/awards/rac/index.php:36 #: application/views/awards/wac/index.php:31 @@ -5639,7 +5639,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:107 #: application/views/awards/helvetia/index.php:49 #: application/views/awards/iota/index.php:54 -#: application/views/awards/itu/index.php:91 +#: application/views/awards/itu/index.php:102 #: application/views/awards/jcc/index.php:44 #: application/views/awards/rac/index.php:40 #: application/views/awards/wac/index.php:35 @@ -5656,7 +5656,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:113 #: application/views/awards/helvetia/index.php:55 #: application/views/awards/iota/index.php:60 -#: application/views/awards/itu/index.php:97 +#: application/views/awards/itu/index.php:108 #: application/views/awards/jcc/index.php:50 #: application/views/awards/rac/index.php:46 #: application/views/awards/wac/index.php:41 @@ -5671,7 +5671,7 @@ msgstr "" #: application/views/awards/cq/index.php:110 #: application/views/awards/iota/index.php:64 -#: application/views/awards/itu/index.php:101 +#: application/views/awards/itu/index.php:112 #: application/views/awards/wac/index.php:45 #: application/views/interface_assets/footer.php:2375 #: application/views/logbookadvanced/index.php:54 @@ -5684,7 +5684,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:244 #: application/views/awards/helvetia/index.php:128 #: application/views/awards/iota/index.php:171 -#: application/views/awards/itu/index.php:162 +#: application/views/awards/itu/index.php:173 #: application/views/awards/rac/index.php:119 #: application/views/awards/waja/index.php:132 #: application/views/awards/wap/index.php:126 @@ -5698,7 +5698,7 @@ msgstr "" #: application/views/awards/dxcc/index.php:247 #: application/views/awards/helvetia/index.php:131 #: application/views/awards/iota/index.php:174 -#: application/views/awards/itu/index.php:165 +#: application/views/awards/itu/index.php:176 #: application/views/awards/jcc/index.php:131 #: application/views/awards/pl_polska/index.php:188 #: application/views/awards/rac/index.php:122 @@ -5715,52 +5715,52 @@ msgstr "" #: application/views/awards/cq/index.php:192 #: application/views/awards/dxcc/index.php:264 -#: application/views/awards/itu/index.php:183 +#: application/views/awards/itu/index.php:194 msgid "Legend:" msgstr "" #: application/views/awards/cq/index.php:193 #: application/views/awards/dxcc/index.php:265 -#: application/views/awards/itu/index.php:184 +#: application/views/awards/itu/index.php:195 msgid "(Q)SL-Paper-Card" msgstr "" #: application/views/awards/cq/index.php:194 #: application/views/awards/dxcc/index.php:266 -#: application/views/awards/itu/index.php:185 +#: application/views/awards/itu/index.php:196 msgid "(L)oTW" msgstr "" #: application/views/awards/cq/index.php:195 #: application/views/awards/dxcc/index.php:267 -#: application/views/awards/itu/index.php:186 +#: application/views/awards/itu/index.php:197 msgid "(e)QSL" msgstr "" #: application/views/awards/cq/index.php:196 #: application/views/awards/dxcc/index.php:268 -#: application/views/awards/itu/index.php:187 +#: application/views/awards/itu/index.php:198 msgid "QR(Z)-\"confirmation\"" msgstr "" #: application/views/awards/cq/index.php:197 #: application/views/awards/dxcc/index.php:269 -#: application/views/awards/itu/index.php:188 +#: application/views/awards/itu/index.php:199 msgid "(C)lublog" msgstr "" #: application/views/awards/cq/index.php:198 #: application/views/awards/dxcc/index.php:270 -#: application/views/awards/itu/index.php:189 +#: application/views/awards/itu/index.php:200 msgid "(W)orked" msgstr "" -#: application/views/awards/cq/index.php:221 +#: application/views/awards/cq/index.php:224 #: application/views/awards/dok/index.php:166 #: application/views/awards/dxcc/index.php:302 #: application/views/awards/helvetia/index.php:174 #: application/views/awards/iota/index.php:224 -#: application/views/awards/itu/index.php:212 +#: application/views/awards/itu/index.php:226 #: application/views/awards/jcc/index.php:170 #: application/views/awards/rac/index.php:165 #: application/views/awards/wac/index.php:169 @@ -5773,18 +5773,18 @@ msgstr "" msgid "Summary" msgstr "" -#: application/views/awards/cq/index.php:236 +#: application/views/awards/cq/index.php:237 #: application/views/awards/dxcc/index.php:315 -#: application/views/awards/itu/index.php:227 +#: application/views/awards/itu/index.php:239 msgid "Total (ex SAT)" msgstr "" -#: application/views/awards/cq/index.php:245 +#: application/views/awards/cq/index.php:242 #: application/views/awards/dok/index.php:179 #: application/views/awards/dxcc/index.php:322 #: application/views/awards/helvetia/index.php:187 #: application/views/awards/iota/index.php:245 -#: application/views/awards/itu/index.php:236 +#: application/views/awards/itu/index.php:244 #: application/views/awards/jcc/index.php:197 #: application/views/awards/rac/index.php:178 #: application/views/awards/wac/index.php:182 @@ -5797,12 +5797,12 @@ msgstr "" msgid "Total worked" msgstr "" -#: application/views/awards/cq/index.php:263 +#: application/views/awards/cq/index.php:255 #: application/views/awards/dok/index.php:186 #: application/views/awards/dxcc/index.php:343 #: application/views/awards/helvetia/index.php:194 #: application/views/awards/iota/index.php:271 -#: application/views/awards/itu/index.php:254 +#: application/views/awards/itu/index.php:257 #: application/views/awards/jcc/index.php:216 #: application/views/awards/rac/index.php:185 #: application/views/awards/wac/index.php:189 @@ -6306,7 +6306,7 @@ msgid "Deleted" msgstr "" #: application/views/awards/itu/index.php:3 -#: application/views/awards/itu/index.php:195 +#: application/views/awards/itu/index.php:206 #: application/views/gridmap/index.php:238 #: application/views/logbookadvanced/checkresult.php:322 #: application/views/logbookadvanced/edit.php:29 @@ -6323,7 +6323,7 @@ msgstr "" msgid "ITU Zone" msgstr "" -#: application/views/awards/itu/index.php:24 +#: application/views/awards/itu/index.php:35 msgid "" "The Classic Worked ITU Zones award may be claimed by producing evidence of " "having contacted land based amateur radio stations in at least 70 of the 75 " @@ -6331,21 +6331,21 @@ msgid "" "(ITU)." msgstr "" -#: application/views/awards/itu/index.php:25 +#: application/views/awards/itu/index.php:36 #, php-format msgctxt "uses 'RSGB'" msgid "You can find more information on the website of %s." msgstr "" -#: application/views/awards/itu/index.php:27 +#: application/views/awards/itu/index.php:38 msgid "Fields taken for this Award: ITU-Zone (ADIF: ITUZ)" msgstr "" -#: application/views/awards/itu/index.php:29 +#: application/views/awards/itu/index.php:40 msgid "Awards - ITU Zones" msgstr "" -#: application/views/awards/itu/index.php:39 +#: application/views/awards/itu/index.php:50 msgid "Show ITU Zone Map" msgstr ""