Merge branch 'magicbug:dev' into dev

application/controllers/Adif.php

@@ -211,6 +211,7 @@ class adif extends CI_Controller {
 			}
 
 			$data['adif_errors'] = $custom_errors;
+			$data['skip_dupes'] = $this->input->post('skipDuplicate');
 
 
 			$data['page_title'] = "ADIF Imported";

application/language/bulgarian/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/chinese_simplified/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/czech/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Uložit';

application/language/dutch/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/english/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/finnish/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/french/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/german/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'Das Alter von Spots in Minuten, welche
 $lang['options_dxcluster_decont'] = 'Nur Spots berücksichtigen, die in folgendem Kontinent erfasst wurden';
 $lang['options_dxcluster_maxage_changed_to']='Maximales Spot-Alter geändert auf ';
 $lang['options_dxcluster_decont_changed_to']='Spotterkontinent geändert auf ';
+$lang['options_dxcluster_decont_hint']='Nur Spots von Spottern dieses Kontinents werden angezeigt';
 
 $lang['options_save'] = 'Speichern';

application/language/greek/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/italian/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/polish/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/russian/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'Возраст спотов, кото
 $lang['options_dxcluster_decont'] = 'Отображать споты, которые присланы с континента  ';
 $lang['options_dxcluster_maxage_changed_to']='Максимальный возраст спотов изменён на ';
 $lang['options_dxcluster_decont_changed_to']='континент изменён на ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Сохранить';

application/language/spanish/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/language/swedish/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'Åldern i minuter av fläckar, som kom
 $lang['options_dxcluster_decont'] = 'Visa fläckar som ses från följande kontinent';
 $lang['options_dxcluster_maxage_changed_to']='Maximal ålder för fläckar ändrad till ';
 $lang['options_dxcluster_decont_changed_to']='kontinenten ändrats till ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Spara';

application/language/turkish/options_lang.php

@@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will
 $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent';
 $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
 $lang['options_dxcluster_decont_changed_to']='de continent changed to ';
+$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
 
 $lang['options_save'] = 'Save';

application/views/adif/import_success.php

@@ -13,7 +13,13 @@
   </div>
   <div class="card-body">
     <h3 class="card-title">Yay, its imported!</h3>
-    <p class="card-text">The ADIF File has been imported, and any dupes skipped.</p>
+    <p class="card-text">The ADIF File has been imported.
+    <?php if(isset($skip_dupes)) {
+             echo ' <b>Dupes were inserted!</b>';
+          } else {
+             echo ' Dupes were skipped.';
+          } ?>
+    </p>
     <?php if($adif_errors) { ?>
       <h3>ADIF Errors</h3>
       <p>You have ADIF errors, the QSOs have still been added but these fields have not been populated.</p>