Conflict: Solve conflict

(cherry picked from commit 311681c)

Author: Jet

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "notewizard",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "description": "NoteWizard Installer",
   "license": "MIT License",

package.json

@@ -1,3 +1,11 @@
+### [0.4.1] - 2025-11-28
+#### 修复
+- 修复搜索栏无法搜索的问题。
+- 修复某些场景下无法禁用加密的问题。
+#### 优化
+- 优化安全功能的交互体验。
+- 优化导出.nwp格式的交互体验。
+
 ### [0.4.0] - 2025-11-24
 #### 新增
 - 新增本地笔记加密功能，采用AES-256-GCM算法实现本地数据加密。

src/assets/changelog/history_cn.md

@@ -1,16 +1,22 @@
+### [0.4.1] - 2025-11-28
+#### Fixed
+- Fixed an issue where the search bar could not perform searches.
+- Fixed an issue where encryption could not be disabled in certain scenarios.
+#### Optimized
+- Optimized the interaction experience of security-related features.
+- Optimized the interaction experience of exporting the .nwp format.
+
 ### [0.4.0] - 2025-11-24
 #### Added
 - Added local note encryption using the AES-256-GCM algorithm for on-device data protection.
-
 #### Fixed
 - Fixed an issue where the Windows version could leave a background process running after uninstallation in certain scenarios.
 - Fixed translation issues in several non-English languages.
-
 #### Optimized
-- Improved view rendering performance.
-- Improved default language initialization.
-- Improved application startup speed.
-- Improved the interaction experience for exporting  .nwp format.
+- Optimized view rendering performance.
+- Optimized default language initialization.
+- Optimized application startup speed.
+- Optimized the interaction experience of exporting the .nwp format.
 
 ### [0.3.2] - 2025-10-26
 #### Optimized

src/assets/changelog/history_en.md

@@ -293,6 +293,7 @@
   "labelEncryptionStatus": "এনক্রিপশন স্থিতি:",
   "inputRecoveryKeyTitle": "পুনরুদ্ধার কী লিখুন",
   "inputRecoveryKeyMessage": "নোট এনক্রিপশন অক্ষম করতে অনুগ্রহ করে পুনরুদ্ধার কী লিখুন।\nনিরাপত্তা সতর্কতা: এটি সমস্ত নোট ডিক্রিপ্ট করবে এবং এনক্রিপশন কনফিগারেশন মুছে ফেলবে।",
+  "inputRecoveryKeyPlaceholder": "অনুগ্রহ করে পুনরুদ্ধার কী প্রবেশ করুন",
   "btnCancel": "বাতিল",
   "btnConfirm": "নিশ্চিত করুন",
   "btnSaveRecoveryKey": "কী রপ্তানি করুন",
@@ -320,5 +321,8 @@
   "batchEncryptWithSkipped": "ব্যাচ এনক্রিপশন সম্পূর্ণ! সফল: {encrypted} টি ফাইল, এড়িয়ে যাওয়া হয়েছে: {skipped} টি ফাইল",
   "batchEncryptWithFailed": "ব্যাচ এনক্রিপশন সম্পূর্ণ! সফল: {encrypted} টি ফাইল, ব্যর্থ: {failed} টি ফাইল",
   "batchDecryptSuccess": "ব্যাচ ডিক্রিপশন সম্পূর্ণ! সফল: {decrypted} টি ফাইল",
-  "encryptionDisabled": "এনক্রিপশন অক্ষম করা হয়েছে! {decrypted} টি ফাইল ডিক্রিপ্ট করা হয়েছে।"
+  "encryptionDisabled": "এনক্রিপশন অক্ষম করা হয়েছে! {decrypted} টি ফাইল ডিক্রিপ্ট করা হয়েছে।",
+  "search.resultsCount": "{count} টি নোট পাওয়া গেছে",
+  "search.noResults": "কোনো মিল নোট পাওয়া যায়নি",
+  "search.clearSearch": "অনুসন্ধান মুছে ফেলুন"
 }

src/locales/bn-BD.json

@@ -293,6 +293,7 @@
   "labelEncryptionStatus": "Verschlüsselungsstatus:",
   "inputRecoveryKeyTitle": "Wiederherstellungsschlüssel eingeben",
   "inputRecoveryKeyMessage": "Bitte geben Sie den Wiederherstellungsschlüssel ein, um die Notizverschlüsselung zu deaktivieren.\nSicherheitswarnung: Dies entschlüsselt alle Notizen und löscht die Verschlüsselungskonfiguration.",
+  "inputRecoveryKeyPlaceholder": "Bitte geben Sie den Wiederherstellungsschlüssel ein",
   "btnCancel": "Abbrechen",
   "btnConfirm": "Bestätigen",
   "btnSaveRecoveryKey": "Schlüssel exportieren",
@@ -320,5 +321,8 @@
   "batchEncryptWithSkipped": "Batch-Verschlüsselung abgeschlossen! Erfolg: {encrypted} Dateien, Übersprungen: {skipped} Dateien",
   "batchEncryptWithFailed": "Batch-Verschlüsselung abgeschlossen! Erfolg: {encrypted} Dateien, Fehlgeschlagen: {failed} Dateien",
   "batchDecryptSuccess": "Batch-Entschlüsselung abgeschlossen! Erfolg: {decrypted} Dateien",
-  "encryptionDisabled": "Verschlüsselung deaktiviert! {decrypted} Dateien entschlüsselt."
+  "encryptionDisabled": "Verschlüsselung deaktiviert! {decrypted} Dateien entschlüsselt.",
+  "search.resultsCount": "{count} Notizen gefunden",
+  "search.noResults": "Keine passenden Notizen gefunden",
+  "search.clearSearch": "Suche löschen"
 }

src/locales/de-DE.json

@@ -293,6 +293,7 @@
   "labelEncryptionStatus": "Encryption Status:",
   "inputRecoveryKeyTitle": "Input Recovery Key",
   "inputRecoveryKeyMessage": "Please input recovery key to disable note encryption.\nSecurity Warning: This will decrypt all notes and clear encryption configuration.",
+  "inputRecoveryKeyPlaceholder": "Please input recovery key",
   "btnCancel": "Cancel",
   "btnConfirm": "Confirm",
   "btnSaveRecoveryKey": "Export Key",
@@ -320,5 +321,8 @@
   "batchEncryptWithSkipped": "Batch encryption complete! Success: {encrypted}, Skipped: {skipped}",
   "batchEncryptWithFailed": "Batch encryption complete! Success: {encrypted}, Failed: {failed}",
   "batchDecryptSuccess": "Batch decryption complete! Success: {decrypted}",
-  "encryptionDisabled": "Encryption disabled! Decrypted {decrypted} files."
+  "encryptionDisabled": "Encryption disabled! Decrypted {decrypted} files.",
+  "search.resultsCount": "Found {count} notes",
+  "search.noResults": "No matching notes found",
+  "search.clearSearch": "Clear search"
 }

src/locales/en-GB.json

@@ -293,6 +293,7 @@
   "labelEncryptionStatus": "Encryption Status:",
   "inputRecoveryKeyTitle": "Input Recovery Key",
   "inputRecoveryKeyMessage": "Please input recovery key to disable note encryption.\nSecurity Warning: This will decrypt all notes and clear encryption configuration.",
+  "inputRecoveryKeyPlaceholder": "Please input recovery key",
   "btnCancel": "Cancel",
   "btnConfirm": "Confirm",
   "btnSaveRecoveryKey": "Export Key",
@@ -320,5 +321,8 @@
   "batchEncryptWithSkipped": "Batch encryption complete! Success: {encrypted}, Skipped: {skipped}",
   "batchEncryptWithFailed": "Batch encryption complete! Success: {encrypted}, Failed: {failed}",
   "batchDecryptSuccess": "Batch decryption complete! Success: {decrypted}",
-  "encryptionDisabled": "Encryption disabled! Decrypted {decrypted} files."
+  "encryptionDisabled": "Encryption disabled! Decrypted {decrypted} files.",
+  "search.resultsCount": "Found {count} notes",
+  "search.noResults": "No matching notes found",
+  "search.clearSearch": "Clear search"
 }

src/locales/en-US.json

@@ -293,6 +293,7 @@
   "labelEncryptionStatus": "Estado de cifrado:",
   "inputRecoveryKeyTitle": "Ingresar clave de recuperación",
   "inputRecoveryKeyMessage": "Ingrese la clave de recuperación para deshabilitar el cifrado de notas.\nAdvertencia de seguridad: Esto descifrará todas las notas y borrará la configuración de cifrado.",
+  "inputRecoveryKeyPlaceholder": "Por favor, ingrese la clave de recuperación",
   "btnCancel": "Cancelar",
   "btnConfirm": "Confirmar",
   "btnSaveRecoveryKey": "Exportar clave",
@@ -320,5 +321,8 @@
   "batchEncryptWithSkipped": "¡Cifrado por lotes completado! Éxito: {encrypted} archivos, Omitidos: {skipped} archivos",
   "batchEncryptWithFailed": "¡Cifrado por lotes completado! Éxito: {encrypted} archivos, Fallidos: {failed} archivos",
   "batchDecryptSuccess": "¡Descifrado por lotes completado! Éxito: {decrypted} archivos",
-  "encryptionDisabled": "¡Cifrado deshabilitado! {decrypted} archivos descifrados."
+  "encryptionDisabled": "¡Cifrado deshabilitado! {decrypted} archivos descifrados.",
+  "search.resultsCount": "Se encontraron {count} notas",
+  "search.noResults": "No se encontraron notas coincidentes",
+  "search.clearSearch": "Limpiar búsqueda"
 }

src/locales/es-ES.json

@@ -293,6 +293,7 @@
   "labelEncryptionStatus": "État du chiffrement :",
   "inputRecoveryKeyTitle": "Entrer la clé de récupération",
   "inputRecoveryKeyMessage": "Veuillez entrer la clé de récupération pour désactiver le chiffrement des notes.\nAvertissement de sécurité : cela déchiffrera toutes les notes et effacera la configuration de chiffrement.",
+  "inputRecoveryKeyPlaceholder": "Veuillez saisir la clé de récupération",
   "btnCancel": "Annuler",
   "btnConfirm": "Confirmer",
   "btnSaveRecoveryKey": "Exporter la clé",
@@ -320,5 +321,8 @@
   "batchEncryptWithSkipped": "Chiffrement par lot terminé ! Succès : {encrypted} fichiers, Ignorés : {skipped} fichiers",
   "batchEncryptWithFailed": "Chiffrement par lot terminé ! Succès : {encrypted} fichiers, Échec : {failed} fichiers",
   "batchDecryptSuccess": "Déchiffrement par lot terminé ! Succès : {decrypted} fichiers",
-  "encryptionDisabled": "Chiffrement désactivé ! {decrypted} fichiers déchiffrés."
+  "encryptionDisabled": "Chiffrement désactivé ! {decrypted} fichiers déchiffrés.",
+  "search.resultsCount": "{count} notes trouvées",
+  "search.noResults": "Aucune note correspondante trouvée",
+  "search.clearSearch": "Effacer la recherche"
 }