Fix LT-22167: Confusing flextext Duplicate text found dialog (#496)

* Fix LT-22167: Confusing flextext Duplicate text found dialog

* Fix problem identified by Jason

Author: jtmaxwell3

Src/LexText/Interlinear/ITextDllTests/BIRDFormatImportTests.cs

@@ -1282,7 +1282,7 @@ public LLIMergeExtension(LcmCache cache, string tempDir, string rootDir) : base(
 				NumTimesDlgShown = 0;
 			}
 
-			protected override DialogResult ShowPossibleMergeDialog(IThreadedProgress progress)
+			protected override DialogResult ShowPossibleMergeDialog(IThreadedProgress progress, string textName)
 			{
 				NumTimesDlgShown++;
 				return DialogResult.Yes;
@@ -1301,7 +1301,7 @@ public LLINomergeExtension(LcmCache cache, string tempDir, string rootDir) : bas
 				NumTimesDlgShown = 0;
 			}
 
-			protected override DialogResult ShowPossibleMergeDialog(IThreadedProgress progress)
+			protected override DialogResult ShowPossibleMergeDialog(IThreadedProgress progress, string textName)
 			{
 				NumTimesDlgShown++;
 				return DialogResult.No;

Src/LexText/Interlinear/ITextStrings.Designer.cs

@@ -833,7 +833,7 @@ Click "Cancel" to abort this import.</value>
     <value>{0} texts will be imported from this SFM file.</value>
   </data>
   <data name="ksAskMergeInterlinearText" xml:space="preserve">
-    <value>You already have this interlinear text in your project. Would you like to merge it?</value>
+    <value>You already have the text '{0}' in your project. Would you like to merge it?</value>
   </data>
   <data name="ksAskMergeInterlinearTextTitle" xml:space="preserve">
     <value>Duplicate text found.</value>

Src/LexText/Interlinear/ITextStrings.resx

@@ -318,7 +318,8 @@ public bool ImportInterlinear(ImportInterlinearOptions options, ref LCModel.ITex
 								ICmObject repoObj;
 								m_cache.ServiceLocator.ObjectRepository.TryGetObject(new Guid(interlineartext.guid), out repoObj);
 								newText = repoObj as LCModel.IText;
-								if (newText != null && ShowPossibleMergeDialog(progress) == DialogResult.Yes)
+								string textName = newText?.Name?.BestVernacularAnalysisAlternative?.Text ?? "";
+								if (newText != null && ShowPossibleMergeDialog(progress, textName) == DialogResult.Yes)
 								{
 									continueMerge = MergeTextWithBIRDDoc(ref newText,
 													new TextCreationParams
@@ -448,14 +449,14 @@ private static void NormalizeItems(item[] items)
 		/// </summary>
 		/// <param name="progress"></param>
 		/// <returns></returns>
-		protected virtual DialogResult ShowPossibleMergeDialog(IThreadedProgress progress)
+		protected virtual DialogResult ShowPossibleMergeDialog(IThreadedProgress progress, string textName)
 		{							//we need to invoke the dialog on the main thread so we can use the progress dialog as the parent.
 			//otherwise the message box can be displayed behind everything
 			IAsyncResult asyncResult = progress.SynchronizeInvoke.BeginInvoke(new ShowDialogAboveProgressbarDelegate(ShowDialogAboveProgressbar),
 																		 new object[]
 																			{
 																				progress,
-																				ITextStrings.ksAskMergeInterlinearText,
+																				string.Format(ITextStrings.ksAskMergeInterlinearText, textName),
 																				ITextStrings.ksAskMergeInterlinearTextTitle,
 																				MessageBoxButtons.YesNo
 																			});