Skip to content

Commit b5f292d

Browse files
csigscsigs
authored
LEGO: Merge pull request 19540
LEGO: Merge pull request 19540
2 parents 3255382 + 8ce740d commit b5f292d

File tree

4 files changed

+116
-32
lines changed

4 files changed

+116
-32
lines changed

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

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -827,10 +827,13 @@
827827
</Item>
828828
<Item ItemId=";Add_0_to_existing_import_declaration_from_1_90015" ItemType="0" PsrId="306" Leaf="true">
829829
<Str Cat="Text">
830-
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
830+
<Val><![CDATA[Add '{0}' to existing import declaration from "{1}".]]></Val>
831831
<Tgt Cat="Text" Stat="Loc" Orig="New">
832-
<Val><![CDATA["{0}" zur vorhandenen Importdeklaration aus "{1}" hinzufügen.]]></Val>
832+
<Val><![CDATA[Fügen Sie "{0}" zur vorhandenen Importdeklaration aus "{1}" hinzu.]]></Val>
833833
</Tgt>
834+
<Prev Cat="Text">
835+
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
836+
</Prev>
834837
</Str>
835838
<Disp Icon="Str" />
836839
</Item>
@@ -2886,6 +2889,15 @@
28862889
</Str>
28872890
<Disp Icon="Str" />
28882891
</Item>
2892+
<Item ItemId=";Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027" ItemType="0" PsrId="306" Leaf="true">
2893+
<Str Cat="Text">
2894+
<Val><![CDATA[Expected {0}-{1} type arguments; provide these with an '@extends' tag.]]></Val>
2895+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2896+
<Val><![CDATA[{0}-{1} Typargumente erwartet; geben Sie diese mit einem @extends-Tag an.]]></Val>
2897+
</Tgt>
2898+
</Str>
2899+
<Disp Icon="Str" />
2900+
</Item>
28892901
<Item ItemId=";Expected_0_arguments_but_got_1_2554" ItemType="0" PsrId="306" Leaf="true">
28902902
<Str Cat="Text">
28912903
<Val><![CDATA[Expected {0} arguments, but got {1}.]]></Val>
@@ -2913,6 +2925,15 @@
29132925
</Str>
29142926
<Disp Icon="Str" />
29152927
</Item>
2928+
<Item ItemId=";Expected_0_type_arguments_provide_these_with_an_extends_tag_8026" ItemType="0" PsrId="306" Leaf="true">
2929+
<Str Cat="Text">
2930+
<Val><![CDATA[Expected {0} type arguments; provide these with an '@extends' tag.]]></Val>
2931+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2932+
<Val><![CDATA[{0} Typargumente erwartet; geben Sie diese mit einem @extends-Tag an.]]></Val>
2933+
</Tgt>
2934+
</Str>
2935+
<Disp Icon="Str" />
2936+
</Item>
29162937
<Item ItemId=";Expected_at_least_0_arguments_but_got_1_2555" ItemType="0" PsrId="306" Leaf="true">
29172938
<Str Cat="Text">
29182939
<Val><![CDATA[Expected at least {0} arguments, but got {1}.]]></Val>
@@ -3665,10 +3686,13 @@
36653686
</Item>
36663687
<Item ItemId=";Import_0_from_1_90013" ItemType="0" PsrId="306" Leaf="true">
36673688
<Str Cat="Text">
3668-
<Val><![CDATA[Import {0} from {1}.]]></Val>
3689+
<Val><![CDATA[Import '{0}' from "{1}".]]></Val>
36693690
<Tgt Cat="Text" Stat="Loc" Orig="New">
3670-
<Val><![CDATA["{0}" aus "{1}" importieren.]]></Val>
3691+
<Val><![CDATA[Importieren Sie "{0}" aus "{1}".]]></Val>
36713692
</Tgt>
3693+
<Prev Cat="Text">
3694+
<Val><![CDATA[Import {0} from {1}.]]></Val>
3695+
</Prev>
36723696
</Str>
36733697
<Disp Icon="Str" />
36743698
</Item>
@@ -6339,11 +6363,11 @@
63396363
</Str>
63406364
<Disp Icon="Str" />
63416365
</Item>
6342-
<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">
6366+
<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">
63436367
<Str Cat="Text">
6344-
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' must be of type '{1}', but here has type '{2}'.]]></Val>
6368+
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' has type '{1}' at {2}, but here has type '{3}'.]]></Val>
63456369
<Tgt Cat="Text" Stat="Loc" Orig="New">
6346-
<Val><![CDATA[Nachfolgende Variablendeklarationen müssen den gleichen Typ aufweisen. Die Variable "{0}" muss den Typ "{1}" aufweisen, ist hier aber vom Typ "{2}".]]></Val>
6370+
<Val><![CDATA[Nachfolgende Variablendeklarationen müssen den gleichen Typ aufweisen. Die Variable "{0}" muss bei "{2}" den Typ "{1}" aufweisen, ist hier aber vom Typ "{3}".]]></Val>
63476371
</Tgt>
63486372
</Str>
63496373
<Disp Icon="Str" />

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

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -839,12 +839,12 @@
839839
</Item>
840840
<Item ItemId=";Add_0_to_existing_import_declaration_from_1_90015" ItemType="0" PsrId="306" Leaf="true">
841841
<Str Cat="Text">
842-
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
842+
<Val><![CDATA[Add '{0}' to existing import declaration from "{1}".]]></Val>
843843
<Tgt Cat="Text" Stat="Loc" Orig="New">
844-
<Val><![CDATA[Ajoutez {0} à une déclaration d'importation existante à partir de {1}.]]></Val>
844+
<Val><![CDATA[Ajoutez '{0}' à une déclaration d'importation existante à partir de "{1}".]]></Val>
845845
</Tgt>
846846
<Prev Cat="Text">
847-
<Val><![CDATA[Add {0} to existing import declaration from {1}]]></Val>
847+
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
848848
</Prev>
849849
</Str>
850850
<Disp Icon="Str" />
@@ -2907,6 +2907,15 @@
29072907
</Str>
29082908
<Disp Icon="Str" />
29092909
</Item>
2910+
<Item ItemId=";Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027" ItemType="0" PsrId="306" Leaf="true">
2911+
<Str Cat="Text">
2912+
<Val><![CDATA[Expected {0}-{1} type arguments; provide these with an '@extends' tag.]]></Val>
2913+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2914+
<Val><![CDATA[Arguments de type {0}-{1} attendus ; indiquez-les avec la balise '@extends'.]]></Val>
2915+
</Tgt>
2916+
</Str>
2917+
<Disp Icon="Str" />
2918+
</Item>
29102919
<Item ItemId=";Expected_0_arguments_but_got_1_2554" ItemType="0" PsrId="306" Leaf="true">
29112920
<Str Cat="Text">
29122921
<Val><![CDATA[Expected {0} arguments, but got {1}.]]></Val>
@@ -2934,6 +2943,15 @@
29342943
</Str>
29352944
<Disp Icon="Str" />
29362945
</Item>
2946+
<Item ItemId=";Expected_0_type_arguments_provide_these_with_an_extends_tag_8026" ItemType="0" PsrId="306" Leaf="true">
2947+
<Str Cat="Text">
2948+
<Val><![CDATA[Expected {0} type arguments; provide these with an '@extends' tag.]]></Val>
2949+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2950+
<Val><![CDATA[Arguments de type {0} attendus ; indiquez-les avec la balise '@extends'.]]></Val>
2951+
</Tgt>
2952+
</Str>
2953+
<Disp Icon="Str" />
2954+
</Item>
29372955
<Item ItemId=";Expected_at_least_0_arguments_but_got_1_2555" ItemType="0" PsrId="306" Leaf="true">
29382956
<Str Cat="Text">
29392957
<Val><![CDATA[Expected at least {0} arguments, but got {1}.]]></Val>
@@ -3689,12 +3707,12 @@
36893707
</Item>
36903708
<Item ItemId=";Import_0_from_1_90013" ItemType="0" PsrId="306" Leaf="true">
36913709
<Str Cat="Text">
3692-
<Val><![CDATA[Import {0} from {1}.]]></Val>
3710+
<Val><![CDATA[Import '{0}' from "{1}".]]></Val>
36933711
<Tgt Cat="Text" Stat="Loc" Orig="New">
3694-
<Val><![CDATA[Importez {0} à partir de {1}.]]></Val>
3712+
<Val><![CDATA[Importez '{0}' à partir de "{1}".]]></Val>
36953713
</Tgt>
36963714
<Prev Cat="Text">
3697-
<Val><![CDATA[Import {0} from {1}]]></Val>
3715+
<Val><![CDATA[Import {0} from {1}.]]></Val>
36983716
</Prev>
36993717
</Str>
37003718
<Disp Icon="Str" />
@@ -6375,11 +6393,11 @@
63756393
</Str>
63766394
<Disp Icon="Str" />
63776395
</Item>
6378-
<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">
6396+
<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">
63796397
<Str Cat="Text">
6380-
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' must be of type '{1}', but here has type '{2}'.]]></Val>
6398+
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' has type '{1}' at {2}, but here has type '{3}'.]]></Val>
63816399
<Tgt Cat="Text" Stat="Loc" Orig="New">
6382-
<Val><![CDATA[Les déclarations de variable ultérieures doivent avoir le même type. La variable '{0}' doit être de type '{1}', mais elle a ici le type '{2}'.]]></Val>
6400+
<Val><![CDATA[Les déclarations de variables ultérieures doivent avoir le même type. La variable '{0}' a le type '{1}' au niveau de {2}, mais ici elle a le type '{3}'.]]></Val>
63836401
</Tgt>
63846402
</Str>
63856403
<Disp Icon="Str" />

‎src/loc/lcl/ptb/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[Adicionar {0} à declaração de importação existente de {1}.]]></Val>
825+
<Val><![CDATA[Adicione "{0}" à declaração de importação existente de "{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[Espera-se {0}-{1} argumentos de tipo; forneça esses recursos com uma marca "@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[Espera-se {0} argumentos de tipo; forneça esses recursos com uma marca "@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[Importar {0} de {1}.]]></Val>
3684+
<Val><![CDATA[Importar "{0}" de "{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[Declarações de variável subsequentes devem ter o mesmo tipo. A variável '{0}' deve ser do tipo '{1}', mas aqui tem o tipo '{2}'.]]></Val>
6363+
<Val><![CDATA[Declarações de variável subsequentes devem ter o mesmo tipo. A variável "{0}" deve ser do tipo "{1}" em {2}, mas aqui tem o tipo "{3}".]]></Val>
63406364
</Tgt>
63416365
</Str>
63426366
<Disp Icon="Str" />

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

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -829,12 +829,12 @@
829829
</Item>
830830
<Item ItemId=";Add_0_to_existing_import_declaration_from_1_90015" ItemType="0" PsrId="306" Leaf="true">
831831
<Str Cat="Text">
832-
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
832+
<Val><![CDATA[Add '{0}' to existing import declaration from "{1}".]]></Val>
833833
<Tgt Cat="Text" Stat="Loc" Orig="New">
834-
<Val><![CDATA[Добавьте {0} в существующее объявление импорта из {1}.]]></Val>
834+
<Val><![CDATA[Добавьте "{0}" в существующее объявление импорта из "{1}".]]></Val>
835835
</Tgt>
836836
<Prev Cat="Text">
837-
<Val><![CDATA[Add {0} to existing import declaration from {1}]]></Val>
837+
<Val><![CDATA[Add {0} to existing import declaration from {1}.]]></Val>
838838
</Prev>
839839
</Str>
840840
<Disp Icon="Str" />
@@ -2897,6 +2897,15 @@
28972897
</Str>
28982898
<Disp Icon="Str" />
28992899
</Item>
2900+
<Item ItemId=";Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027" ItemType="0" PsrId="306" Leaf="true">
2901+
<Str Cat="Text">
2902+
<Val><![CDATA[Expected {0}-{1} type arguments; provide these with an '@extends' tag.]]></Val>
2903+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2904+
<Val><![CDATA[Ожидается аргументов типа: {0}–{1}. Укажите их с тегом "@extends".]]></Val>
2905+
</Tgt>
2906+
</Str>
2907+
<Disp Icon="Str" />
2908+
</Item>
29002909
<Item ItemId=";Expected_0_arguments_but_got_1_2554" ItemType="0" PsrId="306" Leaf="true">
29012910
<Str Cat="Text">
29022911
<Val><![CDATA[Expected {0} arguments, but got {1}.]]></Val>
@@ -2924,6 +2933,15 @@
29242933
</Str>
29252934
<Disp Icon="Str" />
29262935
</Item>
2936+
<Item ItemId=";Expected_0_type_arguments_provide_these_with_an_extends_tag_8026" ItemType="0" PsrId="306" Leaf="true">
2937+
<Str Cat="Text">
2938+
<Val><![CDATA[Expected {0} type arguments; provide these with an '@extends' tag.]]></Val>
2939+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2940+
<Val><![CDATA[Ожидается аргументов типа: {0}. Укажите их с тегом "@extends".]]></Val>
2941+
</Tgt>
2942+
</Str>
2943+
<Disp Icon="Str" />
2944+
</Item>
29272945
<Item ItemId=";Expected_at_least_0_arguments_but_got_1_2555" ItemType="0" PsrId="306" Leaf="true">
29282946
<Str Cat="Text">
29292947
<Val><![CDATA[Expected at least {0} arguments, but got {1}.]]></Val>
@@ -3679,12 +3697,12 @@
36793697
</Item>
36803698
<Item ItemId=";Import_0_from_1_90013" ItemType="0" PsrId="306" Leaf="true">
36813699
<Str Cat="Text">
3682-
<Val><![CDATA[Import {0} from {1}.]]></Val>
3700+
<Val><![CDATA[Import '{0}' from "{1}".]]></Val>
36833701
<Tgt Cat="Text" Stat="Loc" Orig="New">
3684-
<Val><![CDATA[Импортируйте {0} из {1}.]]></Val>
3702+
<Val><![CDATA[Импортируйте "{0}" из "{1}".]]></Val>
36853703
</Tgt>
36863704
<Prev Cat="Text">
3687-
<Val><![CDATA[Import {0} from {1}]]></Val>
3705+
<Val><![CDATA[Import {0} from {1}.]]></Val>
36883706
</Prev>
36893707
</Str>
36903708
<Disp Icon="Str" />
@@ -6365,11 +6383,11 @@
63656383
</Str>
63666384
<Disp Icon="Str" />
63676385
</Item>
6368-
<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">
6386+
<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">
63696387
<Str Cat="Text">
6370-
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' must be of type '{1}', but here has type '{2}'.]]></Val>
6388+
<Val><![CDATA[Subsequent variable declarations must have the same type. Variable '{0}' has type '{1}' at {2}, but here has type '{3}'.]]></Val>
63716389
<Tgt Cat="Text" Stat="Loc" Orig="New">
6372-
<Val><![CDATA[Последующие объявления переменных должны иметь тот же тип. Переменная "{0}" должна иметь тип "{1}", однако имеет тип "{2}".]]></Val>
6390+
<Val><![CDATA[Последующие объявления переменных должны иметь тот же тип. Переменная "{0}" должна иметь тип "{1}" в {2}, но имеет тип "{3}".]]></Val>
63736391
</Tgt>
63746392
</Str>
63756393
<Disp Icon="Str" />

0 commit comments

Comments
 (0)