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

* commit '66337fa78c347b88fabfa74f40e28c7dcc6f121e':
  国际化翻译

designer/designer.iml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/../../env/WebReport/WEB-INF/classes" />
+    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="jdk1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="designer_base" />
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="module" module-name="designer_form" />
+    <orderEntry type="module" module-name="designer_chart" />
   </component>
 </module>

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
@@ -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.