From b913bce398afe325aa156c90247d33a4bd2f9871 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 7 Apr 2017 17:09:25 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/settings.py | 2 - apps/locale/zh/LC_MESSAGES/django.mo | Bin 14626 -> 23944 bytes apps/locale/zh/LC_MESSAGES/django.po | 347 ++++++++++----------------- apps/templates/_header_bar.html | 2 +- 4 files changed, 129 insertions(+), 222 deletions(-) diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 9945416ee..e9d3f7e08 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -112,8 +112,6 @@ SESSION_COOKIE_DOMAIN = CONFIG.SESSION_COOKIE_DOMAIN or None CSRF_COOKIE_DOMAIN = CONFIG.CSRF_COOKIE_DOMAIN or None SESSION_COOKIE_AGE = CONFIG.SESSION_COOKIE_AGE or 3600*24 -print(SESSION_COOKIE_DOMAIN, CSRF_COOKIE_DOMAIN) - MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage' # Database diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 0a8f755fa2651b745b154a60a8b4d727d49c8532..1c72f8960a549c7ade63303498d86921980028fb 100644 GIT binary patch literal 23944 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 literal 14626 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 M(Uf}osRGac0?X~5?EnA( diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 68abbefce..23ab70107 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-06 11:30+0800\n" +"POT-Creation-Date: 2017-04-07 17:03+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -20,14 +20,13 @@ msgstr "" #: applications/models.py:14 #: applications/templates/applications/terminal_detail.html:43 #: applications/templates/applications/terminal_list.html:29 -#: assets/forms.py:121 assets/forms.py:201 assets/forms.py:269 +#: assets/forms.py:117 assets/forms.py:197 assets/forms.py:265 #: assets/models/group.py:18 assets/models/idc.py:18 assets/models/user.py:34 #: assets/models/user.py:136 assets/templates/assets/admin_user_detail.html:52 #: assets/templates/assets/admin_user_list.html:15 #: assets/templates/assets/asset_group_list.html:15 #: assets/templates/assets/idc_detail.html:57 #: assets/templates/assets/idc_list.html:18 -#: assets/templates/assets/system_user_asset_group.html:51 #: assets/templates/assets/system_user_detail.html:52 #: assets/templates/assets/system_user_list.html:17 audits/models.py:18 #: audits/templates/audits/login_log_list.html:49 ops/models.py:19 @@ -52,6 +51,7 @@ msgid "Name" msgstr "名称" #: applications/models.py:15 +#: applications/templates/applications/terminal_detail.html:47 msgid "Remote address" msgstr "远端地址" @@ -61,6 +61,7 @@ msgid "Terminal type" msgstr "终端类型" #: applications/models.py:19 +#: applications/templates/applications/terminal_detail.html:51 msgid "URL to login" msgstr "登录地址" @@ -73,8 +74,7 @@ msgstr "登录地址" #: assets/templates/assets/asset_detail.html:156 #: assets/templates/assets/asset_group_list.html:17 #: assets/templates/assets/idc_detail.html:97 -#: assets/templates/assets/system_user_asset_group.html:54 -#: assets/templates/assets/system_user_detail.html:106 +#: assets/templates/assets/system_user_detail.html:98 #: assets/templates/assets/system_user_list.html:21 perms/models.py:40 #: perms/templates/perms/asset_permission_detail.html:98 #: users/models/group.py:19 users/models/user.py:43 @@ -90,22 +90,13 @@ msgstr "备注" msgid "Terminal detail" msgstr "终端详情" -#: applications/templates/applications/terminal_detail.html:47 -#, fuzzy -#| msgid "Remote address" -msgid "Remote addr" -msgstr "远端地址" - -#: applications/templates/applications/terminal_detail.html:51 -msgid "Terminal url" -msgstr "终端地址" - #: applications/templates/applications/terminal_detail.html:59 +#: assets/models/asset.py:84 assets/models/group.py:21 assets/models/idc.py:30 #: assets/templates/assets/admin_user_detail.html:60 #: assets/templates/assets/idc_detail.html:89 -#: assets/templates/assets/system_user_detail.html:98 perms/models.py:39 +#: assets/templates/assets/system_user_detail.html:90 perms/models.py:39 #: perms/templates/perms/asset_permission_detail.html:90 -#: users/templates/users/user_group_detail.html:66 +#: users/models/group.py:21 users/templates/users/user_group_detail.html:66 msgid "Date created" msgstr "创建日期" @@ -240,7 +231,7 @@ msgstr "其它" #: assets/templates/assets/asset_modal_update.html:78 #: assets/templates/assets/asset_update.html:55 #: assets/templates/assets/idc_create_update.html:51 -#: assets/templates/assets/system_user_detail.html:145 +#: assets/templates/assets/system_user_detail.html:137 #: perms/templates/perms/asset_permission_create_update.html:67 #: users/templates/users/_user.html:49 #: users/templates/users/user_detail.html:158 @@ -299,14 +290,10 @@ msgstr "应用程序" msgid "Update terminal" msgstr "更新终端" -#: applications/views.py:99 +#: applications/views.py:99 applications/views.py:100 msgid "Redirect to web terminal" msgstr "重定向到web terminal" -#: applications/views.py:100 -msgid "Redirect to web terminal: {}" -msgstr "" - #: applications/views.py:107 msgid "Connect ssh terminal" msgstr "连接ssh终端" @@ -343,7 +330,7 @@ msgid "" msgstr "" "管理用户应该已经在资产上存在, 可以是root或者其他拥有 sudo ALL 权限的用户" -#: assets/forms.py:62 assets/forms.py:98 assets/forms.py:136 +#: assets/forms.py:62 assets/forms.py:94 assets/forms.py:132 #: assets/templates/assets/asset_group_list.html:16 #: assets/templates/assets/system_user_list.html:19 audits/models.py:41 #: audits/templates/audits/command_log_list.html:35 @@ -361,29 +348,26 @@ msgstr "" msgid "Asset" msgstr "资产" -#: assets/forms.py:65 assets/forms.py:101 assets/forms.py:139 +#: assets/forms.py:65 assets/forms.py:97 assets/forms.py:135 #: assets/templates/assets/asset_group_detail.html:86 perms/forms.py:27 -#: users/forms.py:150 users/forms.py:176 +#: perms/templates/perms/asset_permission_asset.html:109 users/forms.py:150 +#: users/forms.py:176 msgid "Select assets" msgstr "选择资产" -#: assets/forms.py:87 -msgid "Select asset system user" -msgstr "系统" - -#: assets/forms.py:145 +#: assets/forms.py:141 msgid "If also set private key, use that first" msgstr "如果设置私钥，则优先使用密钥" -#: assets/forms.py:184 +#: assets/forms.py:180 assets/forms.py:248 msgid "Invalid private key" msgstr "ssh密钥不合法" -#: assets/forms.py:194 +#: assets/forms.py:190 msgid "Password and private key file must be input one" msgstr "密码和私钥, 必须输入一个" -#: assets/forms.py:202 assets/forms.py:270 assets/models/user.py:35 +#: assets/forms.py:198 assets/forms.py:266 assets/models/user.py:35 #: assets/models/user.py:137 assets/templates/assets/admin_user_detail.html:56 #: assets/templates/assets/admin_user_list.html:16 #: assets/templates/assets/system_user_detail.html:56 @@ -398,15 +382,11 @@ msgstr "密码和私钥, 必须输入一个" msgid "Username" msgstr "用户名" -#: assets/forms.py:247 +#: assets/forms.py:243 msgid "Private key required" msgstr "密钥不能为空" -#: assets/forms.py:252 -msgid "Private key invalid" -msgstr "密钥不合法" - -#: assets/forms.py:258 +#: assets/forms.py:254 msgid "Password required" msgstr "密码不能为空" @@ -496,7 +476,9 @@ msgstr "机房" msgid "Is active" msgstr "激活" -#: assets/models/asset.py:52 assets/templates/assets/asset_detail.html:132 +#: assets/models/asset.py:52 +#: assets/templates/assets/_asset_bulk_update_modal.html:20 +#: assets/templates/assets/asset_detail.html:132 msgid "Asset type" msgstr "系统类型" @@ -516,11 +498,11 @@ msgstr "公网IP" msgid "Remote control card IP" msgstr "远控卡IP" -#: assets/models/asset.py:61 +#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:88 msgid "Cabinet number" msgstr "机柜编号" -#: assets/models/asset.py:62 +#: assets/models/asset.py:62 assets/templates/assets/asset_detail.html:92 msgid "Cabinet position" msgstr "机柜层号" @@ -585,16 +567,12 @@ msgstr "主机名原始" #: assets/templates/assets/admin_user_detail.html:64 #: assets/templates/assets/asset_detail.html:148 #: assets/templates/assets/idc_detail.html:93 -#: assets/templates/assets/system_user_detail.html:102 perms/models.py:37 +#: assets/templates/assets/system_user_detail.html:94 perms/models.py:37 #: perms/templates/perms/asset_permission_detail.html:94 #: users/models/user.py:47 users/templates/users/user_detail.html:97 msgid "Created by" msgstr "创建者" -#: assets/models/asset.py:84 assets/models/group.py:21 assets/models/idc.py:30 -msgid "Date created" -msgstr "加入日期" - #: assets/models/group.py:32 assets/models/idc.py:42 msgid "Default" msgstr "默认" @@ -644,6 +622,7 @@ msgid "Default IDC" msgstr "默认IDC" #: assets/models/user.py:24 +#, python-format msgid "%(value)s is not an even number" msgstr "%(value)s is not an even number" @@ -681,11 +660,11 @@ msgstr "认证方式" msgid "Auto push" msgstr "自动推送" -#: assets/models/user.py:150 assets/templates/assets/system_user_detail.html:76 +#: assets/models/user.py:150 assets/templates/assets/system_user_detail.html:68 msgid "Sudo" msgstr "Sudo" -#: assets/models/user.py:152 assets/templates/assets/system_user_detail.html:81 +#: assets/models/user.py:152 assets/templates/assets/system_user_detail.html:73 msgid "Shell" msgstr "Shell" @@ -699,12 +678,10 @@ msgstr "更新资产" msgid "Hint: only change the field you want to update." msgstr "" -#: assets/templates/assets/_asset_bulk_update_modal.html:20 -msgid "Asset type" -msgstr "资产类型" - #: assets/templates/assets/_asset_bulk_update_modal.html:35 -msgid "Asset groups" +#, fuzzy +#| msgid "Asset groups" +msgid "Asset Groups" msgstr "资产组" #: assets/templates/assets/_asset_bulk_update_modal.html:37 @@ -714,12 +691,15 @@ msgstr "选择组" #: assets/templates/assets/_asset_bulk_update_modal.html:46 #: assets/templates/assets/_asset_group_bulk_update_modal.html:22 +#: assets/templates/assets/asset_detail.html:246 msgid "System users" msgstr "系统用户" #: assets/templates/assets/_asset_bulk_update_modal.html:48 -#: assets/templates/assets/_asset_group_bulk_update_modal.html:24 -msgid "Select System Users" +#: assets/templates/assets/asset_detail.html:254 perms/forms.py:33 +#: perms/templates/perms/asset_permission_detail.html:161 users/forms.py:156 +#: users/forms.py:182 +msgid "Select system users" msgstr "选择系统用户" #: assets/templates/assets/_asset_bulk_update_modal.html:59 @@ -736,8 +716,8 @@ msgstr "编辑资产组" #: assets/views/admin_user.py:27 assets/views/group.py:30 #: assets/views/group.py:53 assets/views/group.py:73 assets/views/group.py:98 #: assets/views/idc.py:22 assets/views/idc.py:87 assets/views/system_user.py:28 -#: assets/views/system_user.py:47 assets/views/system_user.py:75 -#: assets/views/system_user.py:94 templates/_nav.html:18 +#: assets/views/system_user.py:47 assets/views/system_user.py:71 +#: assets/views/system_user.py:90 templates/_nav.html:18 msgid "Assets" msgstr "资产管理" @@ -745,6 +725,10 @@ msgstr "资产管理" msgid "Select Asset" msgstr "选择资产" +#: assets/templates/assets/_asset_group_bulk_update_modal.html:24 +msgid "Select System Users" +msgstr "选择系统用户" + #: assets/templates/assets/_asset_import_modal.html:4 msgid "Import asset" msgstr "导入资产" @@ -798,7 +782,6 @@ msgstr "创建管理用户" #: assets/templates/assets/idc_assets.html:20 #: assets/templates/assets/idc_detail.html:17 #: assets/templates/assets/system_user_asset.html:17 -#: assets/templates/assets/system_user_asset_group.html:17 #: assets/templates/assets/system_user_detail.html:17 #: perms/templates/perms/asset_permission_asset.html:18 #: perms/templates/perms/asset_permission_detail.html:18 @@ -808,13 +791,12 @@ msgstr "详情" #: assets/templates/assets/admin_user_detail.html:78 #: assets/templates/assets/asset_group_detail.html:26 -#: assets/templates/assets/system_user_asset_group.html:32 #: perms/templates/perms/asset_permission_asset.html:45 msgid "Asset list of " msgstr "资产列表" #: assets/templates/assets/admin_user_detail.html:124 -#: assets/templates/assets/system_user_detail.html:118 +#: assets/templates/assets/system_user_detail.html:110 #: perms/templates/perms/asset_permission_detail.html:110 msgid "Quick update" msgstr "快速更新" @@ -824,24 +806,24 @@ msgid "Get install script" msgstr "获得安装脚本" #: assets/templates/assets/admin_user_detail.html:133 -#: assets/templates/assets/system_user_detail.html:127 +#: assets/templates/assets/system_user_detail.html:119 msgid "Get" msgstr "" #: assets/templates/assets/admin_user_detail.html:139 -#: assets/templates/assets/system_user_detail.html:133 +#: assets/templates/assets/system_user_detail.html:125 #: perms/templates/perms/asset_permission_detail.html:130 msgid "Retest asset connectivity" msgstr "重置资产连接性" #: assets/templates/assets/admin_user_detail.html:142 -#: assets/templates/assets/system_user_detail.html:136 +#: assets/templates/assets/system_user_detail.html:128 #: perms/templates/perms/asset_permission_detail.html:133 msgid "Start" msgstr "开始" #: assets/templates/assets/admin_user_detail.html:148 -#: assets/templates/assets/system_user_detail.html:142 +#: assets/templates/assets/system_user_detail.html:134 msgid "Reset private key" msgstr "重置密钥" @@ -871,7 +853,6 @@ msgstr "移除" #: assets/templates/assets/admin_user_list.html:17 #: assets/templates/assets/idc_list.html:19 -#: assets/templates/assets/system_user_asset_group.html:52 #: users/templates/users/_select_user_modal.html:17 msgid "Asset num" msgstr "资产数量" @@ -894,14 +875,6 @@ msgstr "资产详情" msgid "Remote card IP" msgstr "远控卡IP" -#: assets/templates/assets/asset_detail.html:88 -msgid "Cabinet no" -msgstr "机柜编号" - -#: assets/templates/assets/asset_detail.html:92 -msgid "Cabinet pos" -msgstr "机柜层号" - #: assets/templates/assets/asset_detail.html:104 msgid "CPU" msgstr "CPU" @@ -947,23 +920,24 @@ msgid "Join asset groups" msgstr "添加到资产组" #: assets/templates/assets/asset_detail.html:227 -#: perms/templates/perms/asset_permission_asset.html:146 -#: perms/templates/perms/asset_permission_detail.html:170 -#: users/templates/users/user_detail.html:194 -msgid "Join" -msgstr "加入" - -#: assets/templates/assets/asset_detail.html:246 -msgid "System users" -msgstr "系统用户" - -#: assets/templates/assets/asset_detail.html:254 -msgid "Select system user" -msgstr "选择系统用户" - #: assets/templates/assets/asset_detail.html:263 -msgid "Associate" -msgstr "关联" +#: assets/templates/assets/asset_group_list.html:100 +#: assets/templates/assets/asset_list.html:235 +#: assets/templates/assets/idc_assets.html:101 +#: assets/templates/assets/idc_assets.html:264 +#: assets/templates/assets/idc_list.html:99 +#: assets/templates/assets/system_user_asset.html:96 +#: assets/templates/assets/system_user_list.html:102 +#: assets/templates/assets/user_asset_list.html:167 templates/_modal.html:16 +#: users/templates/users/user_detail.html:337 +#: users/templates/users/user_detail.html:362 +#: users/templates/users/user_detail.html:385 +#: users/templates/users/user_group_create_update.html:45 +#: users/templates/users/user_group_list.html:92 +#: users/templates/users/user_list.html:171 +#: users/templates/users/user_profile.html:181 +msgid "Confirm" +msgstr "确认" #: assets/templates/assets/asset_detail.html:374 #: users/templates/users/user_detail.html:271 @@ -976,7 +950,6 @@ msgid "Add asset to this group" msgstr "添加资产到该组" #: assets/templates/assets/asset_group_detail.html:95 -#: assets/templates/assets/system_user_asset_group.html:94 #: perms/templates/perms/asset_permission_asset.html:118 #: perms/templates/perms/asset_permission_user.html:118 #: perms/templates/perms/asset_permission_user.html:146 @@ -1024,21 +997,6 @@ msgstr "你确认吗?" msgid "This will delete the selected groups !!!" msgstr "删除选择组" -#: assets/templates/assets/asset_group_list.html:100 -#: assets/templates/assets/asset_list.html:235 -#: assets/templates/assets/idc_assets.html:264 -#: assets/templates/assets/idc_list.html:99 -#: assets/templates/assets/system_user_list.html:102 -#: assets/templates/assets/user_asset_list.html:167 templates/_modal.html:16 -#: users/templates/users/user_detail.html:337 -#: users/templates/users/user_detail.html:362 -#: users/templates/users/user_detail.html:385 -#: users/templates/users/user_group_list.html:92 -#: users/templates/users/user_list.html:171 -#: users/templates/users/user_profile.html:181 -msgid "Confirm" -msgstr "确认" - #: assets/templates/assets/asset_group_list.html:104 msgid "Group deleted" msgstr "组已被删除" @@ -1191,8 +1149,10 @@ msgstr "IDC删除失败" #: assets/templates/assets/system_user_asset.html:20 #: assets/templates/assets/system_user_detail.html:21 -msgid "Assets of system user" -msgstr "系统用户关联资产" +#, fuzzy +#| msgid "Attach Asset" +msgid "Attached assets" +msgstr "关联资产" #: assets/templates/assets/system_user_asset.html:28 msgid "Assets of " @@ -1206,10 +1166,6 @@ msgstr "可连接" msgid "Attach to assets " msgstr "关联资产" -#: assets/templates/assets/system_user_asset.html:96 -msgid "Attach Asset" -msgstr "关联资产" - #: assets/templates/assets/system_user_asset.html:107 msgid "Attach to asset groups" msgstr "关联资产组" @@ -1222,50 +1178,16 @@ msgstr "资产组" msgid "Attach AssetGroup" msgstr "添加到资产组" -#: assets/templates/assets/system_user_asset_group.html:20 -#, fuzzy -#| msgid "User assets" -msgid "Associate assets" -msgstr "用户资产" +#: assets/templates/assets/system_user_detail.html:79 +#: templates/_header_bar.html:41 +msgid "Home" +msgstr "" -#: assets/templates/assets/system_user_asset_group.html:24 -#, fuzzy -#| msgid "Create asset group" -msgid "Associate asset groups" -msgstr "创建资产组" - -#: assets/templates/assets/system_user_asset_group.html:53 -msgid "Unavailable num" -msgstr "不可连接数量" - -#: assets/templates/assets/system_user_asset_group.html:77 -msgid "Add asset group to this system user" -msgstr "资产组列表" - -#: assets/templates/assets/system_user_asset_group.html:85 -#, fuzzy -#| msgid "Select asset groups" -msgid "Select asset group" -msgstr "添加到资产组" - -#: assets/templates/assets/system_user_detail.html:68 -msgid "Auto update" -msgstr "自动更新密码/密钥" - -#: assets/templates/assets/system_user_detail.html:72 -msgid "As default" -msgstr "默认使用" - -#: assets/templates/assets/system_user_detail.html:87 -#: templates/_header_bar.html:41 templates/_nav.html:4 -msgid "Dashboard" -msgstr "仪表盘" - -#: assets/templates/assets/system_user_detail.html:93 +#: assets/templates/assets/system_user_detail.html:85 msgid "Uid" msgstr "Uid" -#: assets/templates/assets/system_user_detail.html:124 +#: assets/templates/assets/system_user_detail.html:116 msgid "Get manual install script" msgstr "获得手动安装脚本" @@ -1295,6 +1217,7 @@ msgid "Admin user list" msgstr "管理用户列表" #: assets/views/admin_user.py:52 +#, python-brace-format msgid "Create admin user {name} successfully." msgstr "创建管理用户 {name} 成功" @@ -1311,6 +1234,7 @@ msgid "IDC list" msgstr "IDC列表" #: assets/views/idc.py:38 assets/views/idc.py:65 +#: ops/templates/ops/task_detail.html:84 msgid "assets" msgstr "资产管理" @@ -1322,15 +1246,16 @@ msgstr "更新IDC" msgid "System user list" msgstr "系统用户列表" -#: assets/views/system_user.py:61 +#: assets/views/system_user.py:57 +#, python-brace-format msgid "Create system user {name} successfully." msgstr "创建系统用户 {name} 成功" -#: assets/views/system_user.py:76 +#: assets/views/system_user.py:72 msgid "Update system user" msgstr "更新系统用户" -#: assets/views/system_user.py:95 +#: assets/views/system_user.py:91 msgid "System user detail" msgstr "系统用户详情" @@ -1543,10 +1468,6 @@ msgstr "运行时间" msgid "Is success " msgstr "成功" -#: ops/templates/ops/task_detail.html:84 -msgid "Assets " -msgstr "资产管理" - #: ops/templates/ops/task_detail.html:126 msgid "Failed assets" msgstr "失败资产" @@ -1572,11 +1493,6 @@ msgstr "选择用户" msgid "Select user groups" msgstr "添加到用户组" -#: perms/forms.py:33 perms/templates/perms/asset_permission_detail.html:161 -#: users/forms.py:156 users/forms.py:182 -msgid "Select system users" -msgstr "选择系统用户" - #: perms/models.py:35 perms/templates/perms/asset_permission_detail.html:86 #: users/models/user.py:46 users/templates/users/user_detail.html:93 #: users/templates/users/user_profile.html:96 @@ -1605,19 +1521,22 @@ msgstr "有效" msgid "Add asset to this permission" msgstr "添加资产" -#: perms/templates/perms/asset_permission_asset.html:109 -msgid "Select assets" -msgstr "选择资产" - #: perms/templates/perms/asset_permission_asset.html:129 msgid "Add asset group to this permission" msgstr "添加资产组" +#: perms/templates/perms/asset_permission_asset.html:146 +#: perms/templates/perms/asset_permission_detail.html:170 +#: users/templates/users/user_detail.html:194 +msgid "Join" +msgstr "加入" + #: perms/templates/perms/asset_permission_create_update.html:17 msgid "Create asset permission " msgstr "创建资产权限" #: perms/templates/perms/asset_permission_detail.html:66 +#: users/templates/users/user_group_list.html:13 msgid "User count" msgstr "用户数量" @@ -1694,10 +1613,12 @@ msgid "Create asset permission" msgstr "创建权限规则" #: perms/views.py:86 +#, python-brace-format msgid "Create asset permission {name} successfully." msgstr "创建授权 {name} 成功" #: perms/views.py:106 +#, python-brace-format msgid "Update asset permission {name} successfully." msgstr "更新授权 {name} 成功" @@ -1742,6 +1663,10 @@ msgstr "登录" msgid "Close" msgstr "关闭" +#: templates/_nav.html:4 +msgid "Dashboard" +msgstr "仪表盘" + #: templates/_nav.html:9 users/templates/users/user_group_create_update.html:28 #: users/views/group.py:31 users/views/group.py:45 users/views/group.py:80 #: users/views/group.py:105 users/views/login.py:185 users/views/user.py:54 @@ -1807,8 +1732,12 @@ msgid "" " Your information was incomplete. Please click this link to complete your information.\n" " " -msgstr "你的信息不完整,请点击 链接 补充完整" +msgstr "" +"\n" +" 你的信息不完整,请点击 链接 to 补充完整\n" +" " + #: templates/base.html:37 #, python-format @@ -1817,8 +1746,11 @@ msgid "" " Your ssh-public-key has been expired. Please click this link to update your ssh-public-key.\n" " " -msgstr "你的SSH key已经过期,点击 链接 更新" +msgstr "" +"\n" +" 你的SSH key已经过期,点击 链接 更新 \n" +" " #: templates/captcha/image.html:3 msgid "Play CAPTCHA as audio file" @@ -2105,9 +2037,10 @@ msgid "An e-mail has been sent to the user\\'s mailbox." msgstr "已发送邮件到用户邮箱" #: users/templates/users/user_detail.html:333 -#: users/templates/users/user_detail.html:358 -msgid "This will reset the user\\" -msgstr "重置" +msgid "" +"This will reset the user's password. A password-reset email will be sent to " +"the user\\'s mailbox." +msgstr "" #: users/templates/users/user_detail.html:347 msgid "" @@ -2116,9 +2049,14 @@ msgid "" msgstr "" #: users/templates/users/user_detail.html:348 +#: users/templates/users/user_profile.html:144 msgid "Reset SSH public key" msgstr "重置SSH密钥" +#: users/templates/users/user_detail.html:358 +msgid "This will reset the user\\" +msgstr "重置" + #: users/templates/users/user_detail.html:375 #: users/templates/users/user_profile.html:170 msgid "Successfully updated the SSH public key." @@ -2159,11 +2097,7 @@ msgstr "选择用户" msgid "Cancel" msgstr "取消" -#: users/templates/users/user_group_create_update.html:45 -msgid "confirm" -msgstr "确认删除" - -#: users/templates/users/user_group_detail.html:22 users/views/group.py:106 +#: users/templates/users/user_group_detail.html:22 msgid "User group detail" msgstr "资产组详情" @@ -2179,10 +2113,6 @@ msgstr "添加用户" msgid "Create user group" msgstr "创建用户组" -#: users/templates/users/user_group_list.html:13 -msgid "User count" -msgstr "用户数量" - #: users/templates/users/user_group_list.html:96 msgid "UserGroups Deleted." msgstr "用户组删除" @@ -2248,10 +2178,6 @@ msgstr "用户组" msgid "Perm assets" msgstr "资产" -#: users/templates/users/user_profile.html:144 -msgid "Reset public key" -msgstr "重置SSH密钥" - #: users/templates/users/user_profile.html:174 msgid "Failed to update SSH public key." msgstr "更新密钥失败" @@ -2318,28 +2244,7 @@ msgstr "" " " #: users/utils.py:73 -#, fuzzy, python-format -#| msgid "" -#| "\n" -#| " Hello %(name)s:\n" -#| "
\n" -#| " Please click the link below to reset your password, if not your " -#| "request, concern your account security\n" -#| "
\n" -#| " Click " -#| "here reset password\n" -#| "
\n" -#| " This link is valid for 1 hour. After it expires, request new one<\n" -#| "\n" -#| "
\n" -#| " ---\n" -#| "\n" -#| "
\n" -#| " Login direct\n" -#| "\n" -#| "
\n" -#| " " +#, python-format msgid "" "\n" " Hello %(name)s:\n" @@ -2383,10 +2288,8 @@ msgstr "" " " #: users/utils.py:104 -#, fuzzy -#| msgid "SSH private key" msgid "SSH Key Reset" -msgstr "ssh密钥" +msgstr "重置ssh密钥" #: users/utils.py:106 #, python-format @@ -2401,7 +2304,8 @@ msgid "" "\n" "
\n" " " -msgstr "\n" +msgstr "" +"\n" " 你好 %(name)s:\n" "
\n" " 您的密钥已被管理员重置,\n" @@ -2432,6 +2336,12 @@ msgstr "用户组列表" msgid "Update user group" msgstr "编辑用户组" +#: users/views/group.py:106 +#, fuzzy +#| msgid "User group detail" +msgid "User Group Detail" +msgstr "资产组详情" + #: users/views/login.py:76 msgid "Logout success" msgstr "退出登录成功" @@ -2478,12 +2388,11 @@ msgid "User list" msgstr "用户列表" #: users/views/user.py:66 users/views/user.py:334 -#, fuzzy, python-brace-format -#| msgid "Create admin user %s successfully." +#, python-brace-format msgid "Create user {name} successfully." -msgstr "创建管理用户 %s 成功" +msgstr "创建用户 {name} 成功" #: users/views/user.py:175 msgid "Invalid file." -msgstr "" +msgstr "文件错误" diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html index 419ca717f..7cbb5fc87 100644 --- a/apps/templates/_header_bar.html +++ b/apps/templates/_header_bar.html @@ -38,7 +38,7 @@

  1. - {% trans 'Home' %} + {% trans 'Dashboard' %}
  2. {% if app %}