diff --git a/src/SIL.LCModel/Application/ApplicationServices/AppStrings.Designer.cs b/src/SIL.LCModel/Application/ApplicationServices/AppStrings.Designer.cs index 8d537e23..1f9f6fba 100644 --- a/src/SIL.LCModel/Application/ApplicationServices/AppStrings.Designer.cs +++ b/src/SIL.LCModel/Application/ApplicationServices/AppStrings.Designer.cs @@ -639,7 +639,7 @@ internal static string ksUnrecognizedOwnerlessObjectClass { } /// - /// Looks up a localized string similar to Warning: {0} has the wrong default vernacular writing system (expecting {1}, was {2}).. + /// Looks up a localized string similar to Error: {0} has the wrong default vernacular writing system (expecting {1}, was {2}). Import aborted.. /// internal static string ksWrongVernWs { get { @@ -648,7 +648,7 @@ internal static string ksWrongVernWs { } /// - /// Looks up a localized string similar to Warning: {0} has an invalid version number (expecting {1}, was {2}).. + /// Looks up a localized string similar to Error: {0} has an invalid version number (expecting {1}, was {2}). Import aborted.. /// internal static string ksWrongVersion { get { diff --git a/src/SIL.LCModel/Application/ApplicationServices/AppStrings.resx b/src/SIL.LCModel/Application/ApplicationServices/AppStrings.resx index 0ce9adc7..2c796e4a 100644 --- a/src/SIL.LCModel/Application/ApplicationServices/AppStrings.resx +++ b/src/SIL.LCModel/Application/ApplicationServices/AppStrings.resx @@ -319,9 +319,9 @@ Shown during import. The current entry is supposed to be shown as a subentry under "{1}". - Warning: {0} has the wrong default vernacular writing system (expecting {1}, was {2}). + Error: {0} has the wrong default vernacular writing system (expecting {1}, was {2}). Import aborted. - Warning: {0} has an invalid version number (expecting {1}, was {2}). + Error: {0} has an invalid version number (expecting {1}, was {2}). Import aborted. \ No newline at end of file diff --git a/src/SIL.LCModel/Application/ApplicationServices/XmlImportData.cs b/src/SIL.LCModel/Application/ApplicationServices/XmlImportData.cs index 77e48708..6b265d47 100644 --- a/src/SIL.LCModel/Application/ApplicationServices/XmlImportData.cs +++ b/src/SIL.LCModel/Application/ApplicationServices/XmlImportData.cs @@ -291,7 +291,6 @@ public void ImportData(TextReader rdr, TextWriter wrtrLog, IProgress progress) if (versionId != null && versionId != PhonologyServices.VersionId) { string sMsg = String.Format(AppStrings.ksWrongVersion, m_sFilename, PhonologyServices.VersionId, versionId); - LogMessage(sMsg, LineNumber(xrdr)); throw new Exception(sMsg); } string vernWs = xrdr.GetAttribute("DefaultVernWs"); @@ -299,7 +298,6 @@ public void ImportData(TextReader rdr, TextWriter wrtrLog, IProgress progress) if (vernWs != null && vernWs != cacheVernWs) { string sMsg = String.Format(AppStrings.ksWrongVernWs, m_sFilename, cacheVernWs, vernWs); - LogMessage(sMsg, LineNumber(xrdr)); throw new Exception(sMsg); } xrdr.Read();