From 94821ec416e63c020e3e375cda2f19be296127e0 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Tue, 24 Jul 2018 18:07:33 +0800 Subject: [PATCH 1/2] REPORT-9953 --- .../src/main/resources/com/fr/design/i18n/main.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_en_US.properties | 1 + .../main/resources/com/fr/design/i18n/main_zh_CN.properties | 2 ++ .../main/resources/com/fr/design/i18n/main_zh_TW.properties | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git 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 index cda0b06..a156f9f 100644 --- 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 @@ -2644,4 +2644,5 @@ Fine-Designer_Report_Background=Report Background Fine-Designer_Sheet_Label_Page_Display_Position=sheet label page display position: Fine-Plugin_Shop_Need_Install_Version=Need to update to the 10.0 plug-in store, updated? Fine-Designer_Submit_Condition=Submission conditions -Fine-Designer_About_Remark_Info=*If the above route can not contact the staff, or after the contact has not been satisfactorily resolved, please call the president to do 24 hours call: {R1}, to serve you. \ No newline at end of file +Fine-Designer_About_Remark_Info=*If the above route can not contact the staff, or after the contact has not been satisfactorily resolved, please call the president to do 24 hours call: {R1}, to serve you. +Fine-Designer_Allow_Full_Screen=Allow full screen \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties index 671a84c..78a4833 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties @@ -2645,3 +2645,4 @@ Fine-Designer_Sheet_Label_Page_Display_Position=sheet label page display positio Fine-Plugin_Shop_Need_Install_Version=Need to update to the 10.0 plug-in store, updated? Fine-Designer_Submit_Condition=Submission conditions Fine-Designer_About_Remark_Info=*If the above route can not contact the staff, or after the contact has not been satisfactorily resolved, please call the president to do 24 hours call: {R1}, to serve you. +Fine-Designer_Allow_Full_Screen=Allow full screen diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties index c65c717..faed10a 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties @@ -2645,3 +2645,5 @@ Fine-Designer_Sheet_Label_Page_Display_Position=sheet\u6807\u7B7E\u9875\u663E\u7 Fine-Plugin_Shop_Need_Install_Version=\u9700\u8981\u66F4\u65B0\u523010.0\u63D2\u4EF6\u5546\u5E97\uFF0C\u662F\u5426\u66F4\u65B0\uFF1F Fine-Designer_Submit_Condition=\u63D0\u4EA4\u6761\u4EF6 Fine-Designer_About_Remark_Info=*\u5982\u679C\u4EE5\u4E0A\u9014\u5F84\u65E0\u6CD5\u8054\u7CFB\u5230\u5DE5\u4F5C\u4EBA\u5458\uFF0C\u6216\u8005\u8054\u7CFB\u540E\u6CA1\u6709\u5F97\u5230\u6EE1\u610F\u89E3\u51B3\uFF0C\u8BF7\u62E8\u603B\u88C1\u529E24\u5C0F\u65F6\u7535\u8BDD\uFF1A{R1}\uFF0C\u6765\u4E3A\u60A8\u670D\u52A1\u3002 +Fine-Designer_Allow_Full_Screen=\u5141\u8BB8\u5168\u5C4F + diff --git 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 index 51dc575..7a2c3fd 100644 --- 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 @@ -2645,3 +2645,4 @@ Fine-Designer_Sheet_Label_Page_Display_Position=sheet\u6A19\u7C64\u9801\u986F\u7 Fine-Plugin_Shop_Need_Install_Version=\u9700\u8981\u66F4\u65B0\u523010.0\u63D2\u4EF6\u5546\u5E97\uFF0C\u662F\u5426\u66F4\u65B0\uFF1F Fine-Designer_Submit_Condition=\u63D0\u4EA4\u689D\u4EF6 Fine-Designer_About_Remark_Info=*\u5982\u679C\u4EE5\u4E0A\u9014\u5F91\u7121\u6CD5\u806F\u7CFB\u5230\u5DE5\u4F5C\u4EBA\u54E1\uFF0C\u6216\u8005\u806F\u7CFB\u5F8C\u6C92\u6709\u5F97\u5230\u6EFF\u610F\u89E3\u51B3\uFF0C\u8ACB\u64A5\u7E3D\u88C1\u8FA624\u5C0F\u6642\u96FB\u8A71\uFF1A{R1}\uFF0C\u4F86\u70BA\u60A8\u670D\u52D9\u3002 +Fine-Designer_Allow_Full_Screen=Allow full screen From 2b0b7d6af14829be7cee182b07676957dbf5edb7 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Tue, 24 Jul 2018 18:13:26 +0800 Subject: [PATCH 2/2] REPORT-9953 --- .../src/main/resources/com/fr/design/i18n/main.properties | 3 --- 1 file changed, 3 deletions(-) diff --git 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 index 2b22cca..601cfa0 100644 --- 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 @@ -2715,9 +2715,7 @@ Fine-Designer_Sheet_Label_Page_Display_Position=sheet label page display positio Fine-Plugin_Shop_Need_Install_Version=Need to update to the 10.0 plug-in store, updated? Fine-Designer_Submit_Condition=Submission conditions Fine-Designer_About_Remark_Info=*If the above route can not contact the staff, or after the contact has not been satisfactorily resolved, please call the president to do 24 hours call: {R1}, to serve you. -<<<<<<< HEAD Fine-Designer_Allow_Full_Screen=Allow full screen -======= Fine-Design_Log_Level_Info=Info Fine-Design_Log_Level_Warn=Warn Fine-Design_Log_Level_Error=Error @@ -2783,4 +2781,3 @@ Fine-Design_Chart_Enable_Field_Value=Enable Field Value Fine-Design_Chart_Legend_Name=Legend(Series) Name Fine-Design_Chart_Legend_Value=Legend(Series) Value Fine-Design_Chart_Label_Content=Label Content ->>>>>>> 4d6406dd76787c1c3802c4c471a2e1933c93495c