Skip to content

Commit 90038e5

Browse files
committed
Merge branch 'dev' of github.com:jumpserver/luna into dev
# Conflicts: # ui/assets/css/main.css # ui/components/SideBar/sideBar.vue # ui/layouts/default.vue
2 parents 53f5c86 + 6467055 commit 90038e5

54 files changed

Lines changed: 2649 additions & 1933 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎i18n/locales/en.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@
10071007
"DownloadLogs": "Download logs",
10081008
"LogsCleared": "Logs cleared",
10091009
"LogsCopied": "Logs copied",
1010+
"LogsDownloaded": "Downloaded",
10101011
"LogsEmpty": "No logs yet",
10111012
"InterfaceFont": "Interface font",
10121013
"InterfaceFontDescription": "Font used by menus, navigation, and content areas.",

‎i18n/locales/es.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@
10071007
"DownloadLogs": "Descargar registros",
10081008
"LogsCleared": "Registros borrados",
10091009
"LogsCopied": "Registros copiados",
1010+
"LogsDownloaded": "Descargado",
10101011
"LogsEmpty": "Aún no hay registros",
10111012
"InterfaceFont": "Fuente de la interfaz",
10121013
"InterfaceFontDescription": "Fuente usada en menús, navegación y áreas de contenido.",

‎i18n/locales/ja.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@
10071007
"DownloadLogs": "ログをダウンロード",
10081008
"LogsCleared": "ログを消去しました",
10091009
"LogsCopied": "ログをコピーしました",
1010+
"LogsDownloaded": "ダウンロードしました",
10101011
"LogsEmpty": "ログはまだありません",
10111012
"InterfaceFont": "インターフェースフォント",
10121013
"InterfaceFontDescription": "メニュー、ナビゲーション、コンテンツ領域で使用するフォント。",

‎i18n/locales/ko.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@
10071007
"DownloadLogs": "로그 다운로드",
10081008
"LogsCleared": "로그를 지웠습니다",
10091009
"LogsCopied": "로그를 복사했습니다",
1010+
"LogsDownloaded": "다운로드했습니다",
10101011
"LogsEmpty": "아직 로그가 없습니다",
10111012
"InterfaceFont": "인터페이스 글꼴",
10121013
"InterfaceFontDescription": "메뉴, 탐색 및 콘텐츠 영역에 사용되는 글꼴입니다.",

‎i18n/locales/pt_br.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@
10071007
"DownloadLogs": "Baixar logs",
10081008
"LogsCleared": "Logs limpos",
10091009
"LogsCopied": "Logs copiados",
1010+
"LogsDownloaded": "Baixado",
10101011
"LogsEmpty": "Ainda não há logs",
10111012
"InterfaceFont": "Fonte da interface",
10121013
"InterfaceFontDescription": "Fonte usada em menus, navegação e áreas de conteúdo.",

‎i18n/locales/ru.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@
10071007
"DownloadLogs": "Скачать журналы",
10081008
"LogsCleared": "Журналы очищены",
10091009
"LogsCopied": "Журналы скопированы",
1010+
"LogsDownloaded": "Скачано",
10101011
"LogsEmpty": "Журналов пока нет",
10111012
"InterfaceFont": "Шрифт интерфейса",
10121013
"InterfaceFontDescription": "Шрифт, используемый в меню, навигации и областях содержимого.",

‎i18n/locales/vi.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@
10071007
"DownloadLogs": "Tải nhật ký xuống",
10081008
"LogsCleared": "Đã xóa nhật ký",
10091009
"LogsCopied": "Đã sao chép nhật ký",
1010+
"LogsDownloaded": "Đã tải xuống",
10101011
"LogsEmpty": "Chưa có nhật ký",
10111012
"InterfaceFont": "Phông chữ giao diện",
10121013
"InterfaceFontDescription": "Phông chữ dùng trong trình đơn, điều hướng và vùng nội dung.",

‎i18n/locales/zh.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@
10101010
"DownloadLogs": "下载日志",
10111011
"LogsCleared": "已清空日志",
10121012
"LogsCopied": "日志已复制",
1013+
"LogsDownloaded": "已下载",
10131014
"LogsEmpty": "暂无日志",
10141015
"InterfaceFont": "界面字体",
10151016
"InterfaceFontDescription": "应用菜单、导航和内容区域使用的字体。",

‎i18n/locales/zh_hant.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@
10071007
"DownloadLogs": "下載日誌",
10081008
"LogsCleared": "已清空日誌",
10091009
"LogsCopied": "日誌已複製",
1010+
"LogsDownloaded": "已下載",
10101011
"LogsEmpty": "暫無日誌",
10111012
"InterfaceFont": "介面字型",
10121013
"InterfaceFontDescription": "應用選單、導航和內容區域使用的字型。",

‎nuxt.config.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ export default defineNuxtConfig({
6767
ui: {
6868
fonts: false
6969
},
70+
colorMode: {
71+
classSuffix: "",
72+
disableTransition: false
73+
},
7074
i18n: {
7175
locales: [
7276
{ code: "zh", name: "简体中文", language: "zh-CN", file: "zh.json" },

0 commit comments

Comments
 (0)