Skip to content

Commit

Permalink
Merge branch 'main' into dev/grendel/cpp-tweaks
Browse files Browse the repository at this point in the history 
* main:
  [Xamarin.Android.Build.Tasks] fix warning when missing `proguard-android.txt` (#8641)
  LEGO: Merge pull request 8642
  Fix ServerCertificateCustomValidator on API 21-23 (#8637)
  • Loading branch information
@grendello
grendello committed Jan 17, 2024
2 parents fc5eff0 + 8e65135 commit f55b42a
Show file tree
Hide file tree
Showing 28 changed files with 264 additions and 10 deletions.
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Otevře soubor Activity1.cs v editoru]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Otevře soubor Layout1.xml v editoru]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Öffnet Activity1.cs im Editor]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Öffnet Layout1.xml im Editor]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Abre Activity1.cs en el editor]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Abre Layout1.xml en el editor]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Ouvre Activity1.cs dans l’éditeur]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Ouvre Layout1.xml dans l’éditeur]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Apre Activity1.cs nell'editor]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Apre Layout1.xml nell'editor]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[エディターで Activity1.cs を開きます]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[エディターで Layout1.xml を開きます]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[편집기에서 Activity1.cs를 엽니다.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[편집기에서 Layout1.xml 엽니다.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Otwiera plik Activity1.cs w edytorze]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Otwiera plik Layout1.xml w edytorze]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Abre Activity1.cs no editor]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Abre Layout1.xml no editor]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Открывает Activity1.cs в редакторе]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Открывает Layout1.xml в редакторе]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Activity1.cs dosyasını düzenleyicide açar]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Layout1.xml dosyasını düzenleyicide açar]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
9 changes: 9 additions & 0 deletions ...oft.Android.Templates/android-activity/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Activity1.cs in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[在编辑器中打开 Activity1.cs]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";symbols/namespace/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[namespace for the generated code]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.Android.Templates/android-layout/.template.config/localize/templatestrings.json.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";postActions/openInEditor/description" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Opens Layout1.xml in the editor]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[在编辑器中打开 Layout1.xml]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
Loading

0 comments on commit f55b42a

Please sign in to comment.