From 8e9520815654b40782c28c7c4a0015d622ff3220 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 22:08:31 +0200 Subject: [PATCH 01/82] Quicklog Feature --- application/language/bulgarian/qso_lang.php | 3 +++ .../language/chinese_simplified/qso_lang.php | 3 +++ application/language/czech/qso_lang.php | 3 +++ application/language/dutch/qso_lang.php | 3 +++ application/language/english/qso_lang.php | 3 +++ application/language/finnish/qso_lang.php | 3 +++ application/language/french/qso_lang.php | 3 +++ application/language/german/qso_lang.php | 3 +++ application/language/greek/qso_lang.php | 3 +++ application/language/italian/qso_lang.php | 3 +++ application/language/polish/qso_lang.php | 3 +++ application/language/russian/qso_lang.php | 3 +++ application/language/spanish/qso_lang.php | 3 +++ application/language/swedish/qso_lang.php | 3 +++ application/language/turkish/qso_lang.php | 3 +++ application/views/dashboard/index.php | 13 +++++++++++++ application/views/qso/index.php | 2 +- 17 files changed, 59 insertions(+), 1 deletion(-) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 34aab0356..a840821c7 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Предложения'; $lang['qso_title_previous_contacts'] = 'Предишни контакти'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Посочете стойността на мощността във ватове. Въведете само цифри.'; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 37399d7af..020096984 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = '建议'; $lang['qso_title_previous_contacts'] = '先前通联'; $lang['qso_title_image'] = '操作员照片'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = '以瓦特为单位设置功率值。在输入中仅填写数值。'; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 68d29fe99..9d62916ed 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Návrhy'; $lang['qso_title_previous_contacts'] = 'Předchozí spojení'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Zadej výkon ve Wattech. Jsou povolen pouz čísla'; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 9c4655c58..8592720e9 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggesties'; $lang['qso_title_previous_contacts'] = 'Eerdere verbindingen'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Geef vermogen in Watt. Vermeld alleen cijfers.'; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index f8bf82033..1fe5f9eac 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggestions'; $lang['qso_title_previous_contacts'] = 'Previous Contacts'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Give power value in Watts. Include only numbers in the input.'; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 9207145fb..71fcc003c 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Kutsumerkkiehdotukset'; $lang['qso_title_previous_contacts'] = 'Edelliset yhteydet'; $lang['qso_title_image'] = 'Profiilikuva'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Anna teholukema Watteina käyttäen vain numeroita.'; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index b64ac41de..79bb86789 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggestions'; $lang['qso_title_previous_contacts'] = 'Contacts précédents'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Saisissez la ouissance en Watts en utilisant uniquement des chiffres.'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 229d2bc28..998c57e62 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Vorschläge'; $lang['qso_title_previous_contacts'] = 'Vorherige Kontakte'; $lang['qso_title_image'] = 'Profilbild'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gib die Ausgangsleistung in Watt an. Erfasse nur Zahlen bei der Eingabe.'; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 1a398b3fe..2ae3ff19d 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Εισήγησης'; $lang['qso_title_previous_contacts'] = 'Προηγούμενες Επαφές'; $lang['qso_title_image'] = 'Εικόνα προφίλ'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Δώστε τιμή ισχύος σε Watts. Συμπεριλάβετε μόνο αριθμούς στην εισαγωγή.'; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 9f7618ecf..f64db6125 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggerimenti'; $lang['qso_title_previous_contacts'] = 'Contatti Precedenti'; $lang['qso_title_image'] = 'Immagine Profilo'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Dare valore di potenza in Watt. Includere solo numeri nell input.'; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 42804a262..c471e8321 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Sugestie'; $lang['qso_title_previous_contacts'] = 'Poprzednie łączności'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Wpisz wartość mocy w watach. W polu podaj same cyfry.'; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index c6d1f084b..8b28d263c 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Предложения'; $lang['qso_title_previous_contacts'] = 'Предыдущие контакты'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Укажите мощность в Ваттах (только цифры).'; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index fdd4967c5..002686c2b 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Sugerencias'; $lang['qso_title_previous_contacts'] = 'Contactos previos'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Especifique el valor de potencia en Watios (W). Incluya solo números.'; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 673be8bd5..78b45b843 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Förslag'; $lang['qso_title_previous_contacts'] = 'Föregående QSOn'; $lang['qso_title_image'] = 'Profilbild'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Ange effekt i watt, enbart med siffror.'; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 9b9f82533..e3561d5dc 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Öneriler'; $lang['qso_title_previous_contacts'] = 'Önceki Görüşmeler'; $lang['qso_title_image'] = 'Profil Resmi'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gücü Watt olarak veriniz. Sadece rakamları giriniz.'; diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 38ad16c90..8e43dbd88 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -165,6 +165,19 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
+
+

+
+ +
+ + + +
+ + diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 3f9a6850f..14ac7b42d 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -74,7 +74,7 @@
optionslib->get_option('dxcache_url') != '') { ?>  - +
From dc66ebbb87ad91bb8d78a6d635a42c29c105f286 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 22:12:46 +0200 Subject: [PATCH 02/82] German Translation --- application/language/german/qso_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 998c57e62..52fec3eb4 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -9,7 +9,7 @@ $lang['qso_title_previous_contacts'] = 'Vorherige Kontakte'; $lang['qso_title_image'] = 'Profilbild'; // Quicklog on Dashboard -$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Rufzeichen'; // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gib die Ausgangsleistung in Watt an. Erfasse nur Zahlen bei der Eingabe.'; From 0f75d83fb6c880fe8bfe01523435c328dd2cbf0c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 22:33:16 +0200 Subject: [PATCH 03/82] Corrected PHP Error callsign value --- application/views/qso/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 14ac7b42d..30ea8085e 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -74,7 +74,7 @@
optionslib->get_option('dxcache_url') != '') { ?>  - +
From 8dcf30e257f3d661d99d75ffc326b43c70c4ba29 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 22:17:19 +0200 Subject: [PATCH 04/82] correction of not needed element --- application/views/dashboard/index.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 8e43dbd88..3986aa304 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -165,10 +165,6 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
-
-

-
-
From 827dfdb1528854b1573b11c0595459f2bba3b274 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 2 Nov 2023 20:58:40 +0100 Subject: [PATCH 05/82] web manifest and meta tag --- application/views/interface_assets/header.php | 6 +++++- manifest.json | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 manifest.json diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index c4b35237a..cc95493e0 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -5,7 +5,11 @@ - + + + + + optionslib->get_theme()) { ?> diff --git a/manifest.json b/manifest.json new file mode 100644 index 000000000..08f92f69f --- /dev/null +++ b/manifest.json @@ -0,0 +1,17 @@ +{ + "name": "Cloudlog", + "short_name": "Cloudlog", + "theme_color": "#2571fb", + "background_color": "#ffffff", + "display": "standalone", + "orientation": "portrait", + "scope": ".", + "start_url": "/", + "icons": [ + { + "src": "CloudLog_logo.png", + "type": "image/png", + "sizes": "144x144" + } + ] + } \ No newline at end of file From 01341b107f1eec761bcb13d1d3bd505ed6db9ecc Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 3 Nov 2023 21:54:49 +0100 Subject: [PATCH 06/82] Add German translation for warnings --- application/language/german/general_words_lang.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 099119849..a5d64700b 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -194,3 +194,8 @@ $lang['southamerica'] = 'Südamerika'; $lang['gen_band_selection'] = 'Bandauswahl'; $lang['general_word_today'] = 'Heute'; + +$lang['dashboard_php_version_warning'] = 'Die PHP Version is zu alt. Benötigt wird mindestens die Version 7.4. Die installierte Version ist'; +$lang['dashboard_country_files_warning'] = 'Die Länderlisten müssen aktualisiert werden! Klicke hier, um das zu tun!'; +$lang['dashboard_locations_warning'] = 'Ea wurde kein Stationsstandort angelegt! Klicke hier, um das zu tun!'; +$lang['dashboard_logbooks_warning'] = 'Es wurde kein Stationslogbuch angelegt. Klicke hier, um das zu tun!'; From 2fdcdaa201172872f559e7983f92ba84bdb40d11 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:45:07 +0100 Subject: [PATCH 07/82] added time function to js --- assets/js/sections/simplefle.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 565b9c09a..a29284ba3 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -85,6 +85,13 @@ ssb }); }); +function updateUTCTime() { + const utcTimeElement = document.getElementById("utc-time"); + const now = new Date(); + const utcTimeString = now.toISOString().split("T")[1].split(".")[0]; + utcTimeElement.textContent = utcTimeString; +} + function handleInput() { var qsodate = ""; if ($("#qsodate").val()) { @@ -550,6 +557,8 @@ function isWWFF(value) { $(document).ready(function () { + setInterval(updateUTCTime, 1000); + updateUTCTime(); var tabledata = localStorage.getItem(`user_${user_id}_tabledata`); var mycall = localStorage.getItem(`user_${user_id}_my-call`); var operator = localStorage.getItem(`user_${user_id}_operator`); From c357e0f90c4cbb9959f46fa4d0c48edcff7a6aab Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:45:23 +0100 Subject: [PATCH 08/82] added utc time to view --- application/views/simplefle/index.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 5753ac249..db176ddef 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -70,12 +70,9 @@
-
-
- - - -
+
+ +

@@ -98,6 +95,13 @@
+
+
+ + + +
+
From 5984f3799c05b4aff8d1de2dce3a4750326a5475 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:45:44 +0100 Subject: [PATCH 09/82] added utc time translations --- application/language/bulgarian/qso_lang.php | 1 + application/language/chinese_simplified/qso_lang.php | 1 + application/language/czech/qso_lang.php | 1 + application/language/dutch/qso_lang.php | 1 + application/language/english/qso_lang.php | 1 + application/language/finnish/qso_lang.php | 1 + application/language/french/qso_lang.php | 1 + application/language/german/qso_lang.php | 1 + application/language/greek/qso_lang.php | 1 + application/language/italian/qso_lang.php | 1 + application/language/polish/qso_lang.php | 1 + application/language/russian/qso_lang.php | 1 + application/language/spanish/qso_lang.php | 1 + application/language/swedish/qso_lang.php | 1 + application/language/turkish/qso_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index fb3614f1b..a5e47ff4d 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index a850aab3c..ac9fac2e5 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 7449fe052..38114fce5 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 769f42b3f..c038a3cfb 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 307429aa9..e47d17cb8 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index b4d43a9b8..bd501e2ed 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index e104cfc47..568a58369 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 04e8c77f1..9f9eb053c 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "z.B. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Stationsstandort"; $lang['qso_simplefle_station_call_location_hint'] = "Falls du von einem neuen Standort oder mit einem neuen Rufzeichen gefunkt hast, erstelle erst einen neuen Stationsstandort"; +$lang['qso_simplefle_utc_time'] = "Aktuelle UTC Zeit"; $lang['qso_simplefle_enter_the_data'] = "Gibt hier die Daten ein"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Schliesse und Lade Beispiel Daten"; $lang['qso_simplefle_reload'] = "Aktualisiere QSO Liste"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index ab4653102..0484b4d4a 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index cfa31cd20..bcc442dcd 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 3033ccb6a..93863baa6 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 3042576e4..87525f7a2 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 9e6640d33..a36a55533 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 16f10ecab..83a0804b9 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 6f6c44ec3..228ee601e 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; From a071a4b8d95c88bb5a6eaa123ce339122b3be35d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:55:33 +0100 Subject: [PATCH 10/82] added QSO Date hint --- application/views/simplefle/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index db176ddef..8975a3f4e 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -68,6 +68,7 @@
+
From 70fbafb8441708fb1c3dbca78f9e45c4f073ab03 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:55:47 +0100 Subject: [PATCH 11/82] added Translations for QSO Date hint --- application/language/bulgarian/qso_lang.php | 1 + application/language/chinese_simplified/qso_lang.php | 1 + application/language/czech/qso_lang.php | 1 + application/language/dutch/qso_lang.php | 1 + application/language/english/qso_lang.php | 1 + application/language/finnish/qso_lang.php | 1 + application/language/french/qso_lang.php | 1 + application/language/german/qso_lang.php | 1 + application/language/greek/qso_lang.php | 1 + application/language/italian/qso_lang.php | 1 + application/language/polish/qso_lang.php | 1 + application/language/russian/qso_lang.php | 1 + application/language/spanish/qso_lang.php | 1 + application/language/swedish/qso_lang.php | 1 + application/language/turkish/qso_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index a5e47ff4d..2b407ba0e 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index ac9fac2e5..a5efba4dd 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 38114fce5..107785507 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index c038a3cfb..0eb9e3d57 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index e47d17cb8..ccec36be4 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index bd501e2ed..b84dcf8b9 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 568a58369..1519c7d28 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 9f9eb053c..9e86c42be 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry' oder einfach 'FLE' ist ein S $lang['qso_simplefle_info_ln3'] = "FLE wurde ursprünglich von DF3CB geschrieben. Auf seiner Website bietet er ein Programm für Windows an. Simple FLE wurde von OK2CQR auf Basis des FLE von DF3CB geschrieben und bietet eine Webapplikation zum Erfassen von QSOs."; $lang['qso_simplefle_info_ln4'] = "Ein üblicher Anwendungsfall ist, wenn Sie Ihre Papier-Logbücher von einer Outdoor-Aktion erfassen müssen und SimpleFLE nun auch in Cloudlog verfügbar. Informationen über die allgemeine Syntax und Handhabung gibt es hier."; $lang['qso_simplefle_qso_data'] = "QSO Daten"; +$lang['qso_simplefle_qso_date_hint'] = "Wenn du kein Datum auswählst, wird das heutige Datum verwendet."; $lang['qso_simplefle_qso_list'] = "QSO Liste"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Datum"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 0484b4d4a..31d113501 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index bcc442dcd..4d28e9eef 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 93863baa6..f56812d68 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 87525f7a2..0d5acd81e 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index a36a55533..091150cd8 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 83a0804b9..a8ba6b0dc 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 228ee601e..b0d8bdd8a 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; From b6668227a896c48e36e648a45d27d957f36457d3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:56:03 +0100 Subject: [PATCH 12/82] made table a bit higher to match with the new hint --- assets/css/general.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/general.css b/assets/css/general.css index 672c0d6a6..2d75a9d58 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -557,7 +557,7 @@ input:invalid { } .sfletable{ - height: 440px; + height: 470px; } .sfletable.table { @@ -574,6 +574,6 @@ input:invalid { .sfletable.table tbody { width: 95%; overflow-y: scroll; - max-height: 410px; + max-height: 440px; position: absolute; } From be7632ef58e842e84af85501d9417f187f5ab58b Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 4 Nov 2023 14:19:56 +0100 Subject: [PATCH 13/82] Add reset buttons for times to reset on click --- application/views/interface_assets/footer.php | 13 +++++++++++++ application/views/qso/index.php | 10 +++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index c71433447..8b12884a3 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1005,6 +1005,19 @@ $(document).on('keypress',function(e) { var utc = localTime + (now.getTimezoneOffset() * 60000); $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); }); + $('#reset_start_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + }); + $('#reset_end_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + }); }); diff --git a/application/views/qso/index.php b/application/views/qso/index.php index cc97f357a..679cab724 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -59,12 +59,20 @@
- + + + + + + required pattern="[0-2][0-9]:[0-5][0-9]">
+ + + required pattern="[0-2][0-9]:[0-5][0-9]">
From 26a1f8531f16adc3e9a23ac19da447621c008ad8 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 4 Nov 2023 15:31:44 +0100 Subject: [PATCH 14/82] Also handle logging of start time only --- application/views/qso/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 679cab724..3222af4bd 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -92,6 +92,9 @@
+ + + required pattern="[0-2][0-9]:[0-5][0-9]">
From 139668fcc81468b0755f23dd5e1fe822d59792fa Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:07 +0100 Subject: [PATCH 15/82] created migration for quicklog user option --- application/migrations/151_user_quicklog.php | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 application/migrations/151_user_quicklog.php diff --git a/application/migrations/151_user_quicklog.php b/application/migrations/151_user_quicklog.php new file mode 100644 index 000000000..f55fb23c2 --- /dev/null +++ b/application/migrations/151_user_quicklog.php @@ -0,0 +1,29 @@ +db->field_exists('user_quicklog', 'users')) { + $fields = array( + 'user_quicklog integer DEFAULT 0 AFTER user_default_confirmation', + ); + + $this->dbforge->add_column('users', $fields); + } + } + + public function down() + { + if ($this->db->field_exists('user_quicklog', 'users')) { + $this->dbforge->drop_column('users', 'user_quicklog'); + } + } +} \ No newline at end of file From a160663009d0b1b1c0b3851ac8c3834803ba7c99 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:23 +0100 Subject: [PATCH 16/82] updated migration config --- application/config/migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/migration.php b/application/config/migration.php index 7756a3244..f855e92fb 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 150; +$config['migration_version'] = 151; /* |-------------------------------------------------------------------------- From 39bb190fd255af7dfa4148f95ce634d30a1dc6bd Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sat, 4 Nov 2023 18:31:39 +0100 Subject: [PATCH 17/82] Fix county format in ADIF export --- application/libraries/AdifHelper.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php index a639896c3..d167077a6 100644 --- a/application/libraries/AdifHelper.php +++ b/application/libraries/AdifHelper.php @@ -198,7 +198,13 @@ class AdifHelper { $line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu); - $line .= $this->getAdifFieldLine("MY_CNTY", $qso->station_cnty); + if($qso->state) { + $county = trim($qso->state) . "," . trim($qso->station_cnty); + } else { + $county = trim($qso->station_cnty); + } + + $line .= $this->getAdifFieldLine("MY_CNTY", $county); $line .= $this->getAdifFieldLine("MY_SIG", $qso->station_sig); From 6be6309d0f515c0819b3cc66799c857c991a8990 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:46 +0100 Subject: [PATCH 18/82] added quicklog to User Controller --- application/controllers/User.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/application/controllers/User.php b/application/controllers/User.php index 7bb77a03c..4ce09fc72 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -91,6 +91,7 @@ class User extends CI_Controller { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); } else { @@ -127,6 +128,7 @@ class User extends CI_Controller { $this->input->post('user_default_band'), ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''), $this->input->post('user_qso_end_times'), + $this->input->post('user_quicklog'), $this->input->post('language'), )) { // Check for errors @@ -175,6 +177,7 @@ class User extends CI_Controller { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); $this->load->view('interface_assets/footer'); @@ -398,6 +401,12 @@ class User extends CI_Controller { $data['user_qso_end_times'] = $q->user_qso_end_times; } + if($this->input->post('user_quicklog')) { + $data['user_quicklog'] = $this->input->post('user_quicklog', true); + } else { + $data['user_quicklog'] = $q->user_quicklog; + } + if($this->input->post('user_show_profile_image')) { $data['user_show_profile_image'] = $this->input->post('user_show_profile_image', false); } else { @@ -539,6 +548,7 @@ class User extends CI_Controller { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['language'] = $this->input->post('language'); $data['user_winkey'] = $this->input->post('user_winkey'); $this->load->view('user/edit'); From 802c4ab2e6c971bd3566a9cb0de12fe91a94b38b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:59 +0100 Subject: [PATCH 19/82] added quicklog to User Model --- application/models/User_model.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index 46eb03da2..b43e25db1 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -124,7 +124,7 @@ class User_Model extends CI_Model { $measurement, $user_date_format, $user_stylesheet, $user_qth_lookup, $user_sota_lookup, $user_wwff_lookup, $user_pota_lookup, $user_show_notes, $user_column1, $user_column2, $user_column3, $user_column4, $user_column5, $user_show_profile_image, $user_previous_qsl_type, $user_amsat_status_upload, $user_mastodon_url, - $user_default_band, $user_default_confirmation, $user_qso_end_times, $language) { + $user_default_band, $user_default_confirmation, $user_qso_end_times, $user_quicklog, $language) { // Check that the user isn't already used if(!$this->exists($username)) { $data = array( @@ -157,6 +157,7 @@ class User_Model extends CI_Model { 'user_default_band' => xss_clean($user_default_band), 'user_default_confirmation' => xss_clean($user_default_confirmation), 'user_qso_end_times' => xss_clean($user_qso_end_times), + 'user_quicklog' => xss_clean($user_quicklog), 'language' => xss_clean($language), ); @@ -219,6 +220,7 @@ class User_Model extends CI_Model { 'user_default_band' => xss_clean($fields['user_default_band']), 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : ''), 'user_qso_end_times' => xss_clean($fields['user_qso_end_times']), + 'user_quicklog' => xss_clean($field['user_quicklog']), 'language' => xss_clean($fields['language']), 'winkey' => xss_clean($fields['user_winkey']), ); @@ -346,6 +348,7 @@ class User_Model extends CI_Model { 'user_default_band' => $u->row()->user_default_band, 'user_default_confirmation' => $u->row()->user_default_confirmation, 'user_qso_end_times' => isset($u->row()->user_qso_end_times) ? $u->row()->user_qso_end_times : 1, + 'user_quicklog' => isset($u->row()->user_quicklog) ? $u->row()->user_quicklog : 1, 'active_station_logbook' => $u->row()->active_station_logbook, 'language' => isset($u->row()->language) ? $u->row()->language: 'english', 'isWinkeyEnabled' => $u->row()->winkey, From 08fd2bc992db7d249502a15af304fd38945fc707 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:32:16 +0100 Subject: [PATCH 20/82] added Quicklog User Option --- application/views/user/add.php | 9 +++++++++ application/views/user/edit.php | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/application/views/user/add.php b/application/views/user/add.php index 58f0fb970..86c26097e 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -165,6 +165,15 @@ +
+ + + Quicklog Feature Description +
+
+ + + + Quicklog Feature Description +
+
+ + + +
From e6238dbf66352de91bf9666cda1365fe2650a3f8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:36:08 +0100 Subject: [PATCH 22/82] fixed typo --- application/models/User_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index b43e25db1..776eb3b0a 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -220,7 +220,7 @@ class User_Model extends CI_Model { 'user_default_band' => xss_clean($fields['user_default_band']), 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : ''), 'user_qso_end_times' => xss_clean($fields['user_qso_end_times']), - 'user_quicklog' => xss_clean($field['user_quicklog']), + 'user_quicklog' => xss_clean($fields['user_quicklog']), 'language' => xss_clean($fields['language']), 'winkey' => xss_clean($fields['user_winkey']), ); From 9fd7c5c8b4971a89a5d7ebcc9d42b646e091e9ad Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:43:38 +0100 Subject: [PATCH 23/82] corrected migration --- application/migrations/151_user_quicklog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/migrations/151_user_quicklog.php b/application/migrations/151_user_quicklog.php index f55fb23c2..3d47d853c 100644 --- a/application/migrations/151_user_quicklog.php +++ b/application/migrations/151_user_quicklog.php @@ -7,7 +7,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * QUICKLOG Feature */ -class Migration_quicklog extends CI_Migration { +class Migration_user_quicklog extends CI_Migration { public function up() { From 6503787f26bd2830500d6e15d8efb26578f63785 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:57:09 +0100 Subject: [PATCH 24/82] added Translations --- application/language/bulgarian/account_lang.php | 2 ++ .../language/chinese_simplified/account_lang.php | 2 ++ application/language/czech/account_lang.php | 2 ++ application/language/dutch/account_lang.php | 2 ++ application/language/english/account_lang.php | 2 ++ application/language/finnish/account_lang.php | 2 ++ application/language/french/account_lang.php | 2 ++ application/language/german/account_lang.php | 2 ++ application/language/greek/account_lang.php | 2 ++ application/language/italian/account_lang.php | 2 ++ application/language/polish/account_lang.php | 2 ++ application/language/russian/account_lang.php | 2 ++ application/language/spanish/account_lang.php | 2 ++ application/language/swedish/account_lang.php | 6 ++++-- application/language/turkish/account_lang.php | 2 ++ application/views/user/add.php | 10 +++++----- application/views/user/edit.php | 4 ++-- 17 files changed, 39 insertions(+), 9 deletions(-) diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index 71f8718b4..c0f3bbe68 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 069c0a14c..a6a1bf466 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = '时区'; $lang['account_date_format'] = '日期格式'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = '距离单位偏好'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '选择您登录账户时要显示的日期格式'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = '选择距离单位'; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index c295f5d18..5c84ec435 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Časové pásmo'; $lang['account_date_format'] = 'Formát data'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Nastavení měření'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Vyberte, jak chcete, aby byla data zobrazena při přihlášení do vašeho účtu.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Vyberte, v jakých jednotkách se budou zobrazovat vzdálenosti.'; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 32280eb63..eb7cebd5c 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 753a31654..439277aa6 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index c680f524b..baafb9be5 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Aikavyöhyke'; $lang['account_date_format'] = 'Päivämäärämuoto'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Mittayksikkömuoto'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Valitse, miten haluat päivämäärät näkyvän, kun olet kirjautunut tilillesi.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Valitse, mitä mittayksikkömuotoa käytetään'; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index db4d2c02a..149f92556 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Format de la date'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Unité de mesure'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '(Sélectionnez le format de date à afficher)'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = '(Choisiez l\'unité de mesure à afficher)'; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index 10e65ccf1..4339ce5ad 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Zeitzone'; $lang['account_date_format'] = 'Datumsformat'; $lang['account_log_end_time'] = 'Logge Endzeiten für QSOs separat'; $lang['account_log_end_time_hint'] = 'Wenn aktiviert, werden QSO Endzeiten separat erfasst. Falls nicht, ist die QSO Endzeit gleich der Startzeit.'; +$lang['account_quicklog_feature'] = "Quicklog Feld"; +$lang['account_quicklog_feature_hint'] = "Mit dieser Option kannst du Rufzeichen auch direkt aus dem Suchfeld in der Menüleiste heraus loggen."; $lang['account_measurement_preferences'] = 'Entfernungsformat'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Wähle, wie Datumsfelder angezeigt werden sollen, wenn du eingeloggt bist.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Wähle, in welcher Einheit Entfernungen angezeigt werden sollen.'; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index a4f5d22b9..f4d6c6141 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index 65cad6b64..70cdffd02 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index 873da71ed..4be7683a9 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index 514972412..23aee7c44 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Часовой пояс'; $lang['account_date_format'] = 'Формат даты'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Единицы измерения'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Выберите представление даты для отображения в вашем аккаунте.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Выберите единицы измерения расстояния'; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index f5d04adf5..f08f063e2 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index b9e403950..8546e8cf7 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -13,8 +13,8 @@ $lang['account_create_user_account'] = 'Skapa användarkonto'; $lang['account_edit_account'] = 'Redigera användarkonto'; $lang['account_account_information'] = 'Användarkontoinformation'; -$lang['account_user'] = "User"; -$lang['account_word_edited'] = "edited"; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Användarnamn'; $lang['account_email_address'] = 'E-postadress'; $lang['account_password'] = 'Lösenord'; @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Tidszon'; $lang['account_date_format'] = 'Datumformat'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Välj hur du vill att datum ska visas när du är inloggad på ditt konto.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Välj i vilken enhetsavstånd som ska visas'; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 8dbffce28..ca11e7153 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/views/user/add.php b/application/views/user/add.php index 86c26097e..843ad5dd6 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -166,13 +166,13 @@
- + - Quicklog Feature Description -
+ +
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 45bbf73f0..b036c46d5 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -175,12 +175,12 @@
- + - Quicklog Feature Description +
From 605119f92fb79c1af07255cd630e2d0d22c52847 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 19:06:35 +0100 Subject: [PATCH 25/82] added translations --- application/language/bulgarian/menu_lang.php | 8 +++++--- application/language/chinese_simplified/menu_lang.php | 2 ++ application/language/czech/menu_lang.php | 2 ++ application/language/dutch/menu_lang.php | 2 ++ application/language/english/menu_lang.php | 2 ++ application/language/finnish/menu_lang.php | 2 ++ application/language/french/menu_lang.php | 2 ++ application/language/german/menu_lang.php | 2 ++ application/language/greek/menu_lang.php | 2 ++ application/language/italian/menu_lang.php | 2 ++ application/language/polish/menu_lang.php | 2 ++ application/language/russian/menu_lang.php | 2 ++ application/language/spanish/menu_lang.php | 2 ++ application/language/swedish/menu_lang.php | 2 ++ application/language/turkish/menu_lang.php | 2 ++ application/views/interface_assets/header.php | 4 ++-- 16 files changed, 35 insertions(+), 5 deletions(-) diff --git a/application/language/bulgarian/menu_lang.php b/application/language/bulgarian/menu_lang.php index e7c8a4686..805cdfb24 100644 --- a/application/language/bulgarian/menu_lang.php +++ b/application/language/bulgarian/menu_lang.php @@ -11,7 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; -$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; @@ -86,6 +88,6 @@ $lang['menu_help'] = 'Help'; $lang['menu_forum'] = 'Forum'; $lang['menu_logout'] = 'Logout'; -$lang['menu_ffma'] = "Fred Fish Memorial Award"; -$lang['menu_ja_gridmaster'] = 'JA Gridmaster'; +$lang['menu_ffma'] = "Fred Fish Memorial Award"; +$lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 24c7b816b..e2816873d 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = '更新国家文件'; $lang['menu_debug_information'] = '调试信息'; $lang['menu_search_text'] = '搜索呼号'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = '搜索'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = '登录'; $lang['menu_account'] = '账户'; diff --git a/application/language/czech/menu_lang.php b/application/language/czech/menu_lang.php index 0281ab9d4..3c2a00566 100644 --- a/application/language/czech/menu_lang.php +++ b/application/language/czech/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Aktualizace souborů'; $lang['menu_debug_information'] = 'Informace pro ladění'; $lang['menu_search_text'] = 'Hledat značku'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Hledat'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Přihlásit se'; $lang['menu_account'] = 'Účet'; diff --git a/application/language/dutch/menu_lang.php b/application/language/dutch/menu_lang.php index b2abb3543..e863dfe30 100644 --- a/application/language/dutch/menu_lang.php +++ b/application/language/dutch/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/english/menu_lang.php b/application/language/english/menu_lang.php index 56561034d..46a399376 100644 --- a/application/language/english/menu_lang.php +++ b/application/language/english/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_themes'] = 'Themes'; $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_search_button'] = 'Search'; $lang['menu_login_button'] = 'Login'; diff --git a/application/language/finnish/menu_lang.php b/application/language/finnish/menu_lang.php index 2cf11dcc4..17041bb70 100644 --- a/application/language/finnish/menu_lang.php +++ b/application/language/finnish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Päivitä Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Etsi kutsulla'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Etsi'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Kirjaudu'; $lang['menu_account'] = 'Käyttäjätili'; diff --git a/application/language/french/menu_lang.php b/application/language/french/menu_lang.php index 56561034d..46a399376 100644 --- a/application/language/french/menu_lang.php +++ b/application/language/french/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_themes'] = 'Themes'; $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_search_button'] = 'Search'; $lang['menu_login_button'] = 'Login'; diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 8a0c244e3..7bf9d0e1b 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Länderinformationen'; $lang['menu_debug_information'] = 'Debug Informationen'; $lang['menu_search_text'] = 'Rufzeichensuche'; +$lang['menu_search_text_quicklog'] = "Logge/Suche Call"; //"Rufzeichen" wäre zu lang, daher nur "Call". Das wird verstanden. $lang['menu_search_button'] = 'Suche'; +$lang['menu_search_button_qicksearch_log'] = "Logge"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Konto'; diff --git a/application/language/greek/menu_lang.php b/application/language/greek/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/greek/menu_lang.php +++ b/application/language/greek/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/italian/menu_lang.php b/application/language/italian/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/italian/menu_lang.php +++ b/application/language/italian/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/polish/menu_lang.php b/application/language/polish/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/polish/menu_lang.php +++ b/application/language/polish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/russian/menu_lang.php b/application/language/russian/menu_lang.php index f812cc5e4..e773f528a 100644 --- a/application/language/russian/menu_lang.php +++ b/application/language/russian/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Обновить файлы стран'; $lang['menu_debug_information'] = 'Отладочная информация'; $lang['menu_search_text'] = 'Поиск позывного'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Поиск'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Вход'; $lang['menu_account'] = 'Аккаунт'; diff --git a/application/language/spanish/menu_lang.php b/application/language/spanish/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/spanish/menu_lang.php +++ b/application/language/spanish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/swedish/menu_lang.php b/application/language/swedish/menu_lang.php index 786d8e1a6..95e2a6d6d 100644 --- a/application/language/swedish/menu_lang.php +++ b/application/language/swedish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Uppdatera landsfiler'; $lang['menu_debug_information'] = 'Debug Info'; $lang['menu_search_text'] = 'Sök Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Sök'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Logga in'; $lang['menu_account'] = 'Konto'; diff --git a/application/language/turkish/menu_lang.php b/application/language/turkish/menu_lang.php index ef9418a16..c511cf4be 100644 --- a/application/language/turkish/menu_lang.php +++ b/application/language/turkish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 4866a32d5..2e4620324 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -224,8 +224,8 @@ session->userdata('user_quicklog') == 1) { ?> - - + + From 04ff8d7434330e98e06704f8e37582de407cf1c8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:15:36 +0100 Subject: [PATCH 26/82] implemented search and qso redirect --- application/views/interface_assets/header.php | 41 +++++++++++++++---- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 2e4620324..542736699 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -171,7 +171,7 @@
-
+
SAT Timers
@@ -221,17 +221,42 @@ - + + session->userdata('user_quicklog') == 1) { ?> -
+ - - + + + + + - +
- + @@ -366,4 +391,4 @@ - + \ No newline at end of file From 171dabec1810095083a31344f0d4f802973099c3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:34:08 +0100 Subject: [PATCH 27/82] replaced js to save ressources if ql. is disabled --- application/views/interface_assets/header.php | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 542736699..7680a1eb2 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -164,7 +164,9 @@
  • - +
    Hams.at optionslib->get_option('dxcache_url') != '') { ?> @@ -178,7 +180,9 @@ config->item('use_auth')) && ($this->session->userdata('user_type') == 99)) { ?>
  • - +
    @@ -221,24 +225,23 @@ - - session->userdata('user_quicklog') == 1) { ?> +
    From 1902bf1fb2ede7cf0fb39044c994fd8ab6a75616 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:36:54 +0100 Subject: [PATCH 28/82] removed 1st quicklog draft from dashboard --- application/views/dashboard/index.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 52e41a824..2e66e543d 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -188,15 +188,6 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
    - - - - - - -
    • From c9a9ebe7edd410a70149823ee688fe4687061682 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:39:48 +0100 Subject: [PATCH 29/82] set quicklog to live qso mode --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 7680a1eb2..d070f5436 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -237,7 +237,7 @@ form.action = ""; form.method = "get"; input.name = "manual"; - input.value = "1"; + input.value = "0"; // Set to 1 if go to "Post-QSO" logging } form.submit(); } From 3c1d08f4cbfb3e0049a21e3854f4584fce232317 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 23:05:24 +0100 Subject: [PATCH 30/82] added handlekeyPress --- application/views/interface_assets/header.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index d070f5436..c95c364f8 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -241,9 +241,14 @@ } form.submit(); } + function handleKeyPress(event) { + if (event.key === 'Enter') { + submitForm('qso'); // Treat Enter key press as clicking the 'quicksearch-log' button + } + }
    - +
    ' + '' + '' + - '' + - '' + + '' + + '' + '' + '' + '
    #Year# of QSO\'s worked ' + lang_statistics_year +'' + lang_statistics_number_of_qso_worked + '
    '); @@ -114,7 +114,7 @@ function totalQsosPerYear() { data: { labels: labels, datasets: [{ - label: 'Number of QSO\'s worked each year', + label: lang_statistics_number_of_qso_worked_each_year, data: dataQso, backgroundColor: 'rgba(54, 162, 235, 0.2)', borderColor: 'rgba(54, 162, 235, 1)', @@ -187,14 +187,14 @@ function totalModeQsos() { if (dataQso[0] === null && dataQso[1] === null && dataQso[2] === null && dataQso[3] === null) return; - $(".mode").append('

    Modes


    '); + $(".mode").append('

    ' + lang_statistics_modes + '


    '); // appending table to hold the data $("#modeTable").append('' + '' + '' + - '' + - '' + + '' + + '' + '' + '' + '
    #Mode# of QSO\'s worked ' + lang_gen_hamradio_mode + ' ' + lang_statistics_number_of_qso_worked + '
    '); @@ -307,14 +307,14 @@ function totalBandQsos() { success: function (data) { if (data.length > 0) { - $(".band").append('

    Bands


    '); + $(".band").append('

    ' + lang_statistics_bands + '


    '); // appending table to hold the data $("#bandTable").append('' + '' + '' + - '' + - '' + + '' + + '' + '' + '' + '
    #Band# of QSO\'s worked ' + lang_gen_hamradio_band + '' + lang_statistics_number_of_qso_worked + '
    '); From cd685aaa7112c89c01c7842b81f00ee8a07bb76d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 17:44:58 +0100 Subject: [PATCH 48/82] added general word 'Count' --- application/language/bulgarian/general_words_lang.php | 1 + application/language/chinese_simplified/general_words_lang.php | 1 + application/language/czech/general_words_lang.php | 1 + application/language/dutch/general_words_lang.php | 1 + application/language/english/general_words_lang.php | 1 + application/language/finnish/general_words_lang.php | 1 + application/language/french/general_words_lang.php | 1 + application/language/german/general_words_lang.php | 1 + application/language/greek/general_words_lang.php | 1 + application/language/italian/general_words_lang.php | 1 + application/language/polish/general_words_lang.php | 1 + application/language/russian/general_words_lang.php | 1 + application/language/spanish/general_words_lang.php | 1 + application/language/swedish/general_words_lang.php | 1 + application/language/turkish/general_words_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 4e619f9a3..d66e6ee6f 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Час'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index c3080bb91..56b918925 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = '日期'; $lang['general_word_time'] = '时间'; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index c42a6ddea..e16b6ecfb 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Čas'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 06219892e..27348132c 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Tijd'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index c35c8ea72..8c6a14a29 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Time'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 0e63aba00..ebede7898 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Päivä'; $lang['general_word_time'] = 'Aika'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index 604907f8f..b0a215b13 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Heure'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 88d2a13c5..43e192d94 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Eingeschaltet"; $lang['general_word_disabled'] = "Ausgeschaltet"; $lang['general_word_export'] = "Exportieren"; $lang['general_word_import'] = "Importieren"; +$lang['general_word_count'] = "Zähler"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Zeit'; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 14575f4d8..fcf5e411f 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Ημερομηνία'; $lang['general_word_time'] = 'Ωρα'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index ea373ad88..94ded311a 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Orario'; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index b1e767a68..a4db13ad1 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Godzina'; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index b3afddc3b..da8992ab0 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Время'; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 77ac3a56f..bf3543cbe 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Fecha'; $lang['general_word_time'] = 'Hora'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index e411f5df1..7c16b4bfc 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_ok'] = "OK"; $lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; +$lang['general_word_count'] = "Count"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index cc81e2717..fd83aa73b 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -21,6 +21,7 @@ $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; +$lang['general_word_count'] = "Count"; $lang['general_word_date'] = 'Tarih'; $lang['general_word_time'] = 'Saat'; From 9d02cb13c0b162554794b2fb2a7792dca936e89c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 17:45:53 +0100 Subject: [PATCH 49/82] created lang file for bulgarian --- .../language/bulgarian/gridsquares_lang.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 application/language/bulgarian/gridsquares_lang.php diff --git a/application/language/bulgarian/gridsquares_lang.php b/application/language/bulgarian/gridsquares_lang.php new file mode 100644 index 000000000..07bc32c96 --- /dev/null +++ b/application/language/bulgarian/gridsquares_lang.php @@ -0,0 +1,36 @@ + Date: Sun, 5 Nov 2023 17:46:13 +0100 Subject: [PATCH 50/82] added various translations --- .../language/chinese_simplified/gridsquares_lang.php | 6 ++++++ application/language/czech/gridsquares_lang.php | 6 ++++++ application/language/dutch/gridsquares_lang.php | 8 +++++++- application/language/english/gridsquares_lang.php | 8 +++++++- application/language/finnish/gridsquares_lang.php | 6 ++++++ application/language/french/gridsquares_lang.php | 6 ++++++ application/language/german/gridsquares_lang.php | 7 +++++++ application/language/greek/gridsquares_lang.php | 8 +++++++- application/language/italian/gridsquares_lang.php | 8 +++++++- application/language/polish/gridsquares_lang.php | 8 +++++++- application/language/russian/gridsquares_lang.php | 6 ++++++ application/language/spanish/gridsquares_lang.php | 8 +++++++- application/language/swedish/gridsquares_lang.php | 6 ++++++ application/language/turkish/gridsquares_lang.php | 8 +++++++- 14 files changed, 92 insertions(+), 7 deletions(-) diff --git a/application/language/chinese_simplified/gridsquares_lang.php b/application/language/chinese_simplified/gridsquares_lang.php index a2d127dd4..02bac7ec9 100644 --- a/application/language/chinese_simplified/gridsquares_lang.php +++ b/application/language/chinese_simplified/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = '网格地图'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = '已确认的网格是绿色'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = '已工作但未确认的网格是红色'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = '网格'; $lang['gridsquares_total_count'] = '总数'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = '频率'; $lang['gridsquares_mode'] = '模式'; $lang['gridsquares_sat'] = '卫星'; $lang['gridsquares_confirmation'] = '确认'; $lang['gridsquares_button_plot'] = '绘制'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = '网格'; $lang['gridsquares_gridsquares_confirmed'] = '已确认的网格'; diff --git a/application/language/czech/gridsquares_lang.php b/application/language/czech/gridsquares_lang.php index 13ffd30d8..ccb193971 100644 --- a/application/language/czech/gridsquares_lang.php +++ b/application/language/czech/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Mapa lokátorů'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Potvrzené lokátory jsou zeleně'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Odpracované, ale nepotvrzené lokátory jsou červeně'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'lokátor'; $lang['gridsquares_total_count'] = 'Celkový počet'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Pásmo'; $lang['gridsquares_mode'] = 'Režim'; $lang['gridsquares_sat'] = 'Satelit'; $lang['gridsquares_confirmation'] = 'Potvrzení'; $lang['gridsquares_button_plot'] = 'Zobrazit'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Lokátory'; $lang['gridsquares_gridsquares_confirmed'] = 'Potvrzené lokátory'; diff --git a/application/language/dutch/gridsquares_lang.php b/application/language/dutch/gridsquares_lang.php index d8d4a1b74..38f2447fd 100644 --- a/application/language/dutch/gridsquares_lang.php +++ b/application/language/dutch/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('Directe toegang tot scripts is niet toegestaan'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/english/gridsquares_lang.php b/application/language/english/gridsquares_lang.php index 0b18933e2..07bc32c96 100644 --- a/application/language/english/gridsquares_lang.php +++ b/application/language/english/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_worked'] = 'Gridsquares worked'; diff --git a/application/language/finnish/gridsquares_lang.php b/application/language/finnish/gridsquares_lang.php index af17febc7..84a0dfb9e 100644 --- a/application/language/finnish/gridsquares_lang.php +++ b/application/language/finnish/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Gridsquare-kartta'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Vahvistetut ovat vihreitä'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Workitut, mutta ei vahvistetut ovat punaisena'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Bandi'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satelliitti'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Merkitse'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/french/gridsquares_lang.php b/application/language/french/gridsquares_lang.php index d1611bf69..b3e3151b5 100644 --- a/application/language/french/gridsquares_lang.php +++ b/application/language/french/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Carte des Locators'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmé en Vert'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Contacté, mais non confirmé en Rouge'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'Grilles des Locators'; $lang['gridsquares_total_count'] = 'Total'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Bande'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmé'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Locators'; $lang['gridsquares_gridsquares_confirmed'] = 'Locators confirmés'; diff --git a/application/language/german/gridsquares_lang.php b/application/language/german/gridsquares_lang.php index 9d9fb621f..40eba1c21 100644 --- a/application/language/german/gridsquares_lang.php +++ b/application/language/german/gridsquares_lang.php @@ -3,6 +3,9 @@ defined('BASEPATH') OR exit('Direkter Zugriff auf Skripte ist nicht erlaubt'); $lang['gridsquares_gridsquare_map'] = 'Planquadratkarte'; +$lang['gridsquares_activated_gridsquare_map'] = "Aktivierte Planquadrate Karte"; +$lang['gridsquares_gridsquare_activators'] = "Planquadrat-Aktivierer"; + $lang['gridsquares_confirmed_is_green'] = 'Bestätigt ist grün'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Gearbeitet aber nicht bestätigt ist rot'; @@ -12,6 +15,9 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'Planquadrate'; $lang['gridsquares_total_count'] = 'Summe'; +$lang['gridsquares_minimum_count'] = "Minimale Anzahl"; +$lang['gridsquares_show_qsos'] = "Zeige QSO's"; +$lang['gridsquares_show_map'] = "Zeige Karte"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; @@ -19,6 +25,7 @@ $lang['gridsquares_sat'] = 'Satellit'; $lang['gridsquares_confirmation'] = 'Bestätigung'; $lang['gridsquares_button_plot'] = 'Kartieren'; +$lang['gridsquares_button_clear_markers'] = "Lösche Markierungen"; $lang['gridsquares_gridsquares'] = 'Planquadrate'; $lang['gridsquares_gridsquares_worked'] = 'Gearbeitete Planquadrate'; diff --git a/application/language/greek/gridsquares_lang.php b/application/language/greek/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/greek/gridsquares_lang.php +++ b/application/language/greek/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/italian/gridsquares_lang.php b/application/language/italian/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/italian/gridsquares_lang.php +++ b/application/language/italian/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/polish/gridsquares_lang.php b/application/language/polish/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/polish/gridsquares_lang.php +++ b/application/language/polish/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/russian/gridsquares_lang.php b/application/language/russian/gridsquares_lang.php index 3f7ccdd29..6c5e2a5c7 100644 --- a/application/language/russian/gridsquares_lang.php +++ b/application/language/russian/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Карта квадратов'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Подтверждённые окрашены зелёным'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Сработанные, но не подтверждённые окрвшены красным'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'квадрат(/-а/-ов)'; $lang['gridsquares_total_count'] = 'Всего'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Диапазон'; $lang['gridsquares_mode'] = 'Вид излучения'; $lang['gridsquares_sat'] = 'Спутник'; $lang['gridsquares_confirmation'] = 'Подтверждение'; $lang['gridsquares_button_plot'] = 'Отобразить'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Квадраты'; $lang['gridsquares_gridsquares_confirmed'] = 'Подтверждёно квадратов'; diff --git a/application/language/spanish/gridsquares_lang.php b/application/language/spanish/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/spanish/gridsquares_lang.php +++ b/application/language/spanish/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; diff --git a/application/language/swedish/gridsquares_lang.php b/application/language/swedish/gridsquares_lang.php index 32b06bd02..67a9856a4 100644 --- a/application/language/swedish/gridsquares_lang.php +++ b/application/language/swedish/gridsquares_lang.php @@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Gridsquare karta'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Bekräftat är grönt'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Fungerade men inte bekräftat är röd'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Totalt antal'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Bekräftelse'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares bekräftad'; diff --git a/application/language/turkish/gridsquares_lang.php b/application/language/turkish/gridsquares_lang.php index cecb256c8..c049e319f 100644 --- a/application/language/turkish/gridsquares_lang.php +++ b/application/language/turkish/gridsquares_lang.php @@ -2,7 +2,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; +$lang['gridsquares_gridsquare_map'] = 'Gridsquare Map'; +$lang['gridsquares_activated_gridsquare_map'] = "Activated Gridsquare Map"; +$lang['gridsquares_gridsquare_activators'] = "Gridsquare Activators"; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; @@ -13,12 +15,16 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_minimum_count'] = "Minimum Count"; +$lang['gridsquares_show_qsos'] = "Show QSO's"; +$lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; $lang['gridsquares_button_plot'] = 'Plot'; +$lang['gridsquares_button_clear_markers'] = "Clear Markers"; $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; From 7c0b4486a5363fb2aee5f3e4e60e1b0245832bb8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 17:46:30 +0100 Subject: [PATCH 51/82] Multilanguage Support --- application/views/activated_gridmap/index.php | 10 +++++----- application/views/activators/index.php | 20 +++++++++---------- application/views/gridmap/index.php | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index 2e8c43a28..7c8e055f9 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -44,12 +44,12 @@
    -

    +

    disabled> - + ' . $sat . ''."\n"; } ?> @@ -71,7 +71,7 @@ - + input->post('band') == $band) echo ' selected'; @@ -27,7 +27,7 @@
    - +
    - + - + submode ?? '' == '') { @@ -109,7 +109,7 @@
    - + session->flashdata('message')) { ?> From 83ca8f84b35c2fc00bc5b45594548c667ca5fb60 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:29:44 +0100 Subject: [PATCH 52/82] translation for filter view --- application/controllers/Distances.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Distances.php b/application/controllers/Distances.php index 3d57c9817..1854fb5b8 100644 --- a/application/controllers/Distances.php +++ b/application/controllers/Distances.php @@ -77,7 +77,7 @@ class Distances extends CI_Controller { // Render Page $data['page_title'] = "Log View - " . $distance; - $data['filter'] = "Filtering on QSOs with " . $distance . " and band ".$band; + $data['filter'] = lang('statistics_distances_qsos_with') . " " . $distance . " " . lang('statistics_distances_and_band'). " " . $band; $this->load->view('awards/details', $data); } } From a49def505489341a133cd548c1df4a242b188012 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:30:10 +0100 Subject: [PATCH 53/82] added general word for filtering in --- application/language/bulgarian/general_words_lang.php | 1 + application/language/chinese_simplified/general_words_lang.php | 1 + application/language/czech/general_words_lang.php | 1 + application/language/dutch/general_words_lang.php | 1 + application/language/english/general_words_lang.php | 1 + application/language/finnish/general_words_lang.php | 1 + application/language/french/general_words_lang.php | 1 + application/language/german/general_words_lang.php | 1 + application/language/greek/general_words_lang.php | 1 + application/language/italian/general_words_lang.php | 1 + application/language/polish/general_words_lang.php | 1 + application/language/russian/general_words_lang.php | 1 + application/language/spanish/general_words_lang.php | 1 + application/language/swedish/general_words_lang.php | 1 + application/language/turkish/general_words_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index d66e6ee6f..eea1e3186 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Час'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 56b918925..557865471 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = '日期'; $lang['general_word_time'] = '时间'; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index e16b6ecfb..9bbf698cb 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Čas'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 27348132c..1d6841e2d 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Tijd'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 8c6a14a29..465f64104 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Time'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index ebede7898..7933ad476 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Päivä'; $lang['general_word_time'] = 'Aika'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index b0a215b13..ed63f9e69 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Heure'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 43e192d94..8db313183 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Ausgeschaltet"; $lang['general_word_export'] = "Exportieren"; $lang['general_word_import'] = "Importieren"; $lang['general_word_count'] = "Zähler"; +$lang['general_word_filtering_on'] = "Filtern auf"; $lang['general_word_date'] = 'Datum'; $lang['general_word_time'] = 'Zeit'; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index fcf5e411f..49926502a 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Ημερομηνία'; $lang['general_word_time'] = 'Ωρα'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index 94ded311a..fb82644a2 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Orario'; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index a4db13ad1..e69c6a2b5 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Data'; $lang['general_word_time'] = 'Godzina'; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index da8992ab0..74443b1b9 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Дата'; $lang['general_word_time'] = 'Время'; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index bf3543cbe..f21e4fc84 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Fecha'; $lang['general_word_time'] = 'Hora'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index 7c16b4bfc..06cba4c23 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index fd83aa73b..7abc0e081 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -22,6 +22,7 @@ $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; $lang['general_word_import'] = "Import"; $lang['general_word_count'] = "Count"; +$lang['general_word_filtering_on'] = "Filtering on"; $lang['general_word_date'] = 'Tarih'; $lang['general_word_time'] = 'Saat'; From 61e331335529cceefdcb12d06ba46f98b9cb6e8d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:30:35 +0100 Subject: [PATCH 54/82] added various translations --- application/language/bulgarian/statistics_lang.php | 10 +++++++++- .../language/chinese_simplified/statistics_lang.php | 10 +++++++++- application/language/czech/statistics_lang.php | 10 +++++++++- application/language/dutch/statistics_lang.php | 10 +++++++++- application/language/english/statistics_lang.php | 10 +++++++++- application/language/finnish/statistics_lang.php | 10 +++++++++- application/language/french/statistics_lang.php | 10 +++++++++- application/language/german/statistics_lang.php | 8 ++++++++ application/language/greek/statistics_lang.php | 10 +++++++++- application/language/italian/statistics_lang.php | 10 +++++++++- application/language/polish/statistics_lang.php | 10 +++++++++- application/language/russian/statistics_lang.php | 10 +++++++++- application/language/spanish/statistics_lang.php | 10 +++++++++- application/language/swedish/statistics_lang.php | 10 +++++++++- application/language/turkish/statistics_lang.php | 10 +++++++++- 15 files changed, 134 insertions(+), 14 deletions(-) diff --git a/application/language/bulgarian/statistics_lang.php b/application/language/bulgarian/statistics_lang.php index 185043983..d4fac83f2 100644 --- a/application/language/bulgarian/statistics_lang.php +++ b/application/language/bulgarian/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/chinese_simplified/statistics_lang.php b/application/language/chinese_simplified/statistics_lang.php index 49b8ad3d4..140597870 100644 --- a/application/language/chinese_simplified/statistics_lang.php +++ b/application/language/chinese_simplified/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = '总计'; $lang['statistics_year'] = '年'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/czech/statistics_lang.php b/application/language/czech/statistics_lang.php index 3fddb6651..f735256a7 100644 --- a/application/language/czech/statistics_lang.php +++ b/application/language/czech/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Celkem'; $lang['statistics_year'] = 'Rok'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/dutch/statistics_lang.php b/application/language/dutch/statistics_lang.php index 608a7c0b6..dafcb122c 100644 --- a/application/language/dutch/statistics_lang.php +++ b/application/language/dutch/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/english/statistics_lang.php b/application/language/english/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/english/statistics_lang.php +++ b/application/language/english/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/finnish/statistics_lang.php b/application/language/finnish/statistics_lang.php index 06728d65f..db3ef6a82 100644 --- a/application/language/finnish/statistics_lang.php +++ b/application/language/finnish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Yhteensä'; $lang['statistics_year'] = 'Vuosi'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/french/statistics_lang.php b/application/language/french/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/french/statistics_lang.php +++ b/application/language/french/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/german/statistics_lang.php b/application/language/german/statistics_lang.php index 2228bd0ab..282d12ea6 100644 --- a/application/language/german/statistics_lang.php +++ b/application/language/german/statistics_lang.php @@ -19,4 +19,12 @@ $lang['statistics_year'] = 'Jahr'; $lang['statistics_number_of_qso_worked_each_year'] = "Anzahl der QSOs gearbeitet pro Jahr"; $lang['statistics_number_of_qso_worked'] = "# gearbeitete QSOs"; +$lang['statistics_distances_worked'] = "Gearbeitete Entfernungen"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "Kontakte wurden dargestellt.
    Der weiteste Kontakt war"; // make sure'
    ' stays there +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "im Planquadrat"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "Die Distanz betrug"; +$lang['statistics_distances_number_of_qsos'] = "Anzahl der QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Gearbeitete(s) Rufzeichen (max 5 werden gezeigt)"; +$lang['statistics_distances_qsos_with'] = "QSOs mit"; +$lang['statistics_distances_and_band'] = "und Band"; diff --git a/application/language/greek/statistics_lang.php b/application/language/greek/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/greek/statistics_lang.php +++ b/application/language/greek/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/italian/statistics_lang.php b/application/language/italian/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/italian/statistics_lang.php +++ b/application/language/italian/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/polish/statistics_lang.php b/application/language/polish/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/polish/statistics_lang.php +++ b/application/language/polish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/russian/statistics_lang.php b/application/language/russian/statistics_lang.php index 4a8242bfa..2109e4289 100644 --- a/application/language/russian/statistics_lang.php +++ b/application/language/russian/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Всего'; $lang['statistics_year'] = 'Год'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/spanish/statistics_lang.php b/application/language/spanish/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/spanish/statistics_lang.php +++ b/application/language/spanish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/swedish/statistics_lang.php b/application/language/swedish/statistics_lang.php index 6117243e0..aed05485c 100644 --- a/application/language/swedish/statistics_lang.php +++ b/application/language/swedish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'År'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; diff --git a/application/language/turkish/statistics_lang.php b/application/language/turkish/statistics_lang.php index 2c22553cf..4383f11b8 100644 --- a/application/language/turkish/statistics_lang.php +++ b/application/language/turkish/statistics_lang.php @@ -16,7 +16,15 @@ $lang['statistics_total'] = 'Total'; $lang['statistics_year'] = 'Year'; -$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSO's worked each year"; +$lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +$lang['statistics_distances_worked'] = "Distances Worked"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; +$lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; +$lang['statistics_distances_qsos_with'] = "QSOs with"; +$lang['statistics_distances_and_band'] = "and band"; From f98ee999edd17d18db1f6910073bfe1ec8eedcb4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:31:07 +0100 Subject: [PATCH 55/82] added Translation for Filtering On --- application/views/activators/details.php | 2 +- application/views/awards/counties/details.php | 2 +- application/views/awards/details.php | 2 +- application/views/awards/vucc/band.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/activators/details.php b/application/views/activators/details.php index ca67ad2c8..52b59c929 100644 --- a/application/views/activators/details.php +++ b/application/views/activators/details.php @@ -1,4 +1,4 @@
    -
    Filtering on
    +
    load->view('view_log/partial/log_ajax') ?> diff --git a/application/views/awards/counties/details.php b/application/views/awards/counties/details.php index 48fe99fef..94852d23d 100644 --- a/application/views/awards/counties/details.php +++ b/application/views/awards/counties/details.php @@ -1,7 +1,7 @@

    -

    Filtering on

    +

    Filtering on +
    load->view('view_log/partial/log_ajax') ?> \ No newline at end of file diff --git a/application/views/awards/vucc/band.php b/application/views/awards/vucc/band.php index 98234b1f8..eab72d012 100644 --- a/application/views/awards/vucc/band.php +++ b/application/views/awards/vucc/band.php @@ -1,7 +1,7 @@

    -

    Filtering on

    +

    Date: Sun, 5 Nov 2023 19:31:23 +0100 Subject: [PATCH 56/82] translations --- application/views/distances/index.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/application/views/distances/index.php b/application/views/distances/index.php index 91bc1638e..2860cbb07 100644 --- a/application/views/distances/index.php +++ b/application/views/distances/index.php @@ -2,9 +2,17 @@
    -

    +

    @@ -18,9 +26,9 @@ } ?> - + - +
    From 79750c17de7749940f3e6be2ac17a8aae456d474 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:31:43 +0100 Subject: [PATCH 57/82] added general language --- application/views/interface_assets/footer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 8b12884a3..543724faf 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -26,6 +26,7 @@ var lang_general_word_confirmed = ""; var lang_general_word_worked_not_confirmed = ""; var lang_general_word_not_worked = ""; + var lang_admin_close = ""; From bce2c633b3317d086ef06b68be4936d925aff7c0 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:32:03 +0100 Subject: [PATCH 58/82] added Translation for Filtering On --- application/views/timeline/details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/timeline/details.php b/application/views/timeline/details.php index ca67ad2c8..52b59c929 100644 --- a/application/views/timeline/details.php +++ b/application/views/timeline/details.php @@ -1,4 +1,4 @@
    -
    Filtering on
    +
    load->view('view_log/partial/log_ajax') ?> From 27aad9c3744c09aff7bfd74931e2483e5a7e2d47 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:32:15 +0100 Subject: [PATCH 59/82] various translations --- assets/js/sections/distances.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/assets/js/sections/distances.js b/assets/js/sections/distances.js index a15f1635a..9b7cbe57e 100644 --- a/assets/js/sections/distances.js +++ b/assets/js/sections/distances.js @@ -28,7 +28,7 @@ function distPlot(form) { backgroundColor: getBodyBackground() }, title: { - text: 'Distance Distribution', + text: lang_statistics_distances_worked, style: { color: color } @@ -47,7 +47,7 @@ function distPlot(form) { }, yAxis: { title: { - text: '# QSOs', + text: lang_statistics_distances_number_of_qsos, style: { color: color } @@ -77,9 +77,9 @@ function distPlot(form) { tooltip: { formatter: function () { if(this.point) { - return "Distance: " + options.xAxis.categories[this.point.x] + - "
    Callsign(s) worked (max 5 shown): " + myComments[this.point.x] + - "
    Number of QSOs: " + series.data[this.point.x] + ""; + return lang_gen_hamradio_distance + ": " + options.xAxis.categories[this.point.x] + + "
    " + lang_statistics_distances_callsigns_worked + ": " + myComments[this.point.x] + + "
    " + lang_statistics_distances_number_of_qsos + ": " + series.data[this.point.x] + ""; } } }, @@ -108,16 +108,16 @@ function distPlot(form) { $.each(tmp.qsodata, function(){ myComments.push(this.calls); options.xAxis.categories.push(this.dist); - series.name = 'Number of QSOs'; + series.name = lang_statistics_distances_number_of_qsos; series.data.push(this.count); }); options.series.push(series); - $('#information').html(tmp.qrb.Qsos + " contacts were plotted.
    Your furthest contact was with " + tmp.qrb.Callsign - + " in gridsquare "+ tmp.qrb.Grid - +"; the distance was " - +tmp.qrb.Distance + tmp.unit +"."); + $('#information').html(tmp.qrb.Qsos + " " + lang_statistics_distances_part1_contacts_were_plotted_furthest + " " + tmp.qrb.Callsign + + " " + lang_statistics_distances_part2_contacts_were_plotted_furthest + " " + tmp.qrb.Grid + +". " + lang_statistics_distances_part3_contacts_were_plotted_furthest + " " + + tmp.qrb.Distance + tmp.unit + "."); var chart = new Highcharts.Chart(options); } @@ -166,7 +166,7 @@ function getDistanceQsos(distance) { }); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } From ff1a65d831435f3e7c44d082f9e3f095598ed7b4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 5 Nov 2023 19:38:34 +0100 Subject: [PATCH 60/82] Added Translation for 'Close' Button --- application/views/interface_assets/footer.php | 24 +++++++++---------- assets/js/sections/common.js | 8 +++---- assets/js/sections/ffma.js | 2 +- assets/js/sections/gridmap.js | 2 +- assets/js/sections/gridmaster.js | 2 +- assets/js/sections/ja_gridmaster.js | 2 +- assets/js/sections/labels.js | 2 +- assets/js/sections/logbookadvanced.js | 6 ++--- assets/js/sections/mode.js | 2 +- assets/js/sections/oqrs.js | 4 ++-- assets/js/sections/qslprint.js | 4 ++-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 543724faf..6f8d91ed0 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -336,7 +336,7 @@ $(function () { nl2br: false, message: 'You need to make a query before you search!', buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } @@ -457,7 +457,7 @@ $(function () { nl2br: false, message: html, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } @@ -516,7 +516,7 @@ $(function () { nl2br: false, message: 'You need to make a query before you search!', buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } @@ -2165,7 +2165,7 @@ $(document).ready(function(){ $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2231,7 +2231,7 @@ $(document).ready(function(){ $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2363,7 +2363,7 @@ function viewQsl(picture, callsign) { size: BootstrapDialog.SIZE_WIDE, message: $textAndPic, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogRef){ dialogRef.close(); } @@ -2425,7 +2425,7 @@ function viewEqsl(picture, callsign) { size: BootstrapDialog.SIZE_WIDE, message: $textAndPic, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogRef){ dialogRef.close(); } @@ -2490,7 +2490,7 @@ function viewEqsl(picture, callsign) { }); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2535,7 +2535,7 @@ function viewEqsl(picture, callsign) { }); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2657,7 +2657,7 @@ function viewEqsl(picture, callsign) { nl2br: false, message: html, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2802,7 +2802,7 @@ function viewEqsl(picture, callsign) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -2879,7 +2879,7 @@ function viewEqsl(picture, callsign) { nl2br: false, message: html, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 1fa33e57e..c1935f9f8 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -321,7 +321,7 @@ function spawnQrbCalculator(locator1, locator2) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -346,7 +346,7 @@ function spawnActivatorsMap(call, count, grids) { showActivatorsMap(call, count, grids); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -430,7 +430,7 @@ function spawnLookupModal(searchphrase, searchtype) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -534,7 +534,7 @@ function displayQsl(id) { }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index a3163156d..5055da811 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -127,7 +127,7 @@ function spawnGridsquareModal(loc_4char) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index 2abd226c8..f832ad1f9 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -150,7 +150,7 @@ function spawnGridsquareModal(loc_4char) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/gridmaster.js b/assets/js/sections/gridmaster.js index f197ec509..9d150d8ec 100644 --- a/assets/js/sections/gridmaster.js +++ b/assets/js/sections/gridmaster.js @@ -127,7 +127,7 @@ function spawnGridsquareModal(loc_4char) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/ja_gridmaster.js b/assets/js/sections/ja_gridmaster.js index f19e380cf..6859cdd57 100644 --- a/assets/js/sections/ja_gridmaster.js +++ b/assets/js/sections/ja_gridmaster.js @@ -128,7 +128,7 @@ function spawnGridsquareModal(loc_4char) { } }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function(dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/labels.js b/assets/js/sections/labels.js index c6aececac..01154689a 100644 --- a/assets/js/sections/labels.js +++ b/assets/js/sections/labels.js @@ -30,7 +30,7 @@ function printat(stationid) { onshown: function(dialog) { }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index dd9f9f070..b13664893 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -534,7 +534,7 @@ $(document).ready(function () { } }, { - label: 'Close', + label: lang_admin_close, cssClass: 'btn-sm', id: 'closeButton', action: function (dialogItself) { @@ -579,7 +579,7 @@ $(document).ready(function () { }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { $('#qslSlideshow').prop("disabled", false); dialogItself.close(); @@ -661,7 +661,7 @@ $(document).ready(function () { onshown: function(dialog) { }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { $('#printLabel').prop("disabled", false); dialogItself.close(); diff --git a/assets/js/sections/mode.js b/assets/js/sections/mode.js index 5a496f753..8caa2055d 100644 --- a/assets/js/sections/mode.js +++ b/assets/js/sections/mode.js @@ -43,7 +43,7 @@ function createModeDialog() { nl2br: false, message: html, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/oqrs.js b/assets/js/sections/oqrs.js index 4c7abae25..72e266204 100644 --- a/assets/js/sections/oqrs.js +++ b/assets/js/sections/oqrs.js @@ -331,7 +331,7 @@ function searchLog(callsign) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -361,7 +361,7 @@ function searchLogTimeDate(id) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } diff --git a/assets/js/sections/qslprint.js b/assets/js/sections/qslprint.js index f55caa57d..fe4eff25f 100644 --- a/assets/js/sections/qslprint.js +++ b/assets/js/sections/qslprint.js @@ -35,7 +35,7 @@ function openQsoList(callsign) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } @@ -99,7 +99,7 @@ function showOqrs(id) { $('[data-toggle="tooltip"]').tooltip(); }, buttons: [{ - label: 'Close', + label: lang_admin_close, action: function (dialogItself) { dialogItself.close(); } From 6d8804b1891a9e7dfe4b701761a94ff5e07dac60 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 12:29:33 +0100 Subject: [PATCH 61/82] changed quicklog form to text --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index eaf61e65c..abb948b32 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -264,7 +264,7 @@
    - + From 5d9d77c6ab80c4f314c831b41804e7aa29b11dfc Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:17:01 +0100 Subject: [PATCH 72/82] changed quicklog to localstorage --- application/views/interface_assets/header.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 8c5e8afeb..9a8bf8c4f 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -237,12 +237,16 @@ if (action === 'search') { form.action = ""; form.method = "post"; - } else if (action === 'qso') { - form.action = ""; // Set ?manual=0 to 1 if go to "Post-QSO" logging - form.method = "post"; } form.submit(); } + function logQuicklog() { + if (localStorage.getItem("quicklogCallsign") !== "") { + localStorage.removeItem("quicklogCallsign"); + } + localStorage.setItem("quicklogCallsign", $("input[name='searchBar']").val()); + window.open("", "_self"); + } session->userdata('user_quicklog_enter') == 1) { ?> - + - - From f270ddc1fcd160491568f0008a7a31894c07708b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:17:24 +0100 Subject: [PATCH 73/82] removed post value in callsign --- application/views/qso/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index bb98b60fc..3222af4bd 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -109,7 +109,7 @@
    optionslib->get_option('dxcache_url') != '') { ?>  - +
    From 2c7b588fa26d928f1c9f5233445e6ccc38bbf2f5 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:17:49 +0100 Subject: [PATCH 74/82] lookup logic if localstorage is not empty --- assets/js/sections/qso.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 197657f35..809bb88b3 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -1,10 +1,12 @@ $( document ).ready(function() { setTimeout(function() { - var callsignValue = $("#callsign").val(); - if (callsignValue != "") { - $("#mode").focus(); + var callsignValue = localStorage.getItem("quicklogCallsign"); + if (callsignValue !== "") { + console.log("wir sind in der Funktion"); + $("#callsign").val(callsignValue); + $("#mode").focus(); } - }, 100); + }, 100); var favs={}; get_fav(); From 56ff6fd8e5bbc8b3a4ded5d17f48490566d41343 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:19:47 +0100 Subject: [PATCH 75/82] empty localstorage after lookup --- assets/js/sections/qso.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 809bb88b3..a11467722 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -2,9 +2,9 @@ $( document ).ready(function() { setTimeout(function() { var callsignValue = localStorage.getItem("quicklogCallsign"); if (callsignValue !== "") { - console.log("wir sind in der Funktion"); $("#callsign").val(callsignValue); $("#mode").focus(); + localStorage.removeItem("quicklogCallsign"); } }, 100); var favs={}; From 0088d123998580c455aa2c0822a43d3c1950831d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 22:20:18 +0100 Subject: [PATCH 76/82] fixed enter action --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 9a8bf8c4f..41dfb5b09 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -260,7 +260,7 @@ From 14b2d8c4bc75efeae4baff0522ce5c3effc015c8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 6 Nov 2023 23:00:53 +0100 Subject: [PATCH 77/82] fixed enter problem --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 41dfb5b09..a89ce6b27 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -265,7 +265,7 @@ } - + +
    @@ -113,11 +113,11 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, # '.$ci->lang->line('general_word_date').' - Prefix + '.$ci->lang->line('gen_hamradio_prefix').' '.$ci->lang->line('general_word_country').' - Status - End Date - Show QSOs + '.$ci->lang->line('station_logbooks_status').' + '.$ci->lang->line('general_word_enddate').' + '.$ci->lang->line('gridsquares_show_qsos').' '; @@ -148,7 +148,7 @@ function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $ # '.$ci->lang->line('general_word_date').' '.$ci->lang->line('gen_hamradio_state').' - Show QSOs + '.$ci->lang->line('gridsquares_show_qsos').' '; @@ -159,7 +159,7 @@ function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $ ' . $i-- . ' ' . date($custom_date_format, $date_as_timestamp) . ' ' . $line->col_state . ' - col_state . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show + col_state . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').' '; } echo '
    '; @@ -173,10 +173,10 @@ function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, # '.$ci->lang->line('general_word_date').' - IOTA - Name - Prefix - Show QSOs + '.$ci->lang->line('gen_hamradio_iota').' + '.$ci->lang->line('general_word_name').' + '.$ci->lang->line('gen_hamradio_prefix').' + '.$ci->lang->line('gridsquares_show_qsos').' '; @@ -203,8 +203,8 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $ # '.$ci->lang->line('general_word_date').' - CQ Zone - Show QSOs + '.$ci->lang->line('gen_hamradio_cqzone').' + '.$ci->lang->line('gridsquares_show_qsos').' '; @@ -230,7 +230,7 @@ function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect, # '.$ci->lang->line('general_word_date').' '.$ci->lang->line('gen_hamradio_gridsquare').' - Show QSOs + '.$ci->lang->line('gridsquares_show_qsos').' '; From 4e7ed84ae6c23dce25ba58e5e236f2470a6de524 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 7 Nov 2023 22:11:58 +0100 Subject: [PATCH 80/82] added comments and timeline translation --- application/language/bulgarian/statistics_lang.php | 14 ++++++++++++++ .../chinese_simplified/statistics_lang.php | 14 ++++++++++++++ application/language/czech/statistics_lang.php | 14 ++++++++++++++ application/language/dutch/statistics_lang.php | 14 ++++++++++++++ application/language/english/statistics_lang.php | 14 ++++++++++++++ application/language/finnish/statistics_lang.php | 14 ++++++++++++++ application/language/french/statistics_lang.php | 14 ++++++++++++++ application/language/german/statistics_lang.php | 14 ++++++++++++++ application/language/greek/statistics_lang.php | 14 ++++++++++++++ application/language/italian/statistics_lang.php | 14 ++++++++++++++ application/language/polish/statistics_lang.php | 14 ++++++++++++++ application/language/russian/statistics_lang.php | 14 ++++++++++++++ application/language/spanish/statistics_lang.php | 14 ++++++++++++++ application/language/swedish/statistics_lang.php | 14 ++++++++++++++ application/language/turkish/statistics_lang.php | 14 ++++++++++++++ 15 files changed, 210 insertions(+) diff --git a/application/language/bulgarian/statistics_lang.php b/application/language/bulgarian/statistics_lang.php index d4fac83f2..a92ce98c5 100644 --- a/application/language/bulgarian/statistics_lang.php +++ b/application/language/bulgarian/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Year'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/chinese_simplified/statistics_lang.php b/application/language/chinese_simplified/statistics_lang.php index 140597870..d1b3e0ec1 100644 --- a/application/language/chinese_simplified/statistics_lang.php +++ b/application/language/chinese_simplified/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = '年'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/czech/statistics_lang.php b/application/language/czech/statistics_lang.php index f735256a7..dabf58d4f 100644 --- a/application/language/czech/statistics_lang.php +++ b/application/language/czech/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Rok'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/dutch/statistics_lang.php b/application/language/dutch/statistics_lang.php index dafcb122c..4709463cf 100644 --- a/application/language/dutch/statistics_lang.php +++ b/application/language/dutch/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Year'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/english/statistics_lang.php b/application/language/english/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/english/statistics_lang.php +++ b/application/language/english/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Year'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/finnish/statistics_lang.php b/application/language/finnish/statistics_lang.php index db3ef6a82..eb8feb45c 100644 --- a/application/language/finnish/statistics_lang.php +++ b/application/language/finnish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Vuosi'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/french/statistics_lang.php b/application/language/french/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/french/statistics_lang.php +++ b/application/language/french/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Year'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/german/statistics_lang.php b/application/language/german/statistics_lang.php index 282d12ea6..376dfc3b2 100644 --- a/application/language/german/statistics_lang.php +++ b/application/language/german/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Jahr'; $lang['statistics_number_of_qso_worked_each_year'] = "Anzahl der QSOs gearbeitet pro Jahr"; $lang['statistics_number_of_qso_worked'] = "# gearbeitete QSOs"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Gearbeitete Entfernungen"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "Kontakte wurden dargestellt.
    Der weiteste Kontakt war"; // make sure'
    ' stays there $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "im Planquadrat"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Gearbeitete(s) Rufzeichen (max $lang['statistics_distances_qsos_with'] = "QSOs mit"; $lang['statistics_distances_and_band'] = "und Band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Zeitleiste"; + diff --git a/application/language/greek/statistics_lang.php b/application/language/greek/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/greek/statistics_lang.php +++ b/application/language/greek/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Year'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/italian/statistics_lang.php b/application/language/italian/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/italian/statistics_lang.php +++ b/application/language/italian/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Year'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/polish/statistics_lang.php b/application/language/polish/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/polish/statistics_lang.php +++ b/application/language/polish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Year'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/russian/statistics_lang.php b/application/language/russian/statistics_lang.php index 2109e4289..27a442deb 100644 --- a/application/language/russian/statistics_lang.php +++ b/application/language/russian/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Год'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/spanish/statistics_lang.php b/application/language/spanish/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/spanish/statistics_lang.php +++ b/application/language/spanish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Year'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/swedish/statistics_lang.php b/application/language/swedish/statistics_lang.php index aed05485c..cbc119219 100644 --- a/application/language/swedish/statistics_lang.php +++ b/application/language/swedish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'År'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + diff --git a/application/language/turkish/statistics_lang.php b/application/language/turkish/statistics_lang.php index 4383f11b8..50a90e0d6 100644 --- a/application/language/turkish/statistics_lang.php +++ b/application/language/turkish/statistics_lang.php @@ -19,6 +19,12 @@ $lang['statistics_year'] = 'Year'; $lang['statistics_number_of_qso_worked_each_year'] = "Number of QSOs worked each year"; $lang['statistics_number_of_qso_worked'] = "# of QSO's worked"; +/* +* +* Distances +* +*/ + $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
    Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; @@ -28,3 +34,11 @@ $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 show $lang['statistics_distances_qsos_with'] = "QSOs with"; $lang['statistics_distances_and_band'] = "and band"; +/* +* +* Timeline +* +*/ + +$lang['statistics_timeline'] = "Timeline"; + From 95fe268ca8c747a0c6e4fb9eb8a615b3fcc47759 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 7 Nov 2023 22:16:26 +0100 Subject: [PATCH 81/82] added confirmation translations --- application/views/timeline/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 6a38efe67..6ec79109b 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -52,15 +52,15 @@
    input->post('qsl')) echo ' checked="checked"'; ?> > - +
    input->post('lotw')) echo ' checked="checked"'; ?> > - +
    input->post('eqsl')) echo ' checked="checked"'; ?> > - +
    From 075a9a945950666fb454b504b8a2b711a57adba9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 7 Nov 2023 22:24:27 +0100 Subject: [PATCH 82/82] added translation for 'Show' --- application/views/timeline/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 6ec79109b..0caa46c2a 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -133,7 +133,7 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, if (!empty($line->end)) echo ''.$ci->lang->line('gen_hamradio_deleted_dxcc').''; echo ' ' . $line->end . ' - adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show + adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').' '; } echo '
    '; @@ -189,7 +189,7 @@ function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, ' . $line->col_iota . ' ' . $line->name . ' ' . $line->prefix . ' - col_iota . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show + col_iota . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').' '; } echo '
    '; @@ -215,7 +215,7 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $ ' . $i-- . ' ' . date($custom_date_format, $date_as_timestamp) . ' ' . $line->col_cqz . ' - col_cqz . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show + col_cqz . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').' '; } echo '
    '; @@ -241,7 +241,7 @@ function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect, ' . $i-- . ' ' . date($custom_date_format, $date_as_timestamp) . ' ' . $line['gridsquare'] . ' - Show + '.$ci->lang->line('filter_options_show').' '; } echo '';