Merge pull request #912 in BA/design from ~LILY/design:release to release

* commit 'f5a863610c05f20100e8e4e661d7989b9de483dc': Signed-off-by: unknown <李晓丽>
8 years ago · 998828b838
2 changed files with 35 additions and 35 deletions
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@ -379,7 +379,7 @@ FR-Designer_Clear_All=Clear All
 FR-Designer_Log=Log
 FR-Designer-Plugin_Expire_Dialog_Title=Plug expired
 FR-Designer-Plugin_Expire_Dialog_Text=Plugin expired, go sail soft application center to make a purchase.
-FR-Designer-Plugin_Finerest_Addon=Fineres Plugins
+FR-Designer-Plugin_Finerest_Addon=Fanruan Plugins
 FR-Designer_Performance_First=Performance First
 FR-Designer_Total_N_Grade=Total\:${N}Layer
 FR-Designer-BBSLogin_Login-Title=BBS Login
@ -530,7 +530,7 @@ FR-Designer_Select_panel=Sel
 FR-Designer_LayoutTable_Column_Width=250
 FR-Designer_Set_BG_Of_Current_Row=Set BG of the row being edited
 FR-Designer_Unload_Check=Prompt users when leave without submitting
-FR-Designer_ReportColumns_Columns_Optional=\u3000
+FR-Designer_ReportColumns_Columns_Optional=Multi-column/row
 FR-Designer_Row_Icon_File_Name=row_en.png
 FR-Designer_Center_Display=Center
 FR-Designer_Left_Display=Left
@ -617,7 +617,7 @@ BorderLayout-West=West
 AnalysisLine=Line
 Layer_Report_Warnning_info=<html>Line report engine is suitable for large data.<br/>Many report features will no longer support if use it,<br/>more information in helpdocument.</html>
 Tree-Width=Tree Width
-alert_word=Export without fixed height, cell hight will change according to the content and pagination position will different from the preview result.
+alert_word=Export without fixed height, cell height will change according to the content and pagination position will different from the preview result.
 PageSetup-Paper_Size=Paper Size
 M-Page_Setup=Page Setup
 DashBoard-FormBook=Form
@ -697,7 +697,7 @@ RWA-Click_Cell_To_Edit_Value=Click Cell to Edit Value
 Utils-Row_Height=Row Height
 ReportD-Excel_Export=Export Attributes
 Form-Please_Select_A_Kind_Of_Form_Container=Select A Form Container
-Column_Does_Not_Exsit=Column Does Not Exsit
+Column_Does_Not_Exsit=Column Does Not Exist
 M_Insert-Hyperlink=Hyperlink
 can_not_include_underline=Can not contain "_"
 FR-Designer-Plugin_Jar_Expired=Jar Expired
@ -797,7 +797,7 @@ CellWrite-Page_Before_Row=Before Row
 FR-Designer-Plugin_Load_Plugins_From_Server=Loading data from plugins store
 D-Dispaly_Divide_Result_Set_into_Groups=Grouping on Result Set
 Closed=Closed
-RWA-Help=Set "No update if no modidy", so if cell is not modified, the record will not update; it improves filling and submit performance when data is large.
+RWA-Help=Set "No update if no modify", so if cell is not modified, the record will not update; it improves filling and submit performance when data is large.
 FR-Designer-Widget-Style_Custom=Custom
 FR-Designer-Widget-Style_Render_Style=Rendering style
 Highlight-Barcode=BarCode
@ -948,7 +948,7 @@ zeroMarginWarn=The printer exist the physical margins <br> report page margin se
 Widget-Date_Selector_Return_Type=Return value type
 Utils-Switch_To_Template_Reportlet=Switch to template web report
 satisfy=satisfy
-FR-Designer_WidgetDisplyPosition=Control DisplyPosition
+FR-Designer_WidgetDisplyPosition=Control DisplayPosition
 FR-Base_Top=Top
 FR-Designer_Form-CheckBox=CheckBox
 Reportlet-Parameter_Type=Parameter passing mode
@ -966,7 +966,7 @@ FR-Widget_Tree_And_Table=Control tree and control table
 FR-Base_Help=Help
 FR-Designer-Plugin_Update_Successful=Update successfully, restart the sever to enable it
 August=August
-LOG-Is_Being_Openned=Is Being Openned
+LOG-Is_Being_Openned=Is Being Opened
 BackgroundTexture-Oak=Oak
 Multi_nam_formula=\  data set name\:
 TurnOn=TurnOn
@ -1094,7 +1094,7 @@ Horizontal-Split_Layout=Horizontal partitioning layout
 BorderLayout-Center=Center
 INFO-Reset_Webapp=Reset Application Server
 FR-Designer_Text=Text
-IN_and_INOUT_type_not_as_cursor=IN and INOUT type canot be cursor
+IN_and_INOUT_type_not_as_cursor=IN and INOUT type cannot be cursor
 Main_Axis=Primary axis
 M_Edit-Cut=Cut
 Utils-The_Name_has_been_existed=The name already exists
@ -1125,7 +1125,7 @@ Schedule-The_selected_file_must_be_end_with_filter=The selected file must end wi
 Provide=Provide
 FormulaD-Math_&_Trig=Math and Trig
 FR-Designer-StyleAlignment_Right=Right
-Error_TableDataNameRepeat=\ already exsits in Server DataSet or the name is repeated.
+Error_TableDataNameRepeat=\ already exists in Server DataSet or the name is repeated.
 Choose_None=Deselect
 File-tree=File tree
 FRFont-bold=Bold
@ -1161,7 +1161,7 @@ FR-App-Export_png=png
 Delete_Column=Delete Column
 SecondGraduationLine=Minor Graduation Line
 SpecifiedG-Groups=Groups
-CONTINUUM_MODE=Continous grouping
+CONTINUUM_MODE=Continuous grouping
 Datasource-Connection_failed=Connection Failed
 CategoryName=Category Name
 DBCP_INITIAL_SIZE=Initialize Connections
@ -1175,7 +1175,7 @@ Or-you=or you
 FR-Designer_Certificate_Path=Certificate Path
 Utils-Last_Page=Last Page
 BarCodeD-Drawing_Text=Display Barcode Text
-Warning-Template_Do_Not_Exsit=Template do not exsit
+Warning-Template_Do_Not_Exsit=Template do not exist
 BindColumn-Group=Group
 Export-SVG=SVG
 Plane3D=Plane 3D
@ -1289,7 +1289,7 @@ DS-Class_TableData=Class Data Set
 FR-Designer-Plugin_Illegal_Plugin_Zip_Cannot_Be_Install=Illegal plugin,cannot be installed
 DisplayNothingBeforeQuery=Display Nothing Before Query
 Y_Axis=Y Axis
-FormulaD-Most_Recently_Used=Rencently used
+FormulaD-Most_Recently_Used=Recently used
 FormulaD-Input_formula_in_the_text_area_below=Input formula in the text area below
 Build-Way=Build Way
 M_Edit-Undo=Undo
@ -1392,7 +1392,7 @@ BackgroundTexture-WaterDroplets=Water Drop
 FR-Designer-Dependence_Install_Failed=install failed
 Layout-Padding=Padding
 roles_already_authority_edited=Configured role
-WidgetDisplyPosition=Control disply position
+WidgetDisplyPosition=Control display position
 SpecifiedG-Force_Group=Mandatory Group
 FormulaD-Formula_Definition=Formula Definition
 I-xyScatterStyle_Marker=Scatter
@ -1525,7 +1525,7 @@ FR-Server_Version_Tip=The version of the server you are connecting is older than
 StyleAlignment-Left_To_Right=Left To Right
 Verify-ToolTips=If not meet formula, throw up validation error message
 BackgroundTexture-Stationery=Letter Paper
-FR-Designer_RWA-Help=Set "No update if no modidy", so if cell is not modified, the record will not update; it improves filling and submit performance when data is large.
+FR-Designer_RWA-Help=Set "No update if no modify", so if cell is not modified, the record will not update; it improves filling and submit performance when data is large.
 M_Insert-Barcode=Barcode
 Bounds=Bounds
 FR-Designer-Undo_All_Authority_Operations=Undo all the privilege edit operations
@ -1625,7 +1625,7 @@ FR-Hyperlink_Reportlet=Webreport
 M_Edit-Copy=Copy
 Sub_Report_Message2=The parent-report is not in the current runtime environment
 Sub_Report_Message3=Can not choose itself
-Sub_Report_Message1=Please choose the currect path
+Sub_Report_Message1=Please choose the correct path
 Form-Allow_CustomData=Allow custom data
 FR-Server_Version_Tip_MoreInfo=Conform the version numbers of FineReport Designer and the deployment server are consistent, in order to avoid the problems caused by inconsistent versions. If you open the template produced by higher designer vision, error may occurs or the original template properties missed. If the Designer Version you used to create the template is higher than the final deployment server version, the server may not be able to properly load the template.
 FR-Designer_Server-version-tip-moreInfo=Conform the version numbers of FineReport Designer and the deployment server are consistent, in order to avoid the problems caused by inconsistent versions. If you open the template produced by higher designer vision, error may occurs or the original template properties missed. If the Designer Version you used to create the template is higher than the final deployment server version, the server may not be able to properly load the template.
@ -1757,7 +1757,7 @@ Form-ToolBar=Form ToolBar
 FR-Base_sure_remove_item=Are you sure to delete the selected item
 Component_Scale=Component Scale
 Hyperlink-Use_CJK_to_encode_parameter=Use CJK to process parameter
-LOG-Has_Been_Openned=Report Has Been Openned
+LOG-Has_Been_Openned=Report Has Been Opened
 FR-Designer-Dependence=
 ECP_error_pwd=Password Error
 REPORTLET=Parameter of access path to template
@ -1826,7 +1826,7 @@ FR-Designer-Plugin_All_Plugins=All plugins
 FR-Designer_Prepare_Export=Ready to export, please wait
 DBCP_TEST_ON_RETURN=Test before Returning Connections
 no-alternatives=no alternatives
-FR-Designer_Submmit_WClass=Submmit By Custom Class
+FR-Designer_Submmit_WClass=Submit By Custom Class
 M_Insert-Slope_Line=Insert Slope Line
 FR-Designer-Plugin_Plugin_Description=Description
 ExpandD-Not_Expand=No extend
@ -1889,7 +1889,7 @@ Border-Style=Border Style
 Sort=Sort
 Image-Image_Layout=Image Layout
 Panel=Panel
-FR-Designer-Basic_Copy_Build_NO_OK=Build No. has been copyed
+FR-Designer-Basic_Copy_Build_NO_OK=Build No. has been copied
 All_Border_Line=All Border
 FR-Utils-Please_Input_a_New_Name=Input a New Name
 FR-Base_Formula_Plugin=Plugin Function
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@ -106,7 +106,7 @@ FR-Designer_Font-Size=\u5B57\u9AD4\u5927\u5C0F
 FR-Designer_Forbid_Drag_into_Adapt_Pane=\u8A72\u5C0D\u8C61\u4E0D\u5141\u8A31\u62D6\u5165\u8868\u55AE\u4E3B\u9AD4
 FR-Designer_Forbid_Drag_into_Para_Pane=\u8A72\u5C0D\u8C61\u4E0D\u80FD\u62D6\u5165\u53C3\u6578\u9762\u677F
 FR-Designer_Foreground=\u5B57\u5F62\u8272\u5F69
-FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=\u66AB\u4E0D\u652F\u6301\u8868\u55AE\u6B0A\u9650\u7DE8\u8F2F
+FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=\u66AB\u4E0D\u652F\u63F4\u8868\u55AE\u6B0A\u9650\u7DE8\u8F2F
 FR-Designer_Form-Report=\u5831\u8868\u683C\u5F0F
 FR-Designer_Form_EmbeddedTD=\u5167\u5D01\u683C\u5F0F
 FR-Designer_Form_Module=\u6A21\u7D44\u683C\u5F0F
@ -136,7 +136,7 @@ FR-Designer_M-Repeat-Freeze=\u91CD\u8907\u8207\u51CD\u7D50
 FR-Designer_M-Server=\u4F3A\u670D\u5668
 FR-Designer_M-SwitchWorkspace=\u5207\u63DB\u5DE5\u4F5C\u5340\u9593
 FR-Designer_M-Template=\u7BC4\u672C
-FR-Designer_MDX_Explain=\u8A9E\u6CD5\u683C\u5F0F\u53C3\u8003MDX\u8A9E\u6CD5\u3002\n\u4F8B\u5982\uFF1A\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product].[Product].MEMBERS  ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\n\u8A3B\uFF1ACOLUMNS\u3001ROWS\u53EF\u4EE5\u4F7F\u75280\u30011\u4EE3\u66FF\u67E5\u8EF8\u53EA\u652F\u6301\u8FD4\u56DE\u5169\u500B\u8EF8\u3002
+FR-Designer_MDX_Explain=\u8A9E\u6CD5\u683C\u5F0F\u53C3\u8003MDX\u8A9E\u6CD5\u3002\n\u4F8B\u5982\uFF1A\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product].[Product].MEMBERS  ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\n\u8A3B\uFF1ACOLUMNS\u3001ROWS\u53EF\u4EE5\u4F7F\u75280\u30011\u4EE3\u66FF\u67E5\u8EF8\u53EA\u652F\u63F4\u8FD4\u56DE\u5169\u500B\u8EF8\u3002
 FR-Designer_M_Help-About_Software=\u95DC\u65BC\u8EDF\u9AD4
 FR-Designer_M_Help-Tutorial=\u64CD\u4F5C\u8AAA\u660E
 FR-Designer_Max_Value=\u6700\u5927\u503C
@ -197,7 +197,7 @@ FR-Designer_WaterMark=\u6C34\u5370
 FR-Designer_Widget=\u63A7\u5236\u9805
 FR-Designer_Widget-Settings=\u8A2D\u5B9A
 FR-Designer_Widget-Visible=\u53EF\u898B
-FR-Designer_XMLA_Explain=\u5728\u4F7F\u7528\u591A\u7DAD\u8CC7\u6599\u96C6\u53D6\u6578\u524D\uFF0C\u60A8\u9996\u5148\u9700\u8981\u4E00\u500B\u53EF\u6210\u529F\u9023\u63A5\u7684\u591A\u7DAD\u8CC7\u6599\u5EAB\u9023\u63A5\u3002\n\u8A2D\u5B9A\u5B8C\u8CC7\u6599\u9023\u63A5\u5F8C\uFF0C\u67E5\u8A62\u8CC7\u6599\u6642,\u6709\u5169\u7A2E\u4E0D\u540C\u7684\u53D6\u6578\u624B\u6BB5\u3002\n1.\u7C21\u55AE\u901A\u7528\u67E5\u8A62\uFF1A\n\u7C21\u55AE\u901A\u7528\u67E5\u8A62\u9069\u7528\u65BCFineBI\u53CA\u5176\u4ED6\u591A\u7DAD\u8CC7\u6599\u5EAB\u3002\n\u4F7F\u7528\u7C21\u55AE\u901A\u7528\u67E5\u8A62\uFF0CFR\u5C07\u81EA\u52D5\u8B80\u53D6\u9078\u64C7cube\u7684\u5C64\u6B21\u7D50\u69CB\uFF0C\u60A8\u53EF\u4EE5\u76F4\u63A5\u9078\u64C7\u6240\u9700\u7684\u5EA6\u91CF\u503C\u53CA\u7DAD\u5EA6\uFF0C\u4E26\u6DFB\u52A0\u7BE9\u9078\u689D\u4EF6\uFF0CFR\u6703\u6839\u64DA\u60A8\u7684\u9078\u64C7\u81EA\u52D5\u67E5\u8A62\u8CC7\u6599\u3002\n\u7C21\u55AE\u901A\u7528\u67E5\u8A62\u50C5\u652F\u6301\u7DAD\u5EA6\u53CA\u5EA6\u91CF\u503C\u5169\u500B\u8EF8\u7684\u67E5\u8A62\u3002\n\u5728\u5EA6\u91CF\u503C\u53CA\u7DAD\u5EA6\u8A2D\u5B9A\u4E2D\uFF0C\u76EE\u524D\u60A8\u53EA\u80FD\u9078\u64C7\u6240\u9700\u7DAD\u5EA6\uFF0C\u7121\u6CD5\u624B\u52D5\u4FEE\u6539\u3002\n\u904E\u6FFE\u689D\u4EF6\u63A1\u7528OPEN SQL\u8A9E\u6CD5\uFF0C\u60A8\u53EF\u4EE5\u9375\u5165${abc}\u4F5C\u70BA\u4E00\u500B\u53C3\u6578\uFF0C\u7528\u6CD5\u540C\u8CC7\u6599\u5EAB\u8CC7\u6599\u96C6\u3002\n2.\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62\uFF1A\n\u4F7F\u7528\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62\uFF0C\u60A8\u53EF\u4EE5\u81EA\u5B9A\u7FA9\u7FA9MDX\u8A9E\u53E5\u67E5\u8A62\u6240\u9700\u7D50\u679C\u3002\n\u6CE8\u610F\uFF0C\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62\u4E5F\u53EA\u652F\u6301\u5169\u500B\u8EF8\u7684\u67E5\u8A62\u3002\n\u60A8\u53EF\u9375\u5165${abc}\u4F5C\u70BA\u4E00\u500B\u53C3\u6578\uFF0C\u7528\u6CD5\u540C\u8CC7\u6599\u5EAB\u8CC7\u6599\u96C6\u3002\nFineBI\u7684cube\u4E0D\u652F\u6301MDX\u67E5\u8A62\u3002
+FR-Designer_XMLA_Explain=\u5728\u4F7F\u7528\u591A\u7DAD\u8CC7\u6599\u96C6\u53D6\u6578\u524D\uFF0C\u60A8\u9996\u5148\u9700\u8981\u4E00\u500B\u53EF\u6210\u529F\u9023\u63A5\u7684\u591A\u7DAD\u8CC7\u6599\u5EAB\u9023\u63A5\u3002\n\u8A2D\u5B9A\u5B8C\u8CC7\u6599\u9023\u63A5\u5F8C\uFF0C\u67E5\u8A62\u8CC7\u6599\u6642,\u6709\u5169\u7A2E\u4E0D\u540C\u7684\u53D6\u6578\u624B\u6BB5\u3002\n1.\u7C21\u55AE\u901A\u7528\u67E5\u8A62\uFF1A\n\u7C21\u55AE\u901A\u7528\u67E5\u8A62\u9069\u7528\u65BCFineBI\u53CA\u5176\u4ED6\u591A\u7DAD\u8CC7\u6599\u5EAB\u3002\n\u4F7F\u7528\u7C21\u55AE\u901A\u7528\u67E5\u8A62\uFF0CFR\u5C07\u81EA\u52D5\u8B80\u53D6\u9078\u64C7cube\u7684\u5C64\u6B21\u7D50\u69CB\uFF0C\u60A8\u53EF\u4EE5\u76F4\u63A5\u9078\u64C7\u6240\u9700\u7684\u5EA6\u91CF\u503C\u53CA\u7DAD\u5EA6\uFF0C\u4E26\u6DFB\u52A0\u7BE9\u9078\u689D\u4EF6\uFF0CFR\u6703\u6839\u64DA\u60A8\u7684\u9078\u64C7\u81EA\u52D5\u67E5\u8A62\u8CC7\u6599\u3002\n\u7C21\u55AE\u901A\u7528\u67E5\u8A62\u50C5\u652F\u63F4\u7DAD\u5EA6\u53CA\u5EA6\u91CF\u503C\u5169\u500B\u8EF8\u7684\u67E5\u8A62\u3002\n\u5728\u5EA6\u91CF\u503C\u53CA\u7DAD\u5EA6\u8A2D\u5B9A\u4E2D\uFF0C\u76EE\u524D\u60A8\u53EA\u80FD\u9078\u64C7\u6240\u9700\u7DAD\u5EA6\uFF0C\u7121\u6CD5\u624B\u52D5\u4FEE\u6539\u3002\n\u904E\u6FFE\u689D\u4EF6\u63A1\u7528OPEN SQL\u8A9E\u6CD5\uFF0C\u60A8\u53EF\u4EE5\u9375\u5165${abc}\u4F5C\u70BA\u4E00\u500B\u53C3\u6578\uFF0C\u7528\u6CD5\u540C\u8CC7\u6599\u5EAB\u8CC7\u6599\u96C6\u3002\n2.\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62\uFF1A\n\u4F7F\u7528\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62\uFF0C\u60A8\u53EF\u4EE5\u81EA\u5B9A\u7FA9\u7FA9MDX\u8A9E\u53E5\u67E5\u8A62\u6240\u9700\u7D50\u679C\u3002\n\u6CE8\u610F\uFF0C\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62\u4E5F\u53EA\u652F\u63F4\u5169\u500B\u8EF8\u7684\u67E5\u8A62\u3002\n\u60A8\u53EF\u9375\u5165${abc}\u4F5C\u70BA\u4E00\u500B\u53C3\u6578\uFF0C\u7528\u6CD5\u540C\u8CC7\u6599\u5EAB\u8CC7\u6599\u96C6\u3002\nFineBI\u7684cube\u4E0D\u652F\u63F4MDX\u67E5\u8A62\u3002
 FR-Designer_bold=\u7C97\u9AD4
 FR-Designer_font=\u5B57\u9AD4
 FR-Designer_italic=\u659C\u9AD4
@ -348,7 +348,7 @@ FR-Designer_Add_JS_warning=\u8ACB\u8F38\u51FA\u6B63\u78BA\u7684url\u5730\u5740\u
 FR-Designer-Encoding_Type=\u7DE8\u78BC\u985E\u578B
 FR-Designer-FirstRow_IS_ColumnName=\u7B2C\u4E00\u5217\u5305\u542B\u6B04\u6A19\u984C
 FR-Designer_Dismenber=\u5206\u9694\u7B26
-FR-Designer_TableDismember=\u88FD\u9336\u7B26
+FR-Designer_TableDismember=\u88FD\u8868\u7B26
 FR-Designer_Space=\u7A7A\u683C
 FR-Designer_CommaDismenber=\u9017\u865F
 FR-Designer_Other=\u5176\u4ED6
@ -392,7 +392,7 @@ FR-Designer_Product_improve=\u7522\u54C1\u6539\u826F
 FR-Designer_Join_Product_improve=\u52A0\u5165\u7522\u54C1\u6539\u826F\u8A08\u5283
 FR-Designer_Preference-Function=\u529F\u80FD\u8A2D\u5B9A
 FR-Designer_max_undo_limit=\u6700\u5927\u5FA9\u539F\u6B21\u6578
-FR-Designer_Surport_String_To_Formula=\u652F\u6301\u5B57\u5143\u4E32\u7DE8\u8F2F\u70BA\u516C\u5F0F
+FR-Designer_Surport_String_To_Formula=\u652F\u63F4\u5B57\u5143\u4E32\u7DE8\u8F2F\u70BA\u516C\u5F0F
 FR-Designer_Always=\u59CB\u7D42
 FR-Designer_Export_Setting=\u532F\u51FA\u914D\u7F6E
 FR-Designer_Select_Export_Log_Directory=\u9078\u64C7\u532F\u51FA\u76EE\u9304
@ -559,7 +559,7 @@ FR-Designer_Parameter-Formula=\u516C\u5F0F
 FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u633F\u4EF6\u7248\u672C\u904E\u4F4E\uFF0C\u5B58\u5728API\u4E0D\u76F8\u5BB9\uFF0C\u8ACB\u806F\u7CFB\u958B\u767C\u8005\u965E\u7D1A\u633F\u4EF6
 FR-Designer_WidgetOrder=\u63A7\u4EF6\u9806\u5E8F
 FR-Designer_Mobile_Form_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u8868\u55AE\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\u3002
-FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u5831\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u6301\u5206\u9801\u9810\u89BD\uFF0C\u586B\u5831\u9810\u89BD\u6642\u5C6C\u6027\u7121\u6548\u3002
+FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u5831\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u63F4\u5206\u9801\u9810\u89BD\uFF0C\u586B\u5831\u9810\u89BD\u6642\u5C6C\u6027\u7121\u6548\u3002
 FR-Designer_Background_Null=\u6C92\u6709\u80CC\u666F
 FR-Designer_Background_Color=\u984F\u8272
 FR-Designer_Background_Texture=\u7D0B\u7406
@ -615,7 +615,7 @@ Utils-Current_Sheet=\u7576\u524D\u7684Sheet
 ConditionB-is_less_than=\u5C0F\u65BC
 BorderLayout-West=\u897F
 AnalysisLine=\u5206\u6790\u7DDA\u578B
-Layer_Report_Warnning_info=<html>\u5217\u5F0F\u5F15\u64CE\u9069\u7528\u65BC\u5927\u8CC7\u6599\u91CF\u60C5\u5F62\u4E0B\u3002<br/>\u4F7F\u7528\u6B64\u5F15\u64CE\u5F88\u591A\u5831\u8868\u7279\u6027\u5C07\u4E0D\u518D\u652F\u6301\uFF0C<br/>\u8A73\u7D30\u5167\u5BB9\u8ACB\u898B\u76F8\u95DC\u6587\u6A94\u3002</html>
+Layer_Report_Warnning_info=<html>\u5217\u5F0F\u5F15\u64CE\u9069\u7528\u65BC\u5927\u8CC7\u6599\u91CF\u60C5\u5F62\u4E0B\u3002<br/>\u4F7F\u7528\u6B64\u5F15\u64CE\u5F88\u591A\u5831\u8868\u7279\u6027\u5C07\u4E0D\u518D\u652F\u63F4\uFF0C<br/>\u8A73\u7D30\u5167\u5BB9\u8ACB\u898B\u76F8\u95DC\u6587\u6A94\u3002</html>
 Tree-Width=\u5BEC\u5EA6
 alert_word=\u9078\u64C7\u4E0D\u56FA\u5B9A\u5217\u9AD8\u532F\u51FA\u6642, \u7DE8\u8F2F\u532F\u51FA\u7684word, \u5132\u5B58\u683C\u5217\u9AD8\u6703\u96A8\u8457\u5167\u5BB9\u81EA\u52D5\u62C9\u4F38, \u6B64\u60C5\u6CC1\u4E0B\u532F\u51FA\u7D50\u679C\u8207\u9810\u89BD\u7D50\u679C\u53EF\u80FD\u6703\u4E0D\u518D\u4E00\u81F4.
 PageSetup-Paper_Size=\u7D19\u5F35\u5927\u5C0F
@ -662,7 +662,7 @@ Email-Can_Preview_Report_Content=\u6B63\u6587\u9810\u89BD\u5831\u8868\u5167\u5BB
 FR-Designer-FRFont_Italic=\u659C\u9AD4
 CellWrite-Print_Background=\u5217\u5370/\u532F\u51FA\u5132\u5B58\u683C\u80CC\u666F
 Wizard=\u56AE\u5C0E
-Preference-Is_Drag_Permited=\u652F\u6301\u62D6\u62FD
+Preference-Is_Drag_Permited=\u652F\u63F4\u62D6\u62FD
 FR-Designer_Release_Lock=\u89E3\u9396
 Form-Delimiter=\u5206\u9694\u7B26
 wrong=\u51FA\u932F\u4E86
@ -689,7 +689,7 @@ BackgroundTexture-Canvas=\u756B\u5E03
 BarOutSide=\u67F1\u5B50\u5916\u5074
 Preview_ToolTips=\u9810\u89BD\u63D0\u793A
 FRFont-Family=\u540D\u5B57
-FR-Lic_does_not_Support_Remote=\u60A8\u7576\u524D\u4F7F\u7528\u7684lic\u4E0D\u652F\u6301\u9060\u7A0B\u8A2D\u8A08\u529F\u80FD\uFF0C\u8ACB\u5347\u7D1A\u60A8\u7684lic
+FR-Lic_does_not_Support_Remote=\u60A8\u7576\u524D\u4F7F\u7528\u7684lic\u4E0D\u652F\u63F4\u9060\u7A0B\u8A2D\u8A08\u529F\u80FD\uFF0C\u8ACB\u5347\u7D1A\u60A8\u7684lic
 InterfaceStyle=\u98A8\u683C
 RWA-Key=\u4E3B\u9375
 WF-Name=\u540D\u7A31
@ -864,7 +864,7 @@ M_Edit-FormatBrush=\u8907\u88FD\u683C\u5F0F(B)
 Indent-Pixel=\u50CF\u7D20
 FR-Designer-Widget-Style_Border_Line=\u6846\u7DDA\u7C97\u7D30
 Widget-Default_Widget_Config=\u57FA\u672C\u63A7\u5236\u9805
-Version-does-not-support=\u60A8\u7576\u524D\u4F7F\u7528\u7684lic\u4E0D\u652F\u6301\u9060\u7A0B\u8A2D\u8A08\u529F\u80FD\uFF0C\u8ACB\u5347\u7D1A\u60A8\u7684lic
+Version-does-not-support=\u60A8\u7576\u524D\u4F7F\u7528\u7684lic\u4E0D\u652F\u63F4\u9060\u7A0B\u8A2D\u8A08\u529F\u80FD\uFF0C\u8ACB\u5347\u7D1A\u60A8\u7684lic
 StyleAlignment-Right_To_Left=\u5F9E\u53F3\u5411\u5DE6
 Style-Spacing_Before=\u6BB5\u524D
 Has_Existed=\u5DF2\u7D93\u5B58\u5728
@ -888,7 +888,7 @@ Present-Formula_Present=\u516C\u5F0F\u6A21\u5F0F
 FRFont-Superscript=\u4E0A\u6A19
 CellWrite-Page_Before_Column=\u6B04\u524D\u5206\u9801
 Golden=\u91D1\u8272
-Preference-Support_Cell_Editor_Definition=\u652F\u6301\u5132\u5B58\u683C\u7DE8\u8F2F\u5668
+Preference-Support_Cell_Editor_Definition=\u652F\u63F4\u5132\u5B58\u683C\u7DE8\u8F2F\u5668
 M-Page_Preview=\u5206\u9801\u9810\u89BD
 HJS-CC_to=\u6284\u9001
 Tree-Select_Leaf_Only=\u53EA\u8FD4\u56DE\u8449\u5B50\u7BC0\u9EDE
@ -1038,7 +1038,7 @@ FR-Designer-Tree_Width=\u5BEC\u5EA6
 Record=\u8A18\u9304
 Poly-Report_Component=\u8907\u5408\u5F0F\u5831\u8868\u5143\u4EF6
 Options=\u9078\u9805
-NS-war-remote=\u932F\u8AA4\u4EE3\u78BC\:1117 \u58D3\u7E2E\u90E8\u7F72\u4E0D\u652F\u6301\u9060\u7A0B\u8A2D\u8A08
+NS-war-remote=\u932F\u8AA4\u4EE3\u78BC\:1117 \u58D3\u7E2E\u90E8\u7F72\u4E0D\u652F\u63F4\u9060\u7A0B\u8A2D\u8A08
 Sche-Minute=\u5206
 Three_Rows_Of_Three_Grid=\u4E09\u5217\u4E09\u6B04\u7684\u683C\u5B50
 WorkSheet=\u81EA\u7531\u5831\u8868
@ -1138,7 +1138,7 @@ Dictionary-Dynamic_SQL=\u52D5\u614BSQL
 FR-Designer_Form-CheckBoxGroup=\u5FA9\u9078\u6846\u7D44
 DBCP_TIME_BETWEEN_EVICTIONRUNSMILLIS=\u7A7A\u9591\u9023\u63A5\u56DE\u6536\u5668\u4F11\u7720\u6642\u9593
 ReportD-Export_Hided_Column=\u532F\u51FA\u96B1\u85CF\u6B04
-Preference-Support_Undo=\u652F\u6301\u5FA9\u539F
+Preference-Support_Undo=\u652F\u63F4\u5FA9\u539F
 FR-mobile_report_analysis=\u5831\u8868\u89E3\u6790
 Month=\u6708
 Utils-Column_Width=\u6B04\u5BEC
@ -1257,7 +1257,7 @@ Deep=\u6DF1\u5EA6
 FRFont-Shadow=\u9670\u5F71
 Reportlet=\u7DB2\u8DEF\u5831\u8868
 Calendar=\u65E5\u66C6
-DateFormat-Custom_Warning=\u8A3B\uFF1A\u81EA\u5B9A\u7FA9\u65E5\u671F\u683C\u5F0F\u4E0D\u652F\u6301\u683C\u5F0F\u6821\u9A57
+DateFormat-Custom_Warning=\u8A3B\uFF1A\u81EA\u5B9A\u7FA9\u65E5\u671F\u683C\u5F0F\u4E0D\u652F\u63F4\u683C\u5F0F\u6821\u9A57
 Unit_MM=\u516C\u5398
 Server-Start=\u555F\u52D5
 CellPage-Can_Break_On_Paginate=\u5206\u9801\u6642\u53EF\u4EE5\u65B7\u958B
@ -1369,7 +1369,7 @@ paper=\u7D19\u5F35
 Not_Exsit=\u4E0D\u5B58\u5728\u65BC\u5831\u8868
 Utils-Insert_Row=\u63D2\u5165\u5217
 Utils-Delete_Row=\u522A\u9664\u5217
-not_support_authority_edit=\u8A72\u5143\u7D20\u4E0D\u652F\u6301\u8A31\u53EF\u6B0A\u63A7\u5236
+not_support_authority_edit=\u8A72\u5143\u7D20\u4E0D\u652F\u63F4\u8A31\u53EF\u6B0A\u63A7\u5236
 Formula_Tips=\u516C\u5F0F\u5FC5\u9808\u4EE5"\="\u865F\u958B\u982D
 FR-Action_Copy=\u8907\u88FD
 Compile_Success=\u7DE8\u8B6F\u6210\u529F
@ -1509,7 +1509,7 @@ ReportColumns-Repeat_Row=\u8907\u88FD\u5217\u5E8F\u6B04
 Print_Setting=\u5217\u5370\u8A2D\u5B9A
 Registration-User_Name=\u5E33\u865F
 Datasource-User_Defined=\u81EA\u5B9A\u7FA9
-FR-Designer-Plugin_DownLoadMessage=\u63D2\u4EF6\u9700\u8981\u4F9D\u8CF4\u7684\u652F\u6301\uFF0C\u662F\u5426\u5B89\u88DD({R1} m)?
+FR-Designer-Plugin_DownLoadMessage=\u63D2\u4EF6\u9700\u8981\u4F9D\u8CF4\u7684\u652F\u63F4\uFF0C\u662F\u5426\u5B89\u88DD({R1} m)?
 Delay=\u5EF6\u9072
 FR-Designer-All_MSBold=\u5FAE\u8EDF\u96C5\u9ED1
 Utils-Now_create_connection=\u6B63\u5728\u5EFA\u7ACB\u8CC7\u6599\u9023\u63A5
@ -1812,7 +1812,7 @@ FR-Action_Remove=\u522A\u9664
 FRFont-Style=\u5B57\u5F62
 Select_DataColumn=\u9078\u64C7\u8CC7\u6599\u6B04
 StartValue=\u958B\u59CB\u503C
-SINGLE_FILE_UPLOAD=\u53EA\u652F\u6301\u55AE\u6A94\u6848\u4E0A\u50B3
+SINGLE_FILE_UPLOAD=\u53EA\u652F\u63F4\u55AE\u6A94\u6848\u4E0A\u50B3
 BackgroundTexture-Cork=\u8EDF\u6728\u585E
 M_Format-Data_Map=\u8CC7\u6599\u5B57\u5178
 FR-mobile_native_analysis=\u539F\u751F\u89E3\u6790