Skip to content

Commit 3255382

Browse files
csigscsigs
authored
LEGO: Merge pull request 19531
LEGO: Merge pull request 19531
2 parents 4ccc879 + 8f41843 commit 3255382

File tree

4 files changed

+112
-34
lines changed

4 files changed

+112
-34
lines changed

‎src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -830,12 +830,12 @@
830830
</Item>
831831
<Item ItemId=";Add_0_to_existing_import_declaration_from_1_90015" ItemType="0" PsrId="306" Leaf="true">
832832
<Str Cat="Text">
833-
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
833+
<Val><![CDATA[Add '{0}' to existing import declaration from "{1}".]]></Val>
834834
<Tgt Cat="Text" Stat="Loc" Orig="New">
835-
<Val><![CDATA[從 {1} 將 {0} 新增至現有的匯入宣告。]]></Val>
835+
<Val><![CDATA[從 "{1}" 將 '{0}' 新增至現有的匯入宣告。]]></Val>
836836
</Tgt>
837837
<Prev Cat="Text">
838-
<Val><![CDATA[Add {0} to existing import declaration from {1}]]></Val>
838+
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
839839
</Prev>
840840
</Str>
841841
<Disp Icon="Str" />
@@ -2898,6 +2898,15 @@
28982898
</Str>
28992899
<Disp Icon="Str" />
29002900
</Item>
2901+
<Item ItemId=";Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027" ItemType="0" PsrId="306" Leaf="true">
2902+
<Str Cat="Text">
2903+
<Val><![CDATA[Expected {0}-{1} type arguments; provide these with an '@extends' tag.]]></Val>
2904+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2905+
<Val><![CDATA[必須是 {0}-{1} 型別引數; 請提供有 '@ extends' 標記的這類型引數。]]></Val>
2906+
</Tgt>
2907+
</Str>
2908+
<Disp Icon="Str" />
2909+
</Item>
29012910
<Item ItemId=";Expected_0_arguments_but_got_1_2554" ItemType="0" PsrId="306" Leaf="true">
29022911
<Str Cat="Text">
29032912
<Val><![CDATA[Expected {0} arguments, but got {1}.]]></Val>
@@ -2925,6 +2934,15 @@
29252934
</Str>
29262935
<Disp Icon="Str" />
29272936
</Item>
2937+
<Item ItemId=";Expected_0_type_arguments_provide_these_with_an_extends_tag_8026" ItemType="0" PsrId="306" Leaf="true">
2938+
<Str Cat="Text">
2939+
<Val><![CDATA[Expected {0} type arguments; provide these with an '@extends' tag.]]></Val>
2940+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2941+
<Val><![CDATA[必須是 {0} 型別引數; 請提供有 '@ extends' 標記的這類引數。]]></Val>
2942+
</Tgt>
2943+
</Str>
2944+
<Disp Icon="Str" />
2945+
</Item>
29282946
<Item ItemId=";Expected_at_least_0_arguments_but_got_1_2555" ItemType="0" PsrId="306" Leaf="true">
29292947
<Str Cat="Text">
29302948
<Val><![CDATA[Expected at least {0} arguments, but got {1}.]]></Val>
@@ -3680,12 +3698,12 @@
36803698
</Item>
36813699
<Item ItemId=";Import_0_from_1_90013" ItemType="0" PsrId="306" Leaf="true">
36823700
<Str Cat="Text">
3683-
<Val><![CDATA[Import {0} from {1}.]]></Val>
3701+
<Val><![CDATA[Import '{0}' from "{1}".]]></Val>
36843702
<Tgt Cat="Text" Stat="Loc" Orig="New">
3685-
<Val><![CDATA[將 {0} 從 {1} 匯入。]]></Val>
3703+
<Val><![CDATA[從 "{1}" 匯入 '{0}'。]]></Val>
36863704
</Tgt>
36873705
<Prev Cat="Text">
3688-
<Val><![CDATA[Import {0} from {1}]]></Val>
3706+
<Val><![CDATA[Import {0} from {1}.]]></Val>
36893707
</Prev>
36903708
</Str>
36913709
<Disp Icon="Str" />
@@ -6366,11 +6384,11 @@
63666384
</Str>
63676385
<Disp Icon="Str" />
63686386
</Item>
6369-
<Item ItemId=";Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403" ItemType="0" PsrId="306" Leaf="true">
6387+
<Item ItemId=";Subsequent_variable_declarations_must_have_the_same_type_Variable_0_has_type_1_at_2_but_here_has_typ_2403" ItemType="0" PsrId="306" Leaf="true">
63706388
<Str Cat="Text">
6371-
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' must be of type '{1}', but here has type '{2}'.]]></Val>
6389+
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' has type '{1}' at {2}, but here has type '{3}'.]]></Val>
63726390
<Tgt Cat="Text" Stat="Loc" Orig="New">
6373-
<Val><![CDATA[後續的變數宣告必須具有相同的類型。變數 '{0}' 的類型必須是 '{1}' 但卻是 '{2}'。]]></Val>
6391+
<Val><![CDATA[後續的變數宣告必須具有相同的類型。變數 '{0}' 必須在 {2} 有類型 '{1}' 但卻是 '{3}'。]]></Val>
63746392
</Tgt>
63756393
</Str>
63766394
<Disp Icon="Str" />

‎src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -830,12 +830,12 @@
830830
</Item>
831831
<Item ItemId=";Add_0_to_existing_import_declaration_from_1_90015" ItemType="0" PsrId="306" Leaf="true">
832832
<Str Cat="Text">
833-
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
833+
<Val><![CDATA[Add '{0}' to existing import declaration from "{1}".]]></Val>
834834
<Tgt Cat="Text" Stat="Loc" Orig="New">
835-
<Val><![CDATA[{1} から既存のインポート宣言に {0} を追加します。]]></Val>
835+
<Val><![CDATA["{1}" から既存のインポート宣言に '{0}' を追加します。]]></Val>
836836
</Tgt>
837837
<Prev Cat="Text">
838-
<Val><![CDATA[Add {0} to existing import declaration from {1}]]></Val>
838+
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
839839
</Prev>
840840
</Str>
841841
<Disp Icon="Str" />
@@ -2898,6 +2898,15 @@
28982898
</Str>
28992899
<Disp Icon="Str" />
29002900
</Item>
2901+
<Item ItemId=";Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027" ItemType="0" PsrId="306" Leaf="true">
2902+
<Str Cat="Text">
2903+
<Val><![CDATA[Expected {0}-{1} type arguments; provide these with an '@extends' tag.]]></Val>
2904+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2905+
<Val><![CDATA[{0}-{1} 型の引数が必要です。'@extends' タグで指定してください。]]></Val>
2906+
</Tgt>
2907+
</Str>
2908+
<Disp Icon="Str" />
2909+
</Item>
29012910
<Item ItemId=";Expected_0_arguments_but_got_1_2554" ItemType="0" PsrId="306" Leaf="true">
29022911
<Str Cat="Text">
29032912
<Val><![CDATA[Expected {0} arguments, but got {1}.]]></Val>
@@ -2925,6 +2934,15 @@
29252934
</Str>
29262935
<Disp Icon="Str" />
29272936
</Item>
2937+
<Item ItemId=";Expected_0_type_arguments_provide_these_with_an_extends_tag_8026" ItemType="0" PsrId="306" Leaf="true">
2938+
<Str Cat="Text">
2939+
<Val><![CDATA[Expected {0} type arguments; provide these with an '@extends' tag.]]></Val>
2940+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2941+
<Val><![CDATA[{0} 型の引数が必要です。'@extends' タグで指定してください。]]></Val>
2942+
</Tgt>
2943+
</Str>
2944+
<Disp Icon="Str" />
2945+
</Item>
29282946
<Item ItemId=";Expected_at_least_0_arguments_but_got_1_2555" ItemType="0" PsrId="306" Leaf="true">
29292947
<Str Cat="Text">
29302948
<Val><![CDATA[Expected at least {0} arguments, but got {1}.]]></Val>
@@ -3680,12 +3698,12 @@
36803698
</Item>
36813699
<Item ItemId=";Import_0_from_1_90013" ItemType="0" PsrId="306" Leaf="true">
36823700
<Str Cat="Text">
3683-
<Val><![CDATA[Import {0} from {1}.]]></Val>
3701+
<Val><![CDATA[Import '{0}' from "{1}".]]></Val>
36843702
<Tgt Cat="Text" Stat="Loc" Orig="New">
3685-
<Val><![CDATA[{1} から {0} をインポートします。]]></Val>
3703+
<Val><![CDATA["{1}" から '{0}' をインポートします。]]></Val>
36863704
</Tgt>
36873705
<Prev Cat="Text">
3688-
<Val><![CDATA[Import {0} from {1}]]></Val>
3706+
<Val><![CDATA[Import {0} from {1}.]]></Val>
36893707
</Prev>
36903708
</Str>
36913709
<Disp Icon="Str" />
@@ -6366,11 +6384,11 @@
63666384
</Str>
63676385
<Disp Icon="Str" />
63686386
</Item>
6369-
<Item ItemId=";Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403" ItemType="0" PsrId="306" Leaf="true">
6387+
<Item ItemId=";Subsequent_variable_declarations_must_have_the_same_type_Variable_0_has_type_1_at_2_but_here_has_typ_2403" ItemType="0" PsrId="306" Leaf="true">
63706388
<Str Cat="Text">
6371-
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' must be of type '{1}', but here has type '{2}'.]]></Val>
6389+
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' has type '{1}' at {2}, but here has type '{3}'.]]></Val>
63726390
<Tgt Cat="Text" Stat="Loc" Orig="New">
6373-
<Val><![CDATA[後続の変数宣言は同じ型でなければなりません。変数 '{0}' の型は '{1}' である必要がありますが、'{2}' になっています。]]></Val>
6391+
<Val><![CDATA[後続の変数宣言は同じ型でなければなりません。変数 '{0}' の型は {2} では '{1}' ですが、ここでは型が '{3}' になっています。]]></Val>
63746392
</Tgt>
63756393
</Str>
63766394
<Disp Icon="Str" />

‎src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -830,12 +830,12 @@
830830
</Item>
831831
<Item ItemId=";Add_0_to_existing_import_declaration_from_1_90015" ItemType="0" PsrId="306" Leaf="true">
832832
<Str Cat="Text">
833-
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
833+
<Val><![CDATA[Add '{0}' to existing import declaration from "{1}".]]></Val>
834834
<Tgt Cat="Text" Stat="Loc" Orig="New">
835-
<Val><![CDATA[{1}에서 기존 가져오기 선언에 {0}을(를) 추가합니다.]]></Val>
835+
<Val><![CDATA["{1}"에서 기존 가져오기 선언에 '{0}'을(를) 추가합니다.]]></Val>
836836
</Tgt>
837837
<Prev Cat="Text">
838-
<Val><![CDATA[Add {0} to existing import declaration from {1}]]></Val>
838+
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
839839
</Prev>
840840
</Str>
841841
<Disp Icon="Str" />
@@ -2898,6 +2898,15 @@
28982898
</Str>
28992899
<Disp Icon="Str" />
29002900
</Item>
2901+
<Item ItemId=";Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027" ItemType="0" PsrId="306" Leaf="true">
2902+
<Str Cat="Text">
2903+
<Val><![CDATA[Expected {0}-{1} type arguments; provide these with an '@extends' tag.]]></Val>
2904+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2905+
<Val><![CDATA['@extends' 태그로 제공하는 예상되는 {0}-{1} 형식 인수입니다.]]></Val>
2906+
</Tgt>
2907+
</Str>
2908+
<Disp Icon="Str" />
2909+
</Item>
29012910
<Item ItemId=";Expected_0_arguments_but_got_1_2554" ItemType="0" PsrId="306" Leaf="true">
29022911
<Str Cat="Text">
29032912
<Val><![CDATA[Expected {0} arguments, but got {1}.]]></Val>
@@ -2925,6 +2934,15 @@
29252934
</Str>
29262935
<Disp Icon="Str" />
29272936
</Item>
2937+
<Item ItemId=";Expected_0_type_arguments_provide_these_with_an_extends_tag_8026" ItemType="0" PsrId="306" Leaf="true">
2938+
<Str Cat="Text">
2939+
<Val><![CDATA[Expected {0} type arguments; provide these with an '@extends' tag.]]></Val>
2940+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2941+
<Val><![CDATA['@extends' 태그로 제공하는 예상되는 {0} 형식 인수입니다.]]></Val>
2942+
</Tgt>
2943+
</Str>
2944+
<Disp Icon="Str" />
2945+
</Item>
29282946
<Item ItemId=";Expected_at_least_0_arguments_but_got_1_2555" ItemType="0" PsrId="306" Leaf="true">
29292947
<Str Cat="Text">
29302948
<Val><![CDATA[Expected at least {0} arguments, but got {1}.]]></Val>
@@ -3680,12 +3698,12 @@
36803698
</Item>
36813699
<Item ItemId=";Import_0_from_1_90013" ItemType="0" PsrId="306" Leaf="true">
36823700
<Str Cat="Text">
3683-
<Val><![CDATA[Import {0} from {1}.]]></Val>
3701+
<Val><![CDATA[Import '{0}' from "{1}".]]></Val>
36843702
<Tgt Cat="Text" Stat="Loc" Orig="New">
3685-
<Val><![CDATA[{1}에서 {0}을(를) 가져옵니다.]]></Val>
3703+
<Val><![CDATA["{1}"에서 '{0}'을(를) 가져옵니다.]]></Val>
36863704
</Tgt>
36873705
<Prev Cat="Text">
3688-
<Val><![CDATA[Import {0} from {1}]]></Val>
3706+
<Val><![CDATA[Import {0} from {1}.]]></Val>
36893707
</Prev>
36903708
</Str>
36913709
<Disp Icon="Str" />
@@ -6366,11 +6384,11 @@
63666384
</Str>
63676385
<Disp Icon="Str" />
63686386
</Item>
6369-
<Item ItemId=";Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403" ItemType="0" PsrId="306" Leaf="true">
6387+
<Item ItemId=";Subsequent_variable_declarations_must_have_the_same_type_Variable_0_has_type_1_at_2_but_here_has_typ_2403" ItemType="0" PsrId="306" Leaf="true">
63706388
<Str Cat="Text">
6371-
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' must be of type '{1}', but here has type '{2}'.]]></Val>
6389+
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' has type '{1}' at {2}, but here has type '{3}'.]]></Val>
63726390
<Tgt Cat="Text" Stat="Loc" Orig="New">
6373-
<Val><![CDATA[후속 변수 선언에 같은 형식이 있어야 합니다. '{0}' 변수가 '{1}' 형식이어야 하는데 여기에는 '{2}' 형식이 있습니다.]]></Val>
6391+
<Val><![CDATA[후속 변수 선언에 같은 형식이 있어야 합니다. '{0}' 변수가 {2}에서 '{1}' 형식이어야 하는데 여기에는 '{3}' 형식이 있습니다.]]></Val>
63746392
</Tgt>
63756393
</Str>
63766394
<Disp Icon="Str" />

‎src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -820,10 +820,13 @@
820820
</Item>
821821
<Item ItemId=";Add_0_to_existing_import_declaration_from_1_90015" ItemType="0" PsrId="306" Leaf="true">
822822
<Str Cat="Text">
823-
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
823+
<Val><![CDATA[Add '{0}' to existing import declaration from "{1}".]]></Val>
824824
<Tgt Cat="Text" Stat="Loc" Orig="New">
825-
<Val><![CDATA[Dodaj element {0} do istniejącej deklaracji importu z {1}.]]></Val>
825+
<Val><![CDATA[Dodaj element „{0}” do istniejącej deklaracji importu z elementu „{1}”.]]></Val>
826826
</Tgt>
827+
<Prev Cat="Text">
828+
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
829+
</Prev>
827830
</Str>
828831
<Disp Icon="Str" />
829832
</Item>
@@ -2879,6 +2882,15 @@
28792882
</Str>
28802883
<Disp Icon="Str" />
28812884
</Item>
2885+
<Item ItemId=";Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027" ItemType="0" PsrId="306" Leaf="true">
2886+
<Str Cat="Text">
2887+
<Val><![CDATA[Expected {0}-{1} type arguments; provide these with an '@extends' tag.]]></Val>
2888+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2889+
<Val><![CDATA[Oczekiwano argumentów typu {0}-{1}; podaj je z tagiem „@extends”.]]></Val>
2890+
</Tgt>
2891+
</Str>
2892+
<Disp Icon="Str" />
2893+
</Item>
28822894
<Item ItemId=";Expected_0_arguments_but_got_1_2554" ItemType="0" PsrId="306" Leaf="true">
28832895
<Str Cat="Text">
28842896
<Val><![CDATA[Expected {0} arguments, but got {1}.]]></Val>
@@ -2906,6 +2918,15 @@
29062918
</Str>
29072919
<Disp Icon="Str" />
29082920
</Item>
2921+
<Item ItemId=";Expected_0_type_arguments_provide_these_with_an_extends_tag_8026" ItemType="0" PsrId="306" Leaf="true">
2922+
<Str Cat="Text">
2923+
<Val><![CDATA[Expected {0} type arguments; provide these with an '@extends' tag.]]></Val>
2924+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2925+
<Val><![CDATA[Oczekiwano argumentów typu {0}; podaj je z tagiem „@extends”.]]></Val>
2926+
</Tgt>
2927+
</Str>
2928+
<Disp Icon="Str" />
2929+
</Item>
29092930
<Item ItemId=";Expected_at_least_0_arguments_but_got_1_2555" ItemType="0" PsrId="306" Leaf="true">
29102931
<Str Cat="Text">
29112932
<Val><![CDATA[Expected at least {0} arguments, but got {1}.]]></Val>
@@ -3658,10 +3679,13 @@
36583679
</Item>
36593680
<Item ItemId=";Import_0_from_1_90013" ItemType="0" PsrId="306" Leaf="true">
36603681
<Str Cat="Text">
3661-
<Val><![CDATA[Import {0} from {1}.]]></Val>
3682+
<Val><![CDATA[Import '{0}' from "{1}".]]></Val>
36623683
<Tgt Cat="Text" Stat="Loc" Orig="New">
3663-
<Val><![CDATA[Importuj {0} z {1}.]]></Val>
3684+
<Val><![CDATA[Importuj element „{0}” z elementu „{1}”.]]></Val>
36643685
</Tgt>
3686+
<Prev Cat="Text">
3687+
<Val><![CDATA[Import {0} from {1}.]]></Val>
3688+
</Prev>
36653689
</Str>
36663690
<Disp Icon="Str" />
36673691
</Item>
@@ -6332,11 +6356,11 @@
63326356
</Str>
63336357
<Disp Icon="Str" />
63346358
</Item>
6335-
<Item ItemId=";Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403" ItemType="0" PsrId="306" Leaf="true">
6359+
<Item ItemId=";Subsequent_variable_declarations_must_have_the_same_type_Variable_0_has_type_1_at_2_but_here_has_typ_2403" ItemType="0" PsrId="306" Leaf="true">
63366360
<Str Cat="Text">
6337-
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' must be of type '{1}', but here has type '{2}'.]]></Val>
6361+
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' has type '{1}' at {2}, but here has type '{3}'.]]></Val>
63386362
<Tgt Cat="Text" Stat="Loc" Orig="New">
6339-
<Val><![CDATA[Kolejne deklaracje zmiennej muszą być tego samego typu. Zmienna „{0}” musi być typu „{1}”, ale w tym miejscu jest typu „{2}”.]]></Val>
6363+
<Val><![CDATA[Kolejne deklaracje zmiennej muszą być tego samego typu. Zmienna „{0}” musi być typu „{1}” w {2} , ale w tym miejscu jest typu „{3}”.]]></Val>
63406364
</Tgt>
63416365
</Str>
63426366
<Disp Icon="Str" />

0 commit comments

Comments
 (0)