Skip to content

Commit af34255

Browse files
csigscsigs
authored
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_20250910124810695. (#1779)
1 parent 75db49a commit af34255

File tree

12 files changed

+252
-252
lines changed

12 files changed

+252
-252
lines changed

‎src/localization/cs/messages.json.lcl‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -958,11 +958,11 @@
958958
</Str>
959959
<Disp Icon="Str" />
960960
</Item>
961-
<Item ItemId=";AmbiguousConfigDeleteConfigFile" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
961+
<Item ItemId=";AmbiguousConfig" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
962962
<Str Cat="Text">
963-
<Val><![CDATA[Ambiguous vcpkg configuration provided by both manifest and configuration file.]A;-- Delete configuration file {path}]]></Val>
963+
<Val><![CDATA[Ambiguous vcpkg configuration provided by both manifest and configuration file. Choose one by deleting this file or deleting "{json_field}" from the manifest file.]]></Val>
964964
<Tgt Cat="Text" Stat="Loc" Orig="New">
965-
<Val><![CDATA[Nejednoznačná konfigurace vcpkg poskytovaná manifestem i konfiguračním souborem.]A;-- Odstranit konfigurační soubor {path}]]></Val>
965+
<Val><![CDATA[Nejednoznačná konfigurace vcpkg poskytovaná manifestem i konfiguračním souborem. Zvolte jednu možnost odstraněním tohoto souboru nebo odstraněním {json_field} ze souboru manifestu.]]></Val>
966966
</Tgt>
967967
</Str>
968968
<Disp Icon="Str" />
@@ -4009,6 +4009,15 @@
40094009
</Str>
40104010
<Disp Icon="Str" />
40114011
</Item>
4012+
<Item ItemId=";ConflictingEmbeddedConfiguration" ItemType="0" PsrId="306" Leaf="true">
4013+
<Str Cat="Text">
4014+
<Val><![CDATA[only one of {{"configuration", "vcpkg-configuration"}} may be used]]></Val>
4015+
<Tgt Cat="Text" Stat="Loc" Orig="New">
4016+
<Val><![CDATA[lze použít pouze jednu z {{"configuration", "vcpkg-configuration"}}]]></Val>
4017+
</Tgt>
4018+
</Str>
4019+
<Disp Icon="Str" />
4020+
</Item>
40124021
<Item ItemId=";ConflictingFiles" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
40134022
<Str Cat="Text">
40144023
<Val><![CDATA[The following files are already installed in {path} and are in conflict with {spec}]]></Val>
@@ -4351,15 +4360,6 @@
43514360
</Str>
43524361
<Disp Icon="Str" />
43534362
</Item>
4354-
<Item ItemId=";DeleteVcpkgConfigFromManifest" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
4355-
<Str Cat="Text">
4356-
<Val><![CDATA[-- Or remove "vcpkg-configuration" from the manifest file {path}.]]></Val>
4357-
<Tgt Cat="Text" Stat="Loc" Orig="New">
4358-
<Val><![CDATA[-- Nebo odeberte vcpkg-configuration ze souboru manifestu {path}.]]></Val>
4359-
</Tgt>
4360-
</Str>
4361-
<Disp Icon="Str" />
4362-
</Item>
43634363
<Item ItemId=";DeletingArtifact$From$" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
43644364
<Str Cat="Text">
43654365
<Val><![CDATA[Deleting artifact ${p0} from ${p1}]]></Val>
@@ -4891,15 +4891,6 @@
48914891
</Str>
48924892
<Disp Icon="Str" />
48934893
</Item>
4894-
<Item ItemId=";EmbeddingVcpkgConfigInManifest" ItemType="0" PsrId="306" Leaf="true">
4895-
<Str Cat="Text">
4896-
<Val><![CDATA[Embedding `vcpkg-configuration` in a manifest file is an EXPERIMENTAL feature.]]></Val>
4897-
<Tgt Cat="Text" Stat="Loc" Orig="New">
4898-
<Val><![CDATA[Vložení vcpkg-configuration do souboru manifestu je EXPERIMENTÁLNÍ funkce.]]></Val>
4899-
</Tgt>
4900-
</Str>
4901-
<Disp Icon="Str" />
4902-
</Item>
49034894
<Item ItemId=";EmptyLicenseExpression" ItemType="0" PsrId="306" Leaf="true">
49044895
<Str Cat="Text">
49054896
<Val><![CDATA[SPDX license expression was empty.]]></Val>
@@ -8356,6 +8347,15 @@
83568347
</Str>
83578348
<Disp Icon="Str" />
83588349
</Item>
8350+
<Item ItemId=";ManifestHere" ItemType="0" PsrId="306" Leaf="true">
8351+
<Str Cat="Text">
8352+
<Val><![CDATA[the manifest file is here]]></Val>
8353+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8354+
<Val><![CDATA[tady je soubor manifestu]]></Val>
8355+
</Tgt>
8356+
</Str>
8357+
<Disp Icon="Str" />
8358+
</Item>
83598359
<Item ItemId=";MatchedMoreThanOneInstallBlock$" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
83608360
<Str Cat="Text">
83618361
<Val><![CDATA[Matched more than one install block [${p0}]5D;]]></Val>

‎src/localization/de/messages.json.lcl‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -958,11 +958,11 @@
958958
</Str>
959959
<Disp Icon="Str" />
960960
</Item>
961-
<Item ItemId=";AmbiguousConfigDeleteConfigFile" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
961+
<Item ItemId=";AmbiguousConfig" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
962962
<Str Cat="Text">
963-
<Val><![CDATA[Ambiguous vcpkg configuration provided by both manifest and configuration file.]A;-- Delete configuration file {path}]]></Val>
963+
<Val><![CDATA[Ambiguous vcpkg configuration provided by both manifest and configuration file. Choose one by deleting this file or deleting "{json_field}" from the manifest file.]]></Val>
964964
<Tgt Cat="Text" Stat="Loc" Orig="New">
965-
<Val><![CDATA[Mehrdeutige vcpkg-Konfiguration, die sowohl von Manifest als auch von der Konfigurationsdatei bereitgestellt wird.]A;– Konfigurationsdatei {path} löschen]]></Val>
965+
<Val><![CDATA[Mehrdeutige vcpkg-Konfiguration, die sowohl von Manifest als auch von der Konfigurationsdatei bereitgestellt wird. Wählen Sie eine Option aus, indem Sie diese Datei löschen oder „{json_field}“ aus der Manifestdatei löschen.]]></Val>
966966
</Tgt>
967967
</Str>
968968
<Disp Icon="Str" />
@@ -4009,6 +4009,15 @@
40094009
</Str>
40104010
<Disp Icon="Str" />
40114011
</Item>
4012+
<Item ItemId=";ConflictingEmbeddedConfiguration" ItemType="0" PsrId="306" Leaf="true">
4013+
<Str Cat="Text">
4014+
<Val><![CDATA[only one of {{"configuration", "vcpkg-configuration"}} may be used]]></Val>
4015+
<Tgt Cat="Text" Stat="Loc" Orig="New">
4016+
<Val><![CDATA[es darf nur eines von {{"configuration", "vcpkg-configuration"}} verwendet werden]]></Val>
4017+
</Tgt>
4018+
</Str>
4019+
<Disp Icon="Str" />
4020+
</Item>
40124021
<Item ItemId=";ConflictingFiles" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
40134022
<Str Cat="Text">
40144023
<Val><![CDATA[The following files are already installed in {path} and are in conflict with {spec}]]></Val>
@@ -4351,15 +4360,6 @@
43514360
</Str>
43524361
<Disp Icon="Str" />
43534362
</Item>
4354-
<Item ItemId=";DeleteVcpkgConfigFromManifest" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
4355-
<Str Cat="Text">
4356-
<Val><![CDATA[-- Or remove "vcpkg-configuration" from the manifest file {path}.]]></Val>
4357-
<Tgt Cat="Text" Stat="Loc" Orig="New">
4358-
<Val><![CDATA[– Oder entfernen Sie "vcpkg-configuration" aus der Manifestdatei "{path}".]]></Val>
4359-
</Tgt>
4360-
</Str>
4361-
<Disp Icon="Str" />
4362-
</Item>
43634363
<Item ItemId=";DeletingArtifact$From$" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
43644364
<Str Cat="Text">
43654365
<Val><![CDATA[Deleting artifact ${p0} from ${p1}]]></Val>
@@ -4891,15 +4891,6 @@
48914891
</Str>
48924892
<Disp Icon="Str" />
48934893
</Item>
4894-
<Item ItemId=";EmbeddingVcpkgConfigInManifest" ItemType="0" PsrId="306" Leaf="true">
4895-
<Str Cat="Text">
4896-
<Val><![CDATA[Embedding `vcpkg-configuration` in a manifest file is an EXPERIMENTAL feature.]]></Val>
4897-
<Tgt Cat="Text" Stat="Loc" Orig="New">
4898-
<Val><![CDATA[Das Einbetten von "vcpkg-configuration" in eine Manifestdatei ist ein EXPERIMENTELLEs Feature.]]></Val>
4899-
</Tgt>
4900-
</Str>
4901-
<Disp Icon="Str" />
4902-
</Item>
49034894
<Item ItemId=";EmptyLicenseExpression" ItemType="0" PsrId="306" Leaf="true">
49044895
<Str Cat="Text">
49054896
<Val><![CDATA[SPDX license expression was empty.]]></Val>
@@ -8356,6 +8347,15 @@
83568347
</Str>
83578348
<Disp Icon="Str" />
83588349
</Item>
8350+
<Item ItemId=";ManifestHere" ItemType="0" PsrId="306" Leaf="true">
8351+
<Str Cat="Text">
8352+
<Val><![CDATA[the manifest file is here]]></Val>
8353+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8354+
<Val><![CDATA[die Manifestdatei ist hier]]></Val>
8355+
</Tgt>
8356+
</Str>
8357+
<Disp Icon="Str" />
8358+
</Item>
83598359
<Item ItemId=";MatchedMoreThanOneInstallBlock$" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
83608360
<Str Cat="Text">
83618361
<Val><![CDATA[Matched more than one install block [${p0}]5D;]]></Val>

‎src/localization/es/messages.json.lcl‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -958,11 +958,11 @@
958958
</Str>
959959
<Disp Icon="Str" />
960960
</Item>
961-
<Item ItemId=";AmbiguousConfigDeleteConfigFile" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
961+
<Item ItemId=";AmbiguousConfig" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
962962
<Str Cat="Text">
963-
<Val><![CDATA[Ambiguous vcpkg configuration provided by both manifest and configuration file.]A;-- Delete configuration file {path}]]></Val>
963+
<Val><![CDATA[Ambiguous vcpkg configuration provided by both manifest and configuration file. Choose one by deleting this file or deleting "{json_field}" from the manifest file.]]></Val>
964964
<Tgt Cat="Text" Stat="Loc" Orig="New">
965-
<Val><![CDATA[Configuración ambigua de vcpkg proporcionada por el manifiesto y el archivo de configuración.]A;-- Eliminar archivo de configuración {path}]]></Val>
965+
<Val><![CDATA[Configuración ambigua de vcpkg proporcionada por el manifiesto y el archivo de configuración. Elija una opción eliminando este archivo o eliminando "{json_field}" del archivo de manifiesto.]]></Val>
966966
</Tgt>
967967
</Str>
968968
<Disp Icon="Str" />
@@ -4009,6 +4009,15 @@
40094009
</Str>
40104010
<Disp Icon="Str" />
40114011
</Item>
4012+
<Item ItemId=";ConflictingEmbeddedConfiguration" ItemType="0" PsrId="306" Leaf="true">
4013+
<Str Cat="Text">
4014+
<Val><![CDATA[only one of {{"configuration", "vcpkg-configuration"}} may be used]]></Val>
4015+
<Tgt Cat="Text" Stat="Loc" Orig="New">
4016+
<Val><![CDATA[solo se puede usar un {{"configuration", "vcpkg-configuration"}}]]></Val>
4017+
</Tgt>
4018+
</Str>
4019+
<Disp Icon="Str" />
4020+
</Item>
40124021
<Item ItemId=";ConflictingFiles" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
40134022
<Str Cat="Text">
40144023
<Val><![CDATA[The following files are already installed in {path} and are in conflict with {spec}]]></Val>
@@ -4351,15 +4360,6 @@
43514360
</Str>
43524361
<Disp Icon="Str" />
43534362
</Item>
4354-
<Item ItemId=";DeleteVcpkgConfigFromManifest" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
4355-
<Str Cat="Text">
4356-
<Val><![CDATA[-- Or remove "vcpkg-configuration" from the manifest file {path}.]]></Val>
4357-
<Tgt Cat="Text" Stat="Loc" Orig="New">
4358-
<Val><![CDATA[-- O bien, quite “vcpkg-configuration” del archivo de manifiesto {path}.]]></Val>
4359-
</Tgt>
4360-
</Str>
4361-
<Disp Icon="Str" />
4362-
</Item>
43634363
<Item ItemId=";DeletingArtifact$From$" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
43644364
<Str Cat="Text">
43654365
<Val><![CDATA[Deleting artifact ${p0} from ${p1}]]></Val>
@@ -4891,15 +4891,6 @@
48914891
</Str>
48924892
<Disp Icon="Str" />
48934893
</Item>
4894-
<Item ItemId=";EmbeddingVcpkgConfigInManifest" ItemType="0" PsrId="306" Leaf="true">
4895-
<Str Cat="Text">
4896-
<Val><![CDATA[Embedding `vcpkg-configuration` in a manifest file is an EXPERIMENTAL feature.]]></Val>
4897-
<Tgt Cat="Text" Stat="Loc" Orig="New">
4898-
<Val><![CDATA[La inserción de “vcpkg-configuration” en un archivo de manifiesto es una característica EXPERIMENTAL.]]></Val>
4899-
</Tgt>
4900-
</Str>
4901-
<Disp Icon="Str" />
4902-
</Item>
49034894
<Item ItemId=";EmptyLicenseExpression" ItemType="0" PsrId="306" Leaf="true">
49044895
<Str Cat="Text">
49054896
<Val><![CDATA[SPDX license expression was empty.]]></Val>
@@ -8356,6 +8347,15 @@
83568347
</Str>
83578348
<Disp Icon="Str" />
83588349
</Item>
8350+
<Item ItemId=";ManifestHere" ItemType="0" PsrId="306" Leaf="true">
8351+
<Str Cat="Text">
8352+
<Val><![CDATA[the manifest file is here]]></Val>
8353+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8354+
<Val><![CDATA[el archivo de manifiesto está aquí]]></Val>
8355+
</Tgt>
8356+
</Str>
8357+
<Disp Icon="Str" />
8358+
</Item>
83598359
<Item ItemId=";MatchedMoreThanOneInstallBlock$" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
83608360
<Str Cat="Text">
83618361
<Val><![CDATA[Matched more than one install block [${p0}]5D;]]></Val>

‎src/localization/it/messages.json.lcl‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -958,11 +958,11 @@
958958
</Str>
959959
<Disp Icon="Str" />
960960
</Item>
961-
<Item ItemId=";AmbiguousConfigDeleteConfigFile" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
961+
<Item ItemId=";AmbiguousConfig" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
962962
<Str Cat="Text">
963-
<Val><![CDATA[Ambiguous vcpkg configuration provided by both manifest and configuration file.]A;-- Delete configuration file {path}]]></Val>
963+
<Val><![CDATA[Ambiguous vcpkg configuration provided by both manifest and configuration file. Choose one by deleting this file or deleting "{json_field}" from the manifest file.]]></Val>
964964
<Tgt Cat="Text" Stat="Loc" Orig="New">
965-
<Val><![CDATA[Configurazione vcpkg ambigua fornita sia dal manifesto che dal file di configurazione.]A;-- Eliminare il file di configurazione {path}]]></Val>
965+
<Val><![CDATA[Configurazione vcpkg ambigua fornita sia dal manifesto che dal file di configurazione. Sceglierne uno eliminando questo file o "{json_field}" dal file manifesto.]]></Val>
966966
</Tgt>
967967
</Str>
968968
<Disp Icon="Str" />
@@ -4009,6 +4009,15 @@
40094009
</Str>
40104010
<Disp Icon="Str" />
40114011
</Item>
4012+
<Item ItemId=";ConflictingEmbeddedConfiguration" ItemType="0" PsrId="306" Leaf="true">
4013+
<Str Cat="Text">
4014+
<Val><![CDATA[only one of {{"configuration", "vcpkg-configuration"}} may be used]]></Val>
4015+
<Tgt Cat="Text" Stat="Loc" Orig="New">
4016+
<Val><![CDATA[è possibile utilizzare solo uno di {{"configuration", "vcpkg-configuration"}}]]></Val>
4017+
</Tgt>
4018+
</Str>
4019+
<Disp Icon="Str" />
4020+
</Item>
40124021
<Item ItemId=";ConflictingFiles" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
40134022
<Str Cat="Text">
40144023
<Val><![CDATA[The following files are already installed in {path} and are in conflict with {spec}]]></Val>
@@ -4351,15 +4360,6 @@
43514360
</Str>
43524361
<Disp Icon="Str" />
43534362
</Item>
4354-
<Item ItemId=";DeleteVcpkgConfigFromManifest" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
4355-
<Str Cat="Text">
4356-
<Val><![CDATA[-- Or remove "vcpkg-configuration" from the manifest file {path}.]]></Val>
4357-
<Tgt Cat="Text" Stat="Loc" Orig="New">
4358-
<Val><![CDATA[-- In alternativa, rimuovere "vcpkg-configuration" dal file manifesto {path}.]]></Val>
4359-
</Tgt>
4360-
</Str>
4361-
<Disp Icon="Str" />
4362-
</Item>
43634363
<Item ItemId=";DeletingArtifact$From$" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
43644364
<Str Cat="Text">
43654365
<Val><![CDATA[Deleting artifact ${p0} from ${p1}]]></Val>
@@ -4891,15 +4891,6 @@
48914891
</Str>
48924892
<Disp Icon="Str" />
48934893
</Item>
4894-
<Item ItemId=";EmbeddingVcpkgConfigInManifest" ItemType="0" PsrId="306" Leaf="true">
4895-
<Str Cat="Text">
4896-
<Val><![CDATA[Embedding `vcpkg-configuration` in a manifest file is an EXPERIMENTAL feature.]]></Val>
4897-
<Tgt Cat="Text" Stat="Loc" Orig="New">
4898-
<Val><![CDATA[La possibilità di incorporare `vcpkg-configuration` in un file manifesto è una funzionalità SPERIMENTALE.]]></Val>
4899-
</Tgt>
4900-
</Str>
4901-
<Disp Icon="Str" />
4902-
</Item>
49034894
<Item ItemId=";EmptyLicenseExpression" ItemType="0" PsrId="306" Leaf="true">
49044895
<Str Cat="Text">
49054896
<Val><![CDATA[SPDX license expression was empty.]]></Val>
@@ -8356,6 +8347,15 @@
83568347
</Str>
83578348
<Disp Icon="Str" />
83588349
</Item>
8350+
<Item ItemId=";ManifestHere" ItemType="0" PsrId="306" Leaf="true">
8351+
<Str Cat="Text">
8352+
<Val><![CDATA[the manifest file is here]]></Val>
8353+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8354+
<Val><![CDATA[il file di manifesto è qui]]></Val>
8355+
</Tgt>
8356+
</Str>
8357+
<Disp Icon="Str" />
8358+
</Item>
83598359
<Item ItemId=";MatchedMoreThanOneInstallBlock$" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
83608360
<Str Cat="Text">
83618361
<Val><![CDATA[Matched more than one install block [${p0}]5D;]]></Val>

0 commit comments

Comments
 (0)