diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po
index e3d28c425..17e212f53 100644
--- a/application/locale/bg_BG/LC_MESSAGES/messages.po
+++ b/application/locale/bg_BG/LC_MESSAGES/messages.po
@@ -7385,7 +7385,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/bs/LC_MESSAGES/messages.po b/application/locale/bs/LC_MESSAGES/messages.po
index d3b038dc7..670e772d0 100644
--- a/application/locale/bs/LC_MESSAGES/messages.po
+++ b/application/locale/bs/LC_MESSAGES/messages.po
@@ -7394,7 +7394,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/cnr/LC_MESSAGES/messages.po b/application/locale/cnr/LC_MESSAGES/messages.po
index eef8afd0d..e884397fb 100644
--- a/application/locale/cnr/LC_MESSAGES/messages.po
+++ b/application/locale/cnr/LC_MESSAGES/messages.po
@@ -7394,7 +7394,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/cs_CZ/LC_MESSAGES/messages.po b/application/locale/cs_CZ/LC_MESSAGES/messages.po
index a68512192..089f04fad 100644
--- a/application/locale/cs_CZ/LC_MESSAGES/messages.po
+++ b/application/locale/cs_CZ/LC_MESSAGES/messages.po
@@ -7399,7 +7399,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/de_DE/LC_MESSAGES/messages.po b/application/locale/de_DE/LC_MESSAGES/messages.po
index 341a727a8..9c4a5efcb 100644
--- a/application/locale/de_DE/LC_MESSAGES/messages.po
+++ b/application/locale/de_DE/LC_MESSAGES/messages.po
@@ -7758,7 +7758,7 @@ msgid "Dx"
 msgstr "Dx"
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr "- KEIN - (z.B. /MM, /AM)"
 
diff --git a/application/locale/el_GR/LC_MESSAGES/messages.po b/application/locale/el_GR/LC_MESSAGES/messages.po
index f836fc1df..eea6b1f37 100644
--- a/application/locale/el_GR/LC_MESSAGES/messages.po
+++ b/application/locale/el_GR/LC_MESSAGES/messages.po
@@ -7389,7 +7389,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/es_ES/LC_MESSAGES/messages.po b/application/locale/es_ES/LC_MESSAGES/messages.po
index 481701853..b63f99a67 100644
--- a/application/locale/es_ES/LC_MESSAGES/messages.po
+++ b/application/locale/es_ES/LC_MESSAGES/messages.po
@@ -7427,7 +7427,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/fi_FI/LC_MESSAGES/messages.po b/application/locale/fi_FI/LC_MESSAGES/messages.po
index 6b7be8d70..149086aa1 100644
--- a/application/locale/fi_FI/LC_MESSAGES/messages.po
+++ b/application/locale/fi_FI/LC_MESSAGES/messages.po
@@ -7385,7 +7385,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/fr_FR/LC_MESSAGES/messages.po b/application/locale/fr_FR/LC_MESSAGES/messages.po
index d903216d7..fb4938083 100644
--- a/application/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/application/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7547,7 +7547,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/hr/LC_MESSAGES/messages.po b/application/locale/hr/LC_MESSAGES/messages.po
index 38a028ff5..c573c345d 100644
--- a/application/locale/hr/LC_MESSAGES/messages.po
+++ b/application/locale/hr/LC_MESSAGES/messages.po
@@ -7394,7 +7394,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/it_IT/LC_MESSAGES/messages.po b/application/locale/it_IT/LC_MESSAGES/messages.po
index cbd551ef9..284fd4c68 100644
--- a/application/locale/it_IT/LC_MESSAGES/messages.po
+++ b/application/locale/it_IT/LC_MESSAGES/messages.po
@@ -7389,7 +7389,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/nl_NL/LC_MESSAGES/messages.po b/application/locale/nl_NL/LC_MESSAGES/messages.po
index ae36c32bf..51ecc0acd 100644
--- a/application/locale/nl_NL/LC_MESSAGES/messages.po
+++ b/application/locale/nl_NL/LC_MESSAGES/messages.po
@@ -7386,7 +7386,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/pl_PL/LC_MESSAGES/messages.po b/application/locale/pl_PL/LC_MESSAGES/messages.po
index 911500077..c99afa7c2 100644
--- a/application/locale/pl_PL/LC_MESSAGES/messages.po
+++ b/application/locale/pl_PL/LC_MESSAGES/messages.po
@@ -7396,7 +7396,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/pt_PT/LC_MESSAGES/messages.po b/application/locale/pt_PT/LC_MESSAGES/messages.po
index ec8caaecf..20007e755 100644
--- a/application/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/application/locale/pt_PT/LC_MESSAGES/messages.po
@@ -7742,7 +7742,7 @@ msgid "Dx"
 msgstr "Dx"
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr "- NENHUM - (exemplo: /MM, /AM)"
 
diff --git a/application/locale/ru_RU/LC_MESSAGES/messages.po b/application/locale/ru_RU/LC_MESSAGES/messages.po
index 5a58450b6..07ecdb0cc 100644
--- a/application/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/application/locale/ru_RU/LC_MESSAGES/messages.po
@@ -7730,7 +7730,7 @@ msgid "Dx"
 msgstr "DX"
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr "- NONE - (т.е.. /MM, /AM)"
 
diff --git a/application/locale/sq/LC_MESSAGES/messages.po b/application/locale/sq/LC_MESSAGES/messages.po
index 0d8b49f65..e7ab2600a 100644
--- a/application/locale/sq/LC_MESSAGES/messages.po
+++ b/application/locale/sq/LC_MESSAGES/messages.po
@@ -7386,7 +7386,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/sr/LC_MESSAGES/messages.po b/application/locale/sr/LC_MESSAGES/messages.po
index 2d11799bf..619d11bde 100644
--- a/application/locale/sr/LC_MESSAGES/messages.po
+++ b/application/locale/sr/LC_MESSAGES/messages.po
@@ -7710,7 +7710,7 @@ msgid "Dx"
 msgstr "Dx"
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr "- NIJEDNA - (npr. /MM, /AM)"
 
diff --git a/application/locale/sv_SE/LC_MESSAGES/messages.po b/application/locale/sv_SE/LC_MESSAGES/messages.po
index ad9050fcb..766df1e30 100644
--- a/application/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/application/locale/sv_SE/LC_MESSAGES/messages.po
@@ -7387,7 +7387,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/tr_TR/LC_MESSAGES/messages.po b/application/locale/tr_TR/LC_MESSAGES/messages.po
index 100df3d98..262838563 100644
--- a/application/locale/tr_TR/LC_MESSAGES/messages.po
+++ b/application/locale/tr_TR/LC_MESSAGES/messages.po
@@ -7395,7 +7395,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""
 
diff --git a/application/locale/zh_CN/LC_MESSAGES/messages.po b/application/locale/zh_CN/LC_MESSAGES/messages.po
index 6b4777267..9328747e5 100644
--- a/application/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/application/locale/zh_CN/LC_MESSAGES/messages.po
@@ -7503,7 +7503,7 @@ msgid "Dx"
 msgstr "对方呼号(Dx)"
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr "- 无 - （如 /MM, /AM）"
 
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 21581a4ec..fd193cb07 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -163,7 +163,7 @@ $options = json_decode($options);
                             <label class="form-label" for="dxcc"><?= __("DXCC"); ?></label>
                             <select class="form-control form-control-sm" id="dxcc" name="dxcc">
                                 <option value="">-</option>
-                                <option value="0"><?= _pgettext("Logbook Advanced DXCC Select", "- NONE - (e.g. /MM, /AM)"); ?></option>
+                                <option value="0"><?= _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)"); ?></option>
                                 <?php
                                 foreach ($dxccarray as $dxcc) {
                                     echo '<option value=' . $dxcc->adif;
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index dcbc20fc4..f05310870 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -75,7 +75,7 @@ if ($dxcc_list->result() > 0) {
 		    <label for="stationDXCCInput"><?= __("Station DXCC"); ?></label>
 				<?php if ($dxcc_list->num_rows() > 0) { ?>
 				<select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp">
-				<option value="0" selected><?php echo "- " . _pgettext("DXCC selection", "None") . " -"; ?></option>
+				<option value="0" selected><?= _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)"); ?></option>
 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
 				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.__("Deleted DXCC").')';?>
 				</option>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index 0c2e97f6c..7094aa856 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -96,7 +96,7 @@ if ($dxcc_list->result() > 0) {
 					    <label for="stationDXCCInput"><?= __("Station DXCC"); ?></label>
 					    <?php if ($dxcc_list->num_rows() > 0) { ?>
 					        <select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp">
-					            <option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>><?php echo "- " . _pgettext("DXCC selection", "None") . " -"; ?></option>
+					            <option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>><?= _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)"); ?></option>
 					            <?php foreach ($dxcc_list->result() as $dxcc) { ?>
 					                <?php $isDeleted = $dxcc->end !== NULL; ?>
 					                <option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>>
diff --git a/application/views/stationsetup/stationsetup.php b/application/views/stationsetup/stationsetup.php
index c11fcd7cf..fa404bdee 100644
--- a/application/views/stationsetup/stationsetup.php
+++ b/application/views/stationsetup/stationsetup.php
@@ -147,7 +147,7 @@
 				<?php echo $row->station_profile_name;?><br>
 			</td>
 			<td><?php echo $row->station_callsign;?></td>
-			<td><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge bg-danger">'.__("Deleted DXCC").'</span>'; } ?></td>
+			<td><?php echo $row->station_country == '' ? _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)") : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge bg-danger">'.__("Deleted DXCC").'</span>'; } ?></td>
 			<td><?php echo $row->station_gridsquare;?></td>
 			<td>
 				<?php if($row->station_active != 1) { ?>
diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot
index 6dec2f646..9bc4113cf 100644
--- a/assets/lang_src/messages.pot
+++ b/assets/lang_src/messages.pot
@@ -7384,7 +7384,7 @@ msgid "Dx"
 msgstr ""
 
 #: application/views/logbookadvanced/index.php:166
-msgctxt "Logbook Advanced DXCC Select"
+msgctxt "DXCC Select - No DXCC"
 msgid "- NONE - (e.g. /MM, /AM)"
 msgstr ""