config/locales/en.yml in amalgam-2.1.1 vs config/locales/en.yml in amalgam-2.1.2

- old
+ new

@@ -36,11 +36,11 @@ attachment_list: 'attachment list' attachment: 'attachment' description: 'description' name: 'name' locales: - zh-CN: 'simplified Chinese' - zh-cn: 'simplified Chinese' + zh-CN: '中文(简体)' + zh-cn: '中文(简体)' en: 'English' registrations: currentpassword: 'we need your current password to confirm your changes' leaveblank: "leave it blank if you don't want to change it" fail: \ No newline at end of file