Skip to content

Commit

Permalink
ci: [sync] Update from che-incubator/che-code @ cdef4a
Browse files Browse the repository at this point in the history
Signed-off-by: devstudio-release <[email protected]>
  • Loading branch information
devstudio-release committed Feb 20, 2024
1 parent 946e6f0 commit 192186b
Show file tree
Hide file tree
Showing 81 changed files with 1,100 additions and 839 deletions.
2 changes: 1 addition & 1 deletion devspaces-code/code/build/win32/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion devspaces-code/code/build/win32/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "inno_updater"
version = "0.10.1"
version = "0.11.0"
authors = ["Microsoft <[email protected]>"]
build = "build.rs"

Expand Down
2 changes: 1 addition & 1 deletion devspaces-code/code/build/win32/code.iss
Original file line number Diff line number Diff line change
Expand Up @@ -1519,7 +1519,7 @@ begin
StopTunnelServiceIfNeeded();
Exec(ExpandConstant('{app}\tools\inno_updater.exe'), ExpandConstant('"{app}\{#ExeBasename}.exe" ' + BoolToStr(LockFileExists())), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
Exec(ExpandConstant('{app}\tools\inno_updater.exe'), ExpandConstant('"{app}\{#ExeBasename}.exe" ' + BoolToStr(LockFileExists()) + ' "{cm:UpdatingVisualStudioCode}"'), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
end;
if ShouldRestartTunnelService then
Expand Down
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.de.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=Zu PATH hinzuf
RunAfter=%1 nach der Installation ausführen
Other=Andere:
SourceFile=%1-Quelldatei
OpenWithCodeContextMenu=Mit %1 öffnen
OpenWithCodeContextMenu=Mit %1 öffnen
UpdatingVisualStudioCode=Visual Studio Code wird aktualisiert...
1 change: 1 addition & 0 deletions devspaces-code/code/build/win32/i18n/messages.en.isl
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ RunAfter=Run %1 after installation
Other=Other:
SourceFile=%1 Source File
OpenWithCodeContextMenu=Open w&ith %1
UpdatingVisualStudioCode=Updating Visual Studio Code...
1 change: 1 addition & 0 deletions devspaces-code/code/build/win32/i18n/messages.es.isl
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ RunAfter=Ejecutar %1 despu
Other=Otros:
SourceFile=Archivo de origen %1
OpenWithCodeContextMenu=Abrir &con %1
UpdatingVisualStudioCode=Actualizando Visual Studio Code...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.fr.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=Ajouter
RunAfter=Exécuter %1 après l'installation
Other=Autre :
SourceFile=Fichier source %1
OpenWithCodeContextMenu=Ouvrir avec %1
OpenWithCodeContextMenu=Ouvrir avec %1
UpdatingVisualStudioCode=Mise à jour de Visual Studio Code...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.hu.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=Hozz
RunAfter=%1 indítása a telepítés után
Other=Egyéb:
SourceFile=%1 forrásfájl
OpenWithCodeContextMenu=Megnyitás a következővel: %1
OpenWithCodeContextMenu=Megnyitás a következővel: %1
UpdatingVisualStudioCode=A Visual Studio Code frissítése...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.it.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=Aggiungi a PATH (disponibile dopo il riavvio)
RunAfter=Esegui %1 dopo l'installazione
Other=Altro:
SourceFile=File di origine %1
OpenWithCodeContextMenu=Apri con %1
OpenWithCodeContextMenu=Apri con %1
UpdatingVisualStudioCode=Aggiornamento di Visual Studio Code...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.ja.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=PATH
RunAfter=インストール後に %1 を実行する
Other=その他:
SourceFile=%1 ソース ファイル
OpenWithCodeContextMenu=%1 で開く
OpenWithCodeContextMenu=%1 で開く
UpdatingVisualStudioCode=Visual Studio Code を更新しています...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.ko.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=PATH
RunAfter=설치 후 %1 실행
Other=기타:
SourceFile=%1 원본 파일
OpenWithCodeContextMenu=%1(으)로 열기
OpenWithCodeContextMenu=%1(으)로 열기
UpdatingVisualStudioCode=Visual Studio Code 업데이트 중...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.pt-br.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=Adicione em PATH (dispon
RunAfter=Executar %1 após a instalação
Other=Outros:
SourceFile=Arquivo Fonte %1
OpenWithCodeContextMenu=Abrir com %1
OpenWithCodeContextMenu=Abrir com %1
UpdatingVisualStudioCode=Atualizando o Visual Studio Code...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.ru.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=
RunAfter=Запустить %1 после установки
Other=Другое:
SourceFile=Исходный файл %1
OpenWithCodeContextMenu=Открыть с помощью %1
OpenWithCodeContextMenu=Открыть с помощью %1
UpdatingVisualStudioCode=Обновление Visual Studio Code...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.tr.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=PATH'e ekle (yeniden ba
RunAfter=Kurulumdan sonra %1 uygulamasını çalıştır.
Other=Diğer:
SourceFile=%1 Kaynak Dosyası
OpenWithCodeContextMenu=%1 İle Aç
OpenWithCodeContextMenu=%1 İle Aç
UpdatingVisualStudioCode=Visual Studio Code güncelleniyor...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.zh-cn.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=
RunAfter=安装后运行 %1
Other=其他:
SourceFile=%1 源文件
OpenWithCodeContextMenu=通过 %1 打开
OpenWithCodeContextMenu=通过 %1 打开
UpdatingVisualStudioCode=正在更新 Visual Studio Code...
3 changes: 2 additions & 1 deletion devspaces-code/code/build/win32/i18n/messages.zh-tw.isl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ AddToPath=
RunAfter=安裝後執行 %1
Other=其他:
SourceFile=%1 來源檔案
OpenWithCodeContextMenu=%1 開啟
OpenWithCodeContextMenu=%1 開啟
UpdatingVisualStudioCode=正在更新 Visual Studio Code...
Binary file modified devspaces-code/code/build/win32/inno_updater.exe
Binary file not shown.
10 changes: 10 additions & 0 deletions devspaces-code/code/cglicenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -589,5 +589,15 @@
"prependLicenseText": [
"Copyright (c) heap.js authors"
]
},
{
// Reason: mono-repo where the individual packages are also dual-licensed under MIT and Apache-2.0
"name": "system-configuration",
"fullLicenseTextUri": "https://github.com/mullvad/system-configuration-rs/blob/main/system-configuration/LICENSE-MIT"
},
{
// Reason: mono-repo where the individual packages are also dual-licensed under MIT and Apache-2.0
"name": "system-configuration-sys",
"fullLicenseTextUri": "https://github.com/mullvad/system-configuration-rs/blob/main/system-configuration-sys/LICENSE-MIT"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"css.lint.emptyRules.desc": "Do not use empty rulesets.",
"css.lint.float.desc": "Avoid using `float`. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
"css.lint.fontFaceProperties.desc": "`@font-face` rule must define `src` and `font-family` properties.",
"css.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers.",
"css.lint.hexColorLength.desc": "Hex colors must consist of 3, 4, 6 or 8 hex numbers.",
"css.lint.idSelector.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
"css.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older.",
"css.lint.important.desc": "Avoid using `!important`. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
Expand Down Expand Up @@ -47,7 +47,7 @@
"less.lint.emptyRules.desc": "Do not use empty rulesets.",
"less.lint.float.desc": "Avoid using `float`. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
"less.lint.fontFaceProperties.desc": "`@font-face` rule must define `src` and `font-family` properties.",
"less.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers.",
"less.lint.hexColorLength.desc": "Hex colors must consist of 3, 4, 6 or 8 hex numbers.",
"less.lint.idSelector.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
"less.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older.",
"less.lint.important.desc": "Avoid using `!important`. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
Expand Down Expand Up @@ -81,7 +81,7 @@
"scss.lint.emptyRules.desc": "Do not use empty rulesets.",
"scss.lint.float.desc": "Avoid using `float`. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
"scss.lint.fontFaceProperties.desc": "`@font-face` rule must define `src` and `font-family` properties.",
"scss.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers.",
"scss.lint.hexColorLength.desc": "Hex colors must consist of 3, 4, 6 or 8 hex numbers.",
"scss.lint.idSelector.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
"scss.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older.",
"scss.lint.important.desc": "Avoid using `!important`. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
Expand Down
54 changes: 2 additions & 52 deletions devspaces-code/code/extensions/git/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2759,13 +2759,8 @@
"default": false
},
"git.inputValidation": {
"type": "string",
"enum": [
"always",
"warn",
"off"
],
"default": "off",
"type": "boolean",
"default": false,
"description": "%config.inputValidation%"
},
"git.inputValidationLength": {
Expand All @@ -2781,11 +2776,6 @@
"default": 50,
"markdownDescription": "%config.inputValidationSubjectLength%"
},
"git.experimental.inputValidation": {
"type": "boolean",
"default": false,
"description": "%config.inputValidation%"
},
"git.detectSubmodules": {
"type": "boolean",
"scope": "resource",
Expand Down Expand Up @@ -3208,46 +3198,6 @@
"highContrast": "#8db9e2",
"highContrastLight": "#1258a7"
}
},
{
"id": "gitDecoration.incomingAddedForegroundColor",
"description": "%colors.incomingAdded%",
"defaults": {
"light": "#587c0c",
"dark": "#81b88b",
"highContrast": "#1b5225",
"highContrastLight": "#374e06"
}
},
{
"id": "gitDecoration.incomingDeletedForegroundColor",
"description": "%colors.incomingDeleted%",
"defaults": {
"light": "#ad0707",
"dark": "#c74e39",
"highContrast": "#c74e39",
"highContrastLight": "#ad0707"
}
},
{
"id": "gitDecoration.incomingRenamedForegroundColor",
"description": "%colors.incomingRenamed%",
"defaults": {
"light": "#007100",
"dark": "#73C991",
"highContrast": "#73C991",
"highContrastLight": "#007100"
}
},
{
"id": "gitDecoration.incomingModifiedForegroundColor",
"description": "%colors.incomingModified%",
"defaults": {
"light": "#895503",
"dark": "#E2C08D",
"highContrast": "#E2C08D",
"highContrastLight": "#895503"
}
}
],
"configurationDefaults": {
Expand Down
2 changes: 1 addition & 1 deletion devspaces-code/code/extensions/git/package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
"config.openAfterClone.prompt": "Always prompt for action.",
"config.showInlineOpenFileAction": "Controls whether to show an inline Open File action in the Git changes view.",
"config.showPushSuccessNotification": "Controls whether to show a notification when a push is successful.",
"config.inputValidation": "Controls when to show commit message input validation.",
"config.inputValidation": "Controls whether to show commit message input validation diagnostics.",
"config.inputValidationLength": "Controls the commit message length threshold for showing a warning.",
"config.inputValidationSubjectLength": "Controls the commit message subject length threshold for showing a warning. Unset it to inherit the value of `#git.inputValidationLength#`.",
"config.detectSubmodules": "Controls whether to automatically detect Git submodules.",
Expand Down
Loading

0 comments on commit 192186b

Please sign in to comment.