Merge branch 'master' into feat/db

src/resources/dicts/zh-cn.edn

@@ -184,6 +184,8 @@
  :settings-page/enable-journals "开启日记"
  :settings-page/enable-all-pages-public "发布所有页面"
  :settings-page/enable-whiteboards "激活白板功能"
+ :settings-page/native-titlebar "原生标题栏"
+ :settings-page/native-titlebar-desc "在Windows和Linux上启用系统原生风格的窗口标题栏。"
  :settings-page/home-default-page "设置首页默认页面"
  :settings-page/clear-cache "清除缓存"
  :settings-page/clear "清除"
@@ -211,6 +213,8 @@
  :settings-page/edit-global-config-edn "编辑全局 config.edn"
  :settings-page/sync "同步"
  :settings-permission/start-granting "开始授权"
+ :settings-page/auto-chmod "自动更改文件权限"
+ :settings-page/auto-chmod-desc "禁用此功能可以允许多个用户在拥有用户组权限的情况下编辑文件。"
  :yes "是"
  :submit "提交"
  :cancel "取消"