fanruan
/
design-i18n
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'bugfix/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/design-i18n into release/10.0 

 Conflicts:
	design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
release/10.0
Harrison 5 years ago
parent
049f1e7a69 2abb940991
commit
65418c2713
5 changed files with 0 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
  2. 1
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
  3. 1
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
  4. 1
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
  5. 1
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

1
design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
Unescape View File

@ -1103,7 +1103,6 @@ Fine-Design_Basic_Config=Config
Fine-Design_Basic_Configured_Roles=Configured role Fine-Design_Basic_Configured_Roles=Configured role
Fine-Design_Basic_Confirm=OK Fine-Design_Basic_Confirm=OK
Fine-Design_Form_Confirm_Dialog_Content=\u662F\u5426\u786E\u5B9A\u5220\u9664tab\u63A7\u4EF6 Fine-Design_Form_Confirm_Dialog_Content=\u662F\u5426\u786E\u5B9A\u5220\u9664tab\u63A7\u4EF6
Fine-Design_Form_ConfirmDialog_Title=FineReport 8.0
Fine-Design_Report_Confusion_Key=\u6DF7\u6DC6\u5173\u952E\u5B57 Fine-Design_Report_Confusion_Key=\u6DF7\u6DC6\u5173\u952E\u5B57
Fine-Design_Basic_Connect_SQL_Cannot_Null=Connect SQL Cannot be Null Fine-Design_Basic_Connect_SQL_Cannot_Null=Connect SQL Cannot be Null
Fine-Design_Report_Connection_Failed=connection failed Fine-Design_Report_Connection_Failed=connection failed

1
design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
Unescape View File

@ -1103,7 +1103,6 @@ Fine-Design_Basic_Config=\u8A2D\u5B9A
Fine-Design_Basic_Configured_Roles=\u5F79\u5272\u8A2D\u5B9A\u6E08\u307F Fine-Design_Basic_Configured_Roles=\u5F79\u5272\u8A2D\u5B9A\u6E08\u307F
Fine-Design_Basic_Confirm=OK Fine-Design_Basic_Confirm=OK
Fine-Design_Form_Confirm_Dialog_Content=tab\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u304B Fine-Design_Form_Confirm_Dialog_Content=tab\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u304B
Fine-Design_Form_ConfirmDialog_Title=FineReport 8.0
Fine-Design_Report_Confusion_Key=\u30DF\u30C3\u30AF\u30B9\u30AD\u30FC\u30EF\u30FC\u30C9 Fine-Design_Report_Confusion_Key=\u30DF\u30C3\u30AF\u30B9\u30AD\u30FC\u30EF\u30FC\u30C9
Fine-Design_Basic_Connect_SQL_Cannot_Null=\u30C7\u30FC\u30BF\u63A5\u7D9A\u3068SQL\u30D1\u30CD\u30EB\u306F\u7A7A\u767D\u4E0D\u53EF Fine-Design_Basic_Connect_SQL_Cannot_Null=\u30C7\u30FC\u30BF\u63A5\u7D9A\u3068SQL\u30D1\u30CD\u30EB\u306F\u7A7A\u767D\u4E0D\u53EF
Fine-Design_Report_Connection_Failed=\u63A5\u7D9A\u5931\u6557 Fine-Design_Report_Connection_Failed=\u63A5\u7D9A\u5931\u6557

1
design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
Unescape View File

@ -1096,7 +1096,6 @@ Fine-Design_Basic_Config=\uAD6C\uC131
Fine-Design_Basic_Configured_Roles=\uC5ED\uD560\uC774 \uAD6C\uC131\uB418\uC5C8\uC2B5\uB2C8\uB2E4. Fine-Design_Basic_Configured_Roles=\uC5ED\uD560\uC774 \uAD6C\uC131\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
Fine-Design_Basic_Confirm=\uD655\uC778 Fine-Design_Basic_Confirm=\uD655\uC778
Fine-Design_Form_Confirm_Dialog_Content=tab\uCEE8\uD2B8\uB864\uC744 \uC0AD\uC81C \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAC00? Fine-Design_Form_Confirm_Dialog_Content=tab\uCEE8\uD2B8\uB864\uC744 \uC0AD\uC81C \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAC00?
Fine-Design_Form_ConfirmDialog_Title=FineReport 8.0
Fine-Design_Report_Confusion_Key=\uD63C\uD569 \uD0A4\uC6CC\uB4DC Fine-Design_Report_Confusion_Key=\uD63C\uD569 \uD0A4\uC6CC\uB4DC
Fine-Design_Basic_Connect_SQL_Cannot_Null=\uB370\uC774\uD130\uB9C1\uD06C\uC640 SQL\uD328\uB110\uC740 \uBE48\uAC12\uC73C\uB85C \uB458\uC218\uC5C6\uC2B5\uB2C8\uB2E4. Fine-Design_Basic_Connect_SQL_Cannot_Null=\uB370\uC774\uD130\uB9C1\uD06C\uC640 SQL\uD328\uB110\uC740 \uBE48\uAC12\uC73C\uB85C \uB458\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
Fine-Design_Report_Connection_Failed=\uC5F0\uACB0 \uC2E4\uD328 Fine-Design_Report_Connection_Failed=\uC5F0\uACB0 \uC2E4\uD328

1
design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
Unescape View File

@ -1103,7 +1103,6 @@ Fine-Design_Basic_Config=\u914D\u7F6E
Fine-Design_Basic_Configured_Roles=\u5DF2\u914D\u7F6E\u89D2\u8272 Fine-Design_Basic_Configured_Roles=\u5DF2\u914D\u7F6E\u89D2\u8272
Fine-Design_Basic_Confirm=\u786E\u8BA4 Fine-Design_Basic_Confirm=\u786E\u8BA4
Fine-Design_Form_Confirm_Dialog_Content=\u662F\u5426\u786E\u5B9A\u5220\u9664tab\u63A7\u4EF6 Fine-Design_Form_Confirm_Dialog_Content=\u662F\u5426\u786E\u5B9A\u5220\u9664tab\u63A7\u4EF6
Fine-Design_Form_ConfirmDialog_Title=FineReport 8.0
Fine-Design_Report_Confusion_Key=\u6DF7\u6DC6\u5173\u952E\u5B57 Fine-Design_Report_Confusion_Key=\u6DF7\u6DC6\u5173\u952E\u5B57
Fine-Design_Basic_Connect_SQL_Cannot_Null=\u6570\u636E\u8FDE\u63A5\u548CSQL\u9762\u677F\u4E0D\u80FD\u4E3A\u7A7A Fine-Design_Basic_Connect_SQL_Cannot_Null=\u6570\u636E\u8FDE\u63A5\u548CSQL\u9762\u677F\u4E0D\u80FD\u4E3A\u7A7A
Fine-Design_Report_Connection_Failed=\u94FE\u63A5\u5931\u8D25 Fine-Design_Report_Connection_Failed=\u94FE\u63A5\u5931\u8D25

1
design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
Unescape View File

@ -1092,7 +1092,6 @@ Fine-Design_Basic_Config=\u914D\u7F6E
Fine-Design_Basic_Configured_Roles=\u5DF2\u914D\u7F6E\u89D2\u8272 Fine-Design_Basic_Configured_Roles=\u5DF2\u914D\u7F6E\u89D2\u8272
Fine-Design_Basic_Confirm=\u78BA\u8A8D Fine-Design_Basic_Confirm=\u78BA\u8A8D
Fine-Design_Form_Confirm_Dialog_Content=\u662F\u5426\u78BA\u5B9A\u522A\u9664TAB\u5143\u4EF6 Fine-Design_Form_Confirm_Dialog_Content=\u662F\u5426\u78BA\u5B9A\u522A\u9664TAB\u5143\u4EF6
Fine-Design_Form_ConfirmDialog_Title=FineReport 8.0
Fine-Design_Report_Confusion_Key=\u6DF7\u6DC6\u95DC\u9375\u5B57 Fine-Design_Report_Confusion_Key=\u6DF7\u6DC6\u95DC\u9375\u5B57
Fine-Design_Basic_Connect_SQL_Cannot_Null=\u8CC7\u6599\u9023\u63A5\u548CSQL\u9762\u677F\u4E0D\u80FD\u70BA\u7A7A Fine-Design_Basic_Connect_SQL_Cannot_Null=\u8CC7\u6599\u9023\u63A5\u548CSQL\u9762\u677F\u4E0D\u80FD\u70BA\u7A7A
Fine-Design_Report_Connection_Failed=\u9023\u7D50\u5931\u6557 Fine-Design_Report_Connection_Failed=\u9023\u7D50\u5931\u6557

Write Preview
Loading…
Cancel
Save