Merge release/dev17.11 to main (#74211)

src/EditorFeatures/Core.Wpf/QuickInfo/OnTheFlyDocsView.xaml.cs

@@ -76,7 +76,7 @@ public OnTheFlyDocsView(ITextView textView, IViewElementFactoryService viewEleme
                 new object[]
                 {
                     sparkle,
-                    ClassifiedTextElement.CreateHyperlink(EditorFeaturesResources.Tell_me_more, EditorFeaturesResources.Show_an_AI_generated_summary_of_this_code, () =>
+                    ClassifiedTextElement.CreateHyperlink(EditorFeaturesResources.Describe_with_Copilot, EditorFeaturesResources.Generate_summary_with_Copilot, () =>
                     RequestResults()),
                 }));
 
@@ -86,7 +86,7 @@ public OnTheFlyDocsView(ITextView textView, IViewElementFactoryService viewEleme
                 new object[]
                 {
                     new ClassifiedTextElement(new ClassifiedTextRun(
-                        ClassificationTypeDefinitions.ReducedEmphasisText, EditorFeaturesResources.GitHub_Copilot_thinking)),
+                        ClassificationTypeDefinitions.ReducedEmphasisText, EditorFeaturesResources.Copilot_thinking)),
                     new SmoothProgressBar { IsIndeterminate = true, Height = 2, Margin = new Thickness { Top = 2 } },
                 }));
 
@@ -107,13 +107,10 @@ public OnTheFlyDocsView(ITextView textView, IViewElementFactoryService viewEleme
                         new object[]
                         {
                             sparkle,
-                            ClassifiedTextElement.CreatePlainText(EditorFeaturesResources.GitHub_Copilot),
+                            ClassifiedTextElement.CreatePlainText(EditorFeaturesResources.Copilot),
                         }),
                     new ThematicBreakElement(),
                     _responseControl,
-                    new ThematicBreakElement(),
-                    new ClassifiedTextElement(new ClassifiedTextRun(
-                        ClassificationTypeDefinitions.ReducedEmphasisText, EditorFeaturesResources.AI_generated_content_may_be_inaccurate)),
                 }));
 
         ResultsRequested += (_, _) => PopulateAIDocumentationElements(_cancellationTokenSource.Token);

src/EditorFeatures/Core/EditorFeaturesResources.resx

@@ -935,20 +935,17 @@ Do you want to proceed?</value>
   <data name="Obsolete_symbol" xml:space="preserve">
     <value>Obsolete symbol</value>
   </data>
-  <data name="AI_generated_content_may_be_inaccurate" xml:space="preserve">
-    <value>AI-generated content may be inaccurate</value>
+  <data name="Copilot" xml:space="preserve">
+    <value>Copilot</value>
   </data>
-  <data name="GitHub_Copilot" xml:space="preserve">
-    <value>GitHub Copilot</value>
+  <data name="Copilot_thinking" xml:space="preserve">
+    <value>Copilot thinking...</value>
   </data>
-  <data name="GitHub_Copilot_thinking" xml:space="preserve">
-    <value>GitHub Copilot thinking...</value>
+  <data name="Generate_summary_with_Copilot" xml:space="preserve">
+    <value>Generate summary with Copilot (might be inaccurate)</value>
   </data>
-  <data name="Show_an_AI_generated_summary_of_this_code" xml:space="preserve">
-    <value>Show an AI generated summary of this code</value>
-  </data>
-  <data name="Tell_me_more" xml:space="preserve">
-    <value>Tell me more</value>
+  <data name="Describe_with_Copilot" xml:space="preserve">
+    <value>Describe with Copilot</value>
   </data>
   <data name="On_the_fly_documentation" xml:space="preserve">
     <value>On-the-fly documentation</value>