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

Merge remote-tracking branch 'origin/release/10.0' into release/10.0 

# Conflicts:
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
final/10.0
Harrison 6 years ago
parent
4e320ea4ab 709448429f
commit
ac17bd1ece
6 changed files with 150 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. 33
      design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
  2. 33
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
  3. 21
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
  4. 2
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
  5. 33
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
  6. 34
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

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

@ -2134,4 +2134,35 @@ Fine-Design_Basic_Engine_Event_Success=Success
Fine-Design_Basic_Engine_Event_Unload_Check=Unloading page with data not submitted
Fine-Design_Basic_Engine_Event_Write_Failure=Writefailure
Fine-Design_Basic_Engine_Event_Write_Success=Writesuccess
Fine-Design_Basic_Engine_Local_Workspace=Local Directory
Fine-Design_Basic_Local_Workspace=Local Directory
Fine-Design_Updater_UpdateAndUpgrade=
Fine-Design_Updater_Checking_Jar_Update=
Fine-Design_Updater_Update=
Fine-Design_Updater_Restore=
Fine-Design_Updater_New_Version_Available=
Fine-Design_Updater_JarUpdate=
Fine-Design_Updater_No_Previous_Version=
Fine-Design_Updater_Not_Install_Version=
Fine-Design_Updater_Restart_Designer=
Fine-Design_Updater_Connect_VersionUpdateServer_Failed=
Fine-Design_Updater_Already_Latest_Version=
Fine-Design_Updater_Jar_Restore=
Fine-Design_Updater_Restore_To=
Fine-Design_Updater_WorksAfterRestart=
Fine-Design_Updater_Cancel=
Fine-Design_Updater_Ok=
Fine-Design_Updater_Restart_Later=
Fine-Design_Updater_Download_Failed=
Fine-Design_Updater_Alert=
Fine-Design_Updater_Date=
Fine-Design_Updater_Content=
Fine-Design_Updater_Search=
Fine-Design_Updater_SignHeader=
Fine-Design_Updater_Designer_Version=
Fine-Design_Updater_JAR_Version=
Fine-Design_Updater_Latest_JAR=
Fine-Design_Updater_Update_to_V9.0=
Fine-Design_Updater_Restore_Old_Version=
Fine-Design_Updater_Already_Backup_Old_Project=
Fine-Design_Updater_Unzip_Replace_Restore=
Fine-Design_Updater_Restore_to_V8=

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

@ -2132,4 +2132,35 @@ Fine-Design_Basic_Engine_Event_Success=Success
Fine-Design_Basic_Engine_Event_Unload_Check=Leave Without Submitting
Fine-Design_Basic_Engine_Event_Write_Failure=Filling failed
Fine-Design_Basic_Engine_Event_Write_Success=Filling successfully
Fine-Design_Basic_Engine_Local_Workspace=Local Directory
Fine-Design_Basic_Local_Workspace=Local Directory
Fine-Design_Updater_UpdateAndUpgrade=Update&Upgrade
Fine-Design_Updater_Checking_Jar_Update=checking jarpackage update
Fine-Design_Updater_Update=update
Fine-Design_Updater_Restore=restore to previous?
Fine-Design_Updater_New_Version_Available=new version available
Fine-Design_Updater_JarUpdate=JARPack Update
Fine-Design_Updater_No_Previous_Version=no previous version
Fine-Design_Updater_Not_Install_Version=not install version
Fine-Design_Updater_Restart_Designer=restart
Fine-Design_Updater_Connect_VersionUpdateServer_Failed=cannot connect to version-update-server
Fine-Design_Updater_Already_Latest_Version=The latest version already
Fine-Design_Updater_Jar_Restore=JARPackage restore
Fine-Design_Updater_Restore_To=restore to
Fine-Design_Updater_WorksAfterRestart=version, works after restart
Fine-Design_Updater_Cancel=Cancel
Fine-Design_Updater_Ok=Ok
Fine-Design_Updater_Restart_Later=restart later
Fine-Design_Updater_Download_Failed=download failed\!
Fine-Design_Updater_Alert=Warning
Fine-Design_Updater_Date=Date
Fine-Design_Updater_Content=Content
Fine-Design_Updater_Search=Search
Fine-Design_Updater_SignHeader=Header
Fine-Design_Updater_Designer_Version=Designer Version
Fine-Design_Updater_JAR_Version=JAR Version
Fine-Design_Updater_Latest_JAR=Latest JAR
Fine-Design_Updater_Update_to_V9.0=Upgrade to FineReport v9.0
Fine-Design_Updater_Restore_Old_Version=Restore to V8.0
Fine-Design_Updater_Already_Backup_Old_Project=Designer V8.0 already backups at
Fine-Design_Updater_Unzip_Replace_Restore=,unzip outside /FineReport and run independently.
Fine-Design_Updater_Restore_to_V8=Restore FR8.0

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

@ -2124,4 +2124,23 @@ Fine-Design_Basic_Engine_Event_Success=\u6210\u529F
Fine-Design_Basic_Engine_Event_Unload_Check=\u9001\u4FE1\u305B\u305A\u306B\u96E2\u308C\u308B
Fine-Design_Basic_Engine_Event_Write_Failure=\u66F8\u304D\u8FBC\u307F\u5931\u6557
Fine-Design_Basic_Engine_Event_Write_Success=\u66F8\u304D\u8FBC\u307F\u6210\u529F
Fine-Design_Basic_Engine_Local_Workspace=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
Fine-Design_Basic_Local_Workspace=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
Fine-Design_Updater_UpdateAndUpgrade=\u66F4\u65B0\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
Fine-Design_Updater_Checking_Jar_Update=Jar\u30D1\u30C3\u30B1\u30FC\u30B8\u30C1\u30A7\u30C3\u30AF\u66F4\u65B0\u4E2D
Fine-Design_Updater_Update=\u66F4\u65B0
Fine-Design_Updater_Restore=\u5FA9\u5143
Fine-Design_Updater_New_Version_Available=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u6709\u308A
Fine-Design_Updater_JarUpdate=JAR\u30D1\u30C3\u30B1\u30FC\u30B8\u66F4\u65B0
Fine-Design_Updater_No_Previous_Version=\u30CE\u30FC\u53E4\u3044\u30D0\u30FC\u30B8\u30E7\u30F3
Fine-Design_Updater_Not_Install_Version=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u306F\u306A\u3044
Fine-Design_Updater_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u518D\u8D77\u52D5
Fine-Design_Updater_Connect_VersionUpdateServer_Failed=\u30D0\u30FC\u30B8\u30E7\u30F3\u66F4\u65B0\u30B5\u30FC\u30D0\u30FC\u63A5\u7D9A\u3067\u304D\u306A\u3044
Fine-Design_Updater_Already_Latest_Version=\u65E2\u306B\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3
Fine-Design_Updater_Jar_Restore=\u65E7JAR\u30D1\u30C3\u30B1\u30FC\u30B8\u5FA9\u5143
Fine-Design_Updater_Restore_To=\u5FA9\u5143
Fine-Design_Updater_WorksAfterRestart=\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u518D\u8D77\u52D5\u5F8C\u306B\u6709\u52B9\u3059\u308B
Fine-Design_Updater_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
Fine-Design_Updater_Ok=\u78BA\u5B9A
Fine-Design_Updater_Restart_Later=\u5F8C\u307B\u3069\u30EA\u30B9\u30BF\u30FC\u30C8
Fine-Design_Updater_Download_Failed=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3059\u308B
Fine-Design_Updater_Alert=\u8B66\u544A

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

@ -2128,4 +2128,4 @@ Fine-Design_Basic_Engine_Event_Success=\uC131\uACF5
Fine-Design_Basic_Engine_Event_Unload_Check=\uBBF8\uC81C\uCD9C\uB098\uAC14\uC74C
Fine-Design_Basic_Engine_Event_Write_Failure=\uAE30\uC785\uC2E4\uD328
Fine-Design_Basic_Engine_Event_Write_Success=\uAE30\uC785\uC131\uACF5
Fine-Design_Basic_Engine_Local_Workspace=\uB85C\uCEEC\uB514\uB809\uD130\uB9AC
Fine-Design_Basic_Local_Workspace=\uB85C\uCEEC\uB514\uB809\uD130\uB9AC

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

@ -2134,4 +2134,35 @@ Fine-Design_Basic_Engine_Event_Unload_Check=\u672A\u63D0\u4EA4\u79BB\u5F00
Fine-Design_Basic_Engine_Event_Write_Failure=\u586B\u62A5\u5931\u8D25
Fine-Design_Basic_Engine_Event_Write_Success=\u586B\u62A5\u6210\u529F
Fine-Design_Report_Alignment=\u5BF9\u9F50
Fine-Design_Basic_Engine_Local_Workspace=\u672C\u5730\u76EE\u5F55
Fine-Design_Basic_Local_Workspace=\u672C\u5730\u76EE\u5F55
Fine-Design_Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7EA7
Fine-Design_Updater_Checking_Jar_Update=\u6B63\u5728\u68C0\u6D4BJar\u66F4\u65B0
Fine-Design_Updater_Update=\u66F4\u65B0
Fine-Design_Updater_Restore=\u8FD8\u539F\u5230\u4EE5\u524D?
Fine-Design_Updater_New_Version_Available=\u6709\u65B0\u7248\u672C
Fine-Design_Updater_JarUpdate=JAR\u5305\u66F4\u65B0
Fine-Design_Updater_No_Previous_Version=\u6CA1\u6709\u66F4\u65E9\u7684\u7248\u672C
Fine-Design_Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88C5\u7248\u672C
Fine-Design_Updater_Restart_Designer=\u7ACB\u5373\u91CD\u542F
Fine-Design_Updater_Connect_VersionUpdateServer_Failed=\u65E0\u6CD5\u8FDE\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52A1\u5668
Fine-Design_Updater_Already_Latest_Version=\u5DF2\u7ECF\u662F\u6700\u65B0\u7248\u672C
Fine-Design_Updater_Jar_Restore=JAR\u5305\u8FD8\u539F
Fine-Design_Updater_Restore_To=\u8FD8\u539F\u5230
Fine-Design_Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u542F\u751F\u6548
Fine-Design_Updater_Cancel=\u53D6\u6D88
Fine-Design_Updater_Ok=\u786E\u5B9A
Fine-Design_Updater_Restart_Later=\u7A0D\u540E\u91CD\u542F
Fine-Design_Updater_Download_Failed=\u4E0B\u8F7D\u5931\u8D25
Fine-Design_Updater_Alert=\u8B66\u544A
Fine-Design_Updater_Date=\u66F4\u65B0\u65E5\u671F
Fine-Design_Updater_Content=\u5185\u5BB9
Fine-Design_Updater_Search=\u641C\u7D22
Fine-Design_Updater_SignHeader=\u6807\u5FD7\u4F4D
Fine-Design_Updater_Designer_Version=\u8BBE\u8BA1\u5668\u7248\u672C
Fine-Design_Updater_JAR_Version=JAR\u7248\u672C
Fine-Design_Updater_Latest_JAR=\u6700\u65B0JAR
Fine-Design_Updater_Update_to_V9.0=\u5347\u7EA7\u81F3FineReport9.0\u7248\u672C
Fine-Design_Updater_Restore_Old_Version=\u8FD8\u539F\u81F38.0\u7248\u672C
Fine-Design_Updater_Already_Backup_Old_Project=8.0\u8BBE\u8BA1\u5668\u5DF2\u7ECF\u5907\u4EFD\u5728
Fine-Design_Updater_Unzip_Replace_Restore=\u76EE\u5F55\u4E0B\uFF0C\u89E3\u538B\u540E\u53EF\u72EC\u7ACB\u8FD0\u884C\u3002\u5EFA\u8BAE\u5728FineReport\u6839\u76EE\u5F55\u5916\u89E3\u538B\u3002
Fine-Design_Updater_Restore_to_V8=\u8FD8\u539F\u81F3FR8.0

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

@ -2130,5 +2130,37 @@ Fine-Design_Basic_Engine_Event_Unload_Check=\u672A\u63D0\u4EA4\u96E2\u958B
Fine-Design_Basic_Engine_Event_Write_Failure=\u586B\u5831\u5931\u6557
Fine-Design_Basic_Engine_Event_Write_Success=\u586B\u5831\u6210\u529F
Fine-Design_Report_Alignment=\u5C0D\u9F4A
Fine-Design_Basic_Engine_Local_Workspace=\u672C\u6A5F\u76EE\u9304
Fine-Design_Basic_Local_Workspace=\u672C\u6A5F\u76EE\u9304
Fine-Design_Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7D1A
Fine-Design_Updater_Checking_Jar_Update=\u6B63\u5728\u6AA2\u6E2CJar\u66F4\u65B0
Fine-Design_Updater_Update=\u66F4\u65B0
Fine-Design_Updater_Restore=\u9084\u539F\u5230\u4EE5\u524D?
Fine-Design_Updater_New_Version_Available=\u6709\u65B0\u7248\u672C
Fine-Design_Updater_JarUpdate=JAR\u5305\u66F4\u65B0
Fine-Design_Updater_No_Previous_Version=\u6C92\u6709\u66F4\u65E9\u7684\u7248\u672C
Fine-Design_Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88DD\u7248\u672C
Fine-Design_Updater_Restart_Designer=\u7ACB\u5373\u91CD\u555F
Fine-Design_Updater_Connect_VersionUpdateServer_Failed=\u7121\u6CD5\u9023\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52D9\u5668
Fine-Design_Updater_Already_Latest_Version=\u5DF2\u7D93\u662F\u6700\u65B0\u7248\u672C
Fine-Design_Updater_Jar_Restore=JAR\u5305\u9084\u539F
Fine-Design_Updater_Restore_To=\u9084\u539F\u5230
Fine-Design_Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u555F\u751F\u6548
Fine-Design_Updater_Cancel=\u53D6\u6D88
Fine-Design_Updater_Ok=\u78BA\u5B9A
Fine-Design_Updater_Restart_Later=\u7A0D\u5F8C\u91CD\u555F
Fine-Design_Updater_Download_Failed=\u4E0B\u8F09\u5931\u6557
Fine-Design_Updater_Alert=\u8B66\u544A
Fine-Design_Updater_Date=\u66F4\u65B0\u65E5\u671F
Fine-Design_Updater_Content=\u5167\u5BB9
Fine-Design_Updater_Search=\u641C\u7D22
Fine-Design_Updater_SignHeader=\u6807\u5FD7\u4F4D
Fine-Design_Updater_Designer_Version=\u8A2D\u8A08\u5668\u7248\u672C
Fine-Design_Updater_JAR_Version=JAR\u7248\u672C
Fine-Design_Updater_Latest_JAR=\u6700\u65B0JAR
Fine-Design_Updater_Update_to_V9.0=\u5347\u7D1A\u81F3FINEREPORT9.0\u7248\u672C
Fine-Design_Updater_Restore_Old_Version=\u9084\u539F\u81F38.0\u7248\u672C
Fine-Design_Updater_Already_Backup_Old_Project=8.0\u8A2D\u8A08\u5668\u5DF2\u7D93\u5099\u4EFD\u5728
Fine-Design_Updater_Unzip_Replace_Restore=\u76EE\u9304\u4E0B\uFF0C\u89E3\u58D3\u5F8C\u53EF\u7368\u7ACB\u57F7\u884C\u3002\u5EFA\u8B70\u5728FINEREPORT\u6839\u76EE\u9304\u5916\u89E3\u58D3\u3002
Fine-Design_Updater_Restore_to_V8=\u9084\u539F\u81F3FR8.0

Write Preview
Loading…
Cancel
Save