无jira 解决冲突

4 years ago · 7d3d289bd1
6 changed files with 6 additions and 6 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
@ -131,7 +131,6 @@ Fine-Design_Chart_Curve=
 Fine-Design_Chart_CurveLine=
 Fine-Design_Chart_Curve_Line=
 Fine-Design_Chart_Curve_Smooth=
-Fine-Design_Chart_Text_Orientation=
 Fine-Design_Chart_Custom=
 Fine-Design_Chart_Custom_Axis=
 Fine-Design_Chart_Custom_Color=
@ -509,6 +508,7 @@ Fine-Design_Chart_Result_Data=
 Fine-Design_Chart_Reversal=
 Fine-Design_Chart_Rich_Text=
 Fine-Design_Chart_Rich_Text_Edit=
+Fine-Design_Chart_Text_Orientation=
 Fine-Design_Chart_Right_Boundary=
 Fine-Design_Chart_Right_Top=
 Fine-Design_Chart_Rotation=
--- 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
@ -131,7 +131,6 @@ Fine-Design_Chart_Curve=Curve
 Fine-Design_Chart_CurveLine=Curve Line
 Fine-Design_Chart_Curve_Line=Smooth Curve
 Fine-Design_Chart_Curve_Smooth=Smooth Curve
-Fine-Design_Chart_Text_Orientation=Text orientation
 Fine-Design_Chart_Custom=Custom
 Fine-Design_Chart_Custom_Axis=Custom Axis
 Fine-Design_Chart_Custom_Color=Combination Color
@ -509,6 +508,7 @@ Fine-Design_Chart_Result_Data=Result data
 Fine-Design_Chart_Reversal=Reversal
 Fine-Design_Chart_Rich_Text=Rich Text
 Fine-Design_Chart_Rich_Text_Edit=Rich Text Edit
+Fine-Design_Chart_Text_Orientation=Text orientation
 Fine-Design_Chart_Right_Boundary=Right Boundary
 Fine-Design_Chart_Right_Top=Upper Right
 Fine-Design_Chart_Rotation=Rotatable
--- 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
@ -131,7 +131,6 @@ Fine-Design_Chart_Curve=\u66F2\u7DDA
 Fine-Design_Chart_CurveLine=\u66F2\u7DDA
 Fine-Design_Chart_Curve_Line=\u6ED1\u3089\u304B\u306A\u66F2\u7DDA
 Fine-Design_Chart_Curve_Smooth=\u6ED1\u3089\u304B\u306A\u66F2\u7DDA
-Fine-Design_Chart_Text_Orientation=\u30C6\u30AD\u30B9\u30C8\u306E\u65B9\u5411
 Fine-Design_Chart_Custom=\u30AB\u30B9\u30BF\u30E0
 Fine-Design_Chart_Custom_Axis=\u30AB\u30B9\u30BF\u30E0\u5EA7\u6A19\u8EF8
 Fine-Design_Chart_Custom_Color=\u30B3\u30F3\u30D3\u30CD\u30FC\u30B7\u30E7\u30F3\u30AB\u30E9\u30FC
@ -509,6 +508,7 @@ Fine-Design_Chart_Result_Data=\u7D50\u679C\u30C7\u30FC\u30BF
 Fine-Design_Chart_Reversal=\u53CD\u8EE2
 Fine-Design_Chart_Rich_Text=\u30EA\u30C3\u30C1\u30C6\u30AD\u30B9\u30C8
 Fine-Design_Chart_Rich_Text_Edit=\u30EA\u30C3\u30C1\u30C6\u30AD\u30B9\u30C8\u7DE8\u96C6
+Fine-Design_Chart_Text_Orientation=\u30C6\u30AD\u30B9\u30C8\u306E\u65B9\u5411
 Fine-Design_Chart_Right_Boundary=\u53F3\u5883\u754C
 Fine-Design_Chart_Right_Top=\u53F3\u4E0A
 Fine-Design_Chart_Rotation=\u56DE\u8EE2\u53EF\u80FD
--- 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
@ -131,7 +131,6 @@ Fine-Design_Chart_Curve=\uACE1\uC120
 Fine-Design_Chart_CurveLine=\uACE1\uC120
 Fine-Design_Chart_Curve_Line=\uBD80\uB4DC\uB7EC\uC6B4 \uACE1\uC120
 Fine-Design_Chart_Curve_Smooth=\uBD80\uB4DC\uB7EC\uC6B4 \uACE1\uC120
-Fine-Design_Chart_Text_Orientation=\uD14D\uC2A4\uD2B8 \uBC29\uD5A5
 Fine-Design_Chart_Custom=\uCEE4\uC2A4\uD140
 Fine-Design_Chart_Custom_Axis=\uCEE4\uC2A4\uD140 \uC88C\uD45C\uCD95
 Fine-Design_Chart_Custom_Color=\uC870\uD569\uC0C9
@ -509,6 +508,7 @@ Fine-Design_Chart_Result_Data=\uACB0\uACFC \uB370\uC774\uD130
 Fine-Design_Chart_Reversal=\uD68C\uC804
 Fine-Design_Chart_Rich_Text=\uC11C\uC2DD\uC788\uB294 \uD14D\uC2A4\uD2B8
 Fine-Design_Chart_Rich_Text_Edit=\uC11C\uC2DD\uC788\uB294 \uD14D\uC2A4\uD2B8 \uD3B8\uC9D1
+Fine-Design_Chart_Text_Orientation=\uD14D\uC2A4\uD2B8 \uBC29\uD5A5
 Fine-Design_Chart_Right_Boundary=\uC624\uB978\uCABD \uBCC0\uB450\uB9AC
 Fine-Design_Chart_Right_Top=\uC624\uB978\uCABD\uC704
 Fine-Design_Chart_Rotation=\uD68C\uC804\uAC00\uB2A5
--- 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
@ -131,7 +131,6 @@ Fine-Design_Chart_Curve=\u66F2\u7EBF
 Fine-Design_Chart_CurveLine=\u66F2\u7EBF
 Fine-Design_Chart_Curve_Line=\u5149\u6ED1\u66F2\u7EBF
 Fine-Design_Chart_Curve_Smooth=\u5149\u6ED1\u66F2\u7EBF
-Fine-Design_Chart_Text_Orientation=\u6587\u672C\u65B9\u5411
 Fine-Design_Chart_Custom=\u81EA\u5B9A\u4E49
 Fine-Design_Chart_Custom_Axis=\u81EA\u5B9A\u4E49\u5750\u6807\u8F74
 Fine-Design_Chart_Custom_Color=\u7EC4\u5408\u8272
@ -509,6 +508,7 @@ Fine-Design_Chart_Result_Data=\u7ED3\u679C\u6570\u636E
 Fine-Design_Chart_Reversal=\u7FFB\u8F6C
 Fine-Design_Chart_Rich_Text=\u5BCC\u6587\u672C
 Fine-Design_Chart_Rich_Text_Edit=\u5BCC\u6587\u672C\u7F16\u8F91
+Fine-Design_Chart_Text_Orientation=\u6587\u672C\u65B9\u5411
 Fine-Design_Chart_Right_Boundary=\u53F3\u8FB9\u754C
 Fine-Design_Chart_Right_Top=\u53F3\u4E0A
 Fine-Design_Chart_Rotation=\u53EF\u65CB\u8F6C
--- 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
@ -131,7 +131,6 @@ Fine-Design_Chart_Curve=\u66F2\u7DDA
 Fine-Design_Chart_CurveLine=\u66F2\u7DDA
 Fine-Design_Chart_Curve_Line=\u5149\u6ED1\u66F2\u7DDA
 Fine-Design_Chart_Curve_Smooth=\u5149\u6ED1\u66F2\u7DDA
-Fine-Design_Chart_Text_Orientation=\u6587\u672C\u65B9\u5411
 Fine-Design_Chart_Custom=\u81EA\u8A02
 Fine-Design_Chart_Custom_Axis=\u81EA\u8A02\u5750\u6A19\u8EF8
 Fine-Design_Chart_Custom_Color=\u7D44\u5408\u8272
@ -509,6 +508,7 @@ Fine-Design_Chart_Result_Data=\u7D50\u679C\u8CC7\u6599
 Fine-Design_Chart_Reversal=\u7FFB\u8F49
 Fine-Design_Chart_Rich_Text=\u5BCC\u6587\u672C
 Fine-Design_Chart_Rich_Text_Edit=\u5BCC\u6587\u672C\u7DE8\u8F2F
+Fine-Design_Chart_Text_Orientation=\u6587\u672C\u65B9\u5411
 Fine-Design_Chart_Right_Boundary=\u53F3\u908A\u754C
 Fine-Design_Chart_Right_Top=\u53F3\u4E0A
 Fine-Design_Chart_Rotation=\u53EF\u65CB\u8F49