From d027da14308ac3c13da8b8fbb2cf05d566bc3356 Mon Sep 17 00:00:00 2001
From: John Maxwell <maxwellparc@gmail.com>
Date: Wed, 4 Feb 2026 08:30:16 -0800
Subject: [PATCH 1/2] More fixes to LT-22398: Change view to layout

---
 Src/xWorks/DictionaryConfigMgrDlg.resx         |  4 ++--
 .../DictionaryConfigurationController.cs       |  5 +++++
 .../DictionaryConfigurationImportDlg.resx      |  4 ++--
 Src/xWorks/UploadToWebonaryDlg.resx            |  2 +-
 Src/xWorks/XmlDocConfigureDlg.resx             |  6 +++---
 Src/xWorks/xWorksStrings.Designer.cs           | 18 ++++++++++++++++++
 Src/xWorks/xWorksStrings.resx                  |  7 +++++++
 7 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/Src/xWorks/DictionaryConfigMgrDlg.resx b/Src/xWorks/DictionaryConfigMgrDlg.resx
index b66e72cf44..a01ce70fe2 100644
--- a/Src/xWorks/DictionaryConfigMgrDlg.resx
+++ b/Src/xWorks/DictionaryConfigMgrDlg.resx
@@ -253,7 +253,7 @@
 	<value>1</value>
   </data>
   <data name="m_dlgText.Text" xml:space="preserve">
-	<value>Select a view to rename, copy or delete it.</value>
+	<value>Select a layout to rename, copy or delete it.</value>
   </data>
   <data name="&gt;&gt;m_dlgText.Name" xml:space="preserve">
 	<value>m_dlgText</value>
@@ -373,7 +373,7 @@
 	<value>477, 335</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-	<value>Manage {0} Views</value>
+	<value>Manage {0} Layouts</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
 	<value>DictionaryConfigMgrDlg</value>
diff --git a/Src/xWorks/DictionaryConfigurationController.cs b/Src/xWorks/DictionaryConfigurationController.cs
index 354f2de100..d5bd9135de 100644
--- a/Src/xWorks/DictionaryConfigurationController.cs
+++ b/Src/xWorks/DictionaryConfigurationController.cs
@@ -546,6 +546,11 @@ private void SetManagerTypeInfo(DictionaryConfigurationManagerDlg dialog)
 				dialog.Text = xWorksStrings.ReversalIndexConfigurationDlgTitle;
 				dialog.ConfigurationGroupText = xWorksStrings.DictionaryConfigurationMangager_ReversalConfigurations_GroupLabel;
 			}
+			if (DictionaryConfigurationListener.GetDictionaryConfigurationBaseType(_propertyTable) == xWorksStrings.ClassifiedDictionary)
+			{
+				dialog.Text = xWorksStrings.ClassifiedDictionaryConfigurationDlgTitle;
+				dialog.ConfigurationGroupText = xWorksStrings.DictionaryConfigurationMangager_ClassifiedConfigurations_GroupLabel;
+			}
 		}
 
 		public void SelectModelFromManager(DictionaryConfigurationModel model)
diff --git a/Src/xWorks/DictionaryConfigurationImportDlg.resx b/Src/xWorks/DictionaryConfigurationImportDlg.resx
index 0446c1761b..659c8a12e5 100644
--- a/Src/xWorks/DictionaryConfigurationImportDlg.resx
+++ b/Src/xWorks/DictionaryConfigurationImportDlg.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -596,7 +596,7 @@ Lots of explanation here, to be sure.
     <value>514, 340</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Import a View</value>
+    <value>Import a Layout</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>DictionaryConfigurationImportDlg</value>
diff --git a/Src/xWorks/UploadToWebonaryDlg.resx b/Src/xWorks/UploadToWebonaryDlg.resx
index 90ef02f7a8..8804c45069 100644
--- a/Src/xWorks/UploadToWebonaryDlg.resx
+++ b/Src/xWorks/UploadToWebonaryDlg.resx
@@ -1000,7 +1000,7 @@
     <value>19</value>
   </data>
   <data name="configurationLabel.Text" xml:space="preserve">
-    <value>View:</value>
+    <value>Layout:</value>
   </data>
   <data name="configurationLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
diff --git a/Src/xWorks/XmlDocConfigureDlg.resx b/Src/xWorks/XmlDocConfigureDlg.resx
index b11d49e886..ffa48d2387 100644
--- a/Src/xWorks/XmlDocConfigureDlg.resx
+++ b/Src/xWorks/XmlDocConfigureDlg.resx
@@ -1330,7 +1330,7 @@
 	<value>13</value>
   </data>
   <data name="m_lblViewType.Text" xml:space="preserve">
-	<value>Choose the view to configure:</value>
+	<value>Choose the layout to configure:</value>
   </data>
   <data name="&gt;&gt;m_lblViewType.Name" xml:space="preserve">
 	<value>m_lblViewType</value>
@@ -1420,7 +1420,7 @@
 	<value>29</value>
   </data>
   <data name="m_linkManageViews.Text" xml:space="preserve">
-	<value>Manage Views</value>
+	<value>Manage Layouts</value>
   </data>
   <data name="&gt;&gt;m_linkManageViews.Name" xml:space="preserve">
 	<value>m_linkManageViews</value>
@@ -1456,7 +1456,7 @@
 	<value>True</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-	<value>Configure {0} View</value>
+	<value>Configure {0} Layout</value>
   </data>
   <data name="&gt;&gt;columnHeader1.Name" xml:space="preserve">
 	<value>columnHeader1</value>
diff --git a/Src/xWorks/xWorksStrings.Designer.cs b/Src/xWorks/xWorksStrings.Designer.cs
index 011dc673d3..2dc95b8780 100644
--- a/Src/xWorks/xWorksStrings.Designer.cs
+++ b/Src/xWorks/xWorksStrings.Designer.cs
@@ -186,6 +186,15 @@ internal static string ClassifiedDictionary {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Manage Classified Dictionary Layouts.
+        /// </summary>
+        internal static string ClassifiedDictionaryConfigurationDlgTitle {
+            get {
+                return ResourceManager.GetString("ClassifiedDictionaryConfigurationDlgTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Click to jump to {0}..
         /// </summary>
@@ -365,6 +374,15 @@ internal static string DictionaryConfigurationDictionaryConfigurationUser_StyleO
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Classified Dictionary Layouts.
+        /// </summary>
+        internal static string DictionaryConfigurationMangager_ClassifiedConfigurations_GroupLabel {
+            get {
+                return ResourceManager.GetString("DictionaryConfigurationMangager_ClassifiedConfigurations_GroupLabel", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Reversal Layouts.
         /// </summary>
diff --git a/Src/xWorks/xWorksStrings.resx b/Src/xWorks/xWorksStrings.resx
index b2c25606ff..94dfbc51d1 100644
--- a/Src/xWorks/xWorksStrings.resx
+++ b/Src/xWorks/xWorksStrings.resx
@@ -1119,6 +1119,9 @@ See USFM documentation for help.</value>
   <data name="ReversalIndexConfigurationDlgTitle" xml:space="preserve">
     <value>Manage Reversal Index Layouts</value>
   </data>
+  <data name="ClassifiedDictionaryConfigurationDlgTitle" xml:space="preserve">
+    <value>Manage Classified Dictionary Layouts</value>
+  </data>
   <data name="YouAreResettingReversal" xml:space="preserve">
     <value>You are resetting the following to the 'All Reversal Indexes' settings:</value>
   </data>
@@ -1126,6 +1129,10 @@ See USFM documentation for help.</value>
     <value>Reversal Layouts</value>
     <comment>Label for the group box which contains the reversal configured layouts</comment>
   </data>
+  <data name="DictionaryConfigurationMangager_ClassifiedConfigurations_GroupLabel" xml:space="preserve">
+    <value>Classified Dictionary Layouts</value>
+    <comment>Label for the group box which contains the classified dictionary configured layouts</comment>
+  </data>
   <data name="InadvisableToShare" xml:space="preserve">
     <value>It is inadvisable to share '{0}' because a shared node with the same field ({1}) already exists ({2}). No changes have been made.</value>
     <comment>{0} is the node the user has requested to share. {3} is the field these nodes control. {2} is an existing shared node.</comment>

From 9f627427087000ac1de225cd079b48ffef04f78b Mon Sep 17 00:00:00 2001
From: Hasso <hasso_pape@sil.org>
Date: Wed, 4 Feb 2026 15:26:45 -0600
Subject: [PATCH 2/2] else

---
 Src/xWorks/DictionaryConfigurationController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/xWorks/DictionaryConfigurationController.cs b/Src/xWorks/DictionaryConfigurationController.cs
index d5bd9135de..6639bc1373 100644
--- a/Src/xWorks/DictionaryConfigurationController.cs
+++ b/Src/xWorks/DictionaryConfigurationController.cs
@@ -546,7 +546,7 @@ private void SetManagerTypeInfo(DictionaryConfigurationManagerDlg dialog)
 				dialog.Text = xWorksStrings.ReversalIndexConfigurationDlgTitle;
 				dialog.ConfigurationGroupText = xWorksStrings.DictionaryConfigurationMangager_ReversalConfigurations_GroupLabel;
 			}
-			if (DictionaryConfigurationListener.GetDictionaryConfigurationBaseType(_propertyTable) == xWorksStrings.ClassifiedDictionary)
+			else if (DictionaryConfigurationListener.GetDictionaryConfigurationBaseType(_propertyTable) == xWorksStrings.ClassifiedDictionary)
 			{
 				dialog.Text = xWorksStrings.ClassifiedDictionaryConfigurationDlgTitle;
 				dialog.ConfigurationGroupText = xWorksStrings.DictionaryConfigurationMangager_ClassifiedConfigurations_GroupLabel;