Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merging in latest from upstream (BA/design:refs/heads/release) 

* commit '5c6b3c1a52b44d7f00603da3a90215f1614946a5':
  超链悬浮窗图表，点击确定无效，报null错误
  【国际化修改】 修改几处翻译问题
master
eason 8 years ago
parent
0af798e8d2 5c6b3c1a52
commit
343aca3bd5
2 changed files with 9 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  2. 3
      designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java

12
designer_base/src/com/fr/design/locale/designer_ja_JP.properties
Unescape View File

@ -134,7 +134,7 @@ 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
FR-Designer_M-SwitchWorkspace=\u4F5C\u696D\u30D5\u30A9\u30EB\u30C0\u30FC\u5207\u308A\u66FF\u3048
FR-Designer_M-SwitchWorkspace=\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5207\u308A\u66FF\u3048
FR-Designer_M-Template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
FR-Designer_MDX_Explain=MDX\u8A00\u8A9E\u306E\u6587\u6CD5\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B\u3048\u3070\:\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\:COLUMNS\u3001ROWS\u306F0\u30011\u3092\u4F7F\u7528\u3057\u3066\u4EE3\u66FF\u53EF\u80FD\u3067\u3059\u3002\u30AF\u30A8\u30EA\u8EF8\u306F2\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
@ -299,9 +299,9 @@ FR-Designer_Click_this_button=\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u
FR-Designer_Custom_Icon_Message3=\u30A2\u30A4\u30B3\u30F3\u540D\u306F\u65E2\u306B\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059\u3002
FR-Designer_Set_default_browser=\u65E2\u5B9A\u30D6\u30E9\u30A6\u30B6\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30A4\u30F3\u30BF\u30FC\u30CD\u30C3\u30C8\u30AA\u30D7\u30B7\u30E7\u30F3\u304B\u3089\u65E2\u5B9A\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\u304C\u5229\u7528\u3067\u304D\u306A\u3044\u5834\u5408\u3001\u81EA\u52D5\u3067\u4F5C\u696D\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u5207\u308A\u66FF\u3048\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
FR-Designer_Utils-switch=\n\u4FDD\u5B58\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306F\u73FE\u5728\u306E\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3059\u3002\n\u7D9A\u3051\u307E\u3059\u304B?
FR-Designer_Utils-NewDemoEnv=\u88FD\u54C1\u30C7\u30E2\u304C\u5229\u7528\u3067\u304D\u306A\u3044\u5834\u5408\u3001\u81EA\u52D5\u3067\u4F5C\u696D\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u65B0\u898F\u4F5C\u6210\u3057\u307E\u3059\:
FR-Designer_Utils-OpenDemoEnv=\u88FD\u54C1\u30C7\u30E2\u304C\u5229\u7528\u3067\u304D\u306A\u3044\u5834\u5408\u3001\u81EA\u52D5\u3067\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5207\u308A\u66FF\u3048\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
FR-Designer_Utils-switch=\n\u4FDD\u5B58\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3059\u3002\n\u7D9A\u3051\u307E\u3059\u304B?
FR-Designer_Utils-NewDemoEnv=\u88FD\u54C1\u30C7\u30E2\u304C\u5229\u7528\u3067\u304D\u306A\u3044\u5834\u5408\u3001\u81EA\u52D5\u3067\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u65B0\u898F\u4F5C\u6210\u3057\u307E\u3059\:
FR-Designer_Save_As_Global_Style=\u30B0\u30ED\u30FC\u30D0\u30EB\u30B9\u30BF\u30A4\u30EB\u3068\u3057\u3066\u4FDD\u5B58
FR-Designer_Input_The_Name_Of_Gloabel_Style=\u4FDD\u5B58\u3057\u3066\u3044\u308B\u30B0\u30ED\u30FC\u30D0\u30EB\u30B9\u30BF\u30A4\u30EB\u540D\u3092\u5165\u529B
FR-Designer_This_Name_Has_Exsit=\u3053\u306E\u540D\u524D\u306F\u65E2\u306B\u3042\u308A\u307E\u3059
@ -723,7 +723,7 @@ Form-ComboCheckBox=\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9
BackgroundTexture-WovenMat=\u9EBB
BindColumn-Custom_Data_Appearance=\u30AB\u30B9\u30BF\u30E0\u8868\u793A
Actived=\u30A2\u30AF\u30C6\u30A3\u30D6
Env-Local_Directory=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A9\u30EB\u30C0\u30FC
Env-Local_Directory=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
Form-Colon=\u30B3\u30ED\u30F3
Preference-Vertical_Scroll_Bar_Visible=\u5782\u76F4\u30B9\u30AF\u30ED\u30FC\u30EB\u30D0\u30FC\u3092\u8868\u793A
Utils-Show_Cell_Value=\u30BB\u30EB\u5024\u8868\u793A
@ -752,7 +752,7 @@ FR-Designer_Values-Editor=\u5024\u30A8\u30C7\u30A3\u30BF
Export-Excel=Excel
Utils-Left_to_Right=\u5DE6\u304B\u3089\u53F3\u3078
ExpandD-Vertical_Extendable=\u7E26\u5C55\u958B
Utils-Report_Runtime_Env=\u5E33\u7968\u4F5C\u696D\u30D5\u30A9\u30EB\u30C0\u30FC
Utils-Report_Runtime_Env=\u5E33\u7968\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
Utils-Right_to_Left=\u53F3\u304B\u3089\u5DE6\u3078
Utils-Beyond_the_top_side_of_Border=\u4E0A\u306E\u5883\u754C\u3092\u8D85\u904E\u3057\u3066\u3044\u307E\u3059\u3002
Exception_StackTrace=\u30A8\u30E9\u30FC\u4F8B\u5916\u30B9\u30BF\u30C3\u30AF\u60C5\u5831

3
designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java
Unescape View File

@ -15,6 +15,7 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itabpane.TitleChangeListener;
import com.fr.design.mainframe.chart.ChartEditPane;
import com.fr.general.Inter;
import com.fr.stable.StableUtils;
import javax.swing.*;
import java.awt.*;
@ -36,6 +37,8 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
createNameLabel();
this.add(createNorthComponent(), BorderLayout.NORTH);
chartEditPane = StableUtils.construct(ChartEditPane.class);
chartEditPane.setSupportCellData(true);
}
public void addChartEditPane(String plotID){

Write Preview
Loading…
Cancel
Save