Merge fix.

This commit is contained in:
F0rb1d 2019-02-03 00:34:35 +08:00
parent c1bc895248
commit d281cfded5
2 changed files with 3 additions and 3 deletions

View file

@ -69,7 +69,7 @@ return [
'last_name' => '名称', 'last_name' => '名称',
'update_identity' => '更新个人信息', 'update_identity' => '更新个人信息',
'username_help' => '您的用户名必须未被他人使用,且仅包含下列字符::requirements。', 'username_help' => '您的用户名必须未被他人使用,且仅包含下列字符::requirements。',
'language' => '语言', 'language' => '语言',
], ],
'security' => [ 'security' => [
'session_mgmt_disabled' => '您的托管商未启用此界面来管理账户会话。', 'session_mgmt_disabled' => '您的托管商未启用此界面来管理账户会话。',

View file

@ -258,10 +258,10 @@ return [
], ],
], ],
], ],
'allocations' => [ 'allocations' => [
'mass_actions' => '批量操作', 'mass_actions' => '批量操作',
'delete' => '删除分配地址', 'delete' => '删除分配地址',
], ],
'files' => [ 'files' => [
'exceptions' => [ 'exceptions' => [
'invalid_mime' => '此类型文件无法通过面板内置编辑器编辑。', 'invalid_mime' => '此类型文件无法通过面板内置编辑器编辑。',