Merge branch 'master' into room-settings

2020-04-28 13:12:20 -04:00
parent 1d88f54b44 b08b1ff013
commit 44bd2315b2
9 changed files with 29 additions and 9 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -162,6 +162,7 @@ en:
        delete: Delete
        edit: Edit
        edit_roles: Edit the user roles
+        merge: Merge
        perm_delete: Permanently Delete
        unban: Unban User
        undelete: Undelete
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@ -42,6 +42,7 @@ zh_CN:
        info: 更改左上角显示的网站标志
        placeholder: 品牌形象URL地址
        title: 网站标志
+        invalid: 无效的URL
      cache:
        info: 清除缓存，强制新请求获取已更新的信息
        title: 清除网站缓存
@ -426,7 +427,7 @@ zh_CN:
      visibility: 可见性
      formats: 格式
    visibility:
-      public: 公开
+      public: 公开的
      unlisted: 隐藏
    format:
      notes: 笔记