Skip to content

Commit

Permalink
Merge branch 'main' into xcode15.3-bump
Browse files Browse the repository at this point in the history
  • Loading branch information
dalexsoto authored Feb 15, 2024
2 parents 924b0be + fb8d583 commit 2677d76
Show file tree
Hide file tree
Showing 30 changed files with 130 additions and 261 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Byl zjištěn cyklus odkazu na sestavení související se sestavením {0}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Es wurde ein Assemblyverweiszyklus gefunden, der mit der Assembly {0} verknüpft ist.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Se encontró un ciclo de referencia de ensamblado relacionado con el ensamblado {0}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[A rencontré un cycle de référence d'assemblage lié à l'assemblage {0}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[È stato rilevato un ciclo di riferimento dell'assembly correlato all'assembly {0}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[アセンブリ {0} に関連するアセンブリ参照サイクルが発生しました。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[{0} 어셈블리와 관련된 어셈블리 참조 주기를 발견했습니다.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Napotkano cykl odwołania do zestawu powiązany z zestawem {0}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Foi encontrado um ciclo de referência de assembly relacionado ao assembly {0}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Обнаружен цикл ссылки на сборку, связанный со сборкой {0}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[{0} bütünleştirilmiş koduyla ilgili bir bütünleştirilmiş kod başvuru döngüsüyle karşılaşıldı.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[遇到与程序集 {0} 相关的程序集引用周期。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1939,15 +1939,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7119" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Encountered an assembly reference cycle related to the assembly {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[遇到與組件 {0} 相關的組件參考循環。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
7 changes: 0 additions & 7 deletions msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1533,11 +1533,4 @@
{1}: the exit code of a process
</comment>
</data>

<data name="E7119" xml:space="preserve">
<value>Encountered an assembly reference cycle related to the assembly {0}.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>Byl zjištěn cyklus odkazu na sestavení související se sestavením {0}.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>Es wurde ein Assemblyverweiszyklus gefunden, der mit der Assembly {0} verknüpft ist.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>Se encontró un ciclo de referencia de ensamblado relacionado con el ensamblado {0}.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>A rencontré un cycle de référence d'assemblage lié à l'assemblage {0}.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>È stato rilevato un ciclo di riferimento dell'assembly correlato all'assembly {0}.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>アセンブリ {0} に関連するアセンブリ参照サイクルが発生しました。</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>{0} 어셈블리와 관련된 어셈블리 참조 주기를 발견했습니다.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>Napotkano cykl odwołania do zestawu powiązany z zestawem {0}.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>Foi encontrado um ciclo de referência de assembly relacionado ao assembly {0}.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>Обнаружен цикл ссылки на сборку, связанный со сборкой {0}.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>{0} bütünleştirilmiş koduyla ilgili bir bütünleştirilmiş kod başvuru döngüsüyle karşılaşıldı.</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>遇到与程序集 {0} 相关的程序集引用周期。</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,4 @@
{1}: the exit code of a process
</comment>
</data>
<data name="E7119" xml:space="preserve">
<value>遇到與組件 {0} 相關的組件參考循環。</value>
<comment>
{0}: the path to an assembly
</comment>
</data>
</root>
Loading

0 comments on commit 2677d76

Please sign in to comment.