Skip to content

Commit 521665e

Browse files
bobbrowbobbrow
authored
Merge pull request #878 from microsoft/develop
1.2.1: merge develop -> master
2 parents 53f8f55 + 0464486 commit 521665e

18 files changed

+63
-50
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# What's New?
22

3-
## 1.2.0
3+
## 1.2.1
44
Thank you to the following CMake Tools contributors: koemai, bjosa, emanspeaks, som1lse,
55
dcourtois, tsing80, andy-held, notskm, thezogoth, yokuyuki, dbird137, fabianogk, randshot.
66

‎gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ const generatedSrcLocBundle = () => {
215215

216216
const generateLocalizedJsonSchemaFiles = () => {
217217
return es.through(function (file) {
218-
console.log(file.path);
219218
let jsonTree = JSON.parse(file.contents.toString());
220219
languages.map((language) => {
221220
let stringTable = {};
@@ -228,6 +227,7 @@ const generateLocalizedJsonSchemaFiles = () => {
228227
// Entire file is scanned and modified, then serialized for that language.
229228
// Even if no translations are available, we still write new files to dist/schema/...
230229
let keyPrefix = relativePath + ".";
230+
keyPrefix = keyPrefix.replace(/\\/g, "/");
231231
let descriptionCallback = (path, value, parent) => {
232232
if (stringTable[keyPrefix + path]) {
233233
parent.description = stringTable[keyPrefix + path];

‎i18n/chs/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "扫描工具包",
3737
"cancel.button": "取消",
3838
"rescanning.for.kits": "重新扫描工具包",
39-
"found.duplicate.kits": "找到了带有旧ID的Visual Studio套件，并将其保存在cmake-tools-kits.json中。",
40-
"delete.duplicate.kits": "您是否要从cmake-tools-kits.json中删除重复的Visual Studio套件？",
39+
"found.duplicate.kits": "已找到在 cmake-tools-kits.json 中保存了旧 ID 的 Visual Studio 工具包。",
40+
"delete.duplicate.kits": "是否要从 cmake-tools-kits.json 删除重复的 Visual Studio 工具包?",
4141
"no.button": "否",
4242
"saving.kits.to": "正在将工具包保存到 {0}",
4343
"saving.new.kits.to": "正在将新工具包保存到 {0}",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "{0} 已完成(已返回不可序列化的值)",
6666
"loading.extension.commands": "正在加载扩展命令",
6767
"register.command": "注册 CMakeTools 扩展命令 {0}",
68-
"uninstall.old.cmaketools": "请卸载任何较旧版本的CMake Tools扩展。它现在由Microsoft从版本1.2.0开始发布。",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "CMake 工具正在初始化...",
7070
"deactivate.cmaketools": "停用 CMakeTools"
7171
}

‎i18n/cht/src/extension.i18n.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
"scan.for.kits.button": "掃描套件",
3737
"cancel.button": "取消",
3838
"rescanning.for.kits": "正在重新掃描套件",
39-
"found.duplicate.kits": "找到了帶有舊ID的Visual Studio套件，並將其保存在cmake-tools-kits.json中。",
40-
"delete.duplicate.kits": "您是否要從cmake-tools-kits.json中刪除重複的Visual Studio套件？",
41-
"no.button": "否",
39+
"found.duplicate.kits": "Found Visual Studio kits with the old ids saved in the cmake-tools-kits.json.",
40+
"delete.duplicate.kits": "Would you like to delete the duplicate Visual Studio kits from cmake-tools-kits.json?",
41+
"no.button": "否",
4242
"saving.kits.to": "正在將套件儲存至 {0}",
4343
"saving.new.kits.to": "正在將新套件儲存至 {0}",
4444
"retry.button": "重試",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "{0} 已完成 (傳回無法序列化的值)",
6666
"loading.extension.commands": "正在載入延伸模組命令",
6767
"register.command": "註冊 CMakeTools 延伸模組命令 {0}",
68-
"uninstall.old.cmaketools": "請卸載任何較舊版本的CMake Tools擴展。它現在由Microsoft發布，版本為1.2.0。",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "CMake 工具正在初始化...",
7070
"deactivate.cmaketools": "停用 CMakeTools"
7171
}

‎i18n/csy/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "Vyhledat sady",
3737
"cancel.button": "Storno",
3838
"rescanning.for.kits": "Probíhá opětovné hledání sad.",
39-
"found.duplicate.kits": "Nalezené sady Visual Studio se starými idy uloženými v souboru cmake-tools-kits.json.",
40-
"delete.duplicate.kits": "Chcete odstranit duplicitní sady Visual Studio z cmake-tools-kits.json?",
39+
"found.duplicate.kits": "V souboru cmake-tools-kits.json se našly sady Visual Studio se starými ID.",
40+
"delete.duplicate.kits": "Chcete odstranit duplicitní sady Visual Studio ze souboru cmake-tools-kits.json?",
4141
"no.button": "Ne",
4242
"saving.kits.to": "Ukládají se sady do {0}.",
4343
"saving.new.kits.to": "Ukládají se nové sady do {0}.",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "Dokončeno: {0} (vrácena neserializovatelná hodnota)",
6666
"loading.extension.commands": "Načítání příkazů rozšíření",
6767
"register.command": "Zaregistrujte příkaz rozšíření CMakeTools {0}.",
68-
"uninstall.old.cmaketools": "Odinstalujte prosím všechny starší verze rozšíření CMake Tools. Nyní je publikován společností Microsoft počínaje verzí 1.2.0.",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "Inicializují se nástroje CMake Tools...",
7070
"deactivate.cmaketools": "Deaktivovat CMakeTools"
7171
}

‎i18n/deu/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "Nach Kits suchen",
3737
"cancel.button": "Abbrechen",
3838
"rescanning.for.kits": "Es wird erneut nach Kits gesucht.",
39-
"found.duplicate.kits": "Es wurden Visual Studio-Kits mit den alten IDs gefunden, die in der Datei cmake-tools-kits.json gespeichert sind.",
40-
"delete.duplicate.kits": "Möchten Sie die duplizierten Visual Studio-Kits aus cmake-tools-kits.json löschen?",
39+
"found.duplicate.kits": "Found Visual Studio kits with the old ids saved in the cmake-tools-kits.json.",
40+
"delete.duplicate.kits": "Would you like to delete the duplicate Visual Studio kits from cmake-tools-kits.json?",
4141
"no.button": "Nein",
4242
"saving.kits.to": "Kits werden in \"{0}\" gespeichert.",
4343
"saving.new.kits.to": "Neue Kits werden in \"{0}\" gespeichert.",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "{0} abgeschlossen (nicht serialisierbarer Wert zurückgegeben)",
6666
"loading.extension.commands": "Erweiterungsbefehle werden geladen.",
6767
"register.command": "CMakeTools-Erweiterungsbefehl \"{0}\" registrieren",
68-
"uninstall.old.cmaketools": "Bitte deinstallieren Sie alle älteren Versionen der CMake Tools-Erweiterung. Es wird jetzt von Microsoft ab Version 1.2.0 veröffentlicht.",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "CMake Tools wird initialisiert...",
7070
"deactivate.cmaketools": "CMakeTools deaktivieren"
7171
}

‎i18n/esn/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "Buscar para kits",
3737
"cancel.button": "Cancelar",
3838
"rescanning.for.kits": "Volver a examinar los kits",
39-
"found.duplicate.kits": "Encontrados kits do Visual Studio com os IDs antigos salvos no cmake-tools-kits.json.",
40-
"delete.duplicate.kits": "Deseja excluir os kits duplicados do Visual Studio do cmake-tools-kits.json?",
39+
"found.duplicate.kits": "Se han encontrado kits de Visual Studio con los identificadores antiguos guardados en cmake-tools-kits.json.",
40+
"delete.duplicate.kits": "¿Quiere eliminar los kits de Visual Studio duplicados de cmake-tools-kits.json?",
4141
"no.button": "No",
4242
"saving.kits.to": "Guardando los kits en {0}",
4343
"saving.new.kits.to": "Guardando los kits nuevos en {0}",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "Finalizó {0} (se devolvió un valor no serializable)",
6666
"loading.extension.commands": "Cargando los comandos de la extensión",
6767
"register.command": "Registrar el comando de la extensión CMakeTools {0}",
68-
"uninstall.old.cmaketools": "Desinstale cualquier versión anterior de la extensión CMake Tools. Ahora lo publica Microsoft a partir de la versión 1.2.0.",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "Inicializando las Herramientas de CMake...",
7070
"deactivate.cmaketools": "Desactivar CMakeTools"
7171
}

‎i18n/fra/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "Rechercher des kits",
3737
"cancel.button": "Annuler",
3838
"rescanning.for.kits": "Nouvelle recherche des kits",
39-
"found.duplicate.kits": "Kits Visual Studio trouvés contenant les anciens identifiants enregistrés dans le fichier cmake-tools-kits.json.",
40-
"delete.duplicate.kits": "Souhaitez-vous supprimer les kits Visual Studio dupliqués de cmake-tools-kits.json?",
39+
"found.duplicate.kits": "Détection de kits Visual Studio avec d'anciens ID enregistrés dans cmake-tools-kits.json.",
40+
"delete.duplicate.kits": "Voulez-vous supprimer les kits Visual Studio dupliqués de cmake-tools-kits.json ?",
4141
"no.button": "Non",
4242
"saving.kits.to": "Enregistrement des kits dans {0}",
4343
"saving.new.kits.to": "Enregistrement des nouveaux kits dans {0}",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "{0} a pris fin (valeur non sérialisable retournée)",
6666
"loading.extension.commands": "Chargement des commandes d'extension",
6767
"register.command": "Inscrire la commande d'extension CMakeTools {0}",
68-
"uninstall.old.cmaketools": "Veuillez désinstaller toute ancienne version de CMake Tools. Il est maintenant publié par Microsoft à partir de la version 1.2.0.",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "Initialisation de CMake Tools...",
7070
"deactivate.cmaketools": "Désactiver CMakeTools"
7171
}

‎i18n/ita/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "Cerca kit",
3737
"cancel.button": "Annulla",
3838
"rescanning.for.kits": "Rianalisi dei kit",
39-
"found.duplicate.kits": "Nahita kitapo Visual Studio miaraka amin'ireo ids taloha voatahiry ao amin'ny cmake-fitaovana-kits.json.",
40-
"delete.duplicate.kits": "Te-hanaisotra ireo kitapo Visual Studio ve ianao amin'ny kitapo-fitaovana-kits.json?",
39+
"found.duplicate.kits": "Found Visual Studio kits with the old ids saved in the cmake-tools-kits.json.",
40+
"delete.duplicate.kits": "Would you like to delete the duplicate Visual Studio kits from cmake-tools-kits.json?",
4141
"no.button": "No",
4242
"saving.kits.to": "Salvataggio dei kit in {0}",
4343
"saving.new.kits.to": "Salvataggio dei nuovi kit in {0}",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "{0} terminato (ha restituito un valore non serializzabile)",
6666
"loading.extension.commands": "Caricamento dei comandi dell'estensione",
6767
"register.command": "Registra il comando {0} dell'estensione CMakeTools",
68-
"uninstall.old.cmaketools": "Disinstallare eventuali versioni precedenti dell'estensione CMake Tools. Ora è pubblicato da Microsoft a partire dalla versione 1.2.0.",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "Inizializzazione di CMake Tools...",
7070
"deactivate.cmaketools": "Disattiva CMakeTools"
7171
}

‎i18n/jpn/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "キットのスキャン",
3737
"cancel.button": "キャンセル",
3838
"rescanning.for.kits": "キットを再スキャンしています",
39-
"found.duplicate.kits": "cmake-tools-kits.jsonに保存された古いIDを持つVisual Studioキットを見つけました。",
40-
"delete.duplicate.kits": "重複したVisual Studioキットをcmake-tools-kits.jsonから削除しますか？",
39+
"found.duplicate.kits": "Found Visual Studio kits with the old ids saved in the cmake-tools-kits.json.",
40+
"delete.duplicate.kits": "Would you like to delete the duplicate Visual Studio kits from cmake-tools-kits.json?",
4141
"no.button": "いいえ",
4242
"saving.kits.to": "キットを {0} に保存しています",
4343
"saving.new.kits.to": "新しいキットを {0} に保存しています",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "{0} が完了しました (シリアル化可能でない値が返されました)",
6666
"loading.extension.commands": "拡張コマンドを読み込んでいます",
6767
"register.command": "CMakeTools 拡張コマンド {0} の登録",
68-
"uninstall.old.cmaketools": "CMakeツール拡張機能の古いバージョンをアンインストールしてください。現在、バージョン1.2.0からMicrosoftによって公開されています。",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "CMake Tools を初期化しています...",
7070
"deactivate.cmaketools": "CMakeTools の非アクティブ化"
7171
}

‎i18n/kor/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "키트 검색",
3737
"cancel.button": "취소",
3838
"rescanning.for.kits": "키트를 다시 검색하는 중",
39-
"found.duplicate.kits": "cmake-tools-kits.json에 이전 ID가 저장된 Visual Studio 키트를 찾았습니다.",
40-
"delete.duplicate.kits": "cmake-tools-kits.json에서 중복 된 Visual Studio 키트를 삭제 하시겠습니까?",
39+
"found.duplicate.kits": "cmake-tools-kits.json에 저장된 이전 ID가 있는 Visual Studio 키트를 찾았습니다.",
40+
"delete.duplicate.kits": "cmake-tools-kits.json에서 중복된 Visual Studio 키트를 삭제하시겠습니까?",
4141
"no.button": "아니요",
4242
"saving.kits.to": "{0}에 키트를 저장하는 중",
4343
"saving.new.kits.to": "{0}에 새 키트를 저장하는 중",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "{0} 완료(직렬화할 수 없는 값이 반환됨)",
6666
"loading.extension.commands": "확장 명령을 로드하는 중",
6767
"register.command": "CMakeTools 확장 명령 {0} 등록",
68-
"uninstall.old.cmaketools": "이전 버전의 CMake Tools 확장을 설치 제거하십시오. 이제 버전 1.2.0부터 Microsoft에서 게시합니다.",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "CMake 도구를 초기화하는 중...",
7070
"deactivate.cmaketools": "CMakeTools 비활성화"
7171
}

‎i18n/plk/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "Skanuj w poszukiwaniu zestawów",
3737
"cancel.button": "Anuluj",
3838
"rescanning.for.kits": "Ponowne skanowanie pod kątem zestawów",
39-
"found.duplicate.kits": "Znaleziono zestawy Visual Studio ze starymi identyfikatorami zapisanymi w cmake-tools-kits.json.",
40-
"delete.duplicate.kits": "Czy chcesz usunąć zduplikowane zestawy Visual Studio z cmake-tools-kits.json?",
39+
"found.duplicate.kits": "Found Visual Studio kits with the old ids saved in the cmake-tools-kits.json.",
40+
"delete.duplicate.kits": "Would you like to delete the duplicate Visual Studio kits from cmake-tools-kits.json?",
4141
"no.button": "Nie",
4242
"saving.kits.to": "Zapisywanie zestawów do lokalizacji {0}",
4343
"saving.new.kits.to": "Zapisywanie nowych zestawów do lokalizacji {0}",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "Zakończono {0} (zwrócono wartość, której nie można serializować)",
6666
"loading.extension.commands": "Ładowanie poleceń rozszerzenia",
6767
"register.command": "Zarejestruj polecenie rozszerzenia CMakeTools {0}",
68-
"uninstall.old.cmaketools": "Odinstaluj wszystkie starsze wersje rozszerzenia CMake Tools. Jest teraz publikowany przez Microsoft począwszy od wersji 1.2.0.",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "Trwa inicjowanie narzędzi CMake Tools...",
7070
"deactivate.cmaketools": "Dezaktywuj rozszerzenie CMakeTools"
7171
}

‎i18n/ptb/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "Examinar em busca de kits",
3737
"cancel.button": "Cancelar",
3838
"rescanning.for.kits": "Examinando novamente para kits",
39-
"found.duplicate.kits": "Encontrados kits do Visual Studio com os IDs antigos salvos no cmake-tools-kits.json.",
40-
"delete.duplicate.kits": "Deseja excluir os kits duplicados do Visual Studio do cmake-tools-kits.json?",
39+
"found.duplicate.kits": "Foram encontrados kits do Visual Studio com as IDs antigas salvos no cmake-tools-kits.json.",
40+
"delete.duplicate.kits": "Deseja excluir os kits do Visual Studio duplicados do cmake-tools-kits.json?",
4141
"no.button": "Não",
4242
"saving.kits.to": "Salvando kits em {0}",
4343
"saving.new.kits.to": "Salvando novos kits em {0}",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "{0} concluído (retornou um valor não serializável)",
6666
"loading.extension.commands": "Carregando comandos de extensão",
6767
"register.command": "Registrar o comando de extensão de CMakeTools {0}",
68-
"uninstall.old.cmaketools": "Desinstale todas as versões anteriores da extensão CMake Tools. Agora é publicado pela Microsoft, começando com a versão 1.2.0.",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "Ferramentas CMake inicializando...",
7070
"deactivate.cmaketools": "Desativar CMakeTools"
7171
}

‎i18n/rus/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"scan.for.kits.button": "Поиск наборов",
3737
"cancel.button": "Отмена",
3838
"rescanning.for.kits": "Повторное сканирование наборов.",
39-
"found.duplicate.kits": "Найдены наборы Visual Studio со старыми идентификаторами, сохраненными в cmake-tools-kits.json.",
40-
"delete.duplicate.kits": "Вы хотите удалить дубликаты Visual Studio из cmake-tools-kits.json?",
39+
"found.duplicate.kits": "Found Visual Studio kits with the old ids saved in the cmake-tools-kits.json.",
40+
"delete.duplicate.kits": "Would you like to delete the duplicate Visual Studio kits from cmake-tools-kits.json?",
4141
"no.button": "Нет",
4242
"saving.kits.to": "Сохранение наборов в {0}.",
4343
"saving.new.kits.to": "Сохранение новых наборов в {0}.",
@@ -65,7 +65,7 @@
6565
"cmake.finished.returned.unserializable": "{0} завершено (возвращено несериализуемое значение).",
6666
"loading.extension.commands": "Загрузка команд расширения.",
6767
"register.command": "Регистрация команды расширения CMakeTools {0}",
68-
"uninstall.old.cmaketools": "Пожалуйста, удалите все старые версии расширения CMake Tools. Сейчас он публикуется Microsoft, начиная с версии 1.2.0.",
68+
"uninstall.old.cmaketools": "Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.",
6969
"cmake.tools.initializing": "Инициализация Средств CMake…",
7070
"deactivate.cmaketools": "Деактивировать CMakeTools"
7171
}

0 commit comments

Comments
 (0)