Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into net7.0
Browse files Browse the repository at this point in the history 
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
  • Loading branch information
@mattleibow
mattleibow committed Jul 14, 2022
2 parents c75b7c2 + e38582b commit f327fa6
Show file tree
Hide file tree
Showing 143 changed files with 9,058 additions and 25 deletions.
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ body:
- 6.0 Release Candidate 2 or older
- 6.0 Release Candidate 3
- 6.0.312
- 6.0.400 (current)
- 6.0.400
- 6.0.408 (current)
- Unknown/Other (please specify)
validations:
required: true
Expand All @@ -53,6 +54,7 @@ body:
- 6.0 Release Candidate 2 or older
- 6.0 Release Candidate 3
- 6.0.312
- 6.0.400
- Unknown/Other
validations:
required: true
Expand Down
299 changes: 299 additions & 0 deletions loc/cs/src/Controls/src/Build.Tasks/ErrorMessages.resx.lcl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,299 @@
<?xml version="1.0" encoding="utf-8"?>
<LCX SchemaVersion="6.0" Name="D:\a\1\s\src\Controls\src\Build.Tasks\ErrorMessages.resx" PsrId="211" SrcCul="en-US" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx" TgtCul="cs-CZ">
<OwnedComments>
<Cmt Name="Dev" />
<Cmt Name="LcxAdmin" />
<Cmt Name="Rccx" />
</OwnedComments>
<Item ItemId=";ErrorMessages.resx" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Str" Disp="true" LocTbl="false" />
<Item ItemId=";AdderMissing" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[No Add() method defined on "{0}{1}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is type name, 1 is property name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";BPMissingGetter" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Missing a "public static Get{0}" method or a public instance property getter for the attached property "{1}.{0}Property".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is BindableProperty name, 1 is the declaring type]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";BPName" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The name of the BindableProperty {0} does not end with "Property".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is BindableProperty name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";BindingIndexerEmpty" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Binding: Indexer did not contain arguments.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";BindingIndexerNotClosed" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Binding: Indexer did not contain closing bracket.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";BindingIndexerParse" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Binding: "{0}" cannot be parsed as an index for a "{1}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is indexer value, 1 is property name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";BindingIndexerTypeUnsupported" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Binding: Unsupported indexer index type: "{0}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is indexer type name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";BindingPropertyNotFound" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Binding: Property "{0}" not found on "{1}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is property name, 1 is type name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";ConstructorDefaultMissing" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Missing default constructor for "{0}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is type name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";ConstructorXArgsMissing" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Missing constructor for "{0}" with matching x:Arguments.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is type name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";ContentPropertyAttributeMissing" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot set the content of "{0}" as it doesn't have a [ContentProperty]5D; attribute.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is type name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";Conversion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot convert value "{0}" to "{1}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is a value, 1 is a type]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";EnumValueMissing" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Enum value not found for "{0}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is enum value]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";InvalidXaml" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid Xaml "{0}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is the invalid xaml snippet]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";MarkupNotClosed" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Markup expression not closed.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";MarkupParsingFailed" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Error while parsing markup expression.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";MemberResolution" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[No property, BindableProperty, or event found for "{0}", or mismatching type between value and property.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is member name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";MethodStaticMissing" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[No static method found for "{0}::{1} ({2})".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is type name, 1 is methodname, 2 is type arg list]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";MissingEventHandler" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[EventHandler "{0}" with correct signature not found in type "{1}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is the handler name, 1 is the declaring type]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";NamescopeDuplicate" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[An element with the name "{0}" already exists in this NameScope.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is the duplicated key]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";PropertyMissing" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Missing mandatory property "{0}" on "{1}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is a property name, 1 is a type]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";PropertyResolution" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot resolve property "{0}" on type "{1} (property missing or missing accessors)".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is a property name, 1 is a type name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";ResourceDictDuplicateKey" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA["A resource with the key "{0}" is already present in the ResourceDictionary.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is key name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";ResourceDictMissingKey" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Resources in ResourceDictionary require a x:Key attribute.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";ResourceMissing" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Resource "{0}" not found.]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is a resourceId]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";SByteEnums" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Multi-valued enums are not valid on sbyte enum types.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";StyleSheetNoSourceOrContent" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[StyleSheet require either a Source or a content.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";StyleSheetSourceNotALiteral" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Source property is not a string literal.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";StyleSheetSourceOrContent" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[StyleSheet can not have both a Source and a content.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";StyleSheetStyleNotALiteral" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Style property or Content is not a string literal.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";TypeResolution" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot resolve type "{0}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is a type name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";XDataTypeSyntax" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[x:DataType expects a string literal, an {{x:Type}} markup or {{x:Nul}l}.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XKeyNotLiteral" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[x:Key expects a string literal.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XStaticResolution" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is membername, 1 is type name]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";XStaticSyntax" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Syntax for x:Static is "[Member=]5D;[prefix:]5D;typeName.staticMemberName".]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XmlnsUndeclared" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Undeclared xmlns prefix "{0}".]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[0 is the xmlns prefix]]></Cmt>
</Cmts>
</Item>
</Item>
</Item>
<Settings Name="@vsLocTools@\default.lss" Type="Lss" /></LCX>
32 changes: 32 additions & 0 deletions loc/cs/src/Controls/src/Core/Compatibility/iOS/Resources/StringResources.resx.lcl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LCX SchemaVersion="6.0" Name="D:\a\1\s\src\Controls\src\Core\Compatibility\iOS\Resources\StringResources.resx" PsrId="211" SrcCul="en-US" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx" TgtCul="cs-CZ">
<OwnedComments>
<Cmt Name="Dev" />
<Cmt Name="LcxAdmin" />
<Cmt Name="Rccx" />
</OwnedComments>
<Item ItemId=";StringResources.resx" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Str" Disp="true" LocTbl="false" />
<Item ItemId=";Cancel" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cancel]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[ContextActionCell Cancel button]]></Cmt>
</Cmts>
</Item>
<Item ItemId=";More" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[More]]></Val>
</Str>
<Disp Icon="Str" />
<Cmts>
<Cmt Name="Dev"><![CDATA[ContextActionCell More button]]></Cmt>
</Cmts>
</Item>
</Item>
</Item>
<Settings Name="@vsLocTools@\default.lss" Type="Lss" /></LCX>
Loading

0 comments on commit f327fa6

Please sign in to comment.