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

4 years ago · 328a9cda3f
12 changed files with 22 additions and 10 deletions
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=
 Fine-Engine_Chart_New_Scatter=
 Fine-Engine_Chart_New_Structure=
 Fine-Engine_Chart_New_TreeMap=
-Fine-Engine_Chart_WordCloud_New=
+Fine-Engine_Chart_WordCloud_New=
+Fine-Design_Chart_Match_Default_Color_Scheme=
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=Radar Chart
 Fine-Engine_Chart_New_Scatter=Scatter Plot
 Fine-Engine_Chart_New_Structure=Structure Chart
 Fine-Engine_Chart_New_TreeMap=Rctangular Tree Map
-Fine-Engine_Chart_WordCloud_New=Word Cloud
+Fine-Engine_Chart_WordCloud_New=Word Cloud
+Fine-Design_Chart_Match_Default_Color_Scheme=
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=\u30EC\u30FC\u30C0\u30FC\u30C1\u30E3\u30FC(\u65B0\u6
 Fine-Engine_Chart_New_Scatter=\u6563\u5E03\u56F3(\u65B0\u6A5F\u80FD)
 Fine-Engine_Chart_New_Structure=\u6A39\u5F62\u56F3(\u65B0\u6A5F\u80FD)
 Fine-Engine_Chart_New_TreeMap=\u30C4\u30EA\u30FC\u30DE\u30C3\u30D7(\u65B0\u6A5F\u80FD)
-Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD)
+Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD)
+Fine-Design_Chart_Match_Default_Color_Scheme=
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=\uB808\uC774\uB354
 Fine-Engine_Chart_New_Scatter=\uC0B0\uCC45 \uC880 \uADF8\uB798\uD504
 Fine-Engine_Chart_New_Structure=\uAD6C\uC870\uB3C4(new)
 Fine-Engine_Chart_New_TreeMap=\uC0AC\uAC01\uD615 \uB098\uBB34 \uADF8\uB9BC
-Fine-Engine_Chart_WordCloud_New=Word Cloud
+Fine-Engine_Chart_WordCloud_New=Word Cloud
+Fine-Design_Chart_Match_Default_Color_Scheme=
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=\u96F7\u8FBE\u56FE
 Fine-Engine_Chart_New_Scatter=\u6563\u70B9\u56FE
 Fine-Engine_Chart_New_Structure=\u6846\u67B6\u56FE
 Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6811\u56FE
-Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91
+Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91
+Fine-Design_Chart_Match_Default_Color_Scheme=\u9ED8\u8BA4\u914D\u8272\u65B9\u6848
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
@ -226,7 +226,7 @@ Fine-Design_Chart_Gauge_Pointer=\u591A\u6307\u91DD\u7684\u5100\u9336\u76E4360\u5
 Fine-Design_Chart_Gauge_Pointer180=\u591A\u6307\u91DD\u7684\u5100\u9336\u76E4180\u5EA6
 Fine-Design_Chart_Gauge_Ring=\u767E\u5206\u6BD4\u5713\u74B0\u5100\u9336\u76E4
 Fine-Design_Chart_Gauge_Slot=\u767E\u5206\u6BD4\u523B\u5EA6\u69FD\u578B\u5100\u9336\u76E4
-Fine-Design_Chart_Generate_Recommended_Chart=
+Fine-Design_Chart_Generate_Recommended_Chart=\u6B63\u5728\u751F\u6210\u63A8\u85A6\u5716\u8868
 Fine-Design_Chart_Geographic=\u5730\u7406\u8CC7\u8A0A
 Fine-Design_Chart_Gis_Layer=GIS\u5716\u5C64
 Fine-Design_Chart_Gradient_Direction=\u6F38\u8B8A\u65B9\u5411
@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=\u96F7\u9054\u5716
 Fine-Engine_Chart_New_Scatter=\u6563\u9EDE\u5716
 Fine-Engine_Chart_New_Structure=\u6846\u67B6\u5716
 Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6A39\u5716
-Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2
+Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2
+Fine-Design_Chart_Match_Default_Color_Scheme=
--- 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
@ -637,6 +637,7 @@ Fine-Design_Basic_Normal=
 Fine-Design_Basic_Not_Null_Des=
 Fine-Design_Basic_Not_Support_Authority_Edit=
 Fine-Design_Basic_OccurrenceOf=
+Fine-Design_Basic_Odbc_Tips=
 Fine-Design_Basic_Official_Website=
 Fine-Design_Basic_Ok=
 Fine-Design_Basic_Only_Submit_Current_Sheet=
--- 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
@ -637,6 +637,7 @@ Fine-Design_Basic_Normal=Normal
 Fine-Design_Basic_Not_Null_Des=NOT NULL
 Fine-Design_Basic_Not_Support_Authority_Edit=This element does not support access control
 Fine-Design_Basic_OccurrenceOf=When "{0}" Occurs
+Fine-Design_Basic_Odbc_Tips=How to connect ODBC data source
 Fine-Design_Basic_Official_Website=Official Website:
 Fine-Design_Basic_Ok=OK
 Fine-Design_Basic_Only_Submit_Current_Sheet=Submit Current Sheet Only
@ -1787,7 +1788,7 @@ Fine-Design_Report_Cancel_Repeat_Attributes=Cancel duplicate rows and columns
 Fine-Design_Report_CellElement_Property_Table=Cell Attribute Table
 Fine-Design_Report_CellPage_Can_Break_On_Paginate=Can break when paging
 Fine-Design_Report_CellPage_Repeat_Content_When_Paging=Repeat content when paging
-Fine-Design_Report_CellWrite_InsertRow_COPY=Original Value
+Fine-Design_Report_CellWrite_InsertRow_COPY=Original
 Fine-Design_Report_CellWrite_InsertRow_NULL=NULL
 Fine-Design_Report_CellWrite_InsertRow_Policy=Insert Row Policy
 Fine-Design_Report_CellWrite_Page_After_Column=Paginate After Column
@ -2131,7 +2132,7 @@ Fine-Design_Report_Mobile_ToolBar=Toolbar
 Fine-Design_Report_Mobile_Vertical=Vertical Screen
 Fine-Design_Report_Mobile_Zoom=Zoom
 Fine-Design_Report_NS_Exception_ReadError=Error code:11300005 Template file parsing error
-Fine-Design_Report_New_Value=New Value
+Fine-Design_Report_New_Value=New
 Fine-Design_Report_No=No
 Fine-Design_Report_No_Auto_Adjust=No Automatic Adjustment
 Fine-Design_Report_No_Border_Line=No Border
--- 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
@ -637,6 +637,7 @@ Fine-Design_Basic_Normal=\u6B63\u5E38
 Fine-Design_Basic_Not_Null_Des=\u7A7A\u767D\u4E0D\u53EF
 Fine-Design_Basic_Not_Support_Authority_Edit=\u3053\u306E\u8981\u7D20\u306F\u6A29\u9650\u5236\u5FA1\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093
 Fine-Design_Basic_OccurrenceOf=\u51FA\u73FE\u56DE\u6570 "{0}"
+Fine-Design_Basic_Odbc_Tips=\u5982\u4F55\u306BODBS\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u63A5\u7D9A\u3059\u308B\u304B
 Fine-Design_Basic_Official_Website=\u516C\u5F0F\u30B5\u30A4\u30C8\uFF1A
 Fine-Design_Basic_Ok=\u306F\u3044
 Fine-Design_Basic_Only_Submit_Current_Sheet=\u5F53\u8A72sheet\u306E\u307F\u3092\u9001\u4FE1\u3059\u308B
@ -1527,7 +1528,7 @@ Fine-Design_Form_ToolBar_Widget=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
 Fine-Design_Form_Toolbar_Custom_Button=\u30AB\u30B9\u30BF\u30E0\u30DC\u30BF\u30F3
 Fine-Design_Form_Toolbar_Setting=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30C4\u30FC\u30EB\u30D0\u30FC\u8A2D\u5B9A
 Fine-Design_Form_Total=\u5408\u8A08
-Fine-Design_Form_Use_Params_Template=\u3088\u304F\u4F7F\u308F\u308C\u308B\u30D1\u30E9\u30E1\u30FC\u30BF\u7D44
+Fine-Design_Form_Use_Params_Template=\u3088\u304F\u4F7F\u308F\u308C\u308B\u691C\u7D22\u6761\u4EF6
 Fine-Design_Form_Using_Server_Report_View_Settings=\u30B5\u30FC\u30D0\u8A2D\u5B9A
 Fine-Design_Form_Verify_Message=\u30A8\u30E9\u30FC\u30E1\u30C3\u30BB\u30FC\u30B8
 Fine-Design_Form_Vertical_Box_Layout=\u5782\u76F4\u30DC\u30C3\u30AF\u30B9\u30EC\u30A4\u30A2\u30A6\u30C8
--- 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
@ -637,6 +637,7 @@ Fine-Design_Basic_Normal=\uC815\uC0C1
 Fine-Design_Basic_Not_Null_Des=NOT NULL
 Fine-Design_Basic_Not_Support_Authority_Edit=\uD574\uB2F9 \uC694\uC18C\uB294 \uAD8C\uD55C \uC81C\uC5B4\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 Fine-Design_Basic_OccurrenceOf="{0}" \uBC1C\uC0DD
+Fine-Design_Basic_Odbc_Tips=ODBC \uB370\uC774\uD130 \uC18C\uC2A4\uB97C \uC5F0\uACB0\uD558\uB294 \uBC29\uBC95
 Fine-Design_Basic_Official_Website=\uACF5\uC2DD \uC6F9\uC0AC\uC774\uD2B8:
 Fine-Design_Basic_Ok=\u597D
 Fine-Design_Basic_Only_Submit_Current_Sheet=\uD604\uC7AC sheet\uB9CC \uC81C\uCD9C
--- 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
@ -637,6 +637,7 @@ Fine-Design_Basic_Normal=\u6B63\u5E38
 Fine-Design_Basic_Not_Null_Des=\u4E0D\u80FD\u4E3A\u7A7A
 Fine-Design_Basic_Not_Support_Authority_Edit=\u8BE5\u5143\u7D20\u4E0D\u652F\u6301\u6743\u9650\u63A7\u5236
 Fine-Design_Basic_OccurrenceOf=\u6709"{0}"\u51FA\u73B0
+Fine-Design_Basic_Odbc_Tips=\u5982\u4F55\u8FDE\u63A5ODBC\u6570\u636E\u6E90
 Fine-Design_Basic_Official_Website=\u5B98\u65B9\u7F51\u7AD9\uFF1A
 Fine-Design_Basic_Ok=\u597D
 Fine-Design_Basic_Only_Submit_Current_Sheet=\u53EA\u63D0\u4EA4\u5F53\u524Dsheet
--- 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
@ -637,6 +637,7 @@ Fine-Design_Basic_Normal=\u6B63\u5E38
 Fine-Design_Basic_Not_Null_Des=\u4E0D\u80FD\u70BA\u7A7A
 Fine-Design_Basic_Not_Support_Authority_Edit=\u8A72\u5143\u7D20\u4E0D\u652F\u63F4\u6B0A\u9650\u63A7\u5236
 Fine-Design_Basic_OccurrenceOf=\u6709"{0}"\u51FA\u73FE
+Fine-Design_Basic_Odbc_Tips=\u5982\u4F55\u9023\u7D50ODBC\u8CC7\u6599\u4F86\u6E90
 Fine-Design_Basic_Official_Website=\u5B98\u65B9\u7DB2\u7AD9\uFF1A
 Fine-Design_Basic_Ok=\u597D
 Fine-Design_Basic_Only_Submit_Current_Sheet=\u53EA\u63D0\u4EA4\u7576\u524DSHEET