Prefix 'unmerged changes' with 'TODO'

dotnet · Jul 1, 2022 · 6c807c1 · 6c807c1
1 parent 412dc4c
commit 6c807c1
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 68 deletions.
diff --git a/...e/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs b/...e/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs
@@ -78,7 +78,7 @@ private List<TextChange> GetCommentChangesForDocument(IEnumerable<IEnumerable<Te
                 var newText = oldText.WithChanges(adjustedChanges);
 
                 var warningText = GetConflictCommentText(
-                    string.Format(WorkspacesResources.Unmerged_change_from_project_0, projectName),
+                    string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, projectName),
                     TrimBlankLines(oldText),
                     TrimBlankLines(newText));
 

diff --git a/src/Workspaces/Core/Portable/WorkspacesResources.resx b/src/Workspaces/Core/Portable/WorkspacesResources.resx
@@ -333,8 +333,9 @@
   <data name="Solution_file_not_found_colon_0" xml:space="preserve">
     <value>Solution file not found: '{0}'</value>
   </data>
-  <data name="Unmerged_change_from_project_0" xml:space="preserve">
-    <value>Unmerged change from project '{0}'</value>
+  <data name="TODO_Unmerged_change_from_project_0" xml:space="preserve">
+    <value>TODO: Unmerged change from project '{0}'</value>
+    <comment>{Locked="TODO"}</comment>
   </data>
   <data name="Added_colon" xml:space="preserve">
     <value>Added:</value>

diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf