Skip to content

Commit 97acf71

Browse files
committed
Merge branch 'main' into dev/grendel/optional-no-inline
* main: [One .NET] new "greenfield" projects are trimmed by default (#8805) Localized file check-in by OneLocBuild Task (#8819) LEGO: Merge pull request 8820
2 parents 2ae5deb + 9a782d7 commit 97acf71

File tree

61 files changed

+226
-111
lines changed

Some content is hidden

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

61 files changed

+226
-111
lines changed

Localize/loc/de/src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@
2929
</Item>
3030
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
3131
<Str Cat="Text">
32-
<Val><![CDATA[Android Activity template]]></Val>
32+
<Val><![CDATA[Android Activity]]></Val>
3333
<Tgt Cat="Text" Stat="Loc" Orig="New">
34-
<Val><![CDATA[Android-Aktivitätsvorlage]]></Val>
34+
<Val><![CDATA[Android-Aktivität]]></Val>
3535
</Tgt>
36+
<Prev Cat="Text">
37+
<Val><![CDATA[Android Activity template]]></Val>
38+
</Prev>
3639
</Str>
3740
<Disp Icon="Str" />
3841
</Item>

Localize/loc/de/src/Microsoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@
2929
</Item>
3030
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
3131
<Str Cat="Text">
32-
<Val><![CDATA[Android Layout template]]></Val>
32+
<Val><![CDATA[Android Layout]]></Val>
3333
<Tgt Cat="Text" Stat="Loc" Orig="New">
34-
<Val><![CDATA[Android-Layoutvorlage]]></Val>
34+
<Val><![CDATA[Android-Layout]]></Val>
3535
</Tgt>
36+
<Prev Cat="Text">
37+
<Val><![CDATA[Android Layout template]]></Val>
38+
</Prev>
3639
</Str>
3740
<Disp Icon="Str" />
3841
</Item>

Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,33 @@
417417
</Str>
418418
<Disp Icon="Str" />
419419
</Item>
420+
<Item ItemId=";XA0138" ItemType="0;.resx" PsrId="211" Leaf="true">
421+
<Str Cat="Text">
422+
<Val><![CDATA[%(AndroidAsset.AssetPack) and %(AndroidAsset.AssetPack) item metadata are only supported when `$(AndroidApplication)` is `true`.]]></Val>
423+
<Tgt Cat="Text" Stat="Loc" Orig="New">
424+
<Val><![CDATA[%(AndroidAsset.AssetPack) und %(AndroidAsset.AssetPack)-Elementmetadaten werden nur unterstützt, wenn „$(AndroidApplication)“ auf „true“ festgelegt ist.]]></Val>
425+
</Tgt>
426+
</Str>
427+
<Disp Icon="Str" />
428+
</Item>
429+
<Item ItemId=";XA0139" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
430+
<Str Cat="Text">
431+
<Val><![CDATA[`@(AndroidAsset)` `{0}` has an invalid `DeliveryType` metadata of `{1}`. Supported values are `installtime`, `ondemand` or `fastfollow`.]]></Val>
432+
<Tgt Cat="Text" Stat="Loc" Orig="New">
433+
<Val><![CDATA[“@(AndroidAsset)“ „{0}“ weist die ungültigen DeliveryType-Metadaten „{1}“ auf. Unterstützte Werte sind „installtime“, „ondemand“ oder „fastfollow“.]]></Val>
434+
</Tgt>
435+
</Str>
436+
<Disp Icon="Str" />
437+
</Item>
438+
<Item ItemId=";XA0140" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
439+
<Str Cat="Text">
440+
<Val><![CDATA[The AssetPack value defined for `{0}` has invalid characters. `{1}` should only contain A-z, a-z, 0-9 or an underscore.]]></Val>
441+
<Tgt Cat="Text" Stat="Loc" Orig="New">
442+
<Val><![CDATA[Der für „{0}“ definierte AssetPack-Wert enthält ungültige Zeichen. „{1}“ darf nur A-z, a-z, 0-9 oder einen Unterstrich enthalten.]]></Val>
443+
</Tgt>
444+
</Str>
445+
<Disp Icon="Str" />
446+
</Item>
420447
<Item ItemId=";XA1000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
421448
<Str Cat="Text">
422449
<Val><![CDATA[There was a problem parsing {0}. This is likely due to incomplete or invalid XML. Exception: {1}]]></Val>

src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Microsoft",
3-
"name": "Android Activity",
3+
"name": "Aktivita na Androidu",
44
"description": "Třída aktivity Androidu",
55
"symbols/namespace/description": "obor názvů pro vygenerovaný kód",
66
"postActions/openInEditor/description": "Otevře soubor Activity1.cs v editoru"

src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Microsoft",
3-
"name": "Android Activity",
3+
"name": "Actividad de Android",
44
"description": "Una clase de actividad de Android",
55
"symbols/namespace/description": "espacio de nombres para el código generado",
66
"postActions/openInEditor/description": "Abre Activity1.cs en el editor"

src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Microsoft",
3-
"name": "Android Activity",
3+
"name": "Activité Android",
44
"description": "Une classe d’activité Android",
55
"symbols/namespace/description": "espace de noms pour le code généré",
66
"postActions/openInEditor/description": "Ouvre Activity1.cs dans l’éditeur"

src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Microsoft",
3-
"name": "Android Activity",
3+
"name": "Attività di Android",
44
"description": "Classe di attività Android",
55
"symbols/namespace/description": "spazio dei nomi per il codice generato",
66
"postActions/openInEditor/description": "Apre Activity1.cs nell'editor"

src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.ja.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Microsoft",
3-
"name": "Android Activity",
3+
"name": "Android アクティビティ",
44
"description": "Android アクティビティ クラス",
55
"symbols/namespace/description": "生成されたコードの名前空間",
66
"postActions/openInEditor/description": "エディターで Activity1.cs を開きます"

src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.ko.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Microsoft",
3-
"name": "Android Activity",
3+
"name": "Android 활동",
44
"description": "Android 활동 클래스",
55
"symbols/namespace/description": "생성된 코드의 네임스페이스",
66
"postActions/openInEditor/description": "편집기에서 Activity1.cs를 엽니다."

src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.pl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Microsoft",
3-
"name": "Android Activity",
3+
"name": "Działanie systemu Android",
44
"description": "Klasa Aktywność systemu Android",
55
"symbols/namespace/description": "przestrzeń nazw wygenerowanego kodu.",
66
"postActions/openInEditor/description": "Otwiera plik Activity1.cs w edytorze"

0 commit comments

Comments
 (0)