fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

无JIRA任务， 冲突修正

master
neil 8 years ago
parent
a68922298b
commit
a834655243
6 changed files with 8910 additions and 172 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. 1473
      designer_base/src/com/fr/design/locale/designer.properties
  2. 1555
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  3. 1573
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  4. 1491
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  5. 1466
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  6. 1524
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties

1473
designer_base/src/com/fr/design/locale/designer.properties
View File

File diff suppressed because it is too large Load Diff

1555
designer_base/src/com/fr/design/locale/designer_en_US.properties
View File

File diff suppressed because it is too large Load Diff

1573
designer_base/src/com/fr/design/locale/designer_ja_JP.properties
View File

File diff suppressed because it is too large Load Diff

1491
designer_base/src/com/fr/design/locale/designer_ko_KR.properties
View File

File diff suppressed because it is too large Load Diff

1466
designer_base/src/com/fr/design/locale/designer_zh_CN.properties
View File

File diff suppressed because it is too large Load Diff

1524
designer_base/src/com/fr/design/locale/designer_zh_TW.properties
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save