Skip to content

Commit b504941

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/bump-binutils
* main: LEGO: Merge pull request 8818 Bump to dotnet/installer@b40c44502d 9.0.100-preview.3.24165.20 (#8817) Bump com.android.tools:r8 from 8.2.47 to 8.3.37 (#8816) [Mono.Android] Prevent NullPointerException in TranslateStackTrace (#8795) Localized file check-in by OneLocBuild Task (#8815)
2 parents 8f28775 + 9f548d5 commit b504941

File tree

39 files changed

+454
-58
lines changed

39 files changed

+454
-58
lines changed

‎Localize/loc/cs/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[Šablona aktivity Androidu]]></Val>
34+
<Val><![CDATA[Aktivita na Androidu]]></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/cs/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[Šablona rozložení pro Android]]></Val>
34+
<Val><![CDATA[Rozložení Androidu]]></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/cs/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[Metadata položek %(AndroidAsset.AssetPack) a %(AndroidAsset.AssetPack) se podporují jenom v případě, že $(AndroidApplication) je true.]]></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} má neplatná metadata DeliveryType pro {1}. Podporované hodnoty jsou installtime, ondemand nebo 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[Hodnota AssetPack definovaná pro {0} obsahuje neplatné znaky. Hodnota {1} by měla obsahovat pouze znaky A–Z, a–z, 0–9 nebo podtržítko.]]></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>

‎Localize/loc/es/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[Plantilla de actividad de Android]]></Val>
34+
<Val><![CDATA[Actividad de Android]]></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/es/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[Plantilla de diseño de Android]]></Val>
34+
<Val><![CDATA[Diseño de Android]]></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/es/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[Los metadatos de elemento de "AndroidAsset.AssetPack") y "AndroidAsset.AssetPack" solo se admiten cuando "$(AndroidApplication)" es "true".]]></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}' tiene metadatos 'DeliveryType' no válidos de '{1}'. Los valores admitidos son "installtime", "ondemand" o "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[El valor AssetPack definido para '{0}' tiene caracteres no válidos. '{1}' solo debe contener A-z, a-z, 0-9 o un carácter de subrayado.]]></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>

‎Localize/loc/fr/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[Modèle d’activité Android]]></Val>
34+
<Val><![CDATA[Activité Android]]></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/fr/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[Modèle de disposition Android]]></Val>
34+
<Val><![CDATA[Navigation Android]]></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/fr/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[Les métadonnées des éléments %(AndroidAsset.AssetPack) et %(AndroidAsset.AssetPack) sont uniquement prises en charge lorsque `$(AndroidApplication)` est `true`.]]></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}` a une métadonnée `DeliveryType` invalide de `{1}`. Les valeurs prises en charge sont `installtime`, `ondemand` ou `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[La valeur AssetPack définie pour `{0}` contient des caractères non valides. `{1}` doit contenir uniquement A-z, a-z, 0-9 ou un trait de soulignement.]]></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>

‎Localize/loc/it/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[Modello di attività Android]]></Val>
34+
<Val><![CDATA[Attività di Android]]></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/it/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[Modello di layout Android]]></Val>
34+
<Val><![CDATA[Layout Android]]></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/it/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[I metadati degli elementi %(AndroidAsset.AssetPack) e %(AndroidAsset.AssetPack) sono supportati solo quando '$(AndroidApplication)' è 'true'.]]></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}' contiene metadati 'DeliveryType' non validi di '{1}'. I valori supportati sono 'installtime', 'ondemand' o '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[Il valore AssetPack definito per '{0}' contiene caratteri non validi. '{1}' deve contenere solo A-z, a-z, 0-9 o un carattere di sottolineatura.]]></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>

‎Localize/loc/ja/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 アクティビティ テンプレート]]></Val>
34+
<Val><![CDATA[Android アクティビティ]]></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/ja/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 レイアウト テンプレート]]></Val>
34+
<Val><![CDATA[Android レイアウト]]></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/ja/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) および %(AndroidAsset.AssetPack) 項目メタデータは、'$(AndroidApplication)' が 'true' の場合にのみサポートされます。]]></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}' に、'{1}' の無効な 'DeliveryType' メタデータがあります。サポートされている値は、'installtime'、'ondemand'、または '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['{0}' に定義された AssetPack 値に無効な文字が含まれています。'{1}' には、A-z、a-z、0-9、またはアンダースコアのみを含める必要があります。]]></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>

‎Localize/loc/ko/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 활동 템플릿]]></Val>
34+
<Val><![CDATA[Android 활동]]></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/ko/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 레이아웃 템플릿]]></Val>
34+
<Val><![CDATA[Android 레이아웃]]></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/ko/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) 및 %(AndroidAsset.AssetPack) 항목 메타데이터는 '$(AndroidApplication)'이 'true'인 경우에만 지원됩니다.]]></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}'에 '{1}'의 잘못된 'DeliveryType' 메타데이터가 있습니다. 지원되는 값은 'installtime', 'ondemand' 또는 '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['{0}'에 대해 정의된 AssetPack 값에 잘못된 문자가 있습니다. '{1}'은(는) A-z, a-z, 0-9 또는 밑줄만 포함해야 합니다.]]></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>

0 commit comments

Comments
 (0)