mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-01-15 06:39:33 +00:00
Merge remote-tracking branch 'origin/feature/custom-part-status' into feature/all-features
# Conflicts: # docs/configuration.md # migrations/Version20250321141740.php # src/Entity/Attachments/Attachment.php # src/Entity/Base/AbstractDBElement.php # src/Entity/LogSystem/CollectionElementDeleted.php # src/Entity/LogSystem/LogTargetType.php # src/Entity/Parameters/AbstractParameter.php # src/Entity/Parts/PartCustomState.php # src/Security/Voter/AttachmentVoter.php # templates/parts/edit/_advanced.html.twig # tests/Controller/AdminPages/PartCustomStateControllerTest.php # translations/messages.cs.xlf # translations/messages.el.xlf # translations/messages.fr.xlf # translations/messages.ja.xlf # translations/messages.nl.xlf
This commit is contained in:
commit
73a2b16332
7 changed files with 170 additions and 176 deletions
|
|
@ -10374,7 +10374,7 @@ Element 3</target>
|
|||
<target>Cílový inventář</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="pyv0k6b" name="project.builds.number_of_builds">
|
||||
<unit id="5DTAvWG" name="project.builds.number_of_builds">
|
||||
<segment state="translated">
|
||||
<source>project.builds.number_of_builds</source>
|
||||
<target>Množství sestavy</target>
|
||||
|
|
|
|||
|
|
@ -1601,12 +1601,6 @@
|
|||
<target>Προσαρμοσμένη κατάσταση εξαρτήματος</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="G1hmQdb" name="part.table.partCustomState">
|
||||
<segment state="translated">
|
||||
<source>part.table.partCustomState</source>
|
||||
<target>Προσαρμοσμένη κατάσταση μέρους</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="FV7YOW6" name="part.table.name.value.for_part">
|
||||
<segment state="translated">
|
||||
<source>part.table.name.value.for_part</source>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue