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

final/10.0

Jinbokai 6 years ago

parent

9ca5ae599d 9ba893c410

commit

ae9373bf7f

6 changed files with 3950 additions and 3940 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. 1312
     design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
2. 1317
     design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
3. 1314
     design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
4. 1318
     design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
5. 1316
     design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
6. 1313
     design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

1312

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

View File

File diff suppressed because it is too large Load Diff

1317

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

View File

File diff suppressed because it is too large Load Diff

1314

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

1318

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

1316

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

View File

File diff suppressed because it is too large Load Diff

1313

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