diff --git a/netbox/dcim/tables/power.py b/netbox/dcim/tables/power.py
index 056b22b45..e4735bd57 100644
--- a/netbox/dcim/tables/power.py
+++ b/netbox/dcim/tables/power.py
@@ -33,7 +33,7 @@ class PowerPanelTable(ContactsColumnMixin, NetBoxTable):
powerfeed_count = columns.LinkedCountColumn(
viewname='dcim:powerfeed_list',
url_params={'power_panel_id': 'pk'},
- verbose_name=_('Feeds')
+ verbose_name=_('Power Feeds')
)
comments = columns.MarkdownColumn(
verbose_name=_('Comments'),
diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py
index c2db6165c..baff0efbb 100644
--- a/netbox/extras/tables/tables.py
+++ b/netbox/extras/tables/tables.py
@@ -79,7 +79,7 @@ class CustomFieldTable(NetBoxTable):
)
choice_set = tables.Column(
linkify=True,
- verbose_name=_('Choice set')
+ verbose_name=_('Choice Set')
)
choices = columns.ChoicesColumn(
max_items=10,
@@ -468,7 +468,7 @@ class JournalEntryTable(NetBoxTable):
format=settings.SHORT_DATETIME_FORMAT
)
assigned_object_type = columns.ContentTypeColumn(
- verbose_name=_('Object type')
+ verbose_name=_('Object Type')
)
assigned_object = tables.Column(
linkify=True,
diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py
index 469b5ed10..3b50b257d 100644
--- a/netbox/ipam/tables/ip.py
+++ b/netbox/ipam/tables/ip.py
@@ -371,7 +371,7 @@ class IPAddressTable(TenancyColumnsMixin, NetBoxTable):
accessor='assigned_object__parent_object',
linkify=True,
orderable=False,
- verbose_name=_('Device/VM')
+ verbose_name=_('Parent')
)
nat_inside = tables.Column(
linkify=True,
diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py
index 8a0913f7c..aee91e7d8 100644
--- a/netbox/ipam/tables/vlans.py
+++ b/netbox/ipam/tables/vlans.py
@@ -207,7 +207,7 @@ class InterfaceVLANTable(NetBoxTable):
"""
vid = tables.Column(
linkify=True,
- verbose_name=_('ID')
+ verbose_name=_('VID')
)
tagged = columns.BooleanColumn(
verbose_name=_('Tagged'),
diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py
index 3d260c04b..dbe3c9482 100644
--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -171,7 +171,8 @@ class ToggleColumn(tables.CheckBoxColumn):
@property
def header(self):
- return mark_safe('')
+ title_text = _('Toggle all')
+ return mark_safe(f'')
class BooleanColumn(tables.Column):
diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py
index b6fa33c86..673c01185 100644
--- a/netbox/netbox/tables/tables.py
+++ b/netbox/netbox/tables/tables.py
@@ -170,15 +170,13 @@ class NetBoxTable(BaseTable):
* Actions
"""
pk = columns.ToggleColumn(
- verbose_name=_('Pk'),
visible=False
)
id = tables.Column(
linkify=True,
verbose_name=_('ID')
)
- actions = columns.ActionsColumn(
- )
+ actions = columns.ActionsColumn()
exempt_columns = ('pk', 'actions')