From eda0e2fe265c4995e8558b0b1fdd4f892b14b642 Mon Sep 17 00:00:00 2001
From: Morgan Diepart <morgandiepart@gmail.com>
Date: Tue, 16 Apr 2024 12:15:45 +0200
Subject: [PATCH 1/5] Update Measurement Unit concept (#596)

---
 docs/concepts.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/concepts.md b/docs/concepts.md
index b0861ffa..b6221026 100644
--- a/docs/concepts.md
+++ b/docs/concepts.md
@@ -152,7 +152,7 @@ Footprints are hierarchically which allows you to build logically sorted trees.
 
 ### Measurement Unit
 
-By default, part instock is counted in number of individual parts, which is fine for things like electronic components,
+By default, part in stock is counted in number of individual parts, which is fine for things like electronic components,
 which exist only in integer quantities. However, if you have things with fractional units like the length of a wire or
 the volume of a liquid, you have to define a measurement unit.
 The measurement unit represents a physical quantity like mass, volume, or length.
@@ -160,6 +160,9 @@ The measurement unit represents a physical quantity like mass, volume, or length
 You can define a short unit for it (like m for Meters, or g for grams) which will be shown when a quantity of a part
 with this unit is shown.
 
+In order to cover wider use cases and allow you to define measurement units further, it is possible to define parameters
+associated to a measurement unit. These parameters are distinct from a part's parameters and are not inherited.
+
 ### Currency
 
 By default, all prices are set in the base currency configured for the instance (by default euros). If you want to use

From 34940dd9501403a821d56ed47e91d94df0de2c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Mon, 22 Apr 2024 16:06:13 +0200
Subject: [PATCH 2/5] New translations messages.en.xlf (Russian) (#602)

---
 translations/messages.ru.xlf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/translations/messages.ru.xlf b/translations/messages.ru.xlf
index e8b5687b..cc31308b 100644
--- a/translations/messages.ru.xlf
+++ b/translations/messages.ru.xlf
@@ -8040,7 +8040,7 @@
       </notes>
       <segment state="translated">
         <source>perm.tools.ic_logos</source>
-        <target>логотипы ИС</target>
+        <target>Логотипы производителей</target>
       </segment>
     </unit>
     <unit id="soh_cnt" name="perm.tools.statistics">
@@ -10116,7 +10116,7 @@
     <unit id="Dw4KG4Y" name="tools.ic_logos.title">
       <segment state="translated">
         <source>tools.ic_logos.title</source>
-        <target>Логотипы IC</target>
+        <target>Логотипы производителей</target>
       </segment>
     </unit>
     <unit id="9a9Yu9u" name="part_list.action.group.labels">

From e93148304ef6124a1fa3790a8ece8f6ca71d685f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Fri, 26 Apr 2024 17:22:47 +0200
Subject: [PATCH 3/5] New translations messages.en.xlf (English)

---
 translations/messages.en.xlf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 163225c1..22aafb01 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -3130,7 +3130,7 @@ Sub elements will be moved upwards.</target>
       </notes>
       <segment state="translated">
         <source>statistics.parts_instock_sum</source>
-        <target>Sum of all part instocks</target>
+        <target>Sum of all parts stocks</target>
       </segment>
     </unit>
     <unit id="OUVlqDZ" name="statistics.parts_with_price">

From ffb659b22840eeca813192b86ab4b6563c86b5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sat, 27 Apr 2024 20:30:18 +0200
Subject: [PATCH 4/5] New translations validators.en.xlf (Chinese Simplified)

---
 translations/validators.zh.xlf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/translations/validators.zh.xlf b/translations/validators.zh.xlf
index 77153e35..08c9f014 100644
--- a/translations/validators.zh.xlf
+++ b/translations/validators.zh.xlf
@@ -341,5 +341,11 @@
         <target>该供应商条码已在另一批次中使用。条形码必须是唯一的</target>
       </segment>
     </unit>
+    <unit id="o1qmPUm" name="validator.year_2038_bug_on_32bit">
+      <segment state="translated">
+        <source>validator.year_2038_bug_on_32bit</source>
+        <target>由于技术限制，在32位系统中无法选择2038年1月19日之后的日期！</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

From 39f196013545403289108368d0a1fde5ad162f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sat, 27 Apr 2024 21:30:19 +0200
Subject: [PATCH 5/5] New translations messages.en.xlf (Chinese Simplified)

---
 translations/messages.zh.xlf | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/translations/messages.zh.xlf b/translations/messages.zh.xlf
index 43498457..668c32f2 100644
--- a/translations/messages.zh.xlf
+++ b/translations/messages.zh.xlf
@@ -12196,5 +12196,17 @@ Element 3</target>
         <target>拒绝访问。请登录</target>
       </segment>
     </unit>
+    <unit id="ZY3REby" name="attachment.upload_multiple_files">
+      <segment state="translated">
+        <source>attachment.upload_multiple_files</source>
+        <target>上传文件</target>
+      </segment>
+    </unit>
+    <unit id="OBO.21_" name="entity.mass_creation_flash">
+      <segment state="translated">
+        <source>entity.mass_creation_flash</source>
+        <target>成功创建 %COUNT% 个元素。</target>
+      </segment>
+    </unit>
   </file>
 </xliff>