Skip to content

Commit

Permalink
Merge branch 'main' into dev/grendel/bump-binutils
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
grendello committed Mar 20, 2024
2 parents 8f28775 + 9f548d5 commit b504941
Show file tree
Hide file tree
Showing 39 changed files with 454 additions and 58 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
<Val><![CDATA[Android Activity]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Šablona aktivity Androidu]]></Val>
<Val><![CDATA[Aktivita na Androidu]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
<Val><![CDATA[Android Layout]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Šablona rozložení pro Android]]></Val>
<Val><![CDATA[Rozložení Androidu]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,33 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0138" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[%(AndroidAsset.AssetPack) and %(AndroidAsset.AssetPack) item metadata are only supported when `$(AndroidApplication)` is `true`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Metadata položek %(AndroidAsset.AssetPack) a %(AndroidAsset.AssetPack) se podporují jenom v případě, že $(AndroidApplication) je true.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0139" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[`@(AndroidAsset)` `{0}` has an invalid `DeliveryType` metadata of `{1}`. Supported values are `installtime`, `ondemand` or `fastfollow`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[@(AndroidAsset) {0} má neplatná metadata DeliveryType pro {1}. Podporované hodnoty jsou installtime, ondemand nebo fastfollow.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0140" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<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>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<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>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[There was a problem parsing {0}. This is likely due to incomplete or invalid XML. Exception: {1}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
<Val><![CDATA[Android Activity]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Plantilla de actividad de Android]]></Val>
<Val><![CDATA[Actividad de Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
<Val><![CDATA[Android Layout]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Plantilla de diseño de Android]]></Val>
<Val><![CDATA[Diseño de Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,33 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0138" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[%(AndroidAsset.AssetPack) and %(AndroidAsset.AssetPack) item metadata are only supported when `$(AndroidApplication)` is `true`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Los metadatos de elemento de "AndroidAsset.AssetPack") y "AndroidAsset.AssetPack" solo se admiten cuando "$(AndroidApplication)" es "true".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0139" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[`@(AndroidAsset)` `{0}` has an invalid `DeliveryType` metadata of `{1}`. Supported values are `installtime`, `ondemand` or `fastfollow`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA['@(AndroidAsset)' '{0}' tiene metadatos 'DeliveryType' no válidos de '{1}'. Los valores admitidos son "installtime", "ondemand" o "fastfollow".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0140" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<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>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<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>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[There was a problem parsing {0}. This is likely due to incomplete or invalid XML. Exception: {1}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
<Val><![CDATA[Android Activity]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Modèle d’activité Android]]></Val>
<Val><![CDATA[Activité Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
<Val><![CDATA[Android Layout]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Modèle de disposition Android]]></Val>
<Val><![CDATA[Navigation Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,33 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0138" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[%(AndroidAsset.AssetPack) and %(AndroidAsset.AssetPack) item metadata are only supported when `$(AndroidApplication)` is `true`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Les métadonnées des éléments %(AndroidAsset.AssetPack) et %(AndroidAsset.AssetPack) sont uniquement prises en charge lorsque `$(AndroidApplication)` est `true`.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0139" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[`@(AndroidAsset)` `{0}` has an invalid `DeliveryType` metadata of `{1}`. Supported values are `installtime`, `ondemand` or `fastfollow`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[`@(AndroidAsset)`{0}` a une métadonnée `DeliveryType` invalide de `{1}`. Les valeurs prises en charge sont `installtime`, `ondemand` ou `fastfollow`.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0140" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<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>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<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>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[There was a problem parsing {0}. This is likely due to incomplete or invalid XML. Exception: {1}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
<Val><![CDATA[Android Activity]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Modello di attività Android]]></Val>
<Val><![CDATA[Attività di Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
<Val><![CDATA[Android Layout]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Modello di layout Android]]></Val>
<Val><![CDATA[Layout Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,33 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0138" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[%(AndroidAsset.AssetPack) and %(AndroidAsset.AssetPack) item metadata are only supported when `$(AndroidApplication)` is `true`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[I metadati degli elementi %(AndroidAsset.AssetPack) e %(AndroidAsset.AssetPack) sono supportati solo quando '$(AndroidApplication)' è 'true'.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0139" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[`@(AndroidAsset)` `{0}` has an invalid `DeliveryType` metadata of `{1}`. Supported values are `installtime`, `ondemand` or `fastfollow`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA['@(AndroidAsset)' '{0}' contiene metadati 'DeliveryType' non validi di '{1}'. I valori supportati sono 'installtime', 'ondemand' o 'fastfollow'.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0140" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<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>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<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>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[There was a problem parsing {0}. This is likely due to incomplete or invalid XML. Exception: {1}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
<Val><![CDATA[Android Activity]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Android アクティビティ テンプレート]]></Val>
<Val><![CDATA[Android アクティビティ]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
<Val><![CDATA[Android Layout]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Android レイアウト テンプレート]]></Val>
<Val><![CDATA[Android レイアウト]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,33 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0138" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[%(AndroidAsset.AssetPack) and %(AndroidAsset.AssetPack) item metadata are only supported when `$(AndroidApplication)` is `true`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[%(AndroidAsset.AssetPack) および %(AndroidAsset.AssetPack) 項目メタデータは、'$(AndroidApplication)' が 'true' の場合にのみサポートされます。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0139" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[`@(AndroidAsset)` `{0}` has an invalid `DeliveryType` metadata of `{1}`. Supported values are `installtime`, `ondemand` or `fastfollow`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA['@(AndroidAsset)' '{0}' に、'{1}' の無効な 'DeliveryType' メタデータがあります。サポートされている値は、'installtime'、'ondemand'、または 'fastfollow' です。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0140" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<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>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA['{0}' に定義された AssetPack 値に無効な文字が含まれています。'{1}' には、A-z、a-z、0-9、またはアンダースコアのみを含める必要があります。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[There was a problem parsing {0}. This is likely due to incomplete or invalid XML. Exception: {1}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
<Val><![CDATA[Android Activity]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Android 활동 템플릿]]></Val>
<Val><![CDATA[Android 활동]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Activity template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
</Item>
<Item ItemId=";name" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
<Val><![CDATA[Android Layout]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Android 레이아웃 템플릿]]></Val>
<Val><![CDATA[Android 레이아웃]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Android Layout template]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,33 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0138" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[%(AndroidAsset.AssetPack) and %(AndroidAsset.AssetPack) item metadata are only supported when `$(AndroidApplication)` is `true`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[%(AndroidAsset.AssetPack) 및 %(AndroidAsset.AssetPack) 항목 메타데이터는 '$(AndroidApplication)'이 'true'인 경우에만 지원됩니다.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0139" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[`@(AndroidAsset)` `{0}` has an invalid `DeliveryType` metadata of `{1}`. Supported values are `installtime`, `ondemand` or `fastfollow`.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA['@(AndroidAsset)' '{0}'에 '{1}'의 잘못된 'DeliveryType' 메타데이터가 있습니다. 지원되는 값은 'installtime', 'ondemand' 또는 'fastfollow'입니다.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0140" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<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>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA['{0}'에 대해 정의된 AssetPack 값에 잘못된 문자가 있습니다. '{1}'은(는) A-z, a-z, 0-9 또는 밑줄만 포함해야 합니다.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[There was a problem parsing {0}. This is likely due to incomplete or invalid XML. Exception: {1}]]></Val>
Expand Down
Loading

0 comments on commit b504941

Please sign in to comment.