groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-05-19 18:01:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/mkne/Part-DB-server

Browse source 
# Conflicts:
#	translations/messages.en.xlf
This commit is contained in:
Marc Kreidler 2026-03-05 21:00:29 +01:00
commit 50a04553bf
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
translations/messages.en.xlf
View file

@ -12755,17 +12755,16 @@ Buerklin-API Authentication server:
<target>Create [part] from barcode</target>
</segment>
</unit>
<<<<<<< HEAD
<unit id="xH258F." name="parts.create_from_scan.title">
<segment state="translated">
<source>parts.create_from_scan.title</source>
<target>Create [part] from label scan</target>
=======
</segment>
</unit>
<unit id="8WZYwRJ" name="scan_dialog.mode.amazon">
<segment state="translated">
<source>scan_dialog.mode.amazon</source>
<target>Amazon barcode</target>
>>>>>>> 0b9b2cbf (Allow to read amazon labels for part retrieval and creation)
</segment>
</unit>
<unit id="BQWuR_G" name="settings.ips.canopy">