Merge pull request #1168 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit 'beb02efe911820ec7bd550df2376e2b9fedfc75f': REPORT-3862 （国际化）[9.0一轮回归]英文操作系统FR设计器条件属性添加界面无加号只有一个白框
7 years ago · e844f540d6
5 changed files with 14 additions and 5 deletions
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@ -2133,3 +2133,6 @@ FR-Designer-Basic_Dynamic_Parameter_Injection=Injection
 FR-Designer_Label=
 FR-Designer_Widgetname=Widget Name
 FR-Designer_Insert_Cell_Element=Insert Cell Element
+FR-Designer_Add_Condition=Add Condition
+FR-Designer_Use_Params_Template=use parameter template
+FR-Designer_Label_Name=label name
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@ -2129,3 +2129,6 @@ FR-Designer-Basic_Dynamic_Parameter_Injection=Injection
 FR-Designer_Label=Label
 FR-Designer_Widgetname=Widget Name
 FR-Designer_Insert_Cell_Element=Insert Cell Element
+FR-Designer_Add_Condition=Add Condition
+FR-Designer_Use_Params_Template=use parameter template
+FR-Designer_Label_Name=label name
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@ -2123,7 +2123,8 @@ FR-Designer_Mobile-Height-Percent=
 FR-Designer_Mobile-Height-Limit=
 FR-Designer-Download_Online_Sources=
 FR-Designer_Select_Color=
-FR-Designer-Basic_Dynamic_Parameter_Injection=\ 
+FR-Designer-Basic_Dynamic_Parameter_Injection=
 FR-Designer_Label=\u30E9\u30D9\u30EBa
 FR-Designer_Widgetname=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u540D
-FR-Designer_Insert_Cell_Element=\ 
+FR-Designer_Insert_Cell_Element=
+FR-Designer_Add_Condition=
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@ -2127,4 +2127,5 @@ FR-Designer_Select_Color=
 FR-Designer-Basic_Dynamic_Parameter_Injection=
 FR-Designer_Label=\uB808\uC774\uBE14
 FR-Designer_Widgetname=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC774\uB984
-FR-Designer_Insert_Cell_Element=\ 
+FR-Designer_Insert_Cell_Element=
+FR-Designer_Add_Condition=
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@ -2132,3 +2132,4 @@ FR-Designer-Basic_Dynamic_Parameter_Injection=\u6CE8\u5165
 FR-Designer_Label=\u6A19\u7C3D
 FR-Designer_Widgetname=\u63A7\u5236\u9805\u540D
 FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20
+FR-Designer_Add_Condition=