From ce0f2669ee0539eb4fc61355da698b6c19ac31c2 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Wed, 25 Dec 2024 08:17:37 +0100 Subject: [PATCH] Prefix 'unmerged changes' with 'TODO' --- .../Test2/Rename/RenameTagProducerTests.vb | 2 +- ...dFileMergeConflictCommentAdditionService.cs | 2 +- .../Core/Portable/WorkspacesResources.resx | 5 +++-- .../Portable/xlf/WorkspacesResources.cs.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.de.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.es.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.fr.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.it.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.ja.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.ko.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.pl.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.pt-BR.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.ru.xlf | 10 +++++----- .../Portable/xlf/WorkspacesResources.tr.xlf | 10 +++++----- .../xlf/WorkspacesResources.zh-Hans.xlf | 10 +++++----- .../xlf/WorkspacesResources.zh-Hant.xlf | 10 +++++----- .../LinkedFileDiffMergingTests.TextMerging.cs | 18 +++++++++--------- 17 files changed, 79 insertions(+), 78 deletions(-) diff --git a/src/EditorFeatures/Test2/Rename/RenameTagProducerTests.vb b/src/EditorFeatures/Test2/Rename/RenameTagProducerTests.vb index 2fcf2ff96dd91..043732945a107 100644 --- a/src/EditorFeatures/Test2/Rename/RenameTagProducerTests.vb +++ b/src/EditorFeatures/Test2/Rename/RenameTagProducerTests.vb @@ -352,7 +352,7 @@ public class Class1 void Test(int i) {{ }} void M() {{ -{{|conflict:{{|conflict:<<<<<<< {String.Format(WorkspacesResources.Unmerged_change_from_project_0, "CSharpAssembly1")}, {WorkspacesResources.Before_colon} +{{|conflict:{{|conflict:<<<<<<< {String.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "CSharpAssembly1")}, {WorkspacesResources.Before_colon} Test(5); ======= Test((long)5); diff --git a/src/Workspaces/Core/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs b/src/Workspaces/Core/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs index 1ef88f5a82506..c13f3a9bc9a98 100644 --- a/src/Workspaces/Core/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs +++ b/src/Workspaces/Core/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs @@ -76,7 +76,7 @@ private static ImmutableArray GetCommentChangesForDocument(IEnumerab 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 index bbdcae449142e..1b22399b7d47f 100644 --- a/src/Workspaces/Core/Portable/WorkspacesResources.resx +++ b/src/Workspaces/Core/Portable/WorkspacesResources.resx @@ -249,8 +249,9 @@ Solution file not found: '{0}' - - Unmerged change from project '{0}' + + TODO: Unmerged change from project '{0}' + {Locked="TODO"} After diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf index e27070c0000b0..2f221e6af16e5 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf @@ -197,6 +197,11 @@ Synchronizovat obor názvů se strukturou složek + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. Obsah dokumentu SourceGeneratedDocument nesmí být změněn. @@ -407,11 +412,6 @@ Nenalezený soubor řešení: {0} - - Unmerged change from project '{0}' - Nesloučené změny z projektu '{0}' - - Before: Před: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf index f8ae695f2f5f5..44cec8f9ddf87 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf @@ -197,6 +197,11 @@ Namespace mit Ordnerstruktur synchronisieren + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. Der Inhalt eines SourceGeneratedDocument kann nicht geändert werden. @@ -407,11 +412,6 @@ Lösungsdatei nicht gefunden: "{0}" - - Unmerged change from project '{0}' - Nicht gemergte Änderung aus Projekt "{0}" - - Before: Vor: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf index bf0b2ab7dec68..2114a90441bdf 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf @@ -197,6 +197,11 @@ Sincronizar espacio de nombres con estructura de carpetas + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. No se puede cambiar el contenido de un elemento SourceGeneratedDocument. @@ -407,11 +412,6 @@ Archivo de solución no encontrado: '{0}' - - Unmerged change from project '{0}' - Cambio no fusionado mediante combinación del proyecto '{0}' - - Before: Antes: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf index 7e3f7402eec3e..d8a55f70c9ee0 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf @@ -197,6 +197,11 @@ Synchroniser l'espace de noms avec la structure de dossier + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. Le contenu de SourceGeneratedDocument ne doit pas être changé. @@ -407,11 +412,6 @@ Fichier solution introuvable : '{0}' - - Unmerged change from project '{0}' - Modification non fusionnée à partir du projet '{0}' - - Before: Avant : diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf index 735c8e03b5cf9..540ed5596a248 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf @@ -197,6 +197,11 @@ Sincronizza lo spazio dei nomi con la struttura di cartelle + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. Non è possibile modificare il contenuto di un elemento SourceGeneratedDocument. @@ -407,11 +412,6 @@ Il file di soluzione non è stato trovato: '{0}' - - Unmerged change from project '{0}' - Modifica senza merge dal progetto '{0}' - - Before: Prima: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf index a882e9c6553c3..6f39c3461acdc 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf @@ -197,6 +197,11 @@ 名前空間とフォルダー構造の同期 + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. SourceGeneratedDocument のコンテンツが変更されない可能性があります。 @@ -407,11 +412,6 @@ ソリューション ファイルが見つかりません: '{0}' - - Unmerged change from project '{0}' - プロジェクト '{0}' からのマージされていない変更 - - Before: 前: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf index f9d5bfb946c2f..e11bc6259f096 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf @@ -197,6 +197,11 @@ 네임스페이스를 폴더 구조로 동기화 + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. SourceGeneratedDocument의 콘텐츠는 변경할 수 없습니다. @@ -407,11 +412,6 @@ '{0}' 솔루션 파일을 찾을 수 없습니다. - - Unmerged change from project '{0}' - '{0}' 프로젝트에서 병합되지 않은 변경 내용 - - Before: 이전: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf index 38c73da3c677d..b830e74e4ed04 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf @@ -197,6 +197,11 @@ Synchronizuj przestrzeń nazw ze strukturą folderów + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. Nie można zmienić zawartości elementu SourceGeneratedDocument. @@ -407,11 +412,6 @@ Nie znaleziono pliku rozwiązania: „{0}” - - Unmerged change from project '{0}' - Niescalona zmiana z projektu „{0}” - - Before: Przed: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf index 85cbee505c740..132289554e41c 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf @@ -197,6 +197,11 @@ Sincronizar namespace com a estrutura de pasta + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. O conteúdo de um SourceGeneratedDocument não pode ser alterado. @@ -407,11 +412,6 @@ Arquivo de solução não encontrado: "{0}" - - Unmerged change from project '{0}' - Alteração não mesclada do projeto '{0}' - - Before: Antes: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf index 7be02aaf369d7..98ef67b1ec6e8 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf @@ -197,6 +197,11 @@ Синхронизировать пространство имен со структурой папок + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. Содержимое SourceGeneratedDocument не может быть изменено. @@ -407,11 +412,6 @@ Не удалось найти файл решения: "{0}" - - Unmerged change from project '{0}' - Необъединенное слияние из проекта "{0}" - - Before: До: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf index 8d60e67e18336..4949ac695a677 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf @@ -197,6 +197,11 @@ Ad alanını klasör yapısına eşitle + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. SourceGeneratedDocument'ın içeriği değiştirilemez. @@ -407,11 +412,6 @@ Çözüm dosyası bulunamadı: '{0}' - - Unmerged change from project '{0}' - '{0}' projesinden birleştirilmemiş değişiklik - - Before: Sonra: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf index 5185684ea787e..bb8b8fbcb9562 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf @@ -197,6 +197,11 @@ 将命名空间同步到文件夹结构 + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. 不能更改 SourceGeneratedDocument 的内容。 @@ -407,11 +412,6 @@ 找不到解决方案文件:“{0}” - - Unmerged change from project '{0}' - 项目“{0}”的未合并的更改 - - Before: 在此之前: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf index af5e4db57d57a..982b61f0127f7 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf @@ -197,6 +197,11 @@ 將命名空間同步到資料夾結構 + + TODO: Unmerged change from project '{0}' + TODO: Unmerged change from project '{0}' + {Locked="TODO"} + The contents of a SourceGeneratedDocument may not be changed. SourceGeneratedDocument 的內容可能無法變更。 @@ -407,11 +412,6 @@ 找不到方案檔: '{0}' - - Unmerged change from project '{0}' - 取消合併專案 '{0}' 的變更 - - Before: 之前: diff --git a/src/Workspaces/CoreTest/LinkedFileDiffMerging/LinkedFileDiffMergingTests.TextMerging.cs b/src/Workspaces/CoreTest/LinkedFileDiffMerging/LinkedFileDiffMergingTests.TextMerging.cs index 5a82244767831..11e0617fd4b8a 100644 --- a/src/Workspaces/CoreTest/LinkedFileDiffMerging/LinkedFileDiffMergingTests.TextMerging.cs +++ b/src/Workspaces/CoreTest/LinkedFileDiffMerging/LinkedFileDiffMergingTests.TextMerging.cs @@ -59,7 +59,7 @@ public void TestOneConflict() ["a b y d e", "a b z d e"], $""" - <<<<<<< {string.Format(WorkspacesResources.Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} + <<<<<<< {string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} a b c d e ======= a b z d e @@ -77,7 +77,7 @@ public void TestTwoConflictsOnSameLine() ["a q1 c z1 e", "a q2 c z2 e"], $""" - <<<<<<< {string.Format(WorkspacesResources.Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} + <<<<<<< {string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} a b c d e ======= a q2 c z2 e @@ -114,7 +114,7 @@ public void TestTwoConflictsOnAdjacentLines() $""" One - <<<<<<< {string.Format(WorkspacesResources.Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} + <<<<<<< {string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} Two Three ======= @@ -158,7 +158,7 @@ public void TestTwoConflictsOnSeparatedLines() $""" One; - <<<<<<< {string.Format(WorkspacesResources.Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} + <<<<<<< {string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} Two; ======= TwoZ; @@ -166,7 +166,7 @@ public void TestTwoConflictsOnSeparatedLines() TwoY; Three; - <<<<<<< {string.Format(WorkspacesResources.Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} + <<<<<<< {string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} Four; ======= FourZ; @@ -190,13 +190,13 @@ public void TestManyLinkedFilesWithOverlappingChange() ], $""" - <<<<<<< {string.Format(WorkspacesResources.Unmerged_change_from_project_0, "ProjectName2")}, {WorkspacesResources.Before_colon} + <<<<<<< {string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "ProjectName2")}, {WorkspacesResources.Before_colon} A ======= C >>>>>>> {WorkspacesResources.After} - <<<<<<< {string.Format(WorkspacesResources.Unmerged_change_from_project_0, "ProjectName3")}, {WorkspacesResources.Before_colon} + <<<<<<< {string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "ProjectName3")}, {WorkspacesResources.Before_colon} A ======= >>>>>>> {WorkspacesResources.After} @@ -218,7 +218,7 @@ public void TestCommentsAddedCode(string language) ], $""" - <<<<<<< {string.Format(WorkspacesResources.Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} + <<<<<<< {string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} ======= B >>>>>>> {WorkspacesResources.After} @@ -240,7 +240,7 @@ public void TestCommentsRemovedCode(string language) ], $""" - <<<<<<< {string.Format(WorkspacesResources.Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} + <<<<<<< {string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "ProjectName1")}, {WorkspacesResources.Before_colon} A ======= >>>>>>> {WorkspacesResources.After}