From 1ea3b9cbe99df04478f263bc54aacd3510e84633 Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 24 Nov 2016 11:57:48 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/locale/designer.properties | 447 +++++++++++++++++ .../design/locale/designer_en_US.properties | 446 +++++++++++++++++ .../design/locale/designer_ja_JP.properties | 424 +++++++++++++++++ .../design/locale/designer_ko_KR.properties | 420 ++++++++++++++++ .../design/locale/designer_zh_CN.properties | 450 ++++++++++++++++++ .../design/locale/designer_zh_TW.properties | 439 +++++++++++++++++ 6 files changed, 2626 insertions(+) create mode 100644 designer_base/src/com/fr/design/locale/designer.properties create mode 100644 designer_base/src/com/fr/design/locale/designer_en_US.properties create mode 100644 designer_base/src/com/fr/design/locale/designer_ja_JP.properties create mode 100644 designer_base/src/com/fr/design/locale/designer_ko_KR.properties create mode 100644 designer_base/src/com/fr/design/locale/designer_zh_CN.properties create mode 100644 designer_base/src/com/fr/design/locale/designer_zh_TW.properties diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties new file mode 100644 index 0000000000..c524eb93d5 --- /dev/null +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -0,0 +1,447 @@ +# generated time: 星期四 十一月 24 11:56:39 CST 2016 +FR-Designer-BBSLogin_Account= +FR-Designer-BBSLogin_Connection-Failure= +FR-Designer-BBSLogin_Connection-Failure-Tip= +FR-Designer-BBSLogin_Forgot-Password= +FR-Designer-BBSLogin_Login= +FR-Designer-BBSLogin_Login-Failure-Tip= +FR-Designer-BBSLogin_Password= +FR-Designer-BBSLogin_Password-Empty-Tip= +FR-Designer-BBSLogin_Register-Account= +FR-Designer-BBSLogin_Switch-Account= +FR-Designer-BBSLogin_Privite-Message= +FR-Designer-BBSLogin_Times= +FR-Designer-BBSLogin_Username-Empty-Tip= +FR-Designer-Basic_More_Color= +FR-Designer-Estate_Any= +FR-Designer-Estate_Default_Font= +FR-Designer-Estate_Default_Null= +FR-Designer-Estate_Default_Text= +FR-Designer-Estate_Parameter_Null_Text= +FR-Designer-Estate_Radio-Group= +FR-Designer-Estate_Selected_Font= +FR-Designer-Estate_Widget_Value= +FR-Designer-Layout_Adaptive_Layout= +FR-Designer-Output_Background_Set= +FR-Designer-Output_Default_Background= +FR-Designer-Output_Excel_Page= +FR-Designer-Output_Excel_Sheet= +FR-Designer-Output_Excel_Simple= +FR-Designer-Plugin_PluginMarket_Coding= +FR-Designer-Submit_Condition= +FR-Designer-Widget-Title_border= +FR-Designer-Widget-Title_border_color= +FR-Designer_AbsoluteLayout= +FR-Designer_Allow_Decimals= +FR-Designer_Allow_Negative= +FR-Designer_Background-Click= +FR-Designer_Background-Initial= +FR-Designer_Background-Over= +FR-Designer_Bar-Code-Exception-Tip= +FR-Designer_Block-intersect= +FR-Designer_BorderLayout= +FR-Designer_Button-Hotkeys= +FR-Designer_Button-Icon= +FR-Designer_Button-Name= +FR-Designer_Button-Type= +FR-Designer_CardLayout= +FR-Designer_Cell= +FR-Designer_Chart_Cell= +FR-Designer_Chart_Float= +FR-Designer_Chart_Float_chart= +FR-Designer_Check-for-Updates= +FR-Designer_Choose-Data-Confusion-Tip= +FR-Designer_Close= +FR-Designer_Column= +FR-Designer_Column_Measure= +FR-Designer_Condition_Attributes= +FR-Designer_Confusion-Col-Name= +FR-Designer_Confusion-key= +FR-Designer_Currency_Line= +FR-Designer_Current_tab= +FR-Designer_Custom= +FR-Designer_Custom-Angle= +FR-Designer_DS-Dictionary= +FR-Designer_Data-confusion= +FR-Designer_Data_Type= +FR-Designer_Double_Click_Edit_OR_Clear= +FR-Designer_Email= +FR-Designer_Enabled= +FR-Designer_End-Date= +FR-Designer_ExportAndOutput= +FR-Designer_FRFont= +FR-Designer_FS_Close_Other_Templates= +FR-Designer_File= +FR-Designer_Filter_Conditions= +FR-Designer_Finish-Modify-Share= +FR-Designer_Fit-App= +FR-Designer_Font-Family= +FR-Designer_Font-Size= +FR-Designer_Forbid_Drag_into_Adapt_Pane=Forbid Drag into Para Pane +FR-Designer_Forbid_Drag_into_Para_Pane=Forbid Drag into Para Pane +FR-Designer_Foreground= +FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=Form authority editing can not be supported +FR-Designer_Form-Report= +FR-Designer_Form_EmbeddedTD= +FR-Designer_Form_Module=Form Module +FR-Designer_Format_explan= +FR-Designer_Formula= +FR-Designer_Forum= +FR-Designer_Get-Cube= +FR-Designer_Help= +FR-Designer_Hide= +FR-Designer_Hyperlink= +FR-Designer_Hyperlink-Form_link= +FR-Designer_IDCard= +FR-Designer_Icon= +FR-Designer_Index= +FR-Designer_Input_Rule= +FR-Designer_Language_Default= +FR-Designer_Layout= +FR-Designer_Layout-HBox= +FR-Designer_Layout-Index= +FR-Designer_Layout_Constraints= +FR-Designer_Length= +FR-Designer_Loading_Data= +FR-Designer_M-Exit= +FR-Designer_M-Help= +FR-Designer_M-Insert= +FR-Designer_M-Repeat-Freeze= +FR-Designer_M-Server= +FR-Designer_M-SwitchWorkspace= +FR-Designer_M-Template= +FR-Designer_MDX_Explain= +FR-Designer_M_Help-About_Software= +FR-Designer_M_Help-Tutorial= +FR-Designer_Max_Value= +FR-Designer_Min_Value= +FR-Designer_MobilePhone= +FR-Designer_New_Value= +FR-Designer_None= +FR-Designer_PaperSize-Mobile= +FR-Designer_PaperSize-Mobile-Large= +FR-Designer_PaperSize-Mobile-Small= +FR-Designer_Para-Body= +FR-Designer_Parameters= +FR-Designer_Phone= +FR-Designer_PostCode= +FR-Designer_Present= +FR-Designer_Preview= +FR-Designer_Preview-Data-Confusion= +FR-Designer_Product_Demo= +FR-Designer_Query_Type= +FR-Designer_Refresh= +FR-Designer_Refresh_Parameter_In_SQL= +FR-Designer_Reg_Expressions= +FR-Designer_Reg_Max_Length= +FR-Designer_Reg_Min_Length= +FR-Designer_ReportColumns-Columns= +FR-Designer_Return-Date= +FR-Designer_RichText= +FR-Designer_RichTextEditor= +FR-Designer_Row= +FR-Designer_Row_Dimension= +FR-Designer_Save= +FR-Designer_Search=Search +FR-Designer_Set= +FR-Designer_Share-Template= +FR-Designer_Simple_general= +FR-Designer_Song_TypeFace=Song TypeFace +FR-Designer_Start-Date= +FR-Designer_Subscript= +FR-Designer_Superscript= +FR-Designer_Support_QQ= +FR-Designer_Swatch= +FR-Designer_Tab_title= +FR-Designer_TableData= +FR-Designer_Thank_guest= +FR-Designer_Thanks-To= +FR-Designer_Title= +FR-Designer_Total=Total +FR-Designer_UnSignIn= +FR-Designer_Underline= +FR-Designer_Used= +FR-Designer_User-defined-MDX= +FR-Designer_SampleText= +FR-Designer_Vertical-LeftToRight= +FR-Designer_Vertical-RightToLeft= +FR-Designer_VerticalBoxLayout= +FR-Designer_Visible= +FR-Designer_WLayout-Border-ToolTips= +FR-Designer_WaterMark= +FR-Designer_Widget= +FR-Designer_Widget-Settings= +FR-Designer_Widget-Visible= +FR-Designer_XMLA_Explain= +FR-Designer_bold= +FR-Designer_font= +FR-Designer_italic= +FR-Designer_product_feedback= +FR-Designer_XMLA= +FR-Designer-StyleAlignment_Layout_Default=Default +FR-Designer-StyleAlignment_Layout_Image_Titled=Titled +FR-Designer-StyleAlignment_Layout_Image_Extend=Extend +FR-Designer-StyleAlignment_Layout_Image_Adjust=Adapt +FR-Designer-StyleAlignment_Tooltips_Left=Left +FR-Designer-StyleAlignment_Tooltips_Center=Center +FR-Designer-StyleAlignment_Tooltips_Right=Right +FR-Designer-StyleAlignment_Tooltips_Distributed=Distributed +FR-Designer-StyleAlignment_Tooltips_DEFAULT=DEFAULT +FR-Designer-StyleAlignment_Tooltips_Top=Top +FR-Designer-StyleAlignment_Tooltips_Bottom=Bottom +FR-Designer-StyleAlignment_Pane_Horizontal=Horizontal +FR-Designer-StyleAlignment_Pane_Vertical=Vertical +FR-Designer-StyleAlignment_Pane_Style=Alignment-Style +FR-Designer-StyleAlignment_Style_Indentation=Indentation +FR-Designer-StyleAlignment_Style_Spacing=Spacing +FR-Designer-StyleAlignment_Style_Alignment=Alignment +FR-Designer-CommitTab_Submit=Submit +FR-Designer-CommitTab_SureToDelete=Sure to delete +FR-Designer-CommitTab_Remove=Remove +FR-Designer-Collect_Information_free=Free +FR-Designer-Collect_Information_Description=Description +FR-Designer-Collect_Information_Successfully=Collect Successfully +FR-Designer_Event_Set= +FR-Designer_Blow_set= +FR-Designer_I_Want_To_Set_Single= +FR-Designer_Using_Server_Report_View_Settings= +FR-Designer_ErrorHandlerTemplate= +FR-Designer_Save_Path= +FR-Designer_Chart_Acc_Set=Chart_Acc_Set +FR-Designer_Gradient-Color=Gradient Color +FR-Designer_DEFAULT=DEFAULT +FR-Designer_chart-PreStyle=Chart PreStyle +FR-Designer_Chart-PreStyle=Chart PreStyle +FR-Designer_Already_exist= +FR-Designer_Database=Database +FR-Designer_Model=Model +FR-Designer_Refresh_Successfully=Refresh Successfully +FR-Designer_SQL-Table=Table +FR-Designer_SQL-View=View +FR-Designer_Failed=SyncFailed +FR-Designer_Chart_Field_Name= +FR-Designer_FormulaD-Text=Text +FR-Designer_FormulaD-Logical=Logical Function +FR-Designer_FormulaD-Array=Array +FR-Designer_FormulaD-Report=Report Function +FR-Designer_FormulaD-Other=Other Function +FR-Designer_FormulaD-All=All Function +FR-Designer_Function=Function +FR-Designer_Select=Select +FR-Designer_Edit=Edit +FR-Designer_Description=Function Description +FR-Designer_Role_changed_isRefresh=Roles change, whether to refresh +FR-Designer_FS_Name=FS_Name +FR-Designer_Datasource-Parameter=Data Source +FR-Designer_Tree-ComboBox=Tree ComboBox +FR-Designer_Form-Iframe=Form-Iframe +FR-Designer_Type=Type +FR-Designer_User-defined=User_defined bapiFunction +FR-Designer_Simple_general_forV6=Simple general query for ECC6 +FR-Designer_Import=Import +FR-Designer_Export=Export +FR-Designer_Delete=Delete +FR-Designer_Sequenced_number=Sequenced number +FR-Designer_Parameters_name=parameters name +FR-Designer_SAP_datatype=SAP datatype +FR-Designer_Return_set_name=Return set +FR-Designer_Datatype=Datatype +FR-Designer_Corre_parameter=Corresponse parameter +FR-Designer_Default_value=Default value of parameter +FR-Designer_SAP_column_name=Column name +FR-Designer_Table_name=Table name +FR-Designer_Columns_choosed=Columns choosed by user +FR-Designer_Where_claus=Where claus of open sql +FR-Designer_PreStyle= +FR-Designer_Table= +FR-Designer_Loading= +FR-Designer_Name=Name +FR-Designer_EmailPane-tips= you can type $ {abc} as a parameter, abc is the parameter name; $ {today ()} as a formula, such as\: title text is "$ {today ()} statistics", addressed to "$ {p}, 123@gmail.com, mike ", where mike must has saved in the user management platform as username +FR-Designer_EmailPane-mailContent=Email Body +FR-Designer_EmailPane-BCC=BCC +FR-Designer_EmailPane-mailSubject=Email Subject +FR-Designer_EmailPane-warnings=You have not configured the sender mailbox, please visit the platform configuration or contact the administrator +FR-Designer_Email_sentEmail=sentEmail +FR-Designer_file-is-locked= +FR-Designer_Custom_Icon_Message1=The 16 * 16 standard PNG image is better. +FR-Designer_Add=Add +FR-Designer_Custom_Icon_Message2=The icon name is exist or your operation is unreasonable. +FR-Designer_Tooltips=Tooltips +FR-Designer_Remove=Remove +FR-Designer_Custom_Icon_SelectIcon=Select Icon +FR-Designer_Click_this_button=Click this button to set path +FR-Designer_Custom_Icon_Message3=The icon name is exist. +FR-Designer_Set_default_browser= +FR-Designer_Open=Open +FR-Designer_Utils-OpenDemoEnv= +FR-Designer_Utils-switch=\nThe current unsaved editing files will be saved under current envir0ment\uFF0C\n go on\uFF1F +FR-Designer_Utils-NewDemoEnv=Utils-NewDemoEnv +FR-Designer_Save_As_Global_Style=Save As Global Style +FR-Designer_Input_The_Name_Of_Gloabel_Style=Input The Name Of Gloabel Style +FR-Designer_This_Name_Has_Exsit=This Name Has Exist +FR-Designer_Shortcut_Set= +FR-Designer_Feature_Name= +FR-Designer_Cursor_to_next_column= +FR-Designer_Cursor_to_next_row= +FR-Designer_Current_keys= +FR-Designer_Exchange_key= +FR-Designer_System_default= +FR-Designer_Cursor_to_previous_column= +FR-Designer_Cursor_to_previous_row= +FR-Designer_Are_You_Sure_To_Delete_The_Data=Are_You_Sure_To_Delete_The_Data +FR-Designer_Show_Icon=Show_Icon +FR-Designer_Show_Text=Show_Text +FR-Designer_User_Defined_Event=User Defined Event +FR-Designer_Output_PDF=Output_PDF +FR-Designer_Output_Word=Output_Word +FR-Designer_Image=Image +FR-Designer_Flash_Print=Flash_Print +FR-Designer_PDF_Print=PDF_Print +FR-Designer_Applet_Print=Applet_Print +FR-Designer_Server_Print=Server_Print +FR-Designer_Use_ToolBar=Use ToolBar +FR-Designer_Report_Show_Location=Report Show Location +FR-Designer_Is_Paint_Page=Is_Paint_Page +FR-Designer_IS_Auto_Scale=Is auto scale in iframe +FR-Designer_IS_TD_HEAVY_EXPORT=Is TD Heavy Export +FR-Designer_Top=Top +FR-Designer_Bottom=Bottom +FR-Designer-Collect_OSXTips=Tip\: Press control + v to paste the activation code +FR-Designer_X_Coordinate=X Coordinate +FR-Designer_Y_Coordinate=Y Coordinate +FR-Designer_Widget_Width=Width +FR-Designer_Widget_Height=Height +FR-Designer_Min_Height=Min-Height +FR-Designer_LeftParent=Left Parent +FR-Designer-PluginLicense_Check_Failed=Your plugin license file has expired,please re-activate +FR-Designer-File_address=File address +FR-Designer-Local_file=Local file +FR-Designer_Selection=Selection +FR-Designer-Type_Parameter= +FR-Designer_Add_JS_warning=add js warning +FR-Designer-Encoding_Type=Encoding +FR-Designer-FirstRow_IS_ColumnName=First Row is Column name +FR-Designer_Dismenber=Dismenber +FR-Designer_TableDismember=Tab +FR-Designer_Space=Space +FR-Designer_CommaDismenber=CommaDismenber +FR-Designer_Other=Other +FR-Designer-Series_Dismenber_As_Single= +FR-Designer_KeyPoint=KeyPoint +FR-Designer_loadedTreeModel=loadedTreeModel +FR-Designer-Failed_to_load_the_plugin=Failed to load the plugin\uFF0Cplease update the plugin\: +FR-Designer-Plugin_Please_Update_Jar= +FR-Designer-Invalid_Page_Number=Invalid Page Number +FR-Designer_XMLA_Database=Database +FR-Designer_XMLA_UserName=User name +FR-Designer_XMLA_Password=Password +FR-Designer_XMLA_Get_Catalog=Get Catalog +FR-Designer_XMLA_Not_NULL=Can not be null +FR-Designer_Column-Axis=Column_Axis +FR-Designer_LiteCondition_Common=Common +FR-Designer_LiteCondition_Formula=Formula +FR-Designer_LiteCondition_ConditionB-AND=AND +FR-Designer_LiteCondition_ConditionB-OR=OR +FR-Designer_LiteCondition_Common_Condition=Common Condition +FR-Designer_LiteCondition_Formula_Condition=Formula Condition +FR-Designer_LiteCondition_Define=Define +FR-Designer_Normal= +FR-Designer_Alert= +FR-Designer_Select_All= +FR-Designer_Copy= +FR-Designer_Clear_All= +FR-Designer_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 Addon +FR-Designer_Performance_First= +FR-Designer_Total_N_Grade=Total-N-Grade +FR-Designer-BBSLogin_Login-Title= +FR-Designer_time(s)= +FR-Designer_General= +FR-Designer_Advanced= +FR-Designer_Oracle_All_Tables= +FR-Designer_Product_improve= +FR-Designer_Join_Product_improve= +FR-Designer_Preference-Function= +FR-Designer_max_undo_limit= +FR-Designer_Surport_String_To_Formula= +FR-Designer_Always= +FR-Designer_Export_Setting= +FR-Designer_Select_Export_Log_Directory= +FR-Designer_Level_Setting= +FR-Designer_Choose_Language= +FR-Designer_Work_After_Restart_Designer= +FR-Designer_Setting-Ruler-Units= +FR-Designer_PageSetup-mm= +FR-Designer_Unit_CM= +FR-Designer_Page-Setup-Scale-Units= +FR-Designer_Report-Design-Ruler-Units= +FR-Designer_Web_Preview_Port_Setting= +FR-Designer_Designer_Language= +FR-Designer_Unit_INCH= +FR-Designer_Web_Preview_Port= +FR-Designer_Unit_PT= +FR-Designer-Write_Auto_Stash=auto stash +FR-Designer_Printer_Native_Button= +FR-Designer_Event_ShowWidgets= +FR-Designer_Current_Preview_Rows= +FR-Designer_Data=Data +FR-Designer_Error=Error +FR-Designer_formDesignerModule= +FR-Designer-Website_Url= +FR-Designer-BBSLogin_Download-Unlogin-Tip= +FR-Designer-App_ReLayout=AppRelayout +FR-Designer_Mobile-Attr= +FR-Designer_Mobile-Vertical= +FR-Designer_Mobile-Horizontal= +FR-Designer_COMMUNITY= +FR-Designer_COMMUNITY_BBS= +FR-Designer_COMMUNITY_VIDEO= +FR-Designer_COMMUNITY_HELP= +FR-Designer_COMMUNITY_UPDATE= +FR-Designer_COMMUNITY_NEED= +FR-Designer_COMMUNITY_BUG= +FR-Designer_COMMUNITY_SIGN= +FR-Designer_COMMUNITY_QUESTIONS= +FR-Designer_Mobile-Zoom= +FR-Designer_Mobile-Open= +FR-Designer_Mobile-Warning= +FR-Designer_Button-OK=OK +FR-Designer_Button-Cancel=Cancel +FR-Designer_Write-Save-Formula= +FR-Designer_Export-Save-Formula= +FR-Designer_Form-Fit-Tip= +FR-Designer_Form-Frozen-Tip= +FR-Designer_Form-Forzen-Speed= +FR-Designer_Attention= +FR-Designer_Forbid_Widgets_Intersects= +FR-Designer_Widget_Scaling_Mode_Fit= +FR-Designer_Widget_Scaling_Mode_Fixed= +FR-Designer-Widget_Area_Scaling= +FR-Designer-Widget_Scaling_Mode= +FR-Designer-QQLogin-Determine= +FR-Designer-QQLogin-Cancel= +FR-Designer-Reuse_Manager=Reuse Manager +FR-Designer_TableData-Default-Para=Default Para +FR-Designer_Layout_Block_Absolute=Absolute Layout Block +FR-Designer_Layout_Block_Tab=Tab Layout +FR-Designer_Allow-Blank= +FR-Designer_Layout_Block_Blank=Blank Block +FR-Designer_Attr_Layout=layout +FR-Designer_Attr_Layout_Type=layout type +FR-Designer_Attr_Bidirectional_Adaptive=Bidirectional Adaptive +FR-Designer-Selected_Widget= +FR-Designer_LocalWidget= +FR-Designer_AllCategories= +FR-Designer_SimpleDetail_Report= +FR-Designer_SimpleCross_Report= +FR-Designer_DoubleLayer_Report= +FR-Designer_Download_Template= +FR-Designer_Install_Template= +FR-Designer_Delete_Template= +FR-Designer_Mobile-Refresh=refresh +FR-Designer_Mobile-ToolBar=toolbar +FR-Designer_WLayout-Absolute-ToolTips= +FR-Designer_Reset= +FR-Designer_Add_all= diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties new file mode 100644 index 0000000000..a35606663b --- /dev/null +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -0,0 +1,446 @@ +# generated time: 星期四 十一月 24 11:56:39 CST 2016 +FR-Designer-BBSLogin_Account=User name +FR-Designer-BBSLogin_Connection-Failure=Connection failure, check your network status +FR-Designer-BBSLogin_Connection-Failure-Tip=Tip +FR-Designer-BBSLogin_Forgot-Password=Forget Password +FR-Designer-BBSLogin_Login=Login +FR-Designer-BBSLogin_Login-Failure-Tip=Incorrect username or password! please try again +FR-Designer-BBSLogin_Password=Password +FR-Designer-BBSLogin_Password-Empty-Tip=Password can not be null +FR-Designer-BBSLogin_Register-Account=Register Account +FR-Designer-BBSLogin_Switch-Account=Switch Account +FR-Designer-BBSLogin_Privite-Message=Privite Message +FR-Designer-BBSLogin_Times=times +FR-Designer-BBSLogin_Username-Empty-Tip=User name can not be null +FR-Designer-Basic_More_Color=More Color... +FR-Designer-Estate_Any=Any +FR-Designer-Estate_Default_Font=Default font +FR-Designer-Estate_Default_Null=Default null +FR-Designer-Estate_Default_Text=Default +FR-Designer-Estate_Parameter_Null_Text=Parameter is null, then display as +FR-Designer-Estate_Radio-Group=Common button group controls of real estate +FR-Designer-Estate_Selected_Font=Selected font +FR-Designer-Estate_Widget_Value=Control value +FR-Designer-Layout_Adaptive_Layout=Adaptive layout +FR-Designer-Output_Background_Set=Background set +FR-Designer-Output_Default_Background=Default background +FR-Designer-Output_Excel_Page=Excel Export(page break) +FR-Designer-Output_Excel_Sheet=Excel Export(one page per sheet) +FR-Designer-Output_Excel_Simple=Excel Export(original) +FR-Designer-Plugin_PluginMarket_Coding=Plugin store is developing, stay tuned +FR-Designer-Submit_Condition=Condition +FR-Designer-Widget-Title_border=Border +FR-Designer-Widget-Title_border_color=Color +FR-Designer_AbsoluteLayout=Absolute Layout +FR-Designer_Allow_Decimals=allow decimals +FR-Designer_Allow_Negative=allow negative +FR-Designer_Background-Click=Click Background +FR-Designer_Background-Initial=Initial Background +FR-Designer_Background-Over=Over Background +FR-Designer_Bar-Code-Exception-Tip=Data cannot be null +FR-Designer_Block-intersect=The overlap between block and block is prohibited +FR-Designer_BorderLayout=BorderLayout +FR-Designer_Button-Hotkeys=Hotkeys +FR-Designer_Button-Icon=Button Icon +FR-Designer_Button-Name=Button Name +FR-Designer_Button-Type=Button Type +FR-Designer_CardLayout=TabLayout +FR-Designer_Cell=cell +FR-Designer_Chart_Cell=Chart Hyperlink-Link Cell +FR-Designer_Chart_Float=Chart Hyperlink-Floating Elements +FR-Designer_Chart_Float_chart=Chart Hyperlink-Floating-window Chart +FR-Designer_Check-for-Updates=Check for Updates +FR-Designer_Choose-Data-Confusion-Tip=\ Please Choose the field needed to be confused and then preview +FR-Designer_Close=close +FR-Designer_Column=column +FR-Designer_Column_Measure=Column axis/measure +FR-Designer_Condition_Attributes=Condition attributes +FR-Designer_Confusion-Col-Name=Field Name +FR-Designer_Confusion-key=Confusion Key +FR-Designer_Currency_Line=currency line +FR-Designer_Current_tab=Current tab +FR-Designer_Custom=Custom +FR-Designer_Custom-Angle=Custom Angle +FR-Designer_DS-Dictionary=Data Dictionary +FR-Designer_Data-confusion=Data Confusion +FR-Designer_Data_Type=Data type +FR-Designer_Double_Click_Edit_OR_Clear=Double Click to Edit or Clear +FR-Designer_Email=Mail +FR-Designer_Enabled=Enabled +FR-Designer_End-Date=End Date +FR-Designer_ExportAndOutput=Export +FR-Designer_FRFont=Font +FR-Designer_FS_Close_Other_Templates=Close other templates +FR-Designer_File=file +FR-Designer_Filter_Conditions=Filter condition +FR-Designer_Finish-Modify-Share=Finish Modification And Share +FR-Designer_Fit-App=App self-adaption +FR-Designer_Font-Family=Font name +FR-Designer_Font-Size=Font size +FR-Designer_Forbid_Drag_into_Adapt_Pane=Form body cannot be dragged into the object +FR-Designer_Forbid_Drag_into_Para_Pane=The object cannot be dragged into the parameter panel +FR-Designer_Foreground=Foreground +FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=Form permissions edition is not supported +FR-Designer_Form-Report=Report block +FR-Designer_Form_EmbeddedTD=Form(built-in data) +FR-Designer_Form_Module=Form Module +FR-Designer_Format_explan=Format explain +FR-Designer_Allow-Blank=Allow Blank +FR-Designer_Formula=Formula +FR-Designer_Forum=Forum +FR-Designer_Get-CubeGetting cube= +FR-Designer_Help=Help +FR-Designer_Hide=Hide +FR-Designer_Hyperlink=Hyperlink +FR-Designer_Hyperlink-Form_link=Current form object +FR-Designer_IDCard=IDCard +FR-Designer_Icon=Icon +FR-Designer_Index=index +FR-Designer_Input_Rule=Input Rule +FR-Designer_Language_Default=Default +FR-Designer_Layout=Layout +FR-Designer_Layout-HBox=Horizontal Box Layout +FR-Designer_Layout-Index=Layout Index +FR-Designer_Layout_Constraints=Layout Constraints +FR-Designer_Length=Length +FR-Designer_Loading_Data=Loading Data +FR-Designer_M-Exit=Exit +FR-Designer_M-Help=Help +FR-Designer_M-Insert=Insert +FR-Designer_M-Repeat-Freeze=Duplicate and freeze +FR-Designer_M-Server=Server +FR-Designer_M-SwitchWorkspace=Switch Working Directory +FR-Designer_M-Template=Template +FR-Designer_MDX_Explain=Syntax Reference MDX syntax.\nFor example\:\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]\nNOTE\: COLUMNS, ROWS can be replaced by 0,1, the query axis only supports returning two axis +FR-Designer_M_Help-About_Software=About software +FR-Designer_M_Help-Tutorial=Help tutorial +FR-Designer_Max_Value=max value +FR-Designer_Min_Value=min value +FR-Designer_MobilePhone=Mobile phone +FR-Designer_New_Value=new value +FR-Designer_None=none +FR-Designer_PaperSize-Mobile=Mobile +FR-Designer_PaperSize-Mobile-Large=Large screen +FR-Designer_PaperSize-Mobile-Small=Small screen +FR-Designer_Para-Body=Parameter interface +FR-Designer_Parameters=Parameters +FR-Designer_Phone=Phone +FR-Designer_PostCode=Postcode +FR-Designer_Present=present +FR-Designer_Preview=Preview +FR-Designer_Preview-Data-Confusion=Preview Data After Confusion +FR-Designer_Product_Demo=Demo +FR-Designer_Query_Type=Query type +FR-Designer_Refresh=Refresh +FR-Designer_Refresh_Parameter_In_SQL=Whether to refresh parameters in the SQL +FR-Designer_Reg_Expressions=Regular expressions +FR-Designer_Reg_Max_Length=max length +FR-Designer_Reg_Min_Length=min length +FR-Designer_ReportColumns-Columns=Multi-columns/lines +FR-Designer_Return-Date=Return Date +FR-Designer_RichText=Insert Rich Text +FR-Designer_RichTextEditor=Rich Text Editor +FR-Designer_Row=Row +FR-Designer_Row_Dimension=Row/dimension +FR-Designer_Save=Save +FR-Designer_Search=Search +FR-Designer_Set=Set +FR-Designer_Share-Template=Share Template +FR-Designer_Simple_general=Simple custom query +FR-Designer_Song_TypeFace=song typeface +FR-Designer_Start-Date=Start Date +FR-Designer_Subscript=Subscript +FR-Designer_Superscript=Superscript +FR-Designer_Support_QQ=Support online +FR-Designer_Swatch=Swatch +FR-Designer_Tab_title=Tab title +FR-Designer_TableData=Data set +FR-Designer_Thank_guest=Special Thanks +FR-Designer_Thanks-To=Thanks +FR-Designer_Title=Title +FR-Designer_Total=Total +FR-Designer_UnSignIn=Not Sign In +FR-Designer_Underline=Underline +FR-Designer_Used=Recently Used +FR-Designer_User-defined-MDX=Custom MDX query +FR-Designer_SampleText=SampleText SampleText +FR-Designer_Vertical-LeftToRight=Vertical Text (Left to Right) +FR-Designer_Vertical-RightToLeft=Vertical Text (Right To Left) +FR-Designer_VerticalBoxLayout=Vertical Box Layout +FR-Designer_Visible=Visible +FR-Designer_WLayout-Border-ToolTips=The complete border layout container\uFF0Cis composed of central, eastern, western, northern and southern parts. You can adjust the height of the northern and southern ones and the width of the eastern and western ones. +FR-Designer_WaterMark=WaterMark +FR-Designer_Widget=Control +FR-Designer_Widget-Settings=Control Settings +FR-Designer_Widget-Visible=Visible +FR-Designer_XMLA_Explain=Before using the cube access data, you need a successfully multi-database connection. \ n There are two different access methods. \ n1. Simple custom queries: \ n it applies to FineBI and other multidimensional database. \ n FR will automatically read the hierarchy of the selected cube, you can directly select the metric and dimension, and add filter conditions, FR will automatically query the data based on your selections. \ n Simple custom query only support metric and dimensions query. \ n In the metric and dimension settings, currently you can only select the desired dimension, can not be modified manually. \ n Filters using OPEN SQL, you can type $ {abc} as a parameter, the method same with database data sets. \ n2. custom MDX query: \ n You can customize the MDX statement to query the desired result. \ n NOTE custom MDX query only support two axes queries. \ n You can type $ {abc} as a parameter, the method same with database data sets. \ nThe cube of FineBI does not support MDX queries. +FR-Designer_bold=Bold +FR-Designer_font=Font +FR-Designer_italic=Italic +FR-Designer_product_feedback=Product feedback +FR-Designer_XMLA=Multi-dimensional DB +FR-Designer-StyleAlignment_Layout_Default=Default +FR-Designer-StyleAlignment_Layout_Image_Titled=Tile +FR-Designer-StyleAlignment_Layout_Image_Extend=Stretch +FR-Designer-StyleAlignment_Layout_Image_Adjust=Adapt +FR-Designer-StyleAlignment_Tooltips_Left=Left +FR-Designer-StyleAlignment_Tooltips_Center=Center +FR-Designer-StyleAlignment_Tooltips_Right=Right +FR-Designer-StyleAlignment_Tooltips_Distributed=Distributed +FR-Designer-StyleAlignment_Tooltips_DEFAULT=Default +FR-Designer-StyleAlignment_Tooltips_Top=Top +FR-Designer-StyleAlignment_Tooltips_Bottom=Bottom +FR-Designer-StyleAlignment_Pane_Horizontal=Horizontal align +FR-Designer-StyleAlignment_Pane_Vertical=Vertical align +FR-Designer-StyleAlignment_Pane_Style=Alignment +FR-Designer-StyleAlignment_Style_Indentation=Indentation +FR-Designer-StyleAlignment_Style_Spacing=Spacing +FR-Designer-StyleAlignment_Style_Alignment=Alignment +FR-Designer-CommitTab_Submit=Submit +FR-Designer-CommitTab_SureToDelete=Sure to delete +FR-Designer-CommitTab_Remove=Remove +FR-Designer-Collect_Information_free=Free +FR-Designer-Collect_Information_Description=Description +FR-Designer-Collect_Information_Successfully=Collect Successfully +FR-Designer_Chart_Acc_Set=Acc +FR-Designer_Gradient-Color=Gradient +FR-Designer_DEFAULT=DEFAULT +FR-Designer_chart-PreStyle=Chart PreStyle +FR-Designer_Chart-PreStyle=Chart PreStyle +FR-Designer_Already_exist=Already Exist +FR-Designer_Database=DB +FR-Designer_Model=Model +FR-Designer_Refresh_Successfully=Refresh successfully +FR-Designer_SQL-Table=Tab +FR-Designer_SQL-View=View +FR-Designer_Failed=Failed +FR-Designer_Chart_Field_Name=FieldName +FR-Designer_FormulaD-Text=Text +FR-Designer_FormulaD-Logical=Logical Function +FR-Designer_FormulaD-Array=Array +FR-Designer_FormulaD-Report=Report Function +FR-Designer_FormulaD-Other=Other Functions +FR-Designer_FormulaD-All=All Functions +FR-Designer_Function=Function +FR-Designer_Select=Sel +FR-Designer_Edit=Edit +FR-Designer_Description=Description +FR-Designer_Role_changed_isRefresh=Roles change, whether to refresh +FR-Designer_FS_Name=FineBI +FR-Designer_Datasource-Parameter=Datasource Parameter +FR-Designer_Tree-ComboBox=Tree Combobox +FR-Designer_Form-Iframe=Iframe +FR-Designer_Type=Type +FR-Designer_User-defined=User_defined +FR-Designer_Simple_general_forV6=Simple general for Version6+ +FR-Designer_Import=Import +FR-Designer_Export=Export +FR-Designer_Delete=Delete +FR-Designer_Sequenced_number=Sequenced number +FR-Designer_Parameters_name=parameters name +FR-Designer_SAP_datatype=SAP datatype +FR-Designer_Return_set_name=Return set +FR-Designer_Datatype=Datatype +FR-Designer_Corre_parameter=Corresponse parameter +FR-Designer_Default_value=Default value +FR-Designer_SAP_column_name=Column name +FR-Designer_Table_name=Table name +FR-Designer_Columns_choosed=Columns choosed +FR-Designer_Where_claus=Where claus +FR-Designer_PreStyle=Pre Style +FR-Designer_Loading=Loading +FR-Designer_Table=Table +FR-Designer_Name=Name +FR-Designer_EmailPane-tips= You can type $ {abc} as a parameter, abc is the parameter name; $ {today ()} as a formula, such as\: title text is "$ {today ()} statistics", addressed to "$ {p}, 123@gmail.com, mike ", where mike must has saved in the user management platform as username +FR-Designer_EmailPane-mailContent=Email Body +FR-Designer_EmailPane-BCC=BCC +FR-Designer_EmailPane-mailSubject=Email Subject +FR-Designer_EmailPane-warnings=Visit platform or contact administrator to configure sender mailbox +FR-Designer_Email_sentEmail=Sent Email +FR-Designer_file-is-locked=File is locked by others. +FR-Designer_Custom_Icon_Message1=The 16 * 16 standard PNG image is better. +FR-Designer_Add=Add +FR-Designer_Custom_Icon_Message2=The icon name is already exist or your operation is unreasonable. +FR-Designer_Tooltips=Tooltips +FR-Designer_Remove=Remove +FR-Designer_Custom_Icon_SelectIcon=Select icon +FR-Designer_Click_this_button=Click this button to set path +FR-Designer_Custom_Icon_Message3=The icon name is already exist. +FR-Designer_Set_default_browser=Cannot find the default browser, please set default browser in Intenet options . +FR-Designer_Open=Open +FR-Designer_Utils-OpenDemoEnv=To open the demo, it needs to switch to the workspace\: +FR-Designer_Utils-switch=\nThe current unsaved editing files will be saved under current environment?\nGo on? +FR-Designer_Utils-NewDemoEnv=To open the demo,it needs to create the workspace\: +FR-Designer_Save_As_Global_Style=Save as Global Style +FR-Designer_Input_The_Name_Of_Gloabel_Style=Input the name of gloabel style +FR-Designer_This_Name_Has_Exsit=This name has existed +FR-Designer_Shortcut_Set=Shortcut Setting +FR-Designer_Feature_Name=Feature Name\: +FR-Designer_Cursor_to_next_column=Move cursor to next column +FR-Designer_Cursor_to_next_row=Move cursor to next row +FR-Designer_Current_keys=Current keys\: +FR-Designer_Exchange_key=Click to exchange shortcut key +FR-Designer_System_default=System default +FR-Designer_Cursor_to_previous_column=Move cursor to previous column\: +FR-Designer_Cursor_to_previous_row=Move cursor to previous row\: +FR-Designer_Are_You_Sure_To_Delete_The_Data=Are you sure to delete the data +FR-Designer_Show_Icon=Show Icon of the Button +FR-Designer_Show_Text=Show Name of the Button +FR-Designer_User_Defined_Event=User Defined Event +FR-Designer_Output_PDF=Output PDF +FR-Designer_Output_Word=Output Word +FR-Designer_Image=Image +FR-Designer_Flash_Print=Flash Print +FR-Designer_PDF_Print=PDF Print +FR-Designer_Applet_Print=Applet Print +FR-Designer_Server_Print=Server Print +FR-Designer_Use_ToolBar=Use toolbar +FR-Designer_Report_Show_Location=Report Show Location +FR-Designer_Is_Paint_Page=Show as image +FR-Designer_IS_Auto_Scale=Auto scale when iframe is embedded +FR-Designer_IS_TD_HEAVY_EXPORT=Heavy TD +FR-Designer_Top=Top +FR-Designer_Bottom=Bottom +FR-Designer_Event_Set=Event Setup +FR-Designer_Blow_set=Following Settings +FR-Designer_I_Want_To_Set_Single=Individually set for the report +FR-Designer_Using_Server_Report_View_Settings=Use server report settings +FR-Designer_ErrorHandlerTemplate=Error Template Definition +FR-Designer_Save_Path=Save Path +FR-Designer-Collect_OSXTips=Tip\: Press control + v to paste the activation code +FR-Designer_X_Coordinate=Abscissa +FR-Designer_Y_Coordinate=Ordinate +FR-Designer_Widget_Width=Width +FR-Designer_Widget_Height=Height +FR-Designer_Min_Height=minheight +FR-Designer_LeftParent=Left Parent Cell +FR-Designer-PluginLicense_Check_Failed=Your plugin license file has expired,please re-activate +FR-Designer-File_address=File address +FR-Designer-Local_file=Local file +FR-Designer_Selection=Selection +FR-Designer-Type_Parameter= You can type "${abc}" as a parameter, here, abc is a parameter name.
 for example
+FR-Designer_Add_JS_warning=Type the correct URL +FR-Designer-Encoding_Type=Encoding Type +FR-Designer-FirstRow_IS_ColumnName=First row contains column headings +FR-Designer_Dismenber=Separator +FR-Designer_TableDismember=Tab +FR-Designer_Space=Space +FR-Designer_CommaDismenber=Comma +FR-Designer_Other=Other +FR-Designer-Series_Dismenber_As_Single=Regard consecutive separators as one +FR-Designer_KeyPoint=KeyPoint +FR-Designer_loadedTreeModel=loadedTreeModel +FR-Designer-Failed_to_load_the_plugin=Failed to load the plugin\uFF0Cplease update the plugin\: +FR-Designer-Plugin_Please_Update_Jar=Please Update Jar +FR-Designer-Invalid_Page_Number=Invalid Page Number +FR-Designer_XMLA_Database=DB +FR-Designer_XMLA_UserName=User name +FR-Designer_XMLA_Password=Password +FR-Designer_XMLA_Get_Catalog=Getting Catalog +FR-Designer_XMLA_Not_NULL=NOT NULL +FR-Designer_Column-Axis=Column Axis +FR-Designer_LiteCondition_Common=Common +FR-Designer_LiteCondition_Formula=Formula +FR-Designer_LiteCondition_ConditionB-AND=AND +FR-Designer_LiteCondition_ConditionB-OR=OR +FR-Designer_LiteCondition_Common_Condition=Common Condition +FR-Designer_LiteCondition_Formula_Condition=Formula Condition +FR-Designer_LiteCondition_Define=Define +FR-Designer_Normal=Normal +FR-Designer_Alert=Alert +FR-Designer_Select_All=Select All +FR-Designer_Copy=Copy +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 Addon +FR-Designer_Performance_First=Performance First +FR-Designer_Total_N_Grade=Total\:${N}Layer +FR-Designer-BBSLogin_Login-Title=BBS Login +FR-Designer_time(s)=time(s) +FR-Designer_General=Common +FR-Designer_Advanced=Advanced +FR-Designer_Validate=Validate +FR-Designer_Oracle=All Tables +FR-Designer_Product_improve=Product improvement +FR-Designer_Join_Product_improve=Join product improvement plan +FR-Designer_Preference-Function=Function +FR-Designer_max_undo_limit=Max +FR-Designer_Surport_String_To_Formula=Surport String To Formula +FR-Designer_Always=Default execute this operation +FR-Designer_Export_Setting=Export Configuration +FR-Designer_Select_Export_Log_Directory=Select Export Log Directory +FR-Designer_Level_Setting=Level Setting +FR-Designer_Choose_Language=Choose Language +FR-Designer_Work_After_Restart_Designer=Take effect when the designer is restarted +FR-Designer_Setting-Ruler-Units=Ruler Units Setting +FR-Designer_PageSetup-mm=mm +FR-Designer_Unit_CM=CM +FR-Designer_Page-Setup-Scale-Units=Page Setup Scale Units +FR-Designer_Report-Design-Ruler-Units=Report design ruler unit +FR-Designer_Web_Preview_Port_Setting=Port Setting +FR-Designer_Designer_Language=Designer Language +FR-Designer_Unit_INCH=INCH +FR-Designer_Web_Preview_Port=Port number +FR-Designer_Oracle_All_Tables=All Tables +FR-Designer_Unit_PT=Pound +FR-Designer-Write_Auto_Stash=auto stash +FR-Designer_Printer_Native_Button=Native Print +FR-Designer_Event_ShowWidgets=Display widgets directly +FR-Designer_Current_Preview_Rows=Current Number of Preview Rows +FR-Designer_Data=Data +FR-Designer_Error=Error +FR-Designer_formDesignerModule=Form Designer +FR-Designer-Website_Url=http\://www.finereport.com/en +FR-Designer-BBSLogin_Download-Unlogin-Tip= +FR-Designer-App_ReLayout=AppRelayout +FR-Designer_Mobile-Attr=Mobile Attr +FR-Designer_Mobile-Vertical=Vertical Screen +FR-Designer_Mobile-Horizontal=Horizontal Screen +FR-Designer_COMMUNITY=community +FR-Designer_COMMUNITY_BBS=bbs +FR-Designer_COMMUNITY_VIDEO=video +FR-Designer_COMMUNITY_HELP=help +FR-Designer_COMMUNITY_UPDATE=update +FR-Designer_COMMUNITY_NEED=need +FR-Designer_COMMUNITY_BUG=bug report +FR-Designer_COMMUNITY_SIGN=sign +FR-Designer_COMMUNITY_QUESTIONS=questions +FR-Designer_Mobile-Zoom=zoom +FR-Designer_Mobile-Open=Open +FR-Designer_Mobile-Warning= +FR-Designer_Button-OK=OK +FR-Designer_Button-Cancel=Cancel +FR-Designer_Write-Save-Formula=Preserve formula when fill +FR-Designer_Export-Save-Formula=Preserve formula when export +FR-Designer_Form-Fit-Tip=Fit Plugin +FR-Designer_Form-Frozen-Tip=When Use Form Frozen, Suggest Install +FR-Designer_Form-Forzen-Speed=To Speed UP. +FR-Designer_Attention=attention +FR-Designer_Forbid_Widgets_Intersects=Forbid Widgets Intersects +FR-Designer_Widget_Scaling_Mode_Fit=Area-Fit +FR-Designer_Widget_Scaling_Mode_Fixed=Area-Fixed +FR-Designer-Widget_Area_Scaling=Widget Area Scaling +FR-Designer-Widget_Scaling_Mode=Widget Scaling Mode +FR-Designer-QQLogin-Determine=Determine +FR-Designer-QQLogin-Cancel=Cancel +FR-Designer-Reuse_Manager=Reuse Manager +FR-Designer_TableData-Default-Para=Default Para +FR-Designer_Layout_Block_Absolute=Absolute Layout Block +FR-Designer_Layout_Block_Tab=TabLayout +FR-Designer_Layout_Block_Blank=Blank Block +FR-Designer_Attr_Layout=layout +FR-Designer_Attr_Layout_Type=layout type +FR-Designer_Attr_Bidirectional_Adaptive=Bidirectional Adaptive +FR-Designer-Selected_Widget=selected widget +FR-Designer_LocalWidget=local widget +FR-Designer_AllCategories=all categories +FR-Designer_Download_Template=download template +FR-Designer_Install_Template=install template +FR-Designer_Delete_Template=delete template +FR-Designer_Mobile-Refresh=refresh +FR-Designer_Mobile-ToolBar=toolbar +FR-Designer_WLayout-Absolute-ToolTips=Freestyle layout, add control in any position of the layout +FR-Designer_Reset=reset +FR-Designer_Add_all=Add all diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties new file mode 100644 index 0000000000..2fe50ef9b5 --- /dev/null +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -0,0 +1,424 @@ +# generated time: 星期四 十一月 24 11:56:39 CST 2016 +FR-Designer-BBSLogin_Account=\u30E6\u30FC\u30B6\u30FC\u540D +FR-Designer-BBSLogin_Connection-Failure=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u73FE\u5728\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u72B6\u614B\u3092\u691C\u67FB\u3057\u3066\u304F\u3060\u3055\u3044 +FR-Designer-BBSLogin_Connection-Failure-Tip=\u30D2\u30F3\u30C8 +FR-Designer-BBSLogin_Forgot-Password=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5FD8\u308C\u305F +FR-Designer-BBSLogin_Login=\u30ED\u30B0\u30A4\u30F3 +FR-Designer-BBSLogin_Login-Failure-Tip=\u30E6\u30FC\u30B6\u30FC\u540D\u307E\u305F\u306F\u30D1\u30B9\u30EF\u30FC\u30C9\u30A8\u30E9\u30FC\u3067\u3059\u3002\u518D\u5EA6\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u304F\u3060\u3055\u3044 +FR-Designer-BBSLogin_Password=\u30D1\u30B9\u30EF\u30FC\u30C9 +FR-Designer-BBSLogin_Password-Empty-Tip=\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u7A7A\u6B04\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093 +FR-Designer-BBSLogin_Register-Account=\u30A2\u30AB\u30A6\u30F3\u30C8\u767B\u9332 +FR-Designer-BBSLogin_Switch-Account=\u30A2\u30AB\u30A6\u30F3\u30C8\u5207\u308A\u66FF\u3048 +FR-Designer-BBSLogin_Privite-Message=\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8\u30E1\u30C3\u30BB\u30FC\u30B8 +FR-Designer-BBSLogin_Times=\u6B21 +FR-Designer-BBSLogin_Username-Empty-Tip=\u30E6\u30FC\u30B6\u30FC\u540D\u306F\u7A7A\u6B04\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093 +FR-Designer-Basic_More_Color=\u3082\u3063\u3068\u8272 +FR-Designer-Estate_Any=\u4E0D\u9650 +FR-Designer-Estate_Default_Font=\u30C7\u30D5\u30A9\u30EB\u30C8\u30D5\u30A9\u30F3\u30C8 +FR-Designer-Estate_Default_Null=\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u7A7A\u6B04\u306B\u3059\u308B +FR-Designer-Estate_Default_Text=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024 +FR-Designer-Estate_Parameter_Null_Text=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u7A7A\u6B04\u306B\u3057\u8868\u793A\u3059\u308B +FR-Designer-Estate_Radio-Group=\u4E0D\u52D5\u7523\u696D\u901A\u7528\u30DC\u30BF\u30F3\u30BB\u30C3\u30C8\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB +FR-Designer-Estate_Selected_Font=\u9078\u629E\u3057\u305F\u30D5\u30A9\u30F3\u30C8 +FR-Designer-Estate_Widget_Value=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u5024 +FR-Designer-Layout_Adaptive_Layout=\u81EA\u9069\u5FDC\u914D\u7F6E +FR-Designer-Output_Background_Set=\u80CC\u666F\u8A2D\u5B9A +FR-Designer-Output_Default_Background=\u30C7\u30D5\u30A9\u30EB\u30C8\u80CC\u666F +FR-Designer-Output_Excel_Page=Excel\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8(\u30DA\u30FC\u30B8\u5225\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8) +FR-Designer-Output_Excel_Sheet=Excel\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8(\u30DA\u30FC\u30B8\u5225\u30B7\u30FC\u30C8\u5225\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8) +FR-Designer-Output_Excel_Simple=Excel\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8(\u5143\u306E\u307E\u307E\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8) +FR-Designer-Plugin_PluginMarket_Coding=\u30D7\u30E9\u30B0\u30A4\u30F3\u30DE\u30FC\u30B1\u30C3\u30C8\u306F\u958B\u767A\u4E2D\u3067\u3059\u3002\u3054\u671F\u5F85\u304F\u3060\u3055\u3044 +FR-Designer-Submit_Condition=\u6761\u4EF6 +FR-Designer-Widget-Title_border=\u30D5\u30EC\u30FC\u30E0 +FR-Designer-Widget-Title_border_color=\u8272 +FR-Designer_AbsoluteLayout=\u7D76\u5BFE\u30EC\u30A4\u30A2\u30A6\u30C8 +FR-Designer_Allow_Decimals=\u5C0F\u6570\u3092\u8A31\u53EF +FR-Designer_Allow_Negative=\u30DE\u30A4\u30CA\u30B9\u5024\u3092\u8A31\u53EF +FR-Designer_Background-Click=\u30DE\u30A6\u30B9\u30AF\u30EA\u30C3\u30AF\u80CC\u666F +FR-Designer_Background-Initial=\u521D\u671F\u80CC\u666F +FR-Designer_Background-Over=\u30DE\u30A6\u30B9\u30D5\u30ED\u30FC\u30C8\u80CC\u666F +FR-Designer_Bar-Code-Exception-Tip=\u30C7\u30FC\u30BF\u306F\u7A7A\u6B04\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093 +FR-Designer_Block-intersect=\u30E2\u30B8\u30E5\u30FC\u30EB\u3068\u30E2\u30B8\u30E5\u30FC\u30EB\u9593\u3092\u91CD\u306D\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +FR-Designer_BorderLayout=\u30DC\u30FC\u30C0\u30FC\u30EC\u30A4\u30A2\u30A6\u30C8 +FR-Designer_Button-Hotkeys=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC +FR-Designer_Button-Icon=\u30DC\u30BF\u30F3\u30A2\u30A4\u30B3\u30F3 +FR-Designer_Button-Name=\u30DC\u30BF\u30F3\u540D\u79F0 +FR-Designer_Button-Type=\u30DC\u30BF\u30F3\u30BF\u30A4\u30D7 +FR-Designer_CardLayout=Tab\u914D\u7F6E +FR-Designer_Cell=\u30BB\u30EB +FR-Designer_Chart_Cell=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF-\u9023\u52D5\u30BB\u30EB +FR-Designer_Chart_Float=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF-\u9023\u52D5\u30D5\u30ED\u30FC\u8981\u7D20 +FR-Designer_Chart_Float_chart=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF-\u30D5\u30ED\u30FC\u7A93\u30B0\u30E9\u30D5 +FR-Designer_Check-for-Updates=\u66F4\u65B0\u3092\u78BA\u8A8D +FR-Designer_Choose-Data-Confusion-Tip=\ \u6DF7\u4EA4\u3059\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u9078\u629E\u5F8C\u30D7\u30EC\u30D3\u30E5\u30FC\u3057\u3066\u304F\u3060\u3055\u3044 +FR-Designer_Close=\u30AF\u30ED\u30FC\u30BA +FR-Designer_Column=\u5217 +FR-Designer_Column_Measure=\u5217\u8EF8/\u5EA6\u91CF\u5024 +FR-Designer_Condition_Attributes=\u6761\u4EF6\u5C5E\u6027 +FR-Designer_Confusion-Col-Name=\u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u79F0 +FR-Designer_Confusion-key=\u6DF7\u4EA4\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9 +FR-Designer_Currency_Line=\u91D1\u984D\u7DDA +FR-Designer_Current_tab=\u73FE\u5728\u306E\u7DE8\u96C6tab +FR-Designer_Custom=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA +FR-Designer_Custom-Angle=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u89D2\u5EA6 +FR-Designer_DS-Dictionary=\u30C7\u30FC\u30BF\u5B57\u5178 +FR-Designer_Data-confusion=\u30C7\u30FC\u30BF\u6DF7\u4EA4 +FR-Designer_Data_Type=\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7 +FR-Designer_Double_Click_Edit_OR_Clear=\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u7DE8\u96C6\u307E\u305F\u306F\u30AF\u30EA\u30A2\u3059\u308B +FR-Designer_Email=\u30E1\u30FC\u30EB +FR-Designer_Enabled=\u4F7F\u7528\u53EF\u80FD +FR-Designer_End-Date=\u7D42\u4E86\u65E5\u671F +FR-Designer_ExportAndOutput=\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8 +FR-Designer_FRFont=\u30D5\u30A9\u30F3\u30C8 +FR-Designer_FS_Close_Other_Templates=\u305D\u306E\u4ED6\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u9589\u3058\u308B +FR-Designer_File=\u30D5\u30A1\u30A4\u30EB +FR-Designer_Filter_Conditions=\u9078\u5225\u6761\u4EF6 +FR-Designer_Finish-Modify-Share=\u4FEE\u6B63\u3092\u5B8C\u4E86\u3057\u3066\u30B7\u30A7\u30A2 +FR-Designer_Fit-App=App\u81EA\u9069\u5FDC +FR-Designer_Font-Family=\u30D5\u30A9\u30F3\u30C8\u540D\u79F0 +FR-Designer_Font-Size=\u30D5\u30A9\u30F3\u30C8\u5927\u5C0F +FR-Designer_Forbid_Drag_into_Adapt_Pane=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30D5\u30A9\u30FC\u30E0\u672C\u6587\u3092\u30C9\u30E9\u30C3\u30B0\u3059\u308B\u3053\u3068\u306F\u8A31\u3055\u308C\u306A\u3044 +FR-Designer_Forbid_Drag_into_Para_Pane=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30D1\u30CD\u30EB\u306B\u30C9\u30E9\u30C3\u30B0\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093 +FR-Designer_Foreground=\u8272 +FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=\u8868\u306E\u6A29\u9650\u7DE8\u96C6\u306B\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093 +FR-Designer_Form-Report=\u5E33\u7968\u30E2\u30B8\u30E5\u30FC\u30EB +FR-Designer_Form_EmbeddedTD=\u8868(\u5185\u8535\u30C7\u30FC\u30BF) +FR-Designer_Form_Module=\u8868\u30E2\u30B8\u30E5\u30FC\u30EB +FR-Designer_Format_explan=\u66F8\u5F0F\u8AAC\u660E +FR-Designer_Formula=\u516C\u5F0F +FR-Designer_Forum=BBS +FR-Designer_Get-Cube=cube\u53D6\u5F97\u4E2D +FR-Designer_Help=\u30D8\u30EB\u30D7 +FR-Designer_Hide=\u96A0\u3059 +FR-Designer_Hyperlink=\u30B9\u30FC\u30D1\u30FC\u30EA\u30F3\u30AF +FR-Designer_Hyperlink-Form_link=\u73FE\u5728\u306E\u8868\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8 +FR-Designer_IDCard=\u8EAB\u5206\u8A3C\u660E\u66F8 +FR-Designer_Icon=\u30A2\u30A4\u30B3\u30F3 +FR-Designer_Index=\u5217\u8EF8/\u6307\u6A19 +FR-Designer_Input_Rule=\u30EB\u30FC\u30EB\u8A18\u5165 +FR-Designer_Language_Default=\u30C7\u30D5\u30A9\u30EB\u30C8 +FR-Designer_Layout=\u914D\u7F6E +FR-Designer_Layout-HBox=\u6C34\u5E73\u30B1\u30FC\u30B9\u914D\u7F6E +FR-Designer_Layout-Index=\u7D22\u5F15 +FR-Designer_Layout_Constraints=\u4F4D\u7F6E\u3068\u5927\u5C0F +FR-Designer_Length=\u9577\u3055 +FR-Designer_Loading_Data=\u30C7\u30FC\u30BF\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3057\u3066\u3044\u307E\u3059 +FR-Designer_M-Exit=\u9000\u51FA +FR-Designer_M-Help=\u30D8\u30EB\u30D7 +FR-Designer_M-Insert=\u633F\u5165 +FR-Designer_M-Repeat-Freeze=\u91CD\u8907\u3068\u30D5\u30EA\u30FC\u30BA\u8A2D\u5B9A +FR-Designer_M-Server=\u30B5\u30FC\u30D0\u30FC +FR-Designer_M-SwitchWorkspace=\u4F5C\u696D\u76EE\u6B21\u5207\u308A\u66FF\u3048 +FR-Designer_M-Template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +FR-Designer_MDX_Explain=\u6587\u6CD5\u66F8\u5F0F\u306FMDX\u6587\u6CD5\u3092\u53C2\u8003\u3002\n\u4F8B\u3048\u3070\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\u6CE8\uFF1ACOLUMNS\u3001ROWS\u306F0\u30011\u3092\u4F7F\u7528\u3057\u3066\u4EE3\u66FF\u53EF\u80FD\u3067\u3059\u3002\u30AF\u30A8\u30EA\u8EF8\u306F\u4E8C\u3064\u306E\u8EF8\u623B\u3057\u306B\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002 +FR-Designer_M_Help-About_Software=\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u306B\u3064\u3044\u3066 +FR-Designer_M_Help-Tutorial=\u30D8\u30EB\u30D7\u30C1\u30E5\u30FC\u30C8\u30EA\u30A2\u30EB +FR-Designer_Max_Value=\u6700\u5927\u5024 +FR-Designer_Min_Value=\u6700\u5C0F\u5024 +FR-Designer_MobilePhone=\u643A\u5E2F\u96FB\u8A71 +FR-Designer_New_Value=\u65B0\u5024 +FR-Designer_None=\u7121\u3057 +FR-Designer_PaperSize-Mobile=\u643A\u5E2F\u96FB\u8A71 +FR-Designer_PaperSize-Mobile-Large=\u643A\u5E2F\u96FB\u8A71\u5927\u30B9\u30AF\u30EA\u30FC\u30F3 +FR-Designer_PaperSize-Mobile-Small=\u643A\u5E2F\u96FB\u8A71\u5C0F\u30B9\u30AF\u30EA\u30FC\u30F3 +FR-Designer_Para-Body=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u753B\u9762 +FR-Designer_Parameters=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC +FR-Designer_Phone=\u96FB\u8A71 +FR-Designer_PostCode=\u90F5\u4FBF\u756A\u53F7 +FR-Designer_Present=\u30D5\u30A9\u30EB\u30E0 +FR-Designer_Preview=\u30D7\u30EC\u30D3\u30E5\u30FC +FR-Designer_Preview-Data-Confusion=\u6DF7\u4EA4\u5F8C\u306E\u30C7\u30FC\u30BF\u3092\u30D7\u30EC\u30D3\u30E5\u30FC +FR-Designer_Product_Demo=\u88FD\u54C1\u30C7\u30E2 +FR-Designer_Query_Type=\u30AF\u30A8\u30EA\u65B9\u6CD5 +FR-Designer_Refresh=\u66F4\u65B0 +FR-Designer_Refresh_Parameter_In_SQL=SQL\u4E2D\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u66F4\u65B0\u3057\u307E\u3059\u304B +FR-Designer_Reg_Expressions=\u6B63\u5247\u8868\u73FE\u5F0F +FR-Designer_Reg_Max_Length=\u6700\u5927\u9577\u3055 +FR-Designer_Reg_Min_Length=\u6700\u5C0F\u9577\u3055 +FR-Designer_ReportColumns-Columns=\u6BB5\u7D44\u307F +FR-Designer_Return-Date=\u65E5\u671F\u306B\u623B\u308B +FR-Designer_RichText=\u30EA\u30C3\u30C1\u6587\u66F8\u633F\u5165 +FR-Designer_RichTextEditor=\u30EA\u30C3\u30C1\u6587\u66F8\u30A8\u30C7\u30A3\u30BF +FR-Designer_Row=\u884C +FR-Designer_Row_Dimension=\u884C\u8EF8/\u7DEF\u5EA6 +FR-Designer_Save=\u4FDD\u5B58 +FR-Designer_Search=\u691C\u7D22 +FR-Designer_Set=\u8A2D\u5B9A +FR-Designer_Share-Template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30B7\u30A7\u30A2 +FR-Designer_Simple_general=\u30B7\u30F3\u30D7\u30EB\u901A\u7528\u30AF\u30A8\u30EA +FR-Designer_Song_TypeFace=\u5B8B\u4F53 +FR-Designer_Start-Date=\u958B\u59CB\u65E5\u671F +FR-Designer_Subscript=\u4E0B\u4ED8\u304D +FR-Designer_Superscript=\u4E0A\u4ED8\u304D +FR-Designer_Support_QQ=\u6280\u8853QQ +FR-Designer_Swatch=\u30B5\u30F3\u30D7\u30EB +FR-Designer_Tab_title=tab\u30BF\u30A4\u30C8\u30EB +FR-Designer_TableData=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8 +FR-Designer_Thank_guest=\u7279\u306B\u5F53\u8A72\u30D0\u30FC\u30B8\u30E7\u30F3\u30C7\u30B6\u30A4\u30CA\u30FC\u306E\u4F7F\u3044\u3084\u3059\u3055\u306B\u3064\u3044\u3066\u8CA2\u732E\u3057\u3066\u304F\u308C\u305F\u4EE5\u4E0B\u306EBBS\u306E\u5E06\u30BD\u30D5\u30C8\u30D5\u30A1\u30F3\u306B\u611F\u8B1D\u3057\u307E\u3059 +FR-Designer_Thanks-To=\u611F\u8B1D +FR-Designer_Title=\u30BF\u30A4\u30C8\u30EB +FR-Designer_Total=\u5168\u90E8\u3067 +FR-Designer_UnSignIn=\u672A\u30ED\u30B0\u30A4\u30F3 +FR-Designer_Underline=\u30A2\u30F3\u30C0\u30FC\u30E9\u30A4\u30F3 +FR-Designer_Used=\u6700\u8FD1\u4F7F\u7528\u3057\u305F +FR-Designer_User-defined-MDX=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BAMDX\u30AF\u30A8\u30EA +FR-Designer_SampleText=\u30C6\u30AD\u30B9\u30C8\u4F8B +FR-Designer_Vertical-LeftToRight=\u6587\u5B57\u7E26\u66F8(\u5DE6\u304B\u3089\u53F3\u3078\uFF09 +FR-Designer_Vertical-RightToLeft=\u6587\u5B57\u7E26\u66F8(\u53F3\u304B\u3089\u5DE6\u3078) +FR-Designer_VerticalBoxLayout=\u5782\u76F4\u30B1\u30FC\u30B9\u914D\u7F6E +FR-Designer_Visible=\u53EF\u8996 +FR-Designer_WLayout-Border-ToolTips=\u5B8C\u74A7\u306A\u30DC\u30FC\u30C0\u30FC\u30EC\u30A4\u30A2\u30A6\u30C8\u5BB9\u5668\u306F\u6771\u897F\u5357\u5317\u4E2D\u306E\u4E94\u3064\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\u69CB\u6210\u3055\u308C\u307E\u3059\u3002\\uff4e\u305D\u306E\u3046\u3061\u3001\u5357\u5317\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u9AD8\u3055\u3092\u8ABF\u6574\u3067\u304D\u3001\u6771\u897F\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u5E45\u3092\u8ABF\u6574\u3067\u304D\u307E\u3059\u3002 +FR-Designer_WaterMark=\u900F\u304B\u3057 +FR-Designer_Widget=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB +FR-Designer_Widget-Settings=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u8A2D\u5B9A +FR-Designer_Widget-Visible=\u53EF\u8996 +FR-Designer_XMLA_Explain=\u591A\u6B21\u5143\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u53D6\u308A\u51FA\u3057\u3092\u4F7F\u7528\u3059\u308B\u524D\u306B\u307E\u305A\u63A5\u7D9A\u306B\u6210\u529F\u3057\u305F\u591A\u6B21\u5143\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u304C\u5FC5\u8981\u3067\u3059\u3002\n\u30C7\u30FC\u30BF\u63A5\u7D9A\u8A2D\u5B9A\u5B8C\u4E86\u5F8C\u3001\u30AF\u30A8\u30EA\u30C7\u30FC\u30BF\u6642\u306B\u4E8C\u7A2E\u985E\u306E\u7570\u306A\u308B\u53D6\u308A\u51FA\u3057\u624B\u6BB5\u304C\u3042\u308A\u307E\u3059\u3002\n1.\u30B7\u30F3\u30D7\u30EB\u901A\u7528\u30AF\u30A8\u30EA\uFF1A\n\u30B7\u30F3\u30D7\u30EB\u901A\u7528\u30AF\u30A8\u30EA\u306FFineBI\u304A\u3088\u3073\u305D\u306E\u4ED6\u591A\u6B21\u5143\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002\n\u30B7\u30F3\u30D7\u30EB\u901A\u7528\u30AF\u30A8\u30EA\u306E\u4F7F\u7528\u306B\u306F\u3001FR\u306Fcube\u306E\u5C64\u5225\u69CB\u9020\u3092\u81EA\u52D5\u3067\u8AAD\u307F\u53D6\u308A\u9078\u629E\u3057\u3001\u76F4\u63A5\u5FC5\u8981\u306A\u6240\u9700\u7684\u5EA6\u91CF\u5024\u304A\u3088\u3073\u7DEF\u5EA6\u3092\u9078\u629E\u3057\u9078\u5225\u6761\u4EF6\u3092\u8FFD\u52A0\u3059\u308C\u3070\u3001FR\u306F\u9078\u629E\u306B\u57FA\u3065\u3044\u3066\u81EA\u52D5\u7684\u306B\u30C7\u30FC\u30BF\u3092\u30AF\u30A8\u30EA\u3057\u307E\u3059\u3002\n\u30B7\u30F3\u30D7\u30EB\u901A\u7528\u30AF\u30A8\u30EA\u306F\u7DEF\u5EA6\u304A\u3088\u3073\u5EA6\u91CF\u5024\u3068\u3044\u3046\u4E8C\u3064\u306E\u8EF8\u306E\u30AF\u30A8\u30EA\u306B\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n\u5EA6\u91CF\u5024\u304A\u3088\u3073\u7DEF\u5EA6\u306E\u8A2D\u5B9A\u3067\u3001\u73FE\u5728\u5FC5\u8981\u306A\u7DEF\u5EA6\u3092\u9078\u629E\u3059\u308B\u3057\u304B\u306A\u304F\u3066\u3001\u624B\u52D5\u3067\u4FEE\u6B63\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\n\u9078\u5225\u6761\u4EF6\u306FOPEN SQL\u6587\u6CD5\u3092\u63A1\u7528\u3057\u3066\u304A\u308A\u3001${abc}\u3092\u5165\u529B\u3057\u3066\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3068\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u3001\u7528\u6CD5\u306F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3068\u540C\u69D8\u3067\u3059\u3002\n2.\u30AB\u30B9\u30BF\u30DE\u30A4\u30BAMDX\u30AF\u30A8\u30EA\uFF1A\n\u30AB\u30B9\u30BF\u30DE\u30A4\u30BAMDX\u30AF\u30A8\u30EA\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u30AB\u30B9\u30BF\u30DE\u30A4\u30BAMDX\u6587\u6CD5\u304C\u5FC5\u8981\u306A\u7D50\u679C\u3092\u30AF\u30A8\u30EA\u3057\u307E\u3059\u3002\n\u6CE8\u610F\uFF0C\u30AB\u30B9\u30BF\u30DE\u30A4\u30BAMDX\u30AF\u30A8\u30EA\u3082\u4E8C\u3064\u306E\u8EF8\u306E\u30AF\u30A8\u30EA\u306B\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n{abc}\u3092\u5165\u529B\u3057\u3066\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3068\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u3001\u7528\u6CD5\u306F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3068\u540C\u69D8\u3067\u3059\u3002\nFineBI\u306Ecube\u306FMDX\u30AF\u30A8\u30EA\u306B\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002 +FR-Designer_bold=\u592A\u304F\u3059\u308B +FR-Designer_font=\u30D5\u30A9\u30F3\u30C8 +FR-Designer_italic=\u30A4\u30BF\u30EA\u30C3\u30AF +FR-Designer_product_feedback=\u88FD\u54C1\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF +FR-Designer_XMLA=\u591A\u6B21\u5143\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 +FR-Designer-StyleAlignment_Layout_Default=\u30C7\u30D5\u30A9\u30EB\u30C8 +FR-Designer-StyleAlignment_Layout_Image_Titled=\u5C55\u958B +FR-Designer-StyleAlignment_Layout_Image_Extend=\u5C55\u958B +FR-Designer-StyleAlignment_Layout_Image_Adjust=\u9069\u5FDC +FR-Designer-StyleAlignment_Tooltips_Left=\u5DE6\u8A70\u3081 +FR-Designer-StyleAlignment_Tooltips_Center=\u4E2D\u592E\u63C3\u3048 +FR-Designer-StyleAlignment_Tooltips_Right=\u53F3\u8A70\u3081 +FR-Designer-StyleAlignment_Tooltips_Distributed=\u5747\u7B49\u5272\u308A\u4ED8\u3051 +FR-Designer-StyleAlignment_Tooltips_DEFAULT=\u30C7\u30D5\u30A9\u30EB\u30C8 +FR-Designer-StyleAlignment_Tooltips_Top=\u4E0A\u8A70\u3081 +FR-Designer-StyleAlignment_Tooltips_Bottom=\u4E0B\u8A70\u3081 +FR-Designer-StyleAlignment_Pane_Horizontal=\u6C34\u5E73\u63C3\u3048 +FR-Designer-StyleAlignment_Pane_Vertical=\u5782\u76F4\u63C3\u3048 +FR-Designer-StyleAlignment_Pane_Style=\u30A2\u30E9\u30A4\u30F3\u30E1\u30F3\u30C8 +FR-Designer-StyleAlignment_Style_Indentation=\u30A4\u30F3\u30C7\u30F3\u30C8 +FR-Designer-StyleAlignment_Style_Spacing=\u9593\u9694\u8DDD\u96E2 +FR-Designer-StyleAlignment_Style_Alignment=\u63C3\u3048 +FR-Designer-CommitTab_Submit=\u63D0\u51FA\u3059\u308B +FR-Designer-CommitTab_SureToDelete=Sure to delete +FR-Designer-CommitTab_Remove=\u524A\u9664 +FR-Designer-Collect_Information_free=\u7121\u6599 +FR-Designer-Collect_Information_Description=\u8A18\u8FF0 +FR-Designer-Collect_Information_Successfully=\u53CE\u96C6\u6210\u529F +FR-Designer_Event_Set=\u30A4\u30D9\u30F3\u30C8\u8A2D\u5B9A +FR-Designer_Blow_set=\u4EE5\u4E0B\u8A2D\u5B9A +FR-Designer_I_Want_To_Set_Single=\u5F53\u8A72\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u5358\u72EC\u8A2D\u5B9A +FR-Designer_Using_Server_Report_View_Settings=\u30B5\u30FC\u30D0\u30FC\u8A2D\u5B9A\u63A1\u7528 +FR-Designer_ErrorHandlerTemplate=\u51FA\u9519\u6A21\u677F\u5B9A\u4E49 +FR-Designer_Save_Path=\u4FDD\u5B58\u8DEF\u5F84 +FR-Designer_Chart_Acc_Set=\u7CBE\u78BA\u8A2D\u5B9A +FR-Designer_Gradient-Color=\u8272\u3092\u5F90\u3005\u306B\u5909\u5316 +FR-Designer_DEFAULT=\u30C7\u30D5\u30A9\u30EB\u30C8 +FR-Designer_chart-PreStyle=\u30C1\u30E3\u30FC\u30C8\u306E\u5B9A\u7FA9\u3055\u308C\u305F\u30AB\u30E9\u30FC +FR-Designer_Chart-PreStyle=\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30AB\u30E9\u30FC\u30C1\u30E3\u30FC\u30C8 +FR-Designer_Already_exist=\u73FE\u5728\u306E\u74B0\u5883\u306B\u306F\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\: +FR-Designer_Database=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 +FR-Designer_Model=\u30E2\u30C7\u30EB +FR-Designer_Refresh_Successfully=\u5237\u65B0\u6210\u529F +FR-Designer_SQL-Table=\u8868 +FR-Designer_SQL-View=\u30D3\u30E5\u30FC +FR-Designer_Failed=\u5931\u6557 +FR-Designer_Chart_Field_Name=\u30D5\u30A3\u30FC\u30EB\u30C9\u540D +FR-Designer_FormulaD-Text=\u30C6\u30AD\u30B9\u30C8\u95A2\u6570 +FR-Designer_FormulaD-Logical=\u30ED\u30B8\u30C3\u30AF\u95A2\u6570 +FR-Designer_FormulaD-Array=\u914D\u5217\u95A2\u6570 +FR-Designer_FormulaD-Report=\u5E33\u7968\u95A2\u6570 +FR-Designer_FormulaD-Other=\u305D\u306E\u4ED6\u95A2\u6570 +FR-Designer_FormulaD-All=\u5168\u3066\u306E\u95A2\u6570 +FR-Designer_Function=\u95A2\u6570 +FR-Designer_Select=\u9078\u629E +FR-Designer_Edit=\u7DE8\u96C6 +FR-Designer_Description=\u8AAC\u660E +FR-Designer_Role_changed_isRefresh=\u30ED\u30FC\u30EB\u306F\u3001\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u3059\u308B\u304B\u3069\u3046\u304B\u3001\u5909\u66F4 +FR-Designer_FS_Name=\u30C7\u30FC\u30BF\u51B3\u7B56\u30B7\u30B9\u30C6\u30E0 +FR-Designer_Datasource-Parameter=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9 +FR-Designer_Tree-ComboBox=\u30DA\u30FC\u30B8\u30DC\u30C3\u30AF\u30B9...... +FR-Designer_Form-Iframe=\u30DA\u30FC\u30B8\u30DC\u30C3\u30AF\u30B9 +FR-Designer_Type=\u30BF\u30A4\u30D7 +FR-Designer_User-defined=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA +FR-Designer_Simple_general_forV6=\u901A\u7528\u30AF\u30A8\u30EA(ECC 6\u4EE5\u4E0A\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u9069\u7528) +FR-Designer_Import=\u30A4\u30F3\u30DD\u30FC\u30C8 +FR-Designer_Export=\u51FA\u529B +FR-Designer_Delete=\u524A\u9664 +FR-Designer_Sequenced_number=\u30CA\u30F3\u30D0\u30FC +FR-Designer_Parameters_name=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u540D\u79F0 +FR-Designer_SAP_datatype=SAP\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7 +FR-Designer_Return_set_name=\u30BB\u30C3\u30C8\u306B\u623B\u308B +FR-Designer_Datatype=\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7 +FR-Designer_Corre_parameter=\u5BFE\u5FDC\u3059\u308B\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC +FR-Designer_Default_value=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30C7\u30D5\u30A9\u30EB\u30C8\u5024 +FR-Designer_SAP_column_name=SAP\u5217\u540D +FR-Designer_Table_name=\u8868\u306E\u540D\u79F0 +FR-Designer_Columns_choosed=\u9078\u629E\u3057\u305F\u5217 +FR-Designer_Where_claus=\u9078\u5225\u6761\u4EF6 +FR-Designer_PreStyle=\u9810\u5B9A\u7FA9\u6A23\u5F0F +FR-Designer_Loading=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3057\u3066\u3044\u307E\u3059 +FR-Designer_Table=\u8868 +FR-Designer_Name=\u540D\u79F0 +FR-Designer_EmailPane-tips=\u3042\u306A\u305F\u306F\u3001ABC\u306F\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u3092\u30D1\u30E9\u30E1\u30FC\u30BF\u3068\u3057\u3066${ABC}\u3092\u5165\u529B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3088\u3046\u306B\u3001\u5F0F\u3068\u3057\u3066${\u4ECA\u65E5\uFF08\uFF09}\uFF1A\u30BF\u30A4\u30C8\u30EB\u30C6\u30AD\u30B9\u30C8"${\u4ECA\u65E5\uFF08\uFF09}\u7D71\u8A08\u306F"\u3001"$ {\u306B\u30A2\u30C9\u30EC\u30B9\u6307\u5B9A\u3055\u308C\u3066\u3044\u308BP}\u3001123@gmail.com\u3001\u30DE\u30A4\u30AF\u306F\u3001\u30E6\u30FC\u30B6\u30FC\u540D\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306B\u4FDD\u5B58\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u30DE\u30A4\u30AF "\u3001 +FR-Designer_EmailPane-mailContent=\u30E1\u30FC\u30EB\u672C\u6587 +FR-Designer_EmailPane-BCC=\u5BC6\u9001 +FR-Designer_EmailPane-mailSubject=\u30E1\u30FC\u30EB\u30BF\u30A4\u30C8\u30EB +FR-Designer_EmailPane-warnings=\u9001\u4FE1\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092\u8A2D\u5B9A\u3057\u3066\u3044\u307E\u305B\u3093\u3002\u30ED\u30B0\u30A4\u30F3\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u8A2D\u5B9A\u3059\u308B\u304B\u7BA1\u7406\u8005\u306B\u9023\u7D61\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +FR-Designer_Email_sentEmail=\u30E1\u30FC\u30EB\u9001\u4FE1 +FR-Designer_file-is-locked=\u958B\u3053\u3046\u3068\u3057\u3066\u3044\u308B\u5E33\u7968\u306F\u73FE\u5728\u4ED6\u306E\u4EBA\u304C\u7DE8\u96C6\u3057\u3066\u3044\u307E\u3059\u3002\u5C11\u3057\u5F85\u3063\u3066\u304B\u3089\u958B\u3044\u3066\u304F\u3060\u3055\u3044 +FR-Designer_Custom_Icon_Message1=16 ?? 16\u306EPNG\u753B\u50CF\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u3092\u304A\u3059\u3059\u3081\u3057\u307E\u3059 +FR-Designer_Add=\u8FFD\u52A0 +FR-Designer_Custom_Icon_Message2=\u30AA\u30DA\u30EC\u30FC\u30B7\u30E7\u30F3\u306B\u4E0D\u9069\u5207\u306A\u70B9\u304C\u898B\u3089\u308C\u307E\u3059 +FR-Designer_Tooltips=\u30D2\u30F3\u30C8 +FR-Designer_Remove=\u524A\u9664 +FR-Designer_Custom_Icon_SelectIcon=\u30A2\u30A4\u30B3\u30F3\u3092\u9078\u629E +FR-Designer_Click_this_button=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30EB\u30FC\u30C8\u9078\u629E\u3092\u884C\u3046 +FR-Designer_Custom_Icon_Message3=\u30A2\u30A4\u30B3\u30F3\u540D\u79F0\u306F\u3059\u3067\u306B\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059\u3002 +FR-Designer_Set_default_browser=\u30C7\u30D5\u30A9\u30EB\u30C8\u30D6\u30E9\u30A6\u30B6\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002Intenet\u30AA\u30D7\u30B7\u30E7\u30F3\u4E2D\u304B\u3089\u30B7\u30B9\u30C6\u30E0\u30C7\u30D5\u30A9\u30EB\u30C8\u30D6\u30E9\u30A6\u30B6\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +FR-Designer_Open=\u958B\u304F +FR-Designer_Utils-OpenDemoEnv=\u88FD\u54C1\u30C7\u30E2\u3001\u81EA\u52D5\u3067\u4F5C\u696D\u76EE\u6B21\u306B\u5207\u308A\u66FF\u3048\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 +FR-Designer_Utils-switch=\n\u73FE\u5728\u306E\u4FDD\u5B58\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306F\u73FE\u5728\u306E\u76EE\u6B21\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3059\u3002\n\u7D9A\u884C\u3057\u307E\u3059\u304B\uFF1F +FR-Designer_Utils-NewDemoEnv=\u88FD\u54C1\u30C7\u30E2\u3001\u81EA\u52D5\u3067\u4F5C\u696D\u76EE\u6B21\u3092\u65B0\u898F\u4F5C\u6210\u3057\u307E\u3059\uFF1A +FR-Designer_Save_As_Global_Style=\u5168\u5C40\u66F8\u5F0F\u3068\u3057\u3066\u4FDD\u5B58 +FR-Designer_Input_The_Name_Of_Gloabel_Style=\u4FDD\u5B58\u3057\u3066\u3044\u308B\u5168\u5C40\u66F8\u5F0F\u306E\u540D\u79F0\u3092\u5165\u529B +FR-Designer_This_Name_Has_Exsit=\u3053\u306E\u540D\u524D\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059 +FR-Designer_Shortcut_Set=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u8A2D\u5B9A +FR-Designer_Feature_Name=\u6A5F\u80FD\u540D\u79F0\uFF1A +FR-Designer_Cursor_to_next_column=\u30AB\u30FC\u30BD\u30EB\u3092\u6B21\u306E\u4E00\u5217\u3078\u79FB\u52D5 +FR-Designer_Cursor_to_next_row=\u30AB\u30FC\u30BD\u30EB\u3092\u6B21\u306E\u4E00\u884C\u3078\u79FB\u52D5 +FR-Designer_Current_keys=\u73FE\u5728\u306E\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\uFF1A +FR-Designer_Exchange_key=\u30AF\u30EA\u30C3\u30AF\u4E92\u63DB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC +FR-Designer_System_default=\u30B7\u30B9\u30C6\u30E0\u3092\u30C7\u30D5\u30A9\u30EB\u30C8\u306B\u3059\u308B +FR-Designer_Cursor_to_previous_column=\u30AB\u30FC\u30BD\u30EB\u3092\u524D\u306E\u4E00\u5217\u3078\u79FB\u52D5\uFF1A +FR-Designer_Cursor_to_previous_row=\u30AB\u30FC\u30BD\u30EB\u3092\u524D\u306E\u4E00\u884C\u3078\u79FB\u52D5\uFF1A +FR-Designer_Are_You_Sure_To_Delete_The_Data=\u9078\u629E\u3055\u308C\u305F\u30C7\u30FC\u30BF\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F +FR-Designer_Show_Icon=\u30DC\u30BF\u30F3\u30A2\u30A4\u30B3\u30F3\u3092\u8868\u793A +FR-Designer_Show_Text=\u30DC\u30BF\u30F3\u540D\u524D\u3092\u8868\u793A +FR-Designer_User_Defined_Event=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u4E8B\u4EF6 +FR-Designer_Output_PDF=PDF\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8 +FR-Designer_Output_Word=Word\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8 +FR-Designer_Image=\u30A4\u30E1\u30FC\u30B8 +FR-Designer_Flash_Print=Flash\u30D7\u30EA\u30F3\u30C8 +FR-Designer_PDF_Print=PDF\u30D7\u30EA\u30F3\u30C8 +FR-Designer_Applet_Print=\u30A2\u30D7\u30EC\u30C3\u30C8\u5370\u5237 +FR-Designer_Server_Print=\u30B5\u30FC\u30D0\u30FC\u7AEF\u672B\u30D7\u30EA\u30F3\u30C8 +FR-Designer_Use_ToolBar=\u30C4\u30FC\u30EB\u30D0\u30FC\u4F7F\u7528 +FR-Designer_Report_Show_Location=\u5E33\u7968\u8868\u793A\u4F4D\u7F6E +FR-Designer_Is_Paint_Page=\u753B\u50CF\u3067\u8868\u793A +FR-Designer_IS_Auto_Scale=iframeiframe\u306F\u3081\u8FBC\u307F\u6642\u81EA\u52D5\u30BA\u30FC\u30E0 +FR-Designer_IS_TD_HEAVY_EXPORT=\u91CD\u65B9\u6CD5\u683C\u5B50\u3092\u51FA\u529B +FR-Designer_Top=\u4E0A +FR-Designer_Bottom=\u4E0B +FR-Designer-Collect_OSXTips=\u30D2\u30F3\u30C8\uFF1A\u30D7\u30EC\u30B9 control + v \u30A2\u30AF\u30C6\u30A3\u30D9\u30FC\u30B7\u30E7\u30F3\u30B3\u30FC\u30C9\u3092\u8CBC\u308A\u4ED8\u3051 +FR-Designer_X_Coordinate=\u6A2A\u5EA7\u6A19 +FR-Designer_Y_Coordinate=\u7E26\u5EA7\u6A19 +FR-Designer_Widget_Width=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u5E45 +FR-Designer_Widget_Height=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u9AD8\u3055 +FR-Designer_Min_Height=\u6700\u5C0F\u9AD8\u3055 +FR-Designer_LeftParent=\u5DE6\u89AA\u30BB\u30EB +FR-Designer-PluginLicense_Check_Failed=\u3042\u306A\u305F\u306E\u30D7\u30E9\u30B0\u8A8D\u8A3C\u30D5\u30A1\u30A4\u30EB\u306E\u671F\u9650\u304C\u5207\u308C\u3066\u3044\u308B\u3001\u3057\u3066\u304F\u3060\u3055\u3044\u3001\u518D\u6D3B\u6027\u5316 +FR-Designer-File_address=\u30D5\u30A1\u30A4\u30EB\u30A2\u30C9\u30EC\u30B9 +FR-Designer-Local_file=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB +FR-Designer_Selection=\u9078\u629E +FR-Designer-Type_Parameter= ${abc}\u3092\u5165\u529B\u3057\u3066\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
 \u3053\u3053\u3067abc\u3068\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u7684\u540D\u79F0\u3067\u3059\u3002\u4F8B\u3048\u3070\uFF1A
+FR-Designer_Add_JS_warning=\u4F8B\u306B\u793A\u3059\u3088\u3046\u306A\u6B63\u3057\u3044URL\u30A2\u30C9\u30EC\u30B9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\uFF01 +FR-Designer-Encoding_Type=\u30B3\u30FC\u30C9\u30BF\u30A4\u30D7 +FR-Designer-FirstRow_IS_ColumnName=\u7B2C\u4E00\u884C\u306F\u5217\u30BF\u30A4\u30C8\u30EB\u3092\u542B\u307F\u307E\u3059 +FR-Designer_Dismenber=\u533A\u5207\u308A\u7B26 +FR-Designer_TableDismember=\u30BF\u30D6\u6587\u5B57 +FR-Designer_Space=\u30B9\u30DA\u30FC\u30B9 +FR-Designer_CommaDismenber=\u30B3\u30F3\u30DE +FR-Designer_Other=\u305D\u306E\u4ED6 +FR-Designer-Series_Dismenber_As_Single=\u9023\u7D9A\u3059\u308B\u533A\u5207\u308A\u8A18\u53F7\u306F\u5358\u72EC\u51E6\u7406\u3068\u307F\u306A\u3055\u308C\u308B +FR-Designer_KeyPoint=\u30AD\u30FC\u306E\u30CE\u30FC\u30C9 +FR-Designer_loadedTreeModel=\u30ED\u30FC\u30C9\u304C\u5931\u6557\u3057\u3001\u78BA\u8A8D\u5F8C\u3001\u518D\u8A66\u884C +FR-Designer-Failed_to_load_the_plugin=\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3001\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u66F4\u65B0\u3057\u3066\u304F\u3060\u3055\u3044\uFF1A +FR-Designer_XMLA_Database=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 +FR-Designer_XMLA_UserName=\u30E6\u30FC\u30B6\u540D +FR-Designer_XMLA_Password=\u30D1\u30B9\u30EF\u30FC\u30C9 +FR-Designer_XMLA_Get_Catalog=\u30AB\u30BF\u30ED\u30B0\u3092\u691C\u7D22\u3059\u308B +FR-Designer_XMLA_Not_NULL=\u3053\u3053\u306F\u7A7A\u6B04\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093 +FR-Designer_Column-Axis=\u5217\u8EF8 +FR-Designer_LiteCondition_Common=\u4E00\u822C +FR-Designer_LiteCondition_Formula=\u516C\u5F0F +FR-Designer_LiteCondition_ConditionB-AND=\u30A2\u30F3\u30C9(AND) +FR-Designer_LiteCondition_ConditionB-OR=\u30AA\u30A2(OR) +FR-Designer_LiteCondition_Common_Condition=\u666E\u901A\u6761\u4EF6 +FR-Designer_LiteCondition_Formula_Condition=\u516C\u5F0F\u6761\u4EF6 +FR-Designer_LiteCondition_Define=\u5B9A\u7FA9 +FR-Designer_Select_All= +FR-Designer-Plugin_Expire_Dialog_Title=\u671F\u9650\u5207\u308C\u306E\u30D7\u30E9\u30B0\u30A4\u30F3 +FR-Designer-Plugin_Expire_Dialog_Text=\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u3001\u8CFC\u5165\u3092\u3059\u308B\u305F\u3081\u306B\u5E06\u30BD\u30D5\u30C8\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30BB\u30F3\u30BF\u30FC\u3092\u884C\u304F\u3001\u6709\u52B9\u671F\u9650\u304C\u5207\u308C\u3066\u3044\u307E\u3059\u3002 +FR-Designer-Plugin_Finerest_Addon=\u5E06\u8EDF\u5FDC\u7528\u30BB\u30F3\u30BF\u30FC +FR-Designer_Performance_First=\u6027\u80FD\u512A\u5148 +FR-Designer_Total_N_Grade=\u5168\u90E8\u3067\:${N}\u5C64 +FR-Designer_time(s)= +FR-Designer_General=\u5E38\u7528 +FR-Designer_Advanced=\u9AD8\u7D1A +FR-Designer_Oracle=\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB +FR-Designer_Product_improve=\u88FD\u54C1\u6539\u5584 +FR-Designer_Join_Product_improve=\u88FD\u54C1\u6539\u5584\u30D7\u30E9\u30F3\u306B\u52A0\u3048\u308B +FR-Designer_Preference-Function=\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3\u8A2D\u5B9A +FR-Designer_max_undo_limit=\u6700\u5927\u53D6\u308A\u6D88\u3057\u56DE\u6570 +FR-Designer_Surport_String_To_Formula=\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6587\u5B57\u5217\u7DE8\u96C6\u3092\u516C\u5F0F\u3068\u3059\u308B\u3053\u3068\u306B\u30B5\u30DD\u30FC\u30C8 +FR-Designer_Always=\u30C7\u30D5\u30A9\u30EB\u30C8\u64CD\u4F5C\u5B9F\u884C +FR-Designer_Export_Setting=\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8\u914D\u7F6E +FR-Designer_Select_Export_Log_Directory=\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8\u76EE\u6B21\u3092\u9078\u629E +FR-Designer_Level_Setting=\u30EC\u30D9\u30EB\u5225\u8A2D\u5B9A +FR-Designer_Choose_Language=\u8A00\u8A9E\u9078\u629E +FR-Designer_Work_After_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u518D\u8D77\u52D5\u5F8C\u6709\u52B9 +FR-Designer_Setting-Ruler-Units=\u30EB\u30FC\u30E9\u30FC\u5358\u4F4D\u8A2D\u5B9A +FR-Designer_PageSetup-mm=\u30DF\u30EA\u30E1\u30FC\u30C8\u30EB +FR-Designer_Unit_CM=\u30BB\u30F3\u30C1\u30E1\u30FC\u30C8\u30EB +FR-Designer_Page-Setup-Scale-Units=\u30DA\u30FC\u30B8\u8A2D\u5B9A\u30EB\u30FC\u30E9\u30FC\u5358\u4F4D +FR-Designer_Report-Design-Ruler-Units=\u5E33\u7968\u30C7\u30B6\u30A4\u30F3\u30EB\u30FC\u30E9\u30FC\u5358\u4F4D +FR-Designer_Web_Preview_Port_Setting=\u30DD\u30FC\u30C8\u8A2D\u5B9A +FR-Designer_Designer_Language=\u30C7\u30B6\u30A4\u30CA\u30FC\u8A00\u8A9E +FR-Designer_Unit_INCH=\u30A4\u30F3\u30C1 +FR-Designer_Web_Preview_Port=\u30DD\u30FC\u30C8\u756A\u53F7 +FR-Designer_Oracle_All_Tables=\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB +FR-Designer_Unit_PT=\u30DD\u30F3\u30C9 +FR-Designer-Write_Auto_Stash=\u30AA\u30FC\u30C8\u30B9\u30AF\u30E9\u30C3\u30C1 +FR-Designer_Event_ShowWidgets=\u76F4\u63A5\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u8868\u793A +FR-Designer_Current_Preview_Rows=\u73FE\u5728\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u884C\u6570 +FR-Designer_Data=\u30C7\u30FC\u30BF +FR-Designer_Error=\u30A8\u30E9\u30FC +FR-Designer-Website_Url=http\://www.finereport.com/jp +FR-Designer_formDesignerModule= +FR-Designer-BBSLogin_Login-Title= +FR-Designer_Get-CubeGetting= +FR-Designer-BBSLogin_Download-Unlogin-Tip= +FR-Designer-App_ReLayout=\u96FB\u8A71\u518D\u30EC\u30A4\u30A2\u30A6\u30C8 +FR-Designer_Mobile-Attr=\u30E2\u30D0\u30A4\u30EB\u7AEF\u672B\u5C5E\u6027 +FR-Designer_Mobile-Vertical=\u7E26 +FR-Designer_Mobile-Horizontal=\u6A2A +FR-Designer_Mobile-Zoom=\u5E33\u7968\u30BA\u30FC\u30E0 +FR-Designer_Mobile-Open=\u958B\u304F +FR-Designer_COMMUNITY=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3 +FR-Designer_COMMUNITY_BBS=\u5E06\u8EDF\u30D5\u30A9\u30FC\u30E9\u30E0 +FR-Designer_COMMUNITY_VIDEO=\u30D3\u30C7\u30AA +FR-Designer_COMMUNITY_HELP=\u30D8\u30EB\u30D7\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8 +FR-Designer_COMMUNITY_UPDATE=\u88FD\u54C1\u66F4\u65B0 +FR-Designer_COMMUNITY_NEED=\u9700\u8981\u306E\u63D0\u51FA +FR-Designer_COMMUNITY_BUG=Bug\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF +FR-Designer_COMMUNITY_SIGN=\u5E06\u8EDF\u8A8D\u8A3C +FR-Designer_COMMUNITY_QUESTIONS=\u554F\u984C\u306E\u554F\u3044\u5408\u308F\u305B +FR-Designer_Write-Save-Formula=\u8A18\u5165\u8A08\u7B97\u306B\u6570\u5F0F\u4FDD\u6301 +FR-Designer_Export-Save-Formula=\u7DE8\u96C6\u6642\u3001\u6570\u5F0F\u4FDD\u6301 +FR-Designer_Attention=\u6CE8\u610F\u3057\u307E\u3059 +FR-Designer_Forbid_Widgets_Intersects=\u7981\u6B62\u90E8\u54C1\u3092\u91CD\u306D\u3066 +FR-Designer_Widget_Scaling_Mode_Fit=\u9069\u5FDC\u533A\u57DF +FR-Designer_Widget_Scaling_Mode_Fixed=\u56FA\u5B9A\u30B5\u30A4\u30BA +FR-Designer-Widget_Area_Scaling=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30A8\u30EA\u30A2\ +FR-Designer-QQLogin-Determine=\u6C7A\u5B9A\u3057\u307E\u3059 +FR-Designer-QQLogin-Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB +FR-Designer-Reuse_Manager= +FR-Designer_Layout_Block_Absolute= +FR-Designer_Layout_Block_Tab= +FR-Designer_Layout_Block_Blank= +FR-Designer_Attr_Layout= +FR-Designer_Attr_Layout_Type= +FR-Designer_Attr_Bidirectional_Adaptive= +FR-Designer_Download_Template= +FR-Designer-Widget_Scaling_Mode=\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u8AD6\u7406 +FR-Designer_Mobile-Refresh= +FR-Designer_Mobile-ToolBar= +FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059\u3002\u914D\u7F6E\u5185\u306E\u4EFB\u610F\u306E\u4F4D\u7F6E\u306B\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068 +FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0 diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties new file mode 100644 index 0000000000..137f253a35 --- /dev/null +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -0,0 +1,420 @@ +# generated time: 星期四 十一月 24 11:56:39 CST 2016 +FR-Designer-BBSLogin_Account=\u7528\u6237\u540D +FR-Designer-BBSLogin_Connection-Failure=\uB124\uD2B8\uC6CC\uD06C\uB9C1\uD06C\uC2E4\uD328.\uD604\uC7AC\uB124\uD2B8\uC6CC\uD06C\uC0C1\uD0DC\uB97C\uAC80\uC0AC\uD574\uC8FC\uC2ED\uC2DC\uC624. +FR-Designer-BBSLogin_Connection-Failure-Tip=\uC54C\uB9BC +FR-Designer-BBSLogin_Forgot-Password=\u5FD8\u8BB0\u5BC6\u7801 +FR-Designer-BBSLogin_Login=\u767B\u5F55 +FR-Designer-BBSLogin_Login-Failure-Tip=\uC0AC\uC6A9\uC790\uC774\uB984\uB610\uB294\uBE44\uBC00\uBC88\uD638\uC785\uB825\uC624\uB958.\uB2E4\uC2DC\uB85C\uADF8\uC778\uD574\uC8FC\uC2ED\uC2DC\uC624. +FR-Designer-BBSLogin_Password=\u5BC6\u7801 +FR-Designer-BBSLogin_Password-Empty-Tip=\uC554\uD638\uB294\uBE48\uCE78\uC73C\uB85C\uB458\uC218\uC5C6\uC2B5\uB2C8\uB2E4. +FR-Designer-BBSLogin_Register-Account=\u6CE8\u518C\u8D26\u53F7 +FR-Designer-BBSLogin_Switch-Account=\uC804\uD658\uACC4\uC815\uBC88\uD638 +FR-Designer-BBSLogin_Privite-Message=\uAC1C\uC778\u0020\uBA54\uC2DC\uC9C0 +FR-Designer-BBSLogin_Times=\uD68C +FR-Designer-BBSLogin_Username-Empty-Tip=\uC0AC\uC6A9\uC790\uC774\uB984\uC740\uBE48\uCE78\uC73C\uB85C\uB458\uC218\uC5C6\uC2B5\uB2C8\uB2E4. +FR-Designer-Basic_More_Color=\uC0C9\uB354\uBCF4\uAE30... +FR-Designer-Estate_Any=\uC81C\uD55C\uC5C6\uC74C +FR-Designer-Estate_Default_Font=\uAE30\uBCF8\uAE00\uAF34 +FR-Designer-Estate_Default_Null=\uAE30\uBCF8\uBE44\uC5B4\uC788\uC74C +FR-Designer-Estate_Default_Text=\uAE30\uBCF8\uAC12 +FR-Designer-Estate_Parameter_Null_Text=\uB9E4\uAC1C\uBCC0\uC218\uAC00\uBE44\uC5B4\uC788\uC2B5\uB2C8\uB2E4. +FR-Designer-Estate_Radio-Group=\uBD80\uB3D9\uC0B0\uC5C5\uACC4\uBC94\uC6A9\uD0A4\uD328\uB4DC\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4 +FR-Designer-Estate_Selected_Font=\uC120\uD0DD\uD55C\uAE00\uAF34 +FR-Designer-Estate_Widget_Value=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uAC12 +FR-Designer-Layout_Adaptive_Layout=\uC790\uAE30\uC801\uC751\uB808\uC774\uC544\uC6C3 +FR-Designer-Output_Background_Set=\uBC30\uACBD\uC124\uC815 +FR-Designer-Output_Default_Background=\uAE30\uBCF8\uBC30\uACBD +FR-Designer-Output_Excel_Page=Excel\uCD9C\uB825(\uD398\uC774\uC9C0\uB098\uB204\uAE30\uB0B4\uBCF4\uB0B4\uAE30) +FR-Designer-Output_Excel_Sheet=Excel\uCD9C\uB825(\uD398\uC774\uC9C0\uB098\uB204\uAE30Sheet\uB0B4\uBCF4\uB0B4\uAE30) +FR-Designer-Output_Excel_Simple=Excel\uCD9C\uB825(\uC6D0\uB798\uBAA8\uC2B5\uB0B4\uBCF4\uB0B4\uAE30) +FR-Designer-Plugin_PluginMarket_Coding=\uD50C\uB7EC\uADF8\uC778\uC2A4\uD1A0\uC5B4\uB97C\uAC1C\uBC1C\uC911\uC785\uB2C8\uB2E4.\uAE30\uB2E4\uB824\uC8FC\uC2ED\uC2DC\uC624. +FR-Designer-Submit_Condition=\uC870\uAC74 +FR-Designer-Widget-Title_border=\uD14C\uB450\uB9AC +FR-Designer-Widget-Title_border_color=\uC0C9 +FR-Designer_AbsoluteLayout=\uC808\uB300 \uB808\uC774\uC544\uC6C3 +FR-Designer_Allow_Decimals=\uC18C\uC218\uD5C8\uC6A9 +FR-Designer_Allow_Negative=\uB9C8\uC774\uB108\uC2A4\uAC12\uD5C8\uC6A9 +FR-Designer_Background-Click=\uB9C8\uC6B0\uC2A4\uB85C\uBC30\uACBD\uD074\uB9AD +FR-Designer_Background-Initial=\uCD08\uAE30\uBC30\uACBD +FR-Designer_Background-Over=\uB9C8\uC6B0\uC2A4\uD50C\uB85C\uD305\uBC30\uACBD +FR-Designer_Bar-Code-Exception-Tip=\uB370\uC774\uD130\uB294\uBE48\uCE78\uC73C\uB85C\uB458\uC218\uC5C6\uC2B5\uB2C8\uB2E4. +FR-Designer_Block-intersect=\uBE14\uB7ED\uACFC\uBE14\uB7ED\uC740\uC911\uCCA9\uB420\uC218\uC5C6\uC2B5\uB2C8\uB2E4. +FR-Designer_BorderLayout=\uACBD\uACC4\uC120\uB808\uC774\uC544\uC6C3 +FR-Designer_Button-Hotkeys=\uB2E8\uCD95\uD0A4 +FR-Designer_Button-Icon=\uD0A4\uC544\uC774\uCF58 +FR-Designer_Button-Name=\uD0A4\uBA85\uCE6D +FR-Designer_Button-Type=\uD0A4\uC720\uD615 +FR-Designer_CardLayout=Tab\uB808\uC774\uC544\uC6C3 +FR-Designer_Cell=\uC140 +FR-Designer_Chart_Cell=\uCC28\uD2B8 \uD558\uC774\uD37C\uB9C1\uD06C-\uC140 \uC5F0\uB3D9 +FR-Designer_Chart_Float=\uCC28\uD2B8\uD558\uC774\uD37C\uB9C1\uD06C-\uC5F0\uB3D9\uC11C\uC2A4\uD39C\uC2A4\uC694\uC18C +FR-Designer_Chart_Float_chart=\uCC28\uD2B8 \uD558\uC774\uD37C\uB9C1\uD06C-\uC704\uC82F \uCC28\uD2B8 +FR-Designer_Check-for-Updates=\uC5C5\uB370\uC774\uD2B8\uAC80\uC0AC +FR-Designer_Choose-Data-Confusion-Tip=\\ud63c\uD569\uD560\uD544\uB4DC\uB97C\uC120\uD0DD\uD6C4\uBBF8\uB9AC\uBCF4\uAE30 +FR-Designer_Close=\uB2EB\uAE30 +FR-Designer_Column=\uC5F4 +FR-Designer_Column_Measure=\uC5F4\uCD95/\uCE21\uC815\uAC12 +FR-Designer_Condition_Attributes=\uC870\uAC74\uC18D\uC131 +FR-Designer_Confusion-Col-Name=\uD544\uB4DC\uC774\uB984 +FR-Designer_Confusion-key=\uD63C\uD569\uD0A4\uC6CC\uB4DC +FR-Designer_Currency_Line=\uAE08\uC561\uC120 +FR-Designer_Current_tab=\uD604\uC7AC\uD3B8\uC9D1tab +FR-Designer_Custom=\uC0AC\uC6A9\uC790\uC815\uC758 +FR-Designer_Custom-Angle=\uC0AC\uC6A9\uC790\uC815\uC758\uAC01\uB3C4 +FR-Designer_DS-Dictionary=\uB370\uC774\uD130\uC0AC\uC804 +FR-Designer_Data-confusion=\uB370\uC774\uD130\uD63C\uD569 +FR-Designer_Data_Type=\uB370\uC774\uD130\uC720\uD615 +FR-Designer_Double_Click_Edit_OR_Clear=\uB354\uBE14\uD074\uB9AD\uD558\uC5EC\uD3B8\uC9D1\uB610\uB294\uD074\uB9AC\uC5B4\uC2E4\uD589 +FR-Designer_Email=\uBA54\uC77C +FR-Designer_Enabled=\uC0AC\uC6A9\uAC00\uB2A5 +FR-Designer_End-Date=\uC885\uB8CC\uB0A0\uC9DC +FR-Designer_ExportAndOutput=\uB0B4\uBCF4\uB0B4\uAE30 +FR-Designer_FRFont=\uAE00\uAF34 +FR-Designer_FS_Close_Other_Templates=\uAE30\uD0C0\uD15C\uD50C\uB9BF\uB2EB\uAE30 +FR-Designer_File=\uD30C\uC77C +FR-Designer_Filter_Conditions=\uD544\uD130\uC870\uAC74 +FR-Designer_Finish-Modify-Share=\uC218\uC815\uC644\uB8CC\uBC0F\uACF5\uC720 +FR-Designer_Fit-App=App\uC790\uAE30\uC801\uC751 +FR-Designer_Font-Family=\uAE00\uAF34\uBA85\uCE6D +FR-Designer_Font-Size=\uAE00\uAF34\uD06C\uAE30 +FR-Designer_Forbid_Drag_into_Adapt_Pane=\uD574\uB2F9\uAC1D\uCCB4\uB294\uD3FC\uD14C\uC774\uBE14\uBC14\uB514\uB4DC\uB798\uADF8\uB97C\uD5C8\uC6A9\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4. +FR-Designer_Forbid_Drag_into_Para_Pane=\uD574\uB2F9\uAC1D\uCCB4\uB294\uB9E4\uAC1C\uBCC0\uC218\uD328\uB110\uC744\uB4DC\uB798\uADF8\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4. +FR-Designer_Foreground=\uC0C9 +FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=\uD3FC\uAD8C\uD55C\uD3B8\uC9D1\uC744\uC9C0\uC6D0\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4. +FR-Designer_Form-Report=\uBB38\uC11C\uBE14\uB7ED +FR-Designer_Form_EmbeddedTD=\uD3FC(\uB0B4\uC7A5\uB370\uC774\uD130) +FR-Designer_Form_Module=\uD3FC\uBAA8\uB4C8 +FR-Designer_Format_explan=\uC11C\uC2DD\uC124\uBA85 +FR-Designer_Formula=\uC218\uC2DD +FR-Designer_Forum=\uD3EC\uB7FC +FR-Designer_Get-Cube=Cube\uB97C\uC5BB\uB294\uC911 +FR-Designer_Help=\uB3C4\uC6C0\uB9D0 +FR-Designer_Hide=\uC228\uAE30\uAE30 +FR-Designer_Hyperlink=\uD558\uC774\uD37C\uB9C1\uD06C +FR-Designer_Hyperlink-Form_link=\uD604\uC7AC\uD3FC\uAC1D\uCCB4 +FR-Designer_IDCard=ID \uCE74\uB4DC +FR-Designer_Icon=\uC544\uC774\uCF58 +FR-Designer_Index=\uC5F4\uCD95/\uC778\uB371\uC2A4 +FR-Designer_Input_Rule=\uC791\uC131\uADDC\uCE59 +FR-Designer_Language_Default=\uAE30\uBCF8 +FR-Designer_Layout=\uB808\uC774\uC544\uC6C3 +FR-Designer_Layout-HBox=\uC218\uD3C9\uBC15\uC2A4\uB808\uC774\uC544\uC6C3 +FR-Designer_Layout-Index=\uC0C9\uC778 +FR-Designer_Layout_Constraints=\uC704\uCE58\uC640\uD06C\uAE30 +FR-Designer_Length=\uAE38\uC774 +FR-Designer_Loading_Data=\uB85C\uB529\uB370\uC774\uD130\uB85C\uB529\uC911 +FR-Designer_M-Exit=\uB098\uAC00\uAE30 +FR-Designer_M-Help=\uB3C4\uC6C0\uB9D0 +FR-Designer_M-Insert=\uC0BD\uC785 +FR-Designer_M-Repeat-Freeze=\uC911\uBCF5\uBC0F\uACE0\uC815\uC124\uC815 +FR-Designer_M-Server=\uC11C\uBC84 +FR-Designer_M-SwitchWorkspace=\uC804\uD658\uC791\uC5C5\uB514\uB809\uD130\uB9AC +FR-Designer_M-Template=\uD15C\uD50C\uB9BF +FR-Designer_MDX_Explain=\uADF8\uB798\uBA38\uC11C\uC2DD\uC740MDX\uADF8\uB798\uBA38\uCC38\uC870.\ n\uC608\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\uBE44\uACE0\uFF1ACOLUMNS, ROWS\uB2940, 1\uB85C\uB300\uCCB4\uD560\uC218\uC788\uC73C\uBA70,\uCC3E\uC544\uBCF4\uAE30\uCD95\uC740\uB3CC\uC544\uAC00\uAE30\uB450\uCD95\uB9CC\uC9C0\uC6D0\uD568. +FR-Designer_M_Help-About_Software=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC5D0\uB300\uD558\uC5EC +FR-Designer_M_Help-Tutorial=\uB3C4\uC6C0\uB9D0\uD14D\uC2A4\uD2B8\uBD81 +FR-Designer_Max_Value=\uCD5C\uB300\uAC12 +FR-Designer_Min_Value=\uCD5C\uC18C\uAC12 +FR-Designer_MobilePhone=\uD734\uB300\uD3F0 +FR-Designer_New_Value=\uC0C8\uB85C\uC6B4\uAC12 +FR-Designer_None=\uC5C6\uC74C +FR-Designer_PaperSize-Mobile=\uD734\uB300\uD3F0 +FR-Designer_PaperSize-Mobile-Large=\uD734\uB300\uD3F0\uB300\uD615\uD654\uBA74 +FR-Designer_PaperSize-Mobile-Small=\uD734\uB300\uD3F0\uC18C\uD615\uD654\uBA74 +FR-Designer_Para-Body=\uB9E4\uAC1C\uBCC0\uC218\uC0AC\uC6A9\uC790\uC778\uD130\uD398\uC774\uC2A4 +FR-Designer_Parameters=\uB9E4\uAC1C\uBCC0\uC218 +FR-Designer_Phone=\uC804\uD654 +FR-Designer_PostCode=\uC6B0\uD3B8\uBC88\uD638 +FR-Designer_Present=\uD615\uD0DC +FR-Designer_Preview=\uBBF8\uB9AC\uBCF4\uAE30 +FR-Designer_Preview-Data-Confusion=\uD63C\uD569\uD6C4\uC758\uB370\uC774\uD130\uBBF8\uB9AC\uBCF4\uAE30 +FR-Designer_Product_Demo=\uC81C\uD488\uC2DC\uC5F0 +FR-Designer_Query_Type=\uCC3E\uC544\uBCF4\uAE30\uBC29\uC2DD +FR-Designer_Refresh=\uC0C8\uB85C\uACE0\uCE68 +FR-Designer_Refresh_Parameter_In_SQL=SQL\uC758\uB9E4\uAC1C\uBCC0\uC218\uB97C\uC0C8\uB85C\uACE0\uCE68\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C +FR-Designer_Reg_Expressions=\uC815\uADDC\uD45C\uD604\uC2DD +FR-Designer_Reg_Max_Length=\uCD5C\uB300\uAE38\uC774 +FR-Designer_Reg_Min_Length=\uCD5C\uC18C\uAE38\uC774 +FR-Designer_ReportColumns-Columns=\uC140\uB098\uB204\uAE30 +FR-Designer_Return-Date=\uB0A0\uC9DC\uB3CC\uC544\uAC00\uAE30 +FR-Designer_RichText=\uB9AC\uCE58\uD14D\uC2A4\uD2B8\uBC15\uC2A4\uC0BD\uC785 +FR-Designer_RichTextEditor=\uB9AC\uCE58\uD14D\uC2A4\uD2B8\uBC15\uC2A4\uD3B8\uC9D1\uAE30 +FR-Designer_Row=\uD589 +FR-Designer_Row_Dimension=\uD589\uCD95/\uCC28\uC6D0 +FR-Designer_Save=\uC800\uC7A5 +FR-Designer_Search=\uAC80\uC0C9 +FR-Designer_Set=\uC124\uC815 +FR-Designer_Share-Template=\uD15C\uD50C\uB9BF\uACF5\uC720 +FR-Designer_Simple_general=\uB2E8\uC21C\uBC94\uC6A9\uCC3E\uC544\uBCF4\uAE30 +FR-Designer_Song_TypeFace=\uC1A1\uCCB4 +FR-Designer_Start-Date=\uC2DC\uC791\uB0A0\uC9DC +FR-Designer_Subscript=\uBC11\uC904 +FR-Designer_Superscript=\uC717\uC904 +FR-Designer_Support_QQ=\uAE30\uC220QQ +FR-Designer_Swatch=\uC0D8\uD50C +FR-Designer_Tab_title=tab \uC81C\uBAA9 +FR-Designer_TableData=\uB370\uC774\uD130\uC138\uD2B8 +FR-Designer_Thank_guest=\uD3EC\uB7FC\uD310\uC288\uC758\uD574\uB2F9\uBC84\uC804\uC124\uACC4\uAE30\uC0AC\uC6A9\uC131\uC5D0\uB300\uD55C\uD070\uACF5\uD5CC\uC5D0\uAC10\uC0AC\uB4DC\uB9BD\uB2C8\uB2E4. +FR-Designer_Thanks-To=\uC778\uC0AC\uB9D0 +FR-Designer_Title=\uC81C\uBAA9 +FR-Designer_Total=\uCD1D +FR-Designer_UnSignIn=\uC544\uC9C1 \uB4F1\uB85D +FR-Designer_Underline=\uBC11\uC904 +FR-Designer_Used=\uCD5C\uADFC\uC0AC\uC6A9 +FR-Designer_User-defined-MDX=\uC0AC\uC6A9\uC790\uC815\uC758 MDX\uCC3E\uC544\uBCF4\uAE30 +FR-Designer_SampleText=\uC608\uC2DC\uD14D\uC2A4\uD2B8\uC608\uC2DC\uD14D\uC2A4\uD2B8 +FR-Designer_Vertical-LeftToRight=\uD14D\uC2A4\uD2B8\uC138\uB85C\uC904(\uC67C\uCABD\uC5D0\uC11C\uC624\uB978\uCABD\uC73C\uB85C) +FR-Designer_Vertical-RightToLeft=\uD14D\uC2A4\uD2B8\uC138\uB85C\uC904(\uC624\uB978\uCABD\uC5D0\uC11C\uC67C\uCABD\uC73C\uB85C) +FR-Designer_VerticalBoxLayout=\uC218\uC9C1\uBC15\uC2A4\uB808\uC774\uC544\uC6C3 +FR-Designer_Visible=\uBCFC\uC218\uC788\uC2B5\uB2C8\uB2E4. +FR-Designer_WLayout-Border-ToolTips=\uC644\uC804\uD55C\uACBD\uACC4\uC120\uB808\uC774\uC544\uC6C3\uCEE8\uD14C\uC774\uB108\uB294\uB3D9\uB0A8\uC11C\uBD81\uC911\uAC04\uC7585\uBE14\uB7ED\uC73C\uB85C\uAD6C\uC131\uB418\uC5B4\uC788\uC73C\uBA70,\n\uC774\uC911\uB0A8\uBD81\uBE14\uB7ED\uC740\uD544\uC694\uC5D0\uB530\uB77C\uB192\uC774\uB97C\uC870\uC815\uD560\uC218\uC788\uC73C\uBA70\uB3D9\uC11C\uBE14\uB7ED\uC740\uD544\uC694\uC5D0\uB530\uB77C\uB108\uBE44\uB97C\uC870\uC815\uD560\uC218\uC788\uB2E4. +FR-Designer_WaterMark=\uC6CC\uD130\uB9C8\uD06C +FR-Designer_Widget=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4 +FR-Designer_Widget-Settings=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC124\uC815 +FR-Designer_Widget-Visible=\uBCFC\uC218\uC788\uC2B5\uB2C8\uB2E4. +FR-Designer_XMLA_Explain=\uB2E4\uCC28\uC6D0\uB370\uC774\uD130\uC138\uD2B8\uB97C\uC774\uC6A9\uD574\uAC12\uC744\uC5BB\uC73C\uB824\uBA74\uC5F0\uACB0\uAC00\uB2A5\uD55C\uB2E4\uCC28\uC6D0\uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB9C1\uD06C\uAC00\uD544\uC694\uD569\uB2C8\uB2E4.\ n \uB370\uC774\uD130\uC5F0\uACB0\uC744\uC124\uC815\uD55C\uD6C4\uB370\uC774\uD130\uCC3E\uAE30\uC2DC\uAC12\uC744\uC5BB\uC744\uC218\uC788\uB294\uBC29\uBC95\uC740\uB450\uAC00\uC9C0\uC785\uB2C8\uB2E4.\ n1.\uB2E8\uC21C\uBC94\uC6A9\uCC3E\uC544\uBCF4\uAE30\uFF1A\n\uB2E8\uC21C\uBC94\uC6A9\uCC3E\uAE30\uB294FineBI \uBC0F\uAE30\uD0C0\uB2E4\uCC28\uC6D0\uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC801\uC6A9\uB429\uB2C8\uB2E4.\ n\uB2E8\uC21C\uBC94\uC6A9\uC73C\uB85C\uCC3E\uACE0,FR\uC740 cube\uB97C\uC120\uD0DD\uD55C\uACC4\uCE35\uC11C\uBE0C\uAD6C\uC870\uB97C\uC790\uB3D9\uC73C\uB85C\uC77D\uC2B5\uB2C8\uB2E4.\uB2F9\uC2E0\uC740\uD544\uC694\uD55C\uCE21\uC815\uAC12\uBC0F\uCC28\uC6D0\uC744\uC9C1\uC811\uC120\uD0DD\uD560\uC218\uC788\uC73C\uBA70,\uD544\uD130\uB9C1\uC870\uAC74\uC744\uCD94\uAC00\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. FR\uC740\uB2F9\uC2E0\uC758\uC120\uD0DD\uC5D0\uB530\uB77C\uB370\uC774\uD130\uB97C\uC790\uB3D9\uC73C\uB85C\uCC3E\uC2B5\uB2C8\uB2E4.\ n\uB2E8\uC21C\uBC94\uC6A9\uCC3E\uC544\uBCF4\uAE30\uB294\uCC28\uC6D0\uBC0F\uCE21\uC815\uAC12\uB450\uCD95\uC758\uCC3E\uC544\uBCF4\uAE30\uB9CC\uC9C0\uC6D0\uD569\uB2C8\uB2E4.\ n\uCE21\uC815\uAC12\uBC0F\uCC28\uC6D0\uC124\uC815\uC911,\uD604\uC7AC\uB2F9\uC2E0\uC740\uD544\uC694\uD55C\uCC28\uC6D0\uB9CC\uC120\uD0DD\uD560\uC218\uC788\uC73C\uBA70\uC218\uB3D9\uC73C\uB85C\uC218\uC815\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4. \ n\uD544\uD130\uC870\uAC74\uC740OPEN SQL\uADF8\uB798\uBA38\uB97C\uC0AC\uC6A9\uD558\uBA70,${abc}\uB97C\uB9E4\uAC1C\uBCC0\uC218\uB85C\uC785\uB825\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.\uC0AC\uC6A9\uBC95\uC740\uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB370\uC774\uD130\uC138\uD2B8\uC640\uAC19\uC2B5\uB2C8\uB2E4. \ n2.\uC0AC\uC6A9\uC790\uC815\uC758 MDX\uCC3E\uC544\uBCF4\uAE30\uFF1A\n \uC0AC\uC6A9\uC790\uC815\uC758 MDX\uCC3E\uC544\uBCF4\uAE30\uB97C\uC774\uC6A9\uD558\uC5EC\uC0AC\uC6A9\uC790\uC815\uC758 MDXJScript\uCC3E\uC544\uBCF4\uAE30\uC5D0\uD544\uC694\uD55C\uACB0\uACFC\uB97C\uCC3E\uC744\uC218\uC788\uC2B5\uB2C8\uB2E4.\ n\uC8FC\uC758\uFF0C\uC0AC\uC6A9\uC790\uC815\uC758 MDX\uCC3E\uC544\uBCF4\uAE30\uB3C4\uB450\uCD95\uC758\uCC3E\uC544\uBCF4\uAE30\uB9CC\uC9C0\uC6D0\uD569\uB2C8\uB2E4.\ n${abc}\uB97C\uB9E4\uAC1C\uBCC0\uC218\uB85C\uC785\uB825\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.\uC0AC\uC6A9\uBC95\uC740\uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB370\uC774\uD130\uC138\uD2B8\uC640\uAC19\uC2B5\uB2C8\uB2E4\ nFineBI\uC758 cube\uB294 MDX\uCC3E\uC544\uBCF4\uAE30\uB97C\uC9C0\uC6D0\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4. +FR-Designer_bold=\uAD75\uAC8C +FR-Designer_font=\uAE00\uAF34 +FR-Designer_italic=\uAE30\uC6B8\uAE30 +FR-Designer_product_feedback=\uC81C\uD488\uD53C\uB4DC\uBC31 +FR-Designer_XMLA=\uB2E4\uCC28\uC6D0\uB370\uC774\uD130\uBCA0\uC774\uC2A4 +FR-Designer-StyleAlignment_Layout_Default=\uAE30\uBCF8 +FR-Designer-StyleAlignment_Layout_Image_Titled=\uD0C0\uC77C +FR-Designer-StyleAlignment_Layout_Image_Extend=\uC7A1\uC544\uB2F9\uAE40 +FR-Designer-StyleAlignment_Layout_Image_Adjust=\uC801\uC6A9 +FR-Designer-StyleAlignment_Tooltips_Left=\uC67C\uCABD\uC5D0\uB9DE\uCDA4 +FR-Designer-StyleAlignment_Tooltips_Center=\uAC00\uC6B4\uB370\uC815\uB82C +FR-Designer-StyleAlignment_Tooltips_Right=\uC624\uB978\uCABD\uC5D0\uB9DE\uCDA4 +FR-Designer-StyleAlignment_Tooltips_Distributed=\uBD84\uC0B0\uC815\uB82C +FR-Designer-StyleAlignment_Tooltips_DEFAULT=\uAE30\uBCF8 +FR-Designer-StyleAlignment_Tooltips_Top=\uC704\uC5D0\uB9DE\uCDA4 +FR-Designer-StyleAlignment_Tooltips_Bottom=\uC544\uB798\uC5D0\uB9DE\uCDA4 +FR-Designer-StyleAlignment_Pane_Horizontal=\uC218\uD3C9\uC815\uB82C +FR-Designer-StyleAlignment_Pane_Vertical=\uC218\uC9C1\uC815\uB82C +FR-Designer-StyleAlignment_Pane_Style=\uC815\uB82C\uBC29\uC2DD +FR-Designer-StyleAlignment_Style_Indentation=\uB4E4\uC5EC\uC4F0\uAE30 +FR-Designer-StyleAlignment_Style_Spacing=\uAC04\uACA9 +FR-Designer-StyleAlignment_Style_Alignment=\uC815\uB82C +FR-Designer-CommitTab_Submit=\uC81C\uCD9C +FR-Designer-CommitTab_SureToDelete=\uC0AD\uC81C\uD655\uC778 +FR-Designer-CommitTab_Remove=\uC0AD\uC81C +FR-Designer-Collect_Information_free=\uBB34\uB8CC +FR-Designer-Collect_Information_Description=\uC124\uBA85 +FR-Designer-Collect_Information_Successfully=\uC218\uC9D1\uC131\uACF5 +FR-Designer_Event_Set=\uC774\uBCA4\uD2B8\uC124\uC815 +FR-Designer_Blow_set=\uB2E4\uC74C\uC124\uC815 +FR-Designer_I_Want_To_Set_Single=\uD574\uB2F9\uD15C\uD50C\uB9BF\uC5D0\uB300\uD55C\uB2E8\uB3C5\uC124\uC815 +FR-Designer_Using_Server_Report_View_Settings=\uC11C\uBC84\uC124\uC815\uC0AC\uC6A9 +FR-Designer_ErrorHandlerTemplate=\uD15C\uD50C\uB9BF\uC815\uC758\uC624\uB958 +FR-Designer_Save_Path=\uC800\uC7A5\uACBD\uB85C +FR-Designer_Chart_Acc_Set=\uC815\uD655\uD55C\uC124\uC815 +FR-Designer_Gradient-Color=\uADF8\uB77C\uB370\uC774\uC158\uC0C9\uC0C1 +FR-Designer_DEFAULT=\uAE30\uBCF8 +FR-Designer_chart-PreStyle=\uCC28\uD2B8\uC0AC\uC804\uC815\uC758\uB41C\uC0C9\uBC30\uD569 +FR-Designer_Chart-PreStyle=\uCC28\uD2B8\uC0AC\uC804\uC815\uC758\uB41C\uC0C9\uBC30\uD569 +FR-Designer_Already_exist=\uD604\uC7AC\uD658\uACBD\uC774\uC774\uBBF8\uC874\uC7AC\uD569\uB2C8\uB2E4\: +FR-Designer_Database=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 +FR-Designer_Model=\uBAA8\uB4DC +FR-Designer_Refresh_Successfully=\uC0C8\uB85C\uACE0\uCE68\uC131\uACF5 +FR-Designer_SQL-Table=\uD45C +FR-Designer_SQL-View=\uBDF0 +FR-Designer_Failed=\uC2E4\uD328 +FR-Designer_Chart_Field_Name=\uD544\uB4DC\uBA85 +FR-Designer_FormulaD-Text=\uD14D\uC2A4\uD2B8\uD568\uC218 +FR-Designer_FormulaD-Logical=\uB17C\uB9AC\uD568\uC218 +FR-Designer_FormulaD-Array=\uBC30\uC5F4\uD568\uC218 +FR-Designer_FormulaD-Report=\uBB38\uC11C\uD568\uC218 +FR-Designer_FormulaD-Other=\uAE30\uD0C0\uD568\uC218 +FR-Designer_FormulaD-All=\uBAA8\uB4E0\uD568\uC218 +FR-Designer_Function=\uD568\uC218 +FR-Designer_Select=\uC120\uD0DD +FR-Designer_Edit=\uD3B8\uC9D1 +FR-Designer_Description=\uC124\uBA85 +FR-Designer_Role_changed_isRefresh=\uC5ED\uD560\uC774\uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\uC0C8\uB85C\uACE0\uCE68\uC744\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? +FR-Designer_FS_Name=\uB370\uC774\uD130\uC815\uCC45\uC2DC\uC2A4\uD15C +FR-Designer_Datasource-Parameter=\uB370\uC774\uD130\uC18C\uC2A4\uB9E4\uAC1C\uBCC0\uC218 +FR-Designer_Tree-ComboBox=\uD2B8\uB9AC\uD480\uB2E4\uC6B4 +FR-Designer_Form-Iframe=\uC6F9\uD398\uC774\uC9C0\uD504\uB808\uC784 +FR-Designer_Type=\uC720\uD615 +FR-Designer_User-defined=\uC0AC\uC6A9\uC790\uC815\uC758 +FR-Designer_Simple_general_forV6=\uBC94\uC6A9\uCC3E\uC544\uBCF4\uAE30(ECC 6 \uC774\uC0C1\uBC84\uC804\uC5D0\uC801\uC6A9) +FR-Designer_Import=\uC785\uB825 +FR-Designer_Export=\uCD9C\uB825 +FR-Designer_Delete=\uC0AD\uC81C +FR-Designer_Sequenced_number=\uBC88\uD638 +FR-Designer_Parameters_name=\uB9E4\uAC1C\uBCC0\uC218\uBA85\uCE6D +FR-Designer_SAP_datatype=SAP\uB370\uC774\uD130\uC720\uD615 +FR-Designer_Return_set_name=\uC138\uD2B8(\u96C6)\uB85C\uB3CC\uC544\uAC00\uAE30 +FR-Designer_Datatype=\uB370\uC774\uD130\uC720\uD615 +FR-Designer_Corre_parameter=\uC0C1\uC751\uD558\uB294\uB9E4\uAC1C\uBCC0\uC218 +FR-Designer_Default_value=\uB9E4\uAC1C\uBCC0\uC218\uAE30\uBCF8\uAC12 +FR-Designer_SAP_column_name=SAP\uC5F4\uC774\uB984 +FR-Designer_Table_name=\uD45C\uC774\uB984 +FR-Designer_Columns_choosed=\uC120\uD0DD\uD55C\uC5F4 +FR-Designer_Where_claus=\uD544\uD130\uC870\uAC74 +FR-Designer_PreStyle=\uC0AC\uC804\uC815\uC758\uB41C\uC591\uC2DD +FR-Designer_Loading=\uB85C\uB529\uC911 +FR-Designer_Table=\uD45C +FR-Designer_Name=\uC774\uB984 +FR-Designer_EmailPane-tips=${abc}\uB97C\uB9E4\uAC1C\uBCC0\uC218\uB85C\uC785\uB825\uD558\uACE0,abc\uB294\uB9E4\uAC1C\uBCC0\uC218\uBA85\uCE6D\uC774\uB429\uB2C8\uB2E4.${today()}\uC5D0\uB530\uB77C\uC81C\uBAA9\uBCF8\uBB38\uC740"${today()}\uD1B5\uACC4\uC0C1\uD669"\uFF0C\uC218\uC2E0\uC778\uC740"${p},123@gmail.com,mike"\uB85C\uD558\uACE0,mike\uB294\uD50C\uB7AB\uD3FC\uC0AC\uC6A9\uC790\uAD00\uB9AC\uC5D0\uC800\uC7A5\uB418\uC5B4\uC788\uB294\uC0AC\uC6A9\uC790\uC774\uB984\uC774\uC5B4\uC57C\uD569\uB2C8\uB2E4. +FR-Designer_EmailPane-mailContent=\uBA54\uC77C\uBCF8\uBB38 +FR-Designer_EmailPane-BCC=\uC228\uC740\uCC38\uC870 +FR-Designer_EmailPane-mailSubject=\uBA54\uC77C\uC81C\uBAA9 +FR-Designer_EmailPane-warnings=\uBA54\uC77C\uBC1C\uC1A1\uAD6C\uC131\uC774\uD615\uC131\uB418\uC9C0\uC54A\uC558\uC2B5\uB2C8\uB2E4.\uD50C\uB7AB\uD3FC\uC744\uB4F1\uB85D\uD558\uC5EC\uAD6C\uC131\uD558\uAC70\uB098\uAD00\uB9AC\uC790\uC5D0\uAC8C\uC5F0\uB77D\uD574\uC8FC\uC2ED\uC2DC\uC624. +FR-Designer_Email_sentEmail=\uBA54\uC77C\uBC1C\uC1A1 +FR-Designer_file-is-locked=\uC5F4\uB824\uB294\uBB38\uC11C\uB97C\uB2E4\uB978\uC0AC\uB78C\uC774\uC0AC\uC6A9\uC911\uC774\uB2C8\uC7A0\uC2DC\uD6C4\uC5D0\uC5F4\uC5B4\uC8FC\uC2ED\uC2DC\uC624. +FR-Designer_Custom_Icon_Message1=16 \u00D7 16\uADDC\uACA9\uC758 PNG\uC774\uBBF8\uC9C0\uC0AC\uC6A9\uAD8C\uC7A5 +FR-Designer_Add=\uCD94\uAC00 +FR-Designer_Custom_Icon_Message2=\uC870\uC791\uC774\uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4. +FR-Designer_Tooltips=\uC54C\uB9BC +FR-Designer_Remove=\uC0AD\uC81C +FR-Designer_Custom_Icon_SelectIcon=\uC544\uC774\uCF58\uC120\uD0DD +FR-Designer_Click_this_button=\uBCF8\uD0A4\uB97C\uD074\uB9AD\uD558\uC5EC\uACBD\uB85C\uC120\uD0DD +FR-Designer_Custom_Icon_Message3=\uC544\uC774\uCF58\uC774\uB984\uC774\uC774\uBBF8\uC874\uC7AC\uD569\uB2C8\uB2E4. +FR-Designer_Set_default_browser=\uAE30\uBCF8\uC6F9\uBE0C\uB77C\uC6B0\uC800\uB97C\uCC3E\uC744\uC218\uC5C6\uC2B5\uB2C8\uB2E4. Intenet \uC635\uC158\uC5D0\uC11C\uC2DC\uC2A4\uD15C\uAE30\uBCF8\uC6F9\uBE0C\uB77C\uC6B0\uC800\uB97C\uC124\uC815\uD574\uC8FC\uC2ED\uC2DC\uC624. +FR-Designer_Open=\uC5F4\uAE30 +FR-Designer_Utils-OpenDemoEnv=\uC81C\uD488\uC2DC\uC5F0.\uC791\uC5C5\uB514\uB809\uD130\uB9AC\uB85C\uC790\uB3D9\uC804\uD658\uD574\uC57C\uD569\uB2C8\uB2E4\uFF1A +FR-Designer_Utils-switch=\n\uD604\uC7AC\uC800\uC7A5\uB418\uC9C0\uC54A\uC740\uD30C\uC77C\uC774\uD604\uC7AC\uB514\uB809\uD130\uB9AC\uC5D0\uC800\uC7A5\uB418\uB824\uD569\uB2C8\uB2E4.\n\uACC4\uC18D\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?\uFF1F +FR-Designer_Utils-NewDemoEnv=\uC81C\uD488\uC2DC\uC5F0.\uC790\uB3D9\uC73C\uB85C\uC791\uC5C5\uB514\uB809\uD130\uB9AC\uAC00\uB9CC\uB4E4\uC5B4\uC9D1\uB2C8\uB2E4: +FR-Designer_Save_As_Global_Style=\uC804\uC5ED\uC11C\uC2DD\uC73C\uB85C\uC800\uC7A5 +FR-Designer_Input_The_Name_Of_Gloabel_Style=\uC800\uC7A5\uB41C\uBAA8\uB4E0\uC11C\uC2DD\uBA85\uCE6D\uC785\uB825 +FR-Designer_This_Name_Has_Exsit=\uC774\uC774\uB984\uC740\uC774\uBBF8\uC874\uC7AC\uD569\uB2C8\uB2E4. +FR-Designer_Shortcut_Set=\uB2E8\uCD95\uD0A4\uC124\uC815 +FR-Designer_Feature_Name=\uAE30\uB2A5\uBA85\uCE6D\uFF1A +FR-Designer_Cursor_to_next_column=\uCEE4\uC11C\uB97C\uB2E4\uC74C\uC5F4\uB85C\uC774\uB3D9 +FR-Designer_Cursor_to_next_row=\uCEE4\uC11C\uB97C\uB2E4\uC74C\uD589\uC73C\uB85C\uC774\uB3D9 +FR-Designer_Current_keys=\uD604\uC7AC\uB2E8\uCD95\uD0A4\uFF1A +FR-Designer_Exchange_key=\uAD50\uD658\uB2E8\uCD95\uD0A4\uD074\uB9AD +FR-Designer_System_default=\uC2DC\uC2A4\uD15C\uC774\uAE30\uBCF8\uC744 +FR-Designer_Cursor_to_previous_column=\uCEE4\uC11C\uB97C\uC774\uC804\uC5F4\uB85C\uC774\uB3D9\uFF1A +FR-Designer_Cursor_to_previous_row=\uCEE4\uC11C\uB97C\uC774\uC804\uD589\uC73C\uB85C\uC774\uB3D9\uFF1A +FR-Designer_Are_You_Sure_To_Delete_The_Data=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uB97C\uC0AD\uC81C\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? +FR-Designer_Show_Icon=\uD0A4\uC544\uC774\uCF58\uBCF4\uC774\uAE30 +FR-Designer_Show_Text=\uD0A4\uC774\uB984\uBCF4\uC774\uAE30 +FR-Designer_User_Defined_Event=\uC0AC\uC6A9\uC790\uC815\uC758\uC774\uBCA4\uD2B8 +FR-Designer_Output_PDF=PDF\uCD9C\uB825 +FR-Designer_Output_Word=Word\uCD9C\uB825 +FR-Designer_Image=\uC774\uBBF8\uC9C0 +FR-Designer_Flash_Print=Flash\uC778\uC1C4 +FR-Designer_PDF_Print=PDF\uC778\uC1C4 +FR-Designer_Applet_Print=Applet\uC778\uC1C4 +FR-Designer_Server_Print=\uC11C\uBC84\uB2E8\uC778\uC1C4 +FR-Designer_Use_ToolBar=\uD234\uBC14\uC0AC\uC6A9 +FR-Designer_Report_Show_Location=\uBB38\uC11C\uBCF4\uC774\uAE30\uC704\uCE58 +FR-Designer_Is_Paint_Page=\uC774\uBBF8\uC9C0\uB85C\uBCF4\uC774\uAE30 +FR-Designer_IS_Auto_Scale=iframe \uC0BD\uC785 \uC2DC \uC790\uB3D9 \uCD95\uC18C +FR-Designer_IS_TD_HEAVY_EXPORT=\uC911(\u91CD)\uBC29\uC2DD\uCD9C\uB825\uADF8\uB9AC\uB4DC +FR-Designer_Top=\uC704 +FR-Designer_Bottom=\uC544\uB798 +FR-Designer-Collect_OSXTips=\uC54C\uB9BC\uFF1Acontrol+v\uB97C\uB20C\uB7EC\uD65C\uC131\uCF54\uB4DC\uBD99\uC5EC\uB123\uAE30 +FR-Designer_X_Coordinate=\uAC00\uB85C\uC88C\uD45C +FR-Designer_Y_Coordinate=\uC138\uB85C\uC88C\uD45C +FR-Designer_Widget_Width=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB108\uBE44 +FR-Designer_Widget_Height=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB192\uC774 +FR-Designer_Min_Height=\uCD5C\uC18C\uB192\uC774 +FR-Designer_LeftParent=\uC67C\uCABD\uBD80\uBAA8\uC140 +FR-Designer-PluginLicense_Check_Failed=\uD50C\uB7EC\uADF8\uC778\uAD8C\uD55C\uBD80\uC5EC\uD30C\uC77C\uC774\uAE30\uAC04\uCD08\uACFC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E4\uC2DC\uD65C\uC131\uD654\uD558\uC2ED\uC2DC\uC624. +FR-Designer-File_address=\uD30C\uC77C\uC8FC\uC18C +FR-Designer-Local_file=\uB85C\uCEEC\uD30C\uC77C +FR-Designer_Selection=\uC120\uD0DD +FR-Designer-Type_Parameter= ${abc}\uB97C\uB9E4\uAC1C\uBCC0\uC218\uB85C\uC785\uB825\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.\uC774abc\uB294\uB9E4\uAC1C\uBCC0\uC218\uC758\uC774\uB984\uC785\uB2C8\uB2E4. \uC608\uFF1A
+FR-Designer_Add_JS_warning=\uC608\uC2DC\uC0C1\uC5D0\uC788\uB294\uC815\uD655\uD55C url\uC8FC\uC18C\\ub97c\uC785\uB825\uD574\uC8FC\uC2ED\uC2DC\uC624! +FR-Designer-Encoding_Type=\uCF54\uB529\uC720\uD615 +FR-Designer-FirstRow_IS_ColumnName=\uCCAB\uBC88\uC9F8\uD589\uC5D0\uC5F4\uC81C\uBAA9\uD3EC\uD568 +FR-Designer_Dismenber=\uAD6C\uBD84\uBB38\uC790 +FR-Designer_TableDismember=\uD0ED\uAE30\uD638 +FR-Designer_Space=\uACF5\uBC31 +FR-Designer_CommaDismenber=\uC27C\uD45C +FR-Designer_Other=\uAE30\uD0C0 +FR-Designer-Series_Dismenber_As_Single=\uC5F0\uC18D\uB41C\uAD6C\uBD84\uC790\uB294\uB2E8\uC77C\uCC98\uB9AC\uB85C\uAC04\uC8FC +FR-Designer_KeyPoint=\uD575\uC2EC\uB178\uB4DC +FR-Designer_loadedTreeModel=\uB85C\uB529\uC5D0\uC2E4\uD328\uD558\uC600\uC2B5\uB2C8\uB2E4.\uAC80\uC0AC\uD6C4\uB2E4\uC2DC\uC2DC\uB3C4\uD574\uC8FC\uC2ED\uC2DC\uC624. +FR-Designer-Failed_to_load_the_plugin=\uD50C\uB7EC\uADF8\uC778\uC744\uB85C\uB529\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.\uD50C\uB7EC\uADF8\uC778\uC744\uC5C5\uB370\uC774\uD2B8\uD574\uC8FC\uC138\uC694. +FR-Designer-Plugin_Please_Update_Jar=Jar\uD329\uC744\uC5C5\uB370\uC774\uD2B8\uD574\uC8FC\uC138\uC694.\uD50C\uB7EC\uADF8\uC778\uC740\uCD5C\uC800\uBC84\uC804\uC774\uC788\uC5B4\uC57C\uD569\uB2C8\uB2E4. +FR-Designer_Get-CubeGetting=cube\uD68D\uB4DD +FR-Designer_XMLA_Database=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 +FR-Designer_XMLA_UserName=\uC0AC\uC6A9\uC790\uC774\uB984 +FR-Designer_XMLA_Password=\uC554\uD638 +FR-Designer_XMLA_Get_Catalog=catalog\uB97C\uC5BB\uB294\uC911 +FR-Designer_XMLA_Not_NULL=\uBE48\uCE78\uC73C\uB85C\uB458\uC218\uC5C6\uC2B5\uB2C8\uB2E4. +FR-Designer_Column-Axis=\uC5F4\uCD95 +FR-Designer_LiteCondition_Common=\uC77C\uBC18 +FR-Designer_LiteCondition_Formula=\uC218\uC2DD +FR-Designer_LiteCondition_ConditionB-AND=~\uC640(AND) +FR-Designer_LiteCondition_ConditionB-OR=\uB610\uB294 (OR) +FR-Designer_LiteCondition_Common_Condition=\uC77C\uBC18\uC870\uAC74 +FR-Designer_LiteCondition_Formula_Condition=\uC218\uC2DD\uC870\uAC74 +FR-Designer_LiteCondition_Define=\uC815\uC758 +FR-Designer_Normal=\uC815\uC0C1 +FR-Designer_Alert=\uACBD\uACE0 +FR-Designer_Select_All=\uBAA8\uB450\uC120\uD0DD +FR-Designer_Clear_All=\uBAA8\uB450\uD074\uB9AC\uC5B4 +FR-Designer_Copy=\uBCF5\uC0AC +FR-Designer_Log=\uB85C\uADF8 +FR-Designer-Plugin_Expire_Dialog_Title=\uD50C\uB7EC\uADF8\uC778\uAE30\uAC04\uCD08\uACFC +FR-Designer-Plugin_Expire_Dialog_Text=\uD50C\uB7EC\uADF8\uC778\uAE30\uAC04\uC774\uCD08\uACFC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\uD310\uB87C\uC571\uC13C\uD130\uC5D0\uC11C\uAD6C\uB9E4\uD574\uC8FC\uC2ED\uC2DC\uC624. +FR-Designer-Plugin_Finerest_Addon=\uD310\uB87C\uC571\uC13C\uD130 +FR-Designer_Performance_First=\uC131\uB2A5\uC6B0\uC120\uC21C\uC704 +FR-Designer_Total_N_Grade=\uCD1D\:${N}\uACC4\uCE35 +FR-Designer-BBSLogin_Login-Title=\uD3EC\uB7FC\uACC4\uC815\uC73C\uB85C\uB85C\uADF8\uC778 +FR-Designer_time(s)=\uD68C +FR-Designer_General=\uC77C\uBC18 +FR-Designer_Advanced=\uACE0\uAE09 +FR-Designer_Oracle=\uBAA8\uB4E0\uD45C +FR-Designer_Product_improve=\uC81C\uD488\uAC1C\uB7C9 +FR-Designer_Join_Product_improve=\uC81C\uD488\uAC1C\uB7C9\uACC4\uD68D\uCD94\uAC00 +FR-Designer_Preference-Function=\uAE30\uB2A5\uC124\uC815 +FR-Designer_max_undo_limit=\uCD5C\uB300\uD574\uC81C\uD69F\uC218 +FR-Designer_Surport_String_To_Formula=\uBB38\uC790\uC5F4\uC744\uC218\uC2DD\uC73C\uB85C\uD3B8\uC9D1\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. +FR-Designer_Always=\uD574\uB2F9\uC870\uC791\uAE30\uBCF8\uC2E4\uD589 +FR-Designer_Export_Setting=\uB0B4\uBCF4\uB0B4\uAE30\uAD6C\uC131 +FR-Designer_Select_Export_Log_Directory=\uB514\uB809\uD130\uB9AC\uB0B4\uBCF4\uB0B4\uAE30\uC120\uD0DD +FR-Designer_Level_Setting=\uB4F1\uAE09\uC124\uC815 +FR-Designer_Choose_Language=\uC5B8\uC5B4\uC120\uD0DD +FR-Designer_Work_After_Restart_Designer=\uC124\uACC4\uAE30\uB97C\uC7AC\uBD80\uD305\uD574\uC57C\uC720\uD6A8\uD569\uB2C8\uB2E4. +FR-Designer_Setting-Ruler-Units=\uB208\uAE08\uC790\uB2E8\uC704\uC124\uC815 +FR-Designer_PageSetup-mm=\uBC00\uB9AC\uBBF8\uD130 +FR-Designer_Unit_CM=\uC13C\uD2F0\uBBF8\uD130 +FR-Designer_Page-Setup-Scale-Units=\uC6F9\uD398\uC774\uC9C0\uC124\uC815\uB208\uAE08\uC790\uB2E8\uC704 +FR-Designer_Report-Design-Ruler-Units=\uBB38\uC11C\uB514\uC790\uC778\uB208\uAE08\uC790\uB2E8\uC704 +FR-Designer_Web_Preview_Port_Setting=\uD3EC\uD2B8\uC124\uC815 +FR-Designer_Designer_Language=\uC124\uACC4\uAE30\uC5B8\uC5B4 +FR-Designer_Unit_INCH=\uC778\uCE58 +FR-Designer_Web_Preview_Port=\uD3EC\uD2B8\uBC88\uD638 +FR-Designer_Oracle_All_Tables=\uBAA8\uB4E0\uD45C +FR-Designer_Unit_PT=\uD30C\uC6B4\uB4DC +FR-Designer-Write_Auto_Stash=\uC790\uB3D9\uC784\uC2DC\uC800\uC7A5 +FR-Designer_Printer_Native_Button=\uB85C\uCEEC\uC778\uC1C4 +FR-Designer_Event_ShowWidgets=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC9C1\uC811\uBCF4\uC774\uAE30 +FR-Designer_Current_Preview_Rows=\uD604\uC7AC\uD589\uC218\uBBF8\uB9AC\uBCF4\uAE30 +FR-Designer_Data=\uB370\uC774\uD130 +FR-Designer_Error=\uC624\uB958 +FR-Designer-Website_Url=http\://www.finereport.com/ +FR-Designer-BBSLogin_Download-Unlogin-Tip= +FR-Designer-App_ReLayout=\uC804\uD654 \uB808\uC774\uC544\uC6C3 \uC791\uC5C5 +FR-Designer_Write-Save-Formula=\uAE30\uC785\uD558\uC5EC \uBCF4\uACE0\uD558\uB2E4 \uBCF4\uAD00 \uACF5\uC2DD +FR-Designer_Export-Save-Formula=\uB0B4\uBCF4\uB0B4\uAE30 \uC720\uBCF4 \uACF5\uC2DD +FR-Designer_Attention=\uC8FC\uC758 +FR-Designer_Forbid_Widgets_Intersects=\uC11C\uB85C \uACB9\uCE58\uB294 \uAE08\uC9C0 \uAD6C\uC131 \uC694\uC18C +FR-Designer_Widget_Scaling_Mode_Fit=\uC801\uC751 \uAD6C\uC5ED +FR-Designer_Widget_Scaling_Mode_Fixed=\uACE0\uC815 \uD06C\uAE30 +FR-Designer-Widget_Area_Scaling=\uAD6C\uC131 \uC694\uC18C \uC601\uC5ED \uD06C\uAE30 \uC870\uC815 +FR-Designer-Widget_Scaling_Mode=\uD655\uB300 / \uCD95\uC18C \uB17C\uB9AC +FR-Designer-QQLogin-Determine=\uACB0\uC815 +FR-Designer-QQLogin-Cancel=\uCDE8\uC18C +FR-Designer-Reuse_Manager= +FR-Designer_Layout_Block_Absolute= +FR-Designer_Layout_Block_Tab= +FR-Designer_Layout_Block_Blank= +FR-Designer_Attr_Layout= +FR-Designer_Attr_Layout_Type= +FR-Designer_Attr_Bidirectional_Adaptive= +FR-Designer-Selected_Widget= +FR-Designer_SimpleDetail_Report= +FR-Designer_Download_Template= +FR-Designer_Install_Template= +FR-Designer_Mobile-Refresh= +FR-Designer_Mobile-ToolBar= +FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3\uC740\uB808\uC774\uC544\uC6C3\uC548\uC5D0\uC11C\uC5B4\uB290\uC704\uCE58\uC5D0\uB3C4\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB97C\uCD94\uAC00\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. +FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00 +FR-Designer_Reset= diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties new file mode 100644 index 0000000000..a83c0e8b4d --- /dev/null +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -0,0 +1,450 @@ +# generated time: 星期四 十一月 24 11:56:39 CST 2016 +FR-Designer-BBSLogin_Account=\u7528\u6237\u540D +FR-Designer-BBSLogin_Connection-Failure=\u7F51\u7EDC\u8FDE\u63A5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u5F53\u524D\u7F51\u7EDC\u72B6\u6001 +FR-Designer-BBSLogin_Connection-Failure-Tip=\u63D0\u793A +FR-Designer-BBSLogin_Forgot-Password=\u5FD8\u8BB0\u5BC6\u7801 +FR-Designer-BBSLogin_Login=\u767B\u5F55 +FR-Designer-BBSLogin_Login-Failure-Tip=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF\uFF0C\u8BF7\u91CD\u65B0\u767B\u9646 +FR-Designer-BBSLogin_Password=\u5BC6\u7801 +FR-Designer-BBSLogin_Password-Empty-Tip=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A +FR-Designer-BBSLogin_Register-Account=\u6CE8\u518C\u8D26\u53F7 +FR-Designer-BBSLogin_Switch-Account=\u5207\u6362\u8D26\u53F7 +FR-Designer-BBSLogin_Privite-Message=\u79C1\u4EBA\u6D88\u606F +FR-Designer-BBSLogin_Times=\u6B21 +FR-Designer-BBSLogin_Username-Empty-Tip=\u7528\u6237\u540D\u4E0D\u80FD\u4E3A\u7A7A +FR-Designer-Basic_More_Color=\u66F4\u591A\u989C\u8272... +FR-Designer-Estate_Any=\u4E0D\u9650 +FR-Designer-Estate_Default_Font=\u9ED8\u8BA4\u5B57\u4F53 +FR-Designer-Estate_Default_Null=\u9ED8\u8BA4\u4E3A\u7A7A +FR-Designer-Estate_Default_Text=\u9ED8\u8BA4\u503C +FR-Designer-Estate_Parameter_Null_Text=\u53C2\u6570\u4E3A\u7A7A\u663E\u793A\u4E3A +FR-Designer-Estate_Radio-Group=\u5730\u4EA7\u884C\u4E1A\u901A\u7528\u6309\u94AE\u7EC4\u63A7\u4EF6 +FR-Designer-Estate_Selected_Font=\u9009\u4E2D\u5B57\u4F53 +FR-Designer-Estate_Widget_Value=\u63A7\u4EF6\u503C +FR-Designer-Layout_Adaptive_Layout=\u81EA\u9002\u5E94\u5E03\u5C40 +FR-Designer-Output_Background_Set=\u80CC\u666F\u8BBE\u7F6E +FR-Designer-Output_Default_Background=\u9ED8\u8BA4\u80CC\u666F +FR-Designer-Output_Excel_Page=Excel\u8F93\u51FA(\u5206\u9875\u5BFC\u51FA) +FR-Designer-Output_Excel_Sheet=Excel\u8F93\u51FA(\u5206\u9875\u5206Sheet\u5BFC\u51FA) +FR-Designer-Output_Excel_Simple=Excel\u8F93\u51FA(\u539F\u6837\u5BFC\u51FA) +FR-Designer-Plugin_PluginMarket_Coding=\u63D2\u4EF6\u5546\u5E97\u6B63\u5728\u5F00\u53D1\u4E2D\uFF0C\u656C\u8BF7\u671F\u5F85 +FR-Designer-Submit_Condition=\u6761\u4EF6 +FR-Designer-Widget-Title_border=\u8FB9\u6846 +FR-Designer-Widget-Title_border_color=\u989C\u8272 +FR-Designer_AbsoluteLayout=\u7EDD\u5BF9\u5E03\u5C40 +FR-Designer_Allow_Decimals=\u5141\u8BB8\u5C0F\u6570 +FR-Designer_Allow_Negative=\u5141\u8BB8\u8D1F\u503C +FR-Designer_Background-Click=\u9F20\u6807\u70B9\u51FB\u80CC\u666F +FR-Designer_Background-Initial=\u521D\u59CB\u80CC\u666F +FR-Designer_Background-Over=\u9F20\u6807\u6D6E\u52A8\u80CC\u666F +FR-Designer_Bar-Code-Exception-Tip=\u6570\u636E\u4E0D\u80FD\u4E3A\u7A7A +FR-Designer_Block-intersect=\u7981\u6B62\u5757\u4E0E\u5757\u4E4B\u95F4\u7684\u91CD\u53E0 +FR-Designer_BorderLayout=\u8FB9\u754C\u5E03\u5C40 +FR-Designer_Button-Hotkeys=\u5FEB\u6377\u952E +FR-Designer_Button-Icon=\u6309\u94AE\u56FE\u6807 +FR-Designer_Button-Name=\u6309\u94AE\u540D\u79F0 +FR-Designer_Button-Type=\u6309\u94AE\u7C7B\u578B +FR-Designer_CardLayout=Tab\u5E03\u5C40 +FR-Designer_Cell=\u5355\u5143\u683C +FR-Designer_Chart_Cell=\u56FE\u8868\u8D85\u94FE-\u8054\u52A8\u5355\u5143\u683C +FR-Designer_Chart_Float=\u56FE\u8868\u8D85\u94FE-\u8054\u52A8\u60AC\u6D6E\u5143\u7D20 +FR-Designer_Chart_Float_chart=\u56FE\u8868\u8D85\u94FE-\u60AC\u6D6E\u7A97\u56FE\u8868 +FR-Designer_Check-for-Updates=\u68C0\u67E5\u66F4\u65B0 +FR-Designer_Choose-Data-Confusion-Tip=\ \u8BF7\u9009\u62E9\u9700\u8981\u6DF7\u6DC6\u7684\u5B57\u6BB5\u540E\u9884\u89C8 +FR-Designer_Close=\u5173\u95ED +FR-Designer_Column=\u5217 +FR-Designer_Column_Measure=\u5217\u8F74/\u5EA6\u91CF\u503C +FR-Designer_Condition_Attributes=\u6761\u4EF6\u5C5E\u6027 +FR-Designer_Confusion-Col-Name=\u5B57\u6BB5\u540D\u79F0 +FR-Designer_Confusion-key=\u6DF7\u6DC6\u5173\u952E\u5B57 +FR-Designer_Currency_Line=\u91D1\u989D\u7EBF +FR-Designer_Current_tab=\u5F53\u524D\u7F16\u8F91tab +FR-Designer_Custom=\u81EA\u5B9A\u4E49 +FR-Designer_Custom-Angle=\u81EA\u5B9A\u4E49\u89D2\u5EA6 +FR-Designer_DS-Dictionary=\u6570\u636E\u5B57\u5178 +FR-Designer_Data-confusion=\u6570\u636E\u6DF7\u6DC6 +FR-Designer_Data_Type=\u6570\u636E\u7C7B\u578B +FR-Designer_Double_Click_Edit_OR_Clear=\u53CC\u51FB\u8FDB\u884C\u7F16\u8F91\u6216\u6E05\u9664 +FR-Designer_Email=\u90AE\u4EF6 +FR-Designer_Enabled=\u53EF\u7528 +FR-Designer_End-Date=\u7ED3\u675F\u65E5\u671F +FR-Designer_ExportAndOutput=\u5BFC\u51FA +FR-Designer_FRFont=\u5B57\u4F53 +FR-Designer_FS_Close_Other_Templates=\u5173\u95ED\u5176\u4ED6\u6A21\u677F +FR-Designer_File=\u6587\u4EF6 +FR-Designer_Filter_Conditions=\u8FC7\u6EE4\u6761\u4EF6 +FR-Designer_Finish-Modify-Share=\u5B8C\u6210\u4FEE\u6539\u5E76\u5206\u4EAB +FR-Designer_Fit-App=App\u81EA\u9002\u5E94 +FR-Designer_Font-Family=\u5B57\u4F53\u540D\u79F0 +FR-Designer_Font-Size=\u5B57\u4F53\u5927\u5C0F +FR-Designer_Forbid_Drag_into_Adapt_Pane=\u8BE5\u5BF9\u8C61\u4E0D\u5141\u8BB8\u62D6\u5165\u8868\u5355\u4E3B\u4F53 +FR-Designer_Forbid_Drag_into_Para_Pane=\u8BE5\u5BF9\u8C61\u4E0D\u80FD\u62D6\u5165\u53C2\u6570\u9762\u677F +FR-Designer_Foreground=\u989C\u8272 +FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=\u6682\u4E0D\u652F\u6301\u8868\u5355\u6743\u9650\u7F16\u8F91 +FR-Designer_Form-Report=\u62A5\u8868\u5757 +FR-Designer_Form_EmbeddedTD=\u8868\u5355(\u5185\u7F6E\u6570\u636E) +FR-Designer_Form_Module=\u8868\u5355\u6A21\u5757 +FR-Designer_Format_explan=\u683C\u5F0F\u8BF4\u660E +FR-Designer_Formula=\u516C\u5F0F +FR-Designer_Forum=\u8BBA\u575B +FR-Designer_Get-Cube=\u6B63\u5728\u83B7\u53D6cube +FR-Designer_Help=\u5E2E\u52A9 +FR-Designer_Hide=\u9690\u85CF +FR-Designer_Hyperlink=\u8D85\u7EA7\u94FE\u63A5 +FR-Designer_Hyperlink-Form_link=\u5F53\u524D\u8868\u5355\u5BF9\u8C61 +FR-Designer_IDCard=\u8EAB\u4EFD\u8BC1 +FR-Designer_Icon=\u56FE\u6807 +FR-Designer_Index=\u5217\u8F74/\u6307\u6807 +FR-Designer_Input_Rule=\u586B\u5199\u89C4\u5219 +FR-Designer_Language_Default=\u9ED8\u8BA4 +FR-Designer_Layout=\u5E03\u5C40 +FR-Designer_Layout-HBox=\u6C34\u5E73\u76D2\u5B50\u5E03\u5C40 +FR-Designer_Layout-Index=\u7D22\u5F15 +FR-Designer_Layout_Constraints=\u4F4D\u7F6E\u548C\u5927\u5C0F +FR-Designer_Length=\u957F\u5EA6 +FR-Designer_Loading_Data=\u6B63\u5728\u52A0\u8F7D\u6570\u636E +FR-Designer_M-Exit=\u9000\u51FA +FR-Designer_Allow-Blank=\u5141\u8BB8\u4E3A\u7A7A +FR-Designer_M-Help=\u5E2E\u52A9 +FR-Designer_M-Insert=\u63D2\u5165 +FR-Designer_M-Repeat-Freeze=\u91CD\u590D\u4E0E\u51BB\u7ED3\u8BBE\u7F6E +FR-Designer_M-Server=\u670D\u52A1\u5668 +FR-Designer_M-SwitchWorkspace=\u5207\u6362\u5DE5\u4F5C\u76EE\u5F55 +FR-Designer_M-Template=\u6A21\u677F +FR-Designer_MDX_Explain=\u8BED\u6CD5\u683C\u5F0F\u53C2\u8003MDX\u8BED\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\u6CE8\uFF1ACOLUMNS\u3001ROWS\u53EF\u4EE5\u4F7F\u75280\u30011\u4EE3\u66FF\uFF0C\u67E5\u8BE2\u8F74\u53EA\u652F\u6301\u8FD4\u56DE\u4E24\u4E2A\u8F74\u3002 +FR-Designer_M_Help-About_Software=\u5173\u4E8E\u8F6F\u4EF6 +FR-Designer_M_Help-Tutorial=\u5E2E\u52A9\u6559\u7A0B +FR-Designer_Max_Value=\u6700\u5927\u503C +FR-Designer_Min_Value=\u6700\u5C0F\u503C +FR-Designer_MobilePhone=\u624B\u673A +FR-Designer_New_Value=\u65B0\u503C +FR-Designer_None=\u65E0 +FR-Designer_PaperSize-Mobile=\u624B\u673A +FR-Designer_PaperSize-Mobile-Large=\u624B\u673A\u5927\u5C4F +FR-Designer_PaperSize-Mobile-Small=\u624B\u673A\u5C0F\u5C4F +FR-Designer_Para-Body=\u53C2\u6570\u754C\u9762 +FR-Designer_Parameters=\u53C2\u6570 +FR-Designer_Phone=\u7535\u8BDD +FR-Designer_PostCode=\u90AE\u7F16 +FR-Designer_Present=\u5F62\u6001 +FR-Designer_Preview=\u9884\u89C8 +FR-Designer_Preview-Data-Confusion=\u9884\u89C8\u6DF7\u6DC6\u540E\u7684\u6570\u636E +FR-Designer_Product_Demo=\u4EA7\u54C1\u6F14\u793A +FR-Designer_Query_Type=\u67E5\u8BE2\u65B9\u5F0F +FR-Designer_Refresh=\u5237\u65B0 +FR-Designer_Refresh_Parameter_In_SQL=\u662F\u5426\u5237\u65B0SQL\u4E2D\u7684\u53C2\u6570 +FR-Designer_Reg_Expressions=\u6B63\u5219\u8868\u8FBE\u5F0F +FR-Designer_Reg_Max_Length=\u6700\u5927\u957F\u5EA6 +FR-Designer_Reg_Min_Length=\u6700\u5C0F\u957F\u5EA6 +FR-Designer_ReportColumns-Columns=\u5206\u680F +FR-Designer_Return-Date=\u8FD4\u56DE\u65E5\u671F +FR-Designer_RichText=\u63D2\u5165\u5BCC\u6587\u672C +FR-Designer_RichTextEditor=\u5BCC\u6587\u672C\u7F16\u8F91\u5668 +FR-Designer_Row=\u884C +FR-Designer_Row_Dimension=\u884C\u8F74/\u7EF4\u5EA6 +FR-Designer_Save=\u4FDD\u5B58 +FR-Designer_Search=\u641C\u7D22 +FR-Designer_Set=\u8BBE\u7F6E +FR-Designer_Share-Template=\u5206\u4EAB\u6A21\u677F +FR-Designer_Simple_general=\u7B80\u5355\u901A\u7528\u67E5\u8BE2 +FR-Designer_Song_TypeFace=\u5B8B\u4F53 +FR-Designer_Start-Date=\u8D77\u59CB\u65E5\u671F +FR-Designer_Subscript=\u4E0B\u6807 +FR-Designer_Superscript=\u4E0A\u6807 +FR-Designer_Support_QQ=\u6280\u672FQQ +FR-Designer_Swatch=\u6837\u54C1 +FR-Designer_Tab_title=tab\u6807\u9898 +FR-Designer_TableData=\u6570\u636E\u96C6 +FR-Designer_Thank_guest=\u7279\u522B\u9E23\u8C22\u4EE5\u4E0B\u8BBA\u575B\u5E06\u85AF\u5BF9\u8BE5\u7248\u672C\u8BBE\u8BA1\u5668\u6613\u7528\u6027\u505A\u51FA\u7684\u7A81\u51FA\u8D21\u732E +FR-Designer_Thanks-To=\u9E23\u8C22 +FR-Designer_Title=\u6807\u9898 +FR-Designer_Total=\u603B\u5171 +FR-Designer_UnSignIn=\u672A\u767B\u5F55 +FR-Designer_Underline=\u4E0B\u5212\u7EBF +FR-Designer_Used=\u6700\u8FD1\u4F7F\u7528 +FR-Designer_User-defined-MDX=\u81EA\u5B9A\u4E49MDX\u67E5\u8BE2 +FR-Designer_SampleText=\u793A\u4F8B\u6587\u672C \u793A\u4F8B\u6587\u672C +FR-Designer_Vertical-LeftToRight=\u6587\u5B57\u7AD6\u6392(\u4ECE\u5DE6\u5411\u53F3) +FR-Designer_Vertical-RightToLeft=\u6587\u5B57\u7AD6\u6392(\u4ECE\u53F3\u5411\u5DE6) +FR-Designer_VerticalBoxLayout=\u5782\u76F4\u76D2\u5B50\u5E03\u5C40 +FR-Designer_Visible=\u53EF\u89C1 +FR-Designer_WLayout-Border-ToolTips=\u5B8C\u6574\u7684\u8FB9\u754C\u5E03\u5C40\u5BB9\u5668\uFF0C\u7531\u4E1C\u5357\u897F\u5317\u4E2D\u4E94\u5757\u5171\u540C\u6784\u6210\uFF0C\n\u5176\u4E2D\u5357\u5317\u5757\u53EF\u4EE5\u6839\u636E\u9700\u8981\u8C03\u6574\u9AD8\u5EA6\uFF0C\u4E1C\u897F\u5757\u53EF\u4EE5\u6839\u636E\u9700\u8981\u8C03\u6574\u5BBD\u5EA6\u3002 +FR-Designer_WaterMark=\u6C34\u5370 +FR-Designer_Widget=\u63A7\u4EF6 +FR-Designer_Widget-Settings=\u63A7\u4EF6\u8BBE\u7F6E +FR-Designer_Widget-Visible=\u53EF\u89C1 +FR-Designer_XMLA_Explain=\u5728\u4F7F\u7528\u591A\u7EF4\u6570\u636E\u96C6\u53D6\u6570\u524D\uFF0C\u60A8\u9996\u5148\u9700\u8981\u4E00\u4E2A\u53EF\u6210\u529F\u8FDE\u63A5\u7684\u591A\u7EF4\u6570\u636E\u5E93\u8FDE\u63A5\u3002\n\u8BBE\u7F6E\u5B8C\u6570\u636E\u8FDE\u63A5\u540E\uFF0C\u67E5\u8BE2\u6570\u636E\u65F6,\u6709\u4E24\u79CD\u4E0D\u540C\u7684\u53D6\u6570\u624B\u6BB5\u3002\n1.\u7B80\u5355\u901A\u7528\u67E5\u8BE2\uFF1A\n\u7B80\u5355\u901A\u7528\u67E5\u8BE2\u9002\u7528\u4E8EFineBI\u53CA\u5176\u4ED6\u591A\u7EF4\u6570\u636E\u5E93\u3002\n\u4F7F\u7528\u7B80\u5355\u901A\u7528\u67E5\u8BE2\uFF0CFR\u5C06\u81EA\u52A8\u8BFB\u53D6\u9009\u62E9cube\u7684\u5C42\u6B21\u7ED3\u6784\uFF0C\u60A8\u53EF\u4EE5\u76F4\u63A5\u9009\u62E9\u6240\u9700\u7684\u5EA6\u91CF\u503C\u53CA\u7EF4\u5EA6\uFF0C\u5E76\u6DFB\u52A0\u7B5B\u9009\u6761\u4EF6\uFF0CFR\u4F1A\u6839\u636E\u60A8\u7684\u9009\u62E9\u81EA\u52A8\u67E5\u8BE2\u6570\u636E\u3002\n\u7B80\u5355\u901A\u7528\u67E5\u8BE2\u4EC5\u652F\u6301\u7EF4\u5EA6\u53CA\u5EA6\u91CF\u503C\u4E24\u4E2A\u8F74\u7684\u67E5\u8BE2\u3002\n\u5728\u5EA6\u91CF\u503C\u53CA\u7EF4\u5EA6\u8BBE\u7F6E\u4E2D\uFF0C\u76EE\u524D\u60A8\u53EA\u80FD\u9009\u62E9\u6240\u9700\u7EF4\u5EA6\uFF0C\u65E0\u6CD5\u624B\u52A8\u4FEE\u6539\u3002\n\u8FC7\u6EE4\u6761\u4EF6\u91C7\u7528OPEN SQL\u8BED\u6CD5\uFF0C\u60A8\u53EF\u4EE5\u952E\u5165${abc}\u4F5C\u4E3A\u4E00\u4E2A\u53C2\u6570\uFF0C\u7528\u6CD5\u540C\u6570\u636E\u5E93\u6570\u636E\u96C6\u3002\n2.\u81EA\u5B9A\u4E49MDX\u67E5\u8BE2\uFF1A\n\u4F7F\u7528\u81EA\u5B9A\u4E49MDX\u67E5\u8BE2\uFF0C\u60A8\u53EF\u4EE5\u81EA\u5B9A\u4E49MDX\u8BED\u53E5\u67E5\u8BE2\u6240\u9700\u7ED3\u679C\u3002\n\u6CE8\u610F\uFF0C\u81EA\u5B9A\u4E49MDX\u67E5\u8BE2\u4E5F\u53EA\u652F\u6301\u4E24\u4E2A\u8F74\u7684\u67E5\u8BE2\u3002\n\u60A8\u53EF\u952E\u5165${abc}\u505A\u4E3A\u4E00\u4E2A\u53C2\u6570\uFF0C\u7528\u6CD5\u540C\u6570\u636E\u5E93\u6570\u636E\u96C6\u3002\nFineBI\u7684cube\u4E0D\u652F\u6301MDX\u67E5\u8BE2\u3002 +FR-Designer_bold=\u52A0\u7C97 +FR-Designer_font=\u5B57\u4F53 +FR-Designer_italic=\u659C\u4F53 +FR-Designer_product_feedback=\u4EA7\u54C1\u53CD\u9988 +FR-Designer_XMLA=\u591A\u7EF4\u6570\u636E\u5E93 +FR-Designer-StyleAlignment_Layout_Default=\u9ED8\u8BA4 +FR-Designer-StyleAlignment_Layout_Image_Titled=\u5E73\u94FA +FR-Designer-StyleAlignment_Layout_Image_Extend=\u62C9\u4F38 +FR-Designer-StyleAlignment_Layout_Image_Adjust=\u9002\u5E94 +FR-Designer-StyleAlignment_Tooltips_Left=\u9760\u5DE6 +FR-Designer-StyleAlignment_Tooltips_Center=\u5C45\u4E2D +FR-Designer-StyleAlignment_Tooltips_Right=\u9760\u53F3 +FR-Designer-StyleAlignment_Tooltips_Distributed=\u5206\u6563\u5BF9\u9F50 +FR-Designer-StyleAlignment_Tooltips_DEFAULT=\u9ED8\u8BA4 +FR-Designer-StyleAlignment_Tooltips_Top=\u9760\u4E0A +FR-Designer-StyleAlignment_Tooltips_Bottom=\u9760\u4E0B +FR-Designer-StyleAlignment_Pane_Horizontal=\u6C34\u5E73\u5BF9\u9F50 +FR-Designer-StyleAlignment_Pane_Vertical=\u5782\u76F4\u5BF9\u9F50 +FR-Designer-StyleAlignment_Pane_Style=\u5BF9\u9F50\u65B9\u5F0F +FR-Designer-StyleAlignment_Style_Indentation=\u7F29\u8FDB +FR-Designer-StyleAlignment_Style_Spacing=\u95F4\u8DDD +FR-Designer-StyleAlignment_Style_Alignment=\u5BF9\u9F50 +FR-Designer-CommitTab_Submit=\u63D0\u4EA4 +FR-Designer-CommitTab_SureToDelete=\u786E\u8BA4\u5220\u9664 +FR-Designer-CommitTab_Remove=\u5220\u9664 +FR-Designer-Collect_Information_free=\u514D\u8D39 +FR-Designer-Collect_Information_Description=\u63CF\u8FF0 +FR-Designer-Collect_Information_Successfully=\u6536\u96C6\u6210\u529F +FR-Designer_Event_Set=\u4E8B\u4EF6\u8BBE\u7F6E +FR-Designer_Blow_set=\u4EE5\u4E0B\u8BBE\u7F6E +FR-Designer_I_Want_To_Set_Single=\u4E3A\u8BE5\u6A21\u677F\u5355\u72EC\u8BBE\u7F6E +FR-Designer_Using_Server_Report_View_Settings=\u91C7\u7528\u670D\u52A1\u5668\u8BBE\u7F6E +FR-Designer_ErrorHandlerTemplate=\u51FA\u9519\u6A21\u677F\u5B9A\u4E49 +FR-Designer_Save_Path=\u4FDD\u5B58\u8DEF\u5F84 +FR-Designer_Chart_Acc_Set=\u7CBE\u786E\u8BBE\u7F6E +FR-Designer_Gradient-Color=\u6E10\u53D8\u8272 +FR-Designer_DEFAULT=\u9ED8\u8BA4 +FR-Designer_chart-PreStyle=\u56FE\u8868\u9884\u5B9A\u4E49\u914D\u8272 +FR-Designer_Chart-PreStyle=\u56FE\u8868\u9884\u5B9A\u4E49\u914D\u8272 +FR-Designer_Already_exist=\u5F53\u524D\u73AF\u5883\u5DF2\u5B58\u5728\: +FR-Designer_Database=\u6570\u636E\u5E93 +FR-Designer_Model=\u6A21\u5F0F +FR-Designer_Refresh_Successfully=\u5237\u65B0\u6210\u529F +FR-Designer_SQL-Table=\u8868 +FR-Designer_SQL-View=\u89C6\u56FE +FR-Designer_Failed=\u5931\u8D25 +FR-Designer_Chart_Field_Name=\u5B57\u6BB5\u540D +FR-Designer_FormulaD-Text=\u6587\u672C\u51FD\u6570 +FR-Designer_FormulaD-Logical=\u903B\u8F91\u51FD\u6570 +FR-Designer_FormulaD-Array=\u6570\u7EC4\u51FD\u6570 +FR-Designer_FormulaD-Report=\u62A5\u8868\u51FD\u6570 +FR-Designer_FormulaD-Other=\u5176\u5B83\u51FD\u6570 +FR-Designer_FormulaD-All=\u5168\u90E8\u51FD\u6570 +FR-Designer_Function=\u51FD\u6570 +FR-Designer_Select=\u9009\u62E9 +FR-Designer_Edit=\u7F16\u8F91 +FR-Designer_Description=\u63CF\u8FF0 +FR-Designer_Role_changed_isRefresh=\u89D2\u8272\u5DF2\u53D8\u52A8\uFF0C\u662F\u5426\u5237\u65B0 +FR-Designer_FS_Name=\u6570\u636E\u51B3\u7B56\u7CFB\u7EDF +FR-Designer_Datasource-Parameter=\u6570\u636E\u6E90\u53C2\u6570 +FR-Designer_Tree-ComboBox=\u4E0B\u62C9\u6811 +FR-Designer_Form-Iframe=\u7F51\u9875\u6846 +FR-Designer_Type=\u7C7B\u578B +FR-Designer_User-defined=\u81EA\u5B9A\u4E49 +FR-Designer_Simple_general_forV6=\u901A\u7528\u67E5\u8BE2(\u9002\u7528\u4E8EECC 6\u4EE5\u4E0A\u7248\u672C) +FR-Designer_Import=\u8F93\u5165 +FR-Designer_Export=\u8F93\u51FA +FR-Designer_Delete=\u5220\u9664 +FR-Designer_Sequenced_number=\u5E8F\u53F7 +FR-Designer_Parameters_name=\u53C2\u6570\u540D\u79F0 +FR-Designer_SAP_datatype=SAP\u6570\u636E\u7C7B\u578B +FR-Designer_Return_set_name=\u8FD4\u56DE\u96C6 +FR-Designer_Datatype=\u6570\u636E\u7C7B\u578B +FR-Designer_Corre_parameter=\u5BF9\u5E94\u53C2\u6570 +FR-Designer_Default_value=\u53C2\u6570\u9ED8\u8BA4\u503C +FR-Designer_SAP_column_name=SAP\u5217\u540D +FR-Designer_Table_name=\u8868\u7684\u540D\u79F0 +FR-Designer_Columns_choosed=\u9009\u62E9\u7684\u5217 +FR-Designer_Where_claus=\u8FC7\u6EE4\u6761\u4EF6 +FR-Designer_PreStyle=\u9884\u5B9A\u4E49\u6837\u5F0F +FR-Designer_Loading=\u6B63\u5728\u52A0\u8F7D +FR-Designer_Table=\u8868 +FR-Designer_Name=\u540D\u5B57 +FR-Designer_EmailPane-tips=\u60A8\u53EF\u4EE5\u952E\u5165${abc}\u4F5C\u4E3A\u4E00\u4E2A\u53C2\u6570\uFF0Cabc\u4E3A\u53C2\u6570\u540D\u79F0\uFF1B${today()}\u4F5C\u4E3A\u516C\u5F0F\uFF0C\u4F8B\u5982\uFF1A\u6807\u9898\u6B63\u6587\u4E3A"${today()}\u7EDF\u8BA1\u60C5\u51B5"\uFF0C\u6536\u4EF6\u4EBA\u4E3A"${p},123@gmail.com,mike"\uFF0C\u8FD9\u91CCmike\u5FC5\u987B\u662F\u5DF2\u4FDD\u5B58\u5728\u5E73\u53F0\u7528\u6237\u7BA1\u7406\u91CC\u7684\u7528\u6237\u540D +FR-Designer_EmailPane-mailContent=\u90AE\u4EF6\u6B63\u6587 +FR-Designer_EmailPane-BCC=\u5BC6\u9001 +FR-Designer_EmailPane-mailSubject=\u90AE\u4EF6\u6807\u9898 +FR-Designer_EmailPane-warnings=\u60A8\u5C1A\u672A\u914D\u7F6E\u53D1\u4EF6\u90AE\u7BB1\uFF0C\u8BF7\u767B\u5F55\u5E73\u53F0\u8FDB\u884C\u914D\u7F6E\u6216\u8005\u8054\u7CFB\u7BA1\u7406\u5458 +FR-Designer_Email_sentEmail=\u53D1\u9001\u90AE\u4EF6 +FR-Designer_file-is-locked=\u60A8\u6240\u8981\u6253\u5F00\u7684\u62A5\u8868\u6B63\u5728\u88AB\u5176\u4ED6\u4EBA\u7F16\u8F91\uFF0C\u8BF7\u7A0D\u5019\u6253\u5F00 +FR-Designer_Custom_Icon_Message1=\u5EFA\u8BAE\u4F7F\u752816 \u00D7 16\u89C4\u683C\u7684PNG\u56FE\u7247 +FR-Designer_Add=\u589E\u52A0 +FR-Designer_Custom_Icon_Message2=\u60A8\u7684\u64CD\u4F5C\u5B58\u5728\u4E0D\u5408\u7406\u4E4B\u5904\u3002 +FR-Designer_Tooltips=\u63D0\u793A +FR-Designer_Remove=\u5220\u9664 +FR-Designer_Custom_Icon_SelectIcon=\u9009\u62E9\u56FE\u6807 +FR-Designer_Click_this_button=\u70B9\u51FB\u6B64\u6309\u94AE\u8FDB\u884C\u8DEF\u5F84\u9009\u62E9 +FR-Designer_Custom_Icon_Message3=\u56FE\u6807\u540D\u79F0\u5DF2\u7ECF\u5B58\u5728\u3002 +FR-Designer_Set_default_browser=\u6CA1\u6709\u627E\u5230\u9ED8\u8BA4\u6D4F\u89C8\u5668\uFF0C\u8BF7\u5728Intenet\u9009\u9879\u4E2D\u8BBE\u7F6E\u7CFB\u7EDF\u9ED8\u8BA4\u6D4F\u89C8\u5668\u3002 +FR-Designer_Open=\u6253\u5F00 +FR-Designer_Utils-OpenDemoEnv=\u4EA7\u54C1\u6F14\u793A\uFF0C\u9700\u8981\u81EA\u52A8\u5207\u6362\u81F3\u5DE5\u4F5C\u76EE\u5F55\uFF1A +FR-Designer_Utils-switch=\n\u60A8\u5F53\u524D\u672A\u88AB\u4FDD\u5B58\u6587\u4EF6\u5C06\u88AB\u4FDD\u5B58\u5728\u5F53\u524D\u76EE\u5F55\u4E0B\uFF0C\n\u662F\u5426\u7EE7\u7EED\uFF1F +FR-Designer_Utils-NewDemoEnv=\u4EA7\u54C1\u6F14\u793A\uFF0C\u5C06\u4E3A\u60A8\u81EA\u52A8\u521B\u5EFA\u5DE5\u4F5C\u76EE\u5F55\uFF1A +FR-Designer_Save_As_Global_Style=\u4FDD\u5B58\u4E3A\u5168\u5C40\u683C\u5F0F +FR-Designer_Input_The_Name_Of_Gloabel_Style=\u8F93\u5165\u6240\u4FDD\u5B58\u7684\u5168\u5C40\u683C\u5F0F\u540D\u79F0 +FR-Designer_This_Name_Has_Exsit=\u8FD9\u4E2A\u540D\u5B57\u5DF2\u7ECF\u5B58\u5728 +FR-Designer_Shortcut_Set=\u5FEB\u6377\u952E\u8BBE\u7F6E +FR-Designer_Feature_Name=\u529F\u80FD\u540D\u79F0\uFF1A +FR-Designer_Cursor_to_next_column=\u5149\u6807\u79FB\u5230\u4E0B\u4E00\u5217 +FR-Designer_Cursor_to_next_row=\u5149\u6807\u79FB\u5230\u4E0B\u4E00\u884C +FR-Designer_Current_keys=\u5F53\u524D\u5FEB\u6377\u952E\uFF1A +FR-Designer_Exchange_key=\u70B9\u51FB\u4E92\u6362\u5FEB\u6377\u952E +FR-Designer_System_default=\u7CFB\u7EDF\u5C06\u9ED8\u8BA4 +FR-Designer_Cursor_to_previous_column=\u5149\u6807\u79FB\u5230\u4E0A\u4E00\u5217\u4E3A\uFF1A +FR-Designer_Cursor_to_previous_row=\u5149\u6807\u79FB\u5230\u4E0A\u4E00\u884C\u4E3A\uFF1A +FR-Designer_Are_You_Sure_To_Delete_The_Data=\u786E\u5B9A\u5220\u9664\u9009\u4E2D\u6570\u636E\u5417 +FR-Designer_Show_Icon=\u663E\u793A\u6309\u94AE\u56FE\u6807 +FR-Designer_Show_Text=\u663E\u793A\u6309\u94AE\u540D\u5B57 +FR-Designer_User_Defined_Event=\u81EA\u5B9A\u4E49\u4E8B\u4EF6 +FR-Designer_Output_PDF=PDF\u8F93\u51FA +FR-Designer_Output_Word=Word\u8F93\u51FA +FR-Designer_Image=\u56FE\u7247 +FR-Designer_Flash_Print=Flash\u6253\u5370 +FR-Designer_PDF_Print=PDF\u6253\u5370 +FR-Designer_Applet_Print=Applet\u6253\u5370 +FR-Designer_Server_Print=\u670D\u52A1\u5668\u7AEF\u6253\u5370 +FR-Designer_Use_ToolBar=\u4F7F\u7528\u5DE5\u5177\u680F +FR-Designer_Report_Show_Location=\u62A5\u8868\u663E\u793A\u4F4D\u7F6E +FR-Designer_Is_Paint_Page=\u4EE5\u56FE\u7247\u65B9\u5F0F\u663E\u793A +FR-Designer_IS_Auto_Scale=iframe\u5D4C\u5165\u65F6\u81EA\u52A8\u7F29\u653E +FR-Designer_IS_TD_HEAVY_EXPORT=\u91CD\u65B9\u5F0F\u8F93\u51FA\u683C\u5B50 +FR-Designer_Top=\u4E0A +FR-Designer_Bottom=\u4E0B +FR-Designer-Collect_OSXTips=\u5C0F\u63D0\u793A\uFF1A\u8BF7\u6309control+v\u6765\u7C98\u8D34\u6FC0\u6D3B\u7801 +FR-Designer_X_Coordinate=\u6A2A\u5750\u6807 +FR-Designer_Y_Coordinate=\u7EB5\u5750\u6807 +FR-Designer_Widget_Width=\u63A7\u4EF6\u5BBD\u5EA6 +FR-Designer_Widget_Height=\u63A7\u4EF6\u9AD8\u5EA6 +FR-Designer_Min_Height=\u6700\u5C0F\u9AD8\u5EA6 +FR-Designer_LeftParent=\u5DE6\u7236\u683C +FR-Designer-PluginLicense_Check_Failed=\u60A8\u7684\u63D2\u4EF6\u6388\u6743\u6587\u4EF6\u5DF2\u7ECF\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u6FC0\u6D3B +FR-Designer-File_address=\u6587\u4EF6\u5730\u5740 +FR-Designer-Local_file=\u672C\u5730\u6587\u4EF6 +FR-Designer_Selection=\u9009\u62E9 +FR-Designer-Type_Parameter= \u60A8\u53EF\u4EE5\u952E\u5165${abc}\u4F5C\u4E3A\u4E00\u4E2A\u53C2\u6570\uFF0C\u8FD9\u91CCabc\u662F\u53C2\u6570\u7684\u540D\u79F0\u3002\u4F8B\u5982\uFF1A
+FR-Designer_Add_JS_warning=\u8BF7\u8F93\u5165\u5982\u5B9E\u4F8B\u6240\u793A\u7684\u6B63\u786E\u7684url\u5730\u5740\! +FR-Designer-Encoding_Type=\u7F16\u7801\u7C7B\u578B +FR-Designer-FirstRow_IS_ColumnName=\u7B2C\u4E00\u884C\u5305\u542B\u5217\u6807\u9898 +FR-Designer_Dismenber=\u5206\u9694\u7B26 +FR-Designer_TableDismember=\u5236\u8868\u7B26 +FR-Designer_Space=\u7A7A\u683C +FR-Designer_CommaDismenber=\u9017\u53F7 +FR-Designer_Other=\u5176\u4ED6 +FR-Designer-Series_Dismenber_As_Single=\u8FDE\u7EED\u5206\u9694\u7B26\u89C6\u4E3A\u5355\u4E2A\u5904\u7406 +FR-Designer_KeyPoint=\u5173\u952E\u8282\u70B9 +FR-Designer_loadedTreeModel=\u52A0\u8F7D\u5931\u8D25,\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5 +FR-Designer-Failed_to_load_the_plugin=\u65E0\u6CD5\u52A0\u8F7D\u63D2\u4EF6\uFF0C\u8BF7\u66F4\u65B0\u63D2\u4EF6\uFF1A +FR-Designer-Plugin_Please_Update_Jar=\u8BF7\u66F4\u65B0Jar\u5305, \u63D2\u4EF6\u9700\u6C42\u6700\u4F4E\u7248\u672C +FR-Designer-Invalid_Page_Number=\u65E0\u6548\u9875\u7801 +FR-Designer_Get-CubeGetting=\u83B7\u53D6cube +FR-Designer_XMLA_Database=\u6570\u636E\u5E93 +FR-Designer_XMLA_UserName=\u7528\u6237\u540D +FR-Designer_XMLA_Password=\u5BC6\u7801 +FR-Designer_XMLA_Get_Catalog=\u6B63\u5728\u83B7\u53D6catalog +FR-Designer_XMLA_Not_NULL=\u4E0D\u80FD\u4E3A\u7A7A +FR-Designer_Column-Axis=\u5217\u8F74 +FR-Designer_LiteCondition_Common=\u666E\u901A +FR-Designer_LiteCondition_Formula=\u516C\u5F0F +FR-Designer_LiteCondition_ConditionB-AND=\u4E0E(AND) +FR-Designer_LiteCondition_ConditionB-OR=\u6216(OR) +FR-Designer_LiteCondition_Common_Condition=\u666E\u901A\u6761\u4EF6 +FR-Designer_LiteCondition_Formula_Condition=\u516C\u5F0F\u6761\u4EF6 +FR-Designer_LiteCondition_Define=\u5B9A\u4E49 +FR-Designer_Normal=\u6B63\u5E38 +FR-Designer_Alert=\u8B66\u544A +FR-Designer_Select_All=\u5168\u9009 +FR-Designer_Clear_All=\u6E05\u9664\u5168\u90E8 +FR-Designer_Copy=\u590D\u5236 +FR-Designer_Log=\u65E5\u5FD7 +FR-Designer-Plugin_Expire_Dialog_Title=\u63D2\u4EF6\u8FC7\u671F +FR-Designer-Plugin_Expire_Dialog_Text=\u63D2\u4EF6\u8FC7\u671F,\u8BF7\u524D\u5F80\u5E06\u8F6F\u5E94\u7528\u4E2D\u5FC3\u8FDB\u884C\u8D2D\u4E70\u3002 +FR-Designer-Plugin_Finerest_Addon=\u5E06\u8F6F\u5E94\u7528\u4E2D\u5FC3 +FR-Designer_Performance_First=\u6027\u80FD\u4F18\u5148 +FR-Designer_Total_N_Grade=\u603B\u5171\:${N}\u5C42 +FR-Designer-BBSLogin_Login-Title=\u8BBA\u575B\u8D26\u53F7\u767B\u9646 +FR-Designer_time(s)=\u6B21 +FR-Designer_General=\u5E38\u7528 +FR-Designer_Advanced=\u9AD8\u7EA7 +FR-Designer_Validate=\u6821\u9A8C +FR-Designer_Oracle=\u6240\u6709\u8868 +FR-Designer_Product_improve=\u4EA7\u54C1\u6539\u826F +FR-Designer_Join_Product_improve=\u52A0\u5165\u4EA7\u54C1\u6539\u826F\u8BA1\u5212 +FR-Designer_Preference-Function=\u529F\u80FD\u8BBE\u7F6E +FR-Designer_max_undo_limit=\u6700\u5927\u64A4\u9500\u6B21\u6570 +FR-Designer_Surport_String_To_Formula=\u652F\u6301\u5B57\u7B26\u4E32\u7F16\u8F91\u4E3A\u516C\u5F0F +FR-Designer_Always=\u9ED8\u8BA4\u6267\u884C\u8BE5\u64CD\u4F5C +FR-Designer_Export_Setting=\u5BFC\u51FA\u914D\u7F6E +FR-Designer_Select_Export_Log_Directory=\u9009\u62E9\u5BFC\u51FA\u76EE\u5F55 +FR-Designer_Level_Setting=\u7EA7\u522B\u8BBE\u7F6E +FR-Designer_Choose_Language=\u8BED\u8A00\u9009\u62E9 +FR-Designer_Work_After_Restart_Designer=\u91CD\u542F\u8BBE\u8BA1\u5668\u540E\u751F\u6548 +FR-Designer_Setting-Ruler-Units=\u6807\u5C3A\u5355\u4F4D\u8BBE\u7F6E +FR-Designer_PageSetup-mm=\u6BEB\u7C73 +FR-Designer_Unit_CM=\u5398\u7C73 +FR-Designer_Page-Setup-Scale-Units=\u9875\u9762\u8BBE\u7F6E\u6807\u5C3A\u5355\u4F4D +FR-Designer_Report-Design-Ruler-Units=\u62A5\u8868\u8BBE\u8BA1\u6807\u5C3A\u5355\u4F4D +FR-Designer_Web_Preview_Port_Setting=\u7AEF\u53E3\u8BBE\u7F6E +FR-Designer_Designer_Language=\u8BBE\u8BA1\u5668\u8BED\u8A00 +FR-Designer_Unit_INCH=\u82F1\u5BF8 +FR-Designer_Web_Preview_Port=\u7AEF\u53E3\u53F7 +FR-Designer_Oracle_All_Tables=\u6240\u6709\u8868 +FR-Designer_Unit_PT=\u78C5 +FR-Designer-Write_Auto_Stash=\u81EA\u52A8\u6682\u5B58 +FR-Designer_Printer_Native_Button=\u672C\u5730\u6253\u5370 +FR-Designer_Event_ShowWidgets=\u76F4\u63A5\u663E\u793A\u63A7\u4EF6 +FR-Designer_Current_Preview_Rows=\u5F53\u524D\u9884\u89C8\u884C\u6570 +FR-Designer_Data=\u6570\u636E +FR-Designer_Error=\u9519\u8BEF +FR-Designer_formDesignerModule=\u8868\u5355\u8BBE\u8BA1\u5668\u6A21\u5757 +FR-Designer-Website_Url=http\://www.finereport.com/ +FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u5F55\u540E\u624D\u80FD\u4E0B\u8F7D +FR-Designer-App_ReLayout=\u624B\u673A\u91CD\u5E03\u5C40 +FR-Designer_Mobile-Attr=\u79FB\u52A8\u7AEF\u5C5E\u6027 +FR-Designer_Mobile-Vertical=\u7AD6\u5C4F +FR-Designer_Mobile-Horizontal=\u6A2A\u5C4F +FR-Designer_COMMUNITY=\u793E\u533A +FR-Designer_COMMUNITY_BBS=\u5E06\u8F6F\u8BBA\u575B +FR-Designer_COMMUNITY_VIDEO=\u5165\u95E8\u89C6\u9891 +FR-Designer_COMMUNITY_HELP=\u5E2E\u52A9\u6587\u6863 +FR-Designer_COMMUNITY_UPDATE=\u4EA7\u54C1\u66F4\u65B0 +FR-Designer_COMMUNITY_NEED=\u9700\u6C42\u63D0\u4EA4 +FR-Designer_COMMUNITY_BUG=BUG\u53CD\u9988 +FR-Designer_COMMUNITY_SIGN=\u5E06\u8F6F\u8BA4\u8BC1 +FR-Designer_COMMUNITY_QUESTIONS=\u95EE\u9898\u6C42\u52A9 +FR-Designer_Mobile-Zoom=\u62A5\u8868\u7F29\u653E +FR-Designer_Mobile-Open=\u5F00\u542F +FR-Designer_Mobile-Warning=\u6700\u5927\u9AD8\u5EA6\u4E0D\u53EF\u8D85\u8FC7\u663E\u793A\u533A\u57DF\u768480% +FR-Designer_Button-OK=\u77E5\u9053\u4E86 +FR-Designer_Button-Cancel=\u53D6\u6D88 +FR-Designer_Write-Save-Formula=\u586B\u62A5/\u5206\u6790\u65F6\uFF0C\u4FDD\u7559\u516C\u5F0F\u7528\u4E8E\u8BA1\u7B97 +FR-Designer_Export-Save-Formula=\u5BFC\u51FA/\u7F16\u8F91\u7ED3\u679C\u65F6,\u4FDD\u7559\u516C\u5F0F +FR-Designer_Form-Fit-Tip=\u81EA\u9002\u5E94\u63D2\u4EF6 +FR-Designer_Form-Frozen-Tip=\u4F7F\u7528\u51BB\u7ED3\u65F6, \u5EFA\u8BAE\u5B89\u88C5 +FR-Designer_Form-Forzen-Speed=, \u5E76\u4F7F\u7528\u6A2A\u5411\u6216\u53CC\u5411\u81EA\u9002\u5E94\u6765\u63D0\u5347\u5C55\u73B0\u901F\u5EA6. +FR-Designer_Attention=\u6CE8\u610F +FR-Designer_Forbid_Widgets_Intersects=\u7981\u6B62\u7EC4\u4EF6\u76F8\u4E92\u91CD\u53E0 +FR-Designer_Widget_Scaling_Mode_Fit=\u9002\u5E94\u533A\u57DF +FR-Designer_Widget_Scaling_Mode_Fixed=\u56FA\u5B9A\u5927\u5C0F +FR-Designer-Widget_Area_Scaling=\u7EC4\u4EF6\u533A\u57DF\u7F29\u653E +FR-Designer-Widget_Scaling_Mode=\u7F29\u653E\u903B\u8F91 +FR-Designer-QQLogin-Determine=\u786E\u5B9A +FR-Designer-QQLogin-Cancel=\u53D6\u6D88 +FR-Designer-Reuse_Manager=\u7EC4\u4EF6\u7BA1\u7406 +FR-Designer_TableData-Default-Para=\u6570\u636E\u96C6\u9ED8\u8BA4\u53C2\u6570 +FR-Designer_Layout_Block_Absolute=\u7EDD\u5BF9\u753B\u5E03\u5757 +FR-Designer_Layout_Block_Tab=Tab\u5757 +FR-Designer_Layout_Block_Blank=\u7A7A\u767D\u5757 +FR-Designer_Attr_Layout=\u5E03\u5C40 +FR-Designer_Attr_Layout_Type=\u5E03\u5C40\u65B9\u5F0F +FR-Designer_Attr_Bidirectional_Adaptive=\u53CC\u5411\u81EA\u9002\u5E94 +FR-Designer-Selected_Widget=\u5F53\u524D\u63A7\u4EF6 +FR-Designer_LocalWidget=\u672C\u5730\u7EC4\u4EF6\u5E93 +FR-Designer_AllCategories=\u6240\u6709\u5206\u7C7B +FR-Designer_SimpleDetail_Report=\u7B80\u5355\u660E\u7EC6\u8868 +FR-Designer_SimpleCross_Report=\u7B80\u5355\u4EA4\u53C9\u8868 +FR-Designer_DoubleLayer_Report=\u53CC\u5C42\u8868\u5934 +FR-Designer_Download_Template=\u4E0B\u8F7D\u7EC4\u4EF6 +FR-Designer_Install_Template=\u5B89\u88C5\u7EC4\u4EF6 +FR-Designer_Delete_Template=\u5220\u9664\u7EC4\u4EF6 +FR-Designer_Mobile-ToolBar=\u5DE5\u5177\u680F +FR-Designer_Mobile-Refresh=\u5237\u65B0 +FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5185\u4EFB\u610F\u4F4D\u7F6E\u6DFB\u52A0\u63A7\u4EF6 +FR-Designer_Reset=\u53D6\u6D88\u5220\u9664 +FR-Designer_Add_all=\u5168\u90E8\u6DFB\u52A0 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties new file mode 100644 index 0000000000..6bf0d2df3b --- /dev/null +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -0,0 +1,439 @@ +# generated time: 星期四 十一月 24 11:56:39 CST 2016 +FR-Designer-BBSLogin_Account=\u767B\u5165\u5E33\u865F +FR-Designer-BBSLogin_Connection-Failure=\u767B\u5165\u9023\u63A5\u5931\u6557\uFF0C\u8ACB\u6AA2\u67E5\u7576\u524D\u7DB2\u8DEF\u72C0\u614B +FR-Designer-BBSLogin_Connection-Failure-Tip=\u9023\u7DDA\u5931\u6557\u63D0\u793A +FR-Designer-BBSLogin_Forgot-Password=\u5FD8\u8A18\u5BC6\u78BC +FR-Designer-BBSLogin_Login=\u767B\u9304 +FR-Designer-BBSLogin_Login-Failure-Tip=\u5E33\u865F\u6216\u5BC6\u78BC\u932F\u8AA4\uFF0C\u8ACB\u91CD\u65B0\u767B\u9304 +FR-Designer-BBSLogin_Password=\u5BC6 \u78BC +FR-Designer-BBSLogin_Password-Empty-Tip=\u5BC6\u78BC\u4E0D\u80FD\u70BA\u7A7A +FR-Designer-BBSLogin_Register-Account=\u8A3B\u518A\u5E33\u865F +FR-Designer-BBSLogin_Switch-Account=\u5207\u63DB\u5E33\u865F +FR-Designer-BBSLogin_Privite-Message=\u79C1\u4EBA\u6D88\u606F +FR-Designer-BBSLogin_Times=\u6B21 +FR-Designer-BBSLogin_Username-Empty-Tip=\u4F7F\u7528\u8005\u70BA\u7A7A\u63D0\u793A +FR-Designer-Basic_More_Color=\u66F4\u591A\u984F\u8272... +FR-Designer-Estate_Any=\u4E0D\u9650 +FR-Designer-Estate_Default_Font=\u9810\u8A2D\u5B57\u9AD4 +FR-Designer-Estate_Default_Null=\u9810\u8A2D\u70BA\u7A7A +FR-Designer-Estate_Default_Text=\u9810\u8A2D\u70BA\u6587\u5B57 +FR-Designer-Estate_Parameter_Null_Text=\u53C3\u6578\u70BA\u7A7A\u986F\u793A\u70BA +FR-Designer-Estate_Radio-Group=\u901A\u7528\u6309\u9215\u7D44\u63A7\u5236\u9805 +FR-Designer-Estate_Selected_Font=\u9078\u4E2D\u5B57\u9AD4 +FR-Designer-Estate_Widget_Value=\u5C0F\u5DE5\u5177\u503C +FR-Designer-Layout_Adaptive_Layout=\u81EA\u9069\u61C9\u4F48\u5C40 +FR-Designer-Output_Background_Set=\u80CC\u666F\u8A2D\u5B9A +FR-Designer-Output_Default_Background=\u9810\u8A2D\u80CC\u666F +FR-Designer-Output_Excel_Page=Excel(\u5206\u9801\u532F\u51FA) +FR-Designer-Output_Excel_Sheet=Excel\u8F38\u51FA(\u5206\u9801\u5206Sheet\u532F\u51FA) +FR-Designer-Output_Excel_Simple=Excel\u8F38\u51FA(\u539F\u6A23\u532F\u51FA) +FR-Designer-Plugin_PluginMarket_Coding=\u63D2\u4EF6\u5546\u5E97\u6B63\u5728\u958B\u767C\u4E2D\uFF0C\u656C\u8ACB\u671F\u5F85 +FR-Designer-Submit_Condition=\u63D0\u4EA4\u689D\u4EF6 +FR-Designer-Widget-Title_border=\u6A19\u984C\u6846\u7DDA +FR-Designer-Widget-Title_border_color=\u6A19\u984C\u6846\u7DDA\u984F\u8272 +FR-Designer_AbsoluteLayout=\u7D55\u5C0D\u4F48\u5C40 +FR-Designer_Allow_Decimals=\u5141\u8A31\u5C0F\u6578 +FR-Designer_Allow_Negative=\u5141\u8A31\u8CA0\u503C +FR-Designer_Background-Click=\u6ED1\u9F20\u9EDE\u64CA\u80CC\u666F +FR-Designer_Background-Initial=\u521D\u59CB\u80CC\u666F +FR-Designer_Background-Over=\u6ED1\u9F20\u61F8\u6D6E\u80CC\u666F +FR-Designer_Bar-Code-Exception-Tip=\u689D\u78BC\u4F8B\u5916\u63D0\u793A +FR-Designer_Block-intersect=\u5340\u584A\u91CD\u758A +FR-Designer_BorderLayout=\u908A\u754C\u5E03\u5C40 +FR-Designer_Button-Hotkeys=\u5FEB\u6377\u9375 +FR-Designer_Button-Icon=\u6309\u9215\u5716\u793A +FR-Designer_Button-Name=\u6309\u9215\u540D\u7A31 +FR-Designer_Button-Type=\u6309\u9215\u985E\u578B +FR-Designer_CardLayout=\u5361\u7247\u8A2D\u8A08 +FR-Designer_Cell=\u5132\u5B58\u683C +FR-Designer_Chart_Cell=\u5716\u8868\u5132\u5B58\u683C +FR-Designer_Chart_Float=\u5716\u8868\u8D85\u93C8-\u806F\u52D5\u61F8\u6D6E\u5143\u7D20 +FR-Designer_Chart_Float_chart=\u5716\u8868\u8D85\u93C8-\u61F8\u6D6E\u7A97\u5716\u8868 +FR-Designer_Check-for-Updates=\u6AA2\u67E5\u66F4\u65B0 +FR-Designer_Choose-Data-Confusion-Tip=\u8ACB\u9078\u64C7\u9700\u8981\u6DF7\u6DC6\u7684\u6B04\u4F4D\u5F8C\u9810\u89BD +FR-Designer_Close=\u95DC\u9589 +FR-Designer_Column=\u6B04 +FR-Designer_Column_Measure=\u6B04\u4F4D\u6E2C\u91CF +FR-Designer_Condition_Attributes=\u689D\u4EF6\u5C6C\u6027 +FR-Designer_Confusion-Col-Name=\u6B04\u4F4D\u540D\u7A31 +FR-Designer_Confusion-key=\u6DF7\u6DC6\u95DC\u9375\u5B57 +FR-Designer_Currency_Line=\u9322\u5E63\u7DDA +FR-Designer_Current_tab=\u7576\u524D\u7DE8\u8F2FTab +FR-Designer_Custom=\u81EA\u5B9A\u7FA9 +FR-Designer_Custom-Angle=\u81EA\u5B9A\u7FA9\u89D2\u5EA6 +FR-Designer_DS-Dictionary=\u8CC7\u6599\u5B57\u5178 +FR-Designer_Data-confusion=\u8CC7\u6599\u6DF7\u6DC6 +FR-Designer_Data_Type=\u8CC7\u6599\u985E\u578B +FR-Designer_Double_Click_Edit_OR_Clear=\u96D9\u64CA\u9032\u884C\u7DE8\u8F2F\u6216\u6E05\u9664 +FR-Designer_Email=\u90F5\u4EF6 +FR-Designer_Enabled=\u53EF\u7528 +FR-Designer_End-Date=\u7D50\u675F\u65E5\u671F +FR-Designer_ExportAndOutput=\u532F\u51FA +FR-Designer_FRFont=\u5B57\u9AD4 +FR-Designer_FS_Close_Other_Templates=\u95DC\u9589\u5176\u4ED6\u7BC4\u672C +FR-Designer_File=\u6A94\u6848 +FR-Designer_Filter_Conditions=\u904E\u6FFE\u689D\u4EF6 +FR-Designer_Finish-Modify-Share=\u5B8C\u6210\u4FEE\u6539\u4E26\u5206\u4EAB +FR-Designer_Fit-App=App\u81EA\u9069\u61C9 +FR-Designer_Font-Family=\u5B57\u9AD4\u540D\u7A31 +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=\u984F\u8272 +FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=\u66AB\u4E0D\u652F\u6301\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 +FR-Designer_Format_explan=\u683C\u5F0F\u8AAA\u660E +FR-Designer_Formula=\u516C\u5F0F +FR-Designer_Forum=\u8AD6\u58C7 +FR-Designer_Get-Cube=\u6B63\u5728\u7372\u53D6cube +FR-Designer_Help=\u8AAA\u660E +FR-Designer_Hide=\u96B1\u85CF +FR-Designer_Hyperlink=\u8D85\u7D1A\u93C8\u63A5 +FR-Designer_Hyperlink-Form_link=\u7576\u524D\u8868\u55AE\u5C0D\u8C61 +FR-Designer_IDCard=\u8EAB\u4EFD\u8B49 +FR-Designer_Icon=\u5716\u793A +FR-Designer_Index=\u7D22\u5F15 +FR-Designer_Input_Rule=\u8F38\u5165\u898F\u5247 +FR-Designer_Language_Default=\u9810\u8A2D\u8A9E\u8A00 +FR-Designer_Layout=\u5E03\u5C40\u3001\u898F\u5283 +FR-Designer_Layout-HBox=\u6C34\u5E73\u76D2\u5B50\u5E03\u5C40 +FR-Designer_Layout-Index=\u7D22\u5F15\u898F\u5283 +FR-Designer_Layout_Constraints=\u898F\u5283\u7D04\u675F +FR-Designer_Length=\u9577\u5EA6 +FR-Designer_Loading_Data=\u6B63\u5728\u8F09\u5165\u8CC7\u6599 +FR-Designer_M-Exit=\u9000\u51FA +FR-Designer_M-Help=\u8AAA\u660E +FR-Designer_M-Insert=\u63D2\u5165 +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_M_Help-About_Software=\u95DC\u65BC\u8EDF\u9AD4 +FR-Designer_M_Help-Tutorial=\u64CD\u4F5C\u8AAA\u660E +FR-Designer_Max_Value=\u6700\u5927\u503C +FR-Designer_Min_Value=\u6700\u5C0F\u503C +FR-Designer_MobilePhone=\u624B\u6A5F +FR-Designer_New_Value=\u65B0\u503C +FR-Designer_None=\u7121 +FR-Designer_PaperSize-Mobile=\u624B\u6A5F +FR-Designer_PaperSize-Mobile-Large=\u624B\u6A5F\u5927\u87A2\u5E55 +FR-Designer_PaperSize-Mobile-Small=\u624B\u6A5F\u5C0F\u87A2\u5E55 +FR-Designer_Para-Body=\u53C3\u6578\u672C\u6587 +FR-Designer_Parameters=\u53C3\u6578 +FR-Designer_Phone=\u96FB\u8A71 +FR-Designer_PostCode=\u90F5\u905E\u5340\u865F +FR-Designer_Present=\u7576\u4E0B +FR-Designer_Preview=\u9810\u89BD +FR-Designer_Preview-Data-Confusion=\u6DF7\u6DC6\u8CC7\u6599\u9810\u89BD +FR-Designer_Product_Demo=\u7522\u54C1\u5C55\u793A +FR-Designer_Query_Type=\u67E5\u8A62\u985E\u578B +FR-Designer_Refresh=\u91CD\u65B0\u6574\u7406 +FR-Designer_Refresh_Parameter_In_SQL=\u5728SQL\u4E2D\u91CD\u65B0\u6574\u7406\u7684\u53C3\u6578 +FR-Designer_Reg_Expressions=\u6B63\u5247\u8868\u9054\u5F0F +FR-Designer_Reg_Max_Length=\u6700\u5927\u9577\u5EA6 +FR-Designer_Reg_Min_Length=\u6700\u5C0F\u9577\u5EA6 +FR-Designer_ReportColumns-Columns=\u5831\u8868\u6B04\u4F4D +FR-Designer_Return-Date=\u8FD4\u56DE\u65E5\u671F +FR-Designer_RichText= RTF +FR-Designer_RichTextEditor=RTF\u7DE8\u8F2F\u5668 +FR-Designer_Row=\u5217 +FR-Designer_Row_Dimension=\u5217\u7DAD\u5EA6 +FR-Designer_Save=\u5132\u5B58 +FR-Designer_Search=\u641C\u5C0B +FR-Designer_Set=\u8A2D\u5B9A +FR-Designer_Share-Template=\u5206\u4EAB\u7BC4\u672C +FR-Designer_Simple_general=\u7C21\u55AE\u901A\u7528 +FR-Designer_Song_TypeFace=\u5B8B\u9AD4 +FR-Designer_Start-Date=\u958B\u59CB\u65E5\u671F +FR-Designer_Subscript=\u4E0B\u6A19 +FR-Designer_Superscript=\u4E0A\u6A19 +FR-Designer_Support_QQ=\u652F\u63F4QQ +FR-Designer_Swatch=\u6A23\u54C1 +FR-Designer_Tab_title=tab\u6A19\u984C +FR-Designer_TableData=\u8CC7\u6599\u96C6 +FR-Designer_Thank_guest=\u611F\u8B1D\u5BA2\u6236 +FR-Designer_Thanks-To=\u9CF4\u8B1D +FR-Designer_Title=\u6A19\u984C +FR-Designer_Total=\u7E3D\u5171 +FR-Designer_UnSignIn=\u672A\u767B\u9304 +FR-Designer_Underline=\u5E95\u7DDA +FR-Designer_Used=\u6700\u8FD1\u4F7F\u7528 +FR-Designer_User-defined-MDX=\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62 +FR-Designer_Vertical-LeftToRight=\u6587\u5B57\u8C4E\u6392(\u5F9E\u5DE6\u5411\u53F3) +FR-Designer_Vertical-RightToLeft=\u6587\u5B57\u8C4E\u6392(\u5F9E\u53F3\u5411\u5DE6) +FR-Designer_VerticalBoxLayout=\u6A6B\u5411\u4F48\u5C40 +FR-Designer_Visible=\u53EF\u898B +FR-Designer_WLayout-Border-ToolTips=\u908A\u754C\u4F48\u5C40 +FR-Designer_WaterMark=\u6C34\u5370 +FR-Designer_Widget=\u5C0F\u5DE5\u5177 +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_bold=\u7C97\u9AD4 +FR-Designer_font=\u5B57\u9AD4 +FR-Designer_italic=\u659C\u9AD4 +FR-Designer_product_feedback=\u554F\u984C\u53CD\u994B +FR-Designer_SampleText=\u793A\u4F8B\u6587\u672C \u793A\u4F8B\u6587\u672C +FR-Designer_XMLA=\u591A\u7DAD\u8CC7\u6599\u5EAB +FR-Designer-StyleAlignment_Layout_Default=\u9810\u8A2D +FR-Designer-StyleAlignment_Layout_Image_Titled=\u5E73\u92EA +FR-Designer-StyleAlignment_Layout_Image_Extend=\u62C9\u4F38 +FR-Designer-StyleAlignment_Layout_Image_Adjust=\u9069\u61C9 +FR-Designer-StyleAlignment_Tooltips_Left=\u9760\u5DE6 +FR-Designer-StyleAlignment_Tooltips_Center=\u5C45\u4E2D +FR-Designer-StyleAlignment_Tooltips_Right=\u9760\u53F3 +FR-Designer-StyleAlignment_Tooltips_Distributed=\u5206\u6563\u5C0D\u9F4A +FR-Designer-StyleAlignment_Tooltips_DEFAULT=\u9810\u8A2D +FR-Designer-StyleAlignment_Tooltips_Top=\u9760\u4E0A +FR-Designer-StyleAlignment_Tooltips_Bottom=\u9760\u4E0B +FR-Designer-StyleAlignment_Pane_Horizontal=\u6C34\u5E73\u5C0D\u9F4A +FR-Designer-StyleAlignment_Pane_Vertical=\u5782\u76F4\u5C0D\u9F4A +FR-Designer-StyleAlignment_Pane_Style=\u5C0D\u9F4A\u65B9\u5F0F +FR-Designer-StyleAlignment_Style_Indentation=\u7E2E\u9032 +FR-Designer-StyleAlignment_Style_Spacing=\u9593\u8DDD +FR-Designer-StyleAlignment_Style_Alignment=\u5C0D\u9F4A +FR-Designer-CommitTab_Submit=\u63D0\u4EA4 +FR-Designer-CommitTab_SureToDelete=\u78BA\u8A8D\u522A\u9664 +FR-Designer-CommitTab_Remove=\u522A\u9664 +FR-Designer-Collect_Information_free=\u514D\u8CBB +FR-Designer-Collect_Information_Description=\u63CF\u8FF0 +FR-Designer-Collect_Information_Successfully=\u6536\u96C6\u6210\u529F +FR-Designer_Event_Set=\u4E8B\u4EF6\u8A2D\u5B9A +FR-Designer_Blow_set=\u4EE5\u4E0B\u8A2D\u5B9A +FR-Designer_I_Want_To_Set_Single=\u70BA\u8A72\u6A21\u677F\u55AE\u7368\u8A2D\u5B9A +FR-Designer_Using_Server_Report_View_Settings=\u63A1\u7528\u4F3A\u670D\u5668\u8A2D\u5B9A +FR-Designer_ErrorHandlerTemplate=\u51FA\u932F\u6A21\u677F\u5B9A\u7FA9 +FR-Designer_Save_Path=\u5B58\u5132\u8DEF\u5F91 +FR-Designer_Chart_Acc_Set=\u7CBE\u78BA\u8A2D\u5B9A +FR-Designer_Gradient-Color=\u6F38\u8B8A\u8272 +FR-Designer_DEFAULT=\u9810\u8A2D +FR-Designer_chart-PreStyle=\u5716\u8868\u9810\u5B9A\u7FA9\u914D\u8272 +FR-Designer_Chart-PreStyle=\u5716\u8868\u9810\u5B9A\u7FA9\u914D\u8272 +FR-Designer_Already_exist=\u7576\u524D\u74B0\u5883\u5DF2\u5B58\u5728 +FR-Designer_Database=\u8CC7\u6599\u5EAB +FR-Designer_Model=\u6A21\u5F0F +FR-Designer_Refresh_Successfully=\u91CD\u65B0\u6574\u7406\u6210\u529F +FR-Designer_SQL-Table=\u8868 +FR-Designer_SQL-View=\u6AA2\u8996\u8868 +FR-Designer_Failed=\u5931\u6557 +FR-Designer_Chart_Field_Name=\u6B04\u4F4D\u540D +FR-Designer_FormulaD-Text=\u6587\u672C\u51FD\u6578 +FR-Designer_FormulaD-Logical=\u908F\u8F2F\u51FD\u6578 +FR-Designer_FormulaD-Array=\u6578\u7D44\u51FD\u6578 +FR-Designer_FormulaD-Report=\u5831\u8868\u51FD\u6578 +FR-Designer_FormulaD-Other=\u5176\u5B83\u51FD\u6578 +FR-Designer_FormulaD-All=\u5168\u90E8\u51FD\u6578 +FR-Designer_Function=\u51FD\u6578 +FR-Designer_Select=\u9078\u64C7 +FR-Designer_Edit=\u7DE8\u8F2F +FR-Designer_Description=\u63CF\u8FF0 +FR-Designer_Role_changed_isRefresh=\u89D2\u8272\u5DF2\u8B8A\u52D5\uFF0C\u662F\u5426\u91CD\u65B0\u6574\u7406 +FR-Designer_FS_Name=\u8CC7\u6599\u6C7A\u7B56\u7CFB\u7D71 +FR-Designer_Datasource-Parameter=\u8CC7\u6599\u6E90\u53C3\u6578 +FR-Designer_Tree-ComboBox=\u4E0B\u62C9\u6A39 +FR-Designer_Form-Iframe=\u7DB2\u9801\u6846 +FR-Designer_Type=\u985E\u578B +FR-Designer_User-defined=\u81EA\u5B9A\u7FA9 +FR-Designer_Simple_general_forV6=\u901A\u7528\u67E5\u8A62(\u9069\u7528\u65BCECC 6\u4EE5\u4E0A\u7248\u672C) +FR-Designer_Import=\u8F38\u5165 +FR-Designer_Export=\u8F38\u51FA +FR-Designer_Delete=\u522A\u9664 +FR-Designer_Sequenced_number=\u5E8F\u865F +FR-Designer_Parameters_name=\u53C3\u6578\u540D\u7A31 +FR-Designer_SAP_datatype=SAP\u8CC7\u6599\u985E\u578B +FR-Designer_Return_set_name=\u8FD4\u56DE\u96C6 +FR-Designer_Datatype=\u8CC7\u6599\u985E\u578B +FR-Designer_Corre_parameter=\u5C0D\u61C9\u53C3\u6578 +FR-Designer_Default_value=\u53C3\u6578\u9ED8\u8A8D\u503C +FR-Designer_SAP_column_name=SAP\u5217\u540D +FR-Designer_Table_name=\u8868\u7684\u540D\u7A31 +FR-Designer_Columns_choosed=\u9078\u64C7\u7684\u5217 +FR-Designer_Where_claus=\u904E\u6FFE\u689D\u4EF6 +FR-Designer_PreStyle=\u9810\u5B9A\u7FA9\u6A23\u5F0F +FR-Designer_Table=\u8868 +FR-Designer_Loading=\u6B63\u5728\u52A0\u8F09 +FR-Designer_Name=\u540D\u5B57 +FR-Designer_EmailPane-tips=\u60A8\u53EF\u4EE5\u9375\u5165${abc}\u4F5C\u70BA\u4E00\u500B\u53C3\u6578\uFF0Cabc\u70BA\u53C3\u6578\u540D\u7A31\uFF1B${today()}\u4F5C\u70BA\u516C\u5F0F\uFF0C\u4F8B\u5982\uFF1A\u6A19\u984C\u6B63\u6587\u70BA"${today()}\u7D71\u8A08\u60C5\u6CC1"\uFF0C\u6536\u4EF6\u4EBA\u70BA"${ p},123@gmail.com,mike"\uFF0C\u9019\u88E1mike\u5FC5\u9808\u662F\u5DF2\u5132\u5B58\u5728\u5E73\u53F0\u7528\u6236\u7BA1\u7406\u88E1\u7684\u5E33\u865F +FR-Designer_EmailPane-mailContent=\u90F5\u4EF6\u6B63\u6587 +FR-Designer_EmailPane-BCC=\u5BC6\u9001 +FR-Designer_EmailPane-mailSubject=\u90F5\u4EF6\u6A19\u984C +FR-Designer_EmailPane-warnings=\u60A8\u5C1A\u672A\u914D\u7F6E\u767C\u4EF6\u90F5\u7BB1\uFF0C\u8ACB\u767B\u9304\u5E73\u53F0\u9032\u884C\u914D\u7F6E\u6216\u8005\u806F\u7E6B\u7BA1\u7406\u54E1 +FR-Designer_Email_sentEmail=\u767C\u9001\u90F5\u4EF6 +FR-Designer_file-is-locked=\u60A8\u6240\u8981\u6253\u958B\u7684\u5831\u8868\u6B63\u5728\u88AB\u5176\u4ED6\u4EBA\u7DE8\u8F2F\uFF0C\u8ACB\u7A0D\u5019\u6253\u958B\u60A8\u6240\u8981\u6253\u958B\u7684\u5831\u8868\u6B63\u5728\u88AB\u5176\u4ED6\u4EBA\u7DE8\u8F2F\uFF0C\u8ACB\u7A0D\u5019\u6253\u958B +FR-Designer_Custom_Icon_Message1=\u5EFA\u8B70\u4F7F\u752816 ?? 16\u898F\u683C\u7684PNG\u5716\u7247 +FR-Designer_Add=\u589E\u52A0 +FR-Designer_Custom_Icon_Message2=\u5716\u6A19\u540D\u7A31\u5DF2\u7D93\u5B58\u5728\uFF0C\u6216\u8005\u60A8\u7684\u64CD\u4F5C\u5B58\u5728\u4E0D\u5408\u7406\u4E4B\u8655\u3002 +FR-Designer_Tooltips=\u63D0\u793A +FR-Designer_Remove=\u522A\u9664 +FR-Designer_Custom_Icon_SelectIcon=\u9078\u64C7\u5716\u6A19 +FR-Designer_Click_this_button=\u9EDE\u64CA\u6B64\u6309\u9215\u9032\u884C\u8DEF\u5F91\u9078\u64C7 +FR-Designer_Custom_Icon_Message3=\u5716\u6A19\u540D\u7A31\u5DF2\u7D93\u5B58\u5728\u3002 +FR-Designer_Set_default_browser=\u6C92\u6709\u627E\u5230\u9810\u8A2D\u700F\u89BD\u5668\uFF0C\u8ACB\u5728Intenet\u9078\u9805\u4E2D\u8A2D\u5B9A\u7CFB\u7D71\u9810\u8A2D\u700F\u89BD\u5668\u3002 +FR-Designer_Open=\u6253\u958B +FR-Designer_Utils-OpenDemoEnv=\u529F\u80FD\u5C55\u793A\uFF0C\u9700\u8981\u81EA\u52D5\u5207\u63DB\u81F3\u5DE5\u4F5C\u76EE\u9304\uFF1A +FR-Designer_Utils-switch=\n\u60A8\u7576\u524D\u672A\u88AB\u5132\u5B58\u7684\u6A94\u6848\u5C07\u88AB\u5132\u5B58\u5728\u7576\u524D\u76EE\u9304\u4E0B\uFF0C\n\u662F\u5426\u7E7C\u7E8C\uFF1F +FR-Designer_Utils-NewDemoEnv=\u529F\u80FD\u5C55\u793A\uFF0C\u5C07\u70BA\u60A8\u81EA\u52D5\u5275\u5EFA\u5DE5\u4F5C\u76EE\u9304\uFF1A +FR-Designer_Save_As_Global_Style=\u5132\u5B58\u70BA\u5168\u5C40\u683C\u5F0F +FR-Designer_Input_The_Name_Of_Gloabel_Style=\u8F38\u5165\u6240\u5132\u5B58\u7684\u5168\u5C40\u683C\u5F0F\u540D\u7A31 +FR-Designer_This_Name_Has_Exsit=\u9019\u500B\u540D\u5B57\u5DF2\u7D93\u5B58\u5728 +FR-Designer_Shortcut_Set=\u5FEB\u6377\u9375\u8A2D\u5B9A +FR-Designer_Feature_Name=\u529F\u80FD\u540D\u7A31\uFF1A +FR-Designer_Cursor_to_next_column=\u5149\u6A19\u79FB\u5230\u4E0B\u4E00\u6B04 +FR-Designer_Cursor_to_next_row=\u5149\u6A19\u79FB\u5230\u4E0B\u4E00\u5217 +FR-Designer_Current_keys=\u7576\u524D\u5FEB\u6377\u9375\uFF1A +FR-Designer_Exchange_key=\u9EDE\u64CA\u4E92\u63DB\u5FEB\u6377\u9375 +FR-Designer_System_default=\u7CFB\u7D71\u5C07\u9810\u8A2D +FR-Designer_Cursor_to_previous_column=\u5149\u6A19\u79FB\u5230\u4E0A\u4E00\u6B04\u70BA\uFF1A +FR-Designer_Cursor_to_previous_row=\u5149\u6A19\u79FB\u5230\u4E0A\u4E00\u5217\u70BA\uFF1A +FR-Designer_Are_You_Sure_To_Delete_The_Data=\u78BA\u5B9A\u4E0A\u9664\u9078\u4E2D\u8CC7\u6599\u55CE +FR-Designer_Show_Icon=\u986F\u793A\u6309\u9215\u5716\u793A +FR-Designer_Show_Text=\u986F\u793A\u6309\u9215\u540D\u5B57 +FR-Designer_User_Defined_Event=\u81EA\u5B9A\u7FA9\u4E8B\u4EF6 +FR-Designer_Output_PDF=PDF\u8F38\u51FA +FR-Designer_Output_Word=Word\u8F38\u51FA +FR-Designer_Image=\u5716\u7247 +FR-Designer_Flash_Print=Flash\u5217\u5370 +FR-Designer_PDF_Print=PDF\u5217\u5370 +FR-Designer_Applet_Print=Applet\u5217\u5370 +FR-Designer_Server_Print=\u4F3A\u670D\u5668\u7AEF\u5217\u5370 +FR-Designer_Use_ToolBar=\u4F7F\u7528\u5DE5\u5177\u6B04 +FR-Designer_Report_Show_Location=\u5831\u8868\u986F\u793A\u4F4D\u7F6E +FR-Designer_Is_Paint_Page=\u4EE5\u5716\u7247\u65B9\u5F0F\u986F\u793A +FR-Designer_IS_Auto_Scale=iframe\u5D4C\u5165\u6642\u81EA\u52D5\u7E2E\u653E +FR-Designer_IS_TD_HEAVY_EXPORT=\u91CD\u65B9\u5F0F\u8F38\u51FA\u683C\u5B50 +FR-Designer_Top=\u4E0A +FR-Designer_Bottom=\u4E0B +FR-Designer-Collect_OSXTips=\u5C0F\u63D0\u793A\uFF1A\u8ACB\u6309control+v\u4F86\u7C98\u8CBC\u6FC0\u6D3B\u78BC +FR-Designer_X_Coordinate=\u6A6B\u5EA7\u6A19 +FR-Designer_Y_Coordinate=\u7E31\u5EA7\u6A19 +FR-Designer_Widget_Width=\u63A7\u5236\u9805\u5BEC\u5EA6 +FR-Designer_Widget_Height=\u63A7\u5236\u9805\u9AD8\u5EA6 +FR-Designer_Min_Height=\u6700\u5C0F\u9AD8\u5EA6 +FR-Designer_LeftParent=\u5DE6\u7236\u683C +FR-Designer-PluginLicense_Check_Failed=\u60A8\u7684\u63D2\u4EF6\u6388\u6B0A\u6587\u4EF6\u5DF2\u7D93\u904E\u671F\uFF0C\u8ACB\u91CD\u65B0\u6FC0\u6D3B +FR-Designer-File_address=\u6A94\u6848\u5730\u5740 +FR-Designer-Local_file=\u672C\u6A5F\u6A94\u6848 +FR-Designer_Selection=\u9078\u64C7 +FR-Designer-Type_Parameter= \u60A8\u53EF\u4EE5\u9375\u5165${abc}\u4F5C\u70BA\u4E00\u500B\u53C3\u6578\uFF0C\u9019\u88E1abc\u662F\u53C3\u6578\u7684\u540D\u7A31\u3002\u4F8B\u5982\uFF1A
+FR-Designer_Add_JS_warning=\u8ACB\u8F38\u51FA\u6B63\u78BA\u7684url\u5730\u5740\uFF01 +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_Space=\u7A7A\u683C +FR-Designer_CommaDismenber=\u9017\u865F +FR-Designer_Other=\u5176\u4ED6 +FR-Designer-Series_Dismenber_As_Single=\u9023\u7E8C\u5206\u9694\u7B26\u8996\u70BA\u55AE\u500B\u8655\u7406 +FR-Designer_KeyPoint=\u95DC\u9375\u7BC0\u9EDE +FR-Designer_loadedTreeModel=\u52A0\u8F09\u5931\u6557,\u8ACB\u6AA2\u67E5\u5F8C\u91CD\u8A66 +FR-Designer-Failed_to_load_the_plugin=\u7121\u6CD5\u52A0\u8F09\u63D2\u4EF6\uFF0C\u8ACB\u66F4\u65B0\u63D2\u4EF6\uFF1A +FR-Designer-Plugin_Please_Update_Jar=\u8ACB\u66F4\u65B0Jar\u5305, \u63D2\u4EF6\u9700\u6C42\u6700\u4F4E\u7248\u672C +FR-Designer-Invalid_Page_Number=\u7121\u6548\u9801\u78BC +FR-Designer_Get-CubeGetting=\u7372\u53D6cube +FR-Designer_XMLA_Database=\u8CC7\u6599\u5EAB +FR-Designer_XMLA_UserName=\u5E33\u865F +FR-Designer_XMLA_Password=\u5BC6\u78BC +FR-Designer_XMLA_Get_Catalog=\u6B63\u5728\u7372\u53D6catalog +FR-Designer_XMLA_Not_NULL=\u4E0D\u80FD\u70BA\u7A7A +FR-Designer_Column-Axis=\u6B04\u8EF8 +FR-Designer_LiteCondition_Common=\u666E\u901A +FR-Designer_LiteCondition_Formula=\u516C\u5F0F +FR-Designer_LiteCondition_ConditionB-AND=\u8207(AND) +FR-Designer_LiteCondition_ConditionB-OR=\u6216(OR) +FR-Designer_LiteCondition_Common_Condition=\u666E\u901A\u689D\u4EF6 +FR-Designer_LiteCondition_Formula_Condition=\u516C\u5F0F\u689D\u4EF6 +FR-Designer_LiteCondition_Define=\u5B9A\u7FA9 +FR-Designer_Normal=\u6B63\u5E38 +FR-Designer_Alert=\u8B66\u544A +FR-Designer_Select_All=\u5168\u9078 +FR-Designer_Copy=\u8907\u88FD +FR-Designer_Clear_All=\u6E05\u9664\u5168\u90E8 +FR-Designer_Log=\u65E5\u8A8C +FR-Designer-Plugin_Expire_Dialog_Title=\u63D2\u4EF6\u904E\u671F +FR-Designer-Plugin_Expire_Dialog_Text=\u63D2\u4EF6\u904E\u671F,\u8ACB\u524D\u5F80\u5E06\u8EDF\u61C9\u7528\u4E2D\u5FC3\u9032\u884C\u8CFC\u8CB7\u3002 +FR-Designer-Plugin_Finerest_Addon=\u5E06\u8F6F\u5E94\u7528\u4E2D\u5FC3 +FR-Designer_Performance_First=\u6027\u80FD\u512A\u5148 +FR-Designer_Total_N_Grade=\u7E3D\u5171\:${N}\u5C64 +FR-Designer-BBSLogin_Login-Title=\u8AD6\u58C7\u8CEC\u865F\u767B\u9678 +FR-Designer_time(s)=\u6B21 +FR-Designer_General=\u5E38\u7528 +FR-Designer_Advanced=\u9032\u968E +FR-Designer_Oracle=\u6240\u6709\u8868 +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_Always=\u59CB\u7D42 +FR-Designer_Export_Setting=\u532F\u51FA\u914D\u7F6E +FR-Designer_Select_Export_Log_Directory=\u9078\u64C7\u532F\u51FA\u76EE\u9304 +FR-Designer_Level_Setting=\u7D1A\u5225\u8A2D\u5B9A +FR-Designer_Choose_Language=\u8A9E\u8A00\u9078\u64C7 +FR-Designer_Work_After_Restart_Designer=\u91CD\u555F\u8A2D\u8A08\u5668\u5F8C\u751F\u6548 +FR-Designer_Setting-Ruler-Units=\u6A19\u5C3A\u55AE\u4F4D\u8A2D\u5B9A +FR-Designer_PageSetup-mm=\u516C\u5398 +FR-Designer_Unit_CM=\u516C\u5206 +FR-Designer_Page-Setup-Scale-Units=\u9801\u9762\u8A2D\u5B9A\u6A19\u5C3A\u55AE\u4F4D +FR-Designer_Report-Design-Ruler-Units=\u5831\u8868\u8A2D\u8A08\u6A19\u5C3A\u55AE\u4F4D +FR-Designer_Web_Preview_Port_Setting=\u57E0\u8A2D\u5B9A +FR-Designer_Designer_Language=\u8A2D\u8A08\u5668\u8A9E\u8A00 +FR-Designer_Unit_INCH=\u82F1\u5BF8 +FR-Designer_Web_Preview_Port=\u57E0\u865F +FR-Designer_Oracle_All_Tables=\u6240\u6709\u8868 +FR-Designer_Unit_PT=\u78C5 +FR-Designer-Write_Auto_Stash=\u81EA\u52D5\u66AB\u5B58 +FR-Designer_Printer_Native_Button=\u672C\u5730\u6253\u5370 +FR-Designer_Event_ShowWidgets=\u76F4\u63A5\u986F\u793A\u5C0F\u5DE5\u5177 +FR-Designer_Current_Preview_Rows=\u7576\u524D\u9810\u89BD\u5217\u6578 +FR-Designer_Data=\u8CC7\u6599 +FR-Designer_Error=\u932F\u8AA4 +FR-Designer_formDesignerModule=\u8868\u55AE\u8A2D\u8A08\u5668\u6A21\u584A +FR-Designer-Website_Url=http\://www.finereport.com/tw +FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u9304\u5F8C\u624D\u80FD\u4E0B\u8F09 +FR-Designer-App_ReLayout=\u624B\u6A5F\u91CD\u4F48\u5C40 +FR-Designer_Mobile-Attr=\u79FB\u52D5\u7AEF\u5C6C\u6027 +FR-Designer_Mobile-Horizontal=\u6A6B\u5C4F +FR-Designer_Mobile-Vertical=\u8C4E\u5C4F +FR-Designer_COMMUNITY_QUESTIONS=\u554F\u984C\u6C42\u52A9 +FR-Designer_COMMUNITY_SIGN=\u5E06\u8EDF\u8A8D\u8B49 +FR-Designer_COMMUNITY_BUG=BUG\u53CD\u994B +FR-Designer_COMMUNITY_NEED=\u9700\u6C42\u63D0\u4EA4 +FR-Designer_COMMUNITY_UPDATE=\u7522\u54C1\u66F4\u65B0 +FR-Designer_COMMUNITY_HELP=\u5E6B\u52A9\u6587\u6A94 +FR-Designer_COMMUNITY_VIDEO=\u5165\u9580\u8996\u983B +FR-Designer_COMMUNITY_BBS=\u5E06\u8EDF\u8AD6\u58C7 +FR-Designer_COMMUNITY=\u793E\u5340 +FR-Designer_Mobile-Open=\u958B\u555F +FR-Designer_Mobile-Zoom=\u5831\u8868\u7E2E\u653E +FR-Designer_Mobile-Warning=\u6700\u5927\u9AD8\u5EA6\u4E0D\u53EF\u8D85\u904E\u986F\u793A\u5340\u57DF\u768480% +FR-Designer_Button-OK=\u77E5\u9053\u4E86 +FR-Designer_Button-Cancel=\u53D6\u6D88 +FR-Designer_Write-Save-Formula=\u586B\u5831/\u5206\u6790\u6642\uFF0C\u4FDD\u7559\u516C\u5F0F\u7528\u65BC\u8A08\u7B97 +FR-Designer_Export-Save-Formula=\u532F\u51FA/\u7DE8\u8F2F\u7D50\u679C\u6642,\u4FDD\u7559\u516C\u5F0F +FR-Designer_Form-Fit-Tip=\u81EA\u9069\u61C9\u63D2\u4EF6 +FR-Designer_Form-Frozen-Tip=\u4F7F\u7528\u51CD\u7D50\u6642, \u5EFA\u8B70\u5B89\u88DD +FR-Designer_Form-Forzen-Speed=, \u5E76\u4F7F\u7528\u6A6B\u5411\u6216\u96D9\u5411\u81EA\u9069\u61C9\u4F86\u63D0\u5347\u5C55\u73FE\u901F\u5EA6. +FR-Designer_Attention=\u6CE8\u610F +FR-Designer_Forbid_Widgets_Intersects=\u7981\u6B62\u7D44\u4EF6\u76F8\u4E92\u91CD\u758A +FR-Designer_Widget_Scaling_Mode_Fit=\u9069\u61C9\u5340\u57DF +FR-Designer_Widget_Scaling_Mode_Fixed=\u56FA\u5B9A\u5927\u5C0F +FR-Designer-Widget_Area_Scaling=\u7D44\u4EF6\u5340\u57DF\u7E2E\u653E +FR-Designer-Widget_Scaling_Mode=\u7E2E\u653E\u908F\u8F2F +FR-Designer-QQLogin-Determine=\u78BA\u5B9A +FR-Designer-QQLogin-Cancel=\u53D6\u6D88 +FR-Designer-Reuse_Manager=\u7D44\u4EF6\u7BA1\u7406 +FR-Designer_TableData-Default-Para=\u6578\u64DA\u96C6\u9ED8\u8A8D\u53C3\u6578 +FR-Designer_Layout_Block_Absolute= +FR-Designer_Layout_Block_Tab= +FR-Designer_Layout_Block_Blank= +FR-Designer_Attr_Layout= +FR-Designer_Attr_Layout_Type= +FR-Designer_Attr_Bidirectional_Adaptive= +FR-Designer_Mobile-Refresh=\u5237\u65B0 +FR-Designer_Mobile-ToolBar=\u5DE5\u5177\u6B04 +FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5167\u4EFB\u610F\u4F4D\u7F6E\u65B0\u589E\u63A7\u5236\u9805 +FR-Designer_Reset= +FR-Designer_Add_all=\u5168\u90E8\u65B0\u589E From 15fd6fa87631dad213bd0bc6fd7072dae3a1ef80 Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 24 Nov 2016 12:03:54 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=81=97=E6=BC=8F=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/locale/designer.properties | 28 ++++++++++++++++++- .../design/locale/designer_en_US.properties | 28 ++++++++++++++++++- .../design/locale/designer_ja_JP.properties | 28 ++++++++++++++++++- .../design/locale/designer_ko_KR.properties | 28 ++++++++++++++++++- .../design/locale/designer_zh_CN.properties | 28 ++++++++++++++++++- .../design/locale/designer_zh_TW.properties | 28 ++++++++++++++++++- 6 files changed, 162 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index c524eb93d5..bcc777385c 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 11:56:39 CST 2016 +# generated time: 星期四 十一月 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account= FR-Designer-BBSLogin_Connection-Failure= FR-Designer-BBSLogin_Connection-Failure-Tip= @@ -28,6 +28,32 @@ FR-Designer-Output_Excel_Page= FR-Designer-Output_Excel_Sheet= FR-Designer-Output_Excel_Simple= FR-Designer-Plugin_PluginMarket_Coding= +FR-Desinger-Plugin_Updater_UpdateAndUpgrade= +FR-Desinger-Plugin_Updater_Checking_Jar_Update= +FR-Desinger-Plugin_Updater_Checking_Version_Update= +FR-Desinger-Plugin_Updater_Update= +FR-Desinger-Plugin_Updater_Upgrade= +FR-Desinger-Plugin_Updater_Restore= +FR-Desinger-Plugin_Updater_New_Version_Available= +FR-Desinger-Plugin_Updater_JarUpdate= +FR-Desinger-Plugin_Updater_VersionUpgrade= +FR-Desinger-Plugin_Updater_Previous_Version= +FR-Desinger-Plugin_Updater_Current_Version= +FR-Desinger-Plugin_Updater_Not_Install_Version= +FR-Desinger-Plugin_Updater_Latest_Version= +FR-Desinger-Plugin_Updater_Jar_Downloading= +FR-Desinger-Plugin_Updater_Version_Downloading= +FR-Desinger-Plugin_Updater_Restart_Designer= +FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed= +FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed= +FR-Desinger-Plugin_Updater_Already_Latest_Version= +FR-Desinger-Plugin_Updater_Backup_OldJar_To= +FR-Desinger-Plugin_Updater_Backup_OldVersion_To= +FR-Desinger-Plugin_Updater_Please_Restart= +FR-Desinger-Plugin_Updater_Jar_Restore= +FR-Desinger-Plugin_Updater_Version_Restore= +FR-Desinger-Plugin_Updater_Restore_To= +FR-Desinger-Plugin_Updater_WorksAfterRestart= FR-Designer-Submit_Condition= FR-Designer-Widget-Title_border= FR-Designer-Widget-Title_border_color= diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index a35606663b..d3e02f0072 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 11:56:39 CST 2016 +# generated time: 星期四 十一月 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=User name FR-Designer-BBSLogin_Connection-Failure=Connection failure, check your network status FR-Designer-BBSLogin_Connection-Failure-Tip=Tip @@ -28,6 +28,32 @@ FR-Designer-Output_Excel_Page=Excel Export(page break) FR-Designer-Output_Excel_Sheet=Excel Export(one page per sheet) FR-Designer-Output_Excel_Simple=Excel Export(original) FR-Designer-Plugin_PluginMarket_Coding=Plugin store is developing, stay tuned +FR-Desinger-Plugin_Updater_UpdateAndUpgrade=Update&Upgrade +FR-Desinger-Plugin_Updater_Checking_Jar_Update=Checking jarpackage update +FR-Desinger-Plugin_Updater_Checking_Version_Update=Checking version update +FR-Desinger-Plugin_Updater_Update=update +FR-Desinger-Plugin_Updater_Upgrade=upgrade +FR-Desinger-Plugin_Updater_Restore=restore +FR-Desinger-Plugin_Updater_New_Version_Available=New version available +FR-Desinger-Plugin_Updater_JarUpdate=Jar pack Update: +FR-Desinger-Plugin_Updater_VersionUpgrade=Version Upgrade: +FR-Desinger-Plugin_Updater_Previous_Version=to previous version? +FR-Desinger-Plugin_Updater_Current_Version=to current version +FR-Desinger-Plugin_Updater_Not_Install_Version=not install version +FR-Desinger-Plugin_Updater_Latest_Version=latest version +FR-Desinger-Plugin_Updater_Jar_Downloading=Jar package is downloading +FR-Desinger-Plugin_Updater_Version_Downloading=New version is downloading +FR-Desinger-Plugin_Updater_Restart_Designer=Restart designer +FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=Cannot connect to version-update-server +FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=Cannot connect to version-upgrade-server +FR-Desinger-Plugin_Updater_Already_Latest_Version=This is the latest version +FR-Desinger-Plugin_Updater_Backup_OldJar_To=Already backup the old jar package to: +FR-Desinger-Plugin_Updater_Backup_OldVersion_To=Already backup the old version package to: +FR-Desinger-Plugin_Updater_Please_Restart=,restart designer +FR-Desinger-Plugin_Updater_Jar_Restore=Jar package restore +FR-Desinger-Plugin_Updater_Version_Restore=Version restore +FR-Desinger-Plugin_Updater_Restore_To=Restore to +FR-Desinger-Plugin_Updater_WorksAfterRestart=version, take effect after restart FR-Designer-Submit_Condition=Condition FR-Designer-Widget-Title_border=Border FR-Designer-Widget-Title_border_color=Color diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index 2fe50ef9b5..ca4a6d066d 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 11:56:39 CST 2016 +# generated time: 星期四 十一月 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u30E6\u30FC\u30B6\u30FC\u540D FR-Designer-BBSLogin_Connection-Failure=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u73FE\u5728\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u72B6\u614B\u3092\u691C\u67FB\u3057\u3066\u304F\u3060\u3055\u3044 FR-Designer-BBSLogin_Connection-Failure-Tip=\u30D2\u30F3\u30C8 @@ -28,6 +28,32 @@ FR-Designer-Output_Excel_Page=Excel\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8(\u30DA\u FR-Designer-Output_Excel_Sheet=Excel\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8(\u30DA\u30FC\u30B8\u5225\u30B7\u30FC\u30C8\u5225\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8) FR-Designer-Output_Excel_Simple=Excel\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8(\u5143\u306E\u307E\u307E\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8) FR-Designer-Plugin_PluginMarket_Coding=\u30D7\u30E9\u30B0\u30A4\u30F3\u30DE\u30FC\u30B1\u30C3\u30C8\u306F\u958B\u767A\u4E2D\u3067\u3059\u3002\u3054\u671F\u5F85\u304F\u3060\u3055\u3044 +FR-Desinger-Plugin_Updater_UpdateAndUpgrade=\u66F4\u65B0\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8 +FR-Desinger-Plugin_Updater_Checking_Jar_Update=Jar\u30D1\u30C3\u30B1\u30FC\u30B8\u30C1\u30A7\u30C3\u30AF\u66F4\u65B0\u4E2D +FR-Desinger-Plugin_Updater_Checking_Version_Update=\u30D0\u30FC\u30B8\u30E7\u30F3\u30C1\u30A7\u30C3\u30AF\u66F4\u65B0\u4E2D +FR-Desinger-Plugin_Updater_Update=\u66F4\u65B0 +FR-Desinger-Plugin_Updater_Upgrade=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8 +FR-Desinger-Plugin_Updater_Restore=\u5FA9\u5143 +FR-Desinger-Plugin_Updater_New_Version_Available=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u6709\u308A +FR-Desinger-Plugin_Updater_JarUpdate=Jar\u30D1\u30C3\u30B1\u30FC\u30B8\u66F4\u65B0 +FR-Desinger-Plugin_Updater_VersionUpgrade=\u30D0\u30FC\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7 +FR-Desinger-Plugin_Updater_Previous_Version=\u65E7\u30D0\u30FC\u30B8\u30E7\u30F3\u307E\u3067\u306B +FR-Desinger-Plugin_Updater_Current_Version=\u73FE\u30D0\u30FC\u30B8\u30E7\u30F3 +FR-Desinger-Plugin_Updater_Not_Install_Version=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u306F\u306A\u3044 +FR-Desinger-Plugin_Updater_Latest_Version=\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3 +FR-Desinger-Plugin_Updater_Jar_Downloading=Jar\u30D1\u30C3\u30B1\u30FC\u30B8\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5B8C\u6210\u5F85\u3061 +FR-Desinger-Plugin_Updater_Version_Downloading=\u30D0\u30FC\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7\u30D1\u30C3\u30B1\u30FC\u30B8\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5B8C\u6210\u5F85\u3061 +FR-Desinger-Plugin_Updater_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u518D\u8D77\u52D5 +FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=\u30D0\u30FC\u30B8\u30E7\u30F3\u66F4\u65B0\u30B5\u30FC\u30D0\u30FC\u63A5\u7D9A\u3067\u304D\u306A\u3044 +FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=\u30D0\u30FC\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30FC\u30D0\u30FC\u63A5\u7D9A\u3067\u304D\u306A\u3044 +FR-Desinger-Plugin_Updater_Already_Latest_Version=\u65E2\u306B\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3 +FR-Desinger-Plugin_Updater_Backup_OldJar_To=\u65E7Jar\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u65E2\u306B\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7 +FR-Desinger-Plugin_Updater_Backup_OldVersion_To=\u65E7\u30D0\u30FC\u30B8\u30E7\u30F3\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u65E2\u306B\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7 +FR-Desinger-Plugin_Updater_Please_Restart=\u30C7\u30B6\u30A4\u30CA\u30FC\u306F\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044 +FR-Desinger-Plugin_Updater_Jar_Restore=\u65E7Jar\u30D1\u30C3\u30B1\u30FC\u30B8\u5FA9\u5143 +FR-Desinger-Plugin_Updater_Version_Restore=\u30D0\u30FC\u30B8\u30E7\u30F3\u5FA9\u5143 +FR-Desinger-Plugin_Updater_Restore_To=\u5FA9\u5143 +FR-Desinger-Plugin_Updater_WorksAfterRestart=\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u518D\u8D77\u52D5\u5F8C\u306B\u6709\u52B9\u3059\u308B FR-Designer-Submit_Condition=\u6761\u4EF6 FR-Designer-Widget-Title_border=\u30D5\u30EC\u30FC\u30E0 FR-Designer-Widget-Title_border_color=\u8272 diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 137f253a35..7c434320cd 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 11:56:39 CST 2016 +# generated time: 星期四 十一月 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D FR-Designer-BBSLogin_Connection-Failure=\uB124\uD2B8\uC6CC\uD06C\uB9C1\uD06C\uC2E4\uD328.\uD604\uC7AC\uB124\uD2B8\uC6CC\uD06C\uC0C1\uD0DC\uB97C\uAC80\uC0AC\uD574\uC8FC\uC2ED\uC2DC\uC624. FR-Designer-BBSLogin_Connection-Failure-Tip=\uC54C\uB9BC @@ -28,6 +28,32 @@ FR-Designer-Output_Excel_Page=Excel\uCD9C\uB825(\uD398\uC774\uC9C0\uB098\uB204\u FR-Designer-Output_Excel_Sheet=Excel\uCD9C\uB825(\uD398\uC774\uC9C0\uB098\uB204\uAE30Sheet\uB0B4\uBCF4\uB0B4\uAE30) FR-Designer-Output_Excel_Simple=Excel\uCD9C\uB825(\uC6D0\uB798\uBAA8\uC2B5\uB0B4\uBCF4\uB0B4\uAE30) FR-Designer-Plugin_PluginMarket_Coding=\uD50C\uB7EC\uADF8\uC778\uC2A4\uD1A0\uC5B4\uB97C\uAC1C\uBC1C\uC911\uC785\uB2C8\uB2E4.\uAE30\uB2E4\uB824\uC8FC\uC2ED\uC2DC\uC624. +FR-Desinger-Plugin_Updater_UpdateAndUpgrade=\uC5C5\uB370\uC774\uD2B8\uC5C5\uADF8\uB808\uC774\uB4DC +FR-Desinger-Plugin_Updater_Checking_Jar_Update=Jar\uC5C5\uB370\uC774\uD2B8\uAC80\uC0AC\uC911 +FR-Desinger-Plugin_Updater_Checking_Version_Update=\uBC84\uC804\uC5C5\uB370\uC774\uD2B8\uAC80\uC0AC\uC911 +FR-Desinger-Plugin_Updater_Update=\uC5C5\uB370\uC774\uD2B8 +FR-Desinger-Plugin_Updater_Upgrade=\uC5C5\uADF8\uB808\uC774\uB4DC +FR-Desinger-Plugin_Updater_Restore=\uBCF5\uC6D0 +FR-Desinger-Plugin_Updater_New_Version_Available=\uC0C8\uB85C\uC6B4\uBC84\uC804\uC774\uC788\uC2B5\uB2C8\uB2E4. +FR-Desinger-Plugin_Updater_JarUpdate=Jar\uD329\uC5C5\uB370\uC774\uD2B8\uFF1A +FR-Desinger-Plugin_Updater_VersionUpgrade=\uBC84\uC804\uC5C5\uADF8\uB808\uC774\uB4DC\uFF1A +FR-Desinger-Plugin_Updater_Previous_Version=\uC774\uC804\uBC84\uC804\uC73C\uB85C\uAC00\uC2DC\uACA0\uC2B5\uB2C8\uAE4C\uFF1F +FR-Desinger-Plugin_Updater_Current_Version=\uD604\uC7AC\uBC84\uC804\uFF1A +FR-Desinger-Plugin_Updater_Not_Install_Version=\uC124\uCE58\uB41C\uBC84\uC804\uC774\uC544\uB2D9\uB2C8\uB2E4. +FR-Desinger-Plugin_Updater_Latest_Version=\uCD5C\uC2E0\uBC84\uC804\uFF1A +FR-Desinger-Plugin_Updater_Jar_Downloading=jar\uD329\uB2E4\uC6B4\uB85C\uB4DC\uC644\uB8CC\uB97C\uAE30\uB2E4\uB9AC\uACE0\uC788\uC2B5\uB2C8\uB2E4. +FR-Desinger-Plugin_Updater_Version_Downloading=\uC5C5\uADF8\uB808\uC774\uB4DC\uD329\uB2E4\uC6B4\uB85C\uB4DC\uC644\uB8CC\uB97C\uAE30\uB2E4\uB9AC\uACE0\uC788\uC2B5\uB2C8\uB2E4. +FR-Desinger-Plugin_Updater_Restart_Designer=\uC7AC\uBD80\uD305\uC124\uACC4\uAE30 +FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=\uBC84\uC804\uC5C5\uB370\uC774\uD2B8\uC11C\uBC84\uB97C\uC5F0\uACB0\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4. +FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=\uBC84\uC804\uC5C5\uADF8\uB808\uC774\uB4DC\uC11C\uBC84\uB97C\uC5F0\uACB0\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4. +FR-Desinger-Plugin_Updater_Already_Latest_Version=\uCD5C\uC2E0\uBC84\uC804\uC785\uB2C8\uB2E4. +FR-Desinger-Plugin_Updater_Backup_OldJar_To=\uAE30\uC874 jar\uD329\uC744\uBC31\uC5C5\uD558\uC600\uC2B5\uB2C8\uB2E4. +FR-Desinger-Plugin_Updater_Backup_OldVersion_To=\uAE30\uC874\uBC84\uC804\uD329\uC744\uBC31\uC5C5\uD558\uC600\uC2B5\uB2C8\uB2E4. +FR-Desinger-Plugin_Updater_Please_Restart=\uC124\uACC4\uAE30\uB97C\uC7AC\uBD80\uD305\uD574\uC8FC\uC2ED\uC2DC\uC624. +FR-Desinger-Plugin_Updater_Jar_Restore=Jar\uD329\uBCF5\uC6D0 +FR-Desinger-Plugin_Updater_Version_Restore=\uBC84\uC804\uBCF5\uC6D0 +FR-Desinger-Plugin_Updater_Restore_To=\uB85C\uBCF5\uC6D0 +FR-Desinger-Plugin_Updater_WorksAfterRestart=\uBC84\uC804.\uC7AC\uBD80\uD305\uC720\uD6A8\uD568 FR-Designer-Submit_Condition=\uC870\uAC74 FR-Designer-Widget-Title_border=\uD14C\uB450\uB9AC FR-Designer-Widget-Title_border_color=\uC0C9 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index a83c0e8b4d..8ee044e6e7 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 11:56:39 CST 2016 +# generated time: 星期四 十一月 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D FR-Designer-BBSLogin_Connection-Failure=\u7F51\u7EDC\u8FDE\u63A5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u5F53\u524D\u7F51\u7EDC\u72B6\u6001 FR-Designer-BBSLogin_Connection-Failure-Tip=\u63D0\u793A @@ -28,6 +28,32 @@ FR-Designer-Output_Excel_Page=Excel\u8F93\u51FA(\u5206\u9875\u5BFC\u51FA) FR-Designer-Output_Excel_Sheet=Excel\u8F93\u51FA(\u5206\u9875\u5206Sheet\u5BFC\u51FA) FR-Designer-Output_Excel_Simple=Excel\u8F93\u51FA(\u539F\u6837\u5BFC\u51FA) FR-Designer-Plugin_PluginMarket_Coding=\u63D2\u4EF6\u5546\u5E97\u6B63\u5728\u5F00\u53D1\u4E2D\uFF0C\u656C\u8BF7\u671F\u5F85 +FR-Desinger-Plugin_Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7EA7 +FR-Desinger-Plugin_Updater_Checking_Jar_Update=\u6B63\u5728\u68C0\u6D4BJar\u66F4\u65B0 +FR-Desinger-Plugin_Updater_Checking_Version_Update=\u6B63\u5728\u68C0\u6D4B\u7248\u672C\u66F4\u65B0 +FR-Desinger-Plugin_Updater_Update=\u66F4\u65B0 +FR-Desinger-Plugin_Updater_Upgrade=\u5347\u7EA7 +FR-Desinger-Plugin_Updater_Restore=\u8FD8\u539F +FR-Desinger-Plugin_Updater_New_Version_Available=\u6709\u65B0\u7248\u672C +FR-Desinger-Plugin_Updater_JarUpdate=Jar\u5305\u66F4\u65B0\uFF1A +FR-Desinger-Plugin_Updater_VersionUpgrade=\u7248\u672C\u5347\u7EA7\uFF1A +FR-Desinger-Plugin_Updater_Previous_Version=\u5230\u4EE5\u524D\u7684\u7248\u672C\uFF1F +FR-Desinger-Plugin_Updater_Current_Version=\u5F53\u524D\u7248\u672C\uFF1A +FR-Desinger-Plugin_Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88C5\u7248\u672C +FR-Desinger-Plugin_Updater_Latest_Version=\u6700\u65B0\u7248\u672C\uFF1A +FR-Desinger-Plugin_Updater_Jar_Downloading=\u6B63\u5728\u7B49\u5F85jar\u5305\u4E0B\u8F7D\u5B8C\u6210 +FR-Desinger-Plugin_Updater_Version_Downloading=\u6B63\u5728\u7B49\u5F85\u5347\u7EA7\u5305\u4E0B\u8F7D\u5B8C\u6210 +FR-Desinger-Plugin_Updater_Restart_Designer=\u91CD\u542F\u8BBE\u8BA1\u5668 +FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=\u65E0\u6CD5\u8FDE\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52A1\u5668 +FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=\u65E0\u6CD5\u8FDE\u63A5\u7248\u672C\u5347\u7EA7\u670D\u52A1\u5668 +FR-Desinger-Plugin_Updater_Already_Latest_Version=\u5DF2\u7ECF\u662F\u6700\u65B0\u7248\u672C +FR-Desinger-Plugin_Updater_Backup_OldJar_To=\u5DF2\u5C06\u65E7jar\u5305\u5907\u4EFD\u5230\uFF1A +FR-Desinger-Plugin_Updater_Backup_OldVersion_To=\u5DF2\u5C06\u65E7\u7248\u672C\u5305\u5907\u4EFD\u5230\uFF1A +FR-Desinger-Plugin_Updater_Please_Restart=\uFF0C\u8BF7\u91CD\u542F\u8BBE\u8BA1\u5668 +FR-Desinger-Plugin_Updater_Jar_Restore=Jar\u5305\u8FD8\u539F +FR-Desinger-Plugin_Updater_Version_Restore=\u7248\u672C\u8FD8\u539F +FR-Desinger-Plugin_Updater_Restore_To=\u8FD8\u539F\u5230 +FR-Desinger-Plugin_Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u542F\u751F\u6548 FR-Designer-Submit_Condition=\u6761\u4EF6 FR-Designer-Widget-Title_border=\u8FB9\u6846 FR-Designer-Widget-Title_border_color=\u989C\u8272 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 6bf0d2df3b..551ff97ef5 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 11:56:39 CST 2016 +# generated time: 星期四 十一月 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u767B\u5165\u5E33\u865F FR-Designer-BBSLogin_Connection-Failure=\u767B\u5165\u9023\u63A5\u5931\u6557\uFF0C\u8ACB\u6AA2\u67E5\u7576\u524D\u7DB2\u8DEF\u72C0\u614B FR-Designer-BBSLogin_Connection-Failure-Tip=\u9023\u7DDA\u5931\u6557\u63D0\u793A @@ -28,6 +28,32 @@ FR-Designer-Output_Excel_Page=Excel(\u5206\u9801\u532F\u51FA) FR-Designer-Output_Excel_Sheet=Excel\u8F38\u51FA(\u5206\u9801\u5206Sheet\u532F\u51FA) FR-Designer-Output_Excel_Simple=Excel\u8F38\u51FA(\u539F\u6A23\u532F\u51FA) FR-Designer-Plugin_PluginMarket_Coding=\u63D2\u4EF6\u5546\u5E97\u6B63\u5728\u958B\u767C\u4E2D\uFF0C\u656C\u8ACB\u671F\u5F85 +FR-Desinger-Plugin_Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7D1A +FR-Desinger-Plugin_Updater_Checking_Jar_Update=\u6B63\u5728\u6AA2\u6E2CJar\u66F4\u65B0 +FR-Desinger-Plugin_Updater_Checking_Version_Update=\u6B63\u5728\u6AA2\u6E2C\u7248\u672C\u66F4\u65B0 +FR-Desinger-Plugin_Updater_Update=\u66F4\u65B0 +FR-Desinger-Plugin_Updater_Upgrade=\u5347\u7D1A +FR-Desinger-Plugin_Updater_Restore=\u9084\u539F +FR-Desinger-Plugin_Updater_New_Version_Available=\u6709\u65B0\u7248\u672C +FR-Desinger-Plugin_Updater_JarUpdate=Jar\u5305\u66F4\u65B0\uFF1A +FR-Desinger-Plugin_Updater_VersionUpgrade=\u7248\u672C\u5347\u7D1A\uFF1A +FR-Desinger-Plugin_Updater_Previous_Version=\u5230\u4EE5\u524D\u7684\u7248\u672C\uFF1F +FR-Desinger-Plugin_Updater_Current_Version=\u7576\u524D\u7248\u672C\uFF1A +FR-Desinger-Plugin_Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88DD\u7248\u672C +FR-Desinger-Plugin_Updater_Latest_Version=\u6700\u65B0\u7248\u672C\uFF1A +FR-Desinger-Plugin_Updater_Jar_Downloading=\u6B63\u5728\u7B49\u5F85jar\u5305\u4E0B\u8F09\u5B8C\u6210 +FR-Desinger-Plugin_Updater_Version_Downloading=\u6B63\u5728\u7B49\u5F85\u5347\u7D1A\u5305\u4E0B\u8F09\u5B8C\u6210 +FR-Desinger-Plugin_Updater_Restart_Designer=\u91CD\u555F\u8A2D\u8A08\u5668 +FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=\u7121\u6CD5\u9023\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52D9\u5668 +FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=\u7121\u6CD5\u9023\u63A5\u7248\u672C\u5347\u7D1A\u670D\u52D9\u5668 +FR-Desinger-Plugin_Updater_Already_Latest_Version=\u5DF2\u7D93\u662F\u6700\u65B0\u7248\u672C +FR-Desinger-Plugin_Updater_Backup_OldJar_To=\u5DF2\u5C07\u820Ajar\u5305\u5099\u4EFD\u5230\uFF1A +FR-Desinger-Plugin_Updater_Backup_OldVersion_To=\u5DF2\u5C07\u820A\u7248\u672C\u5305\u5099\u4EFD\u5230\uFF1A +FR-Desinger-Plugin_Updater_Please_Restart=\uFF0C\u8ACB\u91CD\u555F\u8A2D\u8A08\u5668 +FR-Desinger-Plugin_Updater_Jar_Restore=Jar\u5305\u9084\u539F +FR-Desinger-Plugin_Updater_Version_Restore=\u7248\u672C\u9084\u539F +FR-Desinger-Plugin_Updater_Restore_To=\u9084\u539F\u5230 +FR-Desinger-Plugin_Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u555F\u751F\u6548 FR-Designer-Submit_Condition=\u63D0\u4EA4\u689D\u4EF6 FR-Designer-Widget-Title_border=\u6A19\u984C\u6846\u7DDA FR-Designer-Widget-Title_border_color=\u6A19\u984C\u6846\u7DDA\u984F\u8272 From 2e6cae4233fed717c366437290b8141bebd335ee Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 24 Nov 2016 16:59:37 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E5=8A=A0=E8=BD=BDdesign=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=AD=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/module/DesignModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/module/DesignModule.java b/designer_base/src/com/fr/design/module/DesignModule.java index 7dca3803ff..14ed20aea8 100644 --- a/designer_base/src/com/fr/design/module/DesignModule.java +++ b/designer_base/src/com/fr/design/module/DesignModule.java @@ -62,7 +62,7 @@ public abstract class DesignModule extends TopModule { * @return 国际化文件路径 */ public String[] getLocaleFile() { - return ArrayUtils.EMPTY_STRING_ARRAY; + return new String[]{"com/fr/design/locale/designer"}; } public Class[] actionsForInsertCellElement() { From e46f1fe461c77b19eb66c940ceb3292c96f614a1 Mon Sep 17 00:00:00 2001 From: sunmondong Date: Fri, 25 Nov 2016 10:19:53 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=9Aapplet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.dev.gradle | 10 ++--- build.dev.gradle.bak | 4 +- build.master.gradle | 10 ++--- build.master.gradle.bak | 86 ++++++++++++++++++++++++++++++++++++++++ build.release.gradle | 10 ++--- build.release.gradle.bak | 85 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 188 insertions(+), 17 deletions(-) create mode 100644 build.master.gradle.bak create mode 100644 build.release.gradle.bak diff --git a/build.dev.gradle b/build.dev.gradle index c5cc1b92da..1efdd55cc8 100644 --- a/build.dev.gradle +++ b/build.dev.gradle @@ -13,7 +13,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) task appletJar<<{ ant{ - mkdir(dir:"${libDir}/tmp-${branchName}") + mkdir(dir:"./tmp") mkdir(dir:"build/classes/") copy(todir:"build/classes/"){ fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") @@ -27,8 +27,8 @@ task appletJar<<{ fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/${branchName}/3rd.jar",dest:"${libDir}/tmp-${branchName}") - unjar(src:"${libDir}/${branchName}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/${branchName}/3rd.jar",dest:"./tmp") + unjar(src:"${libDir}/${branchName}/servlet-api.jar",dest:"./tmp") jar(jarfile:"build/libs/fr-applet-8.0.jar"){ fileset(dir:"build/classes"){ exclude(name:"*.*") @@ -44,7 +44,7 @@ task appletJar<<{ exclude(name:"com/fr/start/**") exclude(name:"com/fr/process/**") } - fileset(dir:"${libDir}/tmp-${branchName}"){ + fileset(dir:"./tmp"){ include(name:"javax/mail/**") include(name:"javax/servlet/**") include(name:"org/freehep/**") @@ -60,7 +60,7 @@ task appletJar<<{ include(name:"com/fr/web/attr/*.class") } } - delete(dir:"${libDir}/tmp-${branchName}") + delete(dir:"./tmp") def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" def keystore="frapplet.store" def keycert="fr.cert" diff --git a/build.dev.gradle.bak b/build.dev.gradle.bak index cc3bea2327..c5cc1b92da 100644 --- a/build.dev.gradle.bak +++ b/build.dev.gradle.bak @@ -27,8 +27,8 @@ task appletJar<<{ fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") - unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/${branchName}/3rd.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/${branchName}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") jar(jarfile:"build/libs/fr-applet-8.0.jar"){ fileset(dir:"build/classes"){ exclude(name:"*.*") diff --git a/build.master.gradle b/build.master.gradle index c5cc1b92da..1efdd55cc8 100644 --- a/build.master.gradle +++ b/build.master.gradle @@ -13,7 +13,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) task appletJar<<{ ant{ - mkdir(dir:"${libDir}/tmp-${branchName}") + mkdir(dir:"./tmp") mkdir(dir:"build/classes/") copy(todir:"build/classes/"){ fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") @@ -27,8 +27,8 @@ task appletJar<<{ fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/${branchName}/3rd.jar",dest:"${libDir}/tmp-${branchName}") - unjar(src:"${libDir}/${branchName}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/${branchName}/3rd.jar",dest:"./tmp") + unjar(src:"${libDir}/${branchName}/servlet-api.jar",dest:"./tmp") jar(jarfile:"build/libs/fr-applet-8.0.jar"){ fileset(dir:"build/classes"){ exclude(name:"*.*") @@ -44,7 +44,7 @@ task appletJar<<{ exclude(name:"com/fr/start/**") exclude(name:"com/fr/process/**") } - fileset(dir:"${libDir}/tmp-${branchName}"){ + fileset(dir:"./tmp"){ include(name:"javax/mail/**") include(name:"javax/servlet/**") include(name:"org/freehep/**") @@ -60,7 +60,7 @@ task appletJar<<{ include(name:"com/fr/web/attr/*.class") } } - delete(dir:"${libDir}/tmp-${branchName}") + delete(dir:"./tmp") def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" def keystore="frapplet.store" def keycert="fr.cert" diff --git a/build.master.gradle.bak b/build.master.gradle.bak new file mode 100644 index 0000000000..c5cc1b92da --- /dev/null +++ b/build.master.gradle.bak @@ -0,0 +1,86 @@ +apply plugin: "java" +tasks.withType(JavaCompile){ + options.encoding = "UTF-8" +} + +def basicDir="../../" +def libDir="${basicDir}/finereport-lib-stable" +//获取什么分支名 +FileTree files =fileTree(dir:"./",include:"build.*.gradle") +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) +def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) + +task appletJar<<{ + + ant{ + mkdir(dir:"${libDir}/tmp-${branchName}") + mkdir(dir:"build/classes/") + copy(todir:"build/classes/"){ + fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") + + } + unjar(src:"${libDir}/${branchName}/3rd.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/${branchName}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") + jar(jarfile:"build/libs/fr-applet-8.0.jar"){ + fileset(dir:"build/classes"){ + exclude(name:"*.*") + exclude(name:"bin/*.*") + exclude(name:"classes/**") + exclude(name:"com/fr/schedule/**") + exclude(name:"com/fr/cell/**") + exclude(name:"com/fr/dialog/**") + exclude(name:"com/fr/view/**") + exclude(name:"com/fr/web/**") + exclude(name:"com/fr/fs/**") + exclude(name:"com/fr/design/**") + exclude(name:"com/fr/start/**") + exclude(name:"com/fr/process/**") + } + fileset(dir:"${libDir}/tmp-${branchName}"){ + include(name:"javax/mail/**") + include(name:"javax/servlet/**") + include(name:"org/freehep/**") + include(name:"com/fr/third/JAI/**") + include(name:"com/fr/third/antlr/**") + include(name:"com/fr/third/javax/**") + include(name:"com/sun/xml/**") + include(name:"javax/xml/**") + + } + fileset(dir:"build/classes"){ + include(name:"com/fr/web/*.class") + include(name:"com/fr/web/attr/*.class") + } + } + delete(dir:"${libDir}/tmp-${branchName}") + def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" + def keystore="frapplet.store" + def keycert="fr.cert" + def keypassword="123456" + def keyalias="fr" + + exec(executable:"${jdk6home}/bin/keytool"){ + arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") + } + exec(executable:"${jdk6home}/bin/keytool"){ + arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") + } + + exec(executable:"${jdk6home}/bin/jarsigner"){ + arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}") + } + delete(file:"${keystore}") + delete(file:"${keycert}") + delete(dir:"build/classes") + + } + +} \ No newline at end of file diff --git a/build.release.gradle b/build.release.gradle index 44aacadb4d..1c00529e68 100644 --- a/build.release.gradle +++ b/build.release.gradle @@ -12,7 +12,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) task appletJar<<{ ant{ - mkdir(dir:"${libDir}/tmp-${branchName}") + mkdir(dir:"./tmp") mkdir(dir:"build/classes/") copy(todir:"build/classes/"){ fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") @@ -26,8 +26,8 @@ task appletJar<<{ fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") } - unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") - unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/3rd.jar",dest:"./tmp") + unjar(src:"${libDir}/servlet-api.jar",dest:"./tmp") jar(jarfile:"build/libs/fr-applet-8.0.jar"){ fileset(dir:"build/classes"){ exclude(name:"*.*") @@ -43,7 +43,7 @@ task appletJar<<{ exclude(name:"com/fr/start/**") exclude(name:"com/fr/process/**") } - fileset(dir:"${libDir}/tmp-${branchName}"){ + fileset(dir:"./tmp"){ include(name:"javax/mail/**") include(name:"javax/servlet/**") include(name:"org/freehep/**") @@ -59,7 +59,7 @@ task appletJar<<{ include(name:"com/fr/web/attr/*.class") } } - delete(dir:"${libDir}/tmp-${branchName}") + delete(dir:"./tmp") def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" def keystore="frapplet.store" def keycert="fr.cert" diff --git a/build.release.gradle.bak b/build.release.gradle.bak new file mode 100644 index 0000000000..44aacadb4d --- /dev/null +++ b/build.release.gradle.bak @@ -0,0 +1,85 @@ +apply plugin: "java" +tasks.withType(JavaCompile){ + options.encoding = "UTF-8" +} +def basicDir="../../" +def libDir="${basicDir}/finereport-lib-stable/master" +//获取什么分支名 +FileTree files =fileTree(dir:"./",include:"build.*.gradle") +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) +def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) + +task appletJar<<{ + + ant{ + mkdir(dir:"${libDir}/tmp-${branchName}") + mkdir(dir:"build/classes/") + copy(todir:"build/classes/"){ + fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") + + fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") + + } + unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") + unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") + jar(jarfile:"build/libs/fr-applet-8.0.jar"){ + fileset(dir:"build/classes"){ + exclude(name:"*.*") + exclude(name:"bin/*.*") + exclude(name:"classes/**") + exclude(name:"com/fr/schedule/**") + exclude(name:"com/fr/cell/**") + exclude(name:"com/fr/dialog/**") + exclude(name:"com/fr/view/**") + exclude(name:"com/fr/web/**") + exclude(name:"com/fr/fs/**") + exclude(name:"com/fr/design/**") + exclude(name:"com/fr/start/**") + exclude(name:"com/fr/process/**") + } + fileset(dir:"${libDir}/tmp-${branchName}"){ + include(name:"javax/mail/**") + include(name:"javax/servlet/**") + include(name:"org/freehep/**") + include(name:"com/fr/third/JAI/**") + include(name:"com/fr/third/antlr/**") + include(name:"com/fr/third/javax/**") + include(name:"com/sun/xml/**") + include(name:"javax/xml/**") + + } + fileset(dir:"build/classes"){ + include(name:"com/fr/web/*.class") + include(name:"com/fr/web/attr/*.class") + } + } + delete(dir:"${libDir}/tmp-${branchName}") + def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" + def keystore="frapplet.store" + def keycert="fr.cert" + def keypassword="123456" + def keyalias="fr" + + exec(executable:"${jdk6home}/bin/keytool"){ + arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") + } + exec(executable:"${jdk6home}/bin/keytool"){ + arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") + } + + exec(executable:"${jdk6home}/bin/jarsigner"){ + arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}") + } + delete(file:"${keystore}") + delete(file:"${keycert}") + delete(dir:"build/classes") + + } + +} \ No newline at end of file From 2686f1f4661893c3ce75f8243d25e2aa22d4f7e9 Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 25 Nov 2016 10:26:59 +0800 Subject: [PATCH 05/24] =?UTF-8?q?REPORT-881=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E4=B8=8D=E5=BA=94=E8=AF=A5=E7=9C=8B=E5=88=B0?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E7=9A=84=E2=80=9C=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E2=80=9D=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 8df23d70d9..3e862cf288 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -133,7 +133,9 @@ public abstract class ToolBarMenuDock { menuList.addAll(Arrays.asList(menuDefs)); // 添加服务器菜单 - menuList.add(createServerMenuDef(plus)); + if (FRContext.getCurrentEnv() != null && FRContext.getCurrentEnv().isRoot()) { + menuList.add(createServerMenuDef(plus)); + } // 添加帮助菜单 menuList.add(createHelpMenuDef()); @@ -245,11 +247,6 @@ public abstract class ToolBarMenuDock { protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_M-Server"), 'S'); - if (FRContext.getCurrentEnv() == null || !FRContext.getCurrentEnv().isRoot()) { - menuDef.addShortCut(new ConnectionListAction()); - return menuDef; - } - if (!BaseUtils.isAuthorityEditing()) { menuDef.addShortCut( new ConnectionListAction(), From 87718bd2263227d2b192189e147e54ea867ce7aa Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 25 Nov 2016 10:40:02 +0800 Subject: [PATCH 06/24] =?UTF-8?q?REPORT-841=20=E9=AA=8C=E6=94=B6=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/FormCreatorDropTarget.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java b/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java index 18ad2ab71c..6390b64f89 100644 --- a/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java +++ b/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java @@ -15,6 +15,7 @@ import com.fr.design.icon.IconPathConstants; import com.fr.design.utils.ComponentUtils; import com.fr.form.share.ShareLoader; import com.fr.form.ui.ElCaseBindInfo; +import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.SharableElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.general.Inter; @@ -79,6 +80,7 @@ public class FormCreatorDropTarget extends DropTarget { //SetSelection时要确保选中的是最顶层的布局 //tab布局添加的时候是初始化了XWCardLayout，实际上最顶层的布局是XWCardMainBorderLayout XCreator addingXCreator = addingModel.getXCreator(); + Widget widget = (addingXCreator.getTopLayout() != null) ? (addingXCreator.getTopLayout().toData()) : addingXCreator.toData(); if (addingXCreator.isShared()) { String shareId = addingXCreator.getShareId(); SharableElementCaseEditor sharableEditor = ShareLoader.getLoader().getSharedElCaseEditorById(shareId); @@ -86,10 +88,11 @@ public class FormCreatorDropTarget extends DropTarget { if (sharableEditor != null && bindInfo != null) { Map tdNameMap = TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).addTableData(bindInfo.getName(), sharableEditor.getTableDataSource()); //合并数据集之后,可能会有数据集名称变化，做一下联动 - sharableEditor.batchRenameTdName(tdNameMap); + //共享的组件拿的时候都是克隆的,这边改拖拽中克隆的对象而非新克隆对象,上面这个新克隆的对象只是为了拿数据集 + ElementCaseEditor elementCaseEditor = (ElementCaseEditor) widget; + elementCaseEditor.batchRenameTdName(tdNameMap); } } - Widget widget = (addingXCreator.getTopLayout() != null) ? (addingXCreator.getTopLayout().toData()) : addingXCreator.toData(); designer.getSelectionModel().setSelectedCreators( FormSelectionUtils.rebuildSelection(xCreator, new Widget[]{widget})); designer.getEditListenerTable().fireCreatorModified(addingModel.getXCreator(), DesignerEvent.CREATOR_ADDED); From 1f1904409a34e69be0482970d3f8ea797b4d65d0 Mon Sep 17 00:00:00 2001 From: fanglei <294531121> Date: Fri, 25 Nov 2016 14:15:59 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E5=AD=97=E6=AF=8D=E6=8B=BC=E9=94=99?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/report/mobile/MobileToolBarPane.java | 2 +- .../src/com/fr/design/form/mobile/MobileToolBarPane.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/report/mobile/MobileToolBarPane.java b/designer/src/com/fr/design/report/mobile/MobileToolBarPane.java index bea0745cb5..a365416614 100644 --- a/designer/src/com/fr/design/report/mobile/MobileToolBarPane.java +++ b/designer/src/com/fr/design/report/mobile/MobileToolBarPane.java @@ -65,6 +65,6 @@ public class MobileToolBarPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Mobile-Toolbar"); + return Inter.getLocText("FR-Designer_Mobile-ToolBar"); } } diff --git a/designer_form/src/com/fr/design/form/mobile/MobileToolBarPane.java b/designer_form/src/com/fr/design/form/mobile/MobileToolBarPane.java index c46c98ec27..1dddf42cfc 100644 --- a/designer_form/src/com/fr/design/form/mobile/MobileToolBarPane.java +++ b/designer_form/src/com/fr/design/form/mobile/MobileToolBarPane.java @@ -58,7 +58,7 @@ public class MobileToolBarPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Mobile-Toolbar"); + return Inter.getLocText("FR-Designer_Mobile-ToolBar"); } } From 7a1a7f9926a853e942c4e0e061e8dacce63400ba Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 25 Nov 2016 15:25:19 +0800 Subject: [PATCH 08/24] =?UTF-8?q?REPORT-842=20=E6=8A=A5=E8=A1=A8=E5=9D=97?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E5=9C=86=E8=A7=92=E8=BE=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creator/XBorderStyleWidgetCreator.java | 5 ++-- .../design/designer/creator/XElementCase.java | 4 +-- .../creator/XWAbsoluteBodyLayout.java | 2 +- .../fr/design/gui/xpane/LayoutBorderPane.java | 29 +++++++++++++++++-- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java b/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java index 61bd612ad6..07a61f0d4d 100644 --- a/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java +++ b/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java @@ -27,8 +27,7 @@ import com.fr.stable.StringUtils; */ public class XBorderStyleWidgetCreator extends XWidgetCreator{ - private int cornerSize = 15; - private int noneSize = 0; + private int noneSize = 0; protected static final Dimension BORDER_PREFERRED_SIZE = new Dimension(250, 150); @@ -59,7 +58,7 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{ protected void initBorderStyle() { LayoutBorderStyle style = toData().getBorderStyle(); if (style != null && style.getBorder() != Constants.LINE_NONE) { - this.setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.isCorner() ? cornerSize : noneSize)); + this.setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.isCorner() ? style.getRoundRadius() : noneSize)); } else { this.setBorder(DEFALUTBORDER); } diff --git a/designer_form/src/com/fr/design/designer/creator/XElementCase.java b/designer_form/src/com/fr/design/designer/creator/XElementCase.java index f2fa5cfa12..66e5adb163 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -84,7 +84,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme new CRPropertyDescriptor("widgetName", this.data.getClass()) .setI18NName(Inter.getLocText("Form-Widget_Name")), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( - WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName( + WLayoutBorderStyleEditor.class).setI18NName( Inter.getLocText("FR-Designer-Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -94,7 +94,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme } }), new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) - .setRendererClass(PaddingMarginCellRenderer.class).setI18NName(Inter.getLocText("FR-Layout_Padding")) + .setI18NName(Inter.getLocText("FR-Layout_Padding")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("showToolBar", this.data.getClass()).setEditorClass(BooleanEditor.class) .setI18NName(Inter.getLocText("Form-EC_toolbar")) diff --git a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java index e41ac8cba5..291a0f88d5 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java @@ -75,7 +75,7 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout { new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter .getLocText("FR-Designer_Form-Widget_Name")), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( - WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName( + WLayoutBorderStyleEditor.class).setI18NName( Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java index 45713c623e..9c4385b6ed 100644 --- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java @@ -19,6 +19,7 @@ import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.style.BackgroundNoImagePane; import com.fr.design.gui.style.BackgroundSpecialPane; import com.fr.design.gui.style.FRFontPane; @@ -67,7 +68,8 @@ public class LayoutBorderPane extends BasicPane { private UIComboBox borderStyleCombo; //边框粗细 private LineComboBox currentLineCombo; - + //边框圆角 + private UISpinner borderCornerSpinner; //边框颜色 private UIColorButton currentLineColorPane; //主体背景 @@ -136,7 +138,17 @@ public class LayoutBorderPane extends BasicPane { this.currentLineCombo = currentLineCombo; } - public UIColorButton getCurrentLineColorPane() { + + public UISpinner getBorderCornerSpinner() { + return borderCornerSpinner; + } + + public void setBorderCornerSpinner(UISpinner borderCornerSpinner) { + this.borderCornerSpinner = borderCornerSpinner; + } + + + public UIColorButton getCurrentLineColorPane() { return currentLineColorPane; } @@ -337,6 +349,7 @@ public class LayoutBorderPane extends BasicPane { this.borderStyleCombo = new UIComboBox(BORDER_STYLE); this.currentLineCombo = new LineComboBox(BORDER_LINE_STYLE_ARRAY); this.currentLineColorPane = new UIColorButton(null); + this.borderCornerSpinner = new UISpinner(0,1000,1,0); currentLineColorPane.setUI(getButtonUI(currentLineColorPane)); currentLineColorPane.set4ToolbarButton(); currentLineColorPane.setPreferredSize(new Dimension(20,20)); @@ -356,6 +369,7 @@ public class LayoutBorderPane extends BasicPane { {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Render_Style")), borderStyleCombo}, {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Border_Line")), currentLineCombo}, {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Border_Color")), buttonPane}, + {new UILabel(Inter.getLocText("plugin-ChartF_Radius")+":"),borderCornerSpinner}, {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, {new UILabel(""),new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Alpha"))}, {new UILabel(""),transparencyPane}, @@ -373,6 +387,7 @@ public class LayoutBorderPane extends BasicPane { protected JPanel initBodyRightTopPane(){ this.borderTypeCombo = new UIComboBox(BORDER_TYPE); this.borderStyleCombo = new UIComboBox(BORDER_STYLE); + this.borderCornerSpinner = new UISpinner(0,1000,1,0); this.currentLineCombo = new LineComboBox(BORDER_LINE_STYLE_ARRAY); this.currentLineColorPane = new UIColorButton(null); @@ -490,11 +505,12 @@ public class LayoutBorderPane extends BasicPane { LayoutBorderStyle style = new LayoutBorderStyle(); style.setType(borderTypeCombo.getSelectedIndex()); style.setBorderStyle(borderStyleCombo.getSelectedIndex()); + style.setRoundRadius((int)borderCornerSpinner.getValue()); style.setBorder(currentLineCombo.getSelectedLineStyle()); style.setColor(currentLineColorPane.getColor()); style.setBackground(backgroundPane.update()); style.setAlpha((float)(numberDragPane.updateBean()/maxNumber)); - + style.setCorner(true); WidgetTitle title = style.getTitle() == null ? new WidgetTitle() : style.getTitle(); title.setTextObject(formulaPane.updateBean()); FRFont frFont = title.getFrFont(); @@ -557,6 +573,13 @@ public class LayoutBorderPane extends BasicPane { paintPreviewPane(); } }); + this.borderCornerSpinner.setValue(borderStyle.getRoundRadius()); + this.borderCornerSpinner.addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + paintPreviewPane(); + } + }); this.currentLineCombo.setSelectedLineStyle(borderStyle.getBorder()); this.currentLineCombo.addItemListener(new ItemListener() { @Override From bb622b1fd718eb9c6f7dadbda81b150e647d5656 Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 25 Nov 2016 16:04:18 +0800 Subject: [PATCH 09/24] =?UTF-8?q?REPORT-842=20=E6=8A=A5=E8=A1=A8=E5=9D=97?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E5=9C=86=E8=A7=92=E8=BE=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/designer/creator/XBorderStyleWidgetCreator.java | 2 +- .../src/com/fr/design/gui/xpane/LayoutBorderPane.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java b/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java index 07a61f0d4d..1b532f7f99 100644 --- a/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java +++ b/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java @@ -58,7 +58,7 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{ protected void initBorderStyle() { LayoutBorderStyle style = toData().getBorderStyle(); if (style != null && style.getBorder() != Constants.LINE_NONE) { - this.setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.isCorner() ? style.getRoundRadius() : noneSize)); + this.setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.isCorner() ? style.getBorderRadius() : noneSize)); } else { this.setBorder(DEFALUTBORDER); } diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java index 9c4385b6ed..1a1dd071ce 100644 --- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java @@ -505,7 +505,7 @@ public class LayoutBorderPane extends BasicPane { LayoutBorderStyle style = new LayoutBorderStyle(); style.setType(borderTypeCombo.getSelectedIndex()); style.setBorderStyle(borderStyleCombo.getSelectedIndex()); - style.setRoundRadius((int)borderCornerSpinner.getValue()); + style.setBorderRadius((int)borderCornerSpinner.getValue()); style.setBorder(currentLineCombo.getSelectedLineStyle()); style.setColor(currentLineColorPane.getColor()); style.setBackground(backgroundPane.update()); @@ -573,7 +573,7 @@ public class LayoutBorderPane extends BasicPane { paintPreviewPane(); } }); - this.borderCornerSpinner.setValue(borderStyle.getRoundRadius()); + this.borderCornerSpinner.setValue(borderStyle.getBorderRadius()); this.borderCornerSpinner.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { From 5ca2af057fba416e658388661e5c613d32f9ea6f Mon Sep 17 00:00:00 2001 From: kerry Date: Sat, 26 Nov 2016 14:31:59 +0800 Subject: [PATCH 10/24] =?UTF-8?q?REPORT-842=20=E6=8A=A5=E8=A1=A8=E5=BF=AB?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E5=9C=86=E8=A7=92=E8=BE=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/designer/creator/XElementCase.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/creator/XElementCase.java b/designer_form/src/com/fr/design/designer/creator/XElementCase.java index 66e5adb163..543762ba21 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -100,20 +100,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme .setI18NName(Inter.getLocText("Form-EC_toolbar")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }; - - //这边有个插件兼容问题,之后还是要改回process才行 - Set set = ExtraDesignClassManager.getInstance().getArray(AbstractFormElementCaseEditorProvider.MARK_STRING); - for (FormElementCaseEditorProvider provider : set) { - if (provider == null) { - continue; - } - this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); - FormProvider formProvider = designer.getTarget(); - ElementCaseEditorProvider elementCaseEditorProvider = this.toData(); - PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), formProvider, elementCaseEditorProvider); - propertyTableEditor = (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); - } - + resolveCompatible(propertyTableEditor); FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getSingle(FormElementCaseEditorProcessor.MARK_STRING); if (processor == null) { return propertyTableEditor; @@ -131,10 +118,25 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme if (editor.getReportFitAttr() == null) { editor.setReportFitInPc(processor.getFitStateInPC(fitAttr)); } - return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); } + + private void resolveCompatible (CRPropertyDescriptor[] propertyTableEditor) { + //这边有个插件兼容问题,之后还是要改回process才行 + Set set = ExtraDesignClassManager.getInstance().getArray(AbstractFormElementCaseEditorProvider.MARK_STRING); + for (FormElementCaseEditorProvider provider : set) { + if (provider == null) { + continue; + } + this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + FormProvider formProvider = designer.getTarget(); + ElementCaseEditorProvider elementCaseEditorProvider = this.toData(); + PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), formProvider, elementCaseEditorProvider); + propertyTableEditor = (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); + } + } + @Override protected String getIconName() { return "text_field_16.png"; From cfb08a1d0a28a89ae5e48046531b43b6ce49bc7d Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 28 Nov 2016 11:09:12 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E5=B0=86=E5=8E=9F=E5=85=88=E7=9A=84?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=86=E8=A7=92=E5=B1=9E=E6=80=A7=E6=8D=A2?= =?UTF-8?q?=E6=88=90=E5=9C=86=E8=A7=92=E5=8D=8A=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/creator/XBorderStyleWidgetCreator.java | 8 +++----- .../com/fr/design/gui/xpane/LayoutBorderPane.java | 12 ++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java b/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java index 1b532f7f99..5fb559fc4d 100644 --- a/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java +++ b/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java @@ -27,8 +27,6 @@ import com.fr.stable.StringUtils; */ public class XBorderStyleWidgetCreator extends XWidgetCreator{ - private int noneSize = 0; - protected static final Dimension BORDER_PREFERRED_SIZE = new Dimension(250, 150); public XBorderStyleWidgetCreator(Widget widget, Dimension initSize) { @@ -58,7 +56,7 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{ protected void initBorderStyle() { LayoutBorderStyle style = toData().getBorderStyle(); if (style != null && style.getBorder() != Constants.LINE_NONE) { - this.setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.isCorner() ? style.getBorderRadius() : noneSize)); + this.setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.getBorderRadius())); } else { this.setBorder(DEFALUTBORDER); } @@ -108,8 +106,8 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{ //标题的边框样式目前是取对应的控件的边框样式 title.setBorder(style.getBorder()); title.setColor(style.getColor()); - title.setCorner(style.isCorner()); - +// title.setCorner(style.isCorner()); + WidgetTitle wTitle = style.getTitle(); //设置成随机不重复的, 不然都用一个名字的话, 联动只能联动一个 title.setWidgetName(wTitle.TITLE_NAME_INDEX + this.toData().getWidgetName()); diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java index 1a1dd071ce..26f407702d 100644 --- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java @@ -58,6 +58,7 @@ public class LayoutBorderPane extends BasicPane { private static final int RIGHTANGLE_BORDERS = 1; private static final int ROUNDED_BORDERS = 2; private static final int MAX_WIDTH = 220; + private static final int NO_RADIUS = 0; private LayoutBorderStyle borderStyle = new LayoutBorderStyle(); @@ -362,7 +363,7 @@ public class LayoutBorderPane extends BasicPane { transparencyPane.add(new UILabel(" %"), BorderLayout.EAST); double p = TableLayout.PREFERRED; - double[] rowSize = {p,p,p,p,p,p,p}; + double[] rowSize = {p,p,p,p,p,p,p,p}; double[] columnSize = { p, MAX_WIDTH}; JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Frame_Style")), borderTypeCombo}, @@ -510,7 +511,6 @@ public class LayoutBorderPane extends BasicPane { style.setColor(currentLineColorPane.getColor()); style.setBackground(backgroundPane.update()); style.setAlpha((float)(numberDragPane.updateBean()/maxNumber)); - style.setCorner(true); WidgetTitle title = style.getTitle() == null ? new WidgetTitle() : style.getTitle(); title.setTextObject(formulaPane.updateBean()); FRFont frFont = title.getFrFont(); @@ -774,9 +774,9 @@ public class LayoutBorderPane extends BasicPane { public void populate(LayoutBorderStyle style) { if(style.getBorder() == Constants.LINE_NONE) { group.setSelected(noBorder.getModel(), true); - } else if(style.isCorner()) { - group.setSelected(RoundedBorder.getModel(), true); - } else { + } else if(style.getBorderRadius() != NO_RADIUS) { + group.setSelected(RoundedBorder.getModel(), true); + } else { group.setSelected(normalBorder.getModel(), true); } } @@ -817,7 +817,7 @@ public class LayoutBorderPane extends BasicPane { } else { borderStyle.setColor(currentLineColorPane.getColor()); borderStyle.setBorder(currentLineCombo.getSelectedLineStyle()); - borderStyle.setCorner(border != RIGHTANGLE_BORDERS); + borderStyle.setBorderRadius((int)borderCornerSpinner.getValue()); } layoutBorderPreviewPane.repaint(); From 602dfc2de13ed260779397cc2aa0f66ff3f3793d Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 28 Nov 2016 15:22:50 +0800 Subject: [PATCH 12/24] =?UTF-8?q?REPORT-875=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E5=90=8E,=20=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E7=BB=99=E4=B8=AA=E6=8F=90=E7=A4=BA,=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=87=8D=E5=90=AF,=20=E5=B0=B1=E8=B7=9F=E8=A3=85?= =?UTF-8?q?=E5=AE=8C=E6=8F=92=E4=BB=B6=E4=B8=80=E6=A0=B7.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/file/PreferencePane.java | 75 +++++++++++++++++++ .../src/com/fr/design/dialog/BasicDialog.java | 4 +- .../com/fr/design/locale/designer.properties | 3 +- .../design/locale/designer_en_US.properties | 3 +- .../design/locale/designer_zh_CN.properties | 3 +- .../design/locale/designer_zh_TW.properties | 3 +- 6 files changed, 85 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index c3944afd13..6de8d60e81 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -1,10 +1,13 @@ package com.fr.design.actions.file; import com.fr.base.BaseUtils; +import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; +import com.fr.design.RestartHelper; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.dialog.DialogActionListener; import com.fr.design.editor.editor.IntegerEditor; import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.ibutton.UIButton; @@ -78,6 +81,7 @@ public class PreferencePane extends BasicPane { getLocaledLanguage("Traditional_Chinese_Language", Locale.TRADITIONAL_CHINESE), getLocaledLanguage("Korea_Language",Locale.KOREA), }; + private static int designerEnvLanguageIndex; // 打开设置对话框时，设计器使用的语言 //设置是否支持undo private UICheckBox supportUndoCheckBox; @@ -527,6 +531,7 @@ public class PreferencePane extends BasicPane { this.logLevelComboBox.setSelectedItem(FRLevel.getByLevel(designerEnvManager.getLogLevel())); this.languageComboBox.setSelectedItem(LANGUAGE[designerEnvManager.getLanguage()]); + designerEnvLanguageIndex = designerEnvManager.getLanguage(); this.pageLengthComboBox.setSelectedIndex(designerEnvManager.getPageLengthUnit()); this.reportLengthComboBox.setSelectedIndex(designerEnvManager.getReportLengthUnit()); @@ -621,4 +626,74 @@ public class PreferencePane extends BasicPane { } return l; } + + /** + * 显示窗口 + * + * @param window 窗口 + * @param l 对话框监听器 + * @return 对话框 + */ + @Override + public BasicDialog showWindow(Window window, DialogActionListener l) { + BasicDialog dg; + if (window instanceof Frame) { + dg = new DIALOG((Frame) window); + } else { + dg = new DIALOG((Dialog) window); + } + + if (l != null) { + dg.addDialogActionListener(l); + } + + dg.setBasicDialogSize(BasicDialog.DEFAULT); + GUICoreUtils.centerWindow(dg); + dg.setResizable(false); + return dg; + } + + private class DIALOG extends BasicDialog { + public DIALOG(Frame parent) { + super(parent, PreferencePane.this); + this.setTitle(PreferencePane.this.title4PopupWindow()); + } + + public DIALOG(Dialog parent) { + super(parent, PreferencePane.this); + this.setTitle(PreferencePane.this.title4PopupWindow()); + } + + /** + * 确定操作 + * + */ + @Override + public void doOK() { + super.doOK(); + if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) { + int rv = JOptionPane.showOptionDialog( + null, + Inter.getLocText("FR-Designer-Language_Change_Successful"), + Inter.getLocText("FR-Designer-Plugin_Warning"), + JOptionPane.YES_NO_OPTION, + JOptionPane.INFORMATION_MESSAGE, + null, + new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, + null + ); + if (rv == JOptionPane.OK_OPTION) { + RestartHelper.restart(); + } + } + } + + /** + * Check valid. + */ + public void checkValid() throws Exception { + PreferencePane.this.checkValid(); + } + + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/dialog/BasicDialog.java b/designer_base/src/com/fr/design/dialog/BasicDialog.java index 703b192055..b2246dbc6c 100644 --- a/designer_base/src/com/fr/design/dialog/BasicDialog.java +++ b/designer_base/src/com/fr/design/dialog/BasicDialog.java @@ -39,11 +39,11 @@ public abstract class BasicDialog extends UIDialog { super(parent, pane, isNeedButtonPane); } - protected void setBasicDialogSize(Dimension d) { + public void setBasicDialogSize(Dimension d) { super.setSize(d.width, d.height); } - protected void setBasicDialogSize(int w, int h) { + public void setBasicDialogSize(int w, int h) { super.setSize(w, h); } diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index bcc777385c..27615ac778 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account= FR-Designer-BBSLogin_Connection-Failure= FR-Designer-BBSLogin_Connection-Failure-Tip= @@ -471,3 +471,4 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips= FR-Designer_Reset= FR-Designer_Add_all= +FR-Designer-Language_Change_Successful= diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index d3e02f0072..21bb7d2d8e 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=User name FR-Designer-BBSLogin_Connection-Failure=Connection failure, check your network status FR-Designer-BBSLogin_Connection-Failure-Tip=Tip @@ -470,3 +470,4 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips=Freestyle layout, add control in any position of the layout FR-Designer_Reset=reset FR-Designer_Add_all=Add all +FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 8ee044e6e7..1d92c5219a 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D FR-Designer-BBSLogin_Connection-Failure=\u7F51\u7EDC\u8FDE\u63A5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u5F53\u524D\u7F51\u7EDC\u72B6\u6001 FR-Designer-BBSLogin_Connection-Failure-Tip=\u63D0\u793A @@ -474,3 +474,4 @@ FR-Designer_Mobile-Refresh=\u5237\u65B0 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5185\u4EFB\u610F\u4F4D\u7F6E\u6DFB\u52A0\u63A7\u4EF6 FR-Designer_Reset=\u53D6\u6D88\u5220\u9664 FR-Designer_Add_all=\u5168\u90E8\u6DFB\u52A0 +FR-Designer-Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 551ff97ef5..8844b1cb4b 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u767B\u5165\u5E33\u865F FR-Designer-BBSLogin_Connection-Failure=\u767B\u5165\u9023\u63A5\u5931\u6557\uFF0C\u8ACB\u6AA2\u67E5\u7576\u524D\u7DB2\u8DEF\u72C0\u614B FR-Designer-BBSLogin_Connection-Failure-Tip=\u9023\u7DDA\u5931\u6557\u63D0\u793A @@ -463,3 +463,4 @@ FR-Designer_Mobile-ToolBar=\u5DE5\u5177\u6B04 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5167\u4EFB\u610F\u4F4D\u7F6E\u65B0\u589E\u63A7\u5236\u9805 FR-Designer_Reset= FR-Designer_Add_all=\u5168\u90E8\u65B0\u589E +FR-Designer-Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 From 5c9c82c4f6165a416b2533df8078b1630aed0d5e Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 28 Nov 2016 15:44:36 +0800 Subject: [PATCH 13/24] =?UTF-8?q?REPORT-747=20=E4=B9=8B=E5=89=8D=E6=B2=A1?= =?UTF-8?q?=E8=80=83=E8=99=91=E4=B8=8D=E5=90=8C=E6=A8=A1=E6=9D=BF=E4=B9=8B?= =?UTF-8?q?=E9=97=B4=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/clipboard/CellElementsClip.java | 47 +++++++++++-------- designer/src/com/fr/grid/GridUtils.java | 2 +- .../com/fr/grid/selection/CellSelection.java | 12 ++++- 3 files changed, 38 insertions(+), 23 deletions(-) diff --git a/designer/src/com/fr/design/cell/clipboard/CellElementsClip.java b/designer/src/com/fr/design/cell/clipboard/CellElementsClip.java index 44621af89d..64d649d3d3 100644 --- a/designer/src/com/fr/design/cell/clipboard/CellElementsClip.java +++ b/designer/src/com/fr/design/cell/clipboard/CellElementsClip.java @@ -12,27 +12,32 @@ import com.fr.report.cell.CellElement; import com.fr.report.cell.CellElementComparator; import com.fr.report.cell.TemplateCellElement; import com.fr.report.elementcase.TemplateElementCase; +import com.fr.stable.unit.FU; /** * The clip of CellElement. */ public class CellElementsClip implements Cloneable, java.io.Serializable { - private int column; - private int row; private int columnSpan = 0; private int rowSpan = 0; - + private FU[] columnWidth; + private FU[] rowHeight; private TemplateCellElement[] clips; - public CellElementsClip(int column, int row, int columnSpan, int rowSpan, TemplateCellElement[] clips) { - this.column = column; - this.row = row; + public CellElementsClip(int columnSpan, int rowSpan, FU[] columnWidth , FU[] rowHeight, TemplateCellElement[] clips) { this.columnSpan = columnSpan; this.rowSpan = rowSpan; - + this.columnWidth = columnWidth ; + this.rowHeight = rowHeight; this.clips = clips; } - + + public CellElementsClip(int columnSpan, int rowSpan, TemplateCellElement[] clips) { + this.columnSpan = columnSpan; + this.rowSpan = rowSpan; + this.clips = clips; + } + public String compateExcelPaste() { Arrays.sort(this.clips, CellElementComparator.getRowFirstComparator()); @@ -63,9 +68,9 @@ public class CellElementsClip implements Cloneable, java.io.Serializable { return sbuf.toString(); } - + public CellSelection pasteAt(TemplateElementCase ec, int column, int row) { - + Iterator cells = ec.intersect(column, row, columnSpan, rowSpan); while (cells.hasNext()) { TemplateCellElement cellElement = (TemplateCellElement)cells.next(); @@ -79,28 +84,30 @@ public class CellElementsClip implements Cloneable, java.io.Serializable { FRContext.getLogger().error(e.getMessage(), e); return null; } - + // peter:因为前面已经将这个位置的元素删除了,所以不需要override了. ec.addCellElement((TemplateCellElement) cellElement.deriveCellElement( - column + cellElement.getColumn(), row + cellElement.getRow() + column + cellElement.getColumn(), row + cellElement.getRow() ), false); } //设置单元格的宽高 - pasteWidthAndHeight(ec, column, row, columnSpan, rowSpan); + if(this.columnWidth != null && this.rowHeight != null){ + pasteWidthAndHeight(ec, column, row, columnSpan, rowSpan); + } return new CellSelection(column, row, columnSpan, rowSpan); } public void pasteWidthAndHeight(TemplateElementCase ec, int column, int row, int columnSpan, int rowSpan){ - for(int i = 0; i Date: Mon, 28 Nov 2016 15:50:24 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89SQL=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE=E9=9B=86=E6=80=BB=E8=A1=8C=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabledatapane/DBTableDataPane.java | 165 +++++++++++------- 1 file changed, 98 insertions(+), 67 deletions(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index b0fba71c96..81a50d2ac2 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -57,7 +57,8 @@ public class DBTableDataPane extends AbstractTableDataPane { private UICheckBox isShareCheckBox; private MaxMemRowCountPanel maxPanel; private String pageQuery = null; - + private String customCountQuery = null; + public DBTableDataPane() { this.setLayout(new BorderLayout(4, 4)); @@ -134,23 +135,24 @@ public class DBTableDataPane extends AbstractTableDataPane { this.add(mainSplitPane, BorderLayout.CENTER); } - private boolean isPreviewOrRefreshButton (FocusEvent e) { - if (e.getOppositeComponent() != null) { - String name = e.getOppositeComponent().getName(); - return ComparatorUtils.equals(name, PREVIEW_BUTTON) || ComparatorUtils.equals(name, REFRESH_BUTTON); - } - return false; - } + private boolean isPreviewOrRefreshButton (FocusEvent e) { + if (e.getOppositeComponent() != null) { + String name = e.getOppositeComponent().getName(); + return ComparatorUtils.equals(name, PREVIEW_BUTTON) || ComparatorUtils.equals(name, REFRESH_BUTTON); + } + return false; + } @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-DS-Database_Query"); + return Inter.getLocText("DS-Database_Query"); } private void refresh() { - String[] paramTexts = new String[2]; + String[] paramTexts = new String[3]; paramTexts[0] = sqlTextPane.getText(); paramTexts[1] = pageQuery; + paramTexts[2] = customCountQuery; List existParameterList = editorPane.update(); Parameter[] ps = existParameterList == null ? new Parameter[0] : existParameterList.toArray(new Parameter[existParameterList.size()]); @@ -164,9 +166,11 @@ public class DBTableDataPane extends AbstractTableDataPane { toolBarDef.addShortCut(new PreviewAction()); toolBarDef.addShortCut(SeparatorDef.DEFAULT); toolBarDef.addShortCut(new EditPageQueryAction()); - isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData")); + toolBarDef.addShortCut(SeparatorDef.DEFAULT); + toolBarDef.addShortCut(new EditCustomCountQueryAction()); + isShareCheckBox = new UICheckBox(Inter.getLocText("Is_Share_DBTableData")); maxPanel = new MaxMemRowCountPanel(); - maxPanel.setBorder(null); + maxPanel.setBorder(null); UIToolbar editToolBar = ToolBarDef.createJToolBar(); toolBarDef.updateToolBar(editToolBar); editToolBar.add(isShareCheckBox); @@ -175,9 +179,10 @@ public class DBTableDataPane extends AbstractTableDataPane { } private void checkParameter() { - String[] paramTexts = new String[2]; + String[] paramTexts = new String[3]; paramTexts[0] = sqlTextPane.getText(); paramTexts[1] = pageQuery; + paramTexts[2] = customCountQuery; Parameter[] parameters = ParameterHelper.analyze4Parameters(paramTexts, false); @@ -222,6 +227,7 @@ public class DBTableDataPane extends AbstractTableDataPane { isShare = dbtabledata.isShare(); maxMemeryRow = dbtabledata.getMaxMemRowCount(); this.pageQuery = dbtabledata.getPageQuerySql(); + this.customCountQuery = dbtabledata.getCustomCountQuery(); this.connectionTableProcedurePane.setSelectedDatabaseConnection(db); this.sqlTextPane.setText(query); @@ -258,6 +264,7 @@ public class DBTableDataPane extends AbstractTableDataPane { dbTableData.setShare(isShareCheckBox.isSelected()); dbTableData.setMaxMemRowCount(maxPanel.getValue()); dbTableData.setPageQuerySql(this.pageQuery); + dbTableData.setCustomCountQuery(this.customCountQuery); return dbTableData; } @@ -285,64 +292,88 @@ public class DBTableDataPane extends AbstractTableDataPane { } public void actionPerformed(ActionEvent evt) { - checkParameter(); - PreviewTablePane.previewTableData(DBTableDataPane.this.updateBean()); + checkParameter(); + PreviewTablePane.previewTableData(DBTableDataPane.this.updateBean()); + } + } + + private class EditCustomCountQueryAction extends UpdateAction { + public EditCustomCountQueryAction() { + this.setName(Inter.getLocText("FR-Designer-LayerPageReport_CustomCountQuery")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png")); + } + + @Override + public void actionPerformed(ActionEvent e) { + final QueryPane editPane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_CustomCountQuery")); + editPane.populate(customCountQuery); + BasicDialog dialog = editPane.showWindow(DesignerContext.getDesignerFrame()); + dialog.addDialogActionListener(new DialogActionAdapter() { + public void doOk() { + customCountQuery = editPane.update(); + checkParameter(); + } + }); + dialog.setVisible(true); + + } + } + + private class EditPageQueryAction extends UpdateAction { + public EditPageQueryAction() { + this.setName(Inter.getLocText("FR-Designer-LayerPageReport_PageQuery")); + this.setMnemonic('L'); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png")); + } + + public void actionPerformed(ActionEvent e) { + final QueryPane pane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_PageQuerySQL")); + pane.populate(pageQuery); + BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame()); + dialog.addDialogActionListener(new DialogActionAdapter() { + public void doOk() { + pageQuery = pane.update(); + checkParameter(); + } + }); + dialog.setVisible(true); } } - - private class EditPageQueryAction extends UpdateAction { - public EditPageQueryAction() { - this.setName(Inter.getLocText("FR-Designer-LayerPageReport_PageQuery")); - this.setMnemonic('L'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png")); - } - - public void actionPerformed(ActionEvent e) { - final PageQueryPane pane = new PageQueryPane(); - pane.populate(pageQuery); - BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame()); - dialog.addDialogActionListener(new DialogActionAdapter() { - public void doOk() { - pageQuery = pane.update(); - checkParameter(); - } - }); - dialog.setVisible(true); - } - } - - private class PageQueryPane extends BasicPane { - private SQLEditPane pageQueryPane; - - public PageQueryPane() { - this.initComponents(); - } - - public void initComponents() { - this.setLayout(new BorderLayout()); - pageQueryPane = new SQLEditPane(); - this.add(new JScrollPane(pageQueryPane)); - } - - public void populate(String text) { - if (StringUtils.isBlank(text)) { - return; - } - pageQueryPane.setText(text); - } - - public String update() { - String text = pageQueryPane.getText(); - if (StringUtils.isBlank(text)) { - return null; - } else { - return text; - } - } + + private class QueryPane extends BasicPane { + private SQLEditPane pageQueryPane; + private String title; + + public QueryPane(String title) { + this.title = title; + this.initComponents(); + } + + public void initComponents() { + this.setLayout(new BorderLayout()); + pageQueryPane = new SQLEditPane(); + this.add(new JScrollPane(pageQueryPane)); + } + + public void populate(String text) { + if (StringUtils.isBlank(text)) { + return; + } + pageQueryPane.setText(text); + } + + public String update() { + String text = pageQueryPane.getText(); + if (StringUtils.isBlank(text)) { + return null; + } else { + return text; + } + } @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-LayerPageReport_Define_PageQuerySQL"); + return title; } - } + } } \ No newline at end of file From a72ce46cc96155e22026e056b11c961eba86fcbf Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 28 Nov 2016 16:12:21 +0800 Subject: [PATCH 15/24] rt --- .../tabledatapane/DBTableDataPane.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index 81a50d2ac2..553e6814c0 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -145,7 +145,7 @@ public class DBTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("DS-Database_Query"); + return Inter.getLocText("FR-Designer-DS-Database_Query"); } private void refresh() { @@ -168,7 +168,7 @@ public class DBTableDataPane extends AbstractTableDataPane { toolBarDef.addShortCut(new EditPageQueryAction()); toolBarDef.addShortCut(SeparatorDef.DEFAULT); toolBarDef.addShortCut(new EditCustomCountQueryAction()); - isShareCheckBox = new UICheckBox(Inter.getLocText("Is_Share_DBTableData")); + isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData")); maxPanel = new MaxMemRowCountPanel(); maxPanel.setBorder(null); UIToolbar editToolBar = ToolBarDef.createJToolBar(); @@ -297,46 +297,46 @@ public class DBTableDataPane extends AbstractTableDataPane { } } - private class EditCustomCountQueryAction extends UpdateAction { - public EditCustomCountQueryAction() { - this.setName(Inter.getLocText("FR-Designer-LayerPageReport_CustomCountQuery")); + private class EditPageQueryAction extends UpdateAction { + public EditPageQueryAction() { + this.setName(Inter.getLocText("FR-Designer-LayerPageReport_PageQuery")); + this.setMnemonic('L'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png")); } - @Override public void actionPerformed(ActionEvent e) { - final QueryPane editPane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_CustomCountQuery")); - editPane.populate(customCountQuery); - BasicDialog dialog = editPane.showWindow(DesignerContext.getDesignerFrame()); + final QueryPane pane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_PageQuerySQL")); + pane.populate(pageQuery); + BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame()); dialog.addDialogActionListener(new DialogActionAdapter() { public void doOk() { - customCountQuery = editPane.update(); + pageQuery = pane.update(); checkParameter(); } }); dialog.setVisible(true); - } } - private class EditPageQueryAction extends UpdateAction { - public EditPageQueryAction() { - this.setName(Inter.getLocText("FR-Designer-LayerPageReport_PageQuery")); - this.setMnemonic('L'); + private class EditCustomCountQueryAction extends UpdateAction { + public EditCustomCountQueryAction() { + this.setName(Inter.getLocText("FR-Designer-LayerPageReport_CustomCountQuery")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png")); } + @Override public void actionPerformed(ActionEvent e) { - final QueryPane pane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_PageQuerySQL")); - pane.populate(pageQuery); - BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame()); + final QueryPane editPane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_CustomCountQuery")); + editPane.populate(customCountQuery); + BasicDialog dialog = editPane.showWindow(DesignerContext.getDesignerFrame()); dialog.addDialogActionListener(new DialogActionAdapter() { public void doOk() { - pageQuery = pane.update(); + customCountQuery = editPane.update(); checkParameter(); } }); dialog.setVisible(true); + } } From fe2996616ec38b0f7b3aec2e2f4099ef1056ad06 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 28 Nov 2016 16:21:05 +0800 Subject: [PATCH 16/24] =?UTF-8?q?REPORT-875=20=E4=BF=AE=E6=94=B9=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E6=96=87=E4=BB=B6=EF=BC=8C=E5=8A=A0=E5=85=A5?= =?UTF-8?q?FR-Designer-Language=5FChange=5FSuccessful?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/locale/designer.properties | 2 +- .../src/com/fr/design/locale/designer_ja_JP.properties | 3 ++- .../src/com/fr/design/locale/designer_ko_KR.properties | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 27615ac778..144903763c 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -471,4 +471,4 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips= FR-Designer_Reset= FR-Designer_Add_all= -FR-Designer-Language_Change_Successful= +FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted\ \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index ca4a6d066d..b06bbf0e30 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u30E6\u30FC\u30B6\u30FC\u540D FR-Designer-BBSLogin_Connection-Failure=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u73FE\u5728\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u72B6\u614B\u3092\u691C\u67FB\u3057\u3066\u304F\u3060\u3055\u3044 FR-Designer-BBSLogin_Connection-Failure-Tip=\u30D2\u30F3\u30C8 @@ -448,3 +448,4 @@ FR-Designer_Mobile-Refresh= FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059\u3002\u914D\u7F6E\u5185\u306E\u4EFB\u610F\u306E\u4F4D\u7F6E\u306B\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068 FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0 +FR-Designer-Language_Change_Successful= \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 7c434320cd..ed5ad41bfd 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D FR-Designer-BBSLogin_Connection-Failure=\uB124\uD2B8\uC6CC\uD06C\uB9C1\uD06C\uC2E4\uD328.\uD604\uC7AC\uB124\uD2B8\uC6CC\uD06C\uC0C1\uD0DC\uB97C\uAC80\uC0AC\uD574\uC8FC\uC2ED\uC2DC\uC624. FR-Designer-BBSLogin_Connection-Failure-Tip=\uC54C\uB9BC @@ -444,3 +444,4 @@ FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3\uC740\uB808\uC774\uC544\uC6C3\uC548\uC5D0\uC11C\uC5B4\uB290\uC704\uCE58\uC5D0\uB3C4\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB97C\uCD94\uAC00\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00 FR-Designer_Reset= +FR-Designer-Language_Change_Successful= \ No newline at end of file From c0892fd1f7ab3584a05264a6dcb51869c43279f2 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 09:41:32 +0800 Subject: [PATCH 17/24] =?UTF-8?q?REPORT-875=E3=80=82=E5=B0=86setBasicDialo?= =?UTF-8?q?gSize=E6=96=B9=E6=B3=95=E7=9A=84=E8=AE=BF=E9=97=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=94=B9=E5=9B=9Eprotected?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/file/PreferencePane.java | 6 +----- .../src/com/fr/design/dialog/BasicDialog.java | 4 ++-- .../src/com/fr/design/dialog/BasicPane.java | 13 +++++++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index 6de8d60e81..0557eb5875 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -646,11 +646,7 @@ public class PreferencePane extends BasicPane { if (l != null) { dg.addDialogActionListener(l); } - - dg.setBasicDialogSize(BasicDialog.DEFAULT); - GUICoreUtils.centerWindow(dg); - dg.setResizable(false); - return dg; + return showWindow(dg); } private class DIALOG extends BasicDialog { diff --git a/designer_base/src/com/fr/design/dialog/BasicDialog.java b/designer_base/src/com/fr/design/dialog/BasicDialog.java index b2246dbc6c..703b192055 100644 --- a/designer_base/src/com/fr/design/dialog/BasicDialog.java +++ b/designer_base/src/com/fr/design/dialog/BasicDialog.java @@ -39,11 +39,11 @@ public abstract class BasicDialog extends UIDialog { super(parent, pane, isNeedButtonPane); } - public void setBasicDialogSize(Dimension d) { + protected void setBasicDialogSize(Dimension d) { super.setSize(d.width, d.height); } - public void setBasicDialogSize(int w, int h) { + protected void setBasicDialogSize(int w, int h) { super.setSize(w, h); } diff --git a/designer_base/src/com/fr/design/dialog/BasicPane.java b/designer_base/src/com/fr/design/dialog/BasicPane.java index 9bc96f6439..eb1b413055 100644 --- a/designer_base/src/com/fr/design/dialog/BasicPane.java +++ b/designer_base/src/com/fr/design/dialog/BasicPane.java @@ -52,6 +52,19 @@ public abstract class BasicPane extends JPanel { return dg; } + /** + * 显示窗口 + * + * @param dg 已添加监听器的对话框实例 + * @return 对话框 + */ + public BasicDialog showWindow(BasicDialog dg) { + dg.setBasicDialogSize(BasicDialog.DEFAULT); + GUICoreUtils.centerWindow(dg); + dg.setResizable(false); + return dg; + } + /** * 显示窗口 * From 894d5bdb18595bcf7e902fa3b433f8651664a557 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 09:51:07 +0800 Subject: [PATCH 18/24] =?UTF-8?q?REPORT-748=20=E6=A8=A1=E6=9D=BF>=E6=A8=A1?= =?UTF-8?q?=E6=9D=BFWeb=E5=B1=9E=E6=80=A7=E7=82=B9=E8=BF=9B=E5=8E=BB?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E5=BC=B9=E5=87=BA=E7=AA=97=E5=8F=A3=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=8D=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/webattr/ReportWebAttrPane.java | 2 +- designer_base/src/com/fr/design/locale/designer.properties | 3 ++- .../src/com/fr/design/locale/designer_en_US.properties | 1 + .../src/com/fr/design/locale/designer_ja_JP.properties | 3 ++- .../src/com/fr/design/locale/designer_ko_KR.properties | 3 ++- .../src/com/fr/design/locale/designer_zh_CN.properties | 1 + .../src/com/fr/design/locale/designer_zh_TW.properties | 2 +- 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java index 6330ee87fd..ed1079f929 100644 --- a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java +++ b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java @@ -58,7 +58,7 @@ public class ReportWebAttrPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("ReportD-Report_Web_Attributes"); + return Inter.getLocText("FR-Designer-Template_Web_Attributes"); } public void populate(ReportWebAttr reportWebAttr) { diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 144903763c..751e14b11b 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -471,4 +471,5 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips= FR-Designer_Reset= FR-Designer_Add_all= -FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted\ \ No newline at end of file +FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted +FR-Designer-Template_Web_Attributes=Web Attributes diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 21bb7d2d8e..da00526cfc 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -471,3 +471,4 @@ FR-Designer_WLayout-Absolute-ToolTips=Freestyle layout, add control in any posit FR-Designer_Reset=reset FR-Designer_Add_all=Add all FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted +FR-Designer-Template_Web_Attributes=Web Attributes diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index b06bbf0e30..255abf73ce 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -448,4 +448,5 @@ FR-Designer_Mobile-Refresh= FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059\u3002\u914D\u7F6E\u5185\u306E\u4EFB\u610F\u306E\u4F4D\u7F6E\u306B\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068 FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0 -FR-Designer-Language_Change_Successful= \ No newline at end of file +FR-Designer-Language_Change_Successful= +FR-Designer-Template_Web_Attributes= diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index ed5ad41bfd..5ea4a3ab6b 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -444,4 +444,5 @@ FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3\uC740\uB808\uC774\uC544\uC6C3\uC548\uC5D0\uC11C\uC5B4\uB290\uC704\uCE58\uC5D0\uB3C4\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB97C\uCD94\uAC00\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00 FR-Designer_Reset= -FR-Designer-Language_Change_Successful= \ No newline at end of file +FR-Designer-Language_Change_Successful= +FR-Designer-Template_Web_Attributes= diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 1d92c5219a..6e837afbed 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -475,3 +475,4 @@ FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF FR-Designer_Reset=\u53D6\u6D88\u5220\u9664 FR-Designer_Add_all=\u5168\u90E8\u6DFB\u52A0 FR-Designer-Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 +FR-Designer-Template_Web_Attributes=\u6A21\u677FWeb\u5C5E\u6027 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 8844b1cb4b..7b81457f0e 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -461,6 +461,6 @@ FR-Designer_Attr_Bidirectional_Adaptive= FR-Designer_Mobile-Refresh=\u5237\u65B0 FR-Designer_Mobile-ToolBar=\u5DE5\u5177\u6B04 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5167\u4EFB\u610F\u4F4D\u7F6E\u65B0\u589E\u63A7\u5236\u9805 -FR-Designer_Reset= FR-Designer_Add_all=\u5168\u90E8\u65B0\u589E FR-Designer-Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 +FR-Designer-Template_Web_Attributes=\u5831\u8868Web\u5C6C\u6027 From 72337a2dbe322ee988223b32e5cd527ee6776b70 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 11:52:28 +0800 Subject: [PATCH 19/24] =?UTF-8?q?REPORT-875=20=E4=BF=AE=E6=94=B9=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=8B=B7=E8=B4=9D=E8=BF=87=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/file/PreferencePane.java | 80 +++++-------------- 1 file changed, 19 insertions(+), 61 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index 0557eb5875..4aadbf4d23 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -627,69 +627,27 @@ public class PreferencePane extends BasicPane { return l; } - /** - * 显示窗口 - * - * @param window 窗口 - * @param l 对话框监听器 - * @return 对话框 - */ @Override - public BasicDialog showWindow(Window window, DialogActionListener l) { - BasicDialog dg; - if (window instanceof Frame) { - dg = new DIALOG((Frame) window); - } else { - dg = new DIALOG((Dialog) window); - } - - if (l != null) { - dg.addDialogActionListener(l); - } - return showWindow(dg); - } - - private class DIALOG extends BasicDialog { - public DIALOG(Frame parent) { - super(parent, PreferencePane.this); - this.setTitle(PreferencePane.this.title4PopupWindow()); - } - - public DIALOG(Dialog parent) { - super(parent, PreferencePane.this); - this.setTitle(PreferencePane.this.title4PopupWindow()); - } - - /** - * 确定操作 - * - */ - @Override - public void doOK() { - super.doOK(); - if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) { - int rv = JOptionPane.showOptionDialog( - null, - Inter.getLocText("FR-Designer-Language_Change_Successful"), - Inter.getLocText("FR-Designer-Plugin_Warning"), - JOptionPane.YES_NO_OPTION, - JOptionPane.INFORMATION_MESSAGE, - null, - new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, - null - ); - if (rv == JOptionPane.OK_OPTION) { - RestartHelper.restart(); + public BasicDialog showWindow(Window window) { + return showWindow(window, new DialogActionAdapter() { + @Override + public void doOk() { + if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) { + int rv = JOptionPane.showOptionDialog( + null, + Inter.getLocText("FR-Designer-Language_Change_Successful"), + Inter.getLocText("FR-Designer-Plugin_Warning"), + JOptionPane.YES_NO_OPTION, + JOptionPane.INFORMATION_MESSAGE, + null, + new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, + null + ); + if (rv == JOptionPane.OK_OPTION) { + RestartHelper.restart(); + } } } - } - - /** - * Check valid. - */ - public void checkValid() throws Exception { - PreferencePane.this.checkValid(); - } - + }); } } \ No newline at end of file From 01f2ddcbe3d43cb42f647adf7348034d11704bfc Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 12:07:41 +0800 Subject: [PATCH 20/24] =?UTF-8?q?REPORT-748=20=E4=BF=AE=E6=94=B9=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E7=9A=84key=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/webattr/ReportWebAttrPane.java | 2 +- .../src/com/fr/design/actions/file/PreferencePane.java | 2 +- designer_base/src/com/fr/design/locale/designer.properties | 4 ++-- .../src/com/fr/design/locale/designer_en_US.properties | 4 ++-- .../src/com/fr/design/locale/designer_ja_JP.properties | 4 ++-- .../src/com/fr/design/locale/designer_ko_KR.properties | 4 ++-- .../src/com/fr/design/locale/designer_zh_CN.properties | 4 ++-- .../src/com/fr/design/locale/designer_zh_TW.properties | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java index ed1079f929..d3454ed89d 100644 --- a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java +++ b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java @@ -58,7 +58,7 @@ public class ReportWebAttrPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-Template_Web_Attributes"); + return Inter.getLocText("FR-Designer_Template_Web_Attributes"); } public void populate(ReportWebAttr reportWebAttr) { diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index 4aadbf4d23..30628c3f14 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -635,7 +635,7 @@ public class PreferencePane extends BasicPane { if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) { int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText("FR-Designer-Language_Change_Successful"), + Inter.getLocText("FR-Designer_Language_Change_Successful"), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 751e14b11b..c191e5e63c 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -471,5 +471,5 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips= FR-Designer_Reset= FR-Designer_Add_all= -FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted -FR-Designer-Template_Web_Attributes=Web Attributes +FR-Designer_Language_Change_Successful=New language setting will be enabled when designer is restarted +FR-Designer_Template_Web_Attributes=Web Attributes diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index da00526cfc..3cd4673299 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -470,5 +470,5 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips=Freestyle layout, add control in any position of the layout FR-Designer_Reset=reset FR-Designer_Add_all=Add all -FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted -FR-Designer-Template_Web_Attributes=Web Attributes +FR-Designer_Language_Change_Successful=New language setting will be enabled when designer is restarted +FR-Designer_Template_Web_Attributes=Web Attributes diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index 255abf73ce..180eec99ea 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -448,5 +448,5 @@ FR-Designer_Mobile-Refresh= FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059\u3002\u914D\u7F6E\u5185\u306E\u4EFB\u610F\u306E\u4F4D\u7F6E\u306B\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068 FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0 -FR-Designer-Language_Change_Successful= -FR-Designer-Template_Web_Attributes= +FR-Designer_Language_Change_Successful= +FR-Designer_Template_Web_Attributes= diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 5ea4a3ab6b..2d029ec720 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -444,5 +444,5 @@ FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3\uC740\uB808\uC774\uC544\uC6C3\uC548\uC5D0\uC11C\uC5B4\uB290\uC704\uCE58\uC5D0\uB3C4\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB97C\uCD94\uAC00\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00 FR-Designer_Reset= -FR-Designer-Language_Change_Successful= -FR-Designer-Template_Web_Attributes= +FR-Designer_Language_Change_Successful= +FR-Designer_Template_Web_Attributes= diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 6e837afbed..b1b0fa697d 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -474,5 +474,5 @@ FR-Designer_Mobile-Refresh=\u5237\u65B0 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5185\u4EFB\u610F\u4F4D\u7F6E\u6DFB\u52A0\u63A7\u4EF6 FR-Designer_Reset=\u53D6\u6D88\u5220\u9664 FR-Designer_Add_all=\u5168\u90E8\u6DFB\u52A0 -FR-Designer-Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 -FR-Designer-Template_Web_Attributes=\u6A21\u677FWeb\u5C5E\u6027 +FR-Designer_Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 +FR-Designer_Template_Web_Attributes=\u6A21\u677FWeb\u5C5E\u6027 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 7b81457f0e..1c4e13a3b5 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -462,5 +462,5 @@ FR-Designer_Mobile-Refresh=\u5237\u65B0 FR-Designer_Mobile-ToolBar=\u5DE5\u5177\u6B04 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5167\u4EFB\u610F\u4F4D\u7F6E\u65B0\u589E\u63A7\u5236\u9805 FR-Designer_Add_all=\u5168\u90E8\u65B0\u589E -FR-Designer-Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 -FR-Designer-Template_Web_Attributes=\u5831\u8868Web\u5C6C\u6027 +FR-Designer_Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 +FR-Designer_Template_Web_Attributes=\u5831\u8868Web\u5C6C\u6027 From 2f92f8ef0a6457bf41d8561ed3bdad050604ef9e Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 15:16:16 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9ReportWebAttrPane?= =?UTF-8?q?=E4=B8=AD=E7=94=A8=E5=88=B0=E7=9A=84=E9=83=A8=E5=88=86=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96key=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/webattr/ReportWebAttrPane.java | 16 ++++++++-------- .../src/com/fr/design/locale/designer.properties | 8 ++++++++ .../fr/design/locale/designer_en_US.properties | 8 ++++++++ .../fr/design/locale/designer_ja_JP.properties | 8 ++++++++ .../fr/design/locale/designer_ko_KR.properties | 8 ++++++++ .../fr/design/locale/designer_zh_CN.properties | 8 ++++++++ .../fr/design/locale/designer_zh_TW.properties | 8 ++++++++ 7 files changed, 56 insertions(+), 8 deletions(-) diff --git a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java index d3454ed89d..a4e877c564 100644 --- a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java +++ b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java @@ -44,16 +44,16 @@ public class ReportWebAttrPane extends LoadingBasicPane { //Tabbed Pane tabbedPane = new UITabbedPane(); defaultPane.add(tabbedPane, BorderLayout.CENTER); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Basic"), commonPane = new CommonPane()); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Printers(Server)"), serverPrintPane = new ReportServerPrinterPane()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Basic"), commonPane = new CommonPane()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Printers(Server)"), serverPrintPane = new ReportServerPrinterPane()); - tabbedPane.add(Inter.getLocText("WEB-Pagination_Setting"), pageWeb = new PageWebSettingPane()); - tabbedPane.add(Inter.getLocText("WEB-Write_Setting"), writeWeb = new WriteWebSettingPane()); - tabbedPane.add(Inter.getLocText("M-Data_Analysis_Settings"), viewWeb = new ViewWebSettingPane()); + tabbedPane.add(Inter.getLocText("FR-Designer_Pagination_Setting"), pageWeb = new PageWebSettingPane()); + tabbedPane.add(Inter.getLocText("FR-Designer_Write_Setting"), writeWeb = new WriteWebSettingPane()); + tabbedPane.add(Inter.getLocText("FR-Designer_Data_Analysis_Settings"), viewWeb = new ViewWebSettingPane()); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Browser_Background"), backgroundPane = new BackgroundPane4Browser()); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Import_Css"), cssPane = new WebCssPane()); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Import_JavaScript"), jsPane = new WebJsPane()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Browser_Background"), backgroundPane = new BackgroundPane4Browser()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Import_Css"), cssPane = new WebCssPane()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Import_JavaScript"), jsPane = new WebJsPane()); } @Override diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index c191e5e63c..34e998867c 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -473,3 +473,11 @@ FR-Designer_Reset= FR-Designer_Add_all= FR-Designer_Language_Change_Successful=New language setting will be enabled when designer is restarted FR-Designer_Template_Web_Attributes=Web Attributes +FR-Designer_Basic=Basic +FR-Designer_Printers(Server)=Printer(Server) +FR-Designer_Pagination_Setting=Pagination Setting +FR-Designer_Write_Setting=Write Setting +FR-Designer_Data_Analysis_Settings=Data Analysis Settings +FR-Designer_Browser_Background=Browser Background +FR-Designer_Import_Css=Import Css +FR-Designer_Import_JavaScript=Import JavaScript diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 3cd4673299..91b97a86c1 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -472,3 +472,11 @@ FR-Designer_Reset=reset FR-Designer_Add_all=Add all FR-Designer_Language_Change_Successful=New language setting will be enabled when designer is restarted FR-Designer_Template_Web_Attributes=Web Attributes +FR-Designer_Basic=Basic +FR-Designer_Printers(Server)=Printer(Server) +FR-Designer_Pagination_Setting=Page Break Preview +FR-Designer_Write_Setting=Filling Settings +FR-Designer_Data_Analysis_Settings=Data Analysis Settings +FR-Designer_Browser_Background=Browser Background +FR-Designer_Import_Css=Reference Css +FR-Designer_Import_JavaScript=Reference JavaScript diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index 180eec99ea..e4e36a2958 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -450,3 +450,11 @@ FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059 FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0 FR-Designer_Language_Change_Successful= FR-Designer_Template_Web_Attributes= +FR-Designer_Basic=\u57FA\u672C +FR-Designer_Printers(Server)=\u30D7\u30EA\u30F3\u30BF\u30FC(\u30B5\u30FC\u30D0) +FR-Designer_Pagination_Setting=\u30DA\u30FC\u30B8\u5225\u30D7\u30EC\u30D3\u30E5\u30FC\u8A2D\u5B9A +FR-Designer_Write_Setting=\u5831\u544A\u30DA\u30FC\u30B8\u8A2D\u5B9A +FR-Designer_Data_Analysis_Settings=\u30C7\u30FC\u30BF\u5206\u6790\u8A2D\u5B9A +FR-Designer_Browser_Background=\u30D6\u30E9\u30A6\u30B6\u80CC\u666F +FR-Designer_Import_Css=Css\u5F15\u7528 +FR-Designer_Import_JavaScript=JavaScript\u5F15\u7528 diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 2d029ec720..8877b8a9fe 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -446,3 +446,11 @@ FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00 FR-Designer_Reset= FR-Designer_Language_Change_Successful= FR-Designer_Template_Web_Attributes= +FR-Designer_Basic=\uAE30\uBCF8 +FR-Designer_Printers(Server)=\uD504\uB9B0\uD130(\uC11C\uBC84) +FR-Designer_Pagination_Setting=\uD398\uC774\uC9C0\uB098\uB204\uAE30\uBBF8\uB9AC\uBCF4\uAE30\uC124\uC815 +FR-Designer_Write_Setting=\uC6F9\uD398\uC774\uC9C0\uC124\uC815\uAE30\uC785 +FR-Designer_Data_Analysis_Settings=\uB370\uC774\uD130\uBD84\uC11D\uC124\uC815 +FR-Designer_Browser_Background=\uC6F9\uBE0C\uB77C\uC6B0\uC800\uBC30\uACBD +FR-Designer_Import_Css=Css\uC778\uC6A9 +FR-Designer_Import_JavaScript=JavaScript\uC778\uC6A9 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index b1b0fa697d..a849a9b480 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -476,3 +476,11 @@ FR-Designer_Reset=\u53D6\u6D88\u5220\u9664 FR-Designer_Add_all=\u5168\u90E8\u6DFB\u52A0 FR-Designer_Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 FR-Designer_Template_Web_Attributes=\u6A21\u677FWeb\u5C5E\u6027 +FR-Designer_Basic=\u57FA\u672C +FR-Designer_Printers(Server)=\u6253\u5370\u673A(\u670D\u52A1\u5668) +FR-Designer_Pagination_Setting=\u5206\u9875\u9884\u89C8\u8BBE\u7F6E +FR-Designer_Write_Setting=\u586B\u62A5\u9875\u9762\u8BBE\u7F6E +FR-Designer_Data_Analysis_Settings=\u6570\u636E\u5206\u6790\u8BBE\u7F6E +FR-Designer_Browser_Background=\u6D4F\u89C8\u5668\u80CC\u666F +FR-Designer_Import_Css=\u5F15\u7528Css +FR-Designer_Import_JavaScript=\u5F15\u7528JavaScript diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 1c4e13a3b5..2e05b1790b 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -464,3 +464,11 @@ FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF FR-Designer_Add_all=\u5168\u90E8\u65B0\u589E FR-Designer_Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 FR-Designer_Template_Web_Attributes=\u5831\u8868Web\u5C6C\u6027 +FR-Designer_Basic=\u57FA\u672C +FR-Designer_Printers(Server)=\u5370\u8868\u6A5F(\u4F3A\u670D\u5668) +FR-Designer_Pagination_Setting=\u5206\u9801\u9810\u89BD\u8A2D\u5B9A +FR-Designer_Write_Setting=\u586B\u5831\u9801\u9762\u8A2D\u5B9A +FR-Designer_Data_Analysis_Settings=\u8CC7\u6599\u5206\u6790\u8A2D\u5B9A +FR-Designer_Browser_Background=\u700F\u89BD\u5668\u80CC\u666F +FR-Designer_Import_Css=\u5F15\u7528Css +FR-Designer_Import_JavaScript=\u5F15\u7528JavaScript From b7550cfb6d2fdd49f18f3afb2bcba039ed4631a4 Mon Sep 17 00:00:00 2001 From: vito Date: Wed, 30 Nov 2016 17:57:22 +0800 Subject: [PATCH 22/24] =?UTF-8?q?REPORT-916=20[=E6=8F=92=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E6=8F=90=E7=A4=BA=E4=B8=8B=E8=BD=BD=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=8F=96=E6=B6=88=E5=B0=B1=E5=BC=B9=E5=87=BA=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E7=A9=BA=E7=99=BD=E7=9A=84=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freeze/RepeatAndFreezeSettingPane.java | 12 +- .../actions/server/PluginManagerAction.java | 12 +- .../actions/server/ReuseManagerAction.java | 53 ------ .../com/fr/design/extra/ShopManagerPane.java | 117 +----------- .../com/fr/design/extra/WebDialogFactory.java | 169 ++++++++++++++++++ .../design/extra/WebManagerPaneFactory.java | 99 ---------- .../src/com/fr/start/BaseDesigner.java | 14 +- 7 files changed, 177 insertions(+), 299 deletions(-) delete mode 100644 designer_base/src/com/fr/design/actions/server/ReuseManagerAction.java create mode 100644 designer_base/src/com/fr/design/extra/WebDialogFactory.java delete mode 100644 designer_base/src/com/fr/design/extra/WebManagerPaneFactory.java diff --git a/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java b/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java index 2624318aed..5591fa0db4 100644 --- a/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java +++ b/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java @@ -9,16 +9,11 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import com.fr.design.dialog.BasicPane; -import com.fr.design.dialog.UIDialog; -import com.fr.design.extra.ShopManagerPane; -import com.fr.design.extra.ShopDialog; -import com.fr.design.extra.PluginWebBridge; -import com.fr.design.extra.WebManagerPaneFactory; +import com.fr.design.extra.WebDialogFactory; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.mainframe.DesignerContext; import com.fr.general.Inter; import com.fr.page.ReportPageAttrProvider; import com.fr.stable.ColumnRow; @@ -552,10 +547,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { public void actionPerformed(ActionEvent e) { try { //Desktop.getDesktop().browse(new URI(url)); - BasicPane managerPane = new WebManagerPaneFactory().createPluginPane(); - UIDialog dlg = new ShopDialog(DesignerContext.getDesignerFrame(), managerPane); - PluginWebBridge.getHelper().setDialogHandle(dlg); - dlg.setVisible(true); + new WebDialogFactory().createPluginDialog(); RepeatAndFreezeSettingPane.this.getTopLevelAncestor().setVisible(false); } catch (Exception exp) { diff --git a/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java b/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java index fee4678202..77a1ae9a86 100644 --- a/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java +++ b/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java @@ -2,12 +2,7 @@ package com.fr.design.actions.server; import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; -import com.fr.design.dialog.BasicPane; -import com.fr.design.dialog.UIDialog; -import com.fr.design.extra.PluginWebBridge; -import com.fr.design.extra.ShopDialog; -import com.fr.design.extra.WebManagerPaneFactory; -import com.fr.design.mainframe.DesignerContext; +import com.fr.design.extra.WebDialogFactory; import com.fr.design.menu.MenuKeySet; import com.fr.general.Inter; @@ -30,10 +25,7 @@ public class PluginManagerAction extends UpdateAction { @Override public void actionPerformed(ActionEvent e) { - BasicPane managerPane = new WebManagerPaneFactory().createPluginPane(); - UIDialog dlg = new ShopDialog(DesignerContext.getDesignerFrame(), managerPane); - PluginWebBridge.getHelper().setDialogHandle(dlg); - dlg.setVisible(true); + new WebDialogFactory().createPluginDialog(); } public static final MenuKeySet PLUGIN_MANAGER = new MenuKeySet() { diff --git a/designer_base/src/com/fr/design/actions/server/ReuseManagerAction.java b/designer_base/src/com/fr/design/actions/server/ReuseManagerAction.java deleted file mode 100644 index 3bd21a0d91..0000000000 --- a/designer_base/src/com/fr/design/actions/server/ReuseManagerAction.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.fr.design.actions.server; - -import com.fr.base.BaseUtils; -import com.fr.design.actions.UpdateAction; -import com.fr.design.dialog.BasicPane; -import com.fr.design.dialog.UIDialog; -import com.fr.design.extra.ShopDialog; -import com.fr.design.extra.PluginWebBridge; -import com.fr.design.extra.WebManagerPaneFactory; -import com.fr.design.mainframe.DesignerContext; -import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; - -import javax.swing.*; -import java.awt.event.ActionEvent; - -/** - * Created by vito on 2016/9/27. - */ -public class ReuseManagerAction extends UpdateAction { - - public ReuseManagerAction() { - this.setMenuKeySet(REUSE_MANAGER); - this.setName(getMenuKeySet().getMenuKeySetName()); - this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/server/plugin.png")); - } - - @Override - public void actionPerformed(ActionEvent e) { - BasicPane managerPane = new WebManagerPaneFactory().createReusePane(); - UIDialog dlg = new ShopDialog(DesignerContext.getDesignerFrame(), managerPane); - PluginWebBridge.getHelper().setDialogHandle(dlg); - dlg.setVisible(true); - } - - public static final MenuKeySet REUSE_MANAGER = new MenuKeySet() { - @Override - public char getMnemonic() { - return 'R'; - } - - @Override - public String getMenuName() { - return Inter.getLocText("FR-Designer-Reuse_Manager"); - } - - @Override - public KeyStroke getKeyStroke() { - return null; - } - }; -} \ No newline at end of file diff --git a/designer_base/src/com/fr/design/extra/ShopManagerPane.java b/designer_base/src/com/fr/design/extra/ShopManagerPane.java index 12900c720b..857e96cc8d 100644 --- a/designer_base/src/com/fr/design/extra/ShopManagerPane.java +++ b/designer_base/src/com/fr/design/extra/ShopManagerPane.java @@ -1,23 +1,10 @@ package com.fr.design.extra; -import com.fr.base.FRContext; -import com.fr.design.DesignerEnvManager; -import com.fr.design.RestartHelper; import com.fr.design.dialog.BasicPane; -import com.fr.general.ComparatorUtils; -import com.fr.general.IOUtils; import com.fr.general.Inter; -import com.fr.general.SiteCenter; -import com.fr.general.http.HttpClient; -import com.fr.plugin.PluginVerifyException; -import com.fr.stable.StableUtils; import javafx.embed.swing.JFXPanel; -import javax.swing.*; import java.awt.*; -import java.io.File; -import java.net.HttpURLConnection; -import java.util.concurrent.ExecutionException; /** * @author richie @@ -32,113 +19,11 @@ import java.util.concurrent.ExecutionException; */ public class ShopManagerPane extends BasicPane { - private static final String LATEST = "latest"; - private ShopPaneConfig shopPaneConfig; - - public ShopManagerPane(ShopPaneConfig shopPaneConfig) { - this.shopPaneConfig = shopPaneConfig; + public ShopManagerPane(JFXPanel webPane) { setLayout(new BorderLayout()); - if (StableUtils.isDebug()) { - addPane(); - } else { - File file = new File(shopPaneConfig.getMainJS()); - if (!file.exists()) { - int rv = JOptionPane.showConfirmDialog( - this, - Inter.getLocText("FR-Designer-Plugin_Shop_Need_Install"), - Inter.getLocText("FR-Designer-Plugin_Warning"), - JOptionPane.OK_CANCEL_OPTION, - JOptionPane.INFORMATION_MESSAGE - ); - if (rv == JOptionPane.OK_OPTION) { - downloadShopScripts(); - } - } else { - addPane(); - updateShopScripts(); - } - } - } - - private void addPane() { - JFXPanel webPane = shopPaneConfig.getWebPane(); add(webPane, BorderLayout.CENTER); } - private void downloadShopScripts() { - new SwingWorker() { - @Override - protected Boolean doInBackground() throws Exception { - String username = DesignerEnvManager.getEnvManager().getBBSName(); - String password = DesignerEnvManager.getEnvManager().getBBSPassword(); - try { - PluginHelper.downloadPluginFile(shopPaneConfig.getScriptsId(), username, password, new Process() { - @Override - public void process(Double integer) { - } - }); - } catch (PluginVerifyException e) { - JOptionPane.showMessageDialog(ShopManagerPane.this, e.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); - return false; - } catch (Exception e) { - FRContext.getLogger().error(e.getMessage(), e); - return false; - } - return true; - } - - @Override - protected void done() { - - try { - if (get()) { - IOUtils.unzip(new File(StableUtils.pathJoin(PluginHelper.DOWNLOAD_PATH, PluginHelper.TEMP_FILE)), StableUtils.getInstallHome()); - int rv = JOptionPane.showOptionDialog( - ShopManagerPane.this, - Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), - Inter.getLocText("FR-Designer-Plugin_Warning"), - JOptionPane.YES_NO_OPTION, - JOptionPane.INFORMATION_MESSAGE, - null, - new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, - null - ); - if (rv == JOptionPane.OK_OPTION) { - RestartHelper.restart(); - } - } - } catch (InterruptedException | ExecutionException e) { - FRContext.getLogger().error(e.getMessage(), e); - } - - } - }.execute(); - } - - private void updateShopScripts() { - new SwingWorker() { - @Override - protected Void doInBackground() throws Exception { - HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("store.version") + "&version=" + PluginStoreConstants.VERSION); - if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { - if (!ComparatorUtils.equals(httpClient.getResponseText(), LATEST)) { - int rv = JOptionPane.showConfirmDialog( - ShopManagerPane.this, - Inter.getLocText("FR-Designer-Plugin_Shop_Need_Update"), - Inter.getLocText("FR-Designer-Plugin_Warning"), - JOptionPane.OK_CANCEL_OPTION, - JOptionPane.INFORMATION_MESSAGE - ); - if (rv == JOptionPane.OK_OPTION) { - downloadShopScripts(); - } - } - } - return null; - } - }.execute(); - } - @Override protected String title4PopupWindow() { return Inter.getLocText("FR-Designer-Plugin_Manager"); diff --git a/designer_base/src/com/fr/design/extra/WebDialogFactory.java b/designer_base/src/com/fr/design/extra/WebDialogFactory.java new file mode 100644 index 0000000000..3ec5f4286c --- /dev/null +++ b/designer_base/src/com/fr/design/extra/WebDialogFactory.java @@ -0,0 +1,169 @@ +package com.fr.design.extra; + +import com.fr.base.FRContext; +import com.fr.design.DesignerEnvManager; +import com.fr.design.RestartHelper; +import com.fr.design.dialog.BasicPane; +import com.fr.design.dialog.UIDialog; +import com.fr.design.gui.frpane.UITabbedPane; +import com.fr.design.mainframe.DesignerContext; +import com.fr.general.ComparatorUtils; +import com.fr.general.IOUtils; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.general.http.HttpClient; +import com.fr.plugin.PluginVerifyException; +import com.fr.stable.StableUtils; + +import javax.swing.*; +import java.awt.*; +import java.io.File; +import java.net.HttpURLConnection; +import java.util.concurrent.ExecutionException; + +/** + * Created by vito on 2016/9/28. + */ +public class WebDialogFactory { + private static final String LATEST = "latest"; + private static final String SHOP_SCRIPTS = "shop_scripts"; + + private String installHome; + + public WebDialogFactory() { + this.installHome = StableUtils.getInstallHome(); + } + + public void createPluginDialog() { + UIDialog dlg; + if (StableUtils.getMajorJavaVersion() >= 8) { + String relativePath = "/scripts/store/web/index.html"; + String mainJsPath = StableUtils.pathJoin(new File(installHome).getAbsolutePath(), relativePath); + File file = new File(mainJsPath); + if (!file.exists()) { + int rv = JOptionPane.showConfirmDialog( + null, + Inter.getLocText("FR-Designer-Plugin_Shop_Need_Install"), + Inter.getLocText("FR-Designer-Plugin_Warning"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.INFORMATION_MESSAGE + ); + if (rv == JOptionPane.OK_OPTION) { + downloadShopScripts(SHOP_SCRIPTS); + } + } else { + updateShopScripts(SHOP_SCRIPTS); + BasicPane managerPane = new ShopManagerPane(new PluginWebPane(mainJsPath)); + dlg = new ShopDialog(DesignerContext.getDesignerFrame(), managerPane); + PluginWebBridge.getHelper().setDialogHandle(dlg); + dlg.setVisible(true); + } + } else { + BasicPane traditionalStorePane = new BasicPane() { + @Override + protected String title4PopupWindow() { + return Inter.getLocText("FR-Designer-Plugin_Manager"); + } + }; + traditionalStorePane.setLayout(new BorderLayout()); + traditionalStorePane.add(initTraditionalStore(), BorderLayout.CENTER); + dlg = new ShopDialog(DesignerContext.getDesignerFrame(), traditionalStorePane); + dlg.setVisible(true); + } + } + + /** + * 以关键词打开设计器商店 + *

+ * // * @param keyword 关键词 + */ + public void createPluginDialog(String keyword) { + PluginWebBridge.getHelper().openWithSearch(keyword); + createPluginDialog(); + } + + + private Component initTraditionalStore() { + UITabbedPane tabbedPane = new UITabbedPane(); + PluginInstalledPane installedPane = new PluginInstalledPane(); + tabbedPane.addTab(installedPane.tabTitle(), installedPane); + tabbedPane.addTab(Inter.getLocText("FR-Designer-Plugin_Update"), new PluginUpdatePane(tabbedPane)); + tabbedPane.addTab(Inter.getLocText("FR-Designer-Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane)); + return tabbedPane; + } + + private void downloadShopScripts(final String scriptsId) { + new SwingWorker() { + @Override + protected Boolean doInBackground() throws Exception { + String username = DesignerEnvManager.getEnvManager().getBBSName(); + String password = DesignerEnvManager.getEnvManager().getBBSPassword(); + try { + PluginHelper.downloadPluginFile(scriptsId, username, password, new Process() { + @Override + public void process(Double integer) { + } + }); + } catch (PluginVerifyException e) { + JOptionPane.showMessageDialog(null, e.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + return false; + } catch (Exception e) { + FRContext.getLogger().error(e.getMessage(), e); + return false; + } + return true; + } + + @Override + protected void done() { + + try { + if (get()) { + IOUtils.unzip(new File(StableUtils.pathJoin(PluginHelper.DOWNLOAD_PATH, PluginHelper.TEMP_FILE)), StableUtils.getInstallHome()); + int rv = JOptionPane.showOptionDialog( + null, + Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), + Inter.getLocText("FR-Designer-Plugin_Warning"), + JOptionPane.YES_NO_OPTION, + JOptionPane.INFORMATION_MESSAGE, + null, + new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, + null + ); + if (rv == JOptionPane.OK_OPTION) { + RestartHelper.restart(); + } + } + } catch (InterruptedException | ExecutionException e) { + FRContext.getLogger().error(e.getMessage(), e); + } + + } + }.execute(); + } + + private void updateShopScripts(final String scriptsId) { + new SwingWorker() { + @Override + protected Void doInBackground() throws Exception { + HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("store.version") + "&version=" + PluginStoreConstants.VERSION); + if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { + String text = httpClient.getResponseText(); + if (!ComparatorUtils.equals(text, LATEST)) { + int rv = JOptionPane.showConfirmDialog( + null, + Inter.getLocText("FR-Designer-Plugin_Shop_Need_Update"), + Inter.getLocText("FR-Designer-Plugin_Warning"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.INFORMATION_MESSAGE + ); + if (rv == JOptionPane.OK_OPTION) { + downloadShopScripts(scriptsId); + } + } + } + return null; + } + }.execute(); + } +} diff --git a/designer_base/src/com/fr/design/extra/WebManagerPaneFactory.java b/designer_base/src/com/fr/design/extra/WebManagerPaneFactory.java deleted file mode 100644 index 75a79deddd..0000000000 --- a/designer_base/src/com/fr/design/extra/WebManagerPaneFactory.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.fr.design.extra; - -import com.fr.design.dialog.BasicPane; -import com.fr.design.gui.frpane.UITabbedPane; -import com.fr.general.Inter; -import com.fr.stable.StableUtils; -import javafx.embed.swing.JFXPanel; - -import java.awt.*; -import java.io.File; -import java.net.URL; - -/** - * Created by vito on 2016/9/28. - */ -public class WebManagerPaneFactory { - private String installHome; - - public WebManagerPaneFactory() { - if (StableUtils.isDebug()) { - URL url = ClassLoader.getSystemResource(""); - this.installHome = url.getPath(); - } else { - this.installHome = StableUtils.getInstallHome(); - } - } - - public BasicPane createPluginPane() { - if (StableUtils.getMajorJavaVersion() == 8) { - return new ShopManagerPane(new ShopPaneConfig() { - @Override - String getMainJS() { - String relativePath = "/scripts/store/web/index.html"; - return StableUtils.pathJoin(new File(installHome).getAbsolutePath(), relativePath); - } - - @Override - String getScriptsId() { - return "shop_scripts"; - } - - @Override - JFXPanel getWebPane() { - return new PluginWebPane(getMainJS()); - } - - }); - } else { - BasicPane traditionalStorePane = new BasicPane() { - @Override - protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-Plugin_Manager"); - } - }; - traditionalStorePane.setLayout(new BorderLayout()); - traditionalStorePane.add(initTraditionalStore(), BorderLayout.CENTER); - return traditionalStorePane; - } - } - - public BasicPane createReusePane() { - return new ShopManagerPane(new ShopPaneConfig() { - @Override - String getMainJS() { - String relativePath = "/scripts/store/reuse/index.html"; - return StableUtils.pathJoin(new File(installHome).getAbsolutePath(), relativePath); - } - - @Override - String getScriptsId() { - return "reuse_scripts"; - } - - @Override - JFXPanel getWebPane() { - return new ReuseWebPane(getMainJS()); - } - }); - } - - /** - * 以关键词打开设计器商店 - * - * @param keyword 关键词 - */ - public BasicPane createPluginPane(String keyword) { - PluginWebBridge.getHelper().openWithSearch(keyword); - return createPluginPane(); - } - - private Component initTraditionalStore() { - UITabbedPane tabbedPane = new UITabbedPane(); - PluginInstalledPane installedPane = new PluginInstalledPane(); - tabbedPane.addTab(installedPane.tabTitle(), installedPane); - tabbedPane.addTab(Inter.getLocText("FR-Designer-Plugin_Update"), new PluginUpdatePane(tabbedPane)); - tabbedPane.addTab(Inter.getLocText("FR-Designer-Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane)); - return tabbedPane; - } -} diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index a76ec5f535..3d9280965c 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -7,16 +7,11 @@ import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.RestartHelper; -import com.fr.design.dialog.BasicPane; -import com.fr.design.dialog.UIDialog; -import com.fr.design.extra.ShopDialog; -import com.fr.design.extra.PluginWebBridge; -import com.fr.design.extra.WebManagerPaneFactory; +import com.fr.design.extra.WebDialogFactory; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.MutilTempalteTabPane; import com.fr.design.file.TemplateTreePane; import com.fr.design.fun.GlobalListenerProvider; -import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.mainframe.TemplatePane; import com.fr.design.mainframe.toolbar.ToolBarMenuDock; @@ -131,10 +126,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { String text = StableUtils.join(plugins, ",") + Inter.getLocText("FR-Designer_Plugin_Should_Update"); int r = JOptionPane.showConfirmDialog(null, text, Inter.getLocText("FR-Designer_Plugin_Should_Update_Title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); if (r == JOptionPane.OK_OPTION) { - BasicPane managerPane = new WebManagerPaneFactory().createPluginPane(); - UIDialog dlg = new ShopDialog(DesignerContext.getDesignerFrame(), managerPane); - PluginWebBridge.getHelper().setDialogHandle(dlg); - dlg.setVisible(true); + new WebDialogFactory().createPluginDialog(); } } timer.stop(); @@ -149,7 +141,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } protected DesignerFrame createDesignerFrame() { - return new DesignerFrame(this); + return new DesignerFrame(this); } protected int getStartPort() { From c88683ca6eee7387928def9b3c295c4b4b3f4ce6 Mon Sep 17 00:00:00 2001 From: vito Date: Wed, 30 Nov 2016 18:47:20 +0800 Subject: [PATCH 23/24] =?UTF-8?q?pmd=E9=AD=94=E6=9C=AF=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/extra/WebDialogFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/extra/WebDialogFactory.java b/designer_base/src/com/fr/design/extra/WebDialogFactory.java index 3ec5f4286c..ca472c778d 100644 --- a/designer_base/src/com/fr/design/extra/WebDialogFactory.java +++ b/designer_base/src/com/fr/design/extra/WebDialogFactory.java @@ -27,6 +27,7 @@ import java.util.concurrent.ExecutionException; public class WebDialogFactory { private static final String LATEST = "latest"; private static final String SHOP_SCRIPTS = "shop_scripts"; + private static final int VERSION_8 = 8; private String installHome; @@ -36,7 +37,7 @@ public class WebDialogFactory { public void createPluginDialog() { UIDialog dlg; - if (StableUtils.getMajorJavaVersion() >= 8) { + if (StableUtils.getMajorJavaVersion() >= VERSION_8) { String relativePath = "/scripts/store/web/index.html"; String mainJsPath = StableUtils.pathJoin(new File(installHome).getAbsolutePath(), relativePath); File file = new File(mainJsPath); From 5e68b887b18fabaff35843288b465a61098b2286 Mon Sep 17 00:00:00 2001 From: vito Date: Wed, 30 Nov 2016 19:34:37 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E6=94=B9=E4=B8=8B=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freeze/RepeatAndFreezeSettingPane.java | 4 ++-- .../actions/server/PluginManagerAction.java | 4 ++-- .../{WebDialogFactory.java => WebDialog.java} | 17 ++++++----------- .../src/com/fr/start/BaseDesigner.java | 4 ++-- 4 files changed, 12 insertions(+), 17 deletions(-) rename designer_base/src/com/fr/design/extra/{WebDialogFactory.java => WebDialog.java} (94%) diff --git a/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java b/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java index 5591fa0db4..8e70675eee 100644 --- a/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java +++ b/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java @@ -9,7 +9,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import com.fr.design.dialog.BasicPane; -import com.fr.design.extra.WebDialogFactory; +import com.fr.design.extra.WebDialog; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.UILabel; @@ -547,7 +547,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { public void actionPerformed(ActionEvent e) { try { //Desktop.getDesktop().browse(new URI(url)); - new WebDialogFactory().createPluginDialog(); + WebDialog.createPluginDialog(); RepeatAndFreezeSettingPane.this.getTopLevelAncestor().setVisible(false); } catch (Exception exp) { diff --git a/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java b/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java index 77a1ae9a86..08dc91b07e 100644 --- a/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java +++ b/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java @@ -2,7 +2,7 @@ package com.fr.design.actions.server; import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; -import com.fr.design.extra.WebDialogFactory; +import com.fr.design.extra.WebDialog; import com.fr.design.menu.MenuKeySet; import com.fr.general.Inter; @@ -25,7 +25,7 @@ public class PluginManagerAction extends UpdateAction { @Override public void actionPerformed(ActionEvent e) { - new WebDialogFactory().createPluginDialog(); + WebDialog.createPluginDialog(); } public static final MenuKeySet PLUGIN_MANAGER = new MenuKeySet() { diff --git a/designer_base/src/com/fr/design/extra/WebDialogFactory.java b/designer_base/src/com/fr/design/extra/WebDialog.java similarity index 94% rename from designer_base/src/com/fr/design/extra/WebDialogFactory.java rename to designer_base/src/com/fr/design/extra/WebDialog.java index ca472c778d..ed7d735631 100644 --- a/designer_base/src/com/fr/design/extra/WebDialogFactory.java +++ b/designer_base/src/com/fr/design/extra/WebDialog.java @@ -24,18 +24,13 @@ import java.util.concurrent.ExecutionException; /** * Created by vito on 2016/9/28. */ -public class WebDialogFactory { +public class WebDialog { private static final String LATEST = "latest"; private static final String SHOP_SCRIPTS = "shop_scripts"; private static final int VERSION_8 = 8; + private static String installHome = StableUtils.getInstallHome(); - private String installHome; - - public WebDialogFactory() { - this.installHome = StableUtils.getInstallHome(); - } - - public void createPluginDialog() { + public static void createPluginDialog() { UIDialog dlg; if (StableUtils.getMajorJavaVersion() >= VERSION_8) { String relativePath = "/scripts/store/web/index.html"; @@ -84,7 +79,7 @@ public class WebDialogFactory { } - private Component initTraditionalStore() { + private static Component initTraditionalStore() { UITabbedPane tabbedPane = new UITabbedPane(); PluginInstalledPane installedPane = new PluginInstalledPane(); tabbedPane.addTab(installedPane.tabTitle(), installedPane); @@ -93,7 +88,7 @@ public class WebDialogFactory { return tabbedPane; } - private void downloadShopScripts(final String scriptsId) { + private static void downloadShopScripts(final String scriptsId) { new SwingWorker() { @Override protected Boolean doInBackground() throws Exception { @@ -143,7 +138,7 @@ public class WebDialogFactory { }.execute(); } - private void updateShopScripts(final String scriptsId) { + private static void updateShopScripts(final String scriptsId) { new SwingWorker() { @Override protected Void doInBackground() throws Exception { diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 3d9280965c..5af9856c28 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -7,7 +7,7 @@ import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.RestartHelper; -import com.fr.design.extra.WebDialogFactory; +import com.fr.design.extra.WebDialog; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.MutilTempalteTabPane; import com.fr.design.file.TemplateTreePane; @@ -126,7 +126,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { String text = StableUtils.join(plugins, ",") + Inter.getLocText("FR-Designer_Plugin_Should_Update"); int r = JOptionPane.showConfirmDialog(null, text, Inter.getLocText("FR-Designer_Plugin_Should_Update_Title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); if (r == JOptionPane.OK_OPTION) { - new WebDialogFactory().createPluginDialog(); + WebDialog.createPluginDialog(); } } timer.stop();