Merge remote-tracking branch 'origin/release/2025-08-15' into feature/IO-3255-simplified-part-management, resolve conflicts

2025-08-08 12:24:13 -04:00
parent 84795b2048 a7e21b0505
commit 50d2e912ed
48 changed files with 666 additions and 404 deletions
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -3787,7 +3787,9 @@
      "actions": {
        "changepassword": "Change Password",
        "signout": "Sign Out",
-        "updateprofile": "Update Profile"
+        "updateprofile": "Update Profile",
+        "light_theme": "Switch to Light Theme",
+        "dark_theme": "Switch to Dark Theme"
      },
      "errors": {
        "updating": "Error updating user or association {{message}}"
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -3787,7 +3787,9 @@
      "actions": {
        "changepassword": "",
        "signout": "desconectar",
-        "updateprofile": "Actualización del perfil"
+        "updateprofile": "Actualización del perfil",
+        "light_theme": "",
+        "dark_theme": ""
      },
      "errors": {
        "updating": ""
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -3787,7 +3787,9 @@
      "actions": {
        "changepassword": "",
        "signout": "Déconnexion",
-        "updateprofile": "Mettre à jour le profil"
+        "updateprofile": "Mettre à jour le profil",
+        "light_theme": "",
+        "dark_theme": ""
      },
      "errors": {
        "updating": ""