ENI2/DetailViewControls/PortCallDetailControl.xaml.cs

@@ -364,8 +364,8 @@ namespace ENI2.DetailViewControls
             // confirm overwrite of waste disposal service provider
             if (this.textBox_WasteDisposalServiceProvider.Text.Length > 0)
             {
-                string message = string.Format(Properties.Resources.textConfirmWSDPOverwrite, this.textBox_WasteDisposalServiceProvider.Text, this._currentTemplate.WasteDisposalServiceProviderName);
+                if (MessageBox.Show(Properties.Resources.textConfirmWSDPOverwrite, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No)
-                if (MessageBox.Show(message, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No) { return; }
+                    == MessageBoxResult.No) { return; }
             }
 
             this._undoTemplate = createFromCurrentText(null, null);

ENI2/EditControls/SelectImportClassesDialog.xaml.cs

@@ -69,12 +69,13 @@ namespace ENI2.EditControls
                     (aMessage.MessageNotificationClass == Message.NotificationClass.STO)) 
                     continue;
 
-                // these are neither imported nor sent by the Send all function
+                // these are never imported but may be sent
-
+                if (IsImportMode)
+                {
                     if ((aMessage.MessageNotificationClass == Message.NotificationClass.ATA) ||
                         (aMessage.MessageNotificationClass == Message.NotificationClass.ATD))
                         continue;
-
+                }
                 
                 // filter out messages not relevant for transit
                 if (IsTransit && (

ENI2/Excel/ExcelReader.cs

@@ -128,7 +128,7 @@ namespace ENI2.Excel
                 if (portName.IsNullOrEmpty())
                 {
                     _log.WarnFormat("unknown Locode {0}", val);
-                    val = null;
+                    val = "";
                 }
             }
             return val;

ENI2/Excel/ExcelUtil.cs

@@ -1286,10 +1286,10 @@ namespace ENI2.Excel
 
                 waste.WasteDisposalPort = reader.ReadSSNLocode(wastePort);   // aka RemainingWasteDisposalPort
 
-                if ((waste.WasteDisposalPort != null) && (waste.WasteDisposalPort == string.Empty))
+                //if (waste.WasteDisposalPort.IsNullOrEmpty())
-                {
+                //{
-                    waste.WasteDisposalPort = "ZZUKN";
+                //    waste.WasteDisposalPort = "ZZUKN";
-                }
+                //}
 
                 waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumber(amountGen);
 
@@ -1299,7 +1299,7 @@ namespace ENI2.Excel
                 }
             }
 
-            was.AddMissingWaste();
+            // was.AddMissingWaste();
 
             return true;
         }

ENI2/Properties/Resources.Designer.cs

@@ -2174,9 +2174,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The existing value for the waste disposal service provider will be overwritten.
+        ///   Looks up a localized string similar to The existing value for the waste disposal service provider will be overwritten. Proceed?.
-        ///Current entry:{0} New entry:{1}
-        ///Proceed?.
         /// </summary>
         public static string textConfirmWSDPOverwrite {
             get {

ENI2/Properties/Resources.resx

@@ -2258,8 +2258,6 @@
     <value>NSW-Status</value>
   </data>
   <data name="textConfirmWSDPOverwrite" xml:space="preserve">
-    <value>The existing value for the waste disposal service provider will be overwritten.
+    <value>The existing value for the waste disposal service provider will be overwritten. Proceed?</value>
-Current entry:{0} New entry:{1}
-Proceed?</value>
   </data>
 </root>

ENI2/SheetDisplayControls/PortControl.xaml.cs

@@ -342,8 +342,7 @@ namespace ENI2.SheetDisplayControls
             // confirm overwrite of waste disposal service provider
             if (this.textBox_WasteDisposalServiceProvider.Text.Length > 0)
             {
-                string message = string.Format(Properties.Resources.textConfirmWSDPOverwrite, this.textBox_WasteDisposalServiceProvider.Text, this._currentTemplate.WasteDisposalServiceProviderName);
+                if (MessageBox.Show(Properties.Resources.textConfirmWSDPOverwrite, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No)
-                if (MessageBox.Show(message, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No)
                     == MessageBoxResult.No) { return; }
             }