fanruan
/
design-i18n
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Pull request #1725: 无jira任务 解决冲突 

Merge in DESIGN/design-i18n from ~YVAN/design-i18n:feature/10.0 to feature/10.0

* commit '337a465932df74e335c7f0b8dc5743e8306ec7f5':
  REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 【问题原因】迭代提交 【改动思路】迭代提交
feature/10.0
Yvan 4 years ago
parent
4e4ec2eefe 337a465932
commit
fe409fdaed
12 changed files with 34 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
  2. 2
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
  3. 2
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
  4. 2
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
  5. 2
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
  6. 2
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
  7. 5
      design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
  8. 5
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
  9. 5
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
  10. 5
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
  11. 6
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties
  12. 6
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

6
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
Unescape View File

@ -501,6 +501,7 @@ Fine-Design_Chart_Radar_Chart=
Fine-Design_Chart_Radar_Value_Axis=
Fine-Design_Chart_Radial_Structure=
Fine-Design_Chart_Radius=
Fine-Design_Chart_Size=
Fine-Design_Chart_Radius_Set=
Fine-Design_Chart_Range=
Fine-Design_Chart_Range_Chart=
@ -555,7 +556,6 @@ Fine-Design_Chart_Show_All_Level=
Fine-Design_Chart_Show_All_Series=
Fine-Design_Chart_Show_Data_Sheet=
Fine-Design_Chart_Show_Guideline=
Fine-Design_Chart_Size=
Fine-Design_Chart_Slot_Background=
Fine-Design_Chart_Solid_Color=
Fine-Design_Chart_Sort=
@ -674,7 +674,6 @@ Fine-Design_Chart_Use_Percent=
Fine-Design_Chart_Use_Refresh=
Fine-Design_Chart_Use_Same_Slant_Angle=
Fine-Design_Chart_Use_Show=
Fine-Design_Chart_Use_Summary_Value=
Fine-Design_Chart_Use_Tooltip=
Fine-Design_Chart_Use_Value=
Fine-Design_Chart_Use_Zoom=
@ -736,5 +735,6 @@ Fine-Engine_Chart_New_Scatter=
Fine-Engine_Chart_New_Structure=
Fine-Engine_Chart_New_TreeMap=
Fine-Engine_Chart_WordCloud_New=
Fine-Design_Chart_Use_Summary_Value=
Fine-Design_Chart_Data_Function_First=
Fine-Design_Chart_Data_Function_Last=
Fine-Design_Chart_Data_Function_Last=

2
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
Unescape View File

@ -737,4 +737,4 @@ Fine-Engine_Chart_New_Structure=Structure Chart
Fine-Engine_Chart_New_TreeMap=Rctangular Tree Map
Fine-Engine_Chart_WordCloud_New=Word Cloud
Fine-Design_Chart_Data_Function_First=
Fine-Design_Chart_Data_Function_Last=
Fine-Design_Chart_Data_Function_Last=

2
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
Unescape View File

@ -737,4 +737,4 @@ 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-Design_Chart_Data_Function_First=
Fine-Design_Chart_Data_Function_Last=
Fine-Design_Chart_Data_Function_Last=

2
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
Unescape View File

@ -737,4 +737,4 @@ 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-Design_Chart_Data_Function_First=
Fine-Design_Chart_Data_Function_Last=
Fine-Design_Chart_Data_Function_Last=

2
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
Unescape View File

@ -737,4 +737,4 @@ 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-Design_Chart_Data_Function_First=\u9996\u4E2A
Fine-Design_Chart_Data_Function_Last=\u6700\u540E\u4E00\u4E2A
Fine-Design_Chart_Data_Function_Last=\u6700\u540E\u4E00\u4E2A

2
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
Unescape View File

@ -737,4 +737,4 @@ 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-Design_Chart_Data_Function_First=
Fine-Design_Chart_Data_Function_Last=
Fine-Design_Chart_Data_Function_Last=

5
design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
Unescape View File

@ -2680,4 +2680,7 @@ Fine-Design_Basic_Dialog_Message_Title=
Fine-Design_Plugin_Error_Remind_Title=
Fine-Design_Plugin_Error_Remind_Deal_With=
Fine-Design_Plugin_Error_Remind_Not_Deal_With=
Fine-Design_Mobile_Param_Style=
Fine-Design_Mobile_Param_Style=
Fine_Designer_Remote_Design_Data_Connection_Locked=
Fine_Designer_Remote_Design_Server_TableData_Locked=
Fine_Designer_Remote_Design_Locked_Message=

5
design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
Unescape View File

@ -2680,4 +2680,7 @@ Fine-Design_Basic_Dialog_Message_Title=
Fine-Design_Plugin_Error_Remind_Title=The following plugin does not match the JAR version and has been disabled
Fine-Design_Plugin_Error_Remind_Deal_With=Process
Fine-Design_Plugin_Error_Remind_Not_Deal_With=Not Process
Fine-Design_Mobile_Param_Style=
Fine-Design_Mobile_Param_Style=
Fine_Designer_Remote_Design_Data_Connection_Locked=
Fine_Designer_Remote_Design_Server_TableData_Locked=
Fine_Designer_Remote_Design_Locked_Message=

5
design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
Unescape View File

@ -2677,4 +2677,7 @@ Fine-Design_Basic_Remote_Design_Update_Password=
Fine-Design_Basic_Remote_Design_Permission_Denied=
Fine-Design_Basic_Remote_Design_Modify_PassWord=
Fine-Design_Basic_Dialog_Message_Title=
Fine-Design_Mobile_Param_Style=
Fine-Design_Mobile_Param_Style=
Fine_Designer_Remote_Design_Data_Connection_Locked=
Fine_Designer_Remote_Design_Server_TableData_Locked=
Fine_Designer_Remote_Design_Locked_Message=

5
design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
Unescape View File

@ -2676,4 +2676,7 @@ Fine-Design_Basic_Remote_Design_Weak_Password=
Fine-Design_Basic_Remote_Design_Update_Password=
Fine-Design_Basic_Remote_Design_Permission_Denied=
Fine-Design_Basic_Dialog_Message_Title=
Fine-Design_Mobile_Param_Style=
Fine-Design_Mobile_Param_Style=
Fine_Designer_Remote_Design_Data_Connection_Locked=
Fine_Designer_Remote_Design_Server_TableData_Locked=
Fine_Designer_Remote_Design_Locked_Message=

6
design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties
Unescape View File

@ -2680,4 +2680,8 @@ Fine-Design_Basic_Dialog_Message_Title=\u6D88\u606F
Fine-Design_Plugin_Error_Remind_Title=\u4EE5\u4E0B\u63D2\u4EF6\u4E0EJAR\u5305\u7248\u672C\u4E0D\u5339\u914D\uFF0C\u5DF2\u88AB\u7981\u7528
Fine-Design_Plugin_Error_Remind_Deal_With=\u7ACB\u5373\u5904\u7406
Fine-Design_Plugin_Error_Remind_Not_Deal_With=\u6682\u4E0D\u5904\u7406
Fine-Design_Mobile_Param_Style=\u6837\u5F0F\u6A21\u677F
Fine-Design_Mobile_Param_Style=\u6837\u5F0F\u6A21\u677F
Fine_Design_Chart_Year=\u5E74
Fine_Designer_Remote_Design_Data_Connection_Locked=\u6570\u636e\u8fde\u63a5\u9501\u5b9a\u4e2d
Fine_Designer_Remote_Design_Server_TableData_Locked=\u670d\u52a1\u5668\u6570\u636e\u96c6\u9501\u5b9a\u4e2d
Fine_Designer_Remote_Design_Locked_Message=\u5df2\u7531\u5176\u4ed6\u7528\u6237\u7f16\u8f91\u9501\u5b9a\u4e2d\uff0c\u4e3a\u9632\u6b62\u6570\u636e\u4e22\u5931\uff0c\u8bf7\u7a0d\u540e\u518d\u8bd5

6
design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
Unescape View File

@ -2680,4 +2680,8 @@ Fine-Design_Basic_Dialog_Message_Title=
Fine-Design_Plugin_Error_Remind_Title=\u4EE5\u4E0B\u63D2\u4EF6\u8207JAR\u5305\u7248\u672C\u4E0D\u5339\u914D\uFF0C\u5DF2\u88AB\u7981\u7528
Fine-Design_Plugin_Error_Remind_Deal_With=\u7ACB\u5373\u8655\u7406
Fine-Design_Plugin_Error_Remind_Not_Deal_With=\u66AB\u4E0D\u8655\u7406
Fine-Design_Mobile_Param_Style=
Fine-Design_Mobile_Param_Style=
Fine_Design_Chart_Year=\u5E74
Fine_Designer_Remote_Design_Data_Connection_Locked=
Fine_Designer_Remote_Design_Server_TableData_Locked=
Fine_Designer_Remote_Design_Locked_Message=

Write Preview
Loading…
Cancel
Save