mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-04-27 00:39:38 +00:00
Merge remote-tracking branch 'origin/feature/create-assemblies' into feature/all-features
# Conflicts: # .env # config/parameters.yaml # docs/configuration.md # migrations/Version20250304081039.php # migrations/Version20250304154507.php # src/Controller/AdminPages/BaseAdminController.php # src/Controller/ProjectController.php # src/Controller/TypeaheadController.php # src/DataTables/AssemblyBomEntriesDataTable.php # src/DataTables/PartsDataTable.php # src/Entity/AssemblySystem/AssemblyBOMEntry.php # src/Entity/Attachments/Attachment.php # src/Entity/Base/AbstractDBElement.php # src/Entity/LogSystem/CollectionElementDeleted.php # src/Entity/Parameters/AbstractParameter.php # src/Form/AssemblySystem/AssemblyBOMEntryType.php # src/Helpers/Assemblies/AssemblyPartAggregator.php # src/Security/Voter/AttachmentVoter.php # src/Services/AssemblySystem/AssemblyBuildHelper.php # src/Services/ImportExportSystem/BOMImporter.php # src/Services/ImportExportSystem/EntityExporter.php # src/Services/Trees/ToolsTreeBuilder.php # src/Services/Trees/TreeViewGenerator.php # src/Settings/BehaviorSettings/AssemblyBomTableColumns.php # src/Settings/BehaviorSettings/TableSettings.php # src/Validator/Constraints/AssemblySystem/AssemblyCycleValidator.php # templates/admin/assembly_admin.html.twig # templates/assemblies/build/_form.html.twig # templates/assemblies/import_bom.html.twig # templates/assemblies/info/_info_card.html.twig # templates/assemblies/info/info.html.twig # templates/components/tree_macros.html.twig # templates/form/collection_types_layout_assembly.html.twig # translations/messages.cs.xlf # translations/messages.da.xlf # translations/messages.de.xlf # translations/messages.el.xlf # translations/messages.en.xlf # translations/messages.es.xlf # translations/messages.fr.xlf # translations/messages.it.xlf # translations/messages.ja.xlf # translations/messages.nl.xlf # translations/messages.pl.xlf # translations/messages.ru.xlf # translations/messages.zh.xlf # translations/validators.cs.xlf # translations/validators.en.xlf
This commit is contained in:
commit
f7ec130010
42 changed files with 1272 additions and 2273 deletions
|
|
@ -9134,6 +9134,18 @@ Exampletown</target>
|
|||
<target>取り付け名</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="kd8Db5T" name="assembly.bom.designator">
|
||||
<segment>
|
||||
<source>assembly.bom.designator</source>
|
||||
<target>参照記号</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="jd7dh6G" name="assembly.bom.designator.help">
|
||||
<segment>
|
||||
<source>assembly.bom.designator.help</source>
|
||||
<target>自由な参照記号(デジグネータ)</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="rswC4eS" name="assembly.bom.instockAmount">
|
||||
<segment state="translated">
|
||||
<source>assembly.bom.instockAmount</source>
|
||||
|
|
@ -9284,6 +9296,12 @@ Exampletown</target>
|
|||
<target>名前</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="jd7dh6G" name="assembly.bom.name.help">
|
||||
<segment>
|
||||
<source>assembly.bom.name.help</source>
|
||||
<target>BOM エントリの人間が読めるタイトル</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="nUEs.ld" name="assembly.bom.comment">
|
||||
<segment>
|
||||
<source>assembly.bom.comment</source>
|
||||
|
|
@ -9308,6 +9326,24 @@ Exampletown</target>
|
|||
<target>必要な数量</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="UJpD7n6" name="assembly.import_bom">
|
||||
<segment>
|
||||
<source>assembly.import_bom</source>
|
||||
<target>アセンブリの部品表をインポート</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="WTasGao" name="assembly.bom.partOrAssembly">
|
||||
<segment>
|
||||
<source>assembly.bom.partOrAssembly</source>
|
||||
<target>部品またはアセンブリ</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="jd7fn8K" name="assembly.bom.identifiers">
|
||||
<segment>
|
||||
<source>assembly.bom.identifiers</source>
|
||||
<target>識別子</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="yes_button" name="assembly.build.yes_button">
|
||||
<segment>
|
||||
<source>assembly.build.yes_button</source>
|
||||
|
|
@ -9919,10 +9955,58 @@ Exampletown</target>
|
|||
<target>説明</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="a7uOieC" name="datasource.synonym">
|
||||
<unit id="jd7fhvc" name="assembly.bom.table.category">
|
||||
<segment state="translated">
|
||||
<source>datasource.synonym</source>
|
||||
<target>%name% (あなたの同義語: %synonym%)</target>
|
||||
<source>assembly.bom.table.category</source>
|
||||
<target>カテゴリ</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="ab12cd" name="assembly.bom.table.manufacturer">
|
||||
<segment state="translated">
|
||||
<source>assembly.bom.table.manufacturer</source>
|
||||
<target>メーカー</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="7dk4gTa" name="assembly.bom.table.designator">
|
||||
<segment state="translated">
|
||||
<source>assembly.bom.table.designator</source>
|
||||
<target>参照記号</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="ef34gh" name="assembly.bom.table.mountnames">
|
||||
<segment state="translated">
|
||||
<source>assembly.bom.table.mountnames</source>
|
||||
<target>実装名</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="ij56kl" name="assembly.bom.table.storage_location">
|
||||
<segment state="translated">
|
||||
<source>assembly.bom.table.storage_location</source>
|
||||
<target>保管場所</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="mn78op" name="assembly.bom.table.amount">
|
||||
<segment state="translated">
|
||||
<source>assembly.bom.table.amount</source>
|
||||
<target>数量</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="uv12wx" name="assembly.bom.table.addedDate">
|
||||
<segment state="translated">
|
||||
<source>assembly.bom.table.addedDate</source>
|
||||
<target>作成日</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="yz34aa" name="assembly.bom.table.lastModified">
|
||||
<segment state="translated">
|
||||
<source>assembly.bom.table.lastModified</source>
|
||||
<target>最終更新</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="bb56cc" name="assembly.bom.table.edit">
|
||||
<segment state="translated">
|
||||
<source>assembly.bom.table.edit</source>
|
||||
<target>編集</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="OXeGz1A" name="category.edit.part_ipn_prefix.placeholder">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue