* resolved resx split conflicts

ProteoWizard · Jan 3, 2024 · e725032 · e725032
1 parent a668d62
commit e725032
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 214 deletions.
diff --git a/pwiz_tools/Skyline/EditUI/AssociateProteinsDlg.cs b/pwiz_tools/Skyline/EditUI/AssociateProteinsDlg.cs
@@ -341,16 +341,16 @@ private void cbGeneLevel_CheckedChanged(object sender, EventArgs e)
             {
                 cbGroupProteins.Checked = true;
                 cbGroupProteins.Enabled = false;
-                lblMinimalProteinList.Text = Resources.AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides;
-                lblRemoveSubsetProteins.Text = Resources.AssociateProteinsDlg_Remove_subset_genes;
-                lblMinPeptides.Text = Resources.AssociateProteinsDlg_Min_peptides_per_gene;
+                lblMinimalProteinList.Text = EditUIResources.AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides;
+                lblRemoveSubsetProteins.Text = EditUIResources.AssociateProteinsDlg_Remove_subset_genes;
+                lblMinPeptides.Text = EditUIResources.AssociateProteinsDlg_Min_peptides_per_gene;
             }
             else
             {
                 cbGroupProteins.Enabled = true;
-                lblMinimalProteinList.Text = Resources.AssociateProteinsDlg_Find_minimal_protein_group_list_that_explains_all_peptides;
-                lblRemoveSubsetProteins.Text = Resources.AssociateProteinsDlg_Remove_subset_protein_groups;
-                lblMinPeptides.Text = Resources.AssociateProteinsDlg_Min_peptides_per_protein_group;
+                lblMinimalProteinList.Text = EditUIResources.AssociateProteinsDlg_Find_minimal_protein_group_list_that_explains_all_peptides;
+                lblRemoveSubsetProteins.Text = EditUIResources.AssociateProteinsDlg_Remove_subset_protein_groups;
+                lblMinPeptides.Text = EditUIResources.AssociateProteinsDlg_Min_peptides_per_protein_group;
             }
 
             UpdateParsimonyResults();

diff --git a/pwiz_tools/Skyline/EditUI/EditUIResources.designer.cs b/pwiz_tools/Skyline/EditUI/EditUIResources.designer.cs
diff --git a/pwiz_tools/Skyline/EditUI/EditUIResources.resx b/pwiz_tools/Skyline/EditUI/EditUIResources.resx
@@ -462,4 +462,13 @@ Example: Looplink: T [4]
   <data name="UniquePeptidesDlg_SelectPeptidesWithNumberOfMatchesAtOrBelowThreshold_These_proteins_include_" xml:space="preserve">
     <value>These proteins include:</value>
   </data>
+  <data name="AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides" xml:space="preserve">
+    <value>Find &amp;minimal gene group list that explains all peptides</value>
+  </data>
+  <data name="AssociateProteinsDlg_Min_peptides_per_gene" xml:space="preserve">
+    <value>Mi&amp;n peptides per gene</value>
+  </data>
+  <data name="AssociateProteinsDlg_Remove_subset_genes" xml:space="preserve">
+    <value>&amp;Remove subset genes</value>
+  </data>
 </root>
diff --git a/pwiz_tools/Skyline/Model/Proteome/ProteinAssociation.cs b/pwiz_tools/Skyline/Model/Proteome/ProteinAssociation.cs
@@ -669,7 +669,7 @@ IProteinRecord GenerateConcatenatedSequenceIfNecessary(Dictionary<IProteinRecord
             results.FinalProteinCount = _peptideGroupToProteins.Count;
 
             if (geneLevel)
-                broker.Message = Resources.ProteinAssociation_CalculateProteinOrGeneGroups_Calculating_gene_groups;
+                broker.Message = ProteomeResources.ProteinAssociation_CalculateProteinOrGeneGroups_Calculating_gene_groups;
             else
                 broker.Message = ProteomeResources.ProteinAssociation_CalculateProteinGroups_Calculating_protein_groups;
             var proteinGroupAssociations = new Dictionary<IProteinRecord, PeptideAssociationGroup>(geneLevel ? new GeneLevelEqualityComparer() : EqualityComparer<IProteinRecord>.Default);

diff --git a/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.designer.cs b/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.designer.cs
diff --git a/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.resx b/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.resx
@@ -160,4 +160,7 @@
   <data name="ProteinMetadataManager_LookupProteinMetadata_resolving_protein_details" xml:space="preserve">
     <value>Resolving protein details</value>
   </data>
+  <data name="ProteinAssociation_CalculateProteinOrGeneGroups_Calculating_gene_groups" xml:space="preserve">
+    <value>Calculating gene groups</value>
+  </data>
 </root>
diff --git a/pwiz_tools/Skyline/Properties/Resources.Designer.cs b/pwiz_tools/Skyline/Properties/Resources.Designer.cs
diff --git a/pwiz_tools/Skyline/Properties/Resources.resx b/pwiz_tools/Skyline/Properties/Resources.resx
@@ -4357,16 +4357,4 @@ If you choose Disable, you can enable Auto-select later with the "Refine &gt; Ad
   <data name="CommandLine_SetPeptideDigestSettings_Error__Could_not_find_background_proteome_file__0_" xml:space="preserve">
     <value>Error: Could not find background proteome file {0}</value>
   </data>
-  <data name="ProteinAssociation_CalculateProteinOrGeneGroups_Calculating_gene_groups" xml:space="preserve">
-    <value>Calculating gene groups</value>
-  </data>
-  <data name="AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides" xml:space="preserve">
-    <value>Find &amp;minimal gene group list that explains all peptides</value>
-  </data>
-  <data name="AssociateProteinsDlg_Remove_subset_genes" xml:space="preserve">
-    <value>&amp;Remove subset genes</value>
-  </data>
-  <data name="AssociateProteinsDlg_Min_peptides_per_gene" xml:space="preserve">
-    <value>Mi&amp;n peptides per gene</value>
-  </data>
 </root>