From 4333825dfc4574ad9bccb49b2f07689cf845ecb0 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Sun, 22 Oct 2023 23:21:09 +0200
Subject: [PATCH 1/9] small style hack

---
 application/views/kml/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/kml/index.php b/application/views/kml/index.php
index 9375c39ba..c3f943ebb 100644
--- a/application/views/kml/index.php
+++ b/application/views/kml/index.php
@@ -97,8 +97,8 @@
                     </select>
                 </div>
 
-                <p class="card-text"><?php echo lang('gen_from_date') . ':'; ?></p>
-                <div class="row">
+                <div class="form-group">
+                    <label for="datetimepicker1"><?php echo lang('gen_from_date') . ':'; ?></label>
                     <div class="input-group date col-md-3" id="datetimepicker1" data-target-input="nearest">
                         <input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
                         <div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
@@ -107,8 +107,8 @@
                     </div>
                 </div>
 
-                <p class="card-text"><?php echo lang('gen_to_date') . ':'; ?></p>
-                <div class="row">
+                <div class="form-group">
+                    <label for="datetimepicker2"><?php echo lang('gen_to_date') . ':'; ?></label>
                     <div class="input-group date col-md-3" id="datetimepicker2" data-target-input="nearest">
                         <input name="todate" "totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
                         <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">

From 52ed2a1395255f3573b4348f35150db35416a701 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Mon, 23 Oct 2023 21:59:31 +0200
Subject: [PATCH 2/9] fixed datetimepicker in kml export

---
 application/views/interface_assets/footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index a83f000f6..0a5648976 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2284,7 +2284,7 @@ $(document).ready(function(){
     </script>
 <?php } ?>
 
-<?php if ($this->uri->segment(1) == "kml") { ?>
+<?php if ($this->uri->segment(1) == "kmlexport") { ?>
     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/tempusdominus-bootstrap-4.min.js"></script>
     <script type="text/javascript">

From 3b0db81f5abd5e33f3a75c8a0bb371f9c2b25cf0 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Mon, 23 Oct 2023 22:00:57 +0200
Subject: [PATCH 3/9] datetimepicker css class

---
 application/views/dxatlas/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
index e598594ab..e5b736186 100644
--- a/application/views/dxatlas/index.php
+++ b/application/views/dxatlas/index.php
@@ -116,7 +116,7 @@
 				<div class="form-row">
 					<div class="form-group col-md-3">
 						<label for="datetimepicker1">From date:</label>
-						<div class="dxatlasdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
+						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
 							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
 							<div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
@@ -126,8 +126,8 @@
 
 					<div class="form-group col-md-3">
 						<label for="datetimepicker2">To date:</label>
-						<div class="dxatlasdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
-							<input name="todate" "totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
+						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
+							<input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
 							<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>

From 5ec8c7918f8bae6bdd5051aa0675f8dd95b218bf Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Mon, 23 Oct 2023 22:01:16 +0200
Subject: [PATCH 4/9] datetimepicker css class

---
 application/views/csv/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/csv/index.php b/application/views/csv/index.php
index 6e77f1360..f3c283cef 100644
--- a/application/views/csv/index.php
+++ b/application/views/csv/index.php
@@ -112,7 +112,7 @@
 				<div class="form-row">
 					<div class="form-group col-md-3">
 						<label for="datetimepicker1">From date:</label>
-						<div class="csvdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
+						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
 							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
 							<div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
@@ -122,8 +122,8 @@
 
 					<div class="form-group col-md-3">
 						<label for="datetimepicker2">To date:</label>
-						<div class="csvdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
-							<input name="todate" "totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
+						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
+							<input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
 							<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>

From b50f79d716076c61e3a7fb4e1122474d49148385 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Mon, 23 Oct 2023 22:01:46 +0200
Subject: [PATCH 5/9] same layout as sotacsv and dxatlas

---
 application/views/kml/index.php | 191 ++++++++++++++++----------------
 1 file changed, 97 insertions(+), 94 deletions(-)

diff --git a/application/views/kml/index.php b/application/views/kml/index.php
index c3f943ebb..734876fa3 100644
--- a/application/views/kml/index.php
+++ b/application/views/kml/index.php
@@ -14,108 +14,111 @@
         <div class="card-body">
 
             <form class="form" action="<?php echo site_url('kmlexport/export'); ?>" method="post" enctype="multipart/form-data">
+                <div class="form-row">
+                    <div class="form-group col-md-3">
+                        <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+                            <select id="band" name="band" class="custom-select">
+                                <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
+                                <?php foreach($worked_bands as $band) {
+                                    echo '<option value="' . $band . '"';
+                                    if ($this->input->post('band') == $band) echo ' selected';
+                                    echo '>' . $band . '</option>'."\n";
+                                } ?>
+                            </select>
+                    </div>
 
-                <div class="form-group">
-                    <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
-                        <select id="band" name="band" class="custom-select">
-                            <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
-                            <?php foreach($worked_bands as $band) {
-                                echo '<option value="' . $band . '"';
-                                if ($this->input->post('band') == $band) echo ' selected';
-                                echo '>' . $band . '</option>'."\n";
-                            } ?>
-                        </select>
-                </div>
-
-                <div class="form-group">
-                    <label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
-                    <select class="custom-select" id="dxcc_id" name="dxcc_id">
-                        <option value="All"><?php echo lang('general_word_all'); ?></option>
-                        <?php
-                            foreach($dxcc as $d){
-                                echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
-                                if ($d->Enddate != null) {
-                                    echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
+                    <div class="form-group col-md-4">
+                        <label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
+                        <select class="custom-select" id="dxcc_id" name="dxcc_id">
+                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <?php
+                                foreach($dxcc as $d){
+                                    echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
+                                    if ($d->Enddate != null) {
+                                        echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
+                                    }
+                                    echo '</option>';
+                                }
+                            ?>
+
+                        </select>
+                    </div>
+
+                    <div class="form-group col-md-3">
+                    <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+                        <select id="mode" name="mode" class="form-control custom-select">
+                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <?php
+                            foreach($modes->result() as $mode){
+                                if ($mode->submode == null) {
+                                    echo '<option value="' . $mode->mode . '">'. $mode->mode . '</option>'."\n";
+                                } else {
+                                    echo '<option value="' . $mode->submode . '">' . $mode->submode . '</option>'."\n";
                                 }
-                                echo '</option>';
                             }
-                        ?>
-
-                    </select>
-                </div>
-
-                <div class="form-group">
-                <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
-                    <select id="mode" name="mode" class="form-control custom-select">
-                        <option value="All"><?php echo lang('general_word_all'); ?></option>
-                        <?php
-                        foreach($modes->result() as $mode){
-                            if ($mode->submode == null) {
-                                echo '<option value="' . $mode->mode . '">'. $mode->mode . '</option>'."\n";
-                            } else {
-                                echo '<option value="' . $mode->submode . '">' . $mode->submode . '</option>'."\n";
-                            }
-                        }
-                        ?>
-                    </select>
-                </div>
-
-                <div class="form-group">
-                    <label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
-                    <select class="custom-select" id="cqz" name="cqz">
-                        <option value="All"><?php echo lang('general_word_all'); ?></option>
-                        <?php
-                        for ($i = 1; $i<=40; $i++) {
-                            echo '<option value="'. $i . '">'. $i .'</option>';
-                        }
-                        ?>
-                    </select>
-                </div>
-
-                <div class="form-group">
-                    <label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
-                    <select class="custom-select" id="selectPropagation" name="prop_mode">
-                        <option value="All"><?php echo lang('general_word_all'); ?></option>
-                        <option value="AS">Aircraft Scatter</option>
-                        <option value="AUR">Aurora</option>
-                        <option value="AUE">Aurora-E</option>
-                        <option value="BS">Back scatter</option>
-                        <option value="ECH">EchoLink</option>
-                        <option value="EME">Earth-Moon-Earth</option>
-                        <option value="ES">Sporadic E</option>
-                        <option value="FAI">Field Aligned Irregularities</option>
-                        <option value="F2">F2 Reflection</option>
-                        <option value="INTERNET">Internet-assisted</option>
-                        <option value="ION">Ionoscatter</option>
-                        <option value="IRL">IRLP</option>
-                        <option value="MS">Meteor scatter</option>
-                        <option value="RPT">Terrestrial or atmospheric repeater or transponder</option>
-                        <option value="RS">Rain scatter</option>
-                        <option value="SAT">Satellite</option>
-                        <option value="TEP">Trans-equatorial</option>
-                        <option value="TR">Tropospheric ducting</option>
-                    </select>
-                </div>
-
-                <div class="form-group">
-                    <label for="datetimepicker1"><?php echo lang('gen_from_date') . ':'; ?></label>
-                    <div class="input-group date col-md-3" id="datetimepicker1" data-target-input="nearest">
-                        <input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-                        <div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
-                            <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-                        </div>
+                            ?>
+                        </select>
                     </div>
                 </div>
+                <div class="form-row">                
+                    <div class="form-group col-md-3">
+                        <label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
+                        <select class="custom-select" id="cqz" name="cqz">
+                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <?php
+                            for ($i = 1; $i<=40; $i++) {
+                                echo '<option value="'. $i . '">'. $i .'</option>';
+                            }
+                            ?>
+                        </select>
+                    </div>
 
-                <div class="form-group">
-                    <label for="datetimepicker2"><?php echo lang('gen_to_date') . ':'; ?></label>
-                    <div class="input-group date col-md-3" id="datetimepicker2" data-target-input="nearest">
-                        <input name="todate" "totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-                        <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
-                            <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-                        </div>
+                    <div class="form-group col-md-5">
+                        <label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
+                        <select class="custom-select" id="selectPropagation" name="prop_mode">
+                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <option value="AS">Aircraft Scatter</option>
+                            <option value="AUR">Aurora</option>
+                            <option value="AUE">Aurora-E</option>
+                            <option value="BS">Back scatter</option>
+                            <option value="ECH">EchoLink</option>
+                            <option value="EME">Earth-Moon-Earth</option>
+                            <option value="ES">Sporadic E</option>
+                            <option value="FAI">Field Aligned Irregularities</option>
+                            <option value="F2">F2 Reflection</option>
+                            <option value="INTERNET">Internet-assisted</option>
+                            <option value="ION">Ionoscatter</option>
+                            <option value="IRL">IRLP</option>
+                            <option value="MS">Meteor scatter</option>
+                            <option value="RPT">Terrestrial or atmospheric repeater or transponder</option>
+                            <option value="RS">Rain scatter</option>
+                            <option value="SAT">Satellite</option>
+                            <option value="TEP">Trans-equatorial</option>
+                            <option value="TR">Tropospheric ducting</option>
+                        </select>
                     </div>
                 </div>
+                <div class="form-row">
+                    <div class="form-group col-md-3">
+                        <label for="datetimepicker1"><?php echo lang('gen_from_date') . ':'; ?></label>
+                        <div class="exportdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
+                            <input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
+                            <div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
+                                <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group col-md-3">
+                        <label for="datetimepicker2"><?php echo lang('gen_to_date') . ':'; ?></label>
+                        <div class="exportdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
+                            <input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
+                            <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                                <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>    
                 <br>
                 <button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo lang('general_word_export'); ?></button>
             </form>

From fae3358fc9c831dacd5aa24826dc79673f896ddc Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Mon, 23 Oct 2023 22:04:33 +0200
Subject: [PATCH 6/9] datetimepicker shared css class

---
 assets/css/general.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/general.css b/assets/css/general.css
index 6a9794d73..f828860e4 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -313,7 +313,7 @@ color: #ffffff;
 /*
  * Timepicker alignment
  */
-.dxatlasdatepicker {
+.exportdatepicker {
 	padding-right: 0;
 	padding-left: 0;
 }

From 45d004f302b85d83e573529d2e63e6990b05657b Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Mon, 23 Oct 2023 22:29:47 +0200
Subject: [PATCH 7/9] synced layout

---
 application/views/kml/index.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/application/views/kml/index.php b/application/views/kml/index.php
index 734876fa3..40ff42948 100644
--- a/application/views/kml/index.php
+++ b/application/views/kml/index.php
@@ -27,6 +27,22 @@
                             </select>
                     </div>
 
+                    <div class="form-group col-md-3">
+                    <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
+                        <select id="mode" name="mode" class="form-control custom-select">
+                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <?php
+                            foreach($modes->result() as $mode){
+                                if ($mode->submode == null) {
+                                    echo '<option value="' . $mode->mode . '">'. $mode->mode . '</option>'."\n";
+                                } else {
+                                    echo '<option value="' . $mode->submode . '">' . $mode->submode . '</option>'."\n";
+                                }
+                            }
+                            ?>
+                        </select>
+                    </div>
+
                     <div class="form-group col-md-4">
                         <label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
                         <select class="custom-select" id="dxcc_id" name="dxcc_id">
@@ -43,22 +59,6 @@
 
                         </select>
                     </div>
-
-                    <div class="form-group col-md-3">
-                    <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
-                        <select id="mode" name="mode" class="form-control custom-select">
-                            <option value="All"><?php echo lang('general_word_all'); ?></option>
-                            <?php
-                            foreach($modes->result() as $mode){
-                                if ($mode->submode == null) {
-                                    echo '<option value="' . $mode->mode . '">'. $mode->mode . '</option>'."\n";
-                                } else {
-                                    echo '<option value="' . $mode->submode . '">' . $mode->submode . '</option>'."\n";
-                                }
-                            }
-                            ?>
-                        </select>
-                    </div>
                 </div>
                 <div class="form-row">                
                     <div class="form-group col-md-3">

From 8d736e39d293e5026889ed57101047faa6159d05 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Mon, 23 Oct 2023 23:07:28 +0200
Subject: [PATCH 8/9] Multilanguage Support

---
 .../language/bulgarian/export_lang.php        | 19 ++++++++++
 .../chinese_simplified/export_lang.php        | 19 ++++++++++
 application/language/czech/export_lang.php    | 19 ++++++++++
 application/language/dutch/export_lang.php    | 19 ++++++++++
 application/language/english/export_lang.php  | 19 ++++++++++
 application/language/finnish/export_lang.php  | 19 ++++++++++
 application/language/french/export_lang.php   | 19 ++++++++++
 application/language/german/export_lang.php   | 18 ++++++++++
 application/language/greek/export_lang.php    | 19 ++++++++++
 application/language/italian/export_lang.php  | 19 ++++++++++
 application/language/polish/export_lang.php   | 19 ++++++++++
 application/language/russian/export_lang.php  | 19 ++++++++++
 application/language/spanish/export_lang.php  | 19 ++++++++++
 application/language/swedish/export_lang.php  | 19 ++++++++++
 application/language/turkish/export_lang.php  | 19 ++++++++++
 application/views/csv/index.php               | 36 +++++++++----------
 application/views/dxatlas/index.php           | 36 +++++++++----------
 17 files changed, 320 insertions(+), 36 deletions(-)

diff --git a/application/language/bulgarian/export_lang.php b/application/language/bulgarian/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/bulgarian/export_lang.php
+++ b/application/language/bulgarian/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/chinese_simplified/export_lang.php b/application/language/chinese_simplified/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/chinese_simplified/export_lang.php
+++ b/application/language/chinese_simplified/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/czech/export_lang.php b/application/language/czech/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/czech/export_lang.php
+++ b/application/language/czech/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/dutch/export_lang.php b/application/language/dutch/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/dutch/export_lang.php
+++ b/application/language/dutch/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/english/export_lang.php b/application/language/english/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/english/export_lang.php
+++ b/application/language/english/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/finnish/export_lang.php b/application/language/finnish/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/finnish/export_lang.php
+++ b/application/language/finnish/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/french/export_lang.php b/application/language/french/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/french/export_lang.php
+++ b/application/language/french/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/german/export_lang.php b/application/language/german/export_lang.php
index 25b758516..799082afa 100644
--- a/application/language/german/export_lang.php
+++ b/application/language/german/export_lang.php
@@ -13,5 +13,23 @@ $lang['export_kml_description'] = "Exportiere dein Logbuch als KML Datei um dies
 $lang['export_kml_grisquare_warning'] = "Nur QSO mit einem definierten Planquadrat werden auch exportiert!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Exportiere dein Logbuch nach DX Atlas um gearbeitete und bestätigte Planquadrate anzuzeigen.";
+$lang['export_dxatlas_gridsquare_warning'] = "Nur QSO mit einem definierten Planquadrat werden auch exportiert!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Exportiere dein Logbuch um es in SOTA hochzuladen.";
+$lang['export_sota_info_warning'] = "Es werden nur QSO exportiert, welche SOTA Informationen enthalten!";
\ No newline at end of file
diff --git a/application/language/greek/export_lang.php b/application/language/greek/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/greek/export_lang.php
+++ b/application/language/greek/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/italian/export_lang.php b/application/language/italian/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/italian/export_lang.php
+++ b/application/language/italian/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/polish/export_lang.php b/application/language/polish/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/polish/export_lang.php
+++ b/application/language/polish/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/russian/export_lang.php b/application/language/russian/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/russian/export_lang.php
+++ b/application/language/russian/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/spanish/export_lang.php b/application/language/spanish/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/spanish/export_lang.php
+++ b/application/language/spanish/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/swedish/export_lang.php b/application/language/swedish/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/swedish/export_lang.php
+++ b/application/language/swedish/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/language/turkish/export_lang.php b/application/language/turkish/export_lang.php
index 16ba9e386..938d5eaf5 100644
--- a/application/language/turkish/export_lang.php
+++ b/application/language/turkish/export_lang.php
@@ -13,5 +13,24 @@ $lang['export_kml_description'] = "Export your logbook to a KML file for use in
 $lang['export_kml_grisquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+DX Atlas Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_dxatlas_header'] = "DX Atlas Export";
+$lang['export_dxatlas_description'] = "Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.";
+$lang['export_dxatlas_gridsquare_warning'] = "Only QSOs with a gridsquare defined will be exported!";
 
 
+/*
+___________________________________________________________________________________________
+SOTA Export
+___________________________________________________________________________________________
+*/
+
+$lang['export_sota_header'] = "SOTA CSV Export";
+$lang['export_sota_description'] = "Export your logbook for SOTA uploads.";
+$lang['export_sota_info_warning'] = "Only QSOs with SOTA information will be exported!";
+
diff --git a/application/views/csv/index.php b/application/views/csv/index.php
index f3c283cef..afe468d7c 100644
--- a/application/views/csv/index.php
+++ b/application/views/csv/index.php
@@ -1,14 +1,14 @@
 <div class="container">
 	<br>
-	<h2><?php echo $page_title; ?></h2>
+	<h2><?php echo lang('export_sota_header'); ?></h2>
 
 	<div class="card">
 		<div class="card-header">
-			Export your logbook for SOTA uploads.
+			<?php echo lang('export_sota_description'); ?>
 		</div>
 
 		<div class="alert alert-warning" role="alert">
-			Only QSOs with SOTA information will be exported!
+			<?php echo lang('export_sota_info_warning'); ?>
 		</div>
 
 		<div class="card-body">
@@ -18,9 +18,9 @@
 					<div class="form-group col-md-3">
 						<label for="station_profile"><?php echo lang('cloudlog_station_profile'); ?></label>
 						<select name="station_profile" class="station_id custom-select">
-							<option value="All">All</option>
+							<option value="All"><?php echo lang('general_word_all'); ?></option>
 							<?php foreach ($station_profile->result() as $station) { ?>
-								<option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+								<option value="<?php echo $station->station_id; ?>"><?php echo lang('gen_hamradio_callsign') . ": "; ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 							<?php } ?>
 						</select>
 					</div>
@@ -28,9 +28,9 @@
 
 				<div class="form-row">
 				<div class="form-group col-md-3">
-					<label for="band">Band</label>
+					<label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
 					<select id="band" name="band" class="custom-select">
-						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
+						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
 						<?php foreach($worked_bands as $band) {
 							echo '<option value="' . $band . '"';
 							if ($this->input->post('band') == $band) echo ' selected';
@@ -39,9 +39,9 @@
 					</select>
 				</div>
 					<div class="form-group col-md-3">
-						<label for="mode">Mode</label>
+						<label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
 						<select id="mode" name="mode" class="form-control custom-select">
-							<option value="All">All</option>
+							<option value="All"><?php echo lang('general_word_all'); ?></option>
 							<?php
 							foreach($modes->result() as $mode){
 								if ($mode->submode == null) {
@@ -55,9 +55,9 @@
 					</div>
 
 				<div class="form-group col-md-4">
-					<label for="dxcc_id">DXCC</label>
+					<label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
 					<select class="custom-select" id="dxcc_id" name="dxcc_id">
-						<option value="All">All</option>
+						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<?php
 						foreach($dxcc as $d){
 							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
@@ -73,9 +73,9 @@
 
 				<div class="form-row">
 					<div class="form-group col-md-3">
-					<label for="cqz">CQ Zone</label>
+					<label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
 					<select class="custom-select" id="cqz" name="cqz">
-						<option value="All">All</option>
+						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<?php
 						for ($i = 1; $i<=40; $i++) {
 							echo '<option value="'. $i . '">'. $i .'</option>';
@@ -85,9 +85,9 @@
 				</div>
 
 				<div class="form-group col-md-5">
-					<label for="selectPropagation">Propagation Mode</label>
+					<label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
 					<select class="custom-select" id="selectPropagation" name="prop_mode">
-						<option value="All">All</option>
+						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<option value="AS">Aircraft Scatter</option>
 						<option value="AUR">Aurora</option>
 						<option value="AUE">Aurora-E</option>
@@ -111,7 +111,7 @@
 				</div>
 				<div class="form-row">
 					<div class="form-group col-md-3">
-						<label for="datetimepicker1">From date:</label>
+						<label for="datetimepicker1"><?php echo lang('gen_from_date') . ':'; ?></label>
 						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
 							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
 							<div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
@@ -121,7 +121,7 @@
 					</div>
 
 					<div class="form-group col-md-3">
-						<label for="datetimepicker2">To date:</label>
+						<label for="datetimepicker2"><?php echo lang('gen_to_date') . ':'; ?></label>
 						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
 							<input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
 							<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
@@ -131,7 +131,7 @@
 					</div>
 				</div>
 				<br>
-				<button type="submit" class="btn btn-primary mb-2" value="Export">Export</button>
+				<button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo lang('general_word_export'); ?></button>
 			</form>
 		</div>
 	</div>
diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
index e5b736186..259c72ee4 100644
--- a/application/views/dxatlas/index.php
+++ b/application/views/dxatlas/index.php
@@ -1,14 +1,14 @@
 <div class="container">
 	<br>
-	<h2><?php echo $page_title; ?></h2>
+	<h2><?php echo lang('export_dxatlas_header'); ?></h2>
 
 	<div class="card">
 		<div class="card-header">
-			Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.
+			<?php echo lang('export_dxatlas_description'); ?>
 		</div>
 
 		<div class="alert alert-warning" role="alert">
-			Only QSOs with a gridsquare defined will be exported!
+			<?php echo lang('export_dxatlas_gridsquare_warning'); ?>
 		</div>
 
 		<div class="card-body">
@@ -18,9 +18,9 @@
 					<div class="form-group col-md-3">
 						<label for="station_profile"><?php echo lang('cloudlog_station_profile'); ?></label>
 						<select name="station_profile" class="station_id custom-select">
-							<option value="All">All</option>
+							<option value="All"><?php echo lang('general_word_all'); ?></option>
 							<?php foreach ($station_profile->result() as $station) { ?>
-								<option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+								<option value="<?php echo $station->station_id; ?>"><?php echo lang('gen_hamradio_callsign') . ": "; ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 							<?php } ?>
 						</select>
 					</div>
@@ -28,9 +28,9 @@
 
 				<div class="form-row">
 				<div class="form-group col-md-3">
-					<label for="band">Band</label>
+					<label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
 					<select id="band" name="band" class="custom-select">
-						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
+						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
 						<?php foreach($worked_bands as $band) {
 							echo '<option value="' . $band . '"';
 							if ($this->input->post('band') == $band) echo ' selected';
@@ -39,9 +39,9 @@
 					</select>
 				</div>
 					<div class="form-group col-md-3">
-						<label for="mode">Mode</label>
+						<label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
 						<select id="mode" name="mode" class="form-control custom-select">
-							<option value="All">All</option>
+							<option value="All"><?php echo lang('general_word_all'); ?></option>
 							<?php
 							foreach($modes->result() as $mode){
 								if ($mode->submode == null) {
@@ -55,9 +55,9 @@
 					</div>
 
 				<div class="form-group col-md-4">
-					<label for="dxcc_id">DXCC</label>
+					<label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
 					<select class="custom-select" id="dxcc_id" name="dxcc_id">
-						<option value="All">All</option>
+						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<?php
 						foreach($dxcc as $d){
 							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
@@ -77,9 +77,9 @@
 
 				<div class="form-row">
 					<div class="form-group col-md-3">
-					<label for="cqz">CQ Zone</label>
+					<label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
 					<select class="custom-select" id="cqz" name="cqz">
-						<option value="All">All</option>
+						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<?php
 						for ($i = 1; $i<=40; $i++) {
 							echo '<option value="'. $i . '">'. $i .'</option>';
@@ -89,9 +89,9 @@
 				</div>
 
 				<div class="form-group col-md-5">
-					<label for="selectPropagation">Propagation Mode</label>
+					<label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
 					<select class="custom-select" id="selectPropagation" name="prop_mode">
-						<option value="All">All</option>
+						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<option value="AS">Aircraft Scatter</option>
 						<option value="AUR">Aurora</option>
 						<option value="AUE">Aurora-E</option>
@@ -115,7 +115,7 @@
 				</div>
 				<div class="form-row">
 					<div class="form-group col-md-3">
-						<label for="datetimepicker1">From date:</label>
+						<label for="datetimepicker1"><?php echo lang('gen_from_date') . ':'; ?></label>
 						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
 							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
 							<div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
@@ -125,7 +125,7 @@
 					</div>
 
 					<div class="form-group col-md-3">
-						<label for="datetimepicker2">To date:</label>
+						<label for="datetimepicker2"><?php echo lang('gen_to_date') . ':'; ?></label>
 						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
 							<input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
 							<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
@@ -135,7 +135,7 @@
 					</div>
 				</div>
 				<br>
-				<button type="submit" class="btn btn-primary mb-2" value="Export">Export</button>
+				<button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo lang('general_word_export'); ?></button>
 			</form>
 		</div>
 	</div>

From 13bd87b68b6e8db6ee2754fd6091907bf6df9889 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Mon, 23 Oct 2023 23:09:02 +0200
Subject: [PATCH 9/9] added deleted dxcc hint in dxcc select

---
 application/views/csv/index.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/views/csv/index.php b/application/views/csv/index.php
index afe468d7c..cb54e4495 100644
--- a/application/views/csv/index.php
+++ b/application/views/csv/index.php
@@ -60,7 +60,11 @@
 						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<?php
 						foreach($dxcc as $d){
-							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
+							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
+							if ($d->Enddate != null) {
+								echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
+							}
+							echo '</option>';
 						}
 						?>