groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-12-06 02:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'merge_system'

Browse source
This commit is contained in:
Jan Böhmer 2023-11-24 23:51:35 +01:00
commit 5b09cbf1ac
22 changed files with 1573 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

84
translations/messages.en.xlf
View file

@ -11957,5 +11957,89 @@ Please note, that you can not impersonate a disabled user. If you try you will g
<target>Stocked amount</target>
</segment>
</unit>
<unit id="hfwUcM0" name="collection_type.new_element">
<segment>
<source>collection_type.new_element</source>
<target>collection_type.new_element</target>
</segment>
</unit>
<unit id="2NZFail" name="collection_type.new_element.tooltip">
<segment>
<source>collection_type.new_element.tooltip</source>
<target>This element was newly created and was not persisted to the database yet.</target>
</segment>
</unit>
<unit id="USUaBZ0" name="part.merge.title">
<segment>
<source>part.merge.title</source>
<target>Merge part</target>
</segment>
</unit>
<unit id="sCLZTwA" name="part.merge.title.into">
<segment>
<source>part.merge.title.into</source>
<target>into</target>
</segment>
</unit>
<unit id="nISUoQl" name="part.merge.confirm.title">
<segment>
<source>part.merge.confirm.title</source>
<target><![CDATA[Do you really want to merge <b>%other%</b> into <b>%target%</b>?]]></target>
</segment>
</unit>
<unit id="qxHNYfX" name="part.merge.confirm.message">
<segment>
<source>part.merge.confirm.message</source>
<target><![CDATA[<b>%other%</b> will be deleted, and the part will be saved with the shown information.]]></target>
</segment>
</unit>
<unit id="BY9.T4F" name="part.info.merge_modal.title">
<segment>
<source>part.info.merge_modal.title</source>
<target>Merge parts</target>
</segment>
</unit>
<unit id="CasQeyD" name="part.info.merge_modal.other_part">
<segment>
<source>part.info.merge_modal.other_part</source>
<target>Other part</target>
</segment>
</unit>
<unit id="96Qzc6H" name="part.info.merge_modal.other_into_this">
<segment>
<source>part.info.merge_modal.other_into_this</source>
<target>Merge other part into this one (delete other part, keep this one)</target>
</segment>
</unit>
<unit id="Oe4cpRH" name="part.info.merge_modal.this_into_other">
<segment>
<source>part.info.merge_modal.this_into_other</source>
<target>Merge this part into other one (delete this part, keep other one)</target>
</segment>
</unit>
<unit id="pO3q5CN" name="part.info.merge_btn">
<segment>
<source>part.info.merge_btn</source>
<target>Merge part</target>
</segment>
</unit>
<unit id="efgWRwB" name="part.update_part_from_info_provider.btn">
<segment>
<source>part.update_part_from_info_provider.btn</source>
<target>Update part from info providers</target>
</segment>
</unit>
<unit id="n6_Ec0h" name="info_providers.update_part.title">
<segment>
<source>info_providers.update_part.title</source>
<target>Update existing part from info provider</target>
</segment>
</unit>
<unit id="lkIVIWr" name="part.merge.flash.please_review">
<segment>
<source>part.merge.flash.please_review</source>
<target>Data not saved yet. Review the changes and click save to persist the new data.</target>
</segment>
</unit>
</file>
</xliff>