From aeac903c23f10be04f5db4cdd47188257ebd3eda Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 15 Oct 2020 15:23:41 +0300 Subject: [PATCH] chore Signed-off-by: Roman --- locales/en/messages.po | 144 ++++++++++-------- locales/fi/messages.po | 144 ++++++++++-------- locales/ru/messages.po | 144 ++++++++++-------- src/common/user-store.ts | 2 - src/main/index.ts | 7 +- src/main/tray.ts | 7 + src/main/window-manager.ts | 13 +- .../components/+preferences/preferences.tsx | 15 +- 8 files changed, 246 insertions(+), 230 deletions(-) diff --git a/locales/en/messages.po b/locales/en/messages.po index 86f99a841f..f83e9d11a2 100644 --- a/locales/en/messages.po +++ b/locales/en/messages.po @@ -87,8 +87,8 @@ msgstr "Account Name" msgid "Active" msgstr "Active" -#: src/renderer/components/+add-cluster/add-cluster.tsx:289 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:130 +#: src/renderer/components/+add-cluster/add-cluster.tsx:310 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:127 msgid "Add Cluster" msgstr "Add Cluster" @@ -112,7 +112,7 @@ msgstr "Add bindings to {name}" #~ msgid "Add cluster" #~ msgstr "Add cluster" -#: src/renderer/components/+add-cluster/add-cluster.tsx:306 +#: src/renderer/components/+add-cluster/add-cluster.tsx:327 msgid "Add cluster(s)" msgstr "Add cluster(s)" @@ -203,7 +203,7 @@ msgstr "All clusters within workspace will be cleared as well" msgid "All groups" msgstr "All groups" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:57 +#: src/renderer/components/dock/pod-logs.tsx:37 msgid "All logs" msgstr "All logs" @@ -219,11 +219,11 @@ msgstr "Allocatable" msgid "Allow Privilege Escalation" msgstr "Allow Privilege Escalation" -#: src/renderer/components/+preferences/preferences.tsx:169 +#: src/renderer/components/+preferences/preferences.tsx:172 msgid "Allow telemetry & usage tracking" msgstr "Allow telemetry & usage tracking" -#: src/renderer/components/+preferences/preferences.tsx:161 +#: src/renderer/components/+preferences/preferences.tsx:164 msgid "Allow untrusted Certificate Authorities" msgstr "Allow untrusted Certificate Authorities" @@ -301,6 +301,14 @@ msgstr "Associate clusters and choose the ones you want to access via quick laun msgid "Auth App Role" msgstr "Auth App Role" +#: src/renderer/components/+preferences/preferences.tsx:160 +msgid "Auto start-up" +msgstr "Auto start-up" + +#: src/renderer/components/+preferences/preferences.tsx:161 +msgid "Automatically start Lens on login" +msgstr "Automatically start Lens on login" + #: src/renderer/components/error-boundary/error-boundary.tsx:53 #: src/renderer/components/wizard/wizard.tsx:130 msgid "Back" @@ -323,7 +331,7 @@ msgstr "Binding targets" msgid "Bindings" msgstr "Bindings" -#: src/renderer/components/+add-cluster/add-cluster.tsx:236 +#: src/renderer/components/+add-cluster/add-cluster.tsx:257 msgid "Browse" msgstr "Browse" @@ -404,7 +412,7 @@ msgstr "CPU:" #: src/renderer/components/+workspaces/workspaces.tsx:133 #: src/renderer/components/confirm-dialog/confirm-dialog.tsx:44 -#: src/renderer/components/dock/info-panel.tsx:85 +#: src/renderer/components/dock/info-panel.tsx:86 #: src/renderer/components/wizard/wizard.tsx:130 msgid "Cancel" msgstr "Cancel" @@ -422,7 +430,7 @@ msgstr "Cancel" msgid "Capacity" msgstr "Capacity" -#: src/renderer/components/+preferences/preferences.tsx:160 +#: src/renderer/components/+preferences/preferences.tsx:163 msgid "Certificate Trust" msgstr "Certificate Trust" @@ -473,7 +481,6 @@ msgstr "Claim" msgid "Claim Name" msgstr "Claim Name" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:243 #: src/renderer/components/dialog/logs-dialog.tsx:39 #: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:93 msgid "Close" @@ -566,7 +573,7 @@ msgstr "Configuration" msgid "Connection" msgstr "Connection" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:246 +#: src/renderer/components/dock/pod-logs.tsx:144 msgid "Container" msgstr "Container" @@ -595,8 +602,8 @@ msgid "Container runtime" msgstr "Container runtime" #: src/renderer/components/+workloads-pods/pod-details.tsx:122 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:186 #: src/renderer/components/+workloads-pods/pods.tsx:77 +#: src/renderer/components/dock/pod-logs.tsx:125 msgid "Containers" msgstr "Containers" @@ -691,7 +698,7 @@ msgstr "Create new Secret" msgid "Create new Service Account" msgstr "Create new Service Account" -#: src/renderer/components/dock/dock.tsx:93 +#: src/renderer/components/dock/dock.tsx:99 msgid "Create resource" msgstr "Create resource" @@ -818,7 +825,7 @@ msgstr "Desired Healthy" msgid "Desired number of replicas" msgstr "Desired number of replicas" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:65 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:62 msgid "Disconnect" msgstr "Disconnect" @@ -832,7 +839,7 @@ msgstr "Disk" msgid "Disk:" msgstr "Disk:" -#: src/renderer/components/+preferences/preferences.tsx:165 +#: src/renderer/components/+preferences/preferences.tsx:168 msgid "Does not affect cluster communications!" msgstr "Does not affect cluster communications!" @@ -928,7 +935,8 @@ msgstr "Environment" msgid "Error stack" msgstr "Error stack" -#: src/renderer/components/+add-cluster/add-cluster.tsx:109 +#: src/renderer/components/+add-cluster/add-cluster.tsx:88 +#: src/renderer/components/+add-cluster/add-cluster.tsx:129 msgid "Error while adding cluster(s): {0}" msgstr "Error while adding cluster(s): {0}" @@ -948,7 +956,7 @@ msgstr "Everything is fine in the Cluster" #~ msgid "Excluded items with \"system:\" prefix" #~ msgstr "Excluded items with \"system:\" prefix" -#: src/renderer/components/dock/dock.tsx:98 +#: src/renderer/components/dock/dock.tsx:104 msgid "Exit full size mode" msgstr "Exit full size mode" @@ -964,7 +972,7 @@ msgstr "External IP" msgid "External IPs" msgstr "External IPs" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:106 +#: src/renderer/components/dock/pod-logs.store.ts:64 msgid "Failed to load logs: {0}" msgstr "Failed to load logs: {0}" @@ -989,7 +997,7 @@ msgstr "Finalizers" msgid "First seen" msgstr "First seen" -#: src/renderer/components/dock/dock.tsx:98 +#: src/renderer/components/dock/dock.tsx:104 msgid "Fit to window" msgstr "Fit to window" @@ -1006,8 +1014,8 @@ msgid "From" msgstr "From" #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:212 -msgid "From <0>{from} to <1>{to}" -msgstr "From <0>{from} to <1>{to}" +#~ msgid "From <0>{from} to <1>{to}" +#~ msgstr "From <0>{from} to <1>{to}" #: src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx:125 msgid "Fs Group" @@ -1068,7 +1076,7 @@ msgid "Helm branch <0>{0} already in use" msgstr "Helm branch <0>{0} already in use" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/dock/pod-logs.tsx:155 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Hide" msgstr "Hide" @@ -1153,7 +1161,7 @@ msgid "Ingresses" msgstr "Ingresses" #: src/renderer/components/+workloads-pods/pod-details.tsx:118 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:192 +#: src/renderer/components/dock/pod-logs.tsx:131 msgid "Init Containers" msgstr "Init Containers" @@ -1314,7 +1322,7 @@ msgstr "Limited to {0}" msgid "Limits" msgstr "Limits" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248 +#: src/renderer/components/dock/pod-logs.tsx:146 msgid "Lines" msgstr "Lines" @@ -1338,8 +1346,8 @@ msgstr "Load-Balancer Ingress Points" msgid "Loading" msgstr "Loading" -#: src/renderer/components/+workloads-pods/pod-menu.tsx:90 -#: src/renderer/components/+workloads-pods/pod-menu.tsx:91 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:99 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:100 msgid "Logs" msgstr "Logs" @@ -1445,7 +1453,7 @@ msgstr "Min Available" msgid "Min Pods" msgstr "Min Pods" -#: src/renderer/components/dock/dock.tsx:99 +#: src/renderer/components/dock/dock.tsx:105 msgid "Minimize" msgstr "Minimize" @@ -1581,7 +1589,7 @@ msgstr "Namespaces" msgid "Namespaces: {0}" msgstr "Namespaces: {0}" -#: src/renderer/components/+preferences/preferences.tsx:164 +#: src/renderer/components/+preferences/preferences.tsx:167 msgid "Needed with some corporate proxies that do certificate re-writing." msgstr "Needed with some corporate proxies that do certificate re-writing." @@ -1600,11 +1608,11 @@ msgstr "Network File System" msgid "Network Policies" msgstr "Network Policies" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:231 +#: src/renderer/components/dock/pod-logs.tsx:173 msgid "New logs since opening the dialog" msgstr "New logs since opening the dialog" -#: src/renderer/components/dock/dock.tsx:86 +#: src/renderer/components/dock/dock.tsx:92 msgid "New tab" msgstr "New tab" @@ -1642,7 +1650,7 @@ msgstr "No Nodes Available." #~ msgid "No contexts available or they already added" #~ msgstr "No contexts available or they already added" -#: src/renderer/components/+add-cluster/add-cluster.tsx:260 +#: src/renderer/components/+add-cluster/add-cluster.tsx:281 msgid "No contexts available or they have been added already" msgstr "No contexts available or they have been added already" @@ -1738,7 +1746,7 @@ msgstr "Ok" msgid "Ok, got it!" msgstr "Ok, got it!" -#: src/renderer/components/dock/dock.tsx:99 +#: src/renderer/components/dock/dock.tsx:105 msgid "Open" msgstr "Open" @@ -1774,7 +1782,7 @@ msgstr "Parallelism" msgid "Parameters" msgstr "Parameters" -#: src/renderer/components/+add-cluster/add-cluster.tsx:230 +#: src/renderer/components/+add-cluster/add-cluster.tsx:251 msgid "Paste as text" msgstr "Paste as text" @@ -1798,7 +1806,7 @@ msgstr "Persistent Volume Claims" msgid "Persistent Volumes" msgstr "Persistent Volumes" -#: src/renderer/components/+add-cluster/add-cluster.tsx:72 +#: src/renderer/components/+add-cluster/add-cluster.tsx:74 msgid "Please select at least one cluster context" msgstr "Please select at least one cluster context" @@ -1851,7 +1859,7 @@ msgstr "Pod Selector" msgid "Pod Status" msgstr "Pod Status" -#: src/renderer/components/+workloads-pods/pod-menu.tsx:67 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:76 msgid "Pod shell" msgstr "Pod shell" @@ -1914,7 +1922,7 @@ msgstr "Privileged" #~ msgid "Pro-Tip: paste kubeconfig to collect available contexts" #~ msgstr "Pro-Tip: paste kubeconfig to collect available contexts" -#: src/renderer/components/+add-cluster/add-cluster.tsx:248 +#: src/renderer/components/+add-cluster/add-cluster.tsx:269 msgid "Pro-Tip: paste kubeconfig to get available contexts" msgstr "Pro-Tip: paste kubeconfig to get available contexts" @@ -1922,7 +1930,7 @@ msgstr "Pro-Tip: paste kubeconfig to get available contexts" #~ msgid "Pro-Tip: paste kubeconfig to parse available contexts" #~ msgstr "Pro-Tip: paste kubeconfig to parse available contexts" -#: src/renderer/components/+add-cluster/add-cluster.tsx:239 +#: src/renderer/components/+add-cluster/add-cluster.tsx:260 msgid "Pro-Tip: you can also drag-n-drop kubeconfig file to this area" msgstr "Pro-Tip: you can also drag-n-drop kubeconfig file to this area" @@ -1943,7 +1951,7 @@ msgstr "Provisioner" msgid "Proxy is used only for non-cluster communication." msgstr "Proxy is used only for non-cluster communication." -#: src/renderer/components/+add-cluster/add-cluster.tsx:294 +#: src/renderer/components/+add-cluster/add-cluster.tsx:315 msgid "Proxy settings" msgstr "Proxy settings" @@ -1979,7 +1987,7 @@ msgstr "Readiness" msgid "Reason" msgstr "Reason" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:107 +#: src/renderer/components/dock/pod-logs.store.ts:65 msgid "Reason: {0} ({1})" msgstr "Reason: {0} ({1})" @@ -2025,8 +2033,8 @@ msgstr "Releases" #: src/renderer/components/+preferences/preferences.tsx:152 #: src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx:60 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:76 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:82 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:73 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:79 #: src/renderer/components/item-object-list/item-list-layout.tsx:179 #: src/renderer/components/menu/menu-actions.tsx:49 #: src/renderer/components/menu/menu-actions.tsx:85 @@ -2124,7 +2132,7 @@ msgstr "Required Drop Capabilities" msgid "Required field" msgstr "Required field" -#: src/renderer/components/+add-cluster/add-cluster.tsx:235 +#: src/renderer/components/+add-cluster/add-cluster.tsx:256 #: src/renderer/components/item-object-list/page-filters-list.tsx:31 msgid "Reset" msgstr "Reset" @@ -2266,9 +2274,9 @@ msgstr "Runtime Class" #: src/renderer/components/+apps-releases/release-details.tsx:114 #: src/renderer/components/+config-maps/config-map-details.tsx:78 #: src/renderer/components/+config-secrets/secret-details.tsx:97 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216 #: src/renderer/components/+workspaces/workspaces.tsx:132 #: src/renderer/components/dock/edit-resource.tsx:87 +#: src/renderer/components/dock/pod-logs.tsx:156 msgid "Save" msgstr "Save" @@ -2360,7 +2368,7 @@ msgstr "Select a quota.." #~ msgid "Select context(s)" #~ msgstr "Select context(s)" -#: src/renderer/components/+add-cluster/add-cluster.tsx:257 +#: src/renderer/components/+add-cluster/add-cluster.tsx:278 msgid "Select contexts" msgstr "Select contexts" @@ -2373,8 +2381,8 @@ msgstr "Select contexts" #~ msgid "Select custom kube-config file" #~ msgstr "Select custom kube-config file" -#: src/renderer/components/+add-cluster/add-cluster.tsx:62 -#: src/renderer/components/+add-cluster/add-cluster.tsx:62 +#: src/renderer/components/+add-cluster/add-cluster.tsx:63 +#: src/renderer/components/+add-cluster/add-cluster.tsx:63 msgid "Select custom kubeconfig file" msgstr "Select custom kubeconfig file" @@ -2390,7 +2398,7 @@ msgstr "Select custom kubeconfig file" #~ msgid "Select kubeconfig" #~ msgstr "Select kubeconfig" -#: src/renderer/components/+add-cluster/add-cluster.tsx:229 +#: src/renderer/components/+add-cluster/add-cluster.tsx:250 msgid "Select kubeconfig file" msgstr "Select kubeconfig file" @@ -2418,7 +2426,7 @@ msgstr "Select service accounts" #~ msgid "Selected contexts ({0}): <0>{1}" #~ msgstr "Selected contexts ({0}): <0>{1}" -#: src/renderer/components/+add-cluster/add-cluster.tsx:256 +#: src/renderer/components/+add-cluster/add-cluster.tsx:277 msgid "Selected contexts: <0>{0}" msgstr "Selected contexts: <0>{0}" @@ -2470,18 +2478,18 @@ msgstr "Set" msgid "Set quota" msgstr "Set quota" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:53 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:51 msgid "Settings" msgstr "Settings" #: src/renderer/components/+nodes/node-menu.tsx:48 -#: src/renderer/components/+workloads-pods/pod-menu.tsx:68 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:77 msgid "Shell" msgstr "Shell" #: src/renderer/components/+config-secrets/secret-details.tsx:93 #: src/renderer/components/+workloads-pods/pod-container-env.tsx:101 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/dock/pod-logs.tsx:155 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" msgstr "Show" @@ -2494,6 +2502,10 @@ msgstr "Show Notes" msgid "Show value" msgstr "Show value" +#: src/renderer/components/dock/pod-logs.tsx:150 +msgid "Since" +msgstr "Since" + #: src/renderer/components/+nodes/node-charts.tsx:80 #: src/renderer/components/+storage-volume-claims/volume-claims.tsx:49 msgid "Size" @@ -2588,12 +2600,12 @@ msgstr "Strategy Type" msgid "Sub-object" msgstr "Sub-object" -#: src/renderer/components/dock/info-panel.tsx:93 +#: src/renderer/components/dock/info-panel.tsx:95 #: src/renderer/components/wizard/wizard.tsx:131 msgid "Submit" msgstr "Submit" -#: src/renderer/components/dock/info-panel.tsx:94 +#: src/renderer/components/dock/info-panel.tsx:96 msgid "Submitting.." msgstr "Submitting.." @@ -2601,7 +2613,7 @@ msgstr "Submitting.." msgid "Subsets" msgstr "Subsets" -#: src/renderer/components/+add-cluster/add-cluster.tsx:102 +#: src/renderer/components/+add-cluster/add-cluster.tsx:121 msgid "Successfully imported <0>{0} cluster(s)" msgstr "Successfully imported <0>{0} cluster(s)" @@ -2623,11 +2635,11 @@ msgstr "TLS" msgid "Taints" msgstr "Taints" -#: src/renderer/components/+preferences/preferences.tsx:168 +#: src/renderer/components/+preferences/preferences.tsx:171 msgid "Telemetry & Usage Tracking" msgstr "Telemetry & Usage Tracking" -#: src/renderer/components/+preferences/preferences.tsx:171 +#: src/renderer/components/+preferences/preferences.tsx:174 msgid "Telemetry & usage data is collected to continuously improve the Lens experience." msgstr "Telemetry & usage data is collected to continuously improve the Lens experience." @@ -2635,7 +2647,7 @@ msgstr "Telemetry & usage data is collected to continuously improve the Lens exp msgid "Terminal" msgstr "Terminal" -#: src/renderer/components/dock/dock.tsx:89 +#: src/renderer/components/dock/dock.tsx:95 msgid "Terminal session" msgstr "Terminal session" @@ -2643,7 +2655,7 @@ msgstr "Terminal session" msgid "The path to the kubectl binary on the system." msgstr "The path to the kubectl binary on the system." -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226 +#: src/renderer/components/dock/pod-logs.tsx:167 msgid "There are no logs available for container." msgstr "There are no logs available for container." @@ -2663,7 +2675,7 @@ msgstr "This field must be a valid path" msgid "This is the quick launch menu." msgstr "This is the quick launch menu." -#: src/renderer/components/+preferences/preferences.tsx:163 +#: src/renderer/components/+preferences/preferences.tsx:166 msgid "This will make Lens to trust ANY certificate authority without any validations." msgstr "This will make Lens to trust ANY certificate authority without any validations." @@ -2773,8 +2785,8 @@ msgstr "Upgrade version" msgid "Usage" msgstr "Usage" -#: src/renderer/components/+add-cluster/add-cluster.tsx:63 -#: src/renderer/components/+add-cluster/add-cluster.tsx:63 +#: src/renderer/components/+add-cluster/add-cluster.tsx:64 +#: src/renderer/components/+add-cluster/add-cluster.tsx:64 msgid "Use configuration" msgstr "Use configuration" @@ -2941,7 +2953,7 @@ msgstr "listKind" msgid "never" msgstr "never" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:133 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:130 msgid "new" msgstr "new" @@ -2961,7 +2973,7 @@ msgstr "sec" msgid "singular" msgstr "singular" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/dock/pod-logs.tsx:155 msgid "timestamps" msgstr "timestamps" @@ -3006,8 +3018,8 @@ msgid "{metricsRemainCount} more..." msgstr "{metricsRemainCount} more..." #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:240 -msgid "{podName} Logs" -msgstr "{podName} Logs" +#~ msgid "{podName} Logs" +#~ msgstr "{podName} Logs" #: src/renderer/components/dock/edit-resource.tsx:56 msgid "{resourceType} <0>{resourceName} updated." @@ -3017,6 +3029,6 @@ msgstr "{resourceType} <0>{resourceName} updated." msgid "{selectedCount, plural, one {<0>Remove item <1>{selectedNames}?} other {<2>Remove <3>{selectedCount} items <4>{selectedNames} {tail}?}}" msgstr "{selectedCount, plural, one {<0>Remove item <1>{selectedNames}?} other {<2>Remove <3>{selectedCount} items <4>{selectedNames} {tail}?}}" -#: src/renderer/components/dock/info-panel.tsx:88 +#: src/renderer/components/dock/info-panel.tsx:89 msgid "{submitLabel} & Close" msgstr "{submitLabel} & Close" diff --git a/locales/fi/messages.po b/locales/fi/messages.po index 1b53f1bffa..631991e26b 100644 --- a/locales/fi/messages.po +++ b/locales/fi/messages.po @@ -87,8 +87,8 @@ msgstr "" msgid "Active" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:289 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:130 +#: src/renderer/components/+add-cluster/add-cluster.tsx:310 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:127 msgid "Add Cluster" msgstr "" @@ -112,7 +112,7 @@ msgstr "" #~ msgid "Add cluster" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:306 +#: src/renderer/components/+add-cluster/add-cluster.tsx:327 msgid "Add cluster(s)" msgstr "" @@ -203,7 +203,7 @@ msgstr "" msgid "All groups" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:57 +#: src/renderer/components/dock/pod-logs.tsx:37 msgid "All logs" msgstr "" @@ -219,11 +219,11 @@ msgstr "" msgid "Allow Privilege Escalation" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:169 +#: src/renderer/components/+preferences/preferences.tsx:172 msgid "Allow telemetry & usage tracking" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:161 +#: src/renderer/components/+preferences/preferences.tsx:164 msgid "Allow untrusted Certificate Authorities" msgstr "" @@ -301,6 +301,14 @@ msgstr "" msgid "Auth App Role" msgstr "" +#: src/renderer/components/+preferences/preferences.tsx:160 +msgid "Auto start-up" +msgstr "" + +#: src/renderer/components/+preferences/preferences.tsx:161 +msgid "Automatically start Lens on login" +msgstr "" + #: src/renderer/components/error-boundary/error-boundary.tsx:53 #: src/renderer/components/wizard/wizard.tsx:130 msgid "Back" @@ -323,7 +331,7 @@ msgstr "" msgid "Bindings" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:236 +#: src/renderer/components/+add-cluster/add-cluster.tsx:257 msgid "Browse" msgstr "" @@ -404,7 +412,7 @@ msgstr "" #: src/renderer/components/+workspaces/workspaces.tsx:133 #: src/renderer/components/confirm-dialog/confirm-dialog.tsx:44 -#: src/renderer/components/dock/info-panel.tsx:85 +#: src/renderer/components/dock/info-panel.tsx:86 #: src/renderer/components/wizard/wizard.tsx:130 msgid "Cancel" msgstr "" @@ -422,7 +430,7 @@ msgstr "" msgid "Capacity" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:160 +#: src/renderer/components/+preferences/preferences.tsx:163 msgid "Certificate Trust" msgstr "" @@ -469,7 +477,6 @@ msgstr "" msgid "Claim Name" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:243 #: src/renderer/components/dialog/logs-dialog.tsx:39 #: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:93 msgid "Close" @@ -562,7 +569,7 @@ msgstr "" msgid "Connection" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:246 +#: src/renderer/components/dock/pod-logs.tsx:144 msgid "Container" msgstr "" @@ -591,8 +598,8 @@ msgid "Container runtime" msgstr "" #: src/renderer/components/+workloads-pods/pod-details.tsx:122 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:186 #: src/renderer/components/+workloads-pods/pods.tsx:77 +#: src/renderer/components/dock/pod-logs.tsx:125 msgid "Containers" msgstr "" @@ -687,7 +694,7 @@ msgstr "" msgid "Create new Service Account" msgstr "" -#: src/renderer/components/dock/dock.tsx:93 +#: src/renderer/components/dock/dock.tsx:99 msgid "Create resource" msgstr "" @@ -814,7 +821,7 @@ msgstr "" msgid "Desired number of replicas" msgstr "" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:65 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:62 msgid "Disconnect" msgstr "" @@ -828,7 +835,7 @@ msgstr "" msgid "Disk:" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:165 +#: src/renderer/components/+preferences/preferences.tsx:168 msgid "Does not affect cluster communications!" msgstr "" @@ -924,7 +931,8 @@ msgstr "" msgid "Error stack" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:109 +#: src/renderer/components/+add-cluster/add-cluster.tsx:88 +#: src/renderer/components/+add-cluster/add-cluster.tsx:129 msgid "Error while adding cluster(s): {0}" msgstr "" @@ -939,7 +947,7 @@ msgstr "" msgid "Everything is fine in the Cluster" msgstr "" -#: src/renderer/components/dock/dock.tsx:98 +#: src/renderer/components/dock/dock.tsx:104 msgid "Exit full size mode" msgstr "" @@ -955,7 +963,7 @@ msgstr "" msgid "External IPs" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:106 +#: src/renderer/components/dock/pod-logs.store.ts:64 msgid "Failed to load logs: {0}" msgstr "" @@ -980,7 +988,7 @@ msgstr "" msgid "First seen" msgstr "" -#: src/renderer/components/dock/dock.tsx:98 +#: src/renderer/components/dock/dock.tsx:104 msgid "Fit to window" msgstr "" @@ -997,8 +1005,8 @@ msgid "From" msgstr "" #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:212 -msgid "From <0>{from} to <1>{to}" -msgstr "" +#~ msgid "From <0>{from} to <1>{to}" +#~ msgstr "" #: src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx:125 msgid "Fs Group" @@ -1059,7 +1067,7 @@ msgid "Helm branch <0>{0} already in use" msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/dock/pod-logs.tsx:155 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Hide" msgstr "" @@ -1144,7 +1152,7 @@ msgid "Ingresses" msgstr "" #: src/renderer/components/+workloads-pods/pod-details.tsx:118 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:192 +#: src/renderer/components/dock/pod-logs.tsx:131 msgid "Init Containers" msgstr "" @@ -1305,7 +1313,7 @@ msgstr "" msgid "Limits" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248 +#: src/renderer/components/dock/pod-logs.tsx:146 msgid "Lines" msgstr "" @@ -1329,8 +1337,8 @@ msgstr "" msgid "Loading" msgstr "" -#: src/renderer/components/+workloads-pods/pod-menu.tsx:90 -#: src/renderer/components/+workloads-pods/pod-menu.tsx:91 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:99 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:100 msgid "Logs" msgstr "" @@ -1436,7 +1444,7 @@ msgstr "" msgid "Min Pods" msgstr "" -#: src/renderer/components/dock/dock.tsx:99 +#: src/renderer/components/dock/dock.tsx:105 msgid "Minimize" msgstr "" @@ -1572,7 +1580,7 @@ msgstr "" msgid "Namespaces: {0}" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:164 +#: src/renderer/components/+preferences/preferences.tsx:167 msgid "Needed with some corporate proxies that do certificate re-writing." msgstr "" @@ -1591,11 +1599,11 @@ msgstr "" msgid "Network Policies" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:231 +#: src/renderer/components/dock/pod-logs.tsx:173 msgid "New logs since opening the dialog" msgstr "" -#: src/renderer/components/dock/dock.tsx:86 +#: src/renderer/components/dock/dock.tsx:92 msgid "New tab" msgstr "" @@ -1625,7 +1633,7 @@ msgstr "" #~ msgid "No contexts available or they already added" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:260 +#: src/renderer/components/+add-cluster/add-cluster.tsx:281 msgid "No contexts available or they have been added already" msgstr "" @@ -1721,7 +1729,7 @@ msgstr "" msgid "Ok, got it!" msgstr "" -#: src/renderer/components/dock/dock.tsx:99 +#: src/renderer/components/dock/dock.tsx:105 msgid "Open" msgstr "" @@ -1757,7 +1765,7 @@ msgstr "" msgid "Parameters" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:230 +#: src/renderer/components/+add-cluster/add-cluster.tsx:251 msgid "Paste as text" msgstr "" @@ -1781,7 +1789,7 @@ msgstr "" msgid "Persistent Volumes" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:72 +#: src/renderer/components/+add-cluster/add-cluster.tsx:74 msgid "Please select at least one cluster context" msgstr "" @@ -1834,7 +1842,7 @@ msgstr "" msgid "Pod Status" msgstr "" -#: src/renderer/components/+workloads-pods/pod-menu.tsx:67 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:76 msgid "Pod shell" msgstr "" @@ -1897,7 +1905,7 @@ msgstr "" #~ msgid "Pro-Tip: paste kubeconfig to collect available contexts" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:248 +#: src/renderer/components/+add-cluster/add-cluster.tsx:269 msgid "Pro-Tip: paste kubeconfig to get available contexts" msgstr "" @@ -1905,7 +1913,7 @@ msgstr "" #~ msgid "Pro-Tip: paste kubeconfig to parse available contexts" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:239 +#: src/renderer/components/+add-cluster/add-cluster.tsx:260 msgid "Pro-Tip: you can also drag-n-drop kubeconfig file to this area" msgstr "" @@ -1926,7 +1934,7 @@ msgstr "" msgid "Proxy is used only for non-cluster communication." msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:294 +#: src/renderer/components/+add-cluster/add-cluster.tsx:315 msgid "Proxy settings" msgstr "" @@ -1962,7 +1970,7 @@ msgstr "" msgid "Reason" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:107 +#: src/renderer/components/dock/pod-logs.store.ts:65 msgid "Reason: {0} ({1})" msgstr "" @@ -2008,8 +2016,8 @@ msgstr "" #: src/renderer/components/+preferences/preferences.tsx:152 #: src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx:60 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:76 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:82 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:73 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:79 #: src/renderer/components/item-object-list/item-list-layout.tsx:179 #: src/renderer/components/menu/menu-actions.tsx:49 #: src/renderer/components/menu/menu-actions.tsx:85 @@ -2107,7 +2115,7 @@ msgstr "" msgid "Required field" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:235 +#: src/renderer/components/+add-cluster/add-cluster.tsx:256 #: src/renderer/components/item-object-list/page-filters-list.tsx:31 msgid "Reset" msgstr "" @@ -2249,9 +2257,9 @@ msgstr "" #: src/renderer/components/+apps-releases/release-details.tsx:114 #: src/renderer/components/+config-maps/config-map-details.tsx:78 #: src/renderer/components/+config-secrets/secret-details.tsx:97 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216 #: src/renderer/components/+workspaces/workspaces.tsx:132 #: src/renderer/components/dock/edit-resource.tsx:87 +#: src/renderer/components/dock/pod-logs.tsx:156 msgid "Save" msgstr "" @@ -2343,7 +2351,7 @@ msgstr "" #~ msgid "Select context(s)" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:257 +#: src/renderer/components/+add-cluster/add-cluster.tsx:278 msgid "Select contexts" msgstr "" @@ -2356,8 +2364,8 @@ msgstr "" #~ msgid "Select custom kube-config file" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:62 -#: src/renderer/components/+add-cluster/add-cluster.tsx:62 +#: src/renderer/components/+add-cluster/add-cluster.tsx:63 +#: src/renderer/components/+add-cluster/add-cluster.tsx:63 msgid "Select custom kubeconfig file" msgstr "" @@ -2373,7 +2381,7 @@ msgstr "" #~ msgid "Select kubeconfig" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:229 +#: src/renderer/components/+add-cluster/add-cluster.tsx:250 msgid "Select kubeconfig file" msgstr "" @@ -2401,7 +2409,7 @@ msgstr "" #~ msgid "Selected contexts ({0}): <0>{1}" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:256 +#: src/renderer/components/+add-cluster/add-cluster.tsx:277 msgid "Selected contexts: <0>{0}" msgstr "" @@ -2453,18 +2461,18 @@ msgstr "" msgid "Set quota" msgstr "" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:53 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:51 msgid "Settings" msgstr "" #: src/renderer/components/+nodes/node-menu.tsx:48 -#: src/renderer/components/+workloads-pods/pod-menu.tsx:68 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:77 msgid "Shell" msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:93 #: src/renderer/components/+workloads-pods/pod-container-env.tsx:101 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/dock/pod-logs.tsx:155 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" msgstr "" @@ -2477,6 +2485,10 @@ msgstr "" msgid "Show value" msgstr "" +#: src/renderer/components/dock/pod-logs.tsx:150 +msgid "Since" +msgstr "" + #: src/renderer/components/+nodes/node-charts.tsx:80 #: src/renderer/components/+storage-volume-claims/volume-claims.tsx:49 msgid "Size" @@ -2571,12 +2583,12 @@ msgstr "" msgid "Sub-object" msgstr "" -#: src/renderer/components/dock/info-panel.tsx:93 +#: src/renderer/components/dock/info-panel.tsx:95 #: src/renderer/components/wizard/wizard.tsx:131 msgid "Submit" msgstr "" -#: src/renderer/components/dock/info-panel.tsx:94 +#: src/renderer/components/dock/info-panel.tsx:96 msgid "Submitting.." msgstr "" @@ -2584,7 +2596,7 @@ msgstr "" msgid "Subsets" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:102 +#: src/renderer/components/+add-cluster/add-cluster.tsx:121 msgid "Successfully imported <0>{0} cluster(s)" msgstr "" @@ -2606,11 +2618,11 @@ msgstr "" msgid "Taints" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:168 +#: src/renderer/components/+preferences/preferences.tsx:171 msgid "Telemetry & Usage Tracking" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:171 +#: src/renderer/components/+preferences/preferences.tsx:174 msgid "Telemetry & usage data is collected to continuously improve the Lens experience." msgstr "" @@ -2618,7 +2630,7 @@ msgstr "" msgid "Terminal" msgstr "" -#: src/renderer/components/dock/dock.tsx:89 +#: src/renderer/components/dock/dock.tsx:95 msgid "Terminal session" msgstr "" @@ -2626,7 +2638,7 @@ msgstr "" msgid "The path to the kubectl binary on the system." msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226 +#: src/renderer/components/dock/pod-logs.tsx:167 msgid "There are no logs available for container." msgstr "" @@ -2646,7 +2658,7 @@ msgstr "" msgid "This is the quick launch menu." msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:163 +#: src/renderer/components/+preferences/preferences.tsx:166 msgid "This will make Lens to trust ANY certificate authority without any validations." msgstr "" @@ -2756,8 +2768,8 @@ msgstr "" msgid "Usage" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:63 -#: src/renderer/components/+add-cluster/add-cluster.tsx:63 +#: src/renderer/components/+add-cluster/add-cluster.tsx:64 +#: src/renderer/components/+add-cluster/add-cluster.tsx:64 msgid "Use configuration" msgstr "" @@ -2924,7 +2936,7 @@ msgstr "" msgid "never" msgstr "" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:133 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:130 msgid "new" msgstr "" @@ -2944,7 +2956,7 @@ msgstr "" msgid "singular" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/dock/pod-logs.tsx:155 msgid "timestamps" msgstr "" @@ -2989,8 +3001,8 @@ msgid "{metricsRemainCount} more..." msgstr "" #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:240 -msgid "{podName} Logs" -msgstr "" +#~ msgid "{podName} Logs" +#~ msgstr "" #: src/renderer/components/dock/edit-resource.tsx:56 msgid "{resourceType} <0>{resourceName} updated." @@ -3000,6 +3012,6 @@ msgstr "" msgid "{selectedCount, plural, one {<0>Remove item <1>{selectedNames}?} other {<2>Remove <3>{selectedCount} items <4>{selectedNames} {tail}?}}" msgstr "" -#: src/renderer/components/dock/info-panel.tsx:88 +#: src/renderer/components/dock/info-panel.tsx:89 msgid "{submitLabel} & Close" msgstr "" diff --git a/locales/ru/messages.po b/locales/ru/messages.po index 5cbf7f603e..4c6a3e6b1a 100644 --- a/locales/ru/messages.po +++ b/locales/ru/messages.po @@ -88,8 +88,8 @@ msgstr "Название аккаунта" msgid "Active" msgstr "Активный" -#: src/renderer/components/+add-cluster/add-cluster.tsx:289 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:130 +#: src/renderer/components/+add-cluster/add-cluster.tsx:310 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:127 msgid "Add Cluster" msgstr "" @@ -113,7 +113,7 @@ msgstr "Добавить привязки к {name}" #~ msgid "Add cluster" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:306 +#: src/renderer/components/+add-cluster/add-cluster.tsx:327 msgid "Add cluster(s)" msgstr "" @@ -204,7 +204,7 @@ msgstr "" msgid "All groups" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:57 +#: src/renderer/components/dock/pod-logs.tsx:37 msgid "All logs" msgstr "Все логи" @@ -220,11 +220,11 @@ msgstr "" msgid "Allow Privilege Escalation" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:169 +#: src/renderer/components/+preferences/preferences.tsx:172 msgid "Allow telemetry & usage tracking" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:161 +#: src/renderer/components/+preferences/preferences.tsx:164 msgid "Allow untrusted Certificate Authorities" msgstr "" @@ -302,6 +302,14 @@ msgstr "" msgid "Auth App Role" msgstr "Auth App Role" +#: src/renderer/components/+preferences/preferences.tsx:160 +msgid "Auto start-up" +msgstr "" + +#: src/renderer/components/+preferences/preferences.tsx:161 +msgid "Automatically start Lens on login" +msgstr "" + #: src/renderer/components/error-boundary/error-boundary.tsx:53 #: src/renderer/components/wizard/wizard.tsx:130 msgid "Back" @@ -324,7 +332,7 @@ msgstr "Цели привязки" msgid "Bindings" msgstr "Привязки" -#: src/renderer/components/+add-cluster/add-cluster.tsx:236 +#: src/renderer/components/+add-cluster/add-cluster.tsx:257 msgid "Browse" msgstr "" @@ -405,7 +413,7 @@ msgstr "CPU:" #: src/renderer/components/+workspaces/workspaces.tsx:133 #: src/renderer/components/confirm-dialog/confirm-dialog.tsx:44 -#: src/renderer/components/dock/info-panel.tsx:85 +#: src/renderer/components/dock/info-panel.tsx:86 #: src/renderer/components/wizard/wizard.tsx:130 msgid "Cancel" msgstr "Отмена" @@ -423,7 +431,7 @@ msgstr "Отмена" msgid "Capacity" msgstr "Емкость" -#: src/renderer/components/+preferences/preferences.tsx:160 +#: src/renderer/components/+preferences/preferences.tsx:163 msgid "Certificate Trust" msgstr "" @@ -474,7 +482,6 @@ msgstr "Запрос" msgid "Claim Name" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:243 #: src/renderer/components/dialog/logs-dialog.tsx:39 #: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:93 msgid "Close" @@ -567,7 +574,7 @@ msgstr "Конфигурация" msgid "Connection" msgstr "Соединение" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:246 +#: src/renderer/components/dock/pod-logs.tsx:144 msgid "Container" msgstr "Контейнер" @@ -596,8 +603,8 @@ msgid "Container runtime" msgstr "Среда контейнеров" #: src/renderer/components/+workloads-pods/pod-details.tsx:122 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:186 #: src/renderer/components/+workloads-pods/pods.tsx:77 +#: src/renderer/components/dock/pod-logs.tsx:125 msgid "Containers" msgstr "Контейнеры" @@ -692,7 +699,7 @@ msgstr "Создать новый секрет" msgid "Create new Service Account" msgstr "Создать новый Service Account" -#: src/renderer/components/dock/dock.tsx:93 +#: src/renderer/components/dock/dock.tsx:99 msgid "Create resource" msgstr "Создать ресурс" @@ -819,7 +826,7 @@ msgstr "" msgid "Desired number of replicas" msgstr "Нужный уровень реплик" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:65 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:62 msgid "Disconnect" msgstr "" @@ -833,7 +840,7 @@ msgstr "Диск" msgid "Disk:" msgstr "Диск:" -#: src/renderer/components/+preferences/preferences.tsx:165 +#: src/renderer/components/+preferences/preferences.tsx:168 msgid "Does not affect cluster communications!" msgstr "" @@ -929,7 +936,8 @@ msgstr "Среда" msgid "Error stack" msgstr "Стэк ошибки" -#: src/renderer/components/+add-cluster/add-cluster.tsx:109 +#: src/renderer/components/+add-cluster/add-cluster.tsx:88 +#: src/renderer/components/+add-cluster/add-cluster.tsx:129 msgid "Error while adding cluster(s): {0}" msgstr "" @@ -949,7 +957,7 @@ msgstr "В кластере все в порядке" #~ msgid "Excluded items with \"system:\" prefix" #~ msgstr "За исключением объектов с префиксом “system:”" -#: src/renderer/components/dock/dock.tsx:98 +#: src/renderer/components/dock/dock.tsx:104 msgid "Exit full size mode" msgstr "Выйти из полного размера" @@ -965,7 +973,7 @@ msgstr "Внешний IP" msgid "External IPs" msgstr "Внешние IP" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:106 +#: src/renderer/components/dock/pod-logs.store.ts:64 msgid "Failed to load logs: {0}" msgstr "Ошибка загрузки логов: {0}" @@ -990,7 +998,7 @@ msgstr "Финализаторы" msgid "First seen" msgstr "Увиденно впервые" -#: src/renderer/components/dock/dock.tsx:98 +#: src/renderer/components/dock/dock.tsx:104 msgid "Fit to window" msgstr "По размеру окна" @@ -1007,8 +1015,8 @@ msgid "From" msgstr "От" #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:212 -msgid "From <0>{from} to <1>{to}" -msgstr "От <0>{from} до <1>{to}" +#~ msgid "From <0>{from} to <1>{to}" +#~ msgstr "От <0>{from} до <1>{to}" #: src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx:125 msgid "Fs Group" @@ -1069,7 +1077,7 @@ msgid "Helm branch <0>{0} already in use" msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/dock/pod-logs.tsx:155 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Hide" msgstr "Скрыть" @@ -1154,7 +1162,7 @@ msgid "Ingresses" msgstr "Ingresses" #: src/renderer/components/+workloads-pods/pod-details.tsx:118 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:192 +#: src/renderer/components/dock/pod-logs.tsx:131 msgid "Init Containers" msgstr "Контейнеры инициализации" @@ -1315,7 +1323,7 @@ msgstr "" msgid "Limits" msgstr "Лимиты" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248 +#: src/renderer/components/dock/pod-logs.tsx:146 msgid "Lines" msgstr "Строки" @@ -1339,8 +1347,8 @@ msgstr "" msgid "Loading" msgstr "Загрузка" -#: src/renderer/components/+workloads-pods/pod-menu.tsx:90 -#: src/renderer/components/+workloads-pods/pod-menu.tsx:91 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:99 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:100 msgid "Logs" msgstr "Логи" @@ -1446,7 +1454,7 @@ msgstr "" msgid "Min Pods" msgstr "Мин. подов" -#: src/renderer/components/dock/dock.tsx:99 +#: src/renderer/components/dock/dock.tsx:105 msgid "Minimize" msgstr "Минимизировать" @@ -1582,7 +1590,7 @@ msgstr "Namespaces" msgid "Namespaces: {0}" msgstr "Namespaces: {0}" -#: src/renderer/components/+preferences/preferences.tsx:164 +#: src/renderer/components/+preferences/preferences.tsx:167 msgid "Needed with some corporate proxies that do certificate re-writing." msgstr "" @@ -1601,11 +1609,11 @@ msgstr "Сетевая файловая система" msgid "Network Policies" msgstr "Network Policies" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:231 +#: src/renderer/components/dock/pod-logs.tsx:173 msgid "New logs since opening the dialog" msgstr "Новые логи с момента открытия диалога" -#: src/renderer/components/dock/dock.tsx:86 +#: src/renderer/components/dock/dock.tsx:92 msgid "New tab" msgstr "Новая вкладка" @@ -1643,7 +1651,7 @@ msgstr "Нет доступных нод." #~ msgid "No contexts available or they already added" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:260 +#: src/renderer/components/+add-cluster/add-cluster.tsx:281 msgid "No contexts available or they have been added already" msgstr "" @@ -1739,7 +1747,7 @@ msgstr "Ок" msgid "Ok, got it!" msgstr "" -#: src/renderer/components/dock/dock.tsx:99 +#: src/renderer/components/dock/dock.tsx:105 msgid "Open" msgstr "Открыть" @@ -1775,7 +1783,7 @@ msgstr "Параллелизм" msgid "Parameters" msgstr "Параметры" -#: src/renderer/components/+add-cluster/add-cluster.tsx:230 +#: src/renderer/components/+add-cluster/add-cluster.tsx:251 msgid "Paste as text" msgstr "" @@ -1799,7 +1807,7 @@ msgstr "Persistent Volume Claims" msgid "Persistent Volumes" msgstr "Persistent Volumes" -#: src/renderer/components/+add-cluster/add-cluster.tsx:72 +#: src/renderer/components/+add-cluster/add-cluster.tsx:74 msgid "Please select at least one cluster context" msgstr "" @@ -1852,7 +1860,7 @@ msgstr "Селектор подов" msgid "Pod Status" msgstr "Статус подов" -#: src/renderer/components/+workloads-pods/pod-menu.tsx:67 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:76 msgid "Pod shell" msgstr "Командная строка пода" @@ -1915,7 +1923,7 @@ msgstr "" #~ msgid "Pro-Tip: paste kubeconfig to collect available contexts" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:248 +#: src/renderer/components/+add-cluster/add-cluster.tsx:269 msgid "Pro-Tip: paste kubeconfig to get available contexts" msgstr "" @@ -1923,7 +1931,7 @@ msgstr "" #~ msgid "Pro-Tip: paste kubeconfig to parse available contexts" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:239 +#: src/renderer/components/+add-cluster/add-cluster.tsx:260 msgid "Pro-Tip: you can also drag-n-drop kubeconfig file to this area" msgstr "" @@ -1944,7 +1952,7 @@ msgstr "Комиссия" msgid "Proxy is used only for non-cluster communication." msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:294 +#: src/renderer/components/+add-cluster/add-cluster.tsx:315 msgid "Proxy settings" msgstr "" @@ -1980,7 +1988,7 @@ msgstr "Готовность" msgid "Reason" msgstr "Причина" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:107 +#: src/renderer/components/dock/pod-logs.store.ts:65 msgid "Reason: {0} ({1})" msgstr "Причина: {0} ({1})" @@ -2026,8 +2034,8 @@ msgstr "Релизы" #: src/renderer/components/+preferences/preferences.tsx:152 #: src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx:60 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:76 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:82 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:73 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:79 #: src/renderer/components/item-object-list/item-list-layout.tsx:179 #: src/renderer/components/menu/menu-actions.tsx:49 #: src/renderer/components/menu/menu-actions.tsx:85 @@ -2125,7 +2133,7 @@ msgstr "" msgid "Required field" msgstr "Обязательное поле" -#: src/renderer/components/+add-cluster/add-cluster.tsx:235 +#: src/renderer/components/+add-cluster/add-cluster.tsx:256 #: src/renderer/components/item-object-list/page-filters-list.tsx:31 msgid "Reset" msgstr "Сбросить" @@ -2267,9 +2275,9 @@ msgstr "" #: src/renderer/components/+apps-releases/release-details.tsx:114 #: src/renderer/components/+config-maps/config-map-details.tsx:78 #: src/renderer/components/+config-secrets/secret-details.tsx:97 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216 #: src/renderer/components/+workspaces/workspaces.tsx:132 #: src/renderer/components/dock/edit-resource.tsx:87 +#: src/renderer/components/dock/pod-logs.tsx:156 msgid "Save" msgstr "Сохранить" @@ -2361,7 +2369,7 @@ msgstr "Выберите квоту..." #~ msgid "Select context(s)" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:257 +#: src/renderer/components/+add-cluster/add-cluster.tsx:278 msgid "Select contexts" msgstr "" @@ -2374,8 +2382,8 @@ msgstr "" #~ msgid "Select custom kube-config file" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:62 -#: src/renderer/components/+add-cluster/add-cluster.tsx:62 +#: src/renderer/components/+add-cluster/add-cluster.tsx:63 +#: src/renderer/components/+add-cluster/add-cluster.tsx:63 msgid "Select custom kubeconfig file" msgstr "" @@ -2391,7 +2399,7 @@ msgstr "" #~ msgid "Select kubeconfig" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:229 +#: src/renderer/components/+add-cluster/add-cluster.tsx:250 msgid "Select kubeconfig file" msgstr "" @@ -2419,7 +2427,7 @@ msgstr "Выбрать сервисные аккаунты" #~ msgid "Selected contexts ({0}): <0>{1}" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:256 +#: src/renderer/components/+add-cluster/add-cluster.tsx:277 msgid "Selected contexts: <0>{0}" msgstr "" @@ -2471,18 +2479,18 @@ msgstr "Установлено" msgid "Set quota" msgstr "Установить квоту" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:53 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:51 msgid "Settings" msgstr "" #: src/renderer/components/+nodes/node-menu.tsx:48 -#: src/renderer/components/+workloads-pods/pod-menu.tsx:68 +#: src/renderer/components/+workloads-pods/pod-menu.tsx:77 msgid "Shell" msgstr "Командная строка" #: src/renderer/components/+config-secrets/secret-details.tsx:93 #: src/renderer/components/+workloads-pods/pod-container-env.tsx:101 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/dock/pod-logs.tsx:155 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" msgstr "Показать" @@ -2495,6 +2503,10 @@ msgstr "Показать логи" msgid "Show value" msgstr "Показать значение" +#: src/renderer/components/dock/pod-logs.tsx:150 +msgid "Since" +msgstr "" + #: src/renderer/components/+nodes/node-charts.tsx:80 #: src/renderer/components/+storage-volume-claims/volume-claims.tsx:49 msgid "Size" @@ -2589,12 +2601,12 @@ msgstr "Тип стратегии" msgid "Sub-object" msgstr "Суб-объект" -#: src/renderer/components/dock/info-panel.tsx:93 +#: src/renderer/components/dock/info-panel.tsx:95 #: src/renderer/components/wizard/wizard.tsx:131 msgid "Submit" msgstr "Отправить" -#: src/renderer/components/dock/info-panel.tsx:94 +#: src/renderer/components/dock/info-panel.tsx:96 msgid "Submitting.." msgstr "Применение.." @@ -2602,7 +2614,7 @@ msgstr "Применение.." msgid "Subsets" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:102 +#: src/renderer/components/+add-cluster/add-cluster.tsx:121 msgid "Successfully imported <0>{0} cluster(s)" msgstr "" @@ -2624,11 +2636,11 @@ msgstr "TLS" msgid "Taints" msgstr "Метки блокировки" -#: src/renderer/components/+preferences/preferences.tsx:168 +#: src/renderer/components/+preferences/preferences.tsx:171 msgid "Telemetry & Usage Tracking" msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:171 +#: src/renderer/components/+preferences/preferences.tsx:174 msgid "Telemetry & usage data is collected to continuously improve the Lens experience." msgstr "" @@ -2636,7 +2648,7 @@ msgstr "" msgid "Terminal" msgstr "Терминал" -#: src/renderer/components/dock/dock.tsx:89 +#: src/renderer/components/dock/dock.tsx:95 msgid "Terminal session" msgstr "Сессия терминала" @@ -2644,7 +2656,7 @@ msgstr "Сессия терминала" msgid "The path to the kubectl binary on the system." msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226 +#: src/renderer/components/dock/pod-logs.tsx:167 msgid "There are no logs available for container." msgstr "Для контейнера нет логов." @@ -2664,7 +2676,7 @@ msgstr "" msgid "This is the quick launch menu." msgstr "" -#: src/renderer/components/+preferences/preferences.tsx:163 +#: src/renderer/components/+preferences/preferences.tsx:166 msgid "This will make Lens to trust ANY certificate authority without any validations." msgstr "" @@ -2774,8 +2786,8 @@ msgstr "Обновить версию" msgid "Usage" msgstr "Использование" -#: src/renderer/components/+add-cluster/add-cluster.tsx:63 -#: src/renderer/components/+add-cluster/add-cluster.tsx:63 +#: src/renderer/components/+add-cluster/add-cluster.tsx:64 +#: src/renderer/components/+add-cluster/add-cluster.tsx:64 msgid "Use configuration" msgstr "" @@ -2942,7 +2954,7 @@ msgstr "" msgid "never" msgstr "" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:133 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:130 msgid "new" msgstr "" @@ -2962,7 +2974,7 @@ msgstr "сек" msgid "singular" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/dock/pod-logs.tsx:155 msgid "timestamps" msgstr "временные метки" @@ -3007,8 +3019,8 @@ msgid "{metricsRemainCount} more..." msgstr "{metricsRemainCount} еще…" #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:240 -msgid "{podName} Logs" -msgstr "{podName} логи" +#~ msgid "{podName} Logs" +#~ msgstr "{podName} логи" #: src/renderer/components/dock/edit-resource.tsx:56 msgid "{resourceType} <0>{resourceName} updated." @@ -3025,6 +3037,6 @@ msgstr "" "other {<2>Удалить <3>{selectedCount} элементов <4>{selectedNames} {tail}?}\n" "}" -#: src/renderer/components/dock/info-panel.tsx:88 +#: src/renderer/components/dock/info-panel.tsx:89 msgid "{submitLabel} & Close" msgstr "{submitLabel} и закрыть" diff --git a/src/common/user-store.ts b/src/common/user-store.ts index 8faacbf85a..5bb8ec3a64 100644 --- a/src/common/user-store.ts +++ b/src/common/user-store.ts @@ -27,7 +27,6 @@ export interface UserPreferences { downloadKubectlBinaries?: boolean; downloadBinariesPath?: string; kubectlBinariesPath?: string; - trayEnabled?: boolean; openAtLogin?: boolean; } @@ -54,7 +53,6 @@ export class UserStore extends BaseStore { colorTheme: UserStore.defaultTheme, downloadMirror: "default", downloadKubectlBinaries: true, // Download kubectl binaries matching cluster version - trayEnabled: true, openAtLogin: true, }; diff --git a/src/main/index.ts b/src/main/index.ts index 15ebf6c139..e068b77d75 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -88,9 +88,6 @@ app.on("will-quit", (event) => { logger.info('APP:QUIT'); event.preventDefault(); // prevent app's default shutdown (e.g. required for telemetry, etc.) clusterManager?.stop(); // close cluster connections - if (userStore.preferences.trayEnabled) { - return; // with tray the app remains open - } else { - app.exit(); // forced app.quit() - } + return; // skip exit to make tray work, to quit go to app's global menu or tray's menu + // app.exit(); // forced app.quit }) diff --git a/src/main/tray.ts b/src/main/tray.ts index aec318db70..77bb603cc1 100644 --- a/src/main/tray.ts +++ b/src/main/tray.ts @@ -67,6 +67,13 @@ export function createTrayMenu(windowManager: WindowManager): Menu { showAbout(browserWindow); }, }, + { type: 'separator' }, + { + label: "Open Lens", + async click() { + await windowManager.ensureMainWindow() + }, + }, { label: "Preferences", async click() { diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts index f8f70d1697..ffef40f94f 100644 --- a/src/main/window-manager.ts +++ b/src/main/window-manager.ts @@ -1,7 +1,6 @@ import type { ClusterId } from "../common/cluster-store"; import { clusterStore } from "../common/cluster-store"; -import { userStore } from "../common/user-store"; -import { observable, reaction } from "mobx"; +import { observable } from "mobx"; import { app, BrowserWindow, dialog, ipcMain, shell, webContents } from "electron" import windowStateKeeper from "electron-window-state" import { initMenu } from "./menu"; @@ -82,15 +81,7 @@ export class WindowManager { } protected initTray() { - this.disposers.trayAutoBind = reaction(() => userStore.preferences.trayEnabled, isEnabled => { - if (isEnabled) { - this.disposers.trayAutoUpdater = initTray(this); - } else if (this.disposers.trayAutoUpdater) { - this.disposers.trayAutoUpdater(); - } - }, { - fireImmediately: true - }); + this.disposers.trayAutoUpdater = initTray(this); } protected bindEvents() { diff --git a/src/renderer/components/+preferences/preferences.tsx b/src/renderer/components/+preferences/preferences.tsx index 9c67bbd5a6..79bea1ce70 100644 --- a/src/renderer/components/+preferences/preferences.tsx +++ b/src/renderer/components/+preferences/preferences.tsx @@ -175,23 +175,10 @@ export class Preferences extends React.Component {

Auto start-up

Open on start-up} + label={Automatically start Lens on login} value={preferences.openAtLogin} onChange={v => preferences.openAtLogin = v} /> - - Opens Lens app on operation system login - - -

Tray icon

- Enable tray icon} - value={preferences.trayEnabled} - onChange={v => preferences.trayEnabled = v} - /> - - Adds OS-level tray icon and menu to get quick access to Lens -

Certificate Trust