diff --git a/apps/audits/serializers.py b/apps/audits/serializers.py index 78c42fdd0..f22d27820 100644 --- a/apps/audits/serializers.py +++ b/apps/audits/serializers.py @@ -131,7 +131,7 @@ class ActivityUnionLogSerializer(serializers.Serializer): def get_content(obj): if not obj['r_detail']: action = obj['r_action'].replace('_', ' ').capitalize() - ctn = _('User %s %s this resource') % (obj['r_user'], _(action)) + ctn = _('%s %s this resource') % (obj['r_user'], _(action).lower()) else: ctn = i18n_trans(obj['r_detail']) return ctn diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 8d5424925..ba8681609 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -254,7 +254,7 @@ "CommandGroupUpdate": "Update the Command Group", "CommandStorage": "Command Storage", "CommandStorageUpdate": "Update the Cmd Storage", - "Commands": "Command Record", + "Commands": "Commands", "Comment": "Note", "CommentHelpText": "Note: Remarks will be displayed when hovered over in the Luna page's user authorization asset tree. Ordinary users can view, please do not fill in sensitive information.", "CommunityEdition": "Community Version", @@ -329,13 +329,13 @@ "DateExpired": "Expiration Date", "DateFinished": "Completion Date", "DateJoined": "Creation Date", - "DateLast24Hours": "Last 24 Hours", - "DateLast3Months": "Last Three Months", - "DateLastHarfYear": "The last six months", + "DateLast24Hours": "Last Day", + "DateLast3Months": "Quarter of Year", + "DateLastHarfYear": "Half of Year", "DateLastLogin": "Last Login Date", - "DateLastMonth": "Past One Month", + "DateLastMonth": "Last Month", "DateLastSync": "Last synchronization date", - "DateLastWeek": "Past Week", + "DateLastWeek": "Last Week", "DateLastYear": "Last Year", "DatePasswordLastUpdated": "Last Password Update Date", "DateStart": "Start Date", @@ -464,7 +464,7 @@ "GPTCreate": "Create a Asset - GPT", "GPTUpdate": "Update the Asset - GPT", "GatewayCreate": "Create a Gateway", - "GatewayList": "Gateway list", + "GatewayList": "Gateways", "GatewayUpdate": "Update the Gateway", "GatheredAccounts": "Gathered Accounts", "GeneralAccounts": "General Accounts", @@ -785,7 +785,9 @@ "Proportion": "Proportion", "ProportionOfAssetTypes": "Asset Type Proportion", "Protocol": "Protocol", - "Protocols": "Agreement", + "Protocols": "Protocols", + "SuEnabled": "Enable su", + "SyncProtocolToAsset": "Protocols to Assets", "Proxy": "Agent", "PublicCloud": "Public Cloud", "PublicKey": "Public Key", @@ -963,7 +965,7 @@ "SessionData": "Session Data", "SessionDetail": "Session Details", "SessionID": "Session ID", - "SessionList": "Conversation History", + "SessionList": "Sessions", "SessionMonitor": "Monitor", "SessionOffline": "Historical Sessions", "SessionOnline": "Online Sessions", @@ -1048,7 +1050,7 @@ "SyncStrategy": "Sync Policy", "SyncSuccessMsg": "Sync Succeeded", "SyncTask": "Sync Tasks", - "SyncUpdateAccountInfo": "Sync update account information", + "SyncUpdateAccountInfo": "Sync new secret to accounts", "SyncUser": "Sync Users", "SyncedCount": "Synchronized", "SystemError": "System Error", diff --git a/apps/perms/serializers/permission.py b/apps/perms/serializers/permission.py index aa816dd05..d8e15b2ce 100644 --- a/apps/perms/serializers/permission.py +++ b/apps/perms/serializers/permission.py @@ -42,7 +42,7 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali actions = ActionChoicesField(required=False, allow_null=True, label=_("Actions")) is_valid = serializers.BooleanField(read_only=True, label=_("Is valid")) is_expired = serializers.BooleanField(read_only=True, label=_("Is expired")) - accounts = serializers.ListField(label=_("Account"), required=False) + accounts = serializers.ListField(label=_("Accounts"), required=False) protocols = serializers.ListField(label=_("Protocols"), required=False) template_accounts = AccountTemplate.objects.none()