Merge pull request #161 from jumpserver/dev

Dev

cmd/locale/en_US/LC_MESSAGES/koko.po

@@ -19,135 +19,138 @@ msgstr ""
 
 #. i18n.T
 #: pkg/handler/banner.go:48
-msgid "directly login"
-msgstr ""
-
-#. i18n.T
-#: pkg/handler/banner.go:49
 msgid "part IP, Hostname, Comment"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:49
+#: pkg/handler/banner.go:48
 msgid "to search login if unique"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:50
+#: pkg/handler/banner.go:49
 msgid "/ + IP, Hostname, Comment"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:50
+#: pkg/handler/banner.go:49
 msgid "to search, such as: /192.168"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:51
+#: pkg/handler/banner.go:50
 msgid "display the host you have permission"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:52
+#: pkg/handler/banner.go:51
 msgid "display the node that you have permission"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:53
+#: pkg/handler/banner.go:52
 msgid "refresh your assets and nodes"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:54
+#: pkg/handler/banner.go:53
 msgid "print help"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:55
+#: pkg/handler/banner.go:54
 msgid "exit"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:90
+#: pkg/handler/banner.go:89
 msgid "ID"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:91
+#: pkg/handler/banner.go:90
 msgid "hostname"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:92
+#: pkg/handler/banner.go:91
 msgid "IP"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:93
+#: pkg/handler/banner.go:92
 msgid "comment"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:94
+#: pkg/handler/banner.go:93
 msgid "Page: %d, Count: %d, Total Page: %d, Total Count: %d"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:95
+#: pkg/handler/banner.go:94
 msgid "No Assets"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/banner.go:96
+#: pkg/handler/banner.go:95
 msgid ""
-"\n"
-"Tips: Enter the asset ID and directly login the asset.\n"
+"Enter ID number directly login the asset, multiple search use // + field, "
+"such as: //16"
+msgstr ""
+
+#. i18n.T
+#: pkg/handler/banner.go:96
+msgid "Page up: b\tPage down: n"
 msgstr ""
 
 #. i18n.T
 #: pkg/handler/banner.go:97
-msgid ""
-"\n"
-"Page up: P/p\tPage down: Enter|N/n\tBACK: b.\n"
+msgid "Node: [ ID.Name(Asset amount) ]"
 msgstr ""
 
 #. i18n.T
 #: pkg/handler/banner.go:98
-msgid "Node: [ ID.Name(Asset amount) ]"
+msgid "Tips: Enter g+NodeID to display the host under the node, such as g1"
 msgstr ""
 
 #. i18n.T
 #: pkg/handler/banner.go:99
-msgid "Tips: Enter g+NodeID to display the host under the node, such as g1"
+msgid "Refresh done"
 msgstr ""
 
 #. i18n.T
 #: pkg/handler/banner.go:100
-msgid "Refresh done"
+msgid "Tips: Enter system user ID and directly login the asset [ %s(%s) ]"
 msgstr ""
 
 #. i18n.T
 #: pkg/handler/banner.go:101
-msgid "Tips: Enter system user ID and directly login the asset [ %s(%s) ]"
+msgid "Back: B/b"
 msgstr ""
 
 #. i18n.T
 #: pkg/handler/banner.go:102
-msgid "Back: B/b"
+msgid "Name"
 msgstr ""
 
 #. i18n.T
 #: pkg/handler/banner.go:103
-msgid "Name"
+msgid "Username"
 msgstr ""
 
 #. i18n.T
 #: pkg/handler/banner.go:104
-msgid "Username"
+msgid "all"
+msgstr ""
+
+#. i18n.T
+#: pkg/handler/banner.go:105
+msgid "Search: %s"
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/parser.go:131
+#: pkg/proxy/parser.go:130
 msgid "Command `%s` is forbidden"
 msgstr ""
 
@@ -178,11 +181,11 @@ msgid "Connect with api server failed"
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/switch.go:159
+#: pkg/proxy/switch.go:168
 msgid "Connect idle more than %d minutes, disconnect"
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/switch.go:166
+#: pkg/proxy/switch.go:175
 msgid "Terminated by administrator"
 msgstr ""

cmd/locale/zh_CN/LC_MESSAGES/koko.po

@@ -19,144 +19,147 @@ msgstr "欢迎使用Jumpserver开源堡垒机系统"
 
 #. i18n.T
 #: pkg/handler/banner.go:48
-msgid "directly login"
-msgstr "直接登录"
-
-#. i18n.T
-#: pkg/handler/banner.go:49
 msgid "part IP, Hostname, Comment"
 msgstr "部分IP、主机名、备注"
 
 #. i18n.T
-#: pkg/handler/banner.go:49
+#: pkg/handler/banner.go:48
+#, fuzzy
 msgid "to search login if unique"
 msgstr "搜索登录(如果唯一)"
 
 #. i18n.T
-#: pkg/handler/banner.go:50
+#: pkg/handler/banner.go:49
 msgid "/ + IP, Hostname, Comment"
 msgstr "/ + IP，主机名 or 备注"
 
 #. i18n.T
-#: pkg/handler/banner.go:50
+#: pkg/handler/banner.go:49
+#, fuzzy
 msgid "to search, such as: /192.168"
 msgstr "搜索，如：/192.168"
 
 #. i18n.T
-#: pkg/handler/banner.go:51
+#: pkg/handler/banner.go:50
 msgid "display the host you have permission"
 msgstr "显示您有权限的主机"
 
 #. i18n.T
-#: pkg/handler/banner.go:52
+#: pkg/handler/banner.go:51
 msgid "display the node that you have permission"
 msgstr "显示您有权限的节点"
 
 #. i18n.T
-#: pkg/handler/banner.go:53
+#: pkg/handler/banner.go:52
 msgid "refresh your assets and nodes"
 msgstr "刷新最新的机器和节点信息"
 
 #. i18n.T
-#: pkg/handler/banner.go:54
+#: pkg/handler/banner.go:53
 msgid "print help"
 msgstr "显示帮助"
 
 #. i18n.T
-#: pkg/handler/banner.go:55
+#: pkg/handler/banner.go:54
 msgid "exit"
 msgstr "退出"
 
 #. i18n.T
-#: pkg/handler/banner.go:90
+#: pkg/handler/banner.go:89
 msgid "ID"
 msgstr "ID"
 
 #. i18n.T
-#: pkg/handler/banner.go:91
+#: pkg/handler/banner.go:90
 msgid "hostname"
 msgstr "主机名"
 
 #. i18n.T
-#: pkg/handler/banner.go:92
+#: pkg/handler/banner.go:91
 msgid "IP"
 msgstr "IP"
 
 #. i18n.T
-#: pkg/handler/banner.go:93
+#: pkg/handler/banner.go:92
 msgid "comment"
 msgstr "备注"
 
 #. i18n.T
-#: pkg/handler/banner.go:94
+#: pkg/handler/banner.go:93
 msgid "Page: %d, Count: %d, Total Page: %d, Total Count: %d"
 msgstr "页码：%d，每页行数：%d，总页数：%d，总数量：%d"
 
 #. i18n.T
-#: pkg/handler/banner.go:95
+#: pkg/handler/banner.go:94
 msgid "No Assets"
 msgstr "没有资产"
 
 #. i18n.T
-#: pkg/handler/banner.go:96
+#: pkg/handler/banner.go:95
 #, fuzzy
 msgid ""
-"\n"
-"Tips: Enter the asset ID and directly login the asset.\n"
-msgstr ""
-"\n"
-"提示：输入资产ID，登录资产\n"
+"Enter ID number directly login the asset, multiple search use // + field, "
+"such as: //16"
+msgstr "提示：输入资产ID直接登录，二级搜索使用 // + 字段，如：//192"
 
 #. i18n.T
-#: pkg/handler/banner.go:97
-msgid ""
-"\n"
-"Page up: P/p\tPage down: Enter|N/n\tBACK: b.\n"
-msgstr ""
-"\n"
-"上一页：P/p  下一页：Enter|N/n  返回：B/b\n"
+#: pkg/handler/banner.go:96
+#, fuzzy
+msgid "Page up: b\tPage down: n"
+msgstr "上一页：b 下一页：n"
 
 #. i18n.T
-#: pkg/handler/banner.go:98
+#: pkg/handler/banner.go:97
 msgid "Node: [ ID.Name(Asset amount) ]"
 msgstr "节点：[ ID.名称(资产数量) ]"
 
 #. i18n.T
-#: pkg/handler/banner.go:99
+#: pkg/handler/banner.go:98
 msgid "Tips: Enter g+NodeID to display the host under the node, such as g1"
 msgstr "提示：输入 g+节点ID 显示节点下主机，如: g1"
 
 #. i18n.T
-#: pkg/handler/banner.go:100
+#: pkg/handler/banner.go:99
 msgid "Refresh done"
 msgstr "刷新完成"
 
 #. i18n.T
-#: pkg/handler/banner.go:101
+#: pkg/handler/banner.go:100
 #, fuzzy
 msgid "Tips: Enter system user ID and directly login the asset [ %s(%s) ]"
 msgstr ""
 "\n"
 "提示：输入系统用户ID，登录资产[ %s(%s) ]\n"
 
 #. i18n.T
-#: pkg/handler/banner.go:102
+#: pkg/handler/banner.go:101
 msgid "Back: B/b"
 msgstr "返回：B/b"
 
 #. i18n.T
-#: pkg/handler/banner.go:103
+#: pkg/handler/banner.go:102
 msgid "Name"
 msgstr "名称"
 
 #. i18n.T
-#: pkg/handler/banner.go:104
+#: pkg/handler/banner.go:103
 #, fuzzy
 msgid "Username"
 msgstr "用户名"
 
 #. i18n.T
-#: pkg/proxy/parser.go:131
+#: pkg/handler/banner.go:104
+msgid "all"
+msgstr "所有"
+
+#. i18n.T
+#: pkg/handler/banner.go:105
+#, fuzzy
+msgid "Search: %s"
+msgstr "搜索: %s"
+
+#. i18n.T
+#: pkg/proxy/parser.go:130
 msgid "Command `%s` is forbidden"
 msgstr "命令 `%s` 是被禁止的 ..."
 
@@ -187,11 +190,11 @@ msgid "Connect with api server failed"
 msgstr "连接API服务失败"
 
 #. i18n.T
-#: pkg/proxy/switch.go:159
+#: pkg/proxy/switch.go:168
 msgid "Connect idle more than %d minutes, disconnect"
 msgstr "空闲时间超过%d分钟，断开连接"
 
 #. i18n.T
-#: pkg/proxy/switch.go:166
+#: pkg/proxy/switch.go:175
 msgid "Terminated by administrator"
 msgstr "管理员中断连接"