Merge pull request #777 in BA/design from ~PLOUGH/design:dev to dev

* commit '7a026b4b11cf43fd1e123ed568eccfbdfaa4e9c1': 无JIRA任务，国际化
8 years ago · f575784236
6 changed files with 6 additions and 6 deletions
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@ -543,7 +543,7 @@ FR-Designer_Left_Display=Left
 FR-Designer_About_Version=Version
 FR-Designer_About_CopyRight=Copy Right
 FR-Designer_Service_Phone=Service Phone
-FR-Designer_Allow_Blank=Allow Blank
+FR-Designer_Allow_Null=Allow Null
 FR-Designer_PageSetup_Page=Page
 FR-Designer_Custom_Job_Description=Description
 FR-Designer_Property=Property
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@ -544,7 +544,7 @@ FR-Designer_Left_Display=Left
 FR-Designer_About_Version=Version
 FR-Designer_About_CopyRight=Copy Right
 FR-Designer_Service_Phone=Service Phone
-FR-Designer_Allow_Blank=Allow Null
+FR-Designer_Allow_Null=Allow Null
 FR-Designer_PageSetup_Page=Page
 FR-Designer_Custom_Job_Description=Description
 FR-Designer_Property=Property
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@ -518,7 +518,7 @@ FR-Designer_Left_Display=\u5DE6\u8868\u793A
 FR-Designer_About_Version=\u30D0\u30FC\u30B8\u30E7\u30F3
 FR-Designer_About_CopyRight=\u8457\u4F5C\u6A29\u6240\u6709
 FR-Designer_Service_Phone=\u30B5\u30FC\u30D3\u30B9\u96FB\u8A71\uFF1A
-FR-Designer_Allow_Blank=\u7A7A\u6B04\u3042\u308A
+FR-Designer_Allow_Null=\u7A7A\u6B04\u3042\u308A
 FR-Designer_PageSetup_Page=\u30DA\u30FC\u30B8
 FR-Designer_Custom_Job_Description=\u8A18\u8FF0
 FR-Designer_Property=\u5C5E\u6027
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@ -514,7 +514,7 @@ FR-Designer_Left_Display=\uC67C\uCABD\uBCF4\uC774\uAE30
 FR-Designer_About_Version=\uBC84\uC804
 FR-Designer_About_CopyRight=\uD310\uAD8C\uC18C\uC720
 FR-Designer_Service_Phone=\uC11C\uBE44\uC2A4\uC804\uD654\uFF1A
-FR-Designer_Allow_Blank=\uBE48\uCE78\uD5C8\uC6A9
+FR-Designer_Allow_Null=\uBE48\uCE78\uD5C8\uC6A9
 FR-Designer_PageSetup_Page=\uC6F9\uD398\uC774\uC9C0
 FR-Designer_Custom_Job_Description=\uC124\uBA85
 FR-Designer_Property=\uC18D\uC131
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@ -548,7 +548,7 @@ FR-Designer_Left_Display=\u5DE6\u5C55\u793A
 FR-Designer_About_Version=\u7248\u672C
 FR-Designer_About_CopyRight=\u7248\u6743\u6240\u6709
 FR-Designer_Service_Phone=\u670D\u52A1\u7535\u8BDD\uFF1A
-FR-Designer_Allow_Blank=\u5141\u8BB8\u4E3A\u7A7A
+FR-Designer_Allow_Null=\u5141\u8BB8\u4E3A\u7A7A
 FR-Designer_PageSetup_Page=\u9875\u9762
 FR-Designer_Custom_Job_Description=\u63CF\u8FF0
 FR-Designer_Property=\u5C5E\u6027
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@ -536,7 +536,7 @@ FR-Designer_Left_Display=\u5DE6\u986F\u793A
 FR-Designer_About_Version=\u7248\u672C
 FR-Designer_About_CopyRight=\u7248\u6B0A\u6240\u6709
 FR-Designer_Service_Phone=\u670D\u52D9\u96FB\u8A71\uFF1A
-FR-Designer_Allow_Blank=\u5141\u8A31\u70BA\u7A7A\u767D
+FR-Designer_Allow_Null=\u5141\u8A31\u70BA\u7A7A\u767D
 FR-Designer_PageSetup_Page=\u9801\u9762
 FR-Designer_Custom_Job_Description=\u63CF\u8FF0
 FR-Designer_Property=\u5C6C\u6027