mirror of https://github.com/jumpserver/jumpserver
[Update] 修改部分翻译和文档
parent
21328382fc
commit
86c0a2d28b
|
@ -26,14 +26,14 @@ signer = get_signer()
|
|||
class AssetUser(models.Model):
|
||||
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
|
||||
name = models.CharField(max_length=128, unique=True, verbose_name=_('Name'))
|
||||
username = models.CharField(max_length=16, verbose_name=_('Username'))
|
||||
username = models.CharField(max_length=128, verbose_name=_('Username'))
|
||||
_password = models.CharField(max_length=256, blank=True, null=True, verbose_name=_('Password'))
|
||||
_private_key = models.TextField(max_length=4096, blank=True, null=True, verbose_name=_('SSH private key'), validators=[private_key_validator, ])
|
||||
_public_key = models.TextField(max_length=4096, blank=True, verbose_name=_('SSH public key'))
|
||||
comment = models.TextField(blank=True, verbose_name=_('Comment'))
|
||||
date_created = models.DateTimeField(auto_now_add=True)
|
||||
date_updated = models.DateTimeField(auto_now=True)
|
||||
created_by = models.CharField(max_length=32, null=True, verbose_name=_('Created by'))
|
||||
created_by = models.CharField(max_length=128, null=True, verbose_name=_('Created by'))
|
||||
|
||||
@property
|
||||
def password(self):
|
||||
|
|
Binary file not shown.
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Jumpserver 0.3.3\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-02-26 16:54+0800\n"
|
||||
"POT-Creation-Date: 2018-03-05 15:49+0800\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: ibuler <ibuler@qq.com>\n"
|
||||
"Language-Team: Jumpserver team<ibuler@qq.com>\n"
|
||||
|
@ -74,7 +74,7 @@ msgstr "选择节点"
|
|||
#: assets/templates/assets/admin_user_list.html:24
|
||||
#: assets/templates/assets/label_list.html:16
|
||||
#: assets/templates/assets/system_user_list.html:26 perms/models.py:17
|
||||
#: terminal/backends/command/models.py:11 terminal/models.py:116
|
||||
#: terminal/backends/command/models.py:11 terminal/models.py:122
|
||||
#: terminal/templates/terminal/command_list.html:40
|
||||
#: terminal/templates/terminal/command_list.html:73
|
||||
#: terminal/templates/terminal/session_list.html:41
|
||||
|
@ -116,11 +116,11 @@ msgstr "密码和私钥, 必须输入一个"
|
|||
#: assets/templates/assets/system_user_detail.html:58
|
||||
#: assets/templates/assets/system_user_list.html:24 common/models.py:26
|
||||
#: common/templates/common/terminal_setting.html:67
|
||||
#: common/templates/common/terminal_setting.html:88 ops/models.py:31
|
||||
#: common/templates/common/terminal_setting.html:85 ops/models.py:31
|
||||
#: ops/templates/ops/task_detail.html:56 ops/templates/ops/task_list.html:34
|
||||
#: perms/models.py:14 perms/templates/perms/asset_permission_detail.html:62
|
||||
#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:15
|
||||
#: terminal/models.py:141 terminal/templates/terminal/terminal_detail.html:43
|
||||
#: terminal/models.py:147 terminal/templates/terminal/terminal_detail.html:43
|
||||
#: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
|
||||
#: users/models/user.py:35 users/templates/users/_select_user_modal.html:13
|
||||
#: users/templates/users/user_detail.html:63
|
||||
|
@ -352,7 +352,7 @@ msgid "Default asset group"
|
|||
msgstr "默认资产组"
|
||||
|
||||
#: assets/models/label.py:14 perms/models.py:15
|
||||
#: terminal/backends/command/models.py:10 terminal/models.py:115
|
||||
#: terminal/backends/command/models.py:10 terminal/models.py:121
|
||||
#: terminal/templates/terminal/command_list.html:32
|
||||
#: terminal/templates/terminal/command_list.html:72
|
||||
#: terminal/templates/terminal/session_list.html:33
|
||||
|
@ -408,7 +408,7 @@ msgstr "Shell"
|
|||
#: assets/models/user.py:269 perms/forms.py:25 perms/models.py:19
|
||||
#: perms/models.py:76 perms/templates/perms/asset_permission_detail.html:136
|
||||
#: perms/templates/perms/asset_permission_list.html:69 templates/_nav.html:24
|
||||
#: terminal/backends/command/models.py:12 terminal/models.py:117
|
||||
#: terminal/backends/command/models.py:12 terminal/models.py:123
|
||||
#: terminal/templates/terminal/command_list.html:48
|
||||
#: terminal/templates/terminal/command_list.html:74
|
||||
#: terminal/templates/terminal/session_list.html:49
|
||||
|
@ -606,9 +606,9 @@ msgstr "激活所选"
|
|||
#: common/templates/common/basic_setting.html:59
|
||||
#: common/templates/common/email_setting.html:60
|
||||
#: common/templates/common/ldap_setting.html:60
|
||||
#: common/templates/common/terminal_setting.html:108
|
||||
#: common/templates/common/terminal_setting.html:103
|
||||
#: perms/templates/perms/asset_permission_create_update.html:72
|
||||
#: terminal/templates/terminal/terminal_update.html:47
|
||||
#: terminal/templates/terminal/terminal_update.html:48
|
||||
#: users/templates/users/_user.html:44
|
||||
#: users/templates/users/first_login.html:62
|
||||
#: users/templates/users/forgot_password.html:44
|
||||
|
@ -689,7 +689,7 @@ msgstr "自动生成秘钥"
|
|||
#: assets/templates/assets/asset_create.html:57
|
||||
#: assets/templates/assets/asset_update.html:61
|
||||
#: perms/templates/perms/asset_permission_create_update.html:49
|
||||
#: terminal/templates/terminal/terminal_update.html:41
|
||||
#: terminal/templates/terminal/terminal_update.html:42
|
||||
msgid "Other"
|
||||
msgstr "其它"
|
||||
|
||||
|
@ -702,9 +702,9 @@ msgstr "其它"
|
|||
#: common/templates/common/basic_setting.html:58
|
||||
#: common/templates/common/email_setting.html:59
|
||||
#: common/templates/common/ldap_setting.html:59
|
||||
#: common/templates/common/terminal_setting.html:106
|
||||
#: common/templates/common/terminal_setting.html:101
|
||||
#: perms/templates/perms/asset_permission_create_update.html:71
|
||||
#: terminal/templates/terminal/terminal_update.html:46
|
||||
#: terminal/templates/terminal/terminal_update.html:47
|
||||
#: users/templates/users/_user.html:43
|
||||
#: users/templates/users/user_bulk_update.html:23
|
||||
#: users/templates/users/user_password_update.html:58
|
||||
|
@ -1195,7 +1195,7 @@ msgid "Public key auth"
|
|||
msgstr "秘钥认证"
|
||||
|
||||
#: common/forms.py:159 common/templates/common/terminal_setting.html:63
|
||||
#: terminal/forms.py:21 terminal/models.py:19
|
||||
#: terminal/forms.py:29 terminal/models.py:19
|
||||
msgid "Command storage"
|
||||
msgstr "命令存储"
|
||||
|
||||
|
@ -1205,8 +1205,8 @@ msgid ""
|
|||
"other storage and some terminal using"
|
||||
msgstr "设置终端命令存储,default是默认用的存储方式"
|
||||
|
||||
#: common/forms.py:165 common/templates/common/terminal_setting.html:84
|
||||
#: terminal/models.py:20
|
||||
#: common/forms.py:165 common/templates/common/terminal_setting.html:81
|
||||
#: terminal/forms.py:31 terminal/models.py:20
|
||||
msgid "Replay storage"
|
||||
msgstr "录像存储"
|
||||
|
||||
|
@ -1263,17 +1263,11 @@ msgid "Test connection"
|
|||
msgstr "测试连接"
|
||||
|
||||
#: common/templates/common/terminal_setting.html:68
|
||||
#: common/templates/common/terminal_setting.html:89
|
||||
#: common/templates/common/terminal_setting.html:86
|
||||
#: users/templates/users/login_log_list.html:50
|
||||
msgid "Type"
|
||||
msgstr "类型"
|
||||
|
||||
#: common/templates/common/terminal_setting.html:90
|
||||
#: users/templates/users/reset_password.html:57
|
||||
#: users/templates/users/user_profile.html:20
|
||||
msgid "Setting"
|
||||
msgstr "设置"
|
||||
|
||||
#: common/views.py:20 common/views.py:46 common/views.py:72 common/views.py:102
|
||||
#: templates/_nav.html:66
|
||||
msgid "Settings"
|
||||
|
@ -1430,7 +1424,7 @@ msgstr "执行历史"
|
|||
|
||||
#: ops/templates/ops/adhoc_history.html:52
|
||||
#: ops/templates/ops/adhoc_history_detail.html:58
|
||||
#: ops/templates/ops/task_history.html:55 terminal/models.py:124
|
||||
#: ops/templates/ops/task_history.html:55 terminal/models.py:130
|
||||
#: terminal/templates/terminal/session_list.html:77
|
||||
msgid "Date start"
|
||||
msgstr "开始日期"
|
||||
|
@ -1742,10 +1736,11 @@ msgid "Close"
|
|||
msgstr "关闭"
|
||||
|
||||
#: templates/_nav.html:9 users/views/group.py:28 users/views/group.py:44
|
||||
#: users/views/group.py:62 users/views/group.py:79 users/views/login.py:200
|
||||
#: users/views/login.py:249 users/views/user.py:57 users/views/user.py:72
|
||||
#: users/views/user.py:91 users/views/user.py:147 users/views/user.py:300
|
||||
#: users/views/user.py:312 users/views/user.py:348 users/views/user.py:370
|
||||
#: users/views/group.py:62 users/views/group.py:79 users/views/group.py:95
|
||||
#: users/views/login.py:200 users/views/login.py:249 users/views/user.py:57
|
||||
#: users/views/user.py:72 users/views/user.py:91 users/views/user.py:147
|
||||
#: users/views/user.py:300 users/views/user.py:312 users/views/user.py:348
|
||||
#: users/views/user.py:370
|
||||
msgid "Users"
|
||||
msgstr "用户管理"
|
||||
|
||||
|
@ -1819,11 +1814,11 @@ msgstr "输出"
|
|||
msgid "Session"
|
||||
msgstr "会话"
|
||||
|
||||
#: terminal/forms.py:27
|
||||
#: terminal/forms.py:37
|
||||
msgid "Coco ssh listen port"
|
||||
msgstr "SSH 监听端口"
|
||||
|
||||
#: terminal/forms.py:28
|
||||
#: terminal/forms.py:38
|
||||
msgid "Coco http/ws listen port"
|
||||
msgstr "Http/Websocket 监听端口"
|
||||
|
||||
|
@ -1839,51 +1834,51 @@ msgstr "SSH端口"
|
|||
msgid "HTTP Port"
|
||||
msgstr "HTTP端口"
|
||||
|
||||
#: terminal/models.py:91
|
||||
#: terminal/models.py:97
|
||||
msgid "Session Online"
|
||||
msgstr "在线会话"
|
||||
|
||||
#: terminal/models.py:92
|
||||
#: terminal/models.py:98
|
||||
msgid "CPU Usage"
|
||||
msgstr "CPU使用"
|
||||
|
||||
#: terminal/models.py:93
|
||||
#: terminal/models.py:99
|
||||
msgid "Memory Used"
|
||||
msgstr "内存使用"
|
||||
|
||||
#: terminal/models.py:94
|
||||
#: terminal/models.py:100
|
||||
msgid "Connections"
|
||||
msgstr "连接数"
|
||||
|
||||
#: terminal/models.py:95
|
||||
#: terminal/models.py:101
|
||||
msgid "Threads"
|
||||
msgstr "线程数"
|
||||
|
||||
#: terminal/models.py:96
|
||||
#: terminal/models.py:102
|
||||
msgid "Boot Time"
|
||||
msgstr "运行时间"
|
||||
|
||||
#: terminal/models.py:119 terminal/templates/terminal/session_list.html:74
|
||||
#: terminal/models.py:125 terminal/templates/terminal/session_list.html:74
|
||||
#: terminal/templates/terminal/terminal_detail.html:47
|
||||
msgid "Remote addr"
|
||||
msgstr "远端地址"
|
||||
|
||||
#: terminal/models.py:121 terminal/templates/terminal/session_list.html:100
|
||||
#: terminal/models.py:127 terminal/templates/terminal/session_list.html:100
|
||||
msgid "Replay"
|
||||
msgstr "回放"
|
||||
|
||||
#: terminal/models.py:122 terminal/templates/terminal/command_list.html:55
|
||||
#: terminal/models.py:128 terminal/templates/terminal/command_list.html:55
|
||||
#: terminal/templates/terminal/command_list.html:71
|
||||
#: terminal/templates/terminal/session_detail.html:48
|
||||
#: terminal/templates/terminal/session_list.html:76
|
||||
msgid "Command"
|
||||
msgstr "命令"
|
||||
|
||||
#: terminal/models.py:125
|
||||
#: terminal/models.py:131
|
||||
msgid "Date end"
|
||||
msgstr "结束日期"
|
||||
|
||||
#: terminal/models.py:142
|
||||
#: terminal/models.py:148
|
||||
msgid "Args"
|
||||
msgstr "参数"
|
||||
|
||||
|
@ -2269,6 +2264,11 @@ msgstr "重置密码"
|
|||
msgid "Password again"
|
||||
msgstr "再次输入密码"
|
||||
|
||||
#: users/templates/users/reset_password.html:57
|
||||
#: users/templates/users/user_profile.html:20
|
||||
msgid "Setting"
|
||||
msgstr "设置"
|
||||
|
||||
#: users/templates/users/user_create.html:4
|
||||
#: users/templates/users/user_list.html:16 users/views/user.py:72
|
||||
msgid "Create user"
|
||||
|
@ -2351,7 +2351,7 @@ msgstr "取消"
|
|||
#: users/templates/users/user_group_granted_asset.html:18
|
||||
#: users/views/group.py:80
|
||||
msgid "User group detail"
|
||||
msgstr "资产组详情"
|
||||
msgstr "用户组详情"
|
||||
|
||||
#: users/templates/users/user_group_detail.html:86
|
||||
msgid "Add user"
|
||||
|
@ -2562,6 +2562,10 @@ msgstr "用户组列表"
|
|||
msgid "Update user group"
|
||||
msgstr "编辑用户组"
|
||||
|
||||
#: users/views/group.py:96
|
||||
msgid "User group granted asset"
|
||||
msgstr "用户组授权资产"
|
||||
|
||||
#: users/views/login.py:56
|
||||
msgid "Please enable cookies and try again."
|
||||
msgstr "设置你的浏览器支持cookie"
|
||||
|
@ -2634,4 +2638,3 @@ msgstr "密码更新"
|
|||
#: users/views/user.py:371
|
||||
msgid "Public key update"
|
||||
msgstr "秘钥更新"
|
||||
|
||||
|
|
|
@ -92,8 +92,8 @@ class UserGroupGrantedAssetView(AdminUserRequiredMixin, DetailView):
|
|||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = {
|
||||
'app': 'User',
|
||||
'action': 'User group granted asset',
|
||||
'app': _('Users'),
|
||||
'action': _('User group granted asset'),
|
||||
}
|
||||
kwargs.update(context)
|
||||
return super().get_context_data(**kwargs)
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 29 KiB |
|
@ -6,27 +6,6 @@
|
|||
Jumpserver 文档
|
||||
======================================
|
||||
|
||||
有关Jumpserver
|
||||
`````````````````
|
||||
|
||||
欢迎来到 Jumpserver 文档。
|
||||
|
||||
Jumpserver 是一款完全开源的跳板机(堡垒机)系统,遵循GPL v2协议,使用Python,Django开发。
|
||||
|
||||
Jumpserver 是符合4A(认证Authentication,账号Account,授权Authorization,审计Audit) 的专业运维审计系统。
|
||||
|
||||
Jumpserver 从设计时考虑分布式,没有性能瓶颈,满足混合云架构,一个中心,不同Region不同登录点。
|
||||
|
||||
Jumpserver 界面漂亮、简单易用,并有领先的Web terminal解决方案。
|
||||
|
||||
Jumpserver 深度集成了Ansible,支持自动化运维任务。
|
||||
|
||||
Jumpserver 支持容器化部署,windows,LDAP, s3, elasticsearch存储等功能,并提供了强大API方便对接其它系统。
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.. toctree::
|
||||
:maxdepth: 2
|
||||
:caption: 文档:
|
||||
|
|
|
@ -1,3 +1,51 @@
|
|||
简介
|
||||
============
|
||||
|
||||
Jumpserver是混合云下更好用的堡垒机, 分布式架构设计无限扩展,轻松对接混合云资产,支持使用云存储(AWS S3, ES等)存储录像、命令
|
||||
|
||||
Jumpserver颠覆传统堡垒机, 无主机和并发数量限制,支持水平扩容,FIT2CLOUD提供完备的商业服务支持,用户无后顾之忧
|
||||
|
||||
Jumpserver拥有极致的用户体验, 极致UI体验,容器化的部署方式,部署过程方便快捷,可持续升级
|
||||
|
||||
|
||||
组件说明
|
||||
++++++++++++++++++++++++
|
||||
|
||||
Jumpserver
|
||||
```````````
|
||||
现指Jumpserver管理后台,是核心组件(Core), 使用 Django Class Based View 风格开发,支持Restful API。
|
||||
|
||||
`Github <https://github.com/jumpserver/jumpserver.git>`_
|
||||
|
||||
|
||||
Coco
|
||||
````````
|
||||
实现了SSH Server 和 Web Terminal Server的组件,提供ssh和websocket接口, 使用 Paramiko 和 Flask 开发。
|
||||
|
||||
|
||||
`Github <https://github.com/jumpserver/coco.git>`__
|
||||
|
||||
|
||||
Luna
|
||||
````````
|
||||
现在是Web Terminal前端,计划前端页面都由该项目提供,Jumpserver只提供API,不再负责后台渲染html等。
|
||||
|
||||
`Github <https://github.com/jumpserver/luna.git>`__
|
||||
|
||||
|
||||
Guacamole
|
||||
```````````
|
||||
Apache 跳板机项目,Jumpserver使用其组件实现RDP功能,Jumpserver并没有修改其代码而是添加了额外的插件,支持Jumpserver调用
|
||||
|
||||
|
||||
Jumpserver-python-sdk
|
||||
```````````````````````
|
||||
Jumpserver API Python SDK,Coco目前使用该SDK与Jumpserver API交互
|
||||
|
||||
`Github <https://github.com/jumpserver/jumpserver-python-sdk.git>`__
|
||||
|
||||
|
||||
组件架构图
|
||||
++++++++++++++++++++++++
|
||||
.. image:: _static/img/structure.png
|
||||
:alt: 组件架构图
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
用户使用文档
|
||||
===========
|
||||
=============
|
||||
|
||||
这部分给您介绍Jumpserver的用户使用方法。
|
||||
这部分给您介绍Jumpserver的用户管理模块的使用方法。
|
||||
|
||||
.. toctree::
|
||||
:maxdepth: 1
|
||||
|
|
Loading…
Reference in New Issue