Merge branch 'master' into insider

.github/workflows/stable-macos.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macOS-10.15
+          - runner: macos-12
             vscode_arch: x64
           - runner: [self-hosted, macOS, ARM64]
             vscode_arch: arm64

build/linux/appimage/build.sh

@@ -7,7 +7,16 @@ CALLER_DIR=$( pwd )
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
-  wget -c https://github.com/$(wget -q https://github.com/AppImage/pkg2appimage/releases -O - | grep "pkg2appimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
+  GITHUB_RESPONSE=$( curl -s "https://api.github.com/repos/AppImage/pkg2appimage/releases/latest" )
+  APPIMAGE_URL=$( echo "${GITHUB_RESPONSE}" | jq --raw-output '.assets | map(select( .name | test("x86_64.AppImage(?!.zsync)"))) | map(.browser_download_url)[0]' )
+
+  if [[ -z "${APPIMAGE_URL}" ]]; then
+    echo "The url for pkg2appimage.AppImage hasn't been found"
+    exit 1
+  fi
+
+  wget -c "${APPIMAGE_URL}"
+
   chmod +x ./pkg2appimage-*.AppImage
 
   ./pkg2appimage-*.AppImage --appimage-extract && mv ./squashfs-root ./pkg2appimage.AppDir

build/windows/msi/i18n/vscodium.ru-ru.wxl

@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <WixLocalization Culture="ru-ru" Codepage="1251" xmlns="http://schemas.microsoft.com/wix/2006/localization">
   <String Id="ProductLanguage">1049</String>
   <String Id="ProductName">@@PRODUCT_NAME@@</String>
   <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
   <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
   <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
-  <String Id="PackageDescription">Package with @@PRODUCT_NAME@@</String>
-  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
-  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
-  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
-  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
-  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
-  <String Id="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ as an editor for supported file types.</String>
-  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
-  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu.</String>
-  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
-  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu.</String>
-  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
-  <String Id="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ is already installed.</String>
-  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
-  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+  <String Id="PackageDescription">Пакет с @@PRODUCT_NAME@@</String>
+  <String Id="FeatureStartMenuShortcutTitle">Ярлык в меню «Пуск»</String>
+  <String Id="FeatureStartMenuShortcutDescription">Создайте значок в меню «Пуск».</String>
+  <String Id="FeatureDesktopShortcutTitle">Ярлык рабочего стола</String>
+  <String Id="FeatureDesktopShortcutDescription">Создать значок на рабочем столе.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">Ассоциации файлов</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Зарегистрировать @@PRODUCT_NAME@@ в качестве редактора поддерживаемых типов файлов.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Контекстное меню файлов</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Добавить действие «Открыть с помощью @@PRODUCT_NAME@@» в контекстное меню файлов Проводника Windows.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Контекстное меню каталога</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Добавить действие «Открыть с помощью @@PRODUCT_NAME@@» в контекстное меню каталога Проводника Windows.</String>
+  <String Id="FeatureEnvironmentTitle">Добавить в PATH</String>
+  <String Id="FeatureEnvironmentDescription">Добавить @@PRODUCT_NAME@@ в переменную среды PATH. Доступно после перезапуска.</String>
+  <String Id="LaunchApplication">Запустить @@PRODUCT_NAME@@</String>
+  <String Id="NewerVersionInstalled">Новая версия @@PRODUCT_NAME@@ уже установлена.</String>
+  <String Id="MinimumNetFramworkRequired">Приложению требуется .NET Framework 4.5.2 или более новая версии. Пожалуйста, установите .NET Framework, затем снова запустите установщик.</String>
+  <String Id="OSVersionRequired">Требуется Windows 7 или более новая версия.</String>
 </WixLocalization>