Skip to content

Commit f22400c

Browse files
committed
Merge remote-tracking branch 'origin/master' into user/oneblue/update-signing-keys
2 parents c607bcf + 56244fd commit f22400c

143 files changed

Lines changed: 2730 additions & 876 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src/windows/service/inc/${TARGET
557557
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src/windows/wslinstaller/inc/${TARGET_PLATFORM}/${CMAKE_BUILD_TYPE})
558558
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/linux/init/inc)
559559
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/windows/common)
560+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/windows/common/wslc)
561+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/windows/common/wslc/cli)
562+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/windows/common/wslc/models)
563+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/windows/common/wslc/services)
564+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/windows/common/wslc/settings)
560565
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shared/configfile)
561566
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/localization)
562567
include_directories(${CMAKE_BINARY_DIR}/generated)

‎localization/strings/cs-CZ/Resources.resw‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,8 +1215,8 @@ Zobrazit pokyny pro obnovení: https://aka.ms/wsldiskmountrecovery</value>
12151215
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
12161216
</data>
12171217
<data name="MessageCgroupV1IncompatibleWithDistroIsolation" xml:space="preserve">
1218-
<value>Cgroup v1 není kompatibilní s izolací cgroup pro jednotlivé distribuce. Pokud chcete použít cgroup v1, nastavte isolateDistroCgroup=false v části [wsl2] v .wslconfig a pak spusťte wsl --shutdown.</value>
1219-
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
1218+
<value>Cgroup v1 není kompatibilní s izolací cgroup pro jednotlivé distribuce. Místo toho se používá cgroup v2. Pokud chcete použít cgroup v1, nastavte isolateDistroCgroup=false v části [wsl2] v .wslconfig a pak spusťte wsl --shutdown.</value>
1219+
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="cgroup v2"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
12201220
</data>
12211221
<data name="Settings_ErrorTryAgainLater.Text" xml:space="preserve">
12221222
<value>Něco se nepovedlo. Zkuste to znovu později.</value>
@@ -2728,6 +2728,10 @@ Příklad: tar -cf - files | wslc container cp - CONTAINER:/path</value>
27282728
<value>Nelze přepsat '{0}', protože je jiného typu než kopírovaná položka.</value>
27292729
<comment>{0} is the destination path. Shown when a file would replace a directory, or a directory would replace a file.</comment>
27302730
</data>
2731+
<data name="WSLCCLI_CpSourceNameNotRepresentableError" xml:space="preserve">
2732+
<value>Nelze zkopírovat „{0}“, protože jeho název nelze použít jako název souboru ve Windows.</value>
2733+
<comment>{0} is the source path. Shown when the container source name holds a character that is not valid in a Windows file name.</comment>
2734+
</data>
27312735
<data name="WSLCCLI_ContainerInspectDesc" xml:space="preserve">
27322736
<value>Zkontrolovat kontejner.</value>
27332737
</data>

‎localization/strings/da-DK/Resources.resw‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,8 +1215,8 @@ Se genoprettelsesinstruktioner på: https://aka.ms/wsldiskmountrecovery</value>
12151215
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
12161216
</data>
12171217
<data name="MessageCgroupV1IncompatibleWithDistroIsolation" xml:space="preserve">
1218-
<value>Cgroup v1 er ikke kompatibel med cgroup-isolation pr. distribution. Hvis du vil bruge cgroup v1, skal du angive isolateDistroCgroup=false under [wsl2] i .wslconfig og derefter køre wsl --shutdown.</value>
1219-
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
1218+
<value>Cgroup v1 er ikke kompatibel med cgroup-isolation pr. distribution. Der bruges cgroup v2 i stedet. Hvis du vil bruge cgroup v1, skal du angive isolateDistroCgroup=false under [wsl2] i .wslconfig og derefter køre wsl --shutdown.</value>
1219+
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="cgroup v2"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
12201220
</data>
12211221
<data name="Settings_ErrorTryAgainLater.Text" xml:space="preserve">
12221222
<value>Noget gik galt. Prøv igen senere.</value>
@@ -2728,6 +2728,10 @@ Eksempel: tar -cf - filer | wslc container cp - CONTAINER:/path</value>
27282728
<value>'{0}' kan ikke overskrives, fordi det er en anden type end den kopierede post.</value>
27292729
<comment>{0} is the destination path. Shown when a file would replace a directory, or a directory would replace a file.</comment>
27302730
</data>
2731+
<data name="WSLCCLI_CpSourceNameNotRepresentableError" xml:space="preserve">
2732+
<value>'{0}' kan ikke kopieres, fordi navnet ikke kan bruges som et Windows-filnavn.</value>
2733+
<comment>{0} is the source path. Shown when the container source name holds a character that is not valid in a Windows file name.</comment>
2734+
</data>
27312735
<data name="WSLCCLI_ContainerInspectDesc" xml:space="preserve">
27322736
<value>Undersøg en objektbeholder.</value>
27332737
</data>

‎localization/strings/de-DE/Resources.resw‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,8 +1221,8 @@ Anweisungen zur Wiederherstellung finden Sie unter: https://aka.ms/wsldiskmountr
12211221
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
12221222
</data>
12231223
<data name="MessageCgroupV1IncompatibleWithDistroIsolation" xml:space="preserve">
1224-
<value>Cgroup v1 is incompatible with per-distribution cgroup isolation. To use cgroup v1, set isolateDistroCgroup=false under [wsl2] in .wslconfig, then run wsl --shutdown.</value>
1225-
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
1224+
<value>Cgroup v1 is incompatible with per-distribution cgroup isolation. Using cgroup v2 instead. To use cgroup v1, set isolateDistroCgroup=false under [wsl2] in .wslconfig, then run wsl --shutdown.</value>
1225+
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="cgroup v2"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
12261226
</data>
12271227
<data name="Settings_ErrorTryAgainLater.Text" xml:space="preserve">
12281228
<value>Da hat etwas nicht geklappt, versuchen Sie es später noch einmal.</value>
@@ -2734,6 +2734,10 @@ Beispiel: tar -cf - files | wslc container cp - CONTAINER:/path</value>
27342734
<value>Kann „{0}“ nicht überschreiben, da der Zielpfad ein anderer Typ als der kopierte Eintrag ist.</value>
27352735
<comment>{0} is the destination path. Shown when a file would replace a directory, or a directory would replace a file.</comment>
27362736
</data>
2737+
<data name="WSLCCLI_CpSourceNameNotRepresentableError" xml:space="preserve">
2738+
<value>'{0}' kann nicht kopiert werden, da der Name nicht als Windows-Dateiname verwendet werden kann.</value>
2739+
<comment>{0} is the source path. Shown when the container source name holds a character that is not valid in a Windows file name.</comment>
2740+
</data>
27372741
<data name="WSLCCLI_ContainerInspectDesc" xml:space="preserve">
27382742
<value>Einen Container überprüfen.</value>
27392743
</data>

‎localization/strings/en-GB/Resources.resw‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,8 +1215,8 @@ See recovery instructions on: https://aka.ms/wsldiskmountrecovery</value>
12151215
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
12161216
</data>
12171217
<data name="MessageCgroupV1IncompatibleWithDistroIsolation" xml:space="preserve">
1218-
<value>Cgroup v1 is incompatible with per-distribution cgroup isolation. To use cgroup v1, set isolateDistroCgroup=false under [wsl2] in .wslconfig, then run wsl --shutdown.</value>
1219-
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
1218+
<value>Cgroup v1 is incompatible with per-distribution cgroup isolation. Using cgroup v2 instead. To use cgroup v1, set isolateDistroCgroup=false under [wsl2] in .wslconfig, then run wsl --shutdown.</value>
1219+
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="cgroup v2"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
12201220
</data>
12211221
<data name="Settings_ErrorTryAgainLater.Text" xml:space="preserve">
12221222
<value>Something went wrong. Try again later.</value>
@@ -2728,6 +2728,10 @@ Example: tar -cf - files | wslc container cp - CONTAINER:/path</value>
27282728
<value>Cannot overwrite '{0}' because it is a different type than the copied entry.</value>
27292729
<comment>{0} is the destination path. Shown when a file would replace a directory, or a directory would replace a file.</comment>
27302730
</data>
2731+
<data name="WSLCCLI_CpSourceNameNotRepresentableError" xml:space="preserve">
2732+
<value>Cannot copy '{0}' because its name cannot be used as a Windows file name.</value>
2733+
<comment>{0} is the source path. Shown when the container source name holds a character that is not valid in a Windows file name.</comment>
2734+
</data>
27312735
<data name="WSLCCLI_ContainerInspectDesc" xml:space="preserve">
27322736
<value>Inspect a container.</value>
27332737
</data>

‎localization/strings/en-US/Resources.resw‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,8 +1215,8 @@ See recovery instructions on: https://aka.ms/wsldiskmountrecovery</value>
12151215
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
12161216
</data>
12171217
<data name="MessageCgroupV1IncompatibleWithDistroIsolation" xml:space="preserve">
1218-
<value>Cgroup v1 is incompatible with per-distribution cgroup isolation. To use cgroup v1, set isolateDistroCgroup=false under [wsl2] in .wslconfig, then run wsl --shutdown.</value>
1219-
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
1218+
<value>Cgroup v1 is incompatible with per-distribution cgroup isolation. Using cgroup v2 instead. To use cgroup v1, set isolateDistroCgroup=false under [wsl2] in .wslconfig, then run wsl --shutdown.</value>
1219+
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="cgroup v2"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
12201220
</data>
12211221
<data name="Settings_ErrorTryAgainLater.Text" xml:space="preserve">
12221222
<value>Something went wrong. Try again later.</value>
@@ -2728,6 +2728,10 @@ Example: tar -cf - files | wslc container cp - CONTAINER:/path</value>
27282728
<value>Cannot overwrite '{0}' because it is a different type than the copied entry.</value>
27292729
<comment>{0} is the destination path. Shown when a file would replace a directory, or a directory would replace a file.</comment>
27302730
</data>
2731+
<data name="WSLCCLI_CpSourceNameNotRepresentableError" xml:space="preserve">
2732+
<value>Cannot copy '{0}' because its name cannot be used as a Windows file name.</value>
2733+
<comment>{0} is the source path. Shown when the container source name holds a character that is not valid in a Windows file name.</comment>
2734+
</data>
27312735
<data name="WSLCCLI_ContainerInspectDesc" xml:space="preserve">
27322736
<value>Inspect a container.</value>
27332737
</data>

‎localization/strings/es-ES/Resources.resw‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,8 +1221,8 @@ Consulte las instrucciones de recuperación en: https://aka.ms/wsldiskmountrecov
12211221
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
12221222
</data>
12231223
<data name="MessageCgroupV1IncompatibleWithDistroIsolation" xml:space="preserve">
1224-
<value>Cgroup v1 no es compatible con el aislamiento de cgroup por distribución. Para usar cgroup v1, establezca isolateDistroCgroup=false en [wsl2] en .wslconfig y, a continuación, ejecute wsl --shutdown.</value>
1225-
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
1224+
<value>Cgroup v1 no es compatible con el aislamiento de cgroup por distribución. En su lugar, se usa cgroup v2. Para usar cgroup v1, establezca isolateDistroCgroup=false en [wsl2] en .wslconfig y, a continuación, ejecute wsl --shutdown.</value>
1225+
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="cgroup v2"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
12261226
</data>
12271227
<data name="Settings_ErrorTryAgainLater.Text" xml:space="preserve">
12281228
<value>Hubo un problema. Inténtelo de nuevo más tarde.</value>
@@ -2734,6 +2734,10 @@ Ejemplo: tar -cf - archivos | wslc container cp - CONTAINER:/path</value>
27342734
<value>No se puede sobrescribir '{0}' porque es de un tipo distinto al de la entrada copiada.</value>
27352735
<comment>{0} is the destination path. Shown when a file would replace a directory, or a directory would replace a file.</comment>
27362736
</data>
2737+
<data name="WSLCCLI_CpSourceNameNotRepresentableError" xml:space="preserve">
2738+
<value>No se puede copiar '{0}' porque su nombre no se puede usar como nombre de archivo de Windows.</value>
2739+
<comment>{0} is the source path. Shown when the container source name holds a character that is not valid in a Windows file name.</comment>
2740+
</data>
27372741
<data name="WSLCCLI_ContainerInspectDesc" xml:space="preserve">
27382742
<value>Inspecciona un contenedor.</value>
27392743
</data>

‎localization/strings/fi-FI/Resources.resw‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,8 +1215,8 @@ Katso palautusohjeet: https://aka.ms/wsldiskmountrecovery</value>
12151215
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
12161216
</data>
12171217
<data name="MessageCgroupV1IncompatibleWithDistroIsolation" xml:space="preserve">
1218-
<value>Cgroup v1 ei ole yhteensopiva jakelukohtaisen cgroup-eristyksen kanssa. Jos haluat käyttää cgroup v1:tä, määritä isolateDistroCgroup=false tiedoston .wslconfig [wsl2]-osaan ja suorita sitten wsl --shutdown.</value>
1219-
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
1218+
<value>Cgroup v1 ei ole yhteensopiva jakelukohtaisen cgroup-eristyksen kanssa. Käytetään sen sijaan cgroup v2:ta. Jos haluat käyttää cgroup v1:tä, määritä isolateDistroCgroup=false tiedoston .wslconfig [wsl2]-osaan ja suorita sitten wsl --shutdown.</value>
1219+
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="cgroup v2"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
12201220
</data>
12211221
<data name="Settings_ErrorTryAgainLater.Text" xml:space="preserve">
12221222
<value>Tapahtui jokin virhe. Yritä myöhemmin uudelleen.</value>
@@ -2728,6 +2728,10 @@ Esimerkki: tar -cf - files | wslc container cp - CONTAINER:/path</value>
27282728
<value>Kohdetta '{0}' ei voi korvata, koska se on eri tyyppiä kuin kopioitu merkintä.</value>
27292729
<comment>{0} is the destination path. Shown when a file would replace a directory, or a directory would replace a file.</comment>
27302730
</data>
2731+
<data name="WSLCCLI_CpSourceNameNotRepresentableError" xml:space="preserve">
2732+
<value>Kohdetta {0} ei voi kopioida, koska sen nimeä ei voi käyttää Windows-tiedostonimenä.</value>
2733+
<comment>{0} is the source path. Shown when the container source name holds a character that is not valid in a Windows file name.</comment>
2734+
</data>
27312735
<data name="WSLCCLI_ContainerInspectDesc" xml:space="preserve">
27322736
<value>Tarkastele säilöä.</value>
27332737
</data>

‎localization/strings/fr-FR/Resources.resw‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,8 +1222,8 @@ Voir les instructions de récupération sur : https://aka.ms/wsldiskmountrecover
12221222
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
12231223
</data>
12241224
<data name="MessageCgroupV1IncompatibleWithDistroIsolation" xml:space="preserve">
1225-
<value>Cgroup v1 n’est pas compatible avec l’isolation cgroup par distribution. Pour utiliser cgroup v1, définissez isolateDistroCgroup=false sous [wsl2] dans .wslconfig, puis exécutez wsl --shutdown.</value>
1226-
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
1225+
<value>Cgroup v1 n’est pas compatible avec l’isolation de cgroup par distribution. Utilisation de cgroup v2 à la place. Pour utiliser cgroup v1, définissez isolateDistroCgroup=false sous [wsl2] dans .wslconfig, puis exécutez wsl --shutdown.</value>
1226+
<comment>{Locked="Cgroup v1"}{Locked="cgroup v1"}{Locked="cgroup v2"}{Locked="isolateDistroCgroup=false"}{Locked="[wsl2]"}{Locked="--shutdown."}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated.</comment>
12271227
</data>
12281228
<data name="Settings_ErrorTryAgainLater.Text" xml:space="preserve">
12291229
<value>Un problème s’est produit. Réessayez ultérieurement.</value>
@@ -2735,6 +2735,10 @@ Exemple : tar -cf - files | wslc container cp - CONTAINER:/path</value>
27352735
<value>Impossible de remplacer '{0}' car il s’agit d’un type différent de celui de l’entrée copiée.</value>
27362736
<comment>{0} is the destination path. Shown when a file would replace a directory, or a directory would replace a file.</comment>
27372737
</data>
2738+
<data name="WSLCCLI_CpSourceNameNotRepresentableError" xml:space="preserve">
2739+
<value>Impossible de copier '{0}' car son nom ne peut pas être utilisé comme nom de fichier Windows.</value>
2740+
<comment>{0} is the source path. Shown when the container source name holds a character that is not valid in a Windows file name.</comment>
2741+
</data>
27382742
<data name="WSLCCLI_ContainerInspectDesc" xml:space="preserve">
27392743
<value>Inspecter un conteneur.</value>
27402744
</data>

0 commit comments

Comments
 (0)