Merge remote-tracking branch 'weblate/main'

haroohie-club · Jul 23, 2024 · e289fe8 · e289fe8
2 parents cb39edd + 1ed3e82
commit e289fe8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/SerialLoops/Strings.resx b/src/SerialLoops/Strings.resx
@@ -59,7 +59,7 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>

diff --git a/src/SerialLoops/Strings.zh-Hans.resx b/src/SerialLoops/Strings.zh-Hans.resx
@@ -201,7 +201,11 @@
     <value>“访问保存数据提示”消息框</value>
   </data>
   <data name="(Missing)" xml:space="preserve">
+<<<<<<< HEAD
     <value> （缺失）</value>
+=======
+    <value>（缺失）</value>
+>>>>>>> weblate/main
   </data>
   <data name="Batch Dialogue Display On" xml:space="preserve">
     <value>批量对话显示开</value>