diff --git a/src/Workspaces/Core/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs b/src/Workspaces/Core/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs index e8d35e9a70ddd..d6857aedcb059 100644 --- a/src/Workspaces/Core/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs +++ b/src/Workspaces/Core/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs @@ -78,7 +78,7 @@ private List GetCommentChangesForDocument(IEnumerable Solution file not found: '{0}' - - Unmerged change from project '{0}' + + TODO: Unmerged change from project '{0}' + {Locked="TODO"} Added: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf index d34909acb1965..e449520dce374 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf @@ -217,6 +217,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. @@ -502,11 +507,6 @@ Nenalezený soubor řešení: {0} - - Unmerged change from project '{0}' - Nesloučené změny z projektu '{0}' - - Added: Přidáno: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf index 08bd7ec0fce64..dcd6dd5d5fce6 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf @@ -217,6 +217,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. @@ -502,11 +507,6 @@ Lösungsdatei nicht gefunden: "{0}" - - Unmerged change from project '{0}' - Nicht gemergte Änderung aus Projekt "{0}" - - Added: Hinzugefügt: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf index 41bf4e9008f13..b838634130611 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf @@ -217,6 +217,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. @@ -502,11 +507,6 @@ Archivo de solución no encontrado: '{0}' - - Unmerged change from project '{0}' - Cambio no fusionado mediante combinación del proyecto '{0}' - - Added: Agregado: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf index a23e86f1eaffc..70052b9783dcf 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf @@ -217,6 +217,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é. @@ -502,11 +507,6 @@ Fichier solution introuvable : '{0}' - - Unmerged change from project '{0}' - Modification non fusionnée à partir du projet '{0}' - - Added: Ajouté : diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf index 484a343980ffe..3a2623e3eb314 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf @@ -217,6 +217,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. @@ -502,11 +507,6 @@ Il file di soluzione non è stato trovato: '{0}' - - Unmerged change from project '{0}' - Modifica senza merge dal progetto '{0}' - - Added: Aggiunto: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf index a93c1b5781246..3688d75e7bfad 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf @@ -217,6 +217,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 のコンテンツが変更されない可能性があります。 @@ -502,11 +507,6 @@ ソリューション ファイルが見つかりません: '{0}' - - Unmerged change from project '{0}' - プロジェクト '{0}' からのマージされていない変更 - - Added: 追加済み: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf index 86dbae7649f9c..2a463842a900b 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf @@ -217,6 +217,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의 콘텐츠는 변경할 수 없습니다. @@ -502,11 +507,6 @@ '{0}' 솔루션 파일을 찾을 수 없습니다. - - Unmerged change from project '{0}' - '{0}' 프로젝트에서 병합되지 않은 변경 내용 - - Added: 추가됨: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf index 4ad64e59d57bd..09d058534e966 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf @@ -217,6 +217,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. @@ -502,11 +507,6 @@ Nie znaleziono pliku rozwiązania: „{0}” - - Unmerged change from project '{0}' - Niescalona zmiana z projektu „{0}” - - Added: Dodano: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf index dd1540a0b5cdd..92be76badea1a 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf @@ -217,6 +217,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. @@ -502,11 +507,6 @@ Arquivo de solução não encontrado: "{0}" - - Unmerged change from project '{0}' - Alteração não mesclada do projeto '{0}' - - Added: Adicionado: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf index 4c1b117cdbe4b..171df6904ac4a 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf @@ -217,6 +217,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 не может быть изменено. @@ -502,11 +507,6 @@ Не удалось найти файл решения: "{0}" - - Unmerged change from project '{0}' - Необъединенное слияние из проекта "{0}" - - Added: Добавлены: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf index 4cc1f9458c457..4c89b10eea866 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf @@ -217,6 +217,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. @@ -502,11 +507,6 @@ Çözüm dosyası bulunamadı: '{0}' - - Unmerged change from project '{0}' - '{0}' projesinden birleştirilmemiş değişiklik - - Added: Eklendi: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf index cdf6bc67a2623..55aa3373f8407 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf @@ -217,6 +217,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 的内容。 @@ -502,11 +507,6 @@ 找不到解决方案文件:“{0}” - - Unmerged change from project '{0}' - 项目“{0}”的未合并的更改 - - Added: 添加项: diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf index 792f8afe83144..9d4d180c22089 100644 --- a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf +++ b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf @@ -217,6 +217,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 的內容可能無法變更。 @@ -502,11 +507,6 @@ 找不到方案檔: '{0}' - - Unmerged change from project '{0}' - 取消合併專案 '{0}' 的變更 - - Added: 已加入: