Browse Source

Merge branch 'release/10.0' of https://code.fineres.com/scm/~lidongy/design-i18n into bugfix/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.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.properties
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

bugfix/10.0

lidongy 4 years ago

parent

c11bd257e8 55cc364da4

commit

fc5326a120

12 changed files with 17400 additions and 16352 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. 1363
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
2. 1357
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
3. 1349
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
4. 1345
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
5. 1352
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
6. 1346
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
7. 4962
     design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
8. 4345
     design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
9. 3897
     design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
10. 4299
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
11. 3923
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties
12. 4214
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

1363

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties

View File

File diff suppressed because it is too large Load Diff

1357

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en_US.properties → design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties

View File

File diff suppressed because it is too large Load Diff

1349

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties

View File

File diff suppressed because it is too large Load Diff

1345

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties

View File

File diff suppressed because it is too large Load Diff

1352

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_CN.properties → design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties

View File

File diff suppressed because it is too large Load Diff

1346

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties

View File

File diff suppressed because it is too large Load Diff

4962

design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties

View File

File diff suppressed because it is too large Load Diff

4345

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_en.properties

View File

File diff suppressed because it is too large Load Diff

3897

design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties

View File

File diff suppressed because it is too large Load Diff

4299

design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties

View File

File diff suppressed because it is too large Load Diff

3923

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.properties

View File

File diff suppressed because it is too large Load Diff

4214

design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save