合并冲突

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -73,8 +73,8 @@ 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 Hyperlink-Floating Element
-FR-Designer_Chart_Float_chart=Chart Hyperlink-Floating-window Chart
+FR-Designer_Chart_Float_chart=Chart Hyperlink-Floating 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
@@ -118,7 +118,7 @@ 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_Hyperlink-Form_link=Current dashboard object
 FR-Designer_IDCard=IDCard
 FR-Designer_Icon=Icon
 FR-Designer_Index=index
@@ -126,7 +126,7 @@ 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-Index=Index
 FR-Designer_Layout_Constraints=Layout Constraints
 FR-Designer_Length=Length
 FR-Designer_Loading_Data=Loading Data
@@ -173,12 +173,12 @@ 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_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_Swatch=Sample
 FR-Designer_Tab_title=Tab title
 FR-Designer_TableData=Data set
 FR-Designer_Thank_guest=Special thanks to
@@ -190,8 +190,8 @@ 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-LeftToRight=Vertical Text (left to right)
-FR-Designer_Vertical-RightToLeft=Vertical Text (Right To Left)
+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.
@@ -413,12 +413,12 @@ 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_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-BBSLogin_Download-Unlogin-Tip=Login to download
 FR-Designer-App_ReLayout=AppRelayout
 FR-Designer_Mobile-Attr=Mobile Attr
 FR-Designer_Mobile-Vertical=Vertical Screen
@@ -432,42 +432,42 @@ 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-Zoom=Zoom
 FR-Designer_Mobile-Open=Open
-FR-Designer_Mobile-Warning=
+FR-Designer_Mobile-Warning=Max height cannot exceed 80% of display area
 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-Fit-Tip=Adaptive plug-in
-FR-Designer_Form-Frozen-Tip=When Use Form Frozen, Suggest Install
+FR-Designer_Form-Frozen-Tip=When use Frozen, suggest install
-FR-Designer_Form-Forzen-Speed=To Speed UP.
+FR-Designer_Form-Forzen-Speed=, use bidirectional and horizontal adaption to improve the speed.
-FR-Designer_Attention=attention
+FR-Designer_Attention=Attention
-FR-Designer_Forbid_Widgets_Intersects=Forbid Widgets Intersects
+FR-Designer_Forbid_Widgets_Intersects=Forbid component overlap
 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_Area_Scaling=Component area scaling
-FR-Designer-Widget_Scaling_Mode=Widget Scaling Mode
+FR-Designer-Widget_Scaling_Mode=Scaling mode
 FR-Designer-QQLogin-Determine=Determine
 FR-Designer-QQLogin-Cancel=Cancel
-FR-Designer-Reuse_Manager=Reuse Manager
+FR-Designer-Reuse_Manager=Component management
-FR-Designer_TableData-Default-Para=Default Para
+FR-Designer_TableData-Default-Para=Default parameter
-FR-Designer_Layout_Block_Absolute=Absolute Layout Block
+FR-Designer_Layout_Block_Absolute=Absolute layout block
-FR-Designer_Layout_Block_Tab=TabLayout
+FR-Designer_Layout_Block_Tab=Tab block
-FR-Designer_Layout_Block_Blank=Blank Block
+FR-Designer_Layout_Block_Blank=Blank block
-FR-Designer_Attr_Layout=layout
+FR-Designer_Attr_Layout=Layout
-FR-Designer_Attr_Layout_Type=layout type
+FR-Designer_Attr_Layout_Type=Layout type
-FR-Designer_Attr_Bidirectional_Adaptive=Bidirectional Adaptive
+FR-Designer_Attr_Bidirectional_Adaptive=Bidirectional adaptive
-FR-Designer-Selected_Widget=selected widget
+FR-Designer-Selected_Widget=Selected widget
-FR-Designer_LocalWidget=local widget
+FR-Designer_LocalWidget=Local component library
-FR-Designer_AllCategories=all categories
+FR-Designer_AllCategories=All categories
-FR-Designer_Download_Template=download template
+FR-Designer_Download_Template=Download components
-FR-Designer_Install_Template=install template
+FR-Designer_Install_Template=Install components
-FR-Designer_Delete_Template=delete template
+FR-Designer_Delete_Template=Delete components
-FR-Designer_Mobile-Refresh=refresh
+FR-Designer_Mobile-Refresh=Refresh
-FR-Designer_Mobile-ToolBar=toolbar
+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_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
@@ -508,16 +508,16 @@ FR-Designer_Form_Basic_Properties=Basic Property
 FR-Designer_DS_Dictionary=Data Dictionary
 FR-Designer_Create_Tree=Build Tree
 FR-Designer_Set_Callback_Function=Set Callback Function
-FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Content=Confirm to delete Tab Control
-FR-Designer_ConfirmDialog_Title=
+FR-Designer_ConfirmDialog_Title=FineReport 8.0
 
 FR-Designer_FormulaPane_Tips=Tips\:You can input B1 to get the data in the second cell of the first row
 FR-Designer_FormulaPane_Variables=Variables
 FR-Designer_FormulaPane_Formula_Description=Formula Description
 FR-Designer_FormulaPane_Function_Detail=Function Detail
 FR-Designer_FormulaPane_Search=Search
-FR-Designer_Tab_carousel=
+FR-Designer_Tab_carousel=Tab carousel
-FR-Designer_setCarousel=
+FR-Designer_setCarousel=Start
 FR-Designer_carouselInterval=Interval
 
 FR-Designer_ClassName_panel=Class Name

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -222,7 +222,7 @@ 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_SureToDelete=\u524A\u9664\u3057\u307E\u3059\u304B
 FR-Designer-CommitTab_Remove=\u524A\u9664
 FR-Designer-Collect_Information_free=\u7121\u6599
 FR-Designer-Collect_Information_Description=\u8A18\u8FF0
@@ -369,7 +369,7 @@ 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_Select_All=\u5168\u9078\u629E
 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
@@ -407,10 +407,10 @@ FR-Designer_Current_Preview_Rows=\u73FE\u5728\u306E\u30D7\u30EC\u30D3\u30E5\u30F
 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_formDesignerModule=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30C7\u30B6\u30A4\u30CA\u30FC
-FR-Designer-BBSLogin_Login-Title=
+FR-Designer-BBSLogin_Login-Title=BBS\u30ED\u30B0\u30A4\u30F3
-FR-Designer_Get-CubeGetting=
+FR-Designer_Get-CubeGetting=cube\u53D6\u5F97
-FR-Designer-BBSLogin_Download-Unlogin-Tip=
+FR-Designer-BBSLogin_Download-Unlogin-Tip=\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
 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
@@ -449,19 +449,19 @@ FR-Designer_Mobile-ToolBar=\u30C4\u30FC\u30EB\u30D0\u30FC
 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=\u65B0\u3057\u3044\u8A00\u8A9E\u306F\u518D\u8D77\u52D5\u5F8C\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
-FR-Designer_Template_Web_Attributes=
+FR-Designer_Template_Web_Attributes=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30A6\u30A7\u30D6\u30D7\u30ED\u30D1\u30C6\u30A3
 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_Write_Setting=\u66F8\u304D\u8FBC\u307F\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
 FR-Designer-Datasource-Param_DES=<html>&nbsp; "${abc}"\u3092\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3068\u3057\u3066\u5165\u529B\u3067\u304D\u307E\u3059\u3002\u3053\u3053\u3067abc\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3002abc\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u540D\u524D\u3067\u3059\u3002\u4F8B\u3048\u3070<br/>&nbsp;select * from table where id\=${abc}\u3002<br/>&nbsp;select * from table where id\='${abc}'\u3002(\u3082\u3057id\u306F\u6587\u5B57\u5217\u306A\u3089)</html>\uFFFD
 FR-Designer-DS-Database_Query=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30AF\u30A8\u30EA\u30FC
-FR-Designer-LayerPageReport_PageQuery=\u30DA\u30FC\u30B8\u5225\u30AF\u30A8\u30EA
+FR-Designer-LayerPageReport_PageQuery=\u6539\u30DA\u30FC\u30B8\u691C\u7D22
-FR-Designer-LayerPageReport_Define_PageQuerySQL=\u5B9A\u7FA9\u30DA\u30FC\u30B8\u5225\u30AF\u30A8\u30EAsql
+FR-Designer-LayerPageReport_Define_PageQuerySQL=\u6539\u30DA\u30FC\u30B8\u691C\u7D22sql\u3092\u66F8\u304F
 FR-Designer_Is_Share_DBTableData=\u5171\u6709\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
 FR-Designer_Event=\u30A4\u30D9\u30F3\u30C8
 FR-Designer_Properties=\u30D7\u30ED\u30D1\u30C6\u30A3

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -445,7 +445,6 @@ FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3
 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
@@ -499,6 +498,7 @@ FR-Designer_Description_panel=\uC124\uBA85
 FR-Designer_Edit_panel=\uD3B8\uC9D1
 FR-Designer_Property_panel=\uC18D\uC131
 FR-Designer_Select_panel=\uC120\uD0DD
+<<<<<<< HEAD
 
 FR-Designer_LayoutTable_Column_Width=160
 FR-Designer_Set_BG_Of_Current_Row=\uAE30\uC785\uD604\uC7AC\uD3B8\uC9D1\uD589\uBC30\uACBD\uC124\uC815
@@ -515,6 +515,7 @@ FR-Designer_PageSetup_Page=\uC6F9\uD398\uC774\uC9C0
 FR-Designer_Custom_Job_Description=\uC124\uBA85
 FR-Designer_Property=\uC18D\uC131
 FR-Designer_ClassName=\uD074\uB798\uC2A4\uB124\uC784
+FR-Designer_Template_Web_Attributes=\uD15C\uD50C\uB9BF \uC6F9 \uC18D\uC131
 
 FR-Designer_Polyblock_Edit=\uCDE8\uD569\uBE14\uB7ED\uD3B8\uC9D1
 FR-Designer_Function_Description_Area_Text=\uD574\uB2F9\uD074\uB798\uC2A4\uB294\uACC4\uC2B9\uD574\uC57C\uD55C\uB2E4."com.fr.script.AbstractFunction".\uCEF4\uD30C\uC77C\uD6C4\uC758\uD074\uB798\uC2A4\uD30C\uC77C\uC744~\uB85C\uBCF5\uC0AC\nJ2EE\uC11C\uBC84 "{R1}WEB-INF{R2}classes" \uB514\uB809\uD130\uB9AC, \uD544\uC694\uC2DC class \uC0C1\uC751\uD558\uB294 java\uC18C\uC2A4\uD30C\uC77C\uB3C4\uD574\uB2F9\uB514\uB809\uD130\uB9AC\uD558\uB2E8\uC5D0\uB450\uC5B4\uD3B8\uC9D1\uBC0F\uCC3E\uC544\uBCF4\uAE30\uB97C\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.\n\uC608: {R3}classes

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -451,12 +451,12 @@ 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_Absolute=\u7D55\u5C0D\u756B\u5E03\u584A
-FR-Designer_Layout_Block_Tab=
+FR-Designer_Layout_Block_Tab=Tab\u584A
-FR-Designer_Layout_Block_Blank=
+FR-Designer_Layout_Block_Blank=\u7A7A\u767D\u584A
-FR-Designer_Attr_Layout=
+FR-Designer_Attr_Layout=\u4F48\u5C40
-FR-Designer_Attr_Layout_Type=
+FR-Designer_Attr_Layout_Type=\u4F48\u5C40\u65B9\u5F0F
-FR-Designer_Attr_Bidirectional_Adaptive=
+FR-Designer_Attr_Bidirectional_Adaptive=\u96D9\u5411\u81EA\u9069\u61C9
 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
@@ -485,32 +485,32 @@ FR-Designer_Export-PDF=PDF\u683C\u5F0F
 FR-Designer_Properties_Mobile=\u624B\u6A5F\u5C6C\u6027
 FR-Designer_Button_OK=\u78BA\u5B9A
 FR-Designer_Button_Cancel=\u53D6\u6D88
-FR-Designer_JavaScript=
+FR-Designer_JavaScript=JavaScript\u8173\u672C
-FR-Designer_JavaScript_Form_Submit=
+FR-Designer_JavaScript_Form_Submit=\u8868\u55AE\u63D0\u4EA4
-FR-Designer_JavaScript_Commit_to_Database=
+FR-Designer_JavaScript_Commit_to_Database=\u63D0\u4EA4\u5165\u5EAB
-FR-Designer_JavaScript_Custom=
+FR-Designer_JavaScript_Custom=\u81EA\u5B9A\u7FA9
-FR-Designer_RWA_Submit=
+FR-Designer_RWA_Submit=\u63D0\u4EA4
-FR-Designer_Event_Name=
+FR-Designer_Event_Name=\u4E8B\u4EF6\u540D
-FR-Designer_Event_Type=
+FR-Designer_Event_Type=\u4E8B\u4EF6\u985E\u578B
-FR-Designer_Event_Name_Type=
+FR-Designer_Event_Name_Type=\u4E8B\u4EF6\u540D\u5B57\u548C\u985E\u578B
-FR-Designer_JavaScript_Set=
+FR-Designer_JavaScript_Set=JS\u8A2D\u7F6E
-FR-Designer_Attribute=
+FR-Designer_Attribute=\u5C6C\u6027
-FR-Designer_Form_Editing_Listeners=
+FR-Designer_Form_Editing_Listeners=\u4E8B\u4EF6\u7DE8\u8F2F
-FR-Designer_Form_Basic_Properties=
+FR-Designer_Form_Basic_Properties=\u57FA\u672C\u5C6C\u6027
-FR-Designer_DS_Dictionary=
+FR-Designer_DS_Dictionary=\u6578\u64DA\u5B57\u5178
-FR-Designer_Create_Tree=
+FR-Designer_Create_Tree=\u69CB\u5EFA\u6A39
-FR-Designer_Set_Callback_Function=
+FR-Designer_Set_Callback_Function=\u8A2D\u7F6E\u56DE\u8ABF\u51FD\u6578
-FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Content=\u662F\u5426\u78BA\u5B9A\u522A\u9664TAB\u63A7\u4EF6
-FR-Designer_ConfirmDialog_Title=
+FR-Designer_ConfirmDialog_Title=FineReport 8.0
 
 FR-Designer_FormulaPane_Tips=\u63D0\u793A\:\u60A8\u53EF\u4EE5\u901A\u904E\u8F38\u5165B1\u4F86\u5BEB\u5165\u7B2C\u4E00\u5217\u7B2C\u4E8C\u6B04\u7684\u8CC7\u6599\u3002
 FR-Designer_FormulaPane_Variables=\u8B8A\u91CF
 FR-Designer_FormulaPane_Formula_Description=\u516C\u5F0F\u8AAA\u660E
 FR-Designer_FormulaPane_Function_Detail=\u51FD\u6578\u660E\u7D30
 FR-Designer_FormulaPane_Search=\u641C\u7D22
-FR-Designer_Tab_carousel=
+FR-Designer_Tab_carousel=Tab\u8F2A\u64AD
-FR-Designer_setCarousel=
+FR-Designer_setCarousel=\u958B\u555F\u8F2A\u64AD
-FR-Designer_carouselInterval=
+FR-Designer_carouselInterval=\u8F2A\u64AD\u9593\u9694
 
 FR-Designer_ClassName_panel=\u985E\u540D
 FR-Designer_Description_panel=\u63CF\u8FF0