Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design-i18n into release/10.0

Conflicts: design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
5 years ago · 0959c7a045
6 changed files with 27 additions and 33 deletions
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
@ -1738,6 +1738,8 @@ Fine-Design_Report_Barcode_Size=
 Fine-Design_Report_Base_Background=
 Fine-Design_Report_Base_Columns=
 Fine-Design_Report_Base_Format=
+Fine-Design_Report_Base_Option=
+Fine-Design_Report_Base_Option_Half_Up=
 Fine-Design_Report_Base_Rows=
 Fine-Design_Report_Base_StyleFormat_Sample=
 Fine-Design_Report_Base_TurnOff=
@ -2560,7 +2562,4 @@ Fine-Designer_PC_Fit_Attr=
 Fine-Engine_Fit-Impl=
 Fine_Design_Basic_Engine_Event_After_Delete=
 Fine_Design_Basic_M_Data_Analysis=
-Fine_Design_Chart_Year=
-Fine-Design_Report_Base_Option=
-Fine-Design_Report_Base_Option_Half_Up=
-Fine-Design_Basic_Remote_Env_Remember_Password=
+Fine_Design_Chart_Year=
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
@ -1738,6 +1738,8 @@ Fine-Design_Report_Barcode_Size=Barcode Size
 Fine-Design_Report_Base_Background=Background
 Fine-Design_Report_Base_Columns=Column
 Fine-Design_Report_Base_Format=Format
+Fine-Design_Report_Base_Option=
+Fine-Design_Report_Base_Option_Half_Up=
 Fine-Design_Report_Base_Rows=Row
 Fine-Design_Report_Base_StyleFormat_Sample=Sample
 Fine-Design_Report_Base_TurnOff=Turn Off
@ -2560,7 +2562,4 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr
 Fine-Engine_Fit-Impl=Adaptive Plugin
 Fine_Design_Basic_Engine_Event_After_Delete=Delete After Row
 Fine_Design_Basic_M_Data_Analysis=Data Analysis
-Fine_Design_Chart_Year=Year
-Fine-Design_Report_Base_Option=
-Fine-Design_Report_Base_Option_Half_Up=
-Fine-Design_Basic_Remote_Env_Remember_Password=Remember password
+Fine_Design_Chart_Year=Year
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
@ -1115,19 +1115,19 @@ Fine-Design_Basic_Widget_Settings_Duplicate=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
 Fine-Design_Basic_Widget_Size=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u306E\u5927\u304D\u3055
 Fine-Design_Basic_Widget_Style_Preview=\u30D7\u30EC\u30D3\u30E5\u30FC
 Fine-Design_Basic_Widget_TreeNode=\u30C4\u30EA\u30FC\u30CE\u30FC\u30C9\u30DC\u30BF\u30F3
-Fine-Design_Basic_Widget_Type_Button=\u30DC\u30BF\u30F3\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
-Fine-Design_Basic_Widget_Type_Checkbox=\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9
-Fine-Design_Basic_Widget_Type_Checkbox_Group=\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9\u30B0\u30EB\u30FC\u30D7
+Fine-Design_Basic_Widget_Type_Button=\u30DC\u30BF\u30F3
+Fine-Design_Basic_Widget_Type_Checkbox=\u30C1\u30E3\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9
+Fine-Design_Basic_Widget_Type_Checkbox_Group=\u30C1\u30E3\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9\u30B0\u30EB\u30FC\u30D7
 Fine-Design_Basic_Widget_Type_Combo_Box=\u30D7\u30EB\u30C0\u30A6\u30F3\u30DC\u30C3\u30AF\u30B9
 Fine-Design_Basic_Widget_Type_Combo_Checkbox=\u30D7\u30EB\u30C0\u30A6\u30F3\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9
-Fine-Design_Basic_Widget_Type_Date=\u65E5\u4ED8\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
-Fine-Design_Basic_Widget_Type_File=\u30D5\u30A1\u30A4\u30EB\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
-Fine-Design_Basic_Widget_Type_Label=\u30E9\u30D9\u30EB\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
+Fine-Design_Basic_Widget_Type_Date=\u65E5\u4ED8
+Fine-Design_Basic_Widget_Type_File=\u30D5\u30A1\u30A4\u30EB
+Fine-Design_Basic_Widget_Type_Label=\u30E9\u30D9\u30EB
 Fine-Design_Basic_Widget_Type_List=\u30EA\u30B9\u30C8\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
-Fine-Design_Basic_Widget_Type_Number=\u6570\u5B57\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
-Fine-Design_Basic_Widget_Type_Password=\u30D1\u30B9\u30EF\u30FC\u30C9\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
+Fine-Design_Basic_Widget_Type_Number=\u6570\u5B57
+Fine-Design_Basic_Widget_Type_Password=\u30D1\u30B9\u30EF\u30FC\u30C9
 Fine-Design_Basic_Widget_Type_Radio_Group=\u30E9\u30B8\u30AA\u30DC\u30BF\u30F3\u30B0\u30EB\u30FC\u30D7
-Fine-Design_Basic_Widget_Type_Text=\u30C6\u30AD\u30B9\u30C8\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
+Fine-Design_Basic_Widget_Type_Text=\u30C6\u30AD\u30B9\u30C8
 Fine-Design_Basic_Widget_Type_Textarea=\u30C6\u30AD\u30B9\u30C8\u30A8\u30EA\u30A2
 Fine-Design_Basic_Widget_User_Defined_Widget_Config=\u4E8B\u524D\u5B9A\u7FA9\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
 Fine-Design_Basic_WorkBook=\u30EF\u30FC\u30AF\u30D6\u30C3\u30AF
@ -1738,6 +1738,8 @@ Fine-Design_Report_Barcode_Size=\u30D0\u30FC\u30B3\u30FC\u30C9\u306E\u5927\u304D
 Fine-Design_Report_Base_Background=\u80CC\u666F
 Fine-Design_Report_Base_Columns=\u5217
 Fine-Design_Report_Base_Format=\u66F8\u5F0F
+Fine-Design_Report_Base_Option=
+Fine-Design_Report_Base_Option_Half_Up=
 Fine-Design_Report_Base_Rows=\u884C
 Fine-Design_Report_Base_StyleFormat_Sample=\u4F8B
 Fine-Design_Report_Base_TurnOff=\u9589\u3058\u308B
@ -2560,7 +2562,4 @@ Fine-Designer_PC_Fit_Attr=PC\u5074\u306E\u9069\u5FDC\u30D7\u30ED\u30D1\u30C6\u30
 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u30D7\u30E9\u30B0\u30A4\u30F3
 Fine_Design_Basic_Engine_Event_After_Delete=\u884C\u524A\u9664\u5F8C
 Fine_Design_Basic_M_Data_Analysis=\u30C7\u30FC\u30BF\u5206\u6790
-Fine_Design_Chart_Year=\u5E74
-Fine-Design_Report_Base_Option=
-Fine-Design_Report_Base_Option_Half_Up=
-Fine-Design_Basic_Remote_Env_Remember_Password=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u899A\u3048\u308B
+Fine_Design_Chart_Year=\u5E74
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
@ -1738,6 +1738,8 @@ Fine-Design_Report_Barcode_Size=\uBC14\uCF54\uB4DC \uC0AC\uC774\uC988
 Fine-Design_Report_Base_Background=\uBC30\uACBD
 Fine-Design_Report_Base_Columns=\uCE7C\uB7FC
 Fine-Design_Report_Base_Format=\uD3EC\uBA67
+Fine-Design_Report_Base_Option=
+Fine-Design_Report_Base_Option_Half_Up=
 Fine-Design_Report_Base_Rows=\uD589
 Fine-Design_Report_Base_StyleFormat_Sample=\uC0D8\uD50C
 Fine-Design_Report_Base_TurnOff=\uB2EB\uAE30
@ -2560,7 +2562,4 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr
 Fine-Engine_Fit-Impl=\uC790\uCCB4 \uC801\uC751 \uD50C\uB7EC\uADF8\uC778
 Fine_Design_Basic_Engine_Event_After_Delete=\uD589\uC0AD\uC81C\uD6C4
 Fine_Design_Basic_M_Data_Analysis=\uB370\uC774\uD130\uBD84\uC11D
-Fine_Design_Chart_Year=\uB144
-Fine-Design_Report_Base_Option=
-Fine-Design_Report_Base_Option_Half_Up=
-Fine-Design_Basic_Remote_Env_Remember_Password=\uBE44\uBC00\uBC88\uD638 \uAE30\uC5B5\uD558\uAE30
+Fine_Design_Chart_Year=\uB144
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties
@ -1738,6 +1738,8 @@ Fine-Design_Report_Barcode_Size=\u6761\u5F62\u7801\u5927\u5C0F
 Fine-Design_Report_Base_Background=\u80CC\u666F
 Fine-Design_Report_Base_Columns=\u5217
 Fine-Design_Report_Base_Format=\u683C\u5F0F
+Fine-Design_Report_Base_Option=\u9009\u9879
+Fine-Design_Report_Base_Option_Half_Up=\u56DB\u820D\u4E94\u5165
 Fine-Design_Report_Base_Rows=\u884C
 Fine-Design_Report_Base_StyleFormat_Sample=\u793A\u4F8B
 Fine-Design_Report_Base_TurnOff=\u5173\u95ED
@ -2560,7 +2562,4 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9002\u5E94\u5C5E\u6027
 Fine-Engine_Fit-Impl=\u81EA\u9002\u5E94\u63D2\u4EF6
 Fine_Design_Basic_Engine_Event_After_Delete=\u5220\u9664\u884C\u540E
 Fine_Design_Basic_M_Data_Analysis=\u6570\u636E\u5206\u6790
-Fine_Design_Chart_Year=\u5E74
-Fine-Design_Report_Base_Option=\u9009\u9879
-Fine-Design_Report_Base_Option_Half_Up=\u56DB\u820D\u4E94\u5165
-Fine-Design_Basic_Remote_Env_Remember_Password=\u8BB0\u4F4F\u5BC6\u7801
+Fine_Design_Chart_Year=\u5E74
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
@ -1738,6 +1738,8 @@ Fine-Design_Report_Barcode_Size=\u689D\u78BC\u5927\u5C0F
 Fine-Design_Report_Base_Background=\u80CC\u666F
 Fine-Design_Report_Base_Columns=\u884C
 Fine-Design_Report_Base_Format=\u683C\u5F0F
+Fine-Design_Report_Base_Option=
+Fine-Design_Report_Base_Option_Half_Up=
 Fine-Design_Report_Base_Rows=\u5217
 Fine-Design_Report_Base_StyleFormat_Sample=\u793A\u4F8B
 Fine-Design_Report_Base_TurnOff=\u95DC\u9589
@ -2560,7 +2562,4 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9069\u61C9\u5C6C\u6027
 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u63D2\u4EF6
 Fine_Design_Basic_Engine_Event_After_Delete=\u522A\u9664\u5217\u5F8C
 Fine_Design_Basic_M_Data_Analysis=\u8CC7\u6599\u5206\u6790
-Fine_Design_Chart_Year=\u5E74
-Fine-Design_Report_Base_Option=
-Fine-Design_Report_Base_Option_Half_Up=
-Fine-Design_Basic_Remote_Env_Remember_Password=\u8A18\u4F4F\u5BC6\u78BC
+Fine_Design_Chart_Year=\u5E74