NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-02-04 06:16:23 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature
CI / build (20.x, 3.12) (push) Has been cancelled
Details
CI / build (20.x, 3.13) (push) Has been cancelled
Details
CodeQL / Analyze (${{ matrix.language }}) (none, actions) (push) Has been cancelled
Details
CodeQL / Analyze (${{ matrix.language }}) (none, javascript-typescript) (push) Has been cancelled
Details
CodeQL / Analyze (${{ matrix.language }}) (none, python) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Jeremy Stretch
2025-10-03 12:09:03 -04:00
parent 23d7515b41 c094699dc0
commit 6c723dfb1a
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox/core/plugins.py
-1
View File
@@ -1,6 +1,5 @@
import datetime
import importlib
import importlib.util
from dataclasses import dataclass, field
from typing import Optional
netbox/dcim/migrations/0188_racktype.py
-2
View File
@@ -3,9 +3,7 @@ import django.db.models.deletion
import taggit.managers
from django.db import migrations, models
import utilities.fields
import utilities.json
import utilities.ordering
class Migration(migrations.Migration):
netbox/ipam/models/ip.py
+1 -1
View File
@@ -548,7 +548,7 @@ class IPRange(ContactsMixin, PrimaryModel):
mark_utilized = models.BooleanField(
verbose_name=_('mark utilized'),
default=False,
help_text=_("Report space as 100% utilized")
help_text=_("Report space as fully utilized")
)
clone_fields = (
netbox/translations/en/LC_MESSAGES/django.po
+2 -3
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-10-01 05:02+0000\n"
"POT-Creation-Date: 2025-10-02 05:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -10919,8 +10919,7 @@ msgid "Prevent the creation of IP addresses within this range"
msgstr ""
#: netbox/ipam/models/ip.py:551
#, python-format
msgid "Report space as 100% utilized"
msgid "Report space as fully utilized"
msgstr ""
#: netbox/ipam/models/ip.py:560