Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zack/design

8 years ago · ef2079a7a6
8 changed files with 9418 additions and 29 deletions
--- a/designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java
+++ b/designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties