Merge branch 'develop' of https://github.com/SaboZhang/EasyTidy into …

…develop
SaboZhang · Jan 2, 2025 · db0f81a · db0f81a
2 parents 417b763 + 4dfc204
commit db0f81a
Show file tree

Hide file tree

Showing 16 changed files with 372 additions and 130 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,10 @@
 
-# 更新
-
-## [1.0.5.1212]之前的更新程序存在BUG,烦请手动下载新版本 1.0.5.1212版本可自动更新
+# 更新(元旦)
 
 [更新下载](https://github.com/SaboZhang/EasyTidy/releases)
 
 - 优化：导航菜单显示 感谢@kat
 
-**Full Changelog**: https://github.com/SaboZhang/EasyTidy/compare/1.1.0.1226...v1.1.1.1231-alpha.3
+**Full Changelog**: <https://github.com/SaboZhang/EasyTidy/compare/1.1.0.1226...1.1.1.0101>
+
+网盘下载：[123网盘](https://www.123684.com/s/hbzgTd-fmmt)|[蓝奏云(2025)](https://wwoo.lanzouu.com/b02u2ne0eh)
diff --git a/src/EasyTidy.Model/AppConfig.cs b/src/EasyTidy.Model/AppConfig.cs
@@ -5,8 +5,8 @@
 namespace EasyTidy.Model;
 public partial class AppConfig : JsonSettings, IVersionable
 {
-    [EnforcedVersion("1.1.0.1226")]
-    public virtual Version Version { get; set; } = new Version(1, 1, 0, 1226);
+    [EnforcedVersion("1.1.1.0101")]
+    public virtual Version Version { get; set; } = new Version(1, 1, 1, 0101);
 
     public override string FileName { get; set; } = Constants.AppConfigPath;
 

diff --git a/src/EasyTidy/EasyTidy.csproj b/src/EasyTidy/EasyTidy.csproj
@@ -12,7 +12,7 @@
     <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
-    <Version>1.1.0.1226</Version>
+    <Version>1.1.1.0101</Version>
     <ImplicitUsings>true</ImplicitUsings>
     <SuportedOSPlatformsVersion>10.0.22621.0</SuportedOSPlatformsVersion>
     <WindowsSdkPackageVersion>10.0.22621.45</WindowsSdkPackageVersion>

diff --git a/src/EasyTidy/MultilingualResources/EasyTidy.fr-FR.xlf b/src/EasyTidy/MultilingualResources/EasyTidy.fr-FR.xlf
@@ -1764,6 +1764,26 @@
           <source>Not between</source>
           <target state="translated">Pas entre</target>
         </trans-unit>
+        <trans-unit id="RestoreSelectionTips" translate="yes" xml:space="preserve">
+          <source>Please select the type to restore</source>
+          <target state="translated">Veuillez sélectionner le type à restaurer</target>
+        </trans-unit>
+        <trans-unit id="RestoreFailedTips" translate="yes" xml:space="preserve">
+          <source>Recovery failed</source>
+          <target state="translated">La récupération a échoué</target>
+        </trans-unit>
+        <trans-unit id="WebDavConnectFailed" translate="yes" xml:space="preserve">
+          <source>WebDAV connection failed</source>
+          <target state="translated">Échec de la connexion WebDAV</target>
+        </trans-unit>
+        <trans-unit id="RestoreSuccessTips" translate="yes" xml:space="preserve">
+          <source>Recovery successful</source>
+          <target state="translated">Récupération réussie</target>
+        </trans-unit>
+        <trans-unit id="BackupList" translate="yes" xml:space="preserve">
+          <source>Backup list</source>
+          <target state="translated">Liste de sauvegarde</target>
+        </trans-unit>
       </group>
     </body>
   </file>

diff --git a/src/EasyTidy/MultilingualResources/EasyTidy.ja-JP.xlf b/src/EasyTidy/MultilingualResources/EasyTidy.ja-JP.xlf
@@ -1764,6 +1764,26 @@
           <source>Not between</source>
           <target state="translated">間ではない</target>
         </trans-unit>
+        <trans-unit id="RestoreSelectionTips" translate="yes" xml:space="preserve">
+          <source>Please select the type to restore</source>
+          <target state="translated">復元する種別を選択してください</target>
+        </trans-unit>
+        <trans-unit id="RestoreFailedTips" translate="yes" xml:space="preserve">
+          <source>Recovery failed</source>
+          <target state="translated">復元に失敗しました</target>
+        </trans-unit>
+        <trans-unit id="WebDavConnectFailed" translate="yes" xml:space="preserve">
+          <source>WebDAV connection failed</source>
+          <target state="translated">WebDAV接続に失敗しました</target>
+        </trans-unit>
+        <trans-unit id="RestoreSuccessTips" translate="yes" xml:space="preserve">
+          <source>Recovery successful</source>
+          <target state="translated">回復に成功しました</target>
+        </trans-unit>
+        <trans-unit id="BackupList" translate="yes" xml:space="preserve">
+          <source>Backup list</source>
+          <target state="translated">バックアップリスト</target>
+        </trans-unit>
       </group>
     </body>
   </file>

diff --git a/src/EasyTidy/MultilingualResources/EasyTidy.qps-ploc.xlf b/src/EasyTidy/MultilingualResources/EasyTidy.qps-ploc.xlf
@@ -1764,6 +1764,26 @@
           <source>Not between</source>
           <target state="new">Not between</target>
         </trans-unit>
+        <trans-unit id="RestoreSelectionTips" translate="yes" xml:space="preserve">
+          <source>Please select the type to restore</source>
+          <target state="new">Please select the type to restore</target>
+        </trans-unit>
+        <trans-unit id="RestoreFailedTips" translate="yes" xml:space="preserve">
+          <source>Recovery failed</source>
+          <target state="new">Recovery failed</target>
+        </trans-unit>
+        <trans-unit id="WebDavConnectFailed" translate="yes" xml:space="preserve">
+          <source>WebDAV connection failed</source>
+          <target state="new">WebDAV connection failed</target>
+        </trans-unit>
+        <trans-unit id="RestoreSuccessTips" translate="yes" xml:space="preserve">
+          <source>Recovery successful</source>
+          <target state="new">Recovery successful</target>
+        </trans-unit>
+        <trans-unit id="BackupList" translate="yes" xml:space="preserve">
+          <source>Backup list</source>
+          <target state="new">Backup list</target>
+        </trans-unit>
       </group>
     </body>
   </file>

diff --git a/src/EasyTidy/MultilingualResources/EasyTidy.zh-CN.xlf b/src/EasyTidy/MultilingualResources/EasyTidy.zh-CN.xlf
@@ -1764,6 +1764,26 @@
           <source>Not between</source>
           <target state="translated">不介于</target>
         </trans-unit>
+        <trans-unit id="RestoreSelectionTips" translate="yes" xml:space="preserve">
+          <source>Please select the type to restore</source>
+          <target state="translated">请选择要还原的类型</target>
+        </trans-unit>
+        <trans-unit id="RestoreFailedTips" translate="yes" xml:space="preserve">
+          <source>Recovery failed</source>
+          <target state="translated">恢复失败</target>
+        </trans-unit>
+        <trans-unit id="WebDavConnectFailed" translate="yes" xml:space="preserve">
+          <source>WebDAV connection failed</source>
+          <target state="translated">WebDAV 连接失败</target>
+        </trans-unit>
+        <trans-unit id="RestoreSuccessTips" translate="yes" xml:space="preserve">
+          <source>Recovery successful</source>
+          <target state="translated">还原成功</target>
+        </trans-unit>
+        <trans-unit id="BackupList" translate="yes" xml:space="preserve">
+          <source>Backup list</source>
+          <target state="translated">备份列表</target>
+        </trans-unit>
       </group>
     </body>
   </file>

diff --git a/src/EasyTidy/MultilingualResources/EasyTidy.zh-Hant.xlf b/src/EasyTidy/MultilingualResources/EasyTidy.zh-Hant.xlf
@@ -1764,6 +1764,26 @@
           <source>Not between</source>
           <target state="translated">不介於</target>
         </trans-unit>
+        <trans-unit id="RestoreSelectionTips" translate="yes" xml:space="preserve">
+          <source>Please select the type to restore</source>
+          <target state="translated">請選擇要還原的類型</target>
+        </trans-unit>
+        <trans-unit id="RestoreFailedTips" translate="yes" xml:space="preserve">
+          <source>Recovery failed</source>
+          <target state="translated">復原失敗</target>
+        </trans-unit>
+        <trans-unit id="WebDavConnectFailed" translate="yes" xml:space="preserve">
+          <source>WebDAV connection failed</source>
+          <target state="translated">WebDAV 連線失敗</target>
+        </trans-unit>
+        <trans-unit id="RestoreSuccessTips" translate="yes" xml:space="preserve">
+          <source>Recovery successful</source>
+          <target state="translated">還原成功</target>
+        </trans-unit>
+        <trans-unit id="BackupList" translate="yes" xml:space="preserve">
+          <source>Backup list</source>
+          <target state="translated">備份清單</target>
+        </trans-unit>
       </group>
     </body>
   </file>

diff --git a/src/EasyTidy/MultilingualResources/EasyTidy.zh-TW.xlf b/src/EasyTidy/MultilingualResources/EasyTidy.zh-TW.xlf
@@ -1764,6 +1764,26 @@
           <source>Not between</source>
           <target state="translated">不介於</target>
         </trans-unit>
+        <trans-unit id="RestoreSelectionTips" translate="yes" xml:space="preserve">
+          <source>Please select the type to restore</source>
+          <target state="translated">請選擇要還原的類型</target>
+        </trans-unit>
+        <trans-unit id="RestoreFailedTips" translate="yes" xml:space="preserve">
+          <source>Recovery failed</source>
+          <target state="translated">復原失敗</target>
+        </trans-unit>
+        <trans-unit id="WebDavConnectFailed" translate="yes" xml:space="preserve">
+          <source>WebDAV connection failed</source>
+          <target state="translated">WebDAV 連線失敗</target>
+        </trans-unit>
+        <trans-unit id="RestoreSuccessTips" translate="yes" xml:space="preserve">
+          <source>Recovery successful</source>
+          <target state="translated">還原成功</target>
+        </trans-unit>
+        <trans-unit id="BackupList" translate="yes" xml:space="preserve">
+          <source>Backup list</source>
+          <target state="translated">備份清單</target>
+        </trans-unit>
       </group>
     </body>
   </file>

diff --git a/src/EasyTidy/Strings/en-US/Resources.resw b/src/EasyTidy/Strings/en-US/Resources.resw
@@ -1425,4 +1425,19 @@
   <data name="NotBetweenText" xml:space="preserve">
     <value>Not between</value>
   </data>
+  <data name="RestoreSelectionTips" xml:space="preserve">
+    <value>Please select the type to restore</value>
+  </data>
+  <data name="RestoreFailedTips" xml:space="preserve">
+    <value>Recovery failed</value>
+  </data>
+  <data name="WebDavConnectFailed" xml:space="preserve">
+    <value>WebDAV connection failed</value>
+  </data>
+  <data name="RestoreSuccessTips" xml:space="preserve">
+    <value>Recovery successful</value>
+  </data>
+  <data name="BackupList" xml:space="preserve">
+    <value>Backup list</value>
+  </data>
 </root>
diff --git a/src/EasyTidy/Strings/fr-FR/Resources.resw b/src/EasyTidy/Strings/fr-FR/Resources.resw
@@ -1291,4 +1291,19 @@
   <data name="NotBetweenText" xml:space="preserve">
     <value>Pas entre</value>
   </data>
+  <data name="RestoreSelectionTips" xml:space="preserve">
+    <value>Veuillez sélectionner le type à restaurer</value>
+  </data>
+  <data name="RestoreFailedTips" xml:space="preserve">
+    <value>La récupération a échoué</value>
+  </data>
+  <data name="WebDavConnectFailed" xml:space="preserve">
+    <value>Échec de la connexion WebDAV</value>
+  </data>
+  <data name="RestoreSuccessTips" xml:space="preserve">
+    <value>Récupération réussie</value>
+  </data>
+  <data name="BackupList" xml:space="preserve">
+    <value>Liste de sauvegarde</value>
+  </data>
 </root>
diff --git a/src/EasyTidy/Strings/ja-JP/Resources.resw b/src/EasyTidy/Strings/ja-JP/Resources.resw
@@ -1291,4 +1291,19 @@
   <data name="NotBetweenText" xml:space="preserve">
     <value>間ではない</value>
   </data>
+  <data name="RestoreSelectionTips" xml:space="preserve">
+    <value>復元する種別を選択してください</value>
+  </data>
+  <data name="RestoreFailedTips" xml:space="preserve">
+    <value>復元に失敗しました</value>
+  </data>
+  <data name="WebDavConnectFailed" xml:space="preserve">
+    <value>WebDAV接続に失敗しました</value>
+  </data>
+  <data name="RestoreSuccessTips" xml:space="preserve">
+    <value>回復に成功しました</value>
+  </data>
+  <data name="BackupList" xml:space="preserve">
+    <value>バックアップリスト</value>
+  </data>
 </root>
diff --git a/src/EasyTidy/Strings/zh-CN/Resources.resw b/src/EasyTidy/Strings/zh-CN/Resources.resw
@@ -1309,4 +1309,19 @@
   <data name="NotBetweenText" xml:space="preserve">
     <value>不介于</value>
   </data>
+  <data name="RestoreSelectionTips" xml:space="preserve">
+    <value>请选择要还原的类型</value>
+  </data>
+  <data name="RestoreFailedTips" xml:space="preserve">
+    <value>恢复失败</value>
+  </data>
+  <data name="WebDavConnectFailed" xml:space="preserve">
+    <value>WebDAV 连接失败</value>
+  </data>
+  <data name="RestoreSuccessTips" xml:space="preserve">
+    <value>还原成功</value>
+  </data>
+  <data name="BackupList" xml:space="preserve">
+    <value>备份列表</value>
+  </data>
 </root>
diff --git a/src/EasyTidy/Strings/zh-Hant/Resources.resw b/src/EasyTidy/Strings/zh-Hant/Resources.resw
@@ -1288,4 +1288,19 @@
   <data name="NotBetweenText" xml:space="preserve">
     <value>不介於</value>
   </data>
+  <data name="RestoreSelectionTips" xml:space="preserve">
+    <value>請選擇要還原的類型</value>
+  </data>
+  <data name="RestoreFailedTips" xml:space="preserve">
+    <value>復原失敗</value>
+  </data>
+  <data name="WebDavConnectFailed" xml:space="preserve">
+    <value>WebDAV 連線失敗</value>
+  </data>
+  <data name="RestoreSuccessTips" xml:space="preserve">
+    <value>還原成功</value>
+  </data>
+  <data name="BackupList" xml:space="preserve">
+    <value>備份清單</value>
+  </data>
 </root>
diff --git a/src/EasyTidy/Strings/zh-TW/Resources.resw b/src/EasyTidy/Strings/zh-TW/Resources.resw
@@ -1288,4 +1288,19 @@
   <data name="NotBetweenText" xml:space="preserve">
     <value>不介於</value>
   </data>
+  <data name="RestoreSelectionTips" xml:space="preserve">
+    <value>請選擇要還原的類型</value>
+  </data>
+  <data name="RestoreFailedTips" xml:space="preserve">
+    <value>復原失敗</value>
+  </data>
+  <data name="WebDavConnectFailed" xml:space="preserve">
+    <value>WebDAV 連線失敗</value>
+  </data>
+  <data name="RestoreSuccessTips" xml:space="preserve">
+    <value>還原成功</value>
+  </data>
+  <data name="BackupList" xml:space="preserve">
+    <value>備份清單</value>
+  </data>
 </root>