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

a2fec5bcf4 f364dcefa4

commit

d3808bd918

6 changed files with 2048 additions and 2300 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. 724
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
2. 724
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en_US.properties
3. 726
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
4. 724
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
5. 724
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_CN.properties
6. 726
     design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties

724

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

View File

File diff suppressed because it is too large Load Diff

724

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

View File

File diff suppressed because it is too large Load Diff

726

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

724

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

724

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

View File

File diff suppressed because it is too large Load Diff

726

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

Write Preview

Loading…

Cancel

Save