Browse Source

无JIRA任务, 冲突修正

master
neil 8 years ago
parent
commit
a834655243
  1. 1473
      designer_base/src/com/fr/design/locale/designer.properties
  2. 1553
      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. 1464
      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

File diff suppressed because it is too large Load Diff

1553
designer_base/src/com/fr/design/locale/designer_en_US.properties

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

1464
designer_base/src/com/fr/design/locale/designer_zh_CN.properties

File diff suppressed because it is too large Load Diff

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

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