Merge pull request #633 in BA/design from ~PLOUGH/design:master to master

* commit '11fb4878f357c4f46fff2fe2b10142cfd82ee0f3': REPORT-1417 中文设计器，取色器更多颜色下确定取消按钮显示为英文key值
8 years ago · d845c90456
6 changed files with 13 additions and 1 deletions
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@ -492,3 +492,5 @@ FR-Designer_Permissions_Edition=Permissions Edition
 FR-Designer_Export_Excel_Page=Page
 FR-Designer_Export_Excel_Simple=Simple
 FR-Designer_Export_Excel_PageToSheet=Page To Sheet
+FR-Designer_Button_OK=OK
+FR-Designer_Button_Cancel=Cancel
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@ -492,3 +492,5 @@ FR-Designer_Permission_Edition=Permissions Edition
 FR-Designer_Export_Excel_Page=Page Break
 FR-Designer_Export_Excel_Simple=Original
 FR-Designer_Export_Excel_PageToSheet=One Page Per Sheet
+FR-Designer_Button_OK=OK
+FR-Designer_Button_Cancel=Cancel
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@ -469,3 +469,5 @@ FR-Designer_Permissions_Edition=\u6A29\u9650\u7DE8\u96C6
 FR-Designer_Export_Excel_Page=\u6539\u30DA\u30FC\u30B8\u51FA\u529B
 FR-Designer_Export_Excel_Simple=\u305D\u306E\u307E\u307E\u51FA\u529B
 FR-Designer_Export_Excel_PageToSheet=\u6539\u30DA\u30FC\u30B8\uFF06\u30B7\u30FC\u30C8\u5206\u3051
+FR-Designer_Button_OK=\u78BA\u5B9A
+FR-Designer_Button_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@ -464,4 +464,6 @@ FR-Designer_Properties=
 FR-Designer_Permissions_Edition=\uAD8C\uD55C\uD3B8\uC9D1
 FR-Designer_Export_Excel_Page=\uD398\uC774\uC9C0\uB098\uB204\uAE30\uC5B4\uB0B4\uBCF4\uB0B4\uAE30
 FR-Designer_Export_Excel_Simple=\uC6D0\uB798\uBAA8\uC2B5\uB0B4\uBCF4\uB0B4\uAE30
-FR-Designer_Export_Excel_PageToSheet=\uD398\uC774\uC9C0\uC640 Sheet\uB098\uB204\uC5B4\uB0B4\uBCF4\uB0B4\uAE30
+FR-Designer_Export_Excel_PageToSheet=\uD398\uC774\uC9C0\uC640 Sheet\uB098\uB204\uC5B4\uB0B4\uBCF4\uB0B4\uAE30
+FR-Designer_Button_OK=\uD655\uC778
+FR-Designer_Button_Cancel=\uCDE8\uC18C
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@ -495,3 +495,5 @@ FR-Designer_Permissions_Edition=\u6743\u9650\u7F16\u8F91
 FR-Designer_Export_Excel_Page=\u5206\u9875\u5BFC\u51FA
 FR-Designer_Export_Excel_Simple=\u539F\u6837\u5BFC\u51FA
 FR-Designer_Export_Excel_PageToSheet=\u5206\u9875\u5206Sheet\u5BFC\u51FA
+FR-Designer_Button_OK=\u786E\u5B9A
+FR-Designer_Button_Cancel=\u53D6\u6D88
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@ -483,3 +483,5 @@ FR-Designer_Permissions_Edition=\u6B0A\u9650\u7DE8\u8F2F
 FR-Designer_Export_Excel_Page=\u5206\u9801\u532F\u51FA
 FR-Designer_Export_Excel_Simple=\u539F\u6A23\u532F\u51FA
 FR-Designer_Export_Excel_PageToSheet=\u5206\u9801\u5206Sheet\u532F\u51FA
+FR-Designer_Button_OK=\u78BA\u5B9A
+FR-Designer_Button_Cancel=\u53D6\u6D88